修改及提交ok

src/views/siteManage/addGroupCom.vue

@@ -46,7 +46,6 @@ export default defineComponent({
 
     const form = ref([])
 
-    
     // open(): Dialog弹窗打开之前做的事
     const open = () => {
       form.value = props.itemInfo.value

src/views/siteManage/addSiteCom.vue

@@ -47,7 +47,8 @@ export default defineComponent({
     flag: Boolean,
     dialogTitle: String,
     itemInfo: Object,
-    treeLevel:Number
+    treeLevel:Number,
+    groupingId:Number
   },
   setup(props, context) {
     context
@@ -94,7 +95,7 @@ export default defineComponent({
     console.log(form.value.siteName)
       formInfo.value.validate((valid) => {
         if (valid) {
-           context.emit('changeFather', form.value.siteName,form.value.region?form.value.region:'')
+           context.emit('changeFather', form.value.siteName,form.value.region?form.value.region:'',props.groupingId.value)
 
         } else {
           console.log('error submit!!')

src/views/siteManage/basicInfo/index.vue

@@ -238,8 +238,9 @@ export default defineComponent({
   props: {
     siteId: Number,
     siteName: String,
+    groupingId:Number
   },
-  setup(props) {
+  setup(props,context) {
     const fileImages = ref(window.PLATFROM_CONFIG.images)
     const store = useStore()
     const routeDropData = ref([])
@@ -295,7 +296,6 @@ export default defineComponent({
         }
       }
       dataSet.fileList.remove(res.name)
-
       console.log(dataSet.fileList)
     }
 
@@ -351,18 +351,12 @@ export default defineComponent({
       console.log('props.siteName')
       console.log(props.siteName)
       fileListImages.value = []
-      if (props.siteName) {
-        ruleForm.value.siteName = props.siteName
-      }
+
 
       api.getSite({ id: props.siteId }).then((requset) => {
         if (requset.status === 'SUCCESS') {
           console.log(requset.data[0])
           ruleForm.value = requset.data[0]
-
-          if (props.siteName) {
-            ruleForm.value.siteName = props.siteName
-          }
           ruleForm.value.region
             ? (ruleForm.value.region = requset.data[0].region.toString())
             : ''
@@ -392,14 +386,15 @@ export default defineComponent({
               url: fileImages.value + requset.data[0].sitePictureThree,
             })
           }
+          if(props.siteName){
+            alert(1)
+             ruleForm.value.siteName = props.siteName
+
+          }
+         
           console.log('fileListImages.value')
           console.log(fileListImages.value)
 
-          if (requset.data[0]) {
-            formStatus.value = '修改'
-          } else {
-            formStatus.value = '新增'
-          }
         } else {
           ElMessage.error(requset.msg)
         }
@@ -430,6 +425,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,
@@ -446,7 +442,7 @@ export default defineComponent({
               sparePhone: ruleForm.value.sparePhone,
               rheologicalChange: ruleForm.value.rheologicalChange,
               routeId: ruleForm.value.routeId,
-              groupingId: props.siteId, //字段值待写活
+              groupingId: props.siteId, 
             },
             siteDynamicProperties: {
               id: ruleForm.value.siteDynamicPropertiesId,
@@ -469,12 +465,22 @@ export default defineComponent({
             id: formStatus.value == '修改' ? 1 : 0,
           }
 
+          if(formStatus.value == '新增'){
+            alert('新增')
+            alert(props.groupingId.value)
+            params.groupingId=props.groupingId.value
+            return
+
+          }
+
           api.siteAdd(params).then((requset) => {
             if (requset.status === 'SUCCESS') {
               ElMessage.success({
                 message: '保存成功',
                 type: 'success',
               })
+
+               context.emit('func')
             } else {
               ElMessage.error(requset.msg)
             }
@@ -493,14 +499,32 @@ export default defineComponent({
         console.log('newVal')
         console.log(newVal)
         getSite()
-        // ruleForm.value.siteId = newVal
-        // powerQualityList()
       }
     )
 
     onMounted(() => {
+      // alert(props.groupingId.value)
+
+      if(props.siteName&&(!props.siteId)){
+        alert('新增站点不带模板')
+        ruleForm.value.siteName = props.siteName
+        formStatus.value = '新增'
+      }
+       if(props.siteName&&props.siteId){
+       alert('新增站点带模板')
+        formStatus.value = '新增'
+       
+        getSite()
+        
+      }
+      if(props.siteId&&(!props.siteName)){
+        alert('修改站点')
+        formStatus.value = '修改'
+        getSite()
+        
+      }
+     
       platformList()
-      getSite()
       routeDroplist()
       dynamicPropertiesDroplist(2)
       dynamicPropertiesDroplist(1)
@@ -631,6 +655,7 @@ export default defineComponent({
       resetForm,
       handleUpAvatar,
       fileImages,
+      getSite
     }
   },
 })

src/views/siteManage/index.vue

@@ -100,7 +100,9 @@
           <basic-info
             class="basicInfo"
             :siteId="siteId"
+            :groupingId="groupingId"
             :siteName="siteName"
+             @func="getMsgFormSon2"
           ></basic-info>
         </el-tab-pane>
         <el-tab-pane label="监控设备" name="second">
@@ -147,6 +149,7 @@
       <add-site-com
         :dialogTitle="dialogTitle"
         :itemInfo="tableItem"
+        :groupingId="groupingId"
         @closeDialog2="closeDialog2"
         :flag="showDialog2"
         @changeFather="getFromSon"
@@ -272,6 +275,8 @@ export default defineComponent({
       label.value = obj.data.label
       console.log('obj.data')
       console.log(obj)
+      console.log(groupingId.value)
+
 
       if (treeLevel.value == 3) {
         siteId.value = obj.data.id
@@ -322,9 +327,10 @@ export default defineComponent({
     }
 
     //添加站点保存后关闭弹框的操作
-    const getFromSon = (param, param2) => {
+    const getFromSon = (param, param2,param3) => {
       siteId.value = param2
       siteName.value = param
+      groupingId.value=param3
       closeDialog2()
     }
 
@@ -381,7 +387,7 @@ export default defineComponent({
       })
     }
     onMounted(() => {
-      // console.log(groupingId.value)
+     
       siteTreeList()
     })
 

src/views/systemManage/userManage/index.vue

@@ -11,7 +11,7 @@
         </div>
         <div style="margin-top: 20px">
           <div class="filter-item">
-            用户名：
+            账号：
             <el-input
               v-model="userName"
               placeholder="请输入内容"