From beadbecb4ec7aaf960b8e46f5c02836bf6c9e976 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 08 四月 2024 16:14:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/ProjectWeb/src/views/base/UIContentViewer.vue |   31 ++++++++++++++++++++-----------
 1 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/Source/ProjectWeb/src/views/base/UIContentViewer.vue b/Source/ProjectWeb/src/views/base/UIContentViewer.vue
index 8b2cd6b..24d6b35 100644
--- a/Source/ProjectWeb/src/views/base/UIContentViewer.vue
+++ b/Source/ProjectWeb/src/views/base/UIContentViewer.vue
@@ -1,6 +1,6 @@
 <template>
   <!--UI涓婁笅鏂囩殑灞曠ず鍣�-->
-  <div style="height:calc(100% - 4px);min-width:1200px">
+  <div style="height:calc(100% - 4px);min-width:1200px" >
     <el-header v-if="uiDefineVO.northAreas && uiDefineVO.northAreas.length>0">
       <UIContentArea :key="'northArea-'+uiDefineVO.oid" :areasData="uiDefineVO.northAreas"
                      :dataStore="checkedData.northArea"
@@ -54,7 +54,6 @@
 <script>
 import {verifyNull} from "@/util/validate";
 import UIContentArea from "@/views/base/UIContentArea"
-import {uiDefineVOData} from "@/views/base/uiDefineVO"
 import {getUIContent} from '@/api/base/region'
 
 export default {
@@ -78,25 +77,35 @@
       sourceData: {},
     }
   },
-  watch: {},
-  computed: {},
+  watch: {
+    $route(to, from) {
+      this.getTheParameters()
+      this.initUI();
+    }
+  },
+  computed: {
+    typeAContent(){
+      return this.btmType+this.content;
+    }
+  },
   created() {
     if (verifyNull(this.$route.query.type) || (verifyNull(this.$route.query.context) && verifyNull(this.$route.query.content))) {
       this.$message.error("閰嶇疆鐨勪俊鎭敊璇紝璇峰弬鑰僢s=缁勪欢name?type=xxx&context=yyy&param=zzz杩欑褰㈠紡銆傚叾涓璽ype鏄笟鍔＄被鍨嬶紙鎴栭摼鎺ョ被鍨嬶級锛宑ontext鏄疷I涓婁笅鏂囩殑鍚嶇О");
       return false;
     }
-    this.btmType = this.$route.query.type;
-    this.content = this.$route.query.context || this.$route.query.content;
-    this.sourceData = this.$route.query;
+    this.getTheParameters()
     this.initUI();
-    this.initContent();
   },
   methods: {
+    getTheParameters(){
+      this.btmType = this.$route.query.type;
+      this.content = this.$route.query.context || this.$route.query.content;
+      this.sourceData = this.$route.query;
+    },
     initUI() {
-      const query = {btmType: 'folder', id: 'cardtemplatemanager'}
-      getUIContent(query).then(res => {
-        console.log(res.data.obj)
+      getUIContent({btmType: this.btmType, id: this.content}).then(res => {
         this.uiDefineVO = res.data.obj;
+        this.initContent();
       })
     },
     initContent() {

--
Gitblit v1.9.3