From fbc35c9a79d007e447855ecf02225000f16c3f96 Mon Sep 17 00:00:00 2001
From: lll <you@example.com>
Date: Mon, 13 Nov 2023 16:11:48 +0800
Subject: [PATCH] 12

---
 src/App.vue                          | 218 ++-------------------------
 src/api/user.js                      |   5 -
 src/components/ChiGateway.vue        |  42 ++++--
 src/components/PortConfiguration.vue |   2 +-
 src/views/Cockpit.vue                |  22 +--
 5 files changed, 47 insertions(+), 242 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 7912b87..e6cca80 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,12 +1,12 @@
 <template>
   <div id="app">
-    <router-view></router-view>
+    <transition name="fade" mode="out-in">
+      <router-view></router-view>
+    </transition>
   </div>
 </template>
 
 <script>
-// import { Alert } from "element-ui";
-// import { queryallanswer } from "./api/answer";
 export default {
   name: "App",
   data() {
@@ -24,208 +24,8 @@ export default {
       YDPZYM_wgwh: [],
     };
   },
-  created() {
-    // this.queryallanswer();
-  },
-  methods: {
-    // 请求正确答案
-    // async queryallanswer() {
-    //   let { data } = await queryallanswer();
-    //   console.log(JSON.parse(JSON.stringify(data.data)));
-    //   let arr = [];
-    //   arr = data.data;
-    //   arr.forEach((item) => {
-    //     if (item.mark == "DB-IotLite_yx") {
-    //       this.DB_IotLite_yx = JSON.parse(item.answer);
-    //     }
-    //     if (item.mark == "CHGYWG_yx") {
-    //       this.CHGYWG_yx = JSON.parse(item.answer);
-    //     }
-    //     if (item.mark == "CHGYWG_wx") {
-    //       this.CHGYWG_wx = JSON.parse(item.answer);
-    //     }
-    //     if (item.mark == "DB_IotLite_wx") {
-    //       this.DB_IotLite_wx = JSON.parse(item.answer);
-    //     }
-    //     if (item.mark == "CKFWQ_yx") {
-    //       this.CKFWQ_yx = JSON.parse(item.answer);
-    //     }
-    //     if (item.mark == "CKFWQ_wx") {
-    //       this.CKFWQ_wx = JSON.parse(item.answer);
-    //     }
-    //     if (item.mark == "GYWZ_yx") {
-    //       this.GYWZ_yx = JSON.parse(item.answer);
-    //     }
-    //     if (item.mark == "GYWZ_wx") {
-    //       this.GYWZ_wx = JSON.parse(item.answer);
-    //     }
-    //     if (item.mark == "YDPZYM_wgpz") {
-    //       this.YDPZYM_wgpz = JSON.parse(item.answer);
-    //     }
-    //     if (item.mark == "YDPZYM_wgwh") {
-    //       this.YDPZYM_wgwh = JSON.parse(item.answer);
-    //     }
-    //   });
-    // },
-    //   console.log(arr);
-    //   let obj = {
-    //     cjdpz_beilv: "2",
-    //     cjdpz_cjsjlx: "uint16",
-    //     cjdpz_dxsx: "只读131111",
-    //     cjdpz_jcqdz: "8195",
-    //     cjdpz_mc: "产量",
-    //     cjdpz_sjq: "4X (Holding Register)",
-    //     cjdpz_tagid: "MachinePamHID910",
-    //     cjdpz_zjx: "Null",
-    //     ippz_dns_by: "114.114.114.114",
-    //     ippz_dns_sx: "8.8.8.8",
-    //     ippz_ip: "192.168.32.3",
-    //     ippz_mac: "3C:2D:50:20:30:3D",
-    //     ippz_mrwg: "192.168.32.1",
-    //     ippz_wangkou: "ETH1",
-    //     ippz_zwym: "255.255.255.192",
-    //     mqtt_cjd_sbmc: "有线区精雕1",
-    //     mqtt_cjd_tagid: "MachinePamHID910",
-    //     mqtt_ip: "124.70.210.118",
-    //     mqtt_port: "1883",
-    //     mqtt_qiyong: "1",
-    //     mqtt_qos: "qos1",
-    //     mqtt_retained: "0",
-    //     mqtt_scms: "周期上传",
-    //     mqtt_sczq: "5",
-    //     mqtt_sjgl: "采集成功",
-    //     mqtt_sssjfbzt: "dbzn/gateway/iotlite/2000808010",
-    //     mqtt_wgsn: "2000808010",
-    //     sbpz_jdzxz: "1",
-    //     sbpz_jysb: "0",
-    //     sbpz_mac: "3C:2D:50:20:30:3D",
-    //     sbpz_sbid: "有线区加工设备1",
-    //     sbpz_sbmc: "有线区精雕1",
-    //     tdpz_050F: "auto",
-    //     tdpz_0610: "auto",
-    //     tdpz_cfcs: "3",
-    //     tdpz_cjsylxdz: "1",
-    //     tdpz_cssj: "500",
-    //     tdpz_dxzkb: "1:1",
-    //     tdpz_ip: "192.168.32.2",
-    //     tdpz_jgsj: "500",
-    //     tdpz_lxsj: "0",
-    //     tdpz_port: "502",
-    //     tdpz_qdmc: "ModbusTCPClient",
-    //     tdpz_td: "网口",
-    //     tdpz_tdmc: "有线区Channel1",
-    //     tdpz_watchtime: "1",
-    //     wgpz_wgid: "LAN-BOX1",
-    //     wgpz_wglx: "MODBUS网关",
-    //     wgpz_wgmc: "有线区网关1",
-    //   };
-    //   let newArr = [
-    //     {
-    //       cskey: "MachinePamHID917",
-    //       csname: "主轴转速",
-    //       pcz: "100",
-    //       sdz: "2000",
-    //       sfbjbz: "是",
-    //       sfyxbz: "是",
-    //       sswg: "lan-box2",
-    //       xsws: "0",
-    //     },
-    //     {
-    //       cskey: "MachinePamHID910",
-    //       csname: "产量",
-    //       pcz: "5",
-    //       sdz: "20",
-    //       sfbjbz: "是",
-    //       sfyxbz: "是",
-    //       sswg: "lan-box1",
-    //       xsws: "0",
-    //     },
-    //     {
-    //       cskey: "MachinePamHID909",
-    //       csname: "急停状态",
-    //       pcz: "0",
-    //       sdz: "1",
-    //       sfbjbz: "是",
-    //       sfyxbz: "是",
-    //       sswg: "wlan-box1",
-    //       xsws: "0",
-    //     },
-    //     {
-    //       cskey: "MachinePamHID928",
-    //       csname: "切削速度",
-    //       pcz: "50",
-    //       sdz: "500",
-    //       sfbjbz: "是",
-    //       sfyxbz: "是",
-    //       sswg: "wlan-box2",
-    //       xsws: "0",
-    //     },
-    //   ];
-    //   // console.log(this.getAllGrades(arr[0].answer, obj, arr[0].r1));
-    //   console.log(this.getAllGrades(newArr, newArr, arr[9].r1));
-    //   // this.getAllGrades(arr[9].answer, newArr, arr[9].r1);
-    // },
-    // obj1:答案对象   obj：用户对象   r1 模块分数
-    // getAllGrades(obj1, obj2, r1) {
-    //   var arr = [];
-    //   let grade = 0;
-    //   if (!Array.isArray(obj1)) {
-    //     const keys = Object.keys(obj1);
-    //     for (let key of keys) {
-    //       if (obj1[key] !== obj2[key]) {
-    //         arr.push({
-    //           [key]: {
-    //             answer: obj1[key],
-    //             user: obj2[key],
-    //           },
-    //         });
-    //       }
-    //     }
-    //     if (arr.length > 0) {
-    //       grade = 0;
-    //     } else {
-    //       grade = r1;
-    //     }
-    //   } else {
-    //     if (obj1.length !== obj2.length) {
-    //       return false;
-    //     }
-    //     let flagArr = [];
-    //     for (let i = 0; i < obj1.length; i++) {
-    //       for (let j = 0; j < obj2.length; j++) {
-    //         let flag = this.isArrEqual(
-    //           Object.values(obj1[i]),
-    //           Object.values(obj2[j])
-    //         );
-    //         flagArr.push(flag);
-    //       }
-    //     }
-    //     let counter = 0;
-    //     let target = true;
-    //     for (let a of flagArr) {
-    //       if (a == target) {
-    //         counter++;
-    //       }
-    //     }
-    //     if (counter == obj1.length) {
-    //       grade = r1;
-    //       console.log(grade);
-    //     } else {
-    //       grade = 0;
-    //     }
-    //   }
-    //   // 返回此模块分数以及错误的字段;
-    //   return {
-    //     arr,
-    //     grade: Number(grade),
-    //   };
-    // },
-    // isArrEqual(arr1, arr2) {
-    //   return (
-    //     arr1.length === arr2.length && arr1.every((ele) => arr2.includes(ele))
-    //   );
-    // },
-  },
+  created() {},
+  methods: {},
   mounted() {},
   components: {},
 };
