From 85a15646ffe20ed2bbb2042ec500df8c850a69cc Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期五, 25 七月 2025 15:29:41 +0800
Subject: [PATCH] 首次提交
---
pages/tabBar/components/realWarning.vue | 451 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 371 insertions(+), 80 deletions(-)
diff --git a/pages/tabBar/components/realWarning.vue b/pages/tabBar/components/realWarning.vue
index 46e8640..9eb657f 100644
--- a/pages/tabBar/components/realWarning.vue
+++ b/pages/tabBar/components/realWarning.vue
@@ -16,13 +16,18 @@
</view>
<view class="fault-box">
- <image style="width: 100%;border-radius: 20rpx; " src="../../../static/image/ganzaoji-x.png"
+ <image style="width: 100%;border-radius: 20rpx; " src="../../../packageA/static/image/ganzaoji-x.png"
mode="aspectFit">
</image>
<view class="fault-inner">
- <view class="fault-info" v-for="(item,index) in realFaults" :style="getFaultItemStyle(item)">
+ <view class="fault-info" v-for="(item,index) in realFaults" :style="{
+ position: 'absolute',
+ top: item.position.top + 'rpx',
+ left: item.position.left + 'rpx',
+ fontSize: '24rpx'
+ }">
<view :class="['fault-animal', item.type === 1 ? 'fault-marker' : 'warn-marker']"></view>
<view :class="['fault-tag', item.type === 1 ? 'fault-text' : 'warn-text']">{{item.name}}</view>
</view>
@@ -51,7 +56,7 @@
<view style="height: 180rpx;display: flex;align-items: center;">
<view>
<image style="width: 80rpx;height: 80rpx;margin:20rpx;border-radius: 20rpx; "
- src="../../../static/image/pic_gz.jpg"></image>
+ src="../../../packageA/static/image/pic_gz.jpg"></image>
</view>
<view
style="display: flex;flex: 1;flex-direction: column; justify-content: space-between; ;height: 100%;padding: 20rpx;">
@@ -72,7 +77,7 @@
</view>
</view>
-
+ </view>
</view>
@@ -88,41 +93,321 @@
return {
dataList: [],
//瀹炴椂鎶ヨ鏁版嵁鏇存柊鏃堕棿锛堜竴鑸�10s锛�
- refreshTime: '',
- realFaults:[],
- allFaults: [{ id: 1, name: '璁惧鎬ュ仠锛堟�伙級', type: 1, position: {top: 70,left: 230},show: false},
- { id: 2, name: '宸﹀墠鎬ュ仠', type: 1, position: {top: 100,left: 250},show: false},
- { id: 3, name: '鍑烘枡鎬ュ仠', type: 1, position: {top: 130,left: 230},show: false},
- { id: 4, name: '闈㈡澘鎬ュ仠', type: 1, position: {top: 160,left: 250},show: false},
- { id: 5, name: '椋庣鍗囪秴鏃�', type: 1, position: {top: 190,left: 230},show: false},
- { id: 6, name: '椋庣闄嶈秴鏃�', type: 1, position: {top: 220,left: 250},show: false},
- { id: 7, name: '椋庢満杩囨祦', type: 1, position: {top: 250,left: 230},show: false},
- { id: 8, name: '婊氱瓛鍗囪秴鏃�', type: 1, position: {top: 280,left: 250},show: false},
- { id: 9, name: '婊氱瓛闄嶈秴鏃�', type: 1, position: {top: 310,left: 230},show: false},
- { id: 10, name: '婊氱瓛鐢垫満杩囨祦', type: 1, position: {top: 340,left: 250},show: false},
- { id: 11, name: '娓╁害澶辨帶', type: 1, position: {top: 370,left: 230},show: false},
-
- { id: 12, name: '宸﹀墠闂ㄦ姤璀�', type: 2, position: {top: 100,left: 0},show: false},
- { id: 13, name: '宸﹀悗闂ㄦ姤璀�', type: 2, position: {top: 130,left: 20},show: false},
- { id: 14, name: '鍙冲墠闂ㄦ姤璀�', type: 2, position: {top: 160,left: 0},show: false},
- { id: 15, name: '鍙冲悗闂ㄦ姤璀�', type: 2, position: {top: 190,left: 20},show: false},
- { id: 16, name: '婊氱瓛涓嶅湪楂樹綅', type: 2, position: {top: 220,left: 0},show: false},
- { id: 17, name: '椋庣涓嶅湪楂樹綅', type: 2, position: {top: 250,left: 20},show: false},
- { id: 18, name: '椋庣涓嶅湪浣庝綅', type: 2, position: {top: 280,left: 0},show: false},
- { id: 19, name: '鍔犵儹浣嶄紶鎰熷櫒鎶ヨ', type: 2, position: {top: 310,left: 20},show: false},
- { id: 20, name: '宸﹀墠椋庣楂樹綅', type: 2, position: {top: 340,left: 0},show: false},
- { id: 21, name: '宸﹀墠椋庣浣庝綅', type: 2, position: {top: 370,left: 20},show: false},
- { id: 22, name: '宸﹀悗椋庣楂樹綅', type: 2, position: {top: 100,left: 430},show: false},
- { id: 23, name: '宸﹀悗椋庣浣庝綅', type: 2, position: {top: 130,left: 450},show: false},
- { id: 24, name: '鍙冲墠椋庣楂樹綅', type: 2, position: {top: 160,left: 430},show: false},
- { id: 25, name: '鍙冲墠椋庣浣庝綅', type: 2, position: {top: 190,left: 450},show: false},
- { id: 26, name: '鍙冲悗椋庣楂樹綅', type: 2, position: {top: 220,left: 430},show: false},
- { id: 27, name: '鍙冲悗椋庣浣庝綅', type: 2, position: {top: 250,left: 450},show: false},
- { id: 28, name: '宸﹀墠婊氱瓛浣庝綅', type: 2, position: {top: 280,left: 430},show: false},
- { id: 29, name: '宸﹀悗婊氱瓛浣庝綅', type: 2, position: {top: 310,left: 450},show: false},
- { id: 30, name: '鍙冲墠婊氱瓛浣庝綅', type: 2, position: {top: 340,left: 430},show: false},
- { id: 31, name: '鍙冲悗婊氱瓛浣庝綅', type: 2, position: {top: 370,left: 450},show: false},
- ],
+ refreshTime: '',
+ realFaults: [],
+ allFaults: [{
+ id: 1,
+ name: '璁惧鎬ュ仠锛堟�伙級',
+ type: 1,
+ position: {
+ top: 70,
+ left: 230
+ },
+ show: false
+ },
+ {
+ id: 2,
+ name: '宸﹀墠鎬ュ仠',
+ type: 1,
+ position: {
+ top: 100,
+ left: 250
+ },
+ show: false
+ },
+ {
+ id: 3,
+ name: '鍑烘枡鎬ュ仠',
+ type: 1,
+ position: {
+ top: 130,
+ left: 230
+ },
+ show: false
+ },
+ {
+ id: 4,
+ name: '闈㈡澘鎬ュ仠',
+ type: 1,
+ position: {
+ top: 160,
+ left: 250
+ },
+ show: false
+ },
+ {
+ id: 5,
+ name: '椋庣鍗囪秴鏃�',
+ type: 1,
+ position: {
+ top: 190,
+ left: 230
+ },
+ show: false
+ },
+ {
+ id: 6,
+ name: '椋庣闄嶈秴鏃�',
+ type: 1,
+ position: {
+ top: 220,
+ left: 250
+ },
+ show: false
+ },
+ {
+ id: 7,
+ name: '椋庢満杩囨祦',
+ type: 1,
+ position: {
+ top: 250,
+ left: 230
+ },
+ show: false
+ },
+ {
+ id: 8,
+ name: '婊氱瓛鍗囪秴鏃�',
+ type: 1,
+ position: {
+ top: 280,
+ left: 250
+ },
+ show: false
+ },
+ {
+ id: 9,
+ name: '婊氱瓛闄嶈秴鏃�',
+ type: 1,
+ position: {
+ top: 310,
+ left: 230
+ },
+ show: false
+ },
+ {
+ id: 10,
+ name: '婊氱瓛鐢垫満杩囨祦',
+ type: 1,
+ position: {
+ top: 340,
+ left: 250
+ },
+ show: false
+ },
+ {
+ id: 11,
+ name: '娓╁害澶辨帶',
+ type: 1,
+ position: {
+ top: 370,
+ left: 230
+ },
+ show: false
+ },
+
+ {
+ id: 12,
+ name: '宸﹀墠闂ㄦ姤璀�',
+ type: 2,
+ position: {
+ top: 100,
+ left: 0
+ },
+ show: false
+ },
+ {
+ id: 13,
+ name: '宸﹀悗闂ㄦ姤璀�',
+ type: 2,
+ position: {
+ top: 130,
+ left: 20
+ },
+ show: false
+ },
+ {
+ id: 14,
+ name: '鍙冲墠闂ㄦ姤璀�',
+ type: 2,
+ position: {
+ top: 160,
+ left: 0
+ },
+ show: false
+ },
+ {
+ id: 15,
+ name: '鍙冲悗闂ㄦ姤璀�',
+ type: 2,
+ position: {
+ top: 190,
+ left: 20
+ },
+ show: false
+ },
+ {
+ id: 16,
+ name: '婊氱瓛涓嶅湪楂樹綅',
+ type: 2,
+ position: {
+ top: 220,
+ left: 0
+ },
+ show: false
+ },
+ {
+ id: 17,
+ name: '椋庣涓嶅湪楂樹綅',
+ type: 2,
+ position: {
+ top: 250,
+ left: 20
+ },
+ show: false
+ },
+ {
+ id: 18,
+ name: '椋庣涓嶅湪浣庝綅',
+ type: 2,
+ position: {
+ top: 280,
+ left: 0
+ },
+ show: false
+ },
+ {
+ id: 19,
+ name: '鍔犵儹浣嶄紶鎰熷櫒鎶ヨ',
+ type: 2,
+ position: {
+ top: 310,
+ left: 20
+ },
+ show: false
+ },
+ {
+ id: 20,
+ name: '宸﹀墠椋庣楂樹綅',
+ type: 2,
+ position: {
+ top: 340,
+ left: 0
+ },
+ show: false
+ },
+ {
+ id: 21,
+ name: '宸﹀墠椋庣浣庝綅',
+ type: 2,
+ position: {
+ top: 370,
+ left: 20
+ },
+ show: false
+ },
+ {
+ id: 22,
+ name: '宸﹀悗椋庣楂樹綅',
+ type: 2,
+ position: {
+ top: 100,
+ left: 430
+ },
+ show: false
+ },
+ {
+ id: 23,
+ name: '宸﹀悗椋庣浣庝綅',
+ type: 2,
+ position: {
+ top: 130,
+ left: 450
+ },
+ show: false
+ },
+ {
+ id: 24,
+ name: '鍙冲墠椋庣楂樹綅',
+ type: 2,
+ position: {
+ top: 160,
+ left: 430
+ },
+ show: false
+ },
+ {
+ id: 25,
+ name: '鍙冲墠椋庣浣庝綅',
+ type: 2,
+ position: {
+ top: 190,
+ left: 450
+ },
+ show: false
+ },
+ {
+ id: 26,
+ name: '鍙冲悗椋庣楂樹綅',
+ type: 2,
+ position: {
+ top: 220,
+ left: 430
+ },
+ show: false
+ },
+ {
+ id: 27,
+ name: '鍙冲悗椋庣浣庝綅',
+ type: 2,
+ position: {
+ top: 250,
+ left: 450
+ },
+ show: false
+ },
+ {
+ id: 28,
+ name: '宸﹀墠婊氱瓛浣庝綅',
+ type: 2,
+ position: {
+ top: 280,
+ left: 430
+ },
+ show: false
+ },
+ {
+ id: 29,
+ name: '宸﹀悗婊氱瓛浣庝綅',
+ type: 2,
+ position: {
+ top: 310,
+ left: 450
+ },
+ show: false
+ },
+ {
+ id: 30,
+ name: '鍙冲墠婊氱瓛浣庝綅',
+ type: 2,
+ position: {
+ top: 340,
+ left: 430
+ },
+ show: false
+ },
+ {
+ id: 31,
+ name: '鍙冲悗婊氱瓛浣庝綅',
+ type: 2,
+ position: {
+ top: 370,
+ left: 450
+ },
+ show: false
+ },
+ ],
+
}
},
mounted() {
@@ -149,13 +434,13 @@
if (wdata.length === 0) return false;
this.dataList = wdata
this.refreshTime = "鏇存柊鏃堕棿:" + dayjs().format('HH:mm:ss');
-
- const realFaultNames = this.dataList.map(item => item.faultName);
- const realFaults = this.allFaults.filter(item=>
- realFaultNames.some(name =>
- name.startsWith(item.name)
- ))
- this.realFaults = realFaults
+
+ const realFaultNames = this.dataList.map(item => item.faultName);
+ const realFaults = this.allFaults.filter(item =>
+ realFaultNames.some(name =>
+ name.startsWith(item.name)
+ ))
+ this.realFaults = realFaults
//澶勭悊鏁版嵁缁熻
this.$emit('handleData', this.dataList)
break
@@ -193,7 +478,7 @@
},
deviceId() {
return uni.getStorageSync(this.$constant.DEVICE_ID);
- }
+ }
},
}
@@ -336,54 +621,60 @@
right: 0;
bottom: 0;
padding: 20rpx 0;
- background: transparent;
+ background: transparent;
overflow: hidden;
.fault-info {
position: absolute;
display: flex;
align-items: center;
- justify-content: center;
-
+ justify-content: center;
+
}
- .fault-tag {
- display: flex;
- align-items: center;
+ .fault-tag {
+ display: flex;
+ align-items: center;
margin-left: 6rpx;
- height: 28rpx;
+ height: 28rpx;
padding: 0 10rpx;
background: gray;
- border-radius: 5rpx;
+ border-radius: 5rpx;
font-size: 22rpx;
font-weight: bold;
- color: red;
- white-space: nowrap; /* 涓嶆崲琛� */
- overflow: hidden; /* 瓒呭嚭閮ㄥ垎闅愯棌 */
- text-overflow: ellipsis; /* 瓒呭嚭閮ㄥ垎鐢ㄧ渷鐣ュ彿琛ㄧず */
+ color: red;
+ white-space: nowrap;
+ /* 涓嶆崲琛� */
+ overflow: hidden;
+ /* 瓒呭嚭閮ㄥ垎闅愯棌 */
+ text-overflow: ellipsis;
+ /* 瓒呭嚭閮ㄥ垎鐢ㄧ渷鐣ュ彿琛ㄧず */
}
-
- .fault-marker{
- width: 20rpx;
- height: 20rpx;
- background: red;
- border-radius: 50%;
- }
- .warn-marker{
- width: 24rpx;
- height: 24rpx;
- background: orange;
- border-radius: 50%;
- }
- .fault-text{
- color: red;
- }
- .warn-text{
- color: orange;
- }
-
+
+ .fault-marker {
+ width: 20rpx;
+ height: 20rpx;
+ background: red;
+ border-radius: 50%;
+ }
+
+ .warn-marker {
+ width: 24rpx;
+ height: 24rpx;
+ background: orange;
+ border-radius: 50%;
+ }
+
+ .fault-text {
+ color: red;
+ }
+
+ .warn-text {
+ color: orange;
+ }
+
.fault-animal {
-
+
-webkit-animation: scaleout 2s infinite ease-in-out;
animation: scaleout 2s infinite ease-in-out;
}
--
Gitblit v1.9.3