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

src/api/user.js

@@ -1,6 +1,6 @@
 import axios from "axios";
 axios.defaults.baseURL = "http://inspur.dev.umayle.com/";
-// 
+//
 export const SaveUserAnswer = (data) => {
   return axios.post(
     `/Handler/Config.ashx?action=updatecache&mark=${data.mark}&user_id=${data.user_id}&mark_value=${data.mark_value}&step=${data.step}`

src/components/AddPolicy.vue

@@ -1047,7 +1047,7 @@ export default {
           type: "success",
         });
       } else {
-        this.$message.error("新增失败");
+        this.$message.error(data.message);
       }
     },
     //删除命令
@@ -1072,7 +1072,7 @@ export default {
           type: "success",
         });
       } else {
-        this.$message.error("删除失败");
+        this.$message.error(data.message);
       }
     },
   },

src/components/GatewayConfiguration.vue

@@ -281,7 +281,7 @@ export default {
         });
         this.flag = true;
       } else {
-        this.$message.error("操作失败");
+        this.$message.error(data.message);
         return;
       }
     },

src/components/GatewayMaintenance.vue

@@ -344,7 +344,7 @@ export default {
           type: "success",
         });
       } else {
-        this.$message.error("操作失败");
+        this.$message.error(data.message);
       }
     },
   },

src/components/IpConfiguration.vue

@@ -167,6 +167,7 @@
 <script>
 import { SaveUserAnswer, GetUserAnswer } from "@/api/user";
 import { isValidPrimaryDNS } from "../validate";
+import { Alert } from "element-ui";
 export default {
   data() {
     return {
@@ -255,8 +256,9 @@ export default {
     };
   },
   methods: {
-    getParameter(data) {
+    getParameter1(data) {
-      console.log(data);
+      alert(data, "信息");
+      console.log(data, "信息");
       this.user_id = data;
     },
     // 封装合并输入框的数据
@@ -323,10 +325,11 @@ export default {
           type: "success",
         });
       } else {
-        this.$message.error("保存失败");
+        this.$message.error(res.data.message);
       }
     },
     async GetUserAnswer() {
+      this.loading = true;
       let answers = await GetUserAnswer({
         mark: "CKFWQ_yx",
         user_id: this.user_id,
@@ -361,6 +364,7 @@ export default {
           this.ippz_dns_by4 = obj.ippz_dns_by.split(".")[3];
         }
       }
+      this.loading = false;
     },
     submitForm() {
       this.$refs["ruleForm"].validate((valid) => {
@@ -522,11 +526,13 @@ export default {
     },
   },
   created() {
-    let that = this;
+    this.user_id = window.location.href.split("?")[1];
-    window.getParameter = that.getParameter;
+    alert(this.user_id, "信息111111111111111111111");
-    this.Loading = true;
+    console.log(this.user_id, "信息1111111111111111111");
     this.GetUserAnswer();
-    this.Loading = false;
+  },
+  destroyed() {
+    window.getParameter = null;
   },
 };
 </script>

src/components/NetworkConfiguration.vue

@@ -116,7 +116,7 @@ export default {
         this.dialogVisible = false;
         console.log({ ...datas, ...this.ruleForm }, "存储");
       } else {
-        this.$message.error("保存失败");
+        this.$message.error(res.data.message);
       }
     },
     // 拿缓存

src/components/NetworkManagement.vue

@@ -270,7 +270,7 @@ export default {
         });
         this.dialogVisible = false;
       } else {
-        this.$message.error("保存失败");
+        this.$message.error(data.message);
       }
     },
     //拿缓存

src/components/ObjectManagement.vue

@@ -204,7 +204,7 @@ export default {
         this.dialogVisible1 = false;
         this.GetUserAnswer();
       } else {
-        this.$message.error("保存失败");
+        this.$message.error(data.message);
       }
     },
     async GetUserAnswer() {

src/components/PolicyManagement.vue

@@ -332,7 +332,7 @@ export default {
           JSON.stringify({ ...obj, ...newSessObj })
         );
         this.$message({
-          message: "删除成功",
+          message: data.message,
           type: "success",
         });
       }

src/components/PortConfiguration.vue

@@ -237,7 +237,7 @@ export default {
           type: "success",
         });
       } else {
-        this.$message.error("保存失败");
+        this.$message.error(data.message);
       }
     },
     submitForm(formName) {

src/components/Wireles.vue

@@ -117,7 +117,7 @@ export default {
         });
         this.dialogVisible = false;
       } else {
-        this.$message.error("保存失败");
+        this.$message.error(res.data.message);
       }
     },
     async GetUserAnswer() {

src/components/netConfiguration.vue

@@ -178,8 +178,9 @@ export default {
     };
   },
   methods: {
-    getParameter(data) {
+    getParameter2(data) {
-      console.log(data);
+      alert(data, "信息11");
+      console.log(data, "信息111111");
       this.user_id = data;
     },
     //保存
@@ -201,7 +202,7 @@ export default {
           type: "success",
         });
       } else {
-        this.$message.error("保存失败");
+        this.$message.error(res.data.message);
       }
     },
     //拿到缓存数据
@@ -230,9 +231,7 @@ export default {
       this.loading = false;
     },
     //交互方法
-    getParameter(data) {
+
-      console.log(data);
-    },
     submitForm(formName) {
       this.$refs["ruleForm"].validate((valid) => {
         if (valid) {
@@ -245,8 +244,9 @@ export default {
     },
   },
   created() {
-    let that = this;
+    this.user_id = window.location.href.split("?")[1];
-    window.getParameter = that.getParameter;
+    alert(this.user_id, "信息111111111111111111111");
+    console.log(this.user_id, "信息1111111111111111111");
     this.GetUserAnswer();
   },
 };

src/main.js

@@ -17,6 +17,7 @@ Vue.filter("datefmt", function (input, fmtstring) {
 Vue.prototype.$moment = moment;
 Vue.prototype.$store = store;
 Vue.prototype.$answerObj = answerObj;
+
 Vue.use(ElementUI);
 new Vue({
   router,