From 1d2974aca78cf1c1053c8d99549fdae52cd57764 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=B2=E4=B9=88=E4=BA=86?= <zhongchunyang@rocan.com.cn>
Date: Wed, 6 Sep 2023 11:05:21 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=88=97=E8=A1=A8=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                       |  2 +-
 pages/device/list.vue               |  4 ++--
 pages/index/comp/indexGongCheng.vue | 21 +++++++--------------
 pages/index/comp/indexYouKe.vue     | 19 ++++++-------------
 pages/index/comp/indexYunWei.vue    | 19 ++++++-------------
 pages/index/comp/indexZhuanZhi.vue  | 19 ++++++-------------
 6 files changed, 28 insertions(+), 56 deletions(-)

diff --git a/manifest.json b/manifest.json
index a0ff241..b3576aa 100644
--- a/manifest.json
+++ b/manifest.json
@@ -131,7 +131,7 @@
             "proxy" : {
                 "/api" : {
                     "https" : true,
-                    "target" : "http://192.168.1.13:10215",
+                    "target" : "http://192.168.1.115:10215",
                     "changOrigin" : true,
                     "pathRewrite" : {
                         "/api" : ""
diff --git a/pages/device/list.vue b/pages/device/list.vue
index 7673bc0..1c5f88f 100644
--- a/pages/device/list.vue
+++ b/pages/device/list.vue
@@ -62,13 +62,13 @@
                             <uni-icons
                                 type="top"
                                 size="14"
-                                :color="select.projectName ? '#376cf3' : '#666'"
+                                :color="select.runStatusName ? '#376cf3' : '#666'"
                                 v-if="select.runStatusSelect"
                             ></uni-icons>
                             <uni-icons
                                 type="bottom"
                                 size="14"
-                                :color="select.projectName ? '#376cf3' : '#666'"
+                                :color="select.runStatusName ? '#376cf3' : '#666'"
                                 v-else
                             ></uni-icons>
                         </view>
diff --git a/pages/index/comp/indexGongCheng.vue b/pages/index/comp/indexGongCheng.vue
index 4089563..80c640b 100644
--- a/pages/index/comp/indexGongCheng.vue
+++ b/pages/index/comp/indexGongCheng.vue
@@ -3,7 +3,7 @@
         <template v-if="devCount.engineeringListLength > 1">
             <view class="canneng-index-title mb20">所有工程设备统计</view>
             <view class="header">
-                <view class="header-item">
+                <view class="header-item" @click="jump('allEngineering')">
                     <view class="header-item-value">{{ devCount.onLineDevCount + devCount.offLineDevCount || 0 }}</view>
                     <view class="header-item-label">设备总数</view>
                 </view>
@@ -20,7 +20,7 @@
         </template>
         <view class="canneng-index-title mb20">当前工程设备统计</view>
         <view class="header">
-            <view class="header-item">
+            <view class="header-item" @click="jump('nowEngineering')">
                 <view class="header-item-value">{{
                         devCount.currentOnLineDevCount + devCount.currentOffLineDevCount || 0
                     }}
@@ -41,7 +41,7 @@
             <Cn-grid title="">
                 <Cn-grid-item src="/static/device2.png" text="设备注册" @click="registerDevice"></Cn-grid-item>
                 <!-- <Cn-grid-item src="/static/gateway2.png" text="网关注册" @click="registerGateway"></Cn-grid-item> -->
-<!--                <Cn-grid-item src="/static/feedback2.png" text="问题反馈" @click="submitFeedBack"></Cn-grid-item>-->
+                <!--                <Cn-grid-item src="/static/feedback2.png" text="问题反馈" @click="submitFeedBack"></Cn-grid-item>-->
             </Cn-grid>
         </view>
     </view>
@@ -97,17 +97,10 @@ export default {
             })
         },
         jump(type) {
-            switch (type) {
-                default:
-                    uni.navigateTo({
-                        url:
-                            '/pages/device/list?type=' +
-                            type +
-                            '&projectList=' +
-                            encodeURIComponent(JSON.stringify(this.devCount[type])),
-                    })
-                    break
-            }
+            uni.navigateTo({
+                url:
+                    '/pages/device/list?type=' + type
+            })
         },
     },
 }
diff --git a/pages/index/comp/indexYouKe.vue b/pages/index/comp/indexYouKe.vue
index 8962bd5..28dad57 100644
--- a/pages/index/comp/indexYouKe.vue
+++ b/pages/index/comp/indexYouKe.vue
@@ -3,7 +3,7 @@
         <template v-if="devCount.engineeringListLength > 1">
             <view class="canneng-index-title mb20">所有工程设备统计</view>
             <view class="header">
