From 7f8d952032790c2c0bc9c0807930aec8312c9568 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Fri, 5 Jul 2024 16:27:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A6=86=E5=86=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/iceWeather/components/leftTree.vue |  4 ++--
 src/views/photographicDevice/index.vue       | 15 +++++++++++----
 vue.config.js                                |  4 ++--
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/views/iceWeather/components/leftTree.vue b/src/views/iceWeather/components/leftTree.vue
index a8a7cc7..77470bb 100644
--- a/src/views/iceWeather/components/leftTree.vue
+++ b/src/views/iceWeather/components/leftTree.vue
@@ -41,8 +41,8 @@
       <span class="custom-tree-node" slot-scope="{ node, data }">
         <span v-if="node.level === 1">
           <span class="iconfont icon-dianli" style="margin-right: 6px"></span>
-          <!--<span>{{ node.label }} </span>-->
-          <span>捕鱼达人</span>
+          <span>{{ node.label }} </span>
+          <!-- <span>捕鱼达人</span> -->
         </span>
         <span v-else-if="node.level === 2">
           <span class="iconfont icon-dianlihangye" style="margin-right: 6px">
diff --git a/src/views/photographicDevice/index.vue b/src/views/photographicDevice/index.vue
index 1295301..167d2eb 100644
--- a/src/views/photographicDevice/index.vue
+++ b/src/views/photographicDevice/index.vue
@@ -147,11 +147,16 @@
           >
           </el-table-column>
           <el-table-column
-            prop="devName"
+            prop="devType"
             label="设备类型"
             show-overflow-tooltip
             min-width="150"
           >
+            <template slot-scope="scope">
+              <span v-if="scope.row.devType == 1">微拍</span>
+              <span v-if="scope.row.devType == 2">覆冰拉力</span>
+              <span v-if="scope.row.devType == 3">微气象</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="protocolName"
@@ -536,9 +541,11 @@ export default {
       getTerminalJoggle(this.formdata)
         .then((res) => {
           console.log(res);
-          this.terminalTableData = res.data.list;
-          this.total = res.data.total;
-          this.loading = false;
+          if (res.code == 200) {
+            this.loading = false;
+            this.terminalTableData = res.data.list;
+            this.total = res.data.total;
+          }
         })
         .catch((err) => {
           console.log(err); //代码错误、请求失败捕获
diff --git a/vue.config.js b/vue.config.js
index 94473de..759ac7c 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -23,8 +23,8 @@ module.exports = defineConfig({
         //表示拦截以/api开头的请求路径
 
         //target: "http://192.168.1.190:8080", //190 需要去掉/Api
-        //target: "http://61.169.135.146:9911/", //运维
-        target: "http://61.169.135.146:40080/", //dell
+        target: "http://61.169.135.146:9911/", //运维 覆冰
+        //target: "http://61.169.135.146:40080/", //dell
         changOrigin: true, //是否开启跨域
         pathRewrite: {
           "^/api": "/api", //重写api，把api变成空字符，因为我们真正请求的路径是没有api的