调整app页面图标样式

components/Cn-device-card/Cn-device-card.vue

@@ -5,6 +5,7 @@
         :extra="device.isPrimaryUser == 1 ? '主设备' : '分享设备'"
         padding="0"
         @click="jump(device)"
+        class="boxClick"
         :thumbnail="deviceIcon(device.runStatus)"
     >
         <template v-slot:title>
@@ -12,12 +13,9 @@
             <view class="uni-card__header" @click="jump(device)">
                 <view class="uni-card__header-box">
                     <view class="uni-card__header-avatar">
-                        <view
-                            class="event-icon"
-                            :style="{ backgroundColor: getColor(device.runStatus, device.devType) }"
-                        >
+                        <view class="event-icon">
                             <!-- 动态图标：根据类型切换 -->
-                            <uni-icons
+                            <!-- <uni-icons
                                 custom-prefix="iconfont"
                                 :type="
                                     device.devType == 'Direct_Connected_Device'
@@ -26,7 +24,12 @@
                                 "
                                 :color="device.runStatus == 1 ? '#ff3b30' : '#10B981'"
                                 :size="device.devType == 'Direct_Connected_Device' ? '35' : '40'"
-                            ></uni-icons>
+                            ></uni-icons> -->
+                            <Cn-icon-device
+                                :devType="device.devType"
+                                :runStatus="device.runStatus"
+                                :alarmStatus="device.isAlarm ? 1 : 0"
+                            ></Cn-icon-device>
                         </view>
                     </view>
                     <view class="uni-card__header-content">
@@ -114,30 +117,16 @@ export default {
                         '&process=' +
                         this.device.process +
                         '&ndid=' +
-                        this.device.ndid,
+                        this.device.ndid +
+                        '&device=' +
+                        JSON.stringify(this.device),
                 })
             } else {
                 if (this.device.lineList.length == 0) {
                     return this.$util.toast('暂无监测点！')
                 }
                 uni.navigateTo({
-                    url:
-                        '/pages/device/realTime/index?id=' +
-                        this.device.equipmentId +
-                        '&isPrimaryUser=' +
-                        this.device.isPrimaryUser +
-                        '&process=' +
-                        this.device.process +
-                        '&ndid=' +
-                        this.device.ndid +
-                        '&lineList=' +
-                        JSON.stringify(this.device.lineList) +
-                        '&engineeringName=' +
-                        this.device.engineeringName +
-                        '&equipmentName=' +
-                        this.device.equipmentName +
-                        '&runStatus=' +
-                        this.device.runStatus,
+                    url: '/pages/device/realTime/index?device=' + JSON.stringify(this.device),
                 })
             }
         },
@@ -248,8 +237,8 @@ export default {
     color: #007aff;
 }
 .jc-tag {
-    background-color: #36cfc920;
-    color: #36cfc9;
+    background-color: #3498db20;
+    color: #3498db;
 }
 .pinToTop {
     background-color: $uni-theme-color;