From ca9524d2482068d73ba920d2d153a8c2f41889a9 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Tue, 11 Jun 2024 16:17:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8D=A1=E5=8F=B7=E4=BF=A1?=
 =?UTF-8?q?=E5=8F=B7=EF=BC=8C=E5=9B=BA=E4=BB=B6=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/homePage/components/tableMain.vue | 68 ++++++++++++++++-----
 vue.config.js                               |  4 +-
 2 files changed, 54 insertions(+), 18 deletions(-)

diff --git a/src/views/homePage/components/tableMain.vue b/src/views/homePage/components/tableMain.vue
index 42f277d..9cad5bf 100644
--- a/src/views/homePage/components/tableMain.vue
+++ b/src/views/homePage/components/tableMain.vue
@@ -346,29 +346,47 @@
       <u-table-column label="网络信号" v-if="wlcheck" key="wl">
         <u-table-column label="卡1" min-width="60" prop="signature1">
           <template slot-scope="scope">
-            <el-tooltip
-              class="item"
-              effect="dark"
-              :content="
+            <span
+              v-if="
                 scope.row.mntnStatus.reportMap !== null &&
-                scope.row.mntnStatus.reportMap.hasOwnProperty('signature1')
-                  ? scope.row.mntnStatus.reportMap.signature1
-                  : ''
+                scope.row.mntnStatus.reportMap.hasOwnProperty('XyDev')
               "
-              placement="top"
             >
-              <span>{{
-                scope.row.mntnStatus.reportMap !== null &&
-                scope.row.mntnStatus.reportMap.hasOwnProperty("signature1")
-                  ? scope.row.mntnStatus.reportMap.signature1.split("/")[0]
-                  : ""
-              }}</span>
-            </el-tooltip>
+              {{ scope.row.mntnStatus.reportMap.signalLevel1 }}
+            </span>
+            <span v-else>
+              <el-tooltip
+                class="item"
+                effect="dark"
+                :content="
+                  scope.row.mntnStatus.reportMap !== null &&
+                  scope.row.mntnStatus.reportMap.hasOwnProperty('signature1')
+                    ? scope.row.mntnStatus.reportMap.signature1
+                    : ''
+                "
+                placement="top"
+              >
+                <span>{{
+                  scope.row.mntnStatus.reportMap !== null &&
+                  scope.row.mntnStatus.reportMap.hasOwnProperty("signature1")
+                    ? scope.row.mntnStatus.reportMap.signature1.split("/")[0]
+                    : ""
+                }}</span>
+              </el-tooltip>
+            </span>
           </template>
         </u-table-column>
         <u-table-column label="卡2" min-width="60" prop="signature2">
           <template slot-scope="scope">
-            <span>
+            <span
+              v-if="
+                scope.row.mntnStatus.reportMap !== null &&
+                scope.row.mntnStatus.reportMap.hasOwnProperty('XyDev')
+              "
+            >
+              {{ scope.row.mntnStatus.reportMap.signalLevel2 }}
+            </span>
+            <span v-else>
               <el-tooltip
                 class="item"
                 effect="dark"
@@ -551,6 +569,16 @@
           }}</span>
         </template>
       </u-table-column>
+      <u-table-column label="固件版本" v-if="fwcheck" min-width="210" key="fw">
+        <template slot-scope="scope">
+          <span>{{
+            scope.row.mntnStatus.reportMap !== null &&
+            scope.row.mntnStatus.reportMap.hasOwnProperty("XyDev")
+              ? scope.row.mntnStatus.reportMap.firmware
+              : ""
+          }}</span>
+        </template>
+      </u-table-column>
       <u-table-column
         label="装置IP"
         v-if="lastIpcheck"
@@ -647,6 +675,9 @@
           <el-checkbox v-model="MCUcheck" @change="saveLocalStorage"
             >MCU版本</el-checkbox
           >
+          <el-checkbox v-model="fwcheck" @change="saveLocalStorage"
+            >固件版本</el-checkbox
+          >
           <el-checkbox v-model="lastIpcheck" @change="saveLocalStorage"
             >装置IP</el-checkbox
           >
@@ -1073,6 +1104,7 @@ export default {
       Cameracheck: false,
       AIcheck: false,
       MCUcheck: false,
+      fwcheck: false,
       freecheck: false,
       notecheck: false,
       lastIpcheck: false,
@@ -2012,6 +2044,7 @@ export default {
       localStorage.setItem("Cameracheck", this.Cameracheck);
       localStorage.setItem("AIcheck", this.AIcheck);
       localStorage.setItem("MCUcheck", this.MCUcheck);
+      localStorage.setItem("fwcheck", this.fwcheck);
       localStorage.setItem("freecheck", this.freecheck);
       localStorage.setItem("notecheck", this.notecheck);
       localStorage.setItem("lastIpcheck", this.lastIpcheck);
@@ -2072,6 +2105,9 @@ export default {
       this.MCUcheck = localStorage.getItem("MCUcheck")
         ? JSON.parse(localStorage.getItem("MCUcheck"))
         : false;
+      this.fwcheck = localStorage.getItem("fwcheck")
+        ? JSON.parse(localStorage.getItem("fwcheck"))
+        : false;
       this.freecheck = localStorage.getItem("freecheck")
         ? JSON.parse(localStorage.getItem("freecheck"))
         : false;
diff --git a/vue.config.js b/vue.config.js
index 98433bb..dee3a84 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -20,8 +20,8 @@ module.exports = defineConfig({
     proxy: {
       "/api": {
         //表示拦截以/api开头的请求路径
-       // target: "http://61.169.135.146:40101/", //
-        target: "http://61.169.135.146:40080/", //dell
+        //target: "http://61.169.135.146:40101/", //
+        target: "http://61.169.135.146:40085/", //dell
         changOrigin: true, //是否开启跨域
         pathRewrite: {
           "^/api": "/api", //重写api，把api变成空字符，因为我们真正请求的路径是没有api的