-                <view class="header-item">
+                <view class="header-item"  @click="jump('allEngineering')">
                     <view class="header-item-value">{{ devCount.onLineDevCount + devCount.offLineDevCount || 0 }}</view>
                     <view class="header-item-label">设备总数</view>
                 </view>
@@ -20,7 +20,7 @@
         </template>
         <view class="canneng-index-title mb20">当前工程设备统计</view>
         <view class="header">
-            <view class="header-item">
+            <view class="header-item"  @click="jump('nowEngineering')">
                 <view class="header-item-value">{{
                     devCount.currentOnLineDevCount + devCount.currentOffLineDevCount || 0
                 }}</view>
@@ -54,17 +54,10 @@ export default {
     },
     methods: {
         jump(type) {
-            switch (type) {
-                default:
-                    uni.navigateTo({
-                        url:
-                            '/pages/device/list?type=' +
-                            type +
-                            '&projectList=' +
-                            encodeURIComponent(JSON.stringify(this.devCount[type])),
-                    })
-                    break
-            }
+            uni.navigateTo({
+                url:
+                    '/pages/device/list?type=' + type
+            })
         },
         submitFeedBack() {
             uni.navigateTo({url: '/pages/home/feedback'})
diff --git a/pages/index/comp/indexYunWei.vue b/pages/index/comp/indexYunWei.vue
index 6a3de0f..6ede661 100644
--- a/pages/index/comp/indexYunWei.vue
+++ b/pages/index/comp/indexYunWei.vue
@@ -3,7 +3,7 @@
         <template v-if="devCount.engineeringListLength > 1">
             <view class="canneng-index-title mb20">所有工程设备统计</view>
             <view class="header">
-                <view class="header-item">
+                <view class="header-item"  @click="jump('allEngineering')">
                     <view class="header-item-value">{{ devCount.onLineDevCount + devCount.offLineDevCount || 0 }}</view>
                     <view class="header-item-label">设备总数</view>
                 </view>
@@ -32,7 +32,7 @@
         </template>
         <view class="canneng-index-title mb20">当前工程设备统计</view>
         <view class="header">
-            <view class="header-item">
+            <view class="header-item"  @click="jump('nowEngineering')">
                 <view class="header-item-value">{{
                     devCount.currentOnLineDevCount + devCount.currentOffLineDevCount || 0
                 }}</view>
@@ -86,17 +86,10 @@ export default {
             })
         },
         jump(type) {
-            switch (type) {
-                default:
-                    uni.navigateTo({
-                        url:
-                            '/pages/device/list?type=' +
-                            type +
-                            '&projectList=' +
-                            encodeURIComponent(JSON.stringify(this.devCount[type])),
-                    })
-                    break
-            }
+            uni.navigateTo({
+                url:
+                    '/pages/device/list?type=' + type
+            })
         },
     },
     created() {},
diff --git a/pages/index/comp/indexZhuanZhi.vue b/pages/index/comp/indexZhuanZhi.vue
index 68aaf71..52c7028 100644
--- a/pages/index/comp/indexZhuanZhi.vue
+++ b/pages/index/comp/indexZhuanZhi.vue
@@ -3,7 +3,7 @@
         <template v-if="devCount.engineeringListLength > 1">
             <view class="canneng-index-title mb20">所有工程设备统计</view>
             <view class="header">
-                <view class="header-item">
+                <view class="header-item"  @click="jump('allEngineering')">
                     <view class="header-item-value">{{ devCount.onLineDevCount + devCount.offLineDevCount || 0 }}</view>
                     <view class="header-item-label">设备总数</view>
                 </view>
@@ -32,7 +32,7 @@
         </template>
         <view class="canneng-index-title mb20">当前工程设备统计</view>
         <view class="header">
-            <view class="header-item">
+            <view class="header-item"  @click="jump('nowEngineering')">
                 <view class="header-item-value">{{
                         devCount.currentOnLineDevCount + devCount.currentOffLineDevCount || 0
                     }}
@@ -95,17 +95,10 @@ export default {
             }
         },
         jump(type) {
-            switch (type) {
-                default:
-                    uni.navigateTo({
-                        url:
-                            '/pages/device/list?type=' +
-                            type +
-                            '&projectList=' +
-                            encodeURIComponent(JSON.stringify(this.devCount[type])),
-                    })
-                    break
-            }
+            uni.navigateTo({
+                url:
+                    '/pages/device/list?type=' + type
+            })
         },
     },
     created() {