From dac0d6880da10f1d9538048eaf4e8becfc504f97 Mon Sep 17 00:00:00 2001
From: lll <you@example.com>
Date: Wed, 8 Nov 2023 08:37:22 +0800
Subject: [PATCH] 11

---
 src/components/AddPolicy.vue         |  10 +-
 src/components/ChiGateway.vue        | 377 +++++++++++++++------------
 src/components/IpConfiguration.vue   |  11 +-
 src/components/PortConfiguration.vue |   1 -
 src/components/netConfiguration.vue  |   1 -
 5 files changed, 224 insertions(+), 176 deletions(-)

diff --git a/src/components/AddPolicy.vue b/src/components/AddPolicy.vue
index efd4208..bf475b9 100644
--- a/src/components/AddPolicy.vue
+++ b/src/components/AddPolicy.vue
@@ -1,7 +1,12 @@
 <template>
   <div>
     <div>
-      <el-dialog title="添加策略" :visible.sync="dialogVisible1" width="82%">
+      <el-dialog
+        title="添加策略"
+        :visible.sync="dialogVisible1"
+        width="82%"
+        :center="true"
+      >
         <el-form
           :model="ruleForm1"
           :rules="rules1"
@@ -1042,6 +1047,9 @@ export default {
   width: 43px;
   height: 30px;
 }
