浏览代码

bug修复

ming 3 年之前
父节点
当前提交
ce554896ed
共有 3 个文件被更改,包括 34 次插入24 次删除
  1. 15 8
      src/views/siteManage/addSiteCom.vue
  2. 10 11
      src/views/siteManage/basicInfo/index.vue
  3. 9 5
      src/views/siteManage/index.vue

+ 15 - 8
src/views/siteManage/addSiteCom.vue

@@ -39,8 +39,8 @@
 <script>
 import { defineComponent, ref, watchEffect, onMounted } from 'vue'
 
-// import * as api from '@/api/siteManage/index'
-// import { ElMessage } from 'element-plus'
+import * as api from '@/api/siteManage/index'
+import { ElMessage } from 'element-plus'
 import { useStore } from 'vuex'
 
 export default defineComponent({
@@ -65,14 +65,21 @@ export default defineComponent({
 
     // open(): Dialog弹窗打开之前做的事
     const open = () => {
-       store.commit('publicSiteList')  
-       listData.value=store.state.siteList
+
+      //  store.commit('publicSiteList')  
+      //  listData.value=store.state.siteList
+
+      api.list({}).then((requset) => {
+        if (requset.status === 'SUCCESS') {
+          listData.value = requset.data
+        } else {
+          ElMessage.error(requset.msg)
+        }
+      })
+
+
       store.state.basicInfoConst = 1
       form.value = props.itemInfo.value;
-      
-      console.log('listData.value')
-      console.log(listData.value)
-      // alert(props.groupingId)
     }
 
     // 关闭弹框

+ 10 - 11
src/views/siteManage/basicInfo/index.vue

@@ -389,10 +389,7 @@ export default defineComponent({
               url: fileImages.value + requset.data[0].sitePictureThree,
             })
           }
-          if (store.state.basicInfoSiteName) {
-            // alert('props.siteName')
-            ruleForm.value.siteName = store.state.basicInfoSiteName
-          }
+      
 
           console.log('fileListImages.value')
           console.log(fileListImages.value)
@@ -422,9 +419,6 @@ export default defineComponent({
       formInfo.value.validate((valid) => {
         if (valid) {
           isDisable.value = true
-          setTimeout(() => {
-            isDisable.value = false //点击一次时隔两秒后才能再次点击
-          }, 10000)
 
           store
           //  store.commit('TimeAll_function')
@@ -482,11 +476,13 @@ export default defineComponent({
                 type: 'success',
               })
 
-             
-
               store.state.basicInfoSiteName = ''
+
+              setTimeout(() => {
+                isDisable.value = false //点击一次时隔两秒后才能再次点击
+              }, 2000)
+
               formStatus.value = '修改'
-               
               context.emit('func')
             } else {
               ElMessage.error(requset.msg)
@@ -539,7 +535,10 @@ export default defineComponent({
         formStatus.value = '修改'
         getSite()
       }
-      if (props.activeName == 'first' && props.siteId) {
+      if (props.activeName == 'first') {
+        if (store.state.basicInfoSiteName) {
+          ruleForm.value.siteName = store.state.basicInfoSiteName
+        }
         platformList()
         routeDroplist()
         dynamicPropertiesDroplist(2)

+ 9 - 5
src/views/siteManage/index.vue

@@ -103,7 +103,7 @@
             :groupingId="groupingId"
             :siteName="siteName"
             @func="getMsgFormSon2"
-             :activeName="activeName"
+            :activeName="activeName"
           ></basic-info>
         </el-tab-pane>
         <el-tab-pane label="监控设备" name="second">
@@ -202,7 +202,7 @@ export default defineComponent({
     const treeLevel = ref(3)
     const groupingId = ref(1)
     const siteId = ref(0)
-    const labelCom=ref('')
+    const labelCom = ref('')
     const siteName = ref('')
     const label = ref('')
     const activeName = ref('first')
@@ -263,6 +263,10 @@ export default defineComponent({
     }
     const getMsgFormSon2 = () => {
       siteTreeList()
+
+      setTimeout(() => {
+        treeLevel.value = 1
+      }, 1000)
     }
     function mouseenter(data) {
       data.show = true
@@ -272,7 +276,7 @@ export default defineComponent({
     }
 
     const handleNodeClick = (data, obj, node) => {
-      activeName.value='first'
+      activeName.value = 'first'
       data, node
       flag2.value = true
 
@@ -282,7 +286,7 @@ export default defineComponent({
       console.log('obj.data')
       console.log(obj)
       // console.log(groupingId.value)
-      labelCom.value=obj.data.label
+      labelCom.value = obj.data.label
       store.state.siteManageLabelCom = obj.data.label
       // console.log('labelCom.value')
       // console.log(labelCom.value)
@@ -291,7 +295,7 @@ export default defineComponent({
         siteId.value = obj.data.id
       }
       if (treeLevel.value == 2 && groupingId.value == 0) {
-        // console.log(obj.data)  
+        // console.log(obj.data)
         siteId.value = obj.data.id
       }
     }