-

src/store/index.js

@@ -41,6 +41,10 @@ export default createStore({
 
         // tableHeight:0,//公共table监听高度变化
         // echartHeight:0,//公共ehcarts监听高度变化
+
+
+        basicInfoSiteName: '', // 站点基本信息
+
     },
     mutations: {
         /**
@@ -83,8 +87,7 @@ export default createStore({
                                                     deviceName: val.variableName,
                                                     id: val.id,
                                                 }
-                                            }) :
-                                            val.children,
+                                            }) : val.children,
                                     })
                                     // }
                             })

src/views/siteManage/addSiteCom.vue

@@ -1,44 +1,49 @@
 <template>
-    <el-dialog
-      :title="dialogTitle"
-       v-model="dialogVisible"
-     
-      @close="closeDialog2()"
-         @open="open"
-          width="500px"
+  <el-dialog
+    :title="dialogTitle"
+    v-model="dialogVisible"
+    @close="closeDialog2()"
+    @open="open"
+    width="500px"
+  >
+    <el-form
+      ref="formInfo"
+      :model="form"
+      class="demo-form-inline"
+      label-width="100px"
+      :rules="rules"
     >
-      <el-form
-        ref="formInfo"
-        :model="form"
-        class="demo-form-inline"
-        label-width="100px"
-        :rules="rules"
-      >
-        <el-form-item label="站点名称：" prop="siteName">
-          <el-input v-model="form.siteName"></el-input>
-        </el-form-item>
-         <!-- <el-form-item label="站点编号：" prop="siteName">
+      <el-form-item label="站点名称：" prop="siteName">
+        <el-input v-model="form.siteName"></el-input>
+      </el-form-item>
+      <!-- <el-form-item label="站点编号：" prop="siteName">
           <el-input v-model="form.siteName"></el-input>
         </el-form-item> -->
-         <el-form-item label="选择模板：" prop="region">
-            <el-select v-model="form.region" placeholder="请选择">
-              <el-option v-for="(item,index) in listData" :key="index" :label="item.siteName" :value="item.id"></el-option>
-            </el-select>
-          </el-form-item>
-      
-        <div style="text-align: right">
-          <el-button type="primary" @click="submitForm('formInfo')"
-            >保存</el-button
-          >
-        </div>
-      </el-form>
-    </el-dialog>
+      <el-form-item label="选择模板：" prop="region">
+        <el-select v-model="form.region" placeholder="请选择">
+          <el-option
+            v-for="(item, index) in listData"
+            :key="index"
+            :label="item.siteName"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <div style="text-align: right">
+        <el-button type="primary" @click="submitForm('formInfo')">
+          保存
+        </el-button>
+      </div>
+    </el-form>
+  </el-dialog>
 </template>
 <script>
-import { defineComponent, ref, watchEffect,onMounted } from 'vue'
+import { defineComponent, ref, watchEffect, onMounted } from 'vue'
 
 import * as api from '@/api/siteManage/index'
 import { ElMessage } from 'element-plus'
+import { useStore } from 'vuex'
 
 export default defineComponent({
   name: 'AddSiteCom',
@@ -47,23 +52,23 @@ export default defineComponent({
     flag: Boolean,
     dialogTitle: String,
     itemInfo: Object,
-    treeLevel:Number,
-    groupingId:Number
+    treeLevel: Number,
+    groupingId: Number,
   },
   setup(props, context) {
+    const store = useStore()
     context
 
     const dialogVisible = ref(false)
     const formInfo = ref(null)
     const form = ref([])
 
-    const listData=ref([])
+    const listData = ref([])
 
-    
     // open(): Dialog弹窗打开之前做的事
     const open = () => {
       form.value = props.itemInfo.value
-
+      // alert(props.groupingId)
     }
 
     // 关闭弹框
@@ -89,14 +94,19 @@ export default defineComponent({
 
     // 保存-修改操作
     const submitForm = () => {
-    console.log('form.region')
-    console.log(form.value.region)
-    console.log('form.siteName')
-    console.log(form.value.siteName)
+      console.log('form.region')
+      console.log(form.value.region)
+      console.log('form.siteName')
+      console.log(form.value.siteName)
       formInfo.value.validate((valid) => {
         if (valid) {
-           context.emit('changeFather', form.value.siteName,form.value.region?form.value.region:'',props.groupingId.value)
-
+          store.state.basicInfoSiteName = form.value.siteName
+          context.emit(
+            'changeFather',
+            form.value.siteName,
+            form.value.region ? form.value.region : '',
+            props.groupingId
+          )
         } else {
           console.log('error submit!!')
           return false
@@ -108,7 +118,7 @@ export default defineComponent({
     function list() {
       api.list({}).then((requset) => {
         if (requset.status === 'SUCCESS') {
-          listData.value=requset.data
+          listData.value = requset.data
         } else {
           ElMessage.error(requset.msg)
         }
@@ -119,8 +129,6 @@ export default defineComponent({
       list()
     })
 
-
-
     return {
       closeDialog2,
       dialogVisible,
@@ -131,10 +139,10 @@ export default defineComponent({
       form,
       open,
       submitForm,
-       rules: {
+      rules: {
         siteName: [
           // required  是否为必填项， trigger:表单验证的触发时机，失去焦点进行验证
-          { required: true, message: "请输入站点名称", trigger: "blur" },
+          { required: true, message: '请输入站点名称', trigger: 'blur' },
           // {
           //   min: 3,
           //   max: 6,
@@ -145,10 +153,8 @@ export default defineComponent({
       },
     }
   },
-
 })
 </script>
  
 <style scoped lang="scss">
-
 </style>

src/views/siteManage/basicInfo/index.vue

@@ -238,9 +238,9 @@ export default defineComponent({
   props: {
     siteId: Number,
     siteName: String,
-    groupingId:Number
+    groupingId: Number,
   },
-  setup(props,context) {
+  setup(props, context) {
     const fileImages = ref(window.PLATFROM_CONFIG.images)
     const store = useStore()
     const routeDropData = ref([])
@@ -346,13 +346,8 @@ export default defineComponent({
 
     //站点详情请求
     function getSite() {
-      console.log('props.siteId')
-      console.log(props.siteId)
-      console.log('props.siteName')
-      console.log(props.siteName)
       fileListImages.value = []
 
-
       api.getSite({ id: props.siteId }).then((requset) => {
         if (requset.status === 'SUCCESS') {
           console.log(requset.data[0])
@@ -386,15 +381,13 @@ export default defineComponent({
               url: fileImages.value + requset.data[0].sitePictureThree,
             })
           }
-          if(props.siteName){
-            alert(1)
-             ruleForm.value.siteName = props.siteName
-
+          if (store.state.basicInfoSiteName) {
+            alert('props.siteName')
+            ruleForm.value.siteName = store.state.basicInfoSiteName
           }
-         
+
           console.log('fileListImages.value')
           console.log(fileListImages.value)
-
         } else {
           ElMessage.error(requset.msg)
         }
@@ -425,7 +418,7 @@ export default defineComponent({
           // const time = store.state.Time_Data
           // ruleForm.value.operationTime = time[0]
           // ruleForm.value.serviceDeadline = time[1]
-    
+
           var params = {
             site: {
               id: props.siteId,
@@ -442,7 +435,7 @@ export default defineComponent({
               sparePhone: ruleForm.value.sparePhone,
               rheologicalChange: ruleForm.value.rheologicalChange,
               routeId: ruleForm.value.routeId,
-              groupingId: props.siteId, 
+              groupingId: props.groupingId,
             },
             siteDynamicProperties: {
               id: ruleForm.value.siteDynamicPropertiesId,
@@ -465,12 +458,8 @@ export default defineComponent({
             id: formStatus.value == '修改' ? 1 : 0,
           }
 
-          if(formStatus.value == '新增'){
-            alert('新增')
-            alert(props.groupingId.value)
-            params.groupingId=props.groupingId.value
-            return
-
+          if (formStatus.value == '新增') {
+            params.site.groupingId = props.groupingId;
           }
 
           api.siteAdd(params).then((requset) => {
@@ -479,8 +468,9 @@ export default defineComponent({
                 message: '保存成功',
                 type: 'success',
               })
-
-               context.emit('func')
+              store.state.basicInfoSiteName = ''
+              formStatus.value = '修改'
+              context.emit('func')
             } else {
               ElMessage.error(requset.msg)
             }
@@ -503,27 +493,24 @@ export default defineComponent({
     )
 
     onMounted(() => {
-      // alert(props.groupingId.value)
+      // alert(props.groupingId)
 
-      if(props.siteName&&(!props.siteId)){
+      if (props.siteName && !props.siteId) {
         alert('新增站点不带模板')
-        ruleForm.value.siteName = props.siteName
         formStatus.value = '新增'
       }
-       if(props.siteName&&props.siteId){
-       alert('新增站点带模板')
+      if (props.siteName && props.siteId) {
+        alert('新增站点带模板')
         formStatus.value = '新增'
-       
+
         getSite()
-        
       }
-      if(props.siteId&&(!props.siteName)){
+      if (store.state.basicInfoSiteName === '') {
         alert('修改站点')
         formStatus.value = '修改'
-        getSite()
-        
+        getSite() 
       }
-     
+
       platformList()
       routeDroplist()
       dynamicPropertiesDroplist(2)
@@ -655,7 +642,7 @@ export default defineComponent({
       resetForm,
       handleUpAvatar,
       fileImages,
-      getSite
+      getSite,
     }
   },
 })

src/views/siteManage/index.vue

@@ -150,7 +150,7 @@
         :dialogTitle="dialogTitle"
         :itemInfo="tableItem"
         :groupingId="groupingId"
-        @closeDialog2="closeDialog2"
+        @closeDialog2="closeDialog"
         :flag="showDialog2"
         @changeFather="getFromSon"
       ></add-site-com>
@@ -257,7 +257,8 @@ export default defineComponent({
       activeName.value = 'third'
     }
     const getMsgFormSon2 = () => {
-      siteTreeList()
+      siteTreeList();
+
     }
     function mouseenter(data) {
       data.show = true
@@ -309,8 +310,9 @@ export default defineComponent({
       { lazy: true }
     )
 
-    // 关闭操作
+    // 新建分组关闭操作
     const closeDialog = () => {
+      alert('默认关闭')
       showDialog.value = false
       showDialog2.value = false
       siteTreeList()
@@ -319,15 +321,16 @@ export default defineComponent({
     }
 
     const closeDialog2 = () => {
-          // 关闭操作
-      showDialog.value = false
+      //添加站点保存后关闭弹框的操作
+      // showDialog.value = false
       showDialog2.value = false
       flag2.value = true
       treeLevel.value = 3
     }
 
-    //添加站点保存后关闭弹框的操作
+    
     const getFromSon = (param, param2,param3) => {
+       alert('保存后关闭')
       siteId.value = param2
       siteName.value = param
       groupingId.value=param3