@@ -316,4 +116,12 @@ export default {
 .el-dialog {
   margin-top: 8vh !important;
 }
+.fade-enter-active,
+.fade-leave-active {
+  transition: opacity 0.5s;
+}
+.fade-enter,
+.fade-leave-to {
+  opacity: 0;
+}
 </style>
diff --git a/src/api/user.js b/src/api/user.js
index 25f9877..2524106 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -27,8 +27,3 @@ export const getGrade = (data) => {
     `/Handler/Config.ashx?action=displaychart&user_id=${data.user_id}&mark=${data.mark}`
   );
 };
-
-//避免考生中途换电脑的解决方案  在每次拿取考试缓存数据的时候本地存储一份
-// function(mark,data) {
-//   sessionStorage.setItem(`${mark}`,JSON.stringify(data))
-// }
diff --git a/src/components/ChiGateway.vue b/src/components/ChiGateway.vue
index 4a47404..fd34e0d 100644
--- a/src/components/ChiGateway.vue
+++ b/src/components/ChiGateway.vue
@@ -1,11 +1,7 @@
 <!-- 斥候数据采集——有线网关配置 -->
 <template>
   <div>
-<<<<<<< HEAD
-    <div class="gateway" v-loading="loading">
-=======
     <!-- <div class="gateway" v-show="isShow" v-loading="loading">
