Merge branch 'master' of http://git.umayle.com:2023/chengdandan/InternetCompetition

src/components/AddPolicy.vue

@@ -154,7 +154,14 @@
               </el-form-item>
               <el-form-item label="目的对象:" prop="clgl_mddx">
                 <el-col :span="19">
-                  <el-input v-model="ruleForm1.clgl_mddx"> </el-input>
+                  <el-select v-model="ruleForm1.clgl_mddx">
+                    <el-option
+                      v-for="item in arr"
+                      :key="item"
+                      :label="item"
+                      :value="item"
+                    ></el-option>
+                  </el-select>
                 </el-col>
               </el-form-item>
               <el-row>
@@ -679,15 +686,11 @@ export default {
       arr: [],
     };
   },
-  created() {
+  mounted() {
     alert(this.$route.query.id, this.$store.state.type);
     console.log(this.user_id, this.$store.state.type);
     this.GetUserAnswer();
-    this.dxgl.forEach((item) => {
-      this.arr.push(item.dx_name);
-    });
   },
-  mounted() {},
 
   methods: {
     //ip地址验证
@@ -819,8 +822,8 @@ export default {
       };
       console.log(obj);
       let { data } = await SaveUserAnswer({
-        mark: `${this.$store.state.type}`,
-        user_id: `${this.$route.query.id}`,
+        mark: this.$store.state.type,
+        user_id: this.$route.query.id,
         // mark: "GYWZ_wx",
         // user_id: "USER202307301109254198",
         mark_value: JSON.stringify(obj),
@@ -839,8 +842,8 @@ export default {
     //获取缓存数据
     async GetUserAnswer() {
       let { data } = await GetUserAnswer({
-        mark: `${this.$store.state.type}`,
-        user_id: `${this.$route.query.id}`,
+        mark: this.$store.state.type,
+        user_id: this.$route.query.id,
         // mark: "GYWZ_wx",
         // user_id: "USER202307301109254198",
       });
@@ -872,6 +875,10 @@ export default {
         this.cmdlist_ms = res.cmdlist_ms;
         this.cmdlist_dz = res.cmdlist_dz;
       }
+      // console.log(this.dxgl);
+      this.dxgl.forEach((item) => {
+        this.arr.push(item.dx_name);
+      });
     },
     //新增命令-保存
     saveMl() {
@@ -916,8 +923,8 @@ export default {
         dxgl: this.dxgl,
       };
       let { data } = await SaveUserAnswer({
-        mark: `${this.$store.state.type}`,
-        user_id: `${this.$route.query.id}`,
+        mark: this.$store.state.type,
+        user_id: this.$route.query.id,
         // mark: "GYWZ_wx",
         // user_id: "USER202307301109254198",
         mark_value: JSON.stringify(obj),

src/components/IpConfiguration.vue

@@ -315,7 +315,7 @@ export default {
       let res = await SaveUserAnswer({
         mark: "CKFWQ_yx",
         user_id: this.user_id,
-        // user_id: "USER202307301109254198",
+        // user_id: "USER202311140204340206",
         mark_value: JSON.stringify(this.ruleForm),
       });
       console.log(this.ruleForm);
@@ -333,7 +333,7 @@ export default {
       let answers = await GetUserAnswer({
         mark: "CKFWQ_yx",
         user_id: this.user_id,
-        // user_id: "USER202307301109254198",
+        // user_id: "USER202311140204340206",
       });
       if (answers.data.data && answers.data.state) {
         let obj = JSON.parse(answers.data.data.mark_value);

src/components/NetworkManagement.vue

@@ -226,8 +226,9 @@ export default {
       ],
     };
   },
-  created() {
+  mounted() {
     this.dialogVisible = true;
+    // alert(window.location.href);
     let str = window.location.href.split("?")[1];
     this.user_id = str.split("|")[0];
     let type = str.split("|")[1];
@@ -324,8 +325,8 @@ export default {
         // mark: "GYWZ_wx",
         // user_id: "USER202307301109254198",
       });
-      console.log(data.data.mark_value);
-      if (data.state) {
+      // console.log(data.data.mark_value);
+      if (data.state && data.data && data.data.mark_value) {
         let res = JSON.parse(data.data.mark_value);
         console.log(res);
         this.tableData[0].wlgl_nw_name = res.wlgl_nw_name;

src/components/ObjectManagement.vue

@@ -161,7 +161,7 @@ export default {
       cmdlist_dz: "",
     };
   },
-  created() {
+  mounted() {
     this.dialogVisible = true;
     let str = window.location.href.split("?")[1];
     this.user_id = str.split("|")[0];

src/components/PolicyManagement.vue

@@ -269,7 +269,7 @@ export default {
       flag: false,
     };
   },
-  created() {
+  mounted() {
     let str = window.location.href.split("?")[1];
     this.user_id = str.split("|")[0];
     let type = str.split("|")[1];

src/components/PortConfiguration.vue

@@ -196,7 +196,7 @@ export default {
       },
     };
   },
-  created() {
+  mounted() {
     this.user_id = window.location.href.split("?")[1];
     this.GetUserAnswer();
   },
@@ -205,7 +205,7 @@ export default {
       let { data } = await GetUserAnswer({
         mark: "CKFWQ_yx",
         user_id: this.user_id,
-        // user_id: "USER202307301109254198",
+        // user_id: "USER202311140204340206",
       });
       if (data.data) {
         let obj = JSON.parse(data.data.mark_value);
@@ -232,7 +232,7 @@ export default {
       this.ruleForm.dkpz_snckxtb = Number(this.ruleForm.dkpz_snckxtb);
       let { data } = await SaveUserAnswer({
         mark: "CKFWQ_yx",
-        // user_id: "USER202307301109254198",
+        // user_id: "USER202311140204340206",
         user_id: this.user_id,
         mark_value: JSON.stringify(this.ruleForm),
       });

src/components/Wireles.vue

@@ -20,7 +20,7 @@
         <el-form-item label="网络名称:" prop="wxpz_wlmc">
           <el-col :span="10">
             <el-select v-model="ruleForm.wxpz_wlmc" placeholder="无线网名称">
-              <el-option label="无线区无限网" value="shanghai"></el-option>
+              <el-option label="无线区无线网" value="无线区无线网"></el-option>
             </el-select>
           </el-col>
         </el-form-item>