From 522877ae5bddcb27699b893c27f149d6a3c7e408 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 15 十一月 2024 18:29:02 +0800
Subject: [PATCH] ll
---
screen/src/assets/base.css | 12
admin/src/views/login.vue | 9
screen/src/views/LogisticsCenter.vue | 424 +++++++++++++++++++++++--
screen/src/assets/images/default_empty.png | 0
screen/src/views/LogisticsEfficiency.vue | 90 ++++-
screen/vite.config.js | 6
screen/src/views/EnergyConsum.vue | 64 ++-
screen/src/views/SecurityControl.vue | 143 +++++---
admin/src/views/operation/serviceCar/apprRecord.vue | 10
screen/.gitignore | 2
screen/src/views/FireFighting.vue | 145 ++++++--
screen/src/views/TaskEfficiency.vue | 41 +-
12 files changed, 747 insertions(+), 199 deletions(-)
diff --git a/admin/src/views/login.vue b/admin/src/views/login.vue
index 43277c4..6cdf919 100644
--- a/admin/src/views/login.vue
+++ b/admin/src/views/login.vue
@@ -115,11 +115,11 @@
if (this.loading) {
return
}
- this.loading = true
if (this.activeTab == 0) {
if (!this.__check()) {
return
}
+ this.loading = true
loginByPassword({
username: this.username.trim(),
password: this.password,
@@ -154,12 +154,15 @@
if (!smsCode) {
return Message.error('璇疯緭鍏ラ獙璇佺爜')
}
+ this.loading = true
loginByPhone({ phone, code: smsCode }).then(res => {
if (this.isRemPsd) {
localStorage.setItem('phone', this.username.trim())
}
Cookies.set('dm_user_token', res)
this.$router.push('index')
+ }).catch(e => {
+ this.refreshCaptcha()
}).finally(() => {
this.loading = false
})
@@ -266,7 +269,8 @@
background-size: 100% 100%;
padding-left: 40px;
padding-top: 60px;
- .h2{
+
+ .h2 {
color: $primary-color;
background-color: #fff;
height: 24px;
@@ -278,6 +282,7 @@
display: flex;
margin-bottom: 12px;
}
+
.h3 {
font-size: 28px;
font-weight: 700;
diff --git a/admin/src/views/operation/serviceCar/apprRecord.vue b/admin/src/views/operation/serviceCar/apprRecord.vue
index b5b99b1..784b850 100644
--- a/admin/src/views/operation/serviceCar/apprRecord.vue
+++ b/admin/src/views/operation/serviceCar/apprRecord.vue
@@ -130,6 +130,11 @@
min-width="80px"
></el-table-column>
<el-table-column
+ prop="memberNames"
+ label="涔樿溅浜�"
+ min-width="180px"
+ ></el-table-column>
+ <el-table-column
prop="companyName"
label="鎵�灞炵粍缁�"
min-width="150px"
@@ -141,11 +146,6 @@
<span v-if="row.endTime">姝�:{{ row.endTime.slice(0,16) }}</span>
</template>
</el-table-column>
- <el-table-column
- prop="memberNames"
- label="涔樿溅浜�"
- min-width="180px"
- ></el-table-column>
<el-table-column
prop="planUseDate"
label="鍑哄彂鏃堕棿"
diff --git a/screen/.gitignore b/screen/.gitignore
index 8ee54e8..a5ddd06 100644
--- a/screen/.gitignore
+++ b/screen/.gitignore
@@ -6,7 +6,7 @@
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*
-
+screen
node_modules
.DS_Store
dist
diff --git a/screen/src/assets/base.css b/screen/src/assets/base.css
index da3c493..b0d138f 100644
--- a/screen/src/assets/base.css
+++ b/screen/src/assets/base.css
@@ -17,7 +17,17 @@
::-webkit-scrollbar {
display: none;
}
-
+.swiper-wrapper {
+ display: block !important;
+}
+.empty_wrap{
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+.empty_wrap img{
+ width: 100px;
+}
p{
padding: 0;
margin: 0;
diff --git a/screen/src/assets/images/default_empty.png b/screen/src/assets/images/default_empty.png
new file mode 100644
index 0000000..623dce4
--- /dev/null
+++ b/screen/src/assets/images/default_empty.png
Binary files differ
diff --git a/screen/src/views/EnergyConsum.vue b/screen/src/views/EnergyConsum.vue
index 938e91a..b51bc3d 100644
--- a/screen/src/views/EnergyConsum.vue
+++ b/screen/src/views/EnergyConsum.vue
@@ -1,5 +1,5 @@
<template>
- <v-scale-screen width="1920" height="960" >
+ <v-scale-screen width="1920" height="960">
<div class="main_app">
<img src="@/assets/images/bg_main_app.png" class="main_bg" alt="" />
<div class="main_header">
@@ -25,7 +25,8 @@
<img src="@/assets/images/nenghao_ic1.png" class="co2" alt="">
<div>
<div class="name">鏈勾绱寰幆鐑熺</div>
- <div><span class="num" v-if="data1.smokeBoxTotal">{{ data1.smokeBoxTotal.toLocaleString() }}</span><span>鍙�</span></div>
+ <div><span class="num" v-if="data1.smokeBoxTotal">{{ data1.smokeBoxTotal.toLocaleString()
+ }}</span><span>鍙�</span></div>
</div>
</div>
</div>
@@ -69,7 +70,8 @@
<img class="icon" src="@/assets/images/ic_yongdian@2x.png" alt="" />
<div class="content">
<div class="name">涓婃湀鐢ㄧ數(kw路h)</div>
- <div class="num" v-if="data1.electricityQuantity">{{ data1.electricityQuantity.toLocaleString() }}</div>
+ <div class="num" v-if="data1.electricityQuantity || data1.electricityQuantity == 0">{{ data1.electricityQuantity.toLocaleString() }}
+ </div>
</div>
</div>
<div class="static">
@@ -86,7 +88,7 @@
<img class="icon" src="@/assets/images/ic_yongshui@2x.png" alt="" />
<div class="content">
<div class="name">涓婃湀鐢ㄦ按(t)</div>
- <div class="num" v-if="data1.waterQuantity">{{ data1.waterQuantity.toLocaleString() }}</div>
+ <div class="num" v-if="data1.waterQuantity || data1.waterQuantity == 0">{{ data1.waterQuantity.toLocaleString() }}</div>
</div>
</div>
<div class="static">
@@ -103,7 +105,7 @@
<img class="icon" src="@/assets/images/ic_yongqi@2x.png" alt="" />
<div class="content">
<div class="name">涓婃湀鐢ㄦ皵(t)</div>
- <div class="num" v-if="data1.gasQuantity">{{ data1.gasQuantity.toLocaleString() }}</div>
+ <div class="num" v-if="data1.gasQuantity || data1.gasQuantity == 0">{{ data1.gasQuantity.toLocaleString() }}</div>
</div>
</div>
<div class="static">
@@ -120,45 +122,45 @@
<div class="center_box_two">
<img class="bg" src="@/assets/images/img_city@2x.png" alt="" />
<div class="item item1">
- <div class="num fs_linear">{{ data1.workHouseQuantity }}<span class="unit">kw路h</span></div>
+ <div class="num fs_linear">{{ data1.workHouseQuantity || 0 }}<span class="unit">kw路h</span></div>
<div class="name">鑱斿悎宸ユ埧</div>
<img src="@/assets/images/bg_data@2x.png" class="bg" alt="" />
</div>
<div class="item item2">
- <div class="num fs_linear">{{ data1.officeQuantity }}<span class="unit">kw路h</span></div>
+ <div class="num fs_linear">{{ data1.officeQuantity || 0 }}<span class="unit">kw路h</span></div>
<div class="name">鍔炲叕妤�</div>
<img src="@/assets/images/bg_data@2x.png" class="bg" alt="" />
</div>
<div class="item item3">
- <div class="num fs_linear">{{ data1.parkQuantity }}<span class="unit">kw路h</span></div>
+ <div class="num fs_linear">{{ data1.parkQuantity || 0 }}<span class="unit">kw路h</span></div>
<div class="name">鐗╂祦鍥尯</div>
<img src="@/assets/images/bg_data@2x.png" class="bg" alt="" />
</div>
<div class="item item4">
- <div class="num fs_linear">{{ data1.productHouseQuantity }}<span class="unit">kw路h</span></div>
+ <div class="num fs_linear">{{ data1.productHouseQuantity || 0 }}<span class="unit">kw路h</span></div>
<div class="name">鎴愬搧搴�</div>
<img src="@/assets/images/bg_data@2x.png" class="bg" alt="" />
</div>
<div class="item item5">
- <div class="num fs_linear">{{ data1.powerQuantity }}<span class="unit">kw路h</span></div>
+ <div class="num fs_linear">{{ data1.powerQuantity || 0 }}<span class="unit">kw路h</span></div>
<div class="name">鍔ㄥ姏绔欐埧</div>
<img src="@/assets/images/bg_data@2x.png" class="bg" alt="" />
</div>
<div class="bottom_wrap">
<div class="bottom bottom1">
- <div class="num fs_linear">{{ data1.yesterdayElectricity }}</div>
+ <div class="num fs_linear">{{ data1.yesterdayElectricity || 0 }}</div>
<div class="name">鏄ㄦ棩鐢ㄧ數</div>
<div class="unit">kw路h</div>
<img src="@/assets/images/ic_dianliang_b@2x.png" class="bg" alt="" />
</div>
<div class="bottom bottom2">
- <div class="num">{{ data1.todayElectricity }}</div>
+ <div class="num">{{ data1.todayElectricity || 0 }}</div>
<div class="name">浠婃棩鐢ㄧ數</div>
<div class="unit">kw路h</div>
<img src="@/assets/images/ic_dianliang@2x.png" class="bg" alt="" />
</div>
<div class="bottom bottom3">
- <div class="num fs_linear">{{ data1.monthElectricity }}</div>
+ <div class="num fs_linear">{{ data1.monthElectricity || 0 }}</div>
<div class="name">鏈湀鐢ㄧ數</div>
<div class="unit">kw路h</div>
<img src="@/assets/images/ic_dianliang_b@2x.png" class="bg" alt="" />
@@ -179,7 +181,8 @@
<img src="@/assets/images/ic_co2@2x.png" class="co2" alt="">
<div>
<div class="name">鏈湀绱纰虫帓鏀�</div>
- <div><span class="num" v-if="data1.carbon">{{ data1.carbon.toLocaleString() }}</span><span>鍚�</span></div>
+ <div><span class="num" v-if="data1.carbon">{{ data1.carbon.toLocaleString() }}</span><span>鍚�</span>
+ </div>
</div>
</div>
</div>
@@ -197,7 +200,7 @@
<div class="top"><span v-if="i < 3">top</span>{{ i }}</div>
<div class="id_card">{{ item.carNo }}</div>
<div class="wrap">
- <ChargeRate :rate="item.rate" :color="i > 2 ? 'cyan': '#e3a83a'" />
+ <ChargeRate :rate="item.rate" :color="i > 2 ? 'cyan' : '#e3a83a'" />
</div>
<div class="num">{{ item.quantity }}</div>
</div>
@@ -420,7 +423,7 @@
},
series: [
{
- data: data4.value.map(i => i.energy),
+ data: data4.value.map(i => i.energy),
type: 'line',
areaStyle: {
normal: {
@@ -545,7 +548,7 @@
}
const data2 = ref([])
const getData2 = () => {
- zxenergyDataList({type: activeTab2.value}).then(res => {
+ zxenergyDataList({ type: activeTab2.value }).then(res => {
const result = res.data
data2.value = result
initEnergy()
@@ -553,11 +556,26 @@
}
const data3 = ref([])
const getData3 = () => {
+ data3.value = [
+ { carNo: '鐨朅87772', maxOil: 50, quantity: 50 },
+ { carNo: '鐨朅81222', maxOil: 50, quantity: 26 },
+ { carNo: '鐨朅85035', maxOil: 50, quantity: 24 },
+ { carNo: '鐨朅86057', maxOil: 50, quantity: 14 },
+ { carNo: '鐨朅81272', maxOil: 50, quantity: 9 },
+ { carNo: '鐨朅87772', maxOil: 50, quantity: 1 },
+ ]
+ data3.value = data3.value.map(i => {
+ if (i.quantity && i.maxOil) {
+ i.rate = ((i.quantity / i.maxOil) * 25).toFixed(0)
+ }
+ return i
+ })
+ return
zxlastMonthOil().then(res => {
const result = res.data || []
data3.value = result.map(i => {
- if(i.quantity && i.maxOil){
- i.rate = ((i.quantity/i.maxOil) * 25).toFixed(0)
+ if (i.quantity && i.maxOil) {
+ i.rate = ((i.quantity / i.maxOil) * 25).toFixed(0)
}
return i
})
@@ -574,7 +592,7 @@
const data5 = ref([])
const getData5 = () => {
- zxenergyDataList({type: 3}).then(res => {
+ zxenergyDataList({ type: 3 }).then(res => {
const result = res.data
data5.value = result
initOperation()
@@ -632,6 +650,7 @@
.load_wrap {
width: 100%;
height: 250px;
+
.loadRef {
width: 100%;
height: 100%;
@@ -955,9 +974,11 @@
align-items: center;
font-size: 14px;
color: #d2e0ff;
- .tab{
+
+ .tab {
cursor: pointer;
}
+
.separate {
width: 1px;
height: 14px;
@@ -1052,6 +1073,7 @@
height: 980px;
color: #ffffff;
position: relative;
+
.main_bg {
position: absolute;
left: 0;
diff --git a/screen/src/views/FireFighting.vue b/screen/src/views/FireFighting.vue
index b9b4b1f..2e073c7 100644
--- a/screen/src/views/FireFighting.vue
+++ b/screen/src/views/FireFighting.vue
@@ -31,17 +31,22 @@
<span class="item">鏁呴殰</span>
<span class="item">绂荤嚎</span>
</div>
- <template v-for="(item, i) in dataList1" :key="i">
- <div class="line">
- <span class="item name">{{ item.deviceTypeName }}</span>
- <span class="item">{{ item.statusTotal }}</span>
- <span class="item">{{ item.alarmNum }}</span>
- <span class="item">{{ item.shieldNum }}</span>
- <span class="item">{{ item.errNum }}</span>
- <span class="item">{{ item.offlineNum }}</span>
+ <div class="one-swiper list_content">
+ <div class="swiper-wrapper">
+ <div class="line_wrap one-swiper-slide swiper-slide" v-for="(item, i) in dataList1">
+ <div class="line">
+ <span class="item name">{{ item.deviceTypeName }}</span>
+ <span class="item">{{ item.statusTotal }}</span>
+ <span class="item">{{ item.alarmNum }}</span>
+ <span class="item">{{ item.shieldNum }}</span>
+ <span class="item">{{ item.errNum }}</span>
+ <span class="item">{{ item.offlineNum }}</span>
+ </div>
+ <div class="separate"></div>
+ </div>
</div>
- <div class="separate"></div>
- </template>
+ </div>
+
</div>
</div>
</div>
@@ -218,7 +223,8 @@
<div class="separate"></div>
<div class="item">
<div>缁翠繚鐜�</div>
- <div v-if="dataList5.protectNum && dataList5.planProtectTotal" class="num active">{{ ((dataList5.protectNum / dataList5.planProtectTotal) * 100).toFixed(0) }}%</div>
+ <div v-if="dataList5.protectNum && dataList5.planProtectTotal" class="num active">{{
+ ((dataList5.protectNum / dataList5.planProtectTotal) * 100).toFixed(0) }}%</div>
</div>
</div>
<div class="footer">
@@ -262,28 +268,30 @@
<img class="icon" src="@/assets/images/FireFighting/ic_title_green@2x.png" alt="">
<div class="name">鍛婅淇℃伅</div>
</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">
- <span>123</span>
- <span class="status">澶勭悊涓�</span>
- </div>
- <div class="have_time">宸茬粡鍙戠敓<span>1</span>鍒嗛挓</div>
+ <div class="list two-swiper">
+ <div class="swiper-wrapper">
+ <div class="item two-swiper-slide swiper-slide" v-for="item, i in dataList7" :key="i">
+ <div class="icon">
+ <div class="circle"></div>
+ <div class="line"></div>
</div>
- <div class="wrap">
- <div class="title">
- <img class="xf" src="@/assets/images/FireFighting/ic_gaojing_red@2x.png" alt="">
- <span>娑堥槻璀﹀憡</span>
+ <div class="content">
+ <div class="header">
+ <div class="time">
+ <span>{{ item.time }}</span>
+ <span class="status">澶勭悊涓�</span>
+ </div>
+ <div class="have_time">宸茬粡鍙戠敓<span>1</span>鍒嗛挓</div>
</div>
- <div class="title">
- <img class="addr" src="@/assets/images/FireFighting/xiaofang_ic_weizhi@2x.png" alt="">
- <span>A鍘傛埧3杞﹂棿闂ㄥ彛</span>
+ <div class="wrap">
+ <div class="title">
+ <img class="xf" src="@/assets/images/FireFighting/ic_gaojing_red@2x.png" alt="">
+ <span>{{ item.name }}</span>
+ </div>
+ <div class="title">
+ <img class="addr" src="@/assets/images/FireFighting/xiaofang_ic_weizhi@2x.png" alt="">
+ <span>{{ item.addr }}</span>
+ </div>
</div>
</div>
</div>
@@ -302,6 +310,8 @@
import FirePercent from '@/components/FirePercent.vue'
import dayjs from 'dayjs'
import * as echarts from 'echarts'
+import 'swiper/css/swiper.min.css'
+import Swiper from 'swiper'
import {
getFightingalarmData,
getFightingHandle,
@@ -692,11 +702,19 @@
const getData1 = () => {
getFightingDeAlarm().then(res => {
dataList1.value = res.data
+ loopFn1()
})
}
const policeColors = ['#01D9FE', '#FE5501', '#0193FE', '#28F0C4']
const dataList2 = ref([])
const getData2 = () => {
+ let temp = []
+ temp.push({ name: '鐪熷疄鎶ヨ鏁�', num: 10, rate: 20 })
+ temp.push({ name: '璇姤璀︽暟', num: 30, rate: 60 })
+ temp.push({ name: '宸茶В闄�', num: 20, rate: 40 })
+ temp.push({ name: '澶勭悊涓�', num: 8, rate: 16 })
+ dataList2.value = temp
+ return
getFightingalarmData().then(res => {
const result = res.data || {}
let temp = []
@@ -878,8 +896,49 @@
}
const dataList6 = ref([])
const getData6 = () => {
- getFightingHandle({type: 1}).then(res => {
+ getFightingHandle({ type: 1 }).then(res => {
dataList6.value = res.data
+ })
+}
+const dataList7 = ref([])
+const getData7 = () => {
+ dataList7.value = [
+ { name: '娑堥槻鍛婅', addr: '鍘傚尯闂ㄥ彛', time: '2022-02-02' },
+ { name: '娑堥槻鍛婅', addr: '鍘傚尯闂ㄥ彛', time: '2022-02-02' },
+ { name: '娑堥槻鍛婅', addr: '鍘傚尯闂ㄥ彛', time: '2022-02-02' },
+ { name: '娑堥槻鍛婅', addr: '鍘傚尯闂ㄥ彛', time: '2022-02-02' },
+ { name: '娑堥槻鍛婅', addr: '鍘傚尯闂ㄥ彛', time: '2022-02-02' },
+ { name: '娑堥槻鍛婅', addr: '鍘傚尯闂ㄥ彛', time: '2022-02-02' },
+ { name: '娑堥槻鍛婅', addr: '鍘傚尯闂ㄥ彛', time: '2022-02-02' },
+ { name: '娑堥槻鍛婅', addr: '鍘傚尯闂ㄥ彛', time: '2022-02-02' },
+ { name: '娑堥槻鍛婅', addr: '鍘傚尯闂ㄥ彛', time: '2022-02-02' },
+ ]
+ loopFn2()
+}
+
+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,
+ direction: 'vertical', //绔栫洿鏂瑰悜
+ slidesPerView: 5,
+ autoplay: autoplayFlag(dataList1.value, 5, 4000),
+ observer: true, //淇敼swiper鑷繁鎴栧瓙鍏冪礌鏃讹紝鑷姩鍒濆鍖杝wiper
+ })
+}
+const loopFn2 = () => {
+ var newSwiper1 = new Swiper('.two-swiper', {
+ initialSlide: 0,
+ direction: 'vertical', //绔栫洿鏂瑰悜
+ slidesPerView: 4,
+ autoplay: autoplayFlag(dataList7.value, 4, 4000),
+ observer: true, //淇敼swiper鑷繁鎴栧瓙鍏冪礌鏃讹紝鑷姩鍒濆鍖杝wiper
})
}
@@ -890,6 +949,7 @@
getData4()
getData5()
getData6()
+ getData7()
initWatergage()
initLiquidlevel()
@@ -916,8 +976,15 @@
.list_wrap {
padding: 10px 0;
- height: 227px;
- overflow: auto;
+
+ .list_content {
+ height: 170px;
+ overflow: hidden;
+
+ .line_wrap {
+ height: 34px !important;
+ }
+ }
.list {
.line {
@@ -1347,7 +1414,7 @@
margin-right: 7px;
}
}
-
+
.static_wrap {
display: flex;
justify-content: space-evenly;
@@ -1397,15 +1464,15 @@
}
.list {
- height: 330px;
- overflow: auto;
+ height: 320px;
+ overflow: hidden;
margin-top: 15px;
scrollbar-width: none;
-
.item {
display: flex;
font-size: 13px;
color: #D2E0FF;
+ height: 80px !important;
.icon {
width: 40px;
@@ -1465,7 +1532,7 @@
}
.wrap {
- height: 40px;
+ height: 34px;
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;
diff --git a/screen/src/views/LogisticsCenter.vue b/screen/src/views/LogisticsCenter.vue
index b29190e..1611d01 100644
--- a/screen/src/views/LogisticsCenter.vue
+++ b/screen/src/views/LogisticsCenter.vue
@@ -78,7 +78,8 @@
</div>
<div class="search_wrap">
<img src="@/assets/images/LogisticsCenter/ic_search@2x.png" alt="">
- <input class="input" type="text" @blur="getData2" v-model="taskCode">
+ <input class="input" type="text" placeholder="璁㈠崟鏌ヨ" @keyup.enter="getData2" @blur="getData2"
+ v-model="taskCode">
<!-- <span>璁㈠崟鏌ヨ</span> -->
</div>
</div>
@@ -89,12 +90,18 @@
<span class="item">浣嶇疆</span>
<span class="item">浠诲姟涓嬭揪鏃堕棿</span>
</div>
- <div class="line" v-for="(item, i) in transportTask" :key="i">
- <span class="item">{{ item.carNo }}</span>
- <span class="item">{{ item.statusStr }}</span>
- <span class="item">{{ item.address }}</span>
- <span class="item">{{ item.taskDate }}</span>
+ <div class="one-swiper list">
+ <div class="swiper-wrapper">
+ <div class="line one-swiper-slide swiper-slide item" @click="taskClick(item)"
+ v-for="(item, i) in transportTask" :key="i">
+ <span class="item">{{ item.carNo }}</span>
+ <span class="item">{{ item.statusStr }}</span>
+ <span class="item">{{ item.address }}</span>
+ <span class="item">{{ item.taskDate }}</span>
+ </div>
+ </div>
</div>
+
</div>
</div>
</div>
@@ -106,15 +113,12 @@
<span>鍑哄簱鑳藉姏</span>
</div>
<div class="right">
- <img src="@/assets/images/LogisticsCenter/position.png" class="posi" alt="">
- <span>鍏ㄧ渷</span>
- <img src="@/assets/images/LogisticsCenter/bottom.png" class="icon" alt="">
- </div>
- <div class="select_op">
- <div class="line">鍚堣偉浠�</div>
- <div class="line">鍚堣偉浠�</div>
- <div class="line">鍚堣偉浠�</div>
- <div class="line">鍚堣偉浠�</div>
+ <img @click="showPro = !showPro" src="@/assets/images/LogisticsCenter/position.png" class="posi" alt="">
+ <span @click="showPro = !showPro">{{ activeCity.name }}</span>
+ <img @click="showPro = !showPro" src="@/assets/images/LogisticsCenter/bottom.png" class="icon" alt="">
+ <div v-if="showPro" class="select_op">
+ <div class="line" @click="cityClick(item)" v-for="item in cityList">{{ item.name }}</div>
+ </div>
</div>
</div>
<div class="static_wrap">
@@ -193,7 +197,7 @@
<div class="echart_wrap">
<div class="echart3" id="echart3"></div>
<div class="pie_text">
- <!-- <div class="fs30">{{ cneterData.PlanTotal }}%</div> -->
+ <div class="fs30">{{ cneterData.PlanTotal || 30 }}%</div>
</div>
</div>
<div class="text">璁″垝瀹屾垚閲�</div>
@@ -231,6 +235,75 @@
</div>
</div>
</div>
+ <!-- -->
+ <div class="modal_wrap" 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">471342</div>
+ </div>
+ <div class="item">
+ <div class="dian"></div>
+ <div class="la">鍙告満淇℃伅锛�</div>
+ <div class="val">瀛欐枃姝� 17493932936</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">瀹夊窘鐪佸悎鑲ュ競鍖呮渤鍖虹箒鍗庡ぇ閬�123绫冲</div>
+ </div>
+ </div>
+ <div class="tabs">
+ <div :class="{ active: modalTab == 0 }" @click="modalTabClick(0)" class="tab">鍚堝悓1:1231231</div>
+ <div :class="{ active: modalTab == 1 }" @click="modalTabClick(1)" class="tab">鍚堝悓2:1231231</div>
+ </div>
+ <div class="ht_info">
+ <div class="item">
+ <div class="la">鍙戣揣浠撳簱锛�</div>
+ <div class="val">鑺滄箹鎴愬搧</div>
+ </div>
+ <div class="item">
+ <div class="la">棰勮鍒拌揪锛�</div>
+ <div class="val">2024-12-04 14:00</div>
+ </div>
+ <div class="item">
+ <div class="la">鍒拌揣鍦扮偣锛�</div>
+ <div class="val">姹熼棬鐑熻崏鐗╂祦閰嶉�佷腑蹇�</div>
+ </div>
+ <div class="item">
+ <div class="la">杩愯緭閲忥細</div>
+ <div class="val">300涓囨敮</div>
+ </div>
+ </div>
+ <div class="tab1">
+ <div class="title">
+ <img src="@/assets/images/LogisticsCenter/ic_title@2x.png" alt="">
+ <span>鐗╂祦淇℃伅</span>
+ </div>
+ <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="time">2024-04-02 12:00</div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="modal_mask" v-if="showModal" @click="showModal = false"></div>
</div>
</v-scale-screen>
</template>
@@ -241,6 +314,8 @@
import Percent from '@/components/percent.vue'
import dayjs from 'dayjs'
import * as echarts from 'echarts'
+import 'swiper/css/swiper.min.css'
+import Swiper from 'swiper'
import chinaJSON from '@/assets/china.json'
import {
getStoreOperationList,
@@ -312,7 +387,7 @@
labelLine: {
show: false
},
- data: StockOutData.value
+ data: [3, 7]
}
]
}
@@ -328,19 +403,19 @@
echarts.registerMap('china', chinaJSON)
var points = [
// 鐐瑰潗鏍�
- { value: [110.81, 33.40], itemStyle: { color: '#c1bb1f' }, name: '鍖椾含', total: 0, bj: 0, yj: 0, yx: 0, tj: 0, dw: 0 },
- { value: [116.55, 40.01], itemStyle: { color: '#3eef1d' }, name: '鍖椾含', total: 0, bj: 0, yj: 0, yx: 0, tj: 0, dw: 0 },
- { value: [113.11, 28.40], itemStyle: { color: '#3eef1d' }, name: '鍖椾含', total: 5, bj: 0, yj: 0, yx: 5, tj: 0, dw: 0 },
- { value: [106.44, 29.50], itemStyle: { color: '#3eef1d' }, name: '鍖椾含', total: 10, bj: 0, yj: 0, yx: 10, tj: 0, dw: 0 },
- { value: [112.85, 38.95], itemStyle: { color: '#3eef1d' }, name: '鍖椾含', total: 8, bj: 0, yj: 0, yx: 8, tj: 0, dw: 0 },
- { value: [82.78, 43.27], itemStyle: { color: '#3eef1d' }, name: '鍖椾含', total: 18, bj: 0, yj: 0, yx: 18, tj: 0, dw: 0 }
+ { value: [117.1582, 36.8701], itemStyle: { color: '#6ae5e0' }, name: '灞变笢', total: 2, bj: 0, yj: 0, yx: 0, tj: 0, dw: 0 },
+ { value: [117.29, 32.0581], itemStyle: { color: '#6ae5e0' }, name: '瀹夊窘', total: 2, bj: 0, yj: 0, yx: 0, tj: 0, dw: 0 },
+ { value: [114.3896, 30.6628], itemStyle: { color: '#6ae5e0' }, name: '婀栧寳', total: 5, bj: 0, yj: 0, yx: 5, tj: 0, dw: 0 },
+ { value: [119.5313, 29.8773], itemStyle: { color: '#6ae5e0' }, name: '娴欐睙', total: 10, bj: 0, yj: 0, yx: 10, tj: 0, dw: 0 },
+ { value: [113.12244, 23.009505], itemStyle: { color: '#6ae5e0' }, name: '骞夸笢', total: 8, bj: 0, yj: 0, yx: 8, tj: 0, dw: 0 },
+ { value: [103.9526, 30.7617], itemStyle: { color: '#6ae5e0' }, name: '鍥涘窛', total: 18, bj: 0, yj: 0, yx: 18, tj: 0, dw: 0 }
]
var lineToLf = [
{ name: '11', coords: [[110.81, 33.40], [116.55, 40.01]], lineStyle: { color: '#c1bb1f' } },
- { name: '22', coords: [[113.11, 28.40], [116.55, 40.01]], lineStyle: { color: '#3eef1d' } },
- { name: '33', coords: [[106.44, 29.50], [116.55, 40.01]], lineStyle: { color: '#3eef1d' } },
- { name: '44', coords: [[112.85, 38.95], [116.55, 40.01]], lineStyle: { color: '#3eef1d' } },
- { name: '55', coords: [[82.78, 43.27], [116.55, 40.01]], lineStyle: { color: '#3eef1d' } }
+ { name: '22', coords: [[113.11, 28.40], [116.55, 40.01]], lineStyle: { color: '#6ae5e0' } },
+ { name: '33', coords: [[106.44, 29.50], [116.55, 40.01]], lineStyle: { color: '#6ae5e0' } },
+ { name: '44', coords: [[112.85, 38.95], [116.55, 40.01]], lineStyle: { color: '#6ae5e0' } },
+ { name: '55', coords: [[82.78, 43.27], [116.55, 40.01]], lineStyle: { color: '#6ae5e0' } }
]
const option = {
backgroundColor: 'transparent', // 璁剧疆鑳屾櫙鑹查�忔槑
@@ -460,6 +535,7 @@
},
label: {
show: false,
+ triggerOn: 'click',
position: 'right',
formatter: '{b}',
color: '#97e9e1',
@@ -470,6 +546,7 @@
data: points,
tooltip: {
show: true,
+ triggerOn: 'click',
backgroundColor: 'rgba(0,0,0,0)',
padding: 0,
borderWidth: 0,
@@ -643,6 +720,10 @@
}
]
})
+ myChart.on('click', function (params) {
+ console.log(params.name)
+
+ })
window.addEventListener('resize', function () {//鎵ц
myChart.resize()
})
@@ -655,20 +736,48 @@
const transportTask = ref([])
const taskCode = ref('')
+const showModal = ref(false)
+const modalInfo = ref({})
+const modalTab = ref(0)
+const modalTabClick = (val) => {
+ modalTab.value = val
+}
+const taskClick = (item) => {
+ modalInfo.value = item
+ showModal.value = true
+}
const getData2 = () => {
getStoreTaskList({ code: taskCode.value }).then(res => {
let temp = res.data || []
- temp = temp.splice(0, 5)
+ // temp = temp.splice(0, 5)
transportTask.value = temp.map(item => {
item.taskDate = item.taskDate.slice(5, 16)
return item
})
+ loopFn1()
})
}
const cneterData = ref({})
+const showPro = ref(false)
+const cityList = ref([
+ { name: '鍏ㄧ渷', id: 0 },
+ { name: '鍚堣偉浠�', id: 1 },
+ { name: '鑺滄箹浠�', id: 2 },
+ { name: '婊佸窞浠�', id: 3 },
+ { name: '铓屽煚浠�', id: 4 },
+])
+const activeCity = ref({ name: '鍏ㄧ渷', id: 0 })
const colors = ['#0193FE', '#FFB642']
const StockOutData = ref([])
+const cityClick = (item) => {
+ activeCity.value = item
+ showPro.value = false
+ cneterData.value = {}
+ setTimeout(() => {
+ getData3()
+ }, 400)
+}
const initEchart1 = () => {
const myChart = echarts.init(document.getElementById('echart1'))
const option = {
@@ -1131,6 +1240,23 @@
})
}
+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,
+ direction: 'vertical', //绔栫洿鏂瑰悜
+ slidesPerView: 5,
+ autoplay: autoplayFlag(transportTask.value, 5, 4000),
+ observer: true, //淇敼swiper鑷繁鎴栧瓙鍏冪礌鏃讹紝鑷姩鍒濆鍖杝wiper
+ })
+}
+
const initData = () => {
getData1()
getData2()
@@ -1144,9 +1270,12 @@
initMap()
// initEchart2()
- // initEchart3()
+ initEchart3()
// initEchart4()
// initEchart5()
+ window.addEventListener('click', () => {
+
+ })
})
@@ -1162,6 +1291,7 @@
color: #D2E0FF;
font-size: 12px;
border: 1px solid #D2E0FF;
+
.icon {
width: 12px;
height: 14px;
@@ -1187,6 +1317,10 @@
<style lang="scss" scoped>
div {
box-sizing: border-box;
+}
+
+.swiper-wrapper {
+ display: block !important;
}
.main_content {
@@ -1314,12 +1448,18 @@
}
.list_wrap {
+ .list {
+ height: 200px;
+ overflow: hidden;
+ }
+
.line {
display: flex;
height: 40px;
align-items: center;
font-size: 14px;
color: #D2E0FF;
+ cursor: pointer;
&:nth-of-type(2n) {
background: rgba(134, 156, 201, 0.05);
@@ -1362,18 +1502,14 @@
font-weight: bold;
font-size: 18px;
position: relative;
- &:hover{
- .select_op{
- display: block;
- }
- }
- background-image: -webkit-linear-gradient(top,
- #ffffff 0%,
- #c8ddff 66%,
- #85b4ff 72%,
- #74a9ff 100%);
+
+ /* background-image: -webkit-linear-gradient(top,
+ #ffffff 0%,
+ #c8ddff 66%,
+ #85b4ff 72%,
+ #74a9ff 100%);
-webkit-background-clip: text;
- -webkit-text-fill-color: transparent;
+ -webkit-text-fill-color: transparent; */
.left {
display: flex;
@@ -1389,6 +1525,7 @@
display: flex;
align-items: center;
cursor: pointer;
+ position: relative;
.posi {
width: 16px;
@@ -1400,19 +1537,22 @@
margin-left: 2px;
}
}
- .select_op{
+
+ .select_op {
position: absolute;
top: 26px;
- right: 0px;
+ right: -10px;
width: 90px;
- z-index: 11;
- display: none;
- background: radial-gradient( 64% 83% at 50% 50%, rgba(19,88,173,0.8) 0%, rgba(5,18,32,0.86) 100%);
- .line{
+ z-index: 1199999;
+ background: radial-gradient(64% 83% at 50% 50%, rgba(19, 88, 173, 0.8) 0%, rgba(5, 18, 32, 0.86) 100%);
+ color: #fff;
+
+ .line {
display: flex;
justify-content: center;
align-items: center;
height: 36px;
+ font-size: 18px;
cursor: pointer;
color: #fff;
}
@@ -1738,6 +1878,198 @@
}
}
+.modal_wrap {
+ width: 600px;
+ height: 556px;
+ background: rgba(0, 30, 63, 0.5);
+ border: 1px solid #c6eef7;
+ backdrop-filter: blur(5px);
+ position: fixed;
+ top: 20%;
+ left: 50%;
+ transform: translate(-50%, 0);
+ z-index: 999;
+ 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-left: 12px;
+ 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;
+ }
+ }
+
+ .ht_info {
+ display: flex;
+ flex-wrap: wrap;
+ padding: 10px 10px 0;
+ background-color: #0d2845;
+ margin-bottom: 20px;
+
+ .item {
+ display: flex;
+ align-items: center;
+ font-size: 13px;
+ width: 55%;
+ margin-bottom: 8px;
+
+ &:nth-of-type(2n+1) {
+ width: 45%;
+ }
+
+ .la {
+ color: #01D9FE;
+ }
+ }
+ }
+
+ .tab1 {
+ .title {
+ display: flex;
+ align-items: center;
+ font-style: 16px;
+ font-weight: 600;
+ margin-bottom: 20px;
+
+ img {
+ width: 24px;
+ margin-right: 4px;
+ }
+ }
+
+ .item {
+ display: flex;
+ margin-left: 6px;
+
+ &: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;
+ }
+ }
+ }
+ }
+
+}
+
+.modal_mask {
+ position: fixed;
+ width: 100%;
+ height: 100%;
+ top: 0;
+ left: 0;
+ z-index: 99;
+ background-color: rgba(0, 0, 0, 0.1);
+ /* background-color: red; */
+}
+
.second_title {
height: 24px;
display: flex;
diff --git a/screen/src/views/LogisticsEfficiency.vue b/screen/src/views/LogisticsEfficiency.vue
index 1d043b5..1861f8d 100644
--- a/screen/src/views/LogisticsEfficiency.vue
+++ b/screen/src/views/LogisticsEfficiency.vue
@@ -91,7 +91,7 @@
</div>
<div class="one-swiper list_temp">
<div class="swiper-wrapper">
- <div class="line swiper-slide one-swiper-slide" v-for="item in dataList3">
+ <div class="line swiper-slide one-swiper-slide" @click="showModal = true" v-for="item in dataList3">
<span class="item flag"><span :class="{ flag_bg: item.type == 1 || item.type == 3 }">{{ item.type
== 1
|| item.type == 3 ? '鍑�' : '鍏�' }}</span></span>
@@ -99,7 +99,8 @@
<span class="item id_card">{{ item.carCodeFront }}</span>
<span class="item status">{{ statusMap[item.status].label }}</span>
<span class="item addr">{{ item.repertotyAddress }}</span>
- <span class="item time" v-if="item.confirmTaskDate">{{ item.confirmTaskDate.slice(5, 16) }}</span>
+ <span class="item time">{{ item.confirmTaskDate ? item.confirmTaskDate.slice(5, 16) : '-'
+ }}</span>
</div>
</div>
</div>
@@ -147,7 +148,24 @@
</div>
</div>
<div class="center_box_two">
- <div ref="echartMap" class="echart_map" id="echartMap"></div>
+ <div class="list">
+ <div class="item">
+ <img src="@/assets/images/LogisticsCenter/car_zaitu@2x.png" alt="">
+ <span>鍦ㄩ�旓細{{ 8 }}</span>
+ </div>
+ <div class="item">
+ <img src="@/assets/images/LogisticsCenter/car_kongxian@2x.png" alt="">
+ <span>绌洪棽锛歿{ 8 }}</span>
+ </div>
+ <div class="item">
+ <img src="@/assets/images/LogisticsCenter/car_lixian@2x.png" alt="">
+ <span>绂荤嚎锛歿{ 8 }}</span>
+ </div>
+ </div>
+ <div class="echart_wrap">
+ <div ref="echartMap" class="echart_map" id="echartMap"></div>
+ </div>
+
</div>
</div>
<div class="right_box">
@@ -296,6 +314,7 @@
</div>
</div>
</div>
+ <div class="modal_mask" v-if="showModal" @click="showModal = false"></div>
</div>
</v-scale-screen>
</template>
@@ -543,7 +562,7 @@
color: ['#1984ff', '#184b8d'],
img: icKongxian,
data: [
- { name: '鑵惧啿甯�', value: [117.25, 31.49] },
+ { name: '', value: [117.25, 31.49] },
],
},
{
@@ -552,7 +571,7 @@
color: ['#f16c08', '#7f3710'],
img: icLixian,
data: [
- { name: '鑵惧啿甯�', value: [118.5, 31.08] },
+ { name: '', value: [118.5, 31.08] },
],
}
]
@@ -588,7 +607,7 @@
},
}
},
- symbolSize: [24, 30],
+ symbolSize: [32, 40],
hoverAnimation: true,
zlevel: 99,
@@ -619,12 +638,12 @@
{ name: "婊佸窞甯�", value: 0 },
{ name: "鑺滄箹甯�", value: 1 },
{ name: "闃滈槼甯�", value: 0 },
- { name: "铓屽煚甯�", value: 0 },
+ { name: "铓屽煚甯�", value: 4 },
{ name: "娣崡甯�", value: 0 },
- { name: "椹瀺灞卞競", value: 0 },
- { name: "瀹夊簡甯�", value: 0 },
+ { name: "椹瀺灞卞競", value: 6 },
+ { name: "瀹夊簡甯�", value: 2 },
{ name: "榛勫北甯�", value: 0 },
- { name: "閾滈櫟甯�", value: 0 },
+ { name: "閾滈櫟甯�", value: 40 },
{ name: "瀹垮窞甯�", value: 0 },
{ name: "娣寳甯�", value: 0 },
{ name: "鍏畨甯�", value: 0 },
@@ -663,7 +682,7 @@
geo: [{
map: 'js',
roam: false, //鏄惁鍏佽缂╂斁
- zoom: 1.1, //榛樿鏄剧ず绾у埆
+ zoom: 1.2, //榛樿鏄剧ず绾у埆
scaleLimit: {
min: 0,
max: 3
@@ -728,7 +747,7 @@
type: 'map',
mapType: 'js',
geoIndex: -1,
- zoom: 1.1, //榛樿鏄剧ず绾у埆
+ zoom: 1.2, //榛樿鏄剧ず绾у埆
label: {
show: true,
color: '#ffffff',
@@ -1060,7 +1079,8 @@
}
.time {
- flex: 8;
+ flex: 6;
+ margin-left: 6px;
}
}
}
@@ -1166,10 +1186,37 @@
.center_box_two {
flex: 1;
width: 100%;
+ position: relative;
- .echart_map {
+ .list {
+ position: absolute;
+ top: 10px;
+ left: 20px;
+
+ .item {
+ display: flex;
+ align-items: center;
+ font-weight: 500;
+ font-size: 20px;
+ margin-bottom: 18px;
+
+ img {
+ width: 36px;
+ height: 36px;
+ margin-right: 15px;
+ }
+ }
+ }
+
+ .echart_wrap {
width: 100%;
height: 100%;
+
+ .echart_map {
+ width: 100%;
+ height: 100%;
+ /* transform: rotate(60deg); */
+ }
}
}
}
@@ -1328,7 +1375,7 @@
.list {
margin-top: 22px;
height: 240px;
- overflow: auto;
+ overflow: hidden;
scrollbar-width: none;
.item {
@@ -1494,7 +1541,7 @@
top: 20%;
left: 50%;
transform: translate(-50%, 0);
- z-index: 99;
+ z-index: 999;
padding: 24px;
.title_head {
@@ -1678,6 +1725,17 @@
}
}
+.modal_mask {
+ position: fixed;
+ width: 100%;
+ height: 100%;
+ top: 0;
+ left: 0;
+ z-index: 99;
+ background-color: rgba(0, 0, 0, 0.1);
+ /* background-color: red; */
+}
+
.bg {
position: absolute;
left: 0;
diff --git a/screen/src/views/SecurityControl.vue b/screen/src/views/SecurityControl.vue
index 282403c..c13e8f9 100644
--- a/screen/src/views/SecurityControl.vue
+++ b/screen/src/views/SecurityControl.vue
@@ -43,7 +43,7 @@
<div class="rate">
<div class="la">
<span>杞︿綅浣跨敤鐜�</span>
- <span v-if="data.inParkCarTotal && data.parkingLotTotal" class="num">{{ data.parkingUseRate }}%</span>
+ <span class="num">{{ data.parkingUseRate }}%</span>
</div>
<div class="val">
<Percent :rate="data.parkingUseRate" />
@@ -88,7 +88,8 @@
<div class="car_static">
<div class="echart_wrap">
<div class="pie_text">
- <div class="fs30"><strong v-if="data.visitJobCarTotal || data.visitJobCarTotal == 0">{{ data.internalJobCarTotal +
+ <div class="fs30"><strong v-if="data.visitJobCarTotal || data.visitJobCarTotal == 0">{{
+ data.internalJobCarTotal +
data.relatedJobCarTotal + data.visitJobCarTotal }}</strong></div>
<div>璐ц溅</div>
</div>
@@ -116,7 +117,8 @@
<div class="menus">
<div class="search_wrap">
<img class="search" src="@/assets/images/SecurityControl/ic_search@2x.png" alt="">
- <input v-model="dataValue5" @blur="getData5" @keyup.enter="getData5" class="input" type="text" placeholder="鎼滅储鐩戞帶鍚嶇О">
+ <input v-model="dataValue5" @blur="getData5" @keyup.enter="getData5" class="input" type="text"
+ placeholder="鎼滅储鐩戞帶鍚嶇О">
</div>
<div class="menu_wrap">
<div class="menu" v-for="menu, i in data5">
@@ -322,24 +324,45 @@
</div>
<img src="@/assets/images/title@2x.png" class="bg" alt="" />
</div>
- <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 class="one_swiper_wrap">
+ <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="line time">
- <img class="icon" src="@/assets/images/SecurityControl/clock.png" alt="">
- <span>{{ item.createDate }}</span>
+ <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>
+ <div v-if="item.title0 && item.createDate0" class="item_wrap">
+ <img :src="item.img0" class="avatar" alt="">
+ <div class="content">
+ <div class="header">
+ <div class="name">{{ item.title0 }}</div>
+ <div class="have_time">宸茬粡鍙戠敓{{ item.haveTime0 }}</div>
+ </div>
+ <div class="wrap">
+ <div class="line addr">
+ <img class="icon" src="@/assets/images/SecurityControl/xiaofang_ic_weizhi@2x.png" alt="">
+ <span>{{ item.addr0 }}</span>
+ </div>
+ <div class="line time">
+ <img class="icon" src="@/assets/images/SecurityControl/clock.png" alt="">
+ <span>{{ item.createDate0 }}</span>
+ </div>
</div>
</div>
</div>
@@ -347,6 +370,7 @@
</div>
</div>
</div>
+
</div>
<div class="garden_warning">
<div class="com_header">
@@ -425,7 +449,7 @@
<div class="dept">鎷滆閮ㄩ棬</div>
<div class="dept">瓒呮椂鏃堕暱</div>
</div>
- <div class="three-swiper list">
+ <div v-if="dataList3.length > 0" class="three-swiper list">
<div class="swiper-wrapper">
<div class="item swiper-slide three-swiper-slide" v-for="item in dataList3">
<div class="line">
@@ -437,7 +461,9 @@
</div>
</div>
</div>
-
+ <div class="empty_wrap">
+ <img v-if="dataList3.length == 0" src="@/assets/images/default_empty.png" alt="">
+ </div>
</div>
</div>
</div>
@@ -643,9 +669,9 @@
}])]
const data = []
data.push({ name: '寰呰闂�', value: data4.value.waitVisitNum, rate: data4.value.waitVisitNum / data4.value.total })
- data.push({ name: '宸茬櫥璁�', value: data4.value.registerVisitNum, rate: data4.value.registerVisitNum / data4.value.total })
- data.push({ name: '宸茬寮�', value: data4.value.levelNum, rate: data4.value.levelNum / data4.value.total })
- data.push({ name: '婊炵暀', value: data4.value.retentionNum, rate: data4.value.retentionNum / data4.value.total })
+ data.push({ name: '宸茬櫥璁�', value: data4.value.registerVisitNum, rate: data4.value.registerVisitNum / data4.value.total })
+ data.push({ name: '宸茬寮�', value: data4.value.levelNum, rate: data4.value.levelNum / data4.value.total })
+ data.push({ name: '婊炵暀', value: data4.value.retentionNum, rate: data4.value.retentionNum / data4.value.total })
const option = {
color: colors,
tooltip: {
@@ -683,6 +709,9 @@
gap: 4,
label: {
show: false,
+ formatter: '',
+ lineHeight: 0,
+ position: 'inside'
},
tooltip: {
trigger: 'none', // 褰撻紶鏍囨偓娴湪鏌愪釜鏁版嵁椤逛笂鏃惰Е鍙�
@@ -798,10 +827,10 @@
const data4 = ref({})
const getData3 = () => {
visitSecurityData().then(res => {
- if( !res.code == 200) return
+ if (!res.code == 200) return
data4.value = res.data || {}
let obj = data4.value
- data4.value.total = obj.levelNum + obj.retentionNum + obj.registerVisitNum + obj.waitVisitNum
+ data4.value.total = obj.levelNum + obj.retentionNum + obj.registerVisitNum + obj.waitVisitNum
const result = res.data.visitRetentionDataList || []
dataList3.value = result.map(i => {
if (i.timeOutMinute) {
@@ -861,7 +890,23 @@
item.haveTime = dayjs.duration(new Date().getTime() - new Date(item.createDate).getTime()).format('HH灏忔椂mm鍒嗛挓')
return item
})
- // loopFn1()
+ let temp = []
+ warningList.value.forEach((item, i) => {
+ // console.log(i);
+ if (i == 0 || i % 2 == 0) {
+ console.log(i)
+ temp.push(item)
+ } else {
+ temp[temp.length - 1].addr0 = item.addr
+ temp[temp.length - 1].createDate0 = item.createDate
+ temp[temp.length - 1].haveTime0 = item.haveTime
+ temp[temp.length - 1].img0 = item.img
+ temp[temp.length - 1].title0 = item.title
+ }
+ })
+ warningList.value = temp
+ // console.log('temp', warningList.value);
+ loopFn1()
})
}
const tasClick = (val) => {
@@ -909,13 +954,10 @@
const loopFn1 = () => {
var newSwiper1 = new Swiper('.one-swiper', {
initialSlide: 0,
- loop: true, // 寰幆妯″紡閫夐」
+ // loop: true, // 寰幆妯″紡閫夐」
direction: 'vertical', //绔栫洿鏂瑰悜
- slidesPerView: 1,
- slidesPerGroup: 2,
- slidesPerColumn: 2,
- // autoplay: { delay: 500, disableOnInteraction: false },
- autoplay: warningList.value.length > 2 ? { delay: 500, disableOnInteraction: false } : false,
+ slidesPerView: 2,
+ autoplay: warningList.value.length > 1 ? { delay: 4000, disableOnInteraction: false } : false,
observer: true, //淇敼swiper鑷繁鎴栧瓙鍏冪礌鏃讹紝鑷姩鍒濆鍖杝wiper
})
}
@@ -924,7 +966,7 @@
initialSlide: 0,
direction: 'vertical', //绔栫洿鏂瑰悜
slidesPerView: 3,
- autoplay: autoplayFlag(dataList2.value, 3, 2000),
+ autoplay: autoplayFlag(dataList2.value, 3, 4000),
observer: true, //淇敼swiper鑷繁鎴栧瓙鍏冪礌鏃讹紝鑷姩鍒濆鍖杝wiper
})
}
@@ -1231,7 +1273,7 @@
.menu_wrap {
margin-top: 15px;
max-height: 440px;
- overflow: auto;
+ overflow: hidden;
.menu {
.menu_name {
@@ -1533,9 +1575,13 @@
margin-right: 20px;
/* one-swiper */
+ .one_swiper_wrap{
+ height: 140px;
+ overflow: hidden;
+ }
.list {
- height: 124px;
- overflow: auto;
+ height: 204px;
+ overflow: hidden;
margin-top: 15px;
scrollbar-width: none;
display: flex;
@@ -1543,24 +1589,25 @@
margin-left: 20px;
.item {
- width: 366px;
- /* width: 50%; */
- float: left;
+ width: 736px;
height: 102px !important;
font-size: 13px;
color: #D2E0FF;
- margin-right: 10px;
+ display: flex;
- &:nth-of-type(2n) {
- margin-right: 0;
- }
-
+ /* border: 1px solid; */
.item_wrap {
+ width: 368px;
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;
+ margin-right: 10px;
+
+ &:nth-of-type(2n) {
+ margin-right: 0;
+ }
}
@@ -1699,7 +1746,7 @@
.table {
.list {
height: 102px !important;
- overflow: auto;
+ overflow: hidden;
.item {
height: 34px !important;
@@ -1766,7 +1813,7 @@
.table {
.list {
height: 102px !important;
- overflow: auto;
+ overflow: hidden;
.item {
height: 34px !important;
diff --git a/screen/src/views/TaskEfficiency.vue b/screen/src/views/TaskEfficiency.vue
index fc9f8c0..23caa32 100644
--- a/screen/src/views/TaskEfficiency.vue
+++ b/screen/src/views/TaskEfficiency.vue
@@ -228,13 +228,13 @@
<div class="line" v-for="item, i in data6?.platformLogList">
<div class="time_wrap">
<div class="time" :style="{
- backgroundColor: item.objType == 5?'#4ca8f7':item.objType == 6?'#f2b23e':item.objType == 10?'#4673f6':'#4aa38f'
+ 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'
+ 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'
+ backgroundColor: item.objType == 5 ? '#4ca8f7' : item.objType == 6 ? '#f2b23e' : item.objType == 10 ? '#4673f6' : '#4aa38f'
}"></div>
</div>
<div class="id_card">{{ item.carCodeFront || item.param4 }}</div>
@@ -556,10 +556,10 @@
color: '#61d3f9'
}])]
const 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) })
+ temp.push({ name: '绛惧埌鏁�', value: data4.value?.signedNum || 0, rate: data4.value?.signedNum ? '100.0' : 0 })
+ temp.push({ name: '宸插彨鍙�', value: data4.value?.calledNum || 0, rate: data4.value?.signedNum ? (data4.value.calledNum / data4.value?.signedNum * 100).toFixed(1) : 0 })
+ temp.push({ name: '宸蹭綔涓�', value: data4.value?.workedNum || 0, rate: data4.value?.signedNum ? (data4.value.workedNum / data4.value?.signedNum * 100).toFixed(1) : 0 })
+ temp.push({ name: '宸插畬鎴�', value: data4.value?.doneNum || 0, rate: data4.value?.signedNum ? (data4.value.doneNum / data4.value?.signedNum * 100).toFixed(1) : 0 })
console.log('temp', temp)
const option = {
@@ -581,7 +581,10 @@
maxSize: '80%',
gap: 4,
label: {
- show: false
+ show: false,
+ formatter: '',
+ lineHeight: 0,
+ position: 'inside'
},
itemStyle: { //鍘绘帀榛樿鐧借壊杈规绾�
@@ -753,7 +756,7 @@
const data7 = ref([])
const getData7 = () => {
- cnwarningList({ size: 7 }).then(res => {
+ cnwarningList({ size: 10 }).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鍒嗛挓')
@@ -924,7 +927,7 @@
padding: 0px 24px 0px;
height: 200px;
margin-top: 20px;
- overflow: auto;
+ overflow: hidden;
.line {
display: flex;
@@ -1146,18 +1149,18 @@
.two-swiper {
height: 180px;
- overflow: auto;
+ overflow: hidden;
}
.line {
display: flex;
height: 30px;
- &:nth-of-type(2n) {
+ &:nth-of-type(2n + 1) {
background: rgba(12, 153, 236, 0.2);
}
- &:nth-of-type(2n + 1) {
+ &:nth-of-type(2n) {
background: rgba(1, 15, 35, 0.61);
box-shadow: inset 0px 0px 40px 0px rgba(23, 51, 108, 0.66);
}
@@ -1167,15 +1170,17 @@
display: flex;
justify-content: center;
align-items: center;
- font-size: 12px;
+ font-size: 14px;
color: #D2E0FF;
}
}
.header {
font-weight: 500;
- font-size: 13px;
+ font-size: 14px;
color: #01ABFE;
+ background: rgba(1, 15, 35, 0.61) !important;
+ box-shadow: inset 0px 0px 40px 0px rgba(23, 51, 108, 0.66) !important;
}
}
}
@@ -1197,7 +1202,7 @@
align-items: center;
.name {
- font-size: 12px;
+ font-size: 14px;
color: #D2E0FF;
}
@@ -1282,14 +1287,16 @@
.list {
height: 220px;
- overflow: auto;
+ overflow: hidden;
margin-top: 15px;
scrollbar-width: none;
+
.item {
display: flex;
font-size: 13px;
color: #D2E0FF;
height: 110px;
+
.icon {
width: 40px;
display: flex;
diff --git a/screen/vite.config.js b/screen/vite.config.js
index f4a5d19..a9d005f 100644
--- a/screen/vite.config.js
+++ b/screen/vite.config.js
@@ -20,13 +20,13 @@
},
build: {
- outDir: 'platform_screen'
+ outDir: 'screen'
},
server: {
proxy: {
"/gateway_interface": {
- target: "http://192.168.0.103:10010",
- // target: "http://10.50.250.253:8088/gateway_interface",
+ // target: "http://192.168.0.103:10010",
+ target: "http://10.50.250.253:8088/gateway_interface",
// target: "http://192.168.0.173/gateway_interface",
changeOrigin: true,
rewrite: (path) => path.replace(/^\/gateway_interface/, ""),
--
Gitblit v1.9.3