->>>>>>> 64c869237fcdd813721fc025060f87d2262701e7
       <div class="title">
         <p class="title_l" style="color: #fff">新建网关</p>
         <i class="el-icon-close title_r" @click="isShow = false"></i>
@@ -73,16 +69,40 @@
     </div> -->
     <div class="gateway">
       <el-dialog title="新建网关" :visible.sync="outerVisible" width="382px">
-        <el-form :model="formData" :rules="rules" ref="formData" label-width="85px" class="demo-ruleForm">
+        <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>
@@ -196,7 +216,9 @@ export default {
           type: "success",
         });
         sessionStorage.setItem("CHGYWG_yx", JSON.stringify(this.formData));
-        this.$router.push(`/configuration?user_id=${this.user_id}&firstlabel=${this.formData.wgpz_wgid}`);
+        this.$router.push(
+          `/configuration?user_id=${this.user_id}&firstlabel=${this.formData.wgpz_wgid}`
+        );
       } else {
         this.$message({
           message: `保存失败,原因是${res.data.message}`,
diff --git a/src/components/PortConfiguration.vue b/src/components/PortConfiguration.vue
index 05f4508..ff96be2 100644
--- a/src/components/PortConfiguration.vue
+++ b/src/components/PortConfiguration.vue
@@ -209,6 +209,7 @@ export default {
       });
       if (data.data) {
         let obj = JSON.parse(data.data.mark_value);
+        console.log(obj);
         this.ruleForm.dkpz_btl = obj.dkpz_btl;
         this.ruleForm.dkpz_sjw = obj.dkpz_sjw;
         this.ruleForm.dkpz_jyw = obj.dkpz_jyw;
@@ -228,7 +229,6 @@ export default {
       }
     },
     async savePort() {
-      this.ruleForm.dkpz_snckxtb = String(Number(this.ruleForm.dkpz_snckxtb));
       let { data } = await SaveUserAnswer({
         mark: "CKFWQ_yx",
         // user_id: "USER202307301109254198",
diff --git a/src/views/Cockpit.vue b/src/views/Cockpit.vue
index 788d06b..d77704d 100644
--- a/src/views/Cockpit.vue
+++ b/src/views/Cockpit.vue
@@ -261,7 +261,6 @@ export default {
   width: 100vw;
   height: 100vh;
   background-color: #fff;
-  // background-image: url("../assets/image/图片 2 Copy@1x.png");
   background-size: cover; /* 图像大小适应容器 */
   background-repeat: no-repeat; /* 防止图像平铺 */
   background-color: transparent;
@@ -341,31 +340,12 @@ export default {
       margin-left: 45px;
       position: relative;
     }
-    // .mainshaftChart {
-    //   margin-left: 45px;
-    //   margin-top: 45px;
-    //   position: relative;
-    // }
     .loadChart {
       position: absolute;
       right: 45px;
       top: 180px;
     }
-    // .ratedChart {
-    //   position: absolute;
-    //   right: 45px;
-    //   top: 533px;
-    // }
-    // .one {
-    //   position: absolute;
-    //   right: 560px;
-    //   top: 533px;
-    // }
-    // .two {
-    //   position: absolute;
-    //   left: 560px;
-    //   top: 533px;
-    // }
+
     .chartsDiv {
       display: flex;
       justify-content: space-between;