From 8866718edafe8f312feb1e7e4c3f9be531c0f7b2 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 26 十二月 2024 11:23:15 +0800
Subject: [PATCH] ll
---
/dev/null | 0
pda/pages/index/index.vue | 7 +++
screen/public/favicon.ico | 0
screen/src/assets/images/FireFighting/xiaofang_ic_zhengchang@2x.png | 0
screen/vite.config.js | 4 +-
pda/manifest.json | 3 +
screen/src/views/SecurityControl.vue | 4 +-
screen/src/views/FireFighting.vue | 52 +++++++++++++-------------
8 files changed, 38 insertions(+), 32 deletions(-)
diff --git a/pda/manifest.json b/pda/manifest.json
index 5231003..adeb8c7 100644
--- a/pda/manifest.json
+++ b/pda/manifest.json
@@ -18,7 +18,8 @@
"proxy" : {
"/gateway_interface" : {
// 杩欎釜瀛楁鍚嶉渶涓庝綘閰嶇疆鐨刡asePrefixUrl涓�鑷达紝绯荤粺璇嗗埆鍒板甫鏈�/dev-api璇锋眰鐨勫湴鍧�鏃讹紝浼氬湪鍓嶉潰鎷兼帴涓婁唬鐞嗘湇鍔″櫒鍦板潃
- "target" : "http://10.50.250.253:8088/gateway_interface", // 浠ｇ悊鏈嶅姟鍣ㄥ煙鍚嶆垨IP鍦板潃
+ // "target" : "http://10.50.250.253:8088/gateway_interface", // 浠ｇ悊鏈嶅姟鍣ㄥ煙鍚嶆垨IP鍦板潃
+ "target" : "https://atwl.ahzyssl.com/zhyq_interface", // 浠ｇ悊鏈嶅姟鍣ㄥ煙鍚嶆垨IP鍦板潃
// "target" : "http://192.168.0.108:10010", // 浠ｇ悊鏈嶅姟鍣ㄥ煙鍚嶆垨IP鍦板潃
"changeOrigin" : true, // 鍏佽璺ㄥ煙
diff --git a/pda/pages/index/index.vue b/pda/pages/index/index.vue
index 5e58644..ce712bb 100644
--- a/pda/pages/index/index.vue
+++ b/pda/pages/index/index.vue
@@ -46,7 +46,12 @@
}
},
onLoad() {
-
+ const token = uni.getStorageSync('token')
+ if(!token){
+ uni.redirectTo({
+ url: '/pages/index/login'
+ })
+ }
},
methods: {
loginout() {
diff --git a/screen/public/favicon.ico b/screen/public/favicon.ico
index c6ff5db..ec96d02 100644
--- a/screen/public/favicon.ico
+++ b/screen/public/favicon.ico
Binary files differ
diff --git a/screen/src/assets/images/FireFighting/xiaofang_ic_lixian@2x.png b/screen/src/assets/images/FireFighting/xiaofang_ic_lixian@2x.png
deleted file mode 100644
index bb71625..0000000
--- a/screen/src/assets/images/FireFighting/xiaofang_ic_lixian@2x.png
+++ /dev/null
Binary files differ
diff --git a/screen/src/assets/images/FireFighting/xiaofang_ic_zhengchang@2x.png b/screen/src/assets/images/FireFighting/xiaofang_ic_zhengchang@2x.png
new file mode 100644
index 0000000..70dfad1
--- /dev/null
+++ b/screen/src/assets/images/FireFighting/xiaofang_ic_zhengchang@2x.png
Binary files differ
diff --git a/screen/src/views/FireFighting.vue b/screen/src/views/FireFighting.vue
index f0ca910..ef06b7f 100644
--- a/screen/src/views/FireFighting.vue
+++ b/screen/src/views/FireFighting.vue
@@ -101,6 +101,13 @@
</div>
</div>
<div class="item">
+ <img src="@/assets/images/FireFighting/xiaofang_ic_pingbi@2x.png" alt="">
+ <div class="content">
+ <div class="name">灞忚斀</div>
+ <div class="num num5">{{ dataList4.shieldDeviceNum || 0 }}</div>
+ </div>
+ </div>
+ <div class="item">
<img src="@/assets/images/FireFighting/xiaofang_ic_guzhang@2x.png" alt="">
<div class="content">
<div class="name">鏁呴殰</div>
@@ -108,17 +115,10 @@
</div>
</div>
<div class="item">
- <img src="@/assets/images/FireFighting/xiaofang_ic_lixian@2x.png" alt="">
+ <img src="@/assets/images/FireFighting/xiaofang_ic_zhengchang@2x.png" alt="">
<div class="content">
<div class="name">姝ｅ父</div>
<div class="num num4">{{ dataList4.offlineDeviceNum }}</div>
- </div>
- </div>
- <div class="item">
- <img src="@/assets/images/FireFighting/xiaofang_ic_pingbi@2x.png" alt="">
- <div class="content">
- <div class="name">灞忚斀</div>
- <div class="num num5">{{ dataList4.shieldDeviceNum || 0 }}</div>
</div>
</div>
</div>
@@ -559,7 +559,7 @@
{
name: '鏈�涓婂眰绔嬩綋鍦�',
type: 'pictorialBar',
- symbolSize: [260, 40],
+ symbolSize: [170, 40],
symbolOffset: [0, -20],
z: 12,
itemStyle: {
@@ -577,7 +577,7 @@
{
name: '涓棿绔嬩綋鍦�',
type: 'pictorialBar',
- symbolSize: [260, 40],
+ symbolSize: [170, 40],
symbolOffset: [0, -20],
z: 12,
itemStyle: {
@@ -610,7 +610,7 @@
{
name: '鏈�搴曢儴绔嬩綋鍦�',
type: 'pictorialBar',
- symbolSize: [260, 40],
+ symbolSize: [170, 40],
symbolOffset: [0, 20],
z: 12,
itemStyle: {
@@ -659,9 +659,9 @@
label: {
distance: 15,
show: true,
- position: data > 58 ? 'inside' : 'top',
+ position: data > 52 ? 'inside' : 'top',
formatter: '{c}' + '%',
- fontSize: 80,
+ fontSize: 72,
color: '#1AFCFF',
textShadowColor: '#03C7F9',
textShadowBlur: 30,
@@ -1225,16 +1225,16 @@
.num3 {
background-image: -webkit-linear-gradient(top,
- #fff 0%,
- #e9bf43 50%,
- #eb8131 100%);
+ #eb8131 0%,
+ #d0a72c 50%,
+ #e9bf43 100%);
}
.num4 {
background-image: -webkit-linear-gradient(top,
#fff 0%,
- #9e9e9e 50%,
- #9e9e9e 100%);
+ #78db91 50%,
+ #6de8b0 100%);
}
.num5 {
@@ -1436,11 +1436,11 @@
/* border: 6px solid red; */
.liquidle_te {
font-weight: 500;
- font-size: 16px;
+ font-size: 18px;
position: absolute;
- top: 102px;
+ top: 99px;
left: 0;
- width: 214px;
+ width: 192px;
display: flex;
flex-direction: column;
align-items: center;
@@ -1448,7 +1448,7 @@
.placeT {
font-size: 12px;
color: #869CC9;
- margin-top: 4px;
+ margin-top: 6px;
}
}
@@ -1462,14 +1462,14 @@
} */
.liquidlevel {
- width: 300px;
+ width: 206px;
height: 400px;
- transform: scale(0.24);
+ transform: scale(0.27);
color: #fff;
text-align: center;
position: relative;
- left: -42px;
- top: -140px;
+ left: -8px;
+ top: -143px;
}
}
}
diff --git a/screen/src/views/SecurityControl.vue b/screen/src/views/SecurityControl.vue
index f8f77ea..775eaa9 100644
--- a/screen/src/views/SecurityControl.vue
+++ b/screen/src/views/SecurityControl.vue
@@ -612,7 +612,7 @@
})
}
-const colors = ['#FEAF01', '#01ABFE', '#51F9E4']
+const colors = [ '#01ABFE','#FEAF01', '#51F9E4']
const initEchart2 = () => {
const myChart = echarts.init(document.getElementById('echart2'))
const option = {
@@ -965,7 +965,7 @@
initialSlide: 0,
direction: 'vertical', //绔栫洿鏂瑰悜
slidesPerView: 3,
- autoplay: autoplayFlag(dataList2.value.filter(i => i.total > 0), 3, 4000),
+ autoplay: autoplayFlag(dataList2.value.filter(i => i.totalNum > 0), 3, 4000),
observer: true, //淇敼swiper鑷繁鎴栧瓙鍏冪礌鏃讹紝鑷姩鍒濆鍖杝wiper
})
}
diff --git a/screen/vite.config.js b/screen/vite.config.js
index 744c787..ff40646 100644
--- a/screen/vite.config.js
+++ b/screen/vite.config.js
@@ -25,9 +25,9 @@
server: {
proxy: {
"/gateway_interface": {
- target: "http://192.168.0.104:10010",
+ // target: "http://192.168.0.104:10010",
// target: "http://10.50.250.253:8088/gateway_interface",
- // target: "http://192.168.0.173/gateway_interface",
+ target: "https://atwl.ahzyssl.com/zhyq_interface",
changeOrigin: true,
rewrite: (path) => path.replace(/^\/gateway_interface/, ""),
},
--
Gitblit v1.9.3