ming пре 3 година
родитељ
комит
698f574408

+ 8 - 0
src/views/dataManage/sameAnalysis/index.vue

@@ -26,6 +26,7 @@
           accordion
           :check-strictly="true"
           :props="defaultProps"
+          @change="changeTree"
           @check="currentChecked"
         />
       </div>
@@ -114,6 +115,9 @@ export default defineComponent({
     const valueCalculation = ref()
     const dateTime = ref('')
     const ecahrtsData = ref({})
+    function changeTree(){
+
+    }
 
     const listTabsChange = (value) => {
       console.log(value)
@@ -237,6 +241,7 @@ export default defineComponent({
       ]),
       valueCalculation,
       ecahrtsData,
+      changeTree
     }
   },
 })
@@ -309,9 +314,12 @@ export default defineComponent({
     }
   }
 }
+
 </style>
 
 <style lang="less">
+
+
 .sameSwitch {
   .el-tree-node__content .el-checkbox__input {
     display: none;

+ 1 - 1
src/views/siteManage/basicInfo/index.vue

@@ -556,7 +556,7 @@ export default defineComponent({
               }, 2000)
 
               formStatus.value = '修改'
-              context.emit('func')
+              context.emit('func',params.id)
             } else {
               ElMessage.error(requset.msg)
             }

+ 28 - 13
src/views/siteManage/index.vue

@@ -102,7 +102,7 @@
             :siteId="siteId"
             :groupingId="groupingId"
             :siteName="siteName"
-            @func="getMsgFormSon2"
+            @func="getMsgFormSon3"
             :activeName="activeName"
           ></basic-info>
         </el-tab-pane>
@@ -207,6 +207,7 @@ export default defineComponent({
     const label = ref('')
     const activeName = ref('first')
     const filterText = ref('')
+    const selectNode = ref(0)
     const data = ref([
       {
         label: '所有站点',
@@ -263,11 +264,23 @@ export default defineComponent({
     }
     const getMsgFormSon2 = () => {
       siteTreeList()
-
       setTimeout(() => {
         treeLevel.value = 1
       }, 1000)
     }
+    //站点基本信息保存后触发
+    const getMsgFormSon3 = (data) => {
+      siteTreeList()
+      setTimeout(() => {
+        tree.value.setCurrentKey(selectNode.value)
+      }, 1000)
+
+      if (data == 0) {
+        setTimeout(() => {
+          treeLevel.value = 1
+        }, 1000)
+      }
+    }
     function mouseenter(data) {
       data.show = true
     }
@@ -283,14 +296,12 @@ export default defineComponent({
       treeLevel.value = obj.level
       groupingId.value = obj.data.grouping_id
       label.value = obj.data.label
-      console.log('obj.data')
-      console.log(obj)
-      // console.log(groupingId.value)
+      // console.log('obj.data')
+      // console.log(obj.data.id)
+      selectNode.value = obj.data.id
       labelCom.value = obj.data.label
       store.state.siteManageLabelCom = obj.data.label
-      store.state.basicInfoSiteName=''
-      // console.log('labelCom.value')
-      // console.log(labelCom.value)
+      store.state.basicInfoSiteName = ''
 
       if (treeLevel.value == 3) {
         siteId.value = obj.data.id
@@ -322,10 +333,10 @@ export default defineComponent({
       // watch 刚被创建的时候不执行
       { lazy: true }
     )
-     watch(
+    watch(
       activeName,
       (newCount, old, clear) => {
-        newCount,old,clear
+        newCount, old, clear
         // 清除定时器
         clear(() => clearTimeout(store.state.siteCameraTimer))
       },
@@ -333,7 +344,6 @@ export default defineComponent({
       { lazy: true }
     )
 
-
     // 新建分组关闭操作
     const closeDialog = (res) => {
       if (store.state.basicInfoConst == 1 && res == '默认关闭') {
@@ -403,14 +413,16 @@ export default defineComponent({
           var jsonc = JSON.parse(jsonb)
           data.value[0].children = jsonc
           //  data2.value[0].children = jsonc
-          console.log(data)
+          // console.log(data)
           // console.log(data2)
         } else {
           ElMessage.error(requset.msg)
         }
       })
     }
-    onMounted(() => {
+    onMounted(() => { 
+      //  console.log('tree.value')
+      // console.log(tree.value)
       siteTreeList()
     })
 
@@ -443,6 +455,7 @@ export default defineComponent({
       defaultExpand,
       getMsgFormSon,
       getMsgFormSon2,
+      getMsgFormSon3,
       mouseenter,
       mouseleave,
       filterNode,
@@ -451,6 +464,8 @@ export default defineComponent({
       addGroup,
       addSite,
       remove,
+
+      selectNode,
     }
   },
 })