'更新202111302025'

src/store/index.js

@@ -44,7 +44,7 @@ export default createStore({
 
 
         basicInfoSiteName: '', // 站点基本信息
-
+        basicInfoConst:1,// 站点弹窗
     },
     mutations: {
         /**

src/views/siteManage/addSiteCom.vue

@@ -2,7 +2,7 @@
   <el-dialog
     :title="dialogTitle"
     v-model="dialogVisible"
-    @close="closeDialog2()"
+    @close="closeDialog2('默认关闭')"
     @open="open"
     width="500px"
   >
@@ -31,9 +31,7 @@
       </el-form-item>
 
       <div style="text-align: right">
-        <el-button type="primary" @click="submitForm('formInfo')">
-          保存
-        </el-button>
+        <el-button type="primary" @click="submitForm()">保存</el-button>
       </div>
     </el-form>
   </el-dialog>
@@ -67,15 +65,15 @@ export default defineComponent({
 
     // open(): Dialog弹窗打开之前做的事
     const open = () => {
+      store.state.basicInfoConst = 1
       form.value = props.itemInfo.value
       // alert(props.groupingId)
     }
 
     // 关闭弹框
-    const closeDialog2 = () => {
-      context.emit('closeDialog2')
-      //  context.emit('treeLevel', 3)
-      // dialogVisible.value = false
+    const closeDialog2 = (res) => {
+      context.emit('closeDialog', res)
+      store.state.basicInfoConst++
     }
 
     watchEffect((fn, options) => {
@@ -94,6 +92,7 @@ export default defineComponent({
 
     // 保存-修改操作
     const submitForm = () => {
+      store.state.basicInfoConst = 1
       console.log('form.region')
       console.log(form.value.region)
       console.log('form.siteName')
@@ -107,6 +106,7 @@ export default defineComponent({
             form.value.region ? form.value.region : '',
             props.groupingId
           )
+          closeDialog2('')
         } else {
           console.log('error submit!!')
           return false

src/views/siteManage/index.vue

@@ -102,7 +102,7 @@
             :siteId="siteId"
             :groupingId="groupingId"
             :siteName="siteName"
-             @func="getMsgFormSon2"
+            @func="getMsgFormSon2"
           ></basic-info>
         </el-tab-pane>
         <el-tab-pane label="监控设备" name="second">
@@ -140,7 +140,7 @@
       <add-group-com
         :dialogTitle="dialogTitle"
         :itemInfo="tableItem"
-        @closeDialog="closeDialog"
+        @closeDialog="closeDialog('默认关闭')"
         :flag="showDialog"
       ></add-group-com>
       <!-- 新建分组end -->
@@ -150,7 +150,7 @@
         :dialogTitle="dialogTitle"
         :itemInfo="tableItem"
         :groupingId="groupingId"
-        @closeDialog2="closeDialog"
+        @closeDialog="closeDialog"
         :flag="showDialog2"
         @changeFather="getFromSon"
       ></add-site-com>
@@ -175,6 +175,7 @@ import addSiteCom from './addSiteCom'
 
 import * as api from '@/api/siteManage/index'
 import { ElMessage } from 'element-plus'
+import { useStore } from 'vuex'
 
 export default defineComponent({
   components: {
@@ -188,6 +189,7 @@ export default defineComponent({
     addSiteCom,
   },
   setup() {
+    const store = useStore()
     const flag2 = ref(false)
     const tree = ref(null)
     const showTree = ref(true)
@@ -257,8 +259,7 @@ export default defineComponent({
       activeName.value = 'third'
     }
     const getMsgFormSon2 = () => {
-      siteTreeList();
-
+      siteTreeList()
     }
     function mouseenter(data) {
       data.show = true
@@ -278,7 +279,6 @@ export default defineComponent({
       console.log(obj)
       console.log(groupingId.value)
 
-
       if (treeLevel.value == 3) {
         siteId.value = obj.data.id
       }
@@ -311,30 +311,27 @@ export default defineComponent({
     )
 
     // 新建分组关闭操作
-    const closeDialog = () => {
-      alert('默认关闭')
-      showDialog.value = false
-      showDialog2.value = false
-      siteTreeList()
-      flag2.value = false
-      treeLevel.value = 3
-    }
-
-    const closeDialog2 = () => {
-      //添加站点保存后关闭弹框的操作
-      // showDialog.value = false
-      showDialog2.value = false
-      flag2.value = true
-      treeLevel.value = 3
+    const closeDialog = (res) => {
+      if (store.state.basicInfoConst == 1 && res == '默认关闭') {
+        showDialog.value = false
+        showDialog2.value = false
+        siteTreeList()
+        flag2.value = false
+        treeLevel.value = 3
+      } else if (store.state.basicInfoConst == 1) {
+        showDialog.value = false
+        showDialog2.value = false
+      }
     }
 
-    
-    const getFromSon = (param, param2,param3) => {
-       alert('保存后关闭')
+    const getFromSon = (param, param2, param3) => {
+      alert('保存后关闭')
       siteId.value = param2
       siteName.value = param
-      groupingId.value=param3
-      closeDialog2()
+      groupingId.value = param3
+
+      flag2.value = true
+      treeLevel.value = 3
     }
 
     //新建分组
@@ -390,7 +387,6 @@ export default defineComponent({
       })
     }
     onMounted(() => {
-     
       siteTreeList()
     })
 
@@ -427,7 +423,6 @@ export default defineComponent({
       filterNode,
       handleNodeClick,
       closeDialog,
-      closeDialog2,
       addGroup,
       addSite,
       remove,