+/deep/.el-dialog__header {
+  text-align: left; /* 标题左对齐 */
+}
 
 /deep/ .demo-ruleForm1 {
   .el-col-1 {
diff --git a/src/components/ChiGateway.vue b/src/components/ChiGateway.vue
index 02e1d2d..da89d70 100644
--- a/src/components/ChiGateway.vue
+++ b/src/components/ChiGateway.vue
@@ -1,190 +1,235 @@
 <!-- 斥候数据采集——有线网关配置 -->
 <template>
-    <div>
-        <!-- <el-button type="info" plain @click="getShow">斥候数据采集网关配置</el-button> -->
-        <div class="gateway" v-show="isShow">
-            <div class="title">
-                <p class="title_l">新建网关</p>
-                <i class="el-icon-close title_r" @click="isShow = false"></i>
-            </div>
-            <el-divider></el-divider>
-            <div class="content">
-                <el-form :model="formData" :label-position="labelPosition" :rules="rules" ref="ruleForm">
-                    <el-row>
-                        <el-col :span="24">
-                            <el-form-item label="网关名称:" :label-width="formLabelWidth" prop="wgpz_wgmc">
-                                <el-select v-model="formData.wgpz_wgmc" placeholder="请选择" style="width: 200px;">
-                                    <el-option v-for="item in options1" :key="item.value" :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                    <el-row>
-                        <el-col :span="24">
-                            <el-form-item label="网关ID:" :label-width="formLabelWidth" prop="wgpz_wgid">
-                                <el-select v-model="formData.wgpz_wgid" placeholder="请选择" style="width: 200px;">
-                                    <el-option v-for="item in options2" :key="item.value" :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                    <div class="footer">
-                        <el-button type="primary" @click="innerVisible = true">保 存</el-button>
-
-                        <el-button @click="isShow = false">取 消</el-button>
-                    </div>
-                </el-form>
-            </div>
-        </div>
-        <div>
-            <el-dialog title="系统提示" :visible.sync="innerVisible" append-to-body width="382px">
-                <p class="inner_content">请确认选择的网关类型与网关实体一致:否则该工程无法下载至实体网关</p>
-                <div slot="footer" class="dialog-footer">
-                    <el-button type="primary" @click="saveGate">确定</el-button>
-                    <el-button @click="innerVisible = false">取 消</el-button>
-                </div>
-            </el-dialog>
-        </div>
+  <div>
+    <div class="gateway" v-show="isShow">
+      <div class="title">
+        <p class="title_l" style="color: #fff">新建网关</p>
+        <i class="el-icon-close title_r" @click="isShow = false"></i>
+      </div>
+      <el-divider></el-divider>
+      <div class="content">
+        <el-form
+          :model="formData"
+          :label-position="labelPosition"
+          :rules="rules"
+          ref="ruleForm"
+        >
+          <el-row>
+            <el-col :span="24">
+              <el-form-item
+                label="网关名称:"
+                :label-width="formLabelWidth"
+                prop="wgpz_wgmc"
+              >
+                <el-select
+                  v-model="formData.wgpz_wgmc"
+                  placeholder="请选择"
+                  style="width: 200px"
+                >
+                  <el-option
+                    v-for="item in options1"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item
+                label="网关ID:"
+                :label-width="formLabelWidth"
+                prop="wgpz_wgid"
+              >
+                <el-select
+                  v-model="formData.wgpz_wgid"
+                  placeholder="请选择"
+                  style="width: 200px"
+                >
+                  <el-option
+                    v-for="item in options2"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <div class="footer">
+            <el-button type="primary" @click="innerVisible = true"
+              >保 存</el-button
+            >
+            <el-button @click="isShow = false">取 消</el-button>
+          </div>
+        </el-form>
+      </div>
     </div>
+    <div>
+      <el-dialog
+        title="系统提示"
+        :visible.sync="innerVisible"
+        append-to-body
+        width="382px"
+      >
+        <p class="inner_content">
+          请确认选择的网关类型与网关实体一致:否则该工程无法下载至实体网关
+        </p>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="saveGate">确定</el-button>
+          <el-button @click="innerVisible = false">取 消</el-button>
+        </div>
+      </el-dialog>
+    </div>
+  </div>
 </template>
 
 <script>
-import { SaveUserAnswer } from '@/api/user';
+import { SaveUserAnswer } from "@/api/user";
 export default {
-    name: 'TestChiGate',
+  name: "TestChiGate",
+  data() {
+    return {
+      options1: [
+        {
+          value: "有线区网关2",
+          label: "有线区网关2",
+        },
+        {
+          value: "无线区网关2",
+          label: "无线区网关2",
+        },
+      ],
+      options2: [
+        {
+          value: "LAN-BOX2",
+          label: "LAN-BOX2",
+        },
+        {
+          value: "WLAN-BOX2",
+          label: "WLAN-BOX2",
+        },
+      ],
+      formData: {
+        wgpz_wgmc: "有线区网关2",
+        wgpz_wgid: "LAN-BOX2",
+      },
+      innerVisible: false,
+      labelPosition: "left",
+      formLabelWidth: "96px",
+      count: 0,
+      isShow: true,
+      options: [
+        {
+          value: "选项1",
+          label: "测试1",
+        },
+        {
+          value: "选项2",
+          label: "测试2",
+        },
+        {
+          value: "选项3",
+          label: "测试3",
+        },
+        {
+          value: "选项4",
+          label: "测试4",
+        },
+        {
+          value: "选项5",
+          label: "测试5",
+        },
+      ],
+      rules: {
+        gateway_id: [
+          { required: true, message: "请输入网关ID", trigger: "blur" },
+        ],
+        gateway_name: [
+          { required: true, message: "请输入网关名称", trigger: "blur" },
+        ],
+      },
+    };
+  },
 
-    data() {
-        return {
-            options1: [{
-                value: "有线区网关2",
-                label: "有线区网关2"
-            }, {
-                value: "无线区网关2",
-                label: "无线区网关2"
-            }],
-            options2: [{
-                value: "LAN-BOX2",
-                label: "LAN-BOX2"
-            }, {
-                value: "WLAN-BOX2",
-                label: "WLAN-BOX2"
-            }],
-            formData: {
-                wgpz_wgmc: "有线区网关2",
-                wgpz_wgid: "LAN-BOX2",
-            },
-            innerVisible: false,
-            labelPosition: "left",
-            formLabelWidth: "96px",
-            count: 0,
-            isShow: true,
-            options: [{
-                value: '选项1',
-                label: '测试1'
-            }, {
-                value: '选项2',
-                label: '测试2'
-            }, {
-                value: '选项3',
-                label: '测试3'
-            }, {
-                value: '选项4',
-                label: '测试4'
-            }, {
-                value: '选项5',
-                label: '测试5'
-            }],
-            rules: {
-                gateway_id: [
-                    { required: true, message: '请输入网关ID', trigger: 'blur' },
-                ],
-                gateway_name: [
-                    { required: true, message: '请输入网关名称', trigger: 'blur' },
-                ],
-            },
-        };
-    },
-
-    mounted() {
-
-    },
-
-    methods: {
-        async saveGate() {
-            let datas = sessionStorage.getItem("answer2");
-            this.formData  = {...JSON.parse(datas),...this.formData};
-            let res = SaveUserAnswer({
-                mark: "CHGYWG_yx",
-                user_id: "USER202307301109254198",
-                mark_value: JSON.stringify(this.formData),
-            });
-            console.log(res);
-            sessionStorage.setItem("answer2",JSON.stringify(this.formData));
-            this.$router.push("/configuration");
-        }
+  mounted() {},
+
+  methods: {
+    async saveGate() {
+      let datas = sessionStorage.getItem("answer2");
+      this.formData = { ...JSON.parse(datas), ...this.formData };
+      let res = SaveUserAnswer({
+        mark: "CHGYWG_yx",
+        user_id: "USER202307301109254198",
+        mark_value: JSON.stringify(this.formData),
+      });
+      console.log(res);
+      sessionStorage.setItem("answer2", JSON.stringify(this.formData));
+      this.$router.push("/configuration");
     },
+  },
 };
 </script>
 
 <style lang="less" scoped>
 /deep/ .gateway {
-    position: absolute;
-    left: 694px;
-    top: 188px;
-    width: 382px;
-    height: 309px;
-    line-height: 20px;
-    // background-color: rgba(255, 255, 255, 1);
-    background: url(../assets/image/bg.png);
-    background-size: 100% 100%;
-    text-align: center;
-    border: 1px solid rgba(187, 187, 187, 1);
+  position: absolute;
+  left: 694px;
+  top: 188px;
+  width: 382px;
+  height: 309px;
+  line-height: 20px;
+  // background-color: rgba(255, 255, 255, 1);
+  background: url(../assets/image/bg.png);
+  background-size: 100% 100%;
+  text-align: center;
+  border: 1px solid rgba(187, 187, 187, 1);
 
-    .el-divider--horizontal {
-        margin: 8px 0;
+  .el-divider--horizontal {
+    margin: 8px 0;
+  }
+
+  .title {
+    margin: 13px 11px 0px 21px;
+    display: flex;
+    justify-content: space-between;
+
+    .title_l {
+      width: 72px;
+      height: 26px;
+      color: rgba(16, 16, 16, 1);
+      font-size: 18px;
+      text-align: left;
     }
 
-    .title {
-        margin: 13px 11px 0px 21px;
-        display: flex;
-        justify-content: space-between;
-
-        .title_l {
-            width: 72px;
-            height: 26px;
-            color: rgba(16, 16, 16, 1);
-            font-size: 18px;
-            text-align: left;
-        }
-
-        .title_r {
-            width: 24px;
-            height: 24px;
-            cursor: pointer;
-            color: rgba(111, 103, 103, 1);
-        }
+    .title_r {
+      width: 24px;
+      height: 24px;
+      cursor: pointer;
+      color: rgba(111, 103, 103, 1);
     }
+  }
 
-    .content {
-        margin-left: 50px;
-        margin-right: 50px;
+  .content {
+    margin-left: 50px;
+    margin-right: 50px;
 
-        .el-input__inner {
-            width: 200px;
-            height: 30px;
-        }
+    .el-input__inner {
+      width: 200px;
+      height: 30px;
     }
+  }
 
-    /deep/ .footer {
-        .el-button {
-            width: 80px;
-            height: 30px;
-            line-height: 0.5;
-        }
+  /deep/ .footer {
+    .el-button {
+      width: 80px;
+      height: 30px;
+      line-height: 0.5;
     }
+  }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/IpConfiguration.vue b/src/components/IpConfiguration.vue
index d3358b2..36bcd42 100644
--- a/src/components/IpConfiguration.vue
+++ b/src/components/IpConfiguration.vue
@@ -1,7 +1,6 @@
 <!-- ip设置页面 -->
 <template>
   <div>
-    <!-- <el-button @click="dialogVisible = true">ip配置</el-button> -->
     <el-dialog title="IP配置" :visible.sync="dialogVisible" width="30%">
       <p class="txt">本页面涉及排错，请检查修改默认值</p>
       <div class="ip_setting">
@@ -154,9 +153,7 @@
         </el-form>
       </div>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="saveAll"
-          >保存</el-button
-        >
+        <el-button type="primary" @click="saveAll">保存</el-button>
         <el-button @click="dialogVisible = false">取 消</el-button>
       </span>
     </el-dialog>
@@ -250,8 +247,8 @@ export default {
     };
   },
   methods: {
-        // 封装合并输入框的数据
-        Merge(value, value1, value2, value3, value4) {
+    // 封装合并输入框的数据
+    Merge(value, value1, value2, value3, value4) {
       value = value1 + "." + value2 + "." + value3 + "." + value4;
       return value;
     },
@@ -299,7 +296,7 @@ export default {
         this.ippz_dns_by4
       );
       let datas = sessionStorage.getItem("CKFWQ");
-      datas = {...JSON.parse(datas),...this.ruleForm}
+      datas = { ...JSON.parse(datas), ...this.ruleForm };
       let res = await SaveUserAnswer({
         mark: "CKFWQ",
         user_id: "USER202307301109254198",
diff --git a/src/components/PortConfiguration.vue b/src/components/PortConfiguration.vue
index 478ce93..c68a61c 100644
--- a/src/components/PortConfiguration.vue
+++ b/src/components/PortConfiguration.vue
@@ -200,7 +200,6 @@ export default {
       this.$refs[formName].validate((valid) => {
         if (valid) {
           // alert("submit!");
-
         } else {
           console.log("error submit!!");
           return false;
diff --git a/src/components/netConfiguration.vue b/src/components/netConfiguration.vue
index c5f30c8..5f63def 100644
--- a/src/components/netConfiguration.vue
+++ b/src/components/netConfiguration.vue
@@ -1,6 +1,5 @@
 <template>
   <div>
-    <!-- <el-button @click="dialogVisible = true">串口及网络协议设置</el-button> -->
     <el-dialog
       title="串口及网络协议设置"
       :visible.sync="dialogVisible"