From 03e3f933f10fb9228eef02c5699b749a501a50e7 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 14 十一月 2024 09:27:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
screen/package-lock.json | 31 +
screen/src/assets/images/SecurityControl/jiankong_ic_close@2x.png | 0
screen/src/assets/images/SecurityControl/ic_search@2x.png | 0
screen/src/assets/images/SecurityControl/ar_open@2x.png | 0
screen/src/views/SecurityControl.vue | 468 ++++++++++++++++-----
screen/src/assets/images/SecurityControl/car_yuangong@2x.png | 0
screen/src/api/index.js | 16
screen/src/assets/images/SecurityControl/ic_jiankon.png | 0
screen/src/assets/images/SecurityControl/ic_jiankong@2x.png | 0
screen/src/assets/images/LogisticsCenter/ic_yuetai@2x.png | 0
screen/src/assets/images/SecurityControl/ic_jiankong_sel@2x.png | 0
screen/src/assets/images/SecurityControl/ar_close@2x.png | 0
screen/package.json | 1
screen/src/views/LogisticsEfficiency.vue | 267 ++++++++++++
screen/src/router/index.js | 26 +
screen/src/views/TaskEfficiency.vue | 408 +++++++++++++++----
screen/src/assets/images/SecurityControl/car_xiangguanfang@2x.png | 0
/dev/null | 0
screen/src/assets/images/SecurityControl/clock.png | 0
screen/src/assets/images/LogisticsCenter/bg_yuetai@2x.png | 0
screen/src/assets/images/SecurityControl/xiaofang_ic_weizhi@2x.png | 0
screen/src/assets/images/ic_dangqian@2x.png | 0
screen/src/assets/images/SecurityControl/car_laifang@2x.png | 0
screen/src/utils/config.js | 13
screen/src/assets/images/SecurityControl/jiankong_bg@2x.png | 0
25 files changed, 1,023 insertions(+), 207 deletions(-)
diff --git a/screen/package-lock.json b/screen/package-lock.json
index 7d77ab2..4553673 100644
--- a/screen/package-lock.json
+++ b/screen/package-lock.json
@@ -14,6 +14,7 @@
"pinia": "^2.1.7",
"postcss-plugin-px2rem": "^0.8.1",
"px2rem-loader": "^0.1.9",
+ "swiper": "^5.4.5",
"uqrcodejs": "^4.0.7",
"v-scale-screen": "^2.0.0",
"vue": "^3.4.21",
@@ -1923,6 +1924,14 @@
"node": ">=0.4.0"
}
},
+ "node_modules/dom7": {
+ "version": "2.1.5",
+ "resolved": "https://registry.npmjs.org/dom7/-/dom7-2.1.5.tgz",
+ "integrity": "sha512-xnhwVgyOh3eD++/XGtH+5qBwYTgCm0aW91GFgPJ3XG+jlsRLyJivnbP0QmUBFhI+Oaz9FV0s7cxgXHezwOEBYA==",
+ "dependencies": {
+ "ssr-window": "^2.0.0"
+ }
+ },
"node_modules/echarts": {
"version": "5.5.1",
"integrity": "sha512-Fce8upazaAXUVUVsjgV6mBnGuqgO+JNDlcgF79Dksy4+wgGpQB2lmYoO4TSweFg/mZITdpGHomw/cNBJZj1icA==",
@@ -3193,6 +3202,11 @@
"node": ">=0.10.0"
}
},
+ "node_modules/ssr-window": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-2.0.0.tgz",
+ "integrity": "sha512-NXzN+/HPObKAx191H3zKlYomE5WrVIkoCB5IaSdvKokxTpjBdWfr0RaP+1Z5KOfDT0ZVz+2tdtiBkhsEQ9p+0A=="
+ },
"node_modules/strip-ansi": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
@@ -3246,6 +3260,23 @@
"integrity": "sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==",
"dev": true
},
+ "node_modules/swiper": {
+ "version": "5.4.5",
+ "resolved": "https://registry.npmjs.org/swiper/-/swiper-5.4.5.tgz",
+ "integrity": "sha512-7QjA0XpdOmiMoClfaZ2lYN6ICHcMm72LXiY+NF4fQLFidigameaofvpjEEiTQuw3xm5eksG5hzkaRsjQX57vtA==",
+ "hasInstallScript": true,
+ "dependencies": {
+ "dom7": "^2.1.5",
+ "ssr-window": "^2.0.0"
+ },
+ "engines": {
+ "node": ">= 4.7.0"
+ },
+ "funding": {
+ "type": "patreon",
+ "url": "https://www.patreon.com/vladimirkharlampidi"
+ }
+ },
"node_modules/to-fast-properties": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
diff --git a/screen/package.json b/screen/package.json
index c1738f2..9745264 100644
--- a/screen/package.json
+++ b/screen/package.json
@@ -18,6 +18,7 @@
"px2rem-loader": "^0.1.9",
"uqrcodejs": "^4.0.7",
"v-scale-screen": "^2.0.0",
+ "swiper": "^5.4.5",
"vue": "^3.4.21",
"vue-router": "^4.3.0"
},
diff --git a/screen/src/api/index.js b/screen/src/api/index.js
index 3dc5bc7..9a19320 100644
--- a/screen/src/api/index.js
+++ b/screen/src/api/index.js
@@ -70,6 +70,10 @@
export const cnworkEfficiency = (data) => {
return request('visitsAdmin/cloudService/board/api/onSitDispatch/workEfficiency', data)
}
+// 鍦哄唴璋冨害鐪嬫澘 瀹炴椂鍛婅
+export const cnwarningList = (data) => {
+ return request('visitsAdmin/cloudService/board/api/onSitDispatch/warningList', data)
+}
// 鐗╂祦杩愯璋冨害鐪嬫澘 涓績鏁版嵁
export const wlcenterData = (data) => {
@@ -113,6 +117,18 @@
export const afgetVisitData = (data) => {
return request('visitsAdmin/cloudService/board/api/security/getVisitData', data)
}
+// 瀹夐槻绠℃帶澶у睆 鍖哄煙闆嗗悎
+export const afregionList = (data) => {
+ return request('visitsAdmin/cloudService/board/api/security/regionList', data)
+}
+// 瀹夐槻绠℃帶澶у睆 鏍戝瀷鍖哄煙闆嗗悎
+export const afregionTreea = (data) => {
+ return request('visitsAdmin/cloudService/board/api/security/regionList', data)
+}
+// 瀹夐槻绠℃帶澶у睆 鍛婅
+export const afwarningEventData = (data) => {
+ return request('visitsAdmin/cloudService/board/api/security/warningEventData', data)
+}
// 鑳借�楃湅鏉� 涓績鏁版嵁
export const zxcenterData = (data) => {
diff --git a/screen/src/assets/images/LogisticsCenter/bg_yuetai@2x.png b/screen/src/assets/images/LogisticsCenter/bg_yuetai@2x.png
new file mode 100644
index 0000000..27d80a0
--- /dev/null
+++ b/screen/src/assets/images/LogisticsCenter/bg_yuetai@2x.png
Binary files differ
diff --git a/screen/src/assets/images/LogisticsCenter/ic_yuetai@2x.png b/screen/src/assets/images/LogisticsCenter/ic_yuetai@2x.png
new file mode 100644
index 0000000..20e355e
--- /dev/null
+++ b/screen/src/assets/images/LogisticsCenter/ic_yuetai@2x.png
Binary files differ
diff --git a/screen/src/assets/images/SecurityControl/ar_close@2x.png b/screen/src/assets/images/SecurityControl/ar_close@2x.png
new file mode 100644
index 0000000..be94457
--- /dev/null
+++ b/screen/src/assets/images/SecurityControl/ar_close@2x.png
Binary files differ
diff --git a/screen/src/assets/images/SecurityControl/ar_open@2x.png b/screen/src/assets/images/SecurityControl/ar_open@2x.png
new file mode 100644
index 0000000..e7aa640
--- /dev/null
+++ b/screen/src/assets/images/SecurityControl/ar_open@2x.png
Binary files differ
diff --git a/screen/src/assets/images/SecurityControl/car_laifang@2x.png b/screen/src/assets/images/SecurityControl/car_laifang@2x.png
new file mode 100644
index 0000000..f3eaa79
--- /dev/null
+++ b/screen/src/assets/images/SecurityControl/car_laifang@2x.png
Binary files differ
diff --git a/screen/src/assets/images/SecurityControl/car_xiangguanfang@2x.png b/screen/src/assets/images/SecurityControl/car_xiangguanfang@2x.png
new file mode 100644
index 0000000..7a224b8
--- /dev/null
+++ b/screen/src/assets/images/SecurityControl/car_xiangguanfang@2x.png
Binary files differ
diff --git a/screen/src/assets/images/SecurityControl/car_yuangong@2x.png b/screen/src/assets/images/SecurityControl/car_yuangong@2x.png
new file mode 100644
index 0000000..0bce031
--- /dev/null
+++ b/screen/src/assets/images/SecurityControl/car_yuangong@2x.png
Binary files differ
diff --git a/screen/src/assets/images/SecurityControl/clock.png b/screen/src/assets/images/SecurityControl/clock.png
new file mode 100644
index 0000000..0775560
--- /dev/null
+++ b/screen/src/assets/images/SecurityControl/clock.png
Binary files differ
diff --git a/screen/src/assets/images/SecurityControl/ic_jiankon.png b/screen/src/assets/images/SecurityControl/ic_jiankon.png
new file mode 100644
index 0000000..6436d02
--- /dev/null
+++ b/screen/src/assets/images/SecurityControl/ic_jiankon.png
Binary files differ
diff --git a/screen/src/assets/images/SecurityControl/ic_jiankong@2x.png b/screen/src/assets/images/SecurityControl/ic_jiankong@2x.png
new file mode 100644
index 0000000..ed4356c
--- /dev/null
+++ b/screen/src/assets/images/SecurityControl/ic_jiankong@2x.png
Binary files differ
diff --git a/screen/src/assets/images/SecurityControl/ic_jiankong_sel@2x.png b/screen/src/assets/images/SecurityControl/ic_jiankong_sel@2x.png
new file mode 100644
index 0000000..e7824d5
--- /dev/null
+++ b/screen/src/assets/images/SecurityControl/ic_jiankong_sel@2x.png
Binary files differ
diff --git a/screen/src/assets/images/SecurityControl/ic_search@2x.png b/screen/src/assets/images/SecurityControl/ic_search@2x.png
new file mode 100644
index 0000000..2fbea92
--- /dev/null
+++ b/screen/src/assets/images/SecurityControl/ic_search@2x.png
Binary files differ
diff --git a/screen/src/assets/images/SecurityControl/jiankong.png b/screen/src/assets/images/SecurityControl/jiankong.png
deleted file mode 100644
index 3f6db28..0000000
--- a/screen/src/assets/images/SecurityControl/jiankong.png
+++ /dev/null
Binary files differ
diff --git a/screen/src/assets/images/SecurityControl/jiankong_bg@2x.png b/screen/src/assets/images/SecurityControl/jiankong_bg@2x.png
new file mode 100644
index 0000000..d8bbb63
--- /dev/null
+++ b/screen/src/assets/images/SecurityControl/jiankong_bg@2x.png
Binary files differ
diff --git a/screen/src/assets/images/SecurityControl/jiankong_ic_close@2x.png b/screen/src/assets/images/SecurityControl/jiankong_ic_close@2x.png
new file mode 100644
index 0000000..81dd3d4
--- /dev/null
+++ b/screen/src/assets/images/SecurityControl/jiankong_ic_close@2x.png
Binary files differ
diff --git a/screen/src/assets/images/SecurityControl/xiaofang_ic_weizhi@2x.png b/screen/src/assets/images/SecurityControl/xiaofang_ic_weizhi@2x.png
new file mode 100644
index 0000000..2a0dfb4
--- /dev/null
+++ b/screen/src/assets/images/SecurityControl/xiaofang_ic_weizhi@2x.png
Binary files differ
diff --git a/screen/src/assets/images/ic_dangqian@2x.png b/screen/src/assets/images/ic_dangqian@2x.png
new file mode 100644
index 0000000..66681fe
--- /dev/null
+++ b/screen/src/assets/images/ic_dangqian@2x.png
Binary files differ
diff --git a/screen/src/router/index.js b/screen/src/router/index.js
index e65a85c..f12ef0f 100644
--- a/screen/src/router/index.js
+++ b/screen/src/router/index.js
@@ -15,34 +15,58 @@
{
path: '/EnergyConsum', // 鑳借�楃湅鏉� - 缁胯壊浣庣⒊杩愯惀
name: 'EnergyConsum',
+ meta: {
+ title: '鑳借�楃湅鏉�'
+ },
component: () => import('../views/EnergyConsum.vue')
},
{
path: '/LogisticsEfficiency', // 鐗╂祦杩愯璋冨害鐪嬫澘- 璋冨害鑳芥晥
name: 'LogisticsEfficiency',
+ meta: {
+ title: '鐗╂祦杩愯璋冨害鐪嬫澘'
+ },
component: () => import('../views/LogisticsEfficiency.vue')
},
{
path: '/SecurityControl', // 瀹夐槻绠℃帶澶у睆 -
name: 'SecurityControl',
+ meta: {
+ title: '瀹夐槻绠℃帶澶у睆'
+ },
component: () => import('../views/SecurityControl.vue')
},
{
path: '/LogisticsCenter', //搴撳埗绠＄悊鐪嬫澘-鐗╂祦涓績
name: 'LogisticsCenter',
+ meta: {
+ title: '搴撳埗绠＄悊鐪嬫澘'
+ },
component: () => import('../views/LogisticsCenter.vue')
},
{
path: '/FireFighting', //娑堥槻鐩戞帶
name: 'FireFighting',
+ meta: {
+ title: '娑堥槻鐩戞帶'
+ },
component: () => import('../views/FireFighting.vue')
},
{
- path: '/TaskEfficiency', //鍐呭満璋冨害鐪嬫澘 -浣滀笟鑳芥晥
+ path: '/TaskEfficiency', //鍦哄唴璋冨害鐪嬫澘 -浣滀笟鑳芥晥
name: 'TaskEfficiency',
+ meta: {
+ title: '鍦哄唴璋冨害鐪嬫澘'
+ },
component: () => import('../views/TaskEfficiency.vue')
},
]
})
+
+router.beforeEach((to, from, next) => {
+ window.document.title = to.meta.title
+ next()
+})
+
export default router
diff --git a/screen/src/utils/config.js b/screen/src/utils/config.js
new file mode 100644
index 0000000..8b49ba5
--- /dev/null
+++ b/screen/src/utils/config.js
@@ -0,0 +1,13 @@
+export const statusMap = {
+ 0: '浠诲姟鍒涘缓',
+ 1: '鍙告満纭浠诲姟',
+ 2: '绛惧埌',
+ 3: '鍏ュ洯绛夊緟',
+ 4: '鏈堝彴鍙彿',
+ 5: '寮�濮嬩綔涓�',
+ 6: '浣滀笟瀹屾垚',
+ 7: '鏈堝彴杞Щ',
+ 8: '浠诲姟鎸傝捣',
+ 9: '涓嬪彂鎺堟潈绂诲洯',
+ 10: '绂诲洯',
+}
\ No newline at end of file
diff --git a/screen/src/views/LogisticsEfficiency.vue b/screen/src/views/LogisticsEfficiency.vue
index 332092e..a04ca3b 100644
--- a/screen/src/views/LogisticsEfficiency.vue
+++ b/screen/src/views/LogisticsEfficiency.vue
@@ -28,7 +28,8 @@
</div>
<div class="content_wrap">
<div class="content">
- <div class="num" v-if="data1.monthOutTotal || data1.yearOutTotal">{{ activeTab1 == 0 ? data1.monthOutTotal.toLocaleString() : data1.yearOutTotal.toLocaleString() }}</div>
+ <div class="num" v-if="data1.monthOutTotal || data1.yearOutTotal">{{ activeTab1 == 0 ?
+ data1.monthOutTotal.toLocaleString() : data1.yearOutTotal.toLocaleString() }}</div>
<div class="unit_wrap" v-if="data1.monthOutTotalOnYear || data1.yearOutTotalOnYear">
<span style="color: #869CC9;">鍚屾瘮</span>
<img
@@ -215,16 +216,74 @@
<div class="repertory">
<div class="use_ratio">
<div class="header">
- <div>搴撳瓨閲� <span class="num">{{data1.stockTotal}}/{{data1.stockMax}}</span></div>
- <div v-if="data1.stockTotal && data1.stockMax">鍒╃敤鐜噞{ ((data1.stockTotal / data1.stockMax) * 100).toFixed(0) }}%</div>
+ <div>搴撳瓨閲� <span class="num">{{ data1.stockTotal }}/{{ data1.stockMax }}</span></div>
+ <div v-if="data1.stockTotal && data1.stockMax">鍒╃敤鐜噞{ ((data1.stockTotal / data1.stockMax) *
+ 100).toFixed(0) }}%</div>
</div>
- <Percent v-if="data1.stockTotal && data1.stockMax" :rate="((data1.stockTotal / data1.stockMax) * 100).toFixed(0)" />
+ <Percent v-if="data1.stockTotal && data1.stockMax"
+ :rate="((data1.stockTotal / data1.stockMax) * 100).toFixed(0)" />
</div>
<div class="list">
<div class="item" v-for="item in dataList6">
<div class="la">{{ item.name }}</div>
- <div class="val">{{item.num}}涓囨敮</div>
+ <div class="val">{{ item.num }}涓囨敮</div>
</div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!-- -->
+ <div class="modal" v-if="showModal">
+ <div class="title_head">
+ <img src="@/assets/images/energy_ef/chuku_ic_car@2x.png" alt="">
+ <span>鐨朼222</span>
+ </div>
+ <div class="info">
+ <div class="item">
+ <div class="dian"></div>
+ <div class="la">杩愯緭鍗曞彿锛�</div>
+ <div class="val">22</div>
+ </div>
+ <div class="item">
+ <div class="dian"></div>
+ <div class="la">鍙告満淇℃伅锛�</div>
+ <div class="val">22</div>
+ </div>
+ <div class="item">
+ <div class="dian"></div>
+ <div class="la">鎬昏繍杈撻噺锛�</div>
+ <div class="val">22 涓囨敮</div>
+ </div>
+ </div>
+ <div class="tabs">
+ <div :class="{ active: modalTab == 0 }" @click="modalTabClick(0)" class="tab">浣滀笟淇℃伅</div>
+ <div :class="{ active: modalTab == 1 }" @click="modalTabClick(1)" class="tab">鍚堝悓鍒楄〃</div>
+ </div>
+ <div class="tab1" v-if="modalTab == 0">
+ <div class="item" v-for="item, i in 3">
+ <div class="icon_wrap">
+ <img v-if="i === 0" class="dian" src="@/assets/images/ic_dangqian@2x.png" alt="">
+ <img v-else src="@/assets/images/ic_jindu@2x.png" class="dian_ac" alt="">
+ <div class="line"></div>
+ </div>
+ <div class="content">
+ <div class="status">浣滀笟涓�</div>
+ <div class="text">浣滀笟浠诲姟鍦ㄣ�愬叆搴撳幓1鍙锋湀鍙般�戝紑濮嬩綔涓�</div>
+ <div class="time">2024-04-02 12:00</div>
+ </div>
+ </div>
+ </div>
+ <div class="tab2" v-if="modalTab == 1">
+ <div class="list">
+ <div class="item">
+ <div class="head">
+ <div class="code">鍚堝悓鍙凤細12312312</div>
+ <div class="addr">鏀惰揣鍦帮細姹熼棬鐑熻崏鐗╂祦涓績</div>
+ </div>
+ <div class="line" v-for="i in 3">
+ <div class="name">鐗╂枡鍚嶇О锛�<span class="val">榛勫北</span></div>
+ <div class="num">鏁伴噺锛�<span class="val">100涓囨敮</span></div>
</div>
</div>
</div>
@@ -262,7 +321,14 @@
}, 1000)
-const arr = ['#68e2e3', '#50afd3', '#377cdb', '#d5ae3a']
+const showModal = ref(false)
+const modalTab = ref(0)
+const modalTabClick = (val) => {
+ modalTab.value = val
+}
+
+
+
const initEnergy = () => {
var myChart = echarts.init(document.querySelector('.energyRef'))
// 缁樺埗鍥捐〃
@@ -714,7 +780,7 @@
getData5()
getData6()
- initMap()
+ initMap()
})
@@ -1155,6 +1221,7 @@
height: 240px;
overflow: auto;
scrollbar-width: none;
+
.item {
width: 100%;
height: 36px;
@@ -1309,6 +1376,192 @@
}
}
+.modal {
+ width: 600px;
+ height: 556px;
+ background: rgba(0, 30, 63, 0.5);
+ backdrop-filter: blur(5px);
+ position: fixed;
+ top: 20%;
+ left: 50%;
+ transform: translate(-50%, 0);
+ z-index: 99;
+ padding: 24px;
+
+ .title_head {
+ display: flex;
+ align-items: center;
+ font-weight: bold;
+ font-size: 17px;
+ margin-bottom: 20px;
+
+ img {
+ width: 20px;
+ margin-right: 4px;
+ }
+ }
+
+ .info {
+ display: flex;
+ flex-wrap: wrap;
+
+ .item {
+ display: flex;
+ align-items: center;
+ font-size: 13px;
+ width: 55%;
+ margin-bottom: 8px;
+
+ &:nth-of-type(2n+1) {
+ width: 45%;
+ }
+
+ .dian {
+ width: 4px;
+ height: 4px;
+ background-color: #fff;
+ border-radius: 50%;
+ margin-right: 4px;
+ }
+
+ .la {
+ color: #01D9FE;
+ }
+ }
+ }
+
+ .tabs {
+ display: flex;
+ border-bottom: 1px solid rgba(255, 255, 255, 0.16);
+ margin: 0 -24px;
+ margin-bottom: 20px;
+ padding-left: 12px;
+
+ .tab {
+ color: #869CC9;
+ font-size: 14px;
+ margin-right: 12px;
+ width: 80px;
+ height: 42px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ border-bottom: 2px solid #06182e;
+ cursor: pointer;
+ }
+
+ .active {
+ font-weight: 500;
+ font-size: 15px;
+ color: #00F2F3;
+ border-bottom: 2px solid #00F2F3;
+ }
+ }
+
+ .tab1 {
+ .item {
+ display: flex;
+
+ &:nth-last-child(1) {
+ .content {
+ .time {
+ padding-bottom: 0;
+ }
+ }
+ }
+
+ .icon_wrap {
+ width: 24px;
+ margin-right: 10px;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+
+ .dian {
+ width: 12px;
+ height: 12px;
+ }
+
+ .dian_ac {
+ width: 24px;
+ height: 24px;
+ }
+
+ .line {
+ width: 1px;
+ height: 100%;
+ border: 1px dashed #8a9bc5;
+ }
+ }
+
+ .content {
+ font-size: 13px;
+ color: #D2E0FF;
+
+ .status {
+ font-weight: 500;
+ font-size: 14px;
+ margin-bottom: 5px;
+ color: #fff;
+ }
+
+ .text {
+ margin-bottom: 4px;
+ }
+
+ .time {
+ font-size: 12px;
+ padding-bottom: 12px;
+ }
+ }
+ }
+ }
+
+ .tab2 {
+ .list {
+ .item {
+ width: 560px;
+ background: rgba(1, 171, 254, 0.1);
+ font-size: 12px;
+ color: #D2E0FF;
+ padding: 10px;
+ margin-bottom: 10px;
+ .head {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ height: 36px;
+ line-height: 36px;
+ border-bottom: 1px solid rgba(255,255,255,0.16);
+ margin-bottom: 10px;
+ .code {
+ font-weight: 500;
+ font-size: 14px;
+ color: #00F2F3;
+ }
+ }
+ .line{
+ display: flex;
+ align-items: center;
+ margin-bottom: 8px;
+ &:nth-last-child(1){
+ margin-bottom: 0;
+ }
+ .name{
+ flex: 4;
+ }
+ .num{
+ flex: 3;
+ }
+ .val{
+ color: #fff;
+ }
+ }
+ }
+ }
+ }
+}
+
.bg {
position: absolute;
left: 0;
diff --git a/screen/src/views/SecurityControl.vue b/screen/src/views/SecurityControl.vue
index 8afd905..4953e4a 100644
--- a/screen/src/views/SecurityControl.vue
+++ b/screen/src/views/SecurityControl.vue
@@ -59,24 +59,27 @@
</div>
<div class="private_car">
<div class="item">
- <div class="name">鍛樺伐杞﹁締</div>
+ <img class="icon" src="@/assets/images/SecurityControl/car_yuangong@2x.png" alt="">
<div class="num">{{ data.internalCarTotal }}</div>
+ <div class="name">鍛樺伐杞﹁締</div>
</div>
<div class="item">
- <div class="name">鐩稿叧鏂硅溅杈�</div>
+ <img class="icon" src="@/assets/images/SecurityControl/car_xiangguanfang@2x.png" alt="">
<div class="num num2">{{ data.relatedCarTotal }}</div>
+ <div class="name">鐩稿叧鏂硅溅杈�</div>
+
</div>
<div class="item">
-
- <div class="name">鏉ヨ杞﹁締</div>
+ <img class="icon" src="@/assets/images/SecurityControl/car_laifang@2x.png" alt="">
<div class="num num3">{{ data.visitCarTotal }}</div>
+ <div class="name">鏉ヨ杞﹁締</div>
</div>
</div>
- <div class="section">
+ <!-- <div class="section">
<div class="item" :style="{ flex: data.internalCarTotal }"></div>
<div class="item" :style="{ flex: data.relatedCarTotal }"></div>
<div class="item" :style="{ flex: data.visitCarTotal }"></div>
- </div>
+ </div> -->
<div class="second_title">
<div class="title">
<img src="@/assets/images/SecurityControl/ic_title_green@2x.png" class="icon" alt="" />
@@ -105,7 +108,42 @@
</div>
</div>
<div class="center_box">
- <div class="center_box_one">
+ <div v-if="showJk" class="jiankong">
+ <img class="jk_bg" src="@/assets/images/SecurityControl/jiankong_bg@2x.png" alt="">
+ <div class="content">
+ <div class="video"></div>
+ </div>
+ <div class="right_wrap">
+ <div class="menus">
+ <div class="search_wrap">
+ <img class="search" src="@/assets/images/SecurityControl/ic_search@2x.png" alt="">
+ <input v-model="dataValue5" @input="getData5" class="input" type="text" placeholder="鎼滅储鐩戞帶鍚嶇О">
+ </div>
+ <div class="menu_wrap">
+ <div class="menu" v-for="menu, i in data5">
+ <div class="menu_name" @click="menuClick(i)">
+ <div class="name">{{ menu.name }}</div>
+ <!-- <img v-if="activeJkIndex == i" class="open" src="@/assets/images/SecurityControl/ar_close@2x.png"
+ alt="">
+ <img v-else class="icon" src="@/assets/images/SecurityControl/ar_open@2x.png" alt=""> -->
+ </div>
+ <!-- <div v-if="activeJkIndex == i" class="list">
+ <div class="item" @click="menuItemClick(item.name)" v-for="item in menu.childen">
+ <img v-if="activeMenu == item.name" class="icon"
+ src="@/assets/images/SecurityControl/ic_jiankong_sel@2x.png" alt="">
+ <img v-else class="icon" src="@/assets/images/SecurityControl/ic_jiankon.png" alt="">
+ <span :class="{ active: activeMenu == item.name }">{{ item.name }}</span>
+ </div>
+ </div> -->
+ </div>
+
+ </div>
+
+ </div>
+ </div>
+
+ </div>
+ <div v-else class="center_box_one">
<div class="list">
<div class="item">
<div class="name_wrap">
@@ -241,7 +279,7 @@
</div>
</div>
<div class="main_footer">
- <div class="car_warning">
+ <!-- <div class="car_warning">
<div class="com_header">
<div class="title">
<img src="@/assets/images/ic_title@2x.png" class="icon" alt="" />
@@ -268,7 +306,7 @@
</div>
<div class="separate"></div>
</div>
- </div>
+ </div> -->
<div class="safe_warning">
<div class="com_header">
<div class="title">
@@ -284,42 +322,27 @@
</div>
<img src="@/assets/images/title@2x.png" class="bg" alt="" />
</div>
- <div class="list">
- <div class="item">
- <div class="icon">
- <div class="circle"></div>
- <div class="line"></div>
- </div>
- <div class="content">
- <div class="header">
- <div class="time">
- <span>123</span>
- <span class="status">澶勭悊涓�</span>
+ <div class="list one-swiper">
+ <div class="swiper-wrapper">
+ <div class="one-swiper-slide swiper-slide item" v-for="item in warningList">
+ <div class="item_wrap">
+ <img :src="item.img" class="avatar" alt="">
+ <div class="content">
+ <div class="header">
+ <div class="name">{{item.title}}</div>
+ <div class="have_time">宸茬粡鍙戠敓{{item.haveTime}}</div>
+ </div>
+ <div class="wrap">
+ <div class="line addr">
+ <img class="icon" src="@/assets/images/SecurityControl/xiaofang_ic_weizhi@2x.png" alt="">
+ <span>{{item.addr}}</span>
+ </div>
+ <div class="line time">
+ <img class="icon" src="@/assets/images/SecurityControl/clock.png" alt="">
+ <span>{{item.createDate}}</span>
+ </div>
+ </div>
</div>
- <div class="have_time">宸茬粡鍙戠敓<span>1</span>鍒嗛挓</div>
- </div>
- <div class="wrap">
- <div class="title">娑堥槻璀﹀憡</div>
- <div class="title">address</div>
- </div>
- </div>
- </div>
- <div class="item">
- <div class="icon">
- <div class="circle"></div>
- <div class="line"></div>
- </div>
- <div class="content">
- <div class="header">
- <div class="time">
- <span>123</span>
- <span class="status">澶勭悊涓�</span>
- </div>
- <div class="have_time">宸茬粡鍙戠敓<span>1</span>鍒嗛挓</div>
- </div>
- <div class="wrap">
- <div class="title">娑堥槻璀﹀憡</div>
- <div class="title">address</div>
</div>
</div>
</div>
@@ -333,10 +356,11 @@
</div>
<img src="@/assets/images/title@2x.png" class="bg" alt="" />
</div>
- <div class="monitoring">
- <img src="@/assets/images/SecurityControl/jiankong.png" class="icon" alt="">
+ <div class="monitoring" @click="showJk = !showJk">
+ <img src="@/assets/images/SecurityControl/ic_jiankong@2x.png" class="icon" alt="">
<div>鐩戞帶鍒楄〃</div>
- <img src="@/assets/images/SecurityControl/jiankong_ic_open@2x.png" class="top" alt="">
+ <img v-if="showJk" src="@/assets/images/SecurityControl/jiankong_ic_close@2x.png" class="top" alt="">
+ <img v-else src="@/assets/images/SecurityControl/jiankong_ic_open@2x.png" class="top" alt="">
</div>
<div class="content">
<div class="sa_static">
@@ -373,7 +397,7 @@
<div>{{ item.totalNum }}</div>
<div>{{ item.onlineNum }}</div>
<div>{{ item.offlineDeviceNum }}</div>
- <div v-if="item.onlineNum && item.totalNum">{{ ((item.onlineNum / item.totalNum) * 100).toFixed(0) }}%
+ <div>{{ item.totalNum ? ((item.onlineNum / item.totalNum) * 100).toFixed(0) : 0 }}%
</div>
</div>
<div class="separate"></div>
@@ -419,7 +443,9 @@
import duration from 'dayjs/plugin/duration'
dayjs.extend(duration)
import * as echarts from 'echarts'
-import { getEnergyCenterData, getSecurityDeviceData, getVisitRetentionData, afgetVisitData } from '@/api'
+import 'swiper/css/swiper.min.css'
+import Swiper from 'swiper'
+import { getEnergyCenterData,afwarningEventData, getSecurityDeviceData, getVisitRetentionData, afgetVisitData, afregionTreea } from '@/api'
const weekMap = ['鏄熸湡鏃�', '鏄熸湡涓�', '鏄熸湡浜�', '鏄熸湡涓�', '鏄熸湡鍥�', '鏄熸湡浜�', '鏄熸湡鍏�',]
@@ -432,6 +458,43 @@
time.value = dayjs().format('HH:mm:ss')
}, 1000)
+
+const showJk = ref(true)
+const activeJkIndex = ref(0)
+const activeMenu = ref('')
+const jkList = ref([
+ {
+ name: '鏈堝彴鍖�',
+ childen: [
+ { name: '鏈堝彴1', id: 0 },
+ { name: '鏈堝彴2', id: 0 },
+ { name: '鏈堝彴3', id: 0 },
+ ]
+ },
+ {
+ name: '鍔炲叕妤�',
+ childen: []
+ },
+ {
+ name: '鍘傛埧',
+ childen: []
+ },
+ {
+ name: '澶ч棬',
+ childen: []
+ },
+])
+const menuClick = (val) => {
+ if (val == activeJkIndex.value) {
+ activeJkIndex.value = -1
+ } else {
+ activeJkIndex.value = val
+ }
+}
+const menuItemClick = (val) => {
+ activeMenu.value = val
+}
+
const arr = ['#68e2e3', '#50afd3', '#377cdb', '#d5ae3a']
const initEnergy = () => {
@@ -595,10 +658,10 @@
color: '#61d3f9'
}])]
const data = []
- data.push({ name: '寰呰闂�', value: data4.value.waitVisitNum,rate: data4.value.waitVisitRata })
- data.push({ name: '宸茬櫥璁�', value: data4.value.registerVisitNum,rate: data4.value.registerVisitRata })
- data.push({ name: '宸茬寮�', value: data4.value.levelNum,rate: data4.value.levelRata })
- data.push({ name: '婊炵暀', value: data4.value.retentionNum,rate: data4.value.retentionRata })
+ data.push({ name: '寰呰闂�', value: data4.value.waitVisitNum, rate: data4.value.waitVisitRata })
+ data.push({ name: '宸茬櫥璁�', value: data4.value.registerVisitNum, rate: data4.value.registerVisitRata })
+ data.push({ name: '宸茬寮�', value: data4.value.levelNum, rate: data4.value.levelRata })
+ data.push({ name: '婊炵暀', value: data4.value.retentionNum, rate: data4.value.retentionRata })
const option = {
color: colors,
tooltip: {
@@ -713,7 +776,8 @@
const dataListT2 = ref([])
const getData2 = () => {
getSecurityDeviceData().then(res => {
- const result = res.data
+ if(res.code == 200 && res.data && res.data.length > 0){
+ const result = res.data
let temp = []
let online = 0
let outline = 0
@@ -731,6 +795,8 @@
}
dataListT2.value = temp
+ }
+
initEchart2()
})
}
@@ -749,10 +815,77 @@
const getData4 = () => {
afgetVisitData().then(res => {
const result = res.data || {}
- dataList4.value = result
+ data4.value = result
initEchart3()
})
}
+
+const warningList = ref([])
+const getWarning = () => {
+ afwarningEventData({type: 0}).then(res => {
+ const result = res.data || []
+ warningList.value = result.map(item => {
+ item.haveTime = dayjs.duration(new Date().getTime() - new Date(item.createDate).getTime()).format('HH灏忔椂mm鍒嗛挓')
+ return item
+ })
+ })
+}
+const dataValue5 = ref('')
+const data5 = ref([])
+const getData5 = () => {
+ afregionTreea({
+ name: dataValue5.value,
+ withCameras: 1
+ }).then(res => {
+ const result = res.data || []
+ data5.value = result
+ })
+}
+
+const autoplayFlag = (list = [], leng = 4, time = 2000) => {
+ if (list.length > leng) {
+ return { delay: time, disableOnInteraction: false }
+ } else {
+ return false
+ }
+}
+const loopFn1 = () => {
+ var newSwiper1 = new Swiper('.one-swiper', {
+ // initialSlide: 0,
+ loop: true, // 寰幆妯″紡閫夐」
+ // direction: 'vertical', //绔栫洿鏂瑰悜
+ slidesPerView: 2,
+ slidesPerGroup: 2,
+ slidesPerColumn: 2,
+ // autoplay: { delay: 500, disableOnInteraction: false },
+ autoplay: autoplayFlag(dataList2.value, 2, 2000),
+ observer: true, //淇敼swiper鑷繁鎴栧瓙鍏冪礌鏃讹紝鑷姩鍒濆鍖杝wiper
+ })
+}
+loopFn1()
+const loopFn2 = () => {
+ var newSwiper1 = new Swiper('.two-swiper', {
+ initialSlide: 0,
+ // loop: true, // 寰幆妯″紡閫夐」
+ direction: 'vertical', //绔栫洿鏂瑰悜
+ slidesPerView: 3,
+ // autoplay: { delay: 500, disableOnInteraction: false },
+ autoplay: autoplayFlag(dataList2.value, 3, 4000),
+ observer: true, //淇敼swiper鑷繁鎴栧瓙鍏冪礌鏃讹紝鑷姩鍒濆鍖杝wiper
+ })
+}
+const loopFn3 = () => {
+ var newSwiper1 = new Swiper('.three-swiper', {
+ initialSlide: 0,
+ // loop: true, // 寰幆妯″紡閫夐」
+ direction: 'vertical', //绔栫洿鏂瑰悜
+ slidesPerView: 3,
+ // autoplay: { delay: 500, disableOnInteraction: false },
+ autoplay: autoplayFlag(dataList2.value, 3, 4000),
+ observer: true, //淇敼swiper鑷繁鎴栧瓙鍏冪礌鏃讹紝鑷姩鍒濆鍖杝wiper
+ })
+}
+
onMounted(() => {
@@ -760,7 +893,9 @@
getData2()
getData3()
getData4()
-
+ getData5()
+ getWarning()
+
// initEchart1()
})
@@ -771,7 +906,9 @@
div {
box-sizing: border-box;
}
-
+.swiper-wrapper {
+ display: block !important;
+ }
.main_content {
display: flex;
padding: 20px 25px 0;
@@ -842,6 +979,13 @@
.item {
display: flex;
flex-direction: column;
+ align-items: center;
+
+ .icon {
+ width: 52px;
+ height: 52px;
+ margin-bottom: 8px;
+ }
/* align-items: center; */
.num {
@@ -970,6 +1114,114 @@
.center_box {
flex: 1;
margin: 0 20px;
+
+ .jiankong {
+ margin: 0 48px;
+ display: flex;
+ height: calc(100% - 40px);
+ position: relative;
+
+ .jk_bg {
+ width: 100%;
+ height: 100%;
+ position: absolute;
+ z-index: -1;
+ }
+
+ .content {
+ flex: 1;
+ /* height: calc( 100% - 30px ); */
+ padding: 16px 0px 32px 20px;
+
+ .video {
+ height: 100%;
+ border: 1px solid;
+ }
+ }
+
+ .right_wrap {
+ margin-left: 15px;
+ width: 250px;
+ padding: 16px 20px 32px 0;
+
+ .menus {
+ height: 100%;
+ background: #002A42;
+ border: 1px solid rgba(1, 171, 254, 0.8);
+ padding: 15px;
+
+ .search_wrap {
+ display: flex;
+ align-items: center;
+ box-shadow: inset 0px 0px 6px 0px rgba(1, 171, 254, 0.5);
+ border-radius: 2px;
+ border: 1px solid rgba(1, 171, 254, 0.8);
+ height: 34px;
+ line-height: 34px;
+ padding-left: 12px;
+
+ .search {
+ width: 12px;
+ height: 12px;
+ margin-right: 3px;
+ }
+
+ .input {
+ flex: 1;
+ font-size: 14px;
+ }
+ }
+
+ .menu_wrap {
+ margin-top: 15px;
+ max-height: 400px;
+ overflow: auto;
+ .menu {
+ .menu_name {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ height: 34px;
+ border-bottom: 2px solid rgba(210, 224, 255, 0.2);
+ cursor: pointer;
+
+ .name {}
+
+ .icon {
+ width: 8px;
+ }
+
+ .open {
+ width: 14px;
+ }
+ }
+
+ .list {
+ .item {
+ display: flex;
+ align-items: center;
+ height: 34px;
+ margin-left: 10px;
+ cursor: pointer;
+ color: #D2E0FF;
+
+ .icon {
+ width: 15px;
+ height: 14px;
+ margin-right: 8px;
+ }
+
+ .active {
+ color: #01D9FE;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ }
.center_box_one {
padding: 8px 60px;
@@ -1219,43 +1471,36 @@
}
.safe_warning {
- width: 406px;
- margin-left: 20px;
+ width: 786px;
margin-right: 20px;
-
+ /* one-swiper */
.list {
height: 124px;
overflow: auto;
margin-top: 15px;
scrollbar-width: none;
-
+ display: flex;
+ flex-wrap: wrap;
+
.item {
- display: flex;
+ width: 366px;
+ /* width: 50%; */
+ height: 102px;
font-size: 13px;
color: #D2E0FF;
-
- .icon {
- width: 40px;
+ .item_wrap {
+ height: 90px;
+ padding: 10px;
+ background: linear-gradient(270deg, rgba(1, 217, 254, 0) 0%, rgba(1, 217, 254, 0.19) 100%);
+ border: 1px solid #006E81;
display: flex;
- flex-direction: column;
- align-items: center;
- padding-top: 3px;
+ }
- .circle {
- width: 7px;
- height: 7px;
- border-radius: 50%;
- background: #01D9FE;
- box-shadow: 0px 0px 1px 4px #34788f;
- /* opacity: 0.52; */
- }
- .line {
- margin-top: 3px;
- width: 1px;
- height: calc(100% - 10px);
- background-color: #153947;
- }
+ .avatar {
+ width: 70px;
+ height: 70px;
+ margin-right: 10px;
}
.content {
@@ -1265,20 +1510,11 @@
display: flex;
justify-content: space-between;
align-items: center;
+ margin-bottom: 8px;
- .time {
- display: flex;
- align-items: center;
-
- .status {
- height: 18px;
- line-height: 18px;
- border-radius: 2px;
- padding: 2px 4px;
- border: 1px solid #869CC9;
- font-size: 12px;
- margin-left: 8px;
- }
+ .name {
+ font-weight: 500;
+ font-size: 15px;
}
.have_time {
@@ -1292,26 +1528,18 @@
}
.wrap {
- height: 40px;
- background: linear-gradient(270deg, rgba(254, 85, 1, 0) 0%, rgba(254, 85, 1, 0.19) 100%);
- border-radius: 2px 0px 0px 2px;
- display: flex;
- align-items: center;
- border: 1px solid;
- margin-bottom: 20px;
- margin-top: 8px;
- padding: 0 10px;
- border-image: linear-gradient(270deg, rgba(254, 85, 1, 0), rgba(254, 85, 1, 0.6)) 1 1;
+ font-size: 12px;
+ color: #D2E0FF;
- .title {
- flex: 4;
- font-weight: bold;
- font-size: 15px;
- color: #FFFFFF;
+ .line {
+ display: flex;
+ align-items: center;
+ margin-bottom: 3px;
}
- .address {
- flex: 6;
+ .icon {
+ width: 12px;
+ margin-right: 8px;
}
}
}
@@ -1425,6 +1653,7 @@
.monitoring {
position: absolute;
+ cursor: pointer;
top: -60px;
right: 0;
display: flex;
@@ -1439,7 +1668,9 @@
border: 1px solid rgba(12, 153, 236, 0.68);
.icon {
- width: 30px;
+ width: 16px;
+ height: 16px;
+ margin-right: 4px;
}
.top {
@@ -1503,12 +1734,19 @@
.separate {
width: 1px;
height: 14px;
- background-color: #d2e0ff;
+ /* background-color: #d2e0ff; */
margin: 0 6px;
}
+ .tab {
+ cursor: pointer;
+ }
+
.active {
- color: #0094eb;
+ font-weight: 600;
+ font-size: 15px;
+ color: #FFFFFF;
+ text-shadow: 0px 0px 8px #01D9FE;
}
}
}
diff --git a/screen/src/views/TaskEfficiency.vue b/screen/src/views/TaskEfficiency.vue
index 27e6ece..442c916 100644
--- a/screen/src/views/TaskEfficiency.vue
+++ b/screen/src/views/TaskEfficiency.vue
@@ -62,14 +62,16 @@
</div>
<img src="@/assets/images/title@2x.png" class="bg" alt="" />
</div>
- <div class="list">
- <div class="line" v-for="item, i in dataList2" :key="i">
- <div class="top"><span v-if="i < 3">top</span>{{ i }}</div>
- <div class="id_card">{{ item.platformName }}</div>
- <div class="wrap">
- <ChargeRate :rate="item.rate" />
+ <div class="list one-swiper">
+ <div class="swiper-wrapper">
+ <div class="line one-swiper-slide swiper-slide" v-for="item, i in dataList2" :key="i">
+ <div class="top"><span v-if="i < 3">top</span>{{ i }}</div>
+ <div class="id_card">{{ item.platformName }}</div>
+ <div class="wrap">
+ <ChargeRate :rate="item.rate" />
+ </div>
+ <div class="num">{{ item.workTotalTimeT }}</div>
</div>
- <div class="num">{{ item.workTotalTimeT }}</div>
</div>
</div>
</div>
@@ -96,40 +98,75 @@
<div class="static_wrap">
<div class="item">
<div class="name">鏈堝彴鏁伴噺</div>
- <div v-if="data4.platformTotal" class="nums">
- <div class="num" v-for="n, i in data4.platformTotal + ''" :key="i">{{ n }}</div>
+ <div v-if="data4.platformTotal || data4.platformTotal == 0" class="nums">
+ <div class="num" v-for="n, i in formatNum3(data4.platformTotal) " :key="i">{{ n }}</div>
</div>
</div>
<div class="item">
<div class="name">绌洪棽鏈堝彴</div>
- <div v-if="data4.freePlatform" class="nums">
- <div class="num" v-for="n, i in data4.freePlatform + ''" :key="i">{{ n }}</div>
+ <div v-if="data4.freePlatform || data4.freePlatform == 0" class="nums">
+ <div class="num" v-for="n, i in formatNum3(data4.freePlatform)" :key="i">{{ n }}</div>
</div>
</div>
<div class="item">
<div class="name">棰勭害杞﹁締</div>
- <div v-if="data4.reservationCar" class="nums">
- <div class="num" v-for="n, i in data4.reservationCar + ''" :key="i">{{ n }}</div>
+ <div v-if="data4.reservationCar || data4.reservationCar == 0" class="nums">
+ <div class="num" v-for="n, i in formatNum3(data4.reservationCar)" :key="i">{{ n }}</div>
</div>
</div>
<div class="item">
<div class="name">浣滀笟杞﹁締</div>
- <div v-if="data4.workingCar" class="nums">
- <div class="num" v-for="n, i in data4.workingCar + ''" :key="i">{{ n }}</div>
+ <div v-if="data4.workingCar || data4.workingCar == 0" class="nums">
+ <div class="num" v-for="n, i in formatNum3(data4.workingCar)" :key="i">{{ n }}</div>
</div>
</div>
<div class="item">
<div class="name">鎺掗槦杞﹁締</div>
- <div class="nums" v-if="data4.lineUpCar">
- <div class="num" v-for="n, i in data4.lineUpCar + ''" :key="i">{{ n }}</div>
+ <div class="nums" v-if="data4.lineUpCar || data4.lineUpCar == 0">
+ <div class="num" v-for="n, i in formatNum3(data4.lineUpCar)" :key="i">{{ n }}</div>
</div>
</div>
</div>
</div>
- <div class="center_box_two">
- <div class="videos">
- <div class="video" v-for="i in 4"></div>
+ <div class="center_box_bg">
+ <!-- <div class="no no1" @click="workModalClick">1</div>
+ <div class="no no2" @click="workModalClick">2</div>
+ <div class="no no3" @click="workModalClick">3</div> -->
+ <div class="work_modal" @click="showWorkModal = false" v-if="showWorkModal">
+ <img class="bg" src="@/assets/images/LogisticsCenter/bg_yuetai@2x.png" alt="">
+ <div class="head">
+ <div class="left">
+ <img src="@/assets/images/LogisticsCenter/ic_yuetai@2x.png" alt="">
+ <span>{{ workModalParam.platformName }}</span>
+ </div>
+ <div class="right">{{ workModalParam.statusTemp }}</div>
+ </div>
+ <div class="line">
+ <div class="dian"></div>
+ <div class="la">浣滀笟杞﹁締锛�</div>
+ <div class="val">{{ workModalParam.carNo }}</div>
+ </div>
+ <div class="line">
+ <div class="dian"></div>
+ <div class="la">浣滀笟绫诲瀷锛�</div>
+ <div class="val">{{ workModalParam.workType == 0 ? '鍗歌揣' : '瑁呰揣' }}</div>
+ </div>
+ <div class="line">
+ <div class="dian"></div>
+ <div class="la">浣滀笟鏃堕暱锛�</div>
+ <div class="val">{{ workModalParam.workTime }}</div>
+ </div>
+ <div class="line">
+ <div class="dian"></div>
+ <div class="la">棰勮瀹屾垚锛�</div>
+ <div class="val">{{ workModalParam.finishTimeStr }}</div>
+ </div>
</div>
+ </div>
+ <div class="center_box_two">
+ <!-- <div class="videos">
+ <div class="video" v-for="i in 4"></div>
+ </div> -->
<div class="list">
<div class="line header">
<div>鏈堝彴鍚嶇О</div>
@@ -139,15 +176,20 @@
<div>棰勮瀹屾垚鏃堕棿</div>
<div>鏈堝彴鐘舵��</div>
</div>
- <div class="line" v-for="item, i in dataList5" :key="i">
- <div>{{ item.platformName }}</div>
- <div>{{ item.carNo || '-' }}</div>
- <div>{{ item.workNum }}{{ item.workNum ? '涓囨敮' : '-' }}</div>
- <div>{{ item.workTime || '-' }}</div>
- <div>{{ item.finishTime || '-' }}</div>
- <div :style="{
- color: item.status == 1 ? '#869CC9' : item.status == 2 ? '#FE5501' : '#D2E0FF'
- }">{{ item.statusTemp }}</div>
+ <div class="two-swiper">
+ <div class="swiper-wrapper">
+ <div @click="platformClick(item)" class="line one-swiper-slide swiper-slide"
+ v-for="item, i in dataList5" :key="i">
+ <div>{{ item.platformName }}</div>
+ <div>{{ item.carNo || '-' }}</div>
+ <div>{{ item.workNum ? item.workNum + '涓囨敮' : '-' }}</div>
+ <div>{{ item.workTime || '-' }}</div>
+ <div>{{ item.finishTimeStr || '-' }}</div>
+ <div :style="{
+ color: item.status == 1 ? '#869CC9' : item.status == 2 ? '#FE5501' : '#D2E0FF'
+ }">{{ item.statusTemp }}</div>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -164,33 +206,39 @@
<div class="static_wrap">
<div class="item">
<div class="name">绛惧埌鏁�</div>
- <div class="num">{{ data6.inNum || 0 }}</div>
+ <div class="num">{{ data4?.signedNum || 0 }}</div>
</div>
<div class="item">
<div class="name">宸插彨鍙�</div>
- <div class="num">{{ data6.callNum || 0 }}</div>
+ <div class="num">{{ data4?.calledNum || 0 }}</div>
</div>
<div class="item">
<div class="name">宸蹭綔涓�</div>
- <div class="num">{{ data6.workingNum || 0 }}</div>
+ <div class="num">{{ data4?.workedNum || 0 }}</div>
</div>
<div class="item">
<div class="name">宸插畬鎴�</div>
- <div class="num">{{ data6.finishNum || 0 }}</div>
+ <div class="num">{{ data4?.doneNum || 0 }}</div>
</div>
</div>
<div class="echart_wrap">
<div class="echart3" id="echart3"></div>
</div>
<div class="list">
- <div class="line" v-for="item, i in data6.platformLogList">
+ <div class="line" v-for="item, i in data6?.platformLogList">
<div class="time_wrap">
- <div class="time" v-if="item.createDate">{{ item.createDate.slice(11, 16) }}</div>
- <div class="sp"></div>
- <div class="dian"></div>
+ <div class="time" :style="{
+ backgroundColor: item.objType == 5?'#4ca8f7':item.objType == 6?'#f2b23e':item.objType == 10?'#4673f6':'#4aa38f'
+ }" v-if="item.createDate">{{ item.createDate.slice(11, 16) }}</div>
+ <div class="sp" :style="{
+ backgroundColor: item.objType == 5?'#4ca8f7':item.objType == 6?'#f2b23e':item.objType == 10?'#4673f6':'#4aa38f'
+ }"></div>
+ <div class="dian" :style="{
+ backgroundColor: item.objType == 5?'#4ca8f7':item.objType == 6?'#f2b23e':item.objType == 10?'#4673f6':'#4aa38f'
+ }"></div>
</div>
- <div class="id_card">{{ item.carCodeFront }}</div>
- <div class="status">寮�濮嬩綔涓�</div>
+ <div class="id_card">{{ item.carCodeFront || item.param4 }}</div>
+ <div class="status">{{ statusMap[item.objType] }}</div>
<div class="desc">{{ item.content }}</div>
</div>
</div>
@@ -203,29 +251,31 @@
</div>
<img src="@/assets/images/title@2x.png" class="bg" alt="" />
</div>
- <div class="list">
- <div class="item" v-for="i in 5">
- <div class="icon">
- <div class="circle"></div>
- <div class="line"></div>
- </div>
- <div class="content">
- <div class="header">
- <div class="time">time</div>
- <span class="status">涓�</span>
+ <div class="list three-swiper">
+ <div class="swiper-wrapper">
+ <div class="item three-swiper-slide swiper-slide" v-for="item, i in data7">
+ <div class="icon">
+ <div class="circle"></div>
+ <div class="line"></div>
</div>
- <div class="main">
- <div class="left">
- <div class="title">
- <img class="xf" src="@/assets/images/FireFighting/ic_gaojing_red@2x.png" alt="">
- <span>鍛婅锛氬紑杞﹀惛鐑�</span>
- </div>
- <div class="wrap">
- <span style="margin-right: 30px;">鐘舵�侊細寰呭鐞�</span>
- <span>宸插彂鐢燂細1鍒嗛挓</span>
- </div>
+ <div class="content">
+ <div class="header">
+ <div class="time">{{ item.createDate }}</div>
+ <!-- <span class="status">浣�</span> -->
</div>
- <div class="status">澶勭悊涓�</div>
+ <div class="main">
+ <div class="left">
+ <div class="title">
+ <img class="xf" src="@/assets/images/FireFighting/ic_gaojing_red@2x.png" alt="">
+ <span>鍛婅锛歿{ item.eventContent }}</span>
+ </div>
+ <div class="wrap">
+ <!-- <span style="margin-right: 30px;">鐘舵�侊細寰呭鐞�</span> -->
+ <span>宸插彂鐢燂細{{ item.haveTime }}</span>
+ </div>
+ </div>
+ <!-- <div class="status">澶勭悊涓�</div> -->
+ </div>
</div>
</div>
</div>
@@ -243,7 +293,12 @@
import Percent from '@/components/percent.vue'
import dayjs from 'dayjs'
import ChargeRate from '@/components/ChargeRate.vue'
+import { statusMap } from '@/utils/config'
import * as echarts from 'echarts'
+import duration from 'dayjs/plugin/duration'
+dayjs.extend(duration)
+import 'swiper/css/swiper.min.css'
+import Swiper from 'swiper'
import {
cnplatformGroupFinish,
cnplatformDuration,
@@ -251,6 +306,7 @@
cncenterData,
cncarWorkSituation,
cnworkEfficiency,
+ cnwarningList
} from '@/api'
@@ -277,7 +333,7 @@
show: false,
position: 'center'
},
- padAngle: 5,
+ padAngle: 2,
itemStyle: {
borderRadius: 10
},
@@ -430,7 +486,7 @@
shadowColor: 'rgba(124,248,255, 0)',
shadowBlur: 20
},
- data: dataList3.value.map(i => i.workNum)
+ data: dataList3.value.map(i => i.workNum || 0)
},
{
name: '绱浣滀笟閲�',
@@ -500,12 +556,12 @@
color: '#61d3f9'
}])]
const temp = []
- temp.push({ name: '棰勭害鏁�', value: data6.value.reservationNum || 0 })
- temp.push({ name: '宸茶繘鍦�', value: data6.value.inNum || 0 })
- temp.push({ name: '宸蹭綔涓�', value: data6.value.workingNum || 0 })
- temp.push({ name: '宸茬鍦�', value: data6.value.leaveNum || 0 })
- console.log('temp', temp);
-
+ temp.push({ name: '绛惧埌鏁�', value: data4.value?.signedNum || 0, rate: '100.0' })
+ temp.push({ name: '宸插彨鍙�', value: data4.value?.calledNum || 0, rate: (data4.value.calledNum / data4.value?.signedNum * 100).toFixed(1)})
+ temp.push({ name: '宸蹭綔涓�', value: data4.value?.workedNum || 0, rate: (data4.value.workedNum / data4.value?.signedNum * 100).toFixed(1) })
+ temp.push({ name: '宸插畬鎴�', value: data4.value?.doneNum || 0, rate: (data4.value.doneNum / data4.value?.signedNum * 100).toFixed(1) })
+ console.log('temp', temp)
+
const option = {
color: colors,
tooltip: {
@@ -547,7 +603,10 @@
label: {
show: true,
position: 'outside',
- formatter: '{a|{b}} {a|{c}%}',
+ // formatter: '{a|{b}} {a|{c}%}',
+ formatter: params => {
+ return `{a|${params.data.name} ${params.data.rate}%}`
+ },
rich: {
a: {
color: '#869CC9',
@@ -609,17 +668,22 @@
const getData2 = () => {
cnplatformDuration().then(res => {
const result = res.data || []
+ let count = 1
+ if (result.length > 0) {
+ count = result[0].workTotalTime
+ }
dataList2.value = result.map(item => {
if (item.workTotalTime) {
if (item.workTotalTime > 60) {
item.workTotalTimeT = (item.workTotalTime / 60).toFixed(0) + '灏忔椂' + item.workTotalTime % 60 + '鍒嗛挓'
} else {
- item.workTotalTimeT = item.workTotalTime
+ item.workTotalTimeT = item.workTotalTime + '鍒嗛挓'
}
}
- item.rate = ((item.workTotalTime / item.openTotalTime) * 30).toFixed(0)
+ item.rate = ((item.workTotalTime / count) * 30).toFixed(0)
return item
})
+ loopFn2()
})
}
@@ -639,10 +703,24 @@
const data4 = ref({})
const getData4 = () => {
cncenterData().then(res => {
- const result = res.data
+ const result = res.data || []
data4.value = result
+ initEchart3()
})
}
+const formatNum3 = (num) => {
+ if (num || num == 0) {
+ num = num + ''
+ if (num.length == 1) {
+ return '00' + num
+ } else if (num.length == 2) {
+ return '0' + num
+ } else {
+ return num
+ }
+ }
+}
+
const dataList5 = ref([])
const getData5 = () => {
cnplatformWorkData().then(res => {
@@ -650,25 +728,86 @@
dataList5.value = result.map(i => {
i.statusTemp = i.status == 0 ? '浣滀笟涓�' : i.status == 1 ? '绌洪棽涓�' : '浣滀笟瓒呮椂'
if (i.workTime) {
- if (item.workTime > 60) {
- item.workTime = (item.workTime / 60).toFixed(0) + 'h' + item.workTime % 60 + 'm'
+ // i.workTime = dayjs.duration(i.workTime * 1000).format('HH灏忔椂mm鍒�')
+ i.workTime = (i.workTime / 60).toFixed(0)
+ if (i.workTime > 60) {
+ i.workTime = (i.workTime / 60).toFixed(0) + 'h' + i.workTime % 60 + 'm'
} else {
- item.workTime = item.workTime
+ i.workTime = i.workTime + 'm'
}
}
i.finishTime = dayjs(i.finishTime).format('HH:mm')
return i
})
+ loopFn5()
})
}
const data6 = ref({})
const getData6 = () => {
- cncarWorkSituation().then(res => {
+ cncarWorkSituation({ size: 7 }).then(res => {
const result = res.data
data6.value = result
- initEchart3()
})
+}
+
+const data7 = ref([])
+const getData7 = () => {
+ cnwarningList({ size: 7 }).then(res => {
+ const result = res.data || []
+ data7.value = result.map(item => {
+ item.haveTime = dayjs.duration(new Date().getTime() - new Date(item.createDate).getTime()).format('HH灏忔椂mm鍒嗛挓')
+ return item
+ })
+ loopFn7()
+ })
+}
+
+const showWorkModal = ref(false)
+const workModalParam = ref({})
+const platformClick = (val) => {
+ workModalParam.value = val
+ showWorkModal.value = !showWorkModal.value
+}
+const loopFn2 = () => {
+ var newSwiper1 = new Swiper('.one-swiper', {
+ initialSlide: 0,
+ // loop: true, // 寰幆妯″紡閫夐」
+ direction: 'vertical', //绔栫洿鏂瑰悜
+ slidesPerView: 5,
+ // autoplay: { delay: 500, disableOnInteraction: false },
+ autoplay: autoplayFlag(dataList2.value, 5, 4000),
+ observer: true, //淇敼swiper鑷繁鎴栧瓙鍏冪礌鏃讹紝鑷姩鍒濆鍖杝wiper
+ })
+}
+const loopFn5 = () => {
+ var newSwiper1 = new Swiper('.two-swiper', {
+ initialSlide: 0,
+ // loop: true, // 寰幆妯″紡閫夐」
+ direction: 'vertical', //绔栫洿鏂瑰悜
+ slidesPerView: 6,
+ // autoplay: { delay: 500, disableOnInteraction: false },
+ autoplay: autoplayFlag(dataList2.value, 6, 4000),
+ observer: true, //淇敼swiper鑷繁鎴栧瓙鍏冪礌鏃讹紝鑷姩鍒濆鍖杝wiper
+ })
+}
+const loopFn7 = () => {
+ var newSwiper1 = new Swiper('.three-swiper', {
+ initialSlide: 0,
+ // loop: true, // 寰幆妯″紡閫夐」
+ direction: 'vertical', //绔栫洿鏂瑰悜
+ slidesPerView: 2,
+ // autoplay: { delay: 500, disableOnInteraction: false },
+ autoplay: autoplayFlag(dataList2.value, 2, 4000),
+ observer: true, //淇敼swiper鑷繁鎴栧瓙鍏冪礌鏃讹紝鑷姩鍒濆鍖杝wiper
+ })
+}
+const autoplayFlag = (list = [], leng = 4, time = 2000) => {
+ if (list.length > leng) {
+ return { delay: time, disableOnInteraction: false }
+ } else {
+ return false
+ }
}
@@ -680,6 +819,7 @@
getData4()
getData5()
getData6()
+ getData7()
// initEchart1()
// initEchart2()
@@ -781,14 +921,15 @@
margin-bottom: 20px;
.list {
- padding: 20px 24px 4px;
- height: 227px;
+ padding: 0px 24px 0px;
+ height: 200px;
+ margin-top: 20px;
+ overflow: auto;
.line {
display: flex;
align-items: center;
- margin-bottom: 20px;
- height: 20px;
+ height: 40px;
.top {
font-weight: 500;
@@ -800,6 +941,10 @@
color: #DBEAEA;
box-shadow: inset 0px 0px 3px 0px #01D9FE;
margin-right: 10px;
+ }
+
+ .one-swiper-slide {
+ height: 40px !important;
}
.id_card {
@@ -888,6 +1033,92 @@
}
}
+ .center_box_bg {
+ width: 100%;
+ flex: 1;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+
+ .no {
+ width: 28px;
+ height: 28px;
+ border-radius: 50%;
+ border: 1px solid #0193FE;
+ box-shadow: 1px 1px 6px #466d89;
+ font-size: 12px;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ background: #123062;
+ cursor: pointer;
+ }
+
+ .work_modal {
+ width: 314px;
+ height: 180px;
+ position: relative;
+ padding: 22px 20px;
+
+ .head {
+ display: flex;
+ justify-content: space-between;
+ margin-bottom: 12px;
+
+ .left {
+ display: flex;
+ align-items: center;
+ font-weight: bold;
+ font-size: 15px;
+ color: #FFFFFF;
+
+ img {
+ width: 17px;
+ margin-right: 10px;
+ }
+ }
+
+ .right {
+ font-weight: 500;
+ font-size: 13px;
+ color: #01D9FE;
+ }
+ }
+
+ .line {
+ display: flex;
+ align-items: center;
+ font-size: 13px;
+ margin-bottom: 8px;
+
+ &:nth-last-child(1) {
+ margin-bottom: 0;
+ }
+
+ .dian {
+ width: 4px;
+ height: 4px;
+ border-radius: 50%;
+ background-color: #fff;
+ margin-right: 7px;
+ }
+
+ .la {
+ color: #D2E0FF;
+ }
+ }
+
+ .bg {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ }
+
+ }
+ }
+
.center_box_two {
width: 100%;
@@ -911,6 +1142,12 @@
.list {
width: 100%;
height: 210px;
+ overflow-y: auto;
+
+ .two-swiper {
+ height: 180px;
+ overflow: auto;
+ }
.line {
display: flex;
@@ -1044,16 +1281,15 @@
padding: 20px 20px 0;
.list {
- height: 248px;
+ height: 220px;
overflow: auto;
margin-top: 15px;
scrollbar-width: none;
-
.item {
display: flex;
font-size: 13px;
color: #D2E0FF;
-
+ height: 110px;
.icon {
width: 40px;
display: flex;
@@ -1158,6 +1394,10 @@
}
}
}
+
+ .swiper-wrapper {
+ display: block !important;
+ }
}
.main_header {
--
Gitblit v1.9.3