From 5345a6e9841e4ab2dc6e54b8c55615c788f2c6c7 Mon Sep 17 00:00:00 2001
From: lll <you@example.com>
Date: Sat, 11 Nov 2023 11:34:20 +0800
Subject: [PATCH] 11

---
 .../components/AddPolicy_20231107190454.vue   |  7 +-
 src/components/DataAcquisition.vue            | 69 +++++++++++++++----
 src/components/DataView.vue                   |  2 +-
 src/components/ObjectManagement.vue           |  5 +-
 src/components/PolicyManagement.vue           |  5 +-
 5 files changed, 66 insertions(+), 22 deletions(-)

diff --git a/.history/src/components/AddPolicy_20231107190454.vue b/.history/src/components/AddPolicy_20231107190454.vue
index c0c0f85..a405898 100644
--- a/.history/src/components/AddPolicy_20231107190454.vue
+++ b/.history/src/components/AddPolicy_20231107190454.vue
@@ -714,15 +714,10 @@ export default {
       json: {},
     };
   },
-<<<<<<< HEAD
-
-  mounted() { },
-=======
   created() {
     this.GetUserAnswer();
   },
   mounted() {},
->>>>>>> 672924494cb6b7ae4219dd1930897a14261627bc
 
   methods: {
     //保存
@@ -785,7 +780,7 @@ export default {
       //拿缓存数据
       var json = JSON.parse(sessionStorage.getItem(this.$store.state.type));
       let { data } = await SaveUserAnswer({
-        mark:this.$store.state.type,
+        mark: "GYWZ_yx",
         user_id: "USER202307301109254198",
         mark_value: JSON.stringify({ ...json, ...obj }),
       });
diff --git a/src/components/DataAcquisition.vue b/src/components/DataAcquisition.vue
index e68d3fd..957a54d 100644
--- a/src/components/DataAcquisition.vue
+++ b/src/components/DataAcquisition.vue
@@ -1,28 +1,71 @@
 <template>
   <div>
     <div>
-      <el-dialog title="新建网关" :visible.sync="outerVisible" width="382px" v-loading="loading">
-        <el-form :model="formData" :rules="rules" ref="formData" label-width="85px" class="demo-ruleForm">
+      <el-dialog
+        title="新建网关"
+        :visible.sync="outerVisible"
+        width="382px"
+        v-loading="loading"
+      >
+        <el-form
+          :model="formData"
+          :rules="rules"
+          ref="formData"
+          label-width="85px"
+          class="demo-ruleForm"
+        >
           <el-form-item label="网关名称:" 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-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-form-item label="网关ID:" 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-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-form-item label="网关类型:" prop="wgpz_wglx">
-            <el-select v-model="formData.wgpz_wglx" placeholder="请选择" style="width: 200px">
-              <el-option v-for="item in options3" :key="item.value" :label="item.label" :value="item.value">
+            <el-select
+              v-model="formData.wgpz_wglx"
+              placeholder="请选择"
+              style="width: 200px"
+            >
+              <el-option
+                v-for="item in options3"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
               </el-option>
             </el-select>
           </el-form-item>
         </el-form>
-        <el-dialog width="382px" title="系统提示" :visible.sync="innerVisible" append-to-body>
+        <el-dialog
+          width="382px"
+          title="系统提示"
+          :visible.sync="innerVisible"
+          append-to-body
+        >
           <p class="inner_content" style="color: #fff !important">
             请确认选择的网关类型与网关实体一致:否则该工程无法下载至实体网关
           </p>
@@ -32,7 +75,9 @@
           </div>
         </el-dialog>
         <div slot="footer" class="dialog-footer-outer">
-          <el-button type="primary" @click="saveInfo('formData')">保存</el-button>
+          <el-button type="primary" @click="saveInfo('formData')"
+            >保存</el-button
+          >
           <el-button @click="outerVisible = false">取 消</el-button>
         </div>
       </el-dialog>
@@ -159,8 +204,6 @@ export default {
       }
       console.log(res);
       // console.log(JSON.parse(res.data.data.mark_value));
-
-
     },
     async getUserAnswer() {
       this.loading = true;
@@ -190,7 +233,7 @@ export default {
       type: "1",
     }).then((res) => {
       console.log(res);
-    })
+    });
     this.getUserAnswer();
   },
 };
diff --git a/src/components/DataView.vue b/src/components/DataView.vue
index e8cc894..d34197e 100644
--- a/src/components/DataView.vue
+++ b/src/components/DataView.vue
@@ -19,7 +19,7 @@
               <el-row>
                 <el-col :span="12">
                   <el-form-item label="网口:" :label-width="formLabelWidth" prop="ippz_wangkou">
-                    <el-select v-model="ruleForm.ippz_wangkou" placeholder="ETHO" style="width: 200px; height: 30px">
+                    <el-select v-model="ruleForm.ippz_wangkou"  style="width: 200px; height: 30px">
                       <el-option label="ETH0" value="ETH0"></el-option>
                       <el-option label="ETH1" value="ETH1"></el-option>
                     </el-select>
diff --git a/src/components/ObjectManagement.vue b/src/components/ObjectManagement.vue
index 8e12878..3896767 100644
--- a/src/components/ObjectManagement.vue
+++ b/src/components/ObjectManagement.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog title="对象管理" :visible.sync="dialogVisible" width="50%">
+    <el-dialog title="对象管理" :visible.sync="dialogVisible" width="80%">
       <div class="title">
         <el-button style="margin-bottom: 10px" @click="addObj"
           >新增对象</el-button
@@ -303,4 +303,7 @@ export default {
   width: 43px;
   height: 30px;
 }
+.el-table {
+  height: 400px;
+}
 </style>
diff --git a/src/components/PolicyManagement.vue b/src/components/PolicyManagement.vue
index d21b229..7c52aa2 100644
--- a/src/components/PolicyManagement.vue
+++ b/src/components/PolicyManagement.vue
@@ -3,7 +3,7 @@
     <el-dialog
       title="策略管理"
       :visible.sync="dialogVisible"
-      width="50%"
+      width="80%"
       v-loading="loading"
     >
       <div class="title">
@@ -415,4 +415,7 @@ export default {
     color: red;
   }
 }
+.el-table {
+  height: 500px;
+}
 </style>