From 8eb708f2b6d792f03725a0ff437f51da5af45a45 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 29 十一月 2024 10:02:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/index.vue | 64 +++++++++
screen/src/api/index.js | 5
screen/src/views/LogisticsCenter.vue | 4
admin/src/components/common/CommonHeader.vue | 106 ++++++++++++---
screen/src/views/LogisticsEfficiency.vue | 2
screen/src/router/index.js | 16 +-
screen/src/views/EnergyConsum.vue | 14 +
screen/src/views/SecurityControl.vue | 22 ++
screen/src/views/FireFighting.vue | 137 +++++++++++++------
screen/src/views/TaskEfficiency.vue | 14 +
10 files changed, 299 insertions(+), 85 deletions(-)
diff --git a/admin/src/components/common/CommonHeader.vue b/admin/src/components/common/CommonHeader.vue
index da0ed18..d694116 100644
--- a/admin/src/components/common/CommonHeader.vue
+++ b/admin/src/components/common/CommonHeader.vue
@@ -12,6 +12,7 @@
<div class="item" @click="getHeaderNav('1')">娑堟帶涓績</div>
<div class="item" @click="getHeaderNav('2')">鑳界涓績</div>
<div class="item" @click="getHeaderNav('3')">椹鹃┒鑸�</div>
+ <!-- <div class="item" @click="handleTest">娴嬭瘯</div> -->
</div>
<!-- <div class="title-en">Diagnosis of Intelligent Manufacturing Integrated Service Platfrom</div> -->
</div>
@@ -31,26 +32,26 @@
</div>
</div>
<!-- 淇敼瀵嗙爜 -->
- <GlobalAlertWindow title="淇敼瀵嗙爜" :visible.sync="visible.changePwd"
- :showClose="userInfo && (!userInfo.needChangePwd || userInfo.needChangePwd == '0')"
- :showCancel="userInfo && (!userInfo.needChangePwd || userInfo.needChangePwd == '0')" @confirm="confirmChangePwd"
- @close="visible.changePwd = false">
- <el-form :model="changePwdData.form" ref="changePwdDataForm" :rules="changePwdData.rules">
- <el-form-item label="鍘熷瀵嗙爜" prop="oldPwd" required>
- <el-input v-model="changePwdData.form.oldPwd" type="password" placeholder="璇疯緭鍏ュ師濮嬪瘑鐮�" maxlength="30"
- show-password></el-input>
- </el-form-item>
- <el-form-item label="鏂板瘑鐮�" prop="newPwd" required>
- <el-input v-model="changePwdData.form.newPwd" type="password" placeholder="璇疯緭鍏ユ柊瀵嗙爜锛屽瘑鐮侀渶鍖呭惈瀛楁瘝銆佹暟瀛楀強鐗规畩瀛楃涓殑鑷冲皯涓ょ"
- maxlength="20" show-password></el-input>
- </el-form-item>
- <!-- <div style="font-size: 12px;color:#999999">瀵嗙爜闇�鍖呭惈瀛楁瘝銆佹暟瀛楀強鐗规畩瀛楃涓殑鑷冲皯涓ょ</div> -->
- <el-form-item label="纭鏂板瘑鐮�" prop="confirmPwd" required>
- <el-input v-model="changePwdData.form.confirmPwd" type="password" placeholder="璇峰啀娆¤緭鍏ユ柊瀵嗙爜" maxlength="20"
- show-password></el-input>
- </el-form-item>
- </el-form>
- </GlobalAlertWindow>
+ <GlobalAlertWindow title="淇敼瀵嗙爜" :visible.sync="visible.changePwd"
+ :showClose="userInfo && (!userInfo.needChangePwd || userInfo.needChangePwd == '0')"
+ :showCancel="userInfo && (!userInfo.needChangePwd || userInfo.needChangePwd == '0')" @confirm="confirmChangePwd"
+ @close="visible.changePwd = false">
+ <el-form :model="changePwdData.form" ref="changePwdDataForm" :rules="changePwdData.rules">
+ <el-form-item label="鍘熷瀵嗙爜" prop="oldPwd" required>
+ <el-input v-model="changePwdData.form.oldPwd" type="password" placeholder="璇疯緭鍏ュ師濮嬪瘑鐮�" maxlength="30"
+ show-password></el-input>
+ </el-form-item>
+ <el-form-item label="鏂板瘑鐮�" prop="newPwd" required>
+ <el-input v-model="changePwdData.form.newPwd" type="password" placeholder="璇疯緭鍏ユ柊瀵嗙爜锛屽瘑鐮侀渶鍖呭惈瀛楁瘝銆佹暟瀛楀強鐗规畩瀛楃涓殑鑷冲皯涓ょ"
+ maxlength="20" show-password></el-input>
+ </el-form-item>
+ <!-- <div style="font-size: 12px;color:#999999">瀵嗙爜闇�鍖呭惈瀛楁瘝銆佹暟瀛楀強鐗规畩瀛楃涓殑鑷冲皯涓ょ</div> -->
+ <el-form-item label="纭鏂板瘑鐮�" prop="confirmPwd" required>
+ <el-input v-model="changePwdData.form.confirmPwd" type="password" placeholder="璇峰啀娆¤緭鍏ユ柊瀵嗙爜" maxlength="20"
+ show-password></el-input>
+ </el-form-item>
+ </el-form>
+ </GlobalAlertWindow>
</div>
</template>
@@ -114,7 +115,7 @@
},
mounted() {
// needChangePwd 0 : 榛樿瀵嗙爜闇�瑕佷慨鏀癸紝1 涓嶉渶瑕�
- if (userInfo &&(!this.userInfo.needChangePwd || this.userInfo.needChangePwd == '0')) {
+ if (userInfo && (!this.userInfo.needChangePwd || this.userInfo.needChangePwd == '0')) {
this.visible.changePwd = true
}
},
@@ -164,6 +165,67 @@
window.open(res, "_blank")
})
},
+ handleTest() {
+ const myWindow = window.open('https://10.50.250.253/portal/ui/index?componentId=dfe&componentMenuId=process_apply')
+ setTimeout(() => {
+ const params = {
+ componentId: 'dfe',
+ componentMenuId: 'process_apply',
+ callback: {
+ method: 'dealTlncMsg', argument: {
+ "msgId": "98c256b9-aaff-11ef-8347-fa163ee2c57c",
+ "moduleId": "dfeFlowTodoModuleId",
+ "msgTitle": "璇峰強鏃跺鐞�13856591439鍙戣捣鐨勮鍋囩敵璇�",
+ "msgStatus": "0",
+ "msgCreateTime": "浠婂ぉ 15:33",
+ "msgCreateTimeIso": "2024-11-25T15:33:42.000+08:00",
+ "serverTime": 1732531014591,
+ "menuCode": "process_apply",
+ "msgStatusStr": "寰呭鐞�",
+ "comId": "dfe",
+ "userId": "13856591439",
+ "extendNoShow": "{\"processInstanceId\":\"98a57fe0-aaff-11ef-8347-fa163ee2c57c\",\"processId\":\"process_dabcfdd39f1b6f46d36a9f4ff6ce1080\",\"param\":{\"sourceType\":\"todo\",\"modelCode\":\"tb_leave_dfe_for_dfe_runtime\",\"processNodeId\":\"UserTask_dde7d83377343a2d5fa1f60c23b023ef\",\"taskId\":\"98c256b9-aaff-11ef-8347-fa163ee2c57c\"},\"process.param.appId\":\"32ca8770-6f85-11ec-b5a3-991864da52a6\",\"appId\":\"32ca8770-6f85-11ec-b5a3-991864da52a6\",\"name\":\"璇峰亣鐢宠\",\"taskId\":\"98c256b9-aaff-11ef-8347-fa163ee2c57c\",\"taskNodeId\":\"UserTask_dde7d83377343a2d5fa1f60c23b023ef\",\"url\":\"/dfe-form/process/tlnc/apply\"}",
+ "targetComId": "dfe",
+ "moduleName": "娴佺▼寰呭姙",
+ "tid": "99cad778-aaff-11ef-9dbf-ff08ba71965c",
+ "msgEndTime": null,
+ "msgEndTimeIso": "",
+ "picUrl": "",
+ "extendJson": "{\"key1\":\"璇峰強鏃跺鐞嗛檲楦块鍙戣捣鐨勮鍋囩敵璇穃"}",
+ "extendParam": null,
+ "extendCascade": null,
+ "createUser": "13856591439",
+ "webCascadeUrl": null,
+ "h5CascadeUrl": null,
+ "cascadeTodoOpenType": null,
+ "cascadeSourceConfigId": null,
+ "h5Url": "/h5/pages/form-page/form-page?returnPath=-1&appId=32ca8770-6f85-11ec-b5a3-991864da52a6&taskId=98c256b9-aaff-11ef-8347-fa163ee2c57c&processNodeId=UserTask_dde7d83377343a2d5fa1f60c23b023ef&modelCode=tb_leave_dfe_for_dfe_runtime&type=flowHandle&component=form-apply&_sn=true",
+ "segmentId": "dfe-form",
+ "lastUsers": "闄堥缚椋�",
+ "currentUsers": "闄堥缚椋�",
+ "todoTypeCode": "dfe@@tlnc_placeholder_tlnc@@dfeFlowTodoModuleId",
+ "currentUserIds": "13856591439",
+ "lastUserIds": "13856591439",
+ "msgDesc": null,
+ "widgetUrl": null,
+ "detailType": null,
+ "widgetWidth": null,
+ "widgetHeight": null,
+ "userIdList": null,
+ "statusName": null,
+ "arriveTime": null,
+ "stayTime": null,
+ "todoType": null,
+ "cascadePort": null,
+ "openMode": null
+ }
+ },
+ msgType: 'tlnc'
+ }
+ let argus = JSON.stringify(params)
+ myWindow.postMessage('{"method":"goToApp","argument":' + argus + '}', '*')
+ }, 3000)
+ },
// 纭畾淇敼瀵嗙爜
confirmChangePwd() {
if (this.isWorking.changePwd) {
@@ -186,7 +248,7 @@
})
.then(() => {
this.$tip.apiSuccess('淇敼鎴愬姛')
- this.$store.commit('setUserInfo', {needChangePwd: 1})
+ this.$store.commit('setUserInfo', { needChangePwd: 1 })
this.visible.changePwd = false
})
.catch(e => {
diff --git a/admin/src/views/index.vue b/admin/src/views/index.vue
index c50e64b..1aca030 100644
--- a/admin/src/views/index.vue
+++ b/admin/src/views/index.vue
@@ -133,7 +133,7 @@
<div class="task">
<div class="header df_sb">
<div class="home_title df">
- <span>寰呭姙浜嬮」</span>
+ <span @click="handleTest">寰呭姙浜嬮」</span>
<span class="num" v-if="taskTotal">{{ taskTotal }}</span>
</div>
<div class="df_ac more" @click="jumpPage('/task/index')">
@@ -257,11 +257,73 @@
setInterval(() => {
this.updateDate()
}, 1000 * 60 * 60)
+
},
mounted() {
this.initData()
},
methods: {
+ handleTest() {
+ const myWindow = window.open('https://10.50.250.253/portal/ui/index?componentId=dfe&componentMenuId=process_apply')
+ setTimeout(() => {
+ const params = {
+ componentId: 'dfe',
+ componentMenuId: 'process_apply',
+ callback: {
+ method: 'dealTlncMsg', argument: {
+ "msgId": "98c256b9-aaff-11ef-8347-fa163ee2c57c",
+ "moduleId": "dfeFlowTodoModuleId",
+ "msgTitle": "璇峰強鏃跺鐞�13856591439鍙戣捣鐨勮鍋囩敵璇�",
+ "msgStatus": "0",
+ "msgCreateTime": "浠婂ぉ 15:33",
+ "msgCreateTimeIso": "2024-11-25T15:33:42.000+08:00",
+ "serverTime": 1732531014591,
+ "menuCode": "process_apply",
+ "msgStatusStr": "寰呭鐞�",
+ "comId": "dfe",
+ "userId": "13856591439",
+ "extendNoShow": "{\"processInstanceId\":\"98a57fe0-aaff-11ef-8347-fa163ee2c57c\",\"processId\":\"process_dabcfdd39f1b6f46d36a9f4ff6ce1080\",\"param\":{\"sourceType\":\"todo\",\"modelCode\":\"tb_leave_dfe_for_dfe_runtime\",\"processNodeId\":\"UserTask_dde7d83377343a2d5fa1f60c23b023ef\",\"taskId\":\"98c256b9-aaff-11ef-8347-fa163ee2c57c\"},\"process.param.appId\":\"32ca8770-6f85-11ec-b5a3-991864da52a6\",\"appId\":\"32ca8770-6f85-11ec-b5a3-991864da52a6\",\"name\":\"璇峰亣鐢宠\",\"taskId\":\"98c256b9-aaff-11ef-8347-fa163ee2c57c\",\"taskNodeId\":\"UserTask_dde7d83377343a2d5fa1f60c23b023ef\",\"url\":\"/dfe-form/process/tlnc/apply\"}",
+ "targetComId": "dfe",
+ "moduleName": "娴佺▼寰呭姙",
+ "tid": "99cad778-aaff-11ef-9dbf-ff08ba71965c",
+ "msgEndTime": null,
+ "msgEndTimeIso": "",
+ "picUrl": "",
+ "extendJson": "{\"key1\":\"璇峰強鏃跺鐞嗛檲楦块鍙戣捣鐨勮鍋囩敵璇穃"}",
+ "extendParam": null,
+ "extendCascade": null,
+ "createUser": "13856591439",
+ "webCascadeUrl": null,
+ "h5CascadeUrl": null,
+ "cascadeTodoOpenType": null,
+ "cascadeSourceConfigId": null,
+ "h5Url": "/h5/pages/form-page/form-page?returnPath=-1&appId=32ca8770-6f85-11ec-b5a3-991864da52a6&taskId=98c256b9-aaff-11ef-8347-fa163ee2c57c&processNodeId=UserTask_dde7d83377343a2d5fa1f60c23b023ef&modelCode=tb_leave_dfe_for_dfe_runtime&type=flowHandle&component=form-apply&_sn=true",
+ "segmentId": "dfe-form",
+ "lastUsers": "闄堥缚椋�",
+ "currentUsers": "闄堥缚椋�",
+ "todoTypeCode": "dfe@@tlnc_placeholder_tlnc@@dfeFlowTodoModuleId",
+ "currentUserIds": "13856591439",
+ "lastUserIds": "13856591439",
+ "msgDesc": null,
+ "widgetUrl": null,
+ "detailType": null,
+ "widgetWidth": null,
+ "widgetHeight": null,
+ "userIdList": null,
+ "statusName": null,
+ "arriveTime": null,
+ "stayTime": null,
+ "todoType": null,
+ "cascadePort": null,
+ "openMode": null
+ }
+ },
+ msgType: 'tlnc'
+ }
+ let argus = JSON.stringify(params)
+ myWindow.postMessage('{"method":"goToApp","argument":' + argus + '}', '*')
+ }, 3000)
+ },
SubSuccess(str) {
this[str] = false
this.getTaskList()
diff --git a/screen/src/api/index.js b/screen/src/api/index.js
index d2317c6..ab60818 100644
--- a/screen/src/api/index.js
+++ b/screen/src/api/index.js
@@ -45,6 +45,11 @@
export const getFightingDeviceY = (data) => {
return request('visitsAdmin/cloudService/board/api/fightingAdmin/yearDeviceData', data)
}
+// 鍛婅淇℃伅
+export const getFighalarmDataList = (data) => {
+ return request('visitsAdmin/cloudService/board/api/fightingAdmin/alarmDataList', data)
+}
+
// 鍦哄唴璋冨害鐪嬫澘 浠婃棩鏈堝彴瀹屾垚璁㈠崟缁熻
export const cnplatformGroupFinish = (data) => {
diff --git a/screen/src/router/index.js b/screen/src/router/index.js
index f12ef0f..337b81d 100644
--- a/screen/src/router/index.js
+++ b/screen/src/router/index.js
@@ -13,10 +13,10 @@
component: () => import('../views/PlatformCall.vue')
},
{
- path: '/EnergyConsum', // 鑳借�楃湅鏉� - 缁胯壊浣庣⒊杩愯惀
+ path: '/EnergyConsum', // 鑳借�楃湅鏉� - 瀹夋嘲鏅烘収鐗╂祦鍥尯-缁胯壊浣庣⒊杩愯惀
name: 'EnergyConsum',
meta: {
- title: '鑳借�楃湅鏉�'
+ title: '瀹夋嘲鏅烘収鐗╂祦鍥尯-缁胯壊浣庣⒊杩愯惀'
},
component: () => import('../views/EnergyConsum.vue')
},
@@ -24,7 +24,7 @@
path: '/LogisticsEfficiency', // 鐗╂祦杩愯璋冨害鐪嬫澘- 璋冨害鑳芥晥
name: 'LogisticsEfficiency',
meta: {
- title: '鐗╂祦杩愯璋冨害鐪嬫澘'
+ title: '瀹夋嘲鏅烘収鐗╂祦鍥尯-璋冨害鑳芥晥璺熻釜'
},
component: () => import('../views/LogisticsEfficiency.vue')
},
@@ -32,15 +32,15 @@
path: '/SecurityControl', // 瀹夐槻绠℃帶澶у睆 -
name: 'SecurityControl',
meta: {
- title: '瀹夐槻绠℃帶澶у睆'
+ title: '瀹夋嘲鏅烘収鐗╂祦鍥尯-瀹夐槻鏅鸿兘鐩戞祴'
},
component: () => import('../views/SecurityControl.vue')
},
{
- path: '/LogisticsCenter', //搴撳埗绠＄悊鐪嬫澘-鐗╂祦涓績
+ path: '/LogisticsCenter', //鍏ㄧ渷鐗╂祦鍦ㄩ��-鐗╂祦涓績
name: 'LogisticsCenter',
meta: {
- title: '搴撳埗绠＄悊鐪嬫澘'
+ title: '鍏ㄧ渷鐗╂祦鍦ㄩ��'
},
component: () => import('../views/LogisticsCenter.vue')
},
@@ -48,7 +48,7 @@
path: '/FireFighting', //娑堥槻鐩戞帶
name: 'FireFighting',
meta: {
- title: '娑堥槻鐩戞帶'
+ title: '瀹夋嘲鏅烘収鐗╂祦鍥尯-娑堥槻鎬佸娍鐩戞帶'
},
component: () => import('../views/FireFighting.vue')
},
@@ -56,7 +56,7 @@
path: '/TaskEfficiency', //鍦哄唴璋冨害鐪嬫澘 -浣滀笟鑳芥晥
name: 'TaskEfficiency',
meta: {
- title: '鍦哄唴璋冨害鐪嬫澘'
+ title: '瀹夋嘲鏅烘収鐗╂祦鍥尯-浣滀笟鏁堣兘缁熺'
},
component: () => import('../views/TaskEfficiency.vue')
},
diff --git a/screen/src/views/EnergyConsum.vue b/screen/src/views/EnergyConsum.vue
index 3fa773b..8e383e4 100644
--- a/screen/src/views/EnergyConsum.vue
+++ b/screen/src/views/EnergyConsum.vue
@@ -3,7 +3,7 @@
<div class="main_app">
<img src="@/assets/images/bg_main_app.png" class="main_bg" alt="" />
<div class="main_header">
- <img src="@/assets/images/maintitle@2x.png" class="main_header_bg" alt="" />
+ <img src="@/assets/images/maintitle.gif" class="main_header_bg" alt="" />
<div class="title">瀹夋嘲鏅烘収鐗╂祦鍥尯-缁胯壊浣庣⒊杩愯惀</div>
<div class="time_wrap">
<span class="date">{{ date }}</span>
@@ -241,7 +241,7 @@
</div>
<div v-if="data3 && data3.length > 0" class="list">
<template v-for="item, i in data3">
- <div v-if="i < 6" class="line" >
+ <div v-if="i < 6" class="line">
<div class="top"><span v-if="i < 3">top</span>{{ i + 1 }}</div>
<div class="id_card">{{ item.carNo }}</div>
<div class="wrap">
@@ -656,6 +656,16 @@
getData4()
getData5()
getData6()
+ setInterval(() => {
+ getData4()
+ }, 1000 * 60)
+ setInterval(() => {
+ getData1()
+ getData2()
+ getData3()
+ getData5()
+ getData6()
+ }, 1000 * 60 * 60)
})
diff --git a/screen/src/views/FireFighting.vue b/screen/src/views/FireFighting.vue
index 2e073c7..dc8bb57 100644
--- a/screen/src/views/FireFighting.vue
+++ b/screen/src/views/FireFighting.vue
@@ -35,12 +35,12 @@
<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>
+ <span class="item name">{{ item.typeName }}</span>
+ <span class="item">{{ item.totalDeviceNum || 0 }}</span>
+ <span class="item">{{ item.alarmDeviceNum || 0 }}</span>
+ <span class="item">{{ item.shieldDeviceNum || 0 }}</span>
+ <span class="item">{{ item.errDeviceNum || 0 }}</span>
+ <span class="item">{{ item.offlineDeviceNum || 0 }}</span>
</div>
<div class="separate"></div>
</div>
@@ -117,7 +117,7 @@
<img src="@/assets/images/FireFighting/xiaofang_ic_pingbi@2x.png" alt="">
<div class="content">
<div class="name">灞忚斀</div>
- <div class="num num5">{{ dataList4.shieldDeviceNum }}</div>
+ <div class="num num5">{{ dataList4.shieldDeviceNum || 0 }}</div>
</div>
</div>
</div>
@@ -253,14 +253,14 @@
<img src="@/assets/images/FireFighting/ic_tibao@2x.png" alt="">
<div class="content">
<div class="name">鎻愭姤闅愭偅鏁�</div>
- <div class="num"><span>{{ dataList4.todayDangerNum }}</span>涓�</div>
+ <div class="num"><span>{{ dataList4.dangerTotalNum }}</span>涓�</div>
</div>
</div>
<div class="item">
<img src="@/assets/images/FireFighting/ic_chuli@2x.png" alt="">
<div class="content">
<div class="name">澶勭悊闅愭偅鏁�</div>
- <div class="num"><span class="today">{{ dataList4.dealDangerNum }}</span>涓�</div>
+ <div class="num"><span class="today">{{ dataList4.dangerDealedNum }}</span>涓�</div>
</div>
</div>
</div>
@@ -278,22 +278,28 @@
<div class="content">
<div class="header">
<div class="time">
- <span>{{ item.time }}</span>
- <span class="status">澶勭悊涓�</span>
+ <span>{{ item.alarmTime }}</span>
+ <span class="status" v-if="item.handleStatus == 1">宸叉牳瀹�</span>
+ <span class="status" v-else-if="item.handleStatus == 2">鏈牳瀹�</span>
+ <span class="status" v-else-if="item.handleStatus == 3">鏍稿疄涓�</span>
+ <span v-else class="status">鏈牳瀹�</span>
</div>
- <div class="have_time">宸茬粡鍙戠敓<span>1</span>鍒嗛挓</div>
+ <div class="have_time">宸茬粡鍙戠敓{{ item.haveTime }}</div>
</div>
<div class="wrap">
<div class="title">
<img class="xf" src="@/assets/images/FireFighting/ic_gaojing_red@2x.png" alt="">
- <span>{{ item.name }}</span>
+ <span>{{ item.alarmTypeName }}</span>
</div>
<div class="title">
<img class="addr" src="@/assets/images/FireFighting/xiaofang_ic_weizhi@2x.png" alt="">
- <span>{{ item.addr }}</span>
+ <span>{{ item.regionName }}</span>
</div>
</div>
</div>
+ </div>
+ <div v-if="dataList7.length == 0" style="margin-top: 100px;" class="empty_wrap">
+ <img src="@/assets/images/default_empty.png" alt="">
</div>
</div>
</div>
@@ -309,6 +315,8 @@
import VScaleScreen from 'v-scale-screen'
import FirePercent from '@/components/FirePercent.vue'
import dayjs from 'dayjs'
+import duration from 'dayjs/plugin/duration'
+dayjs.extend(duration)
import * as echarts from 'echarts'
import 'swiper/css/swiper.min.css'
import Swiper from 'swiper'
@@ -318,6 +326,7 @@
getFightingcenterData,
getFightingDeAlarm,
getFightingDeviceY,
+ getFighalarmDataList
} from '@/api'
const colors = ['#FEAF01', '#01ABFE', '#51F9E4']
@@ -335,7 +344,7 @@
const initWatergage = () => {
const myChart = echarts.init(document.getElementById('watergage'))
- var data_value = 2
+ var data_value = 1
const option = {
barMaxWidth: 3,
polar: {
@@ -699,22 +708,22 @@
}
const dataList1 = ref([])
-const getData1 = () => {
- getFightingDeAlarm().then(res => {
- dataList1.value = res.data
- loopFn1()
- })
-}
+// 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
+ // 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 = []
@@ -737,10 +746,15 @@
var myChart = echarts.init(document.querySelector('.echart2'))
// 鐢熸垚鏁版嵁鍜屾棩鏈�
// 绀轰緥鏁版嵁
- const data1 = dataList3.value.map(i => i.alarmNum)
+ const data1 = dataList3.value.map(i => i.realNum)
const data2 = dataList3.value.map(i => i.processingNum)
const data3 = dataList3.value.map(i => i.liftNum)
const data4 = dataList3.value.map(i => i.errNum)
+ const months = dataList3.value.map(i => {
+ console.log('i.startDate', i.startDate.substring(5, 7))
+ return i.startDate.substring(5, 7) + '鏈�'
+ }
+ )
const option = {
legend: {
x: "center",
@@ -774,10 +788,10 @@
borderColor: "rgba(219, 230, 255, 0.8)",
},
xAxis: {
- data: dataList3.value.map(i => i.monthStr),
+ data: months,
axisLabel: {
color: "#FFFFFF", // X 杞存枃瀛楄涓虹櫧鑹�
- fontSize: 14,
+ fontSize: 13,
},
axisLine: {
lineStyle: {
@@ -886,6 +900,8 @@
const getData4 = () => {
getFightingcenterData().then(res => {
dataList4.value = res.data || {}
+ dataList1.value = res.data.deviceTypeList
+ loopFn1()
})
}
const dataList5 = ref({}) // 缁翠繚
@@ -902,17 +918,25 @@
}
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' },
- ]
+
+ getFighalarmDataList().then(res => {
+ dataList7.value = res.data || []
+ dataList7.value = dataList7.value.map(item => {
+ item.haveTime = dayjs.duration(new Date().getTime() - new Date(item.alarmTime).getTime()).format('H灏忔椂m鍒嗛挓')
+ return item
+ })
+ })
+ // 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()
}
@@ -943,16 +967,40 @@
}
onMounted(() => {
- getData1()
+ // getData1()
getData2()
getData3()
getData4()
getData5()
- getData6()
+ // getData6()
getData7()
+ setInterval(() => {
+ getData2()
+ getData3()
+ getData4()
+ // getData6()
+ getData7()
+ }, 60 * 1000)
+ setInterval(() => {
+
+ getData5()
+
+ }, 60 * 60 * 1000)
+
initWatergage()
initLiquidlevel()
+
+ // setInterval(() => {
+ // getData4()
+ // }, 1000 * 60)
+ // setInterval(() => {
+ // getData1()
+ // getData2()
+ // getData3()
+ // getData5()
+ // getData6()
+ // }, 1000 * 60 * 60)
})
@@ -1468,6 +1516,7 @@
overflow: hidden;
margin-top: 15px;
scrollbar-width: none;
+
.item {
display: flex;
font-size: 13px;
diff --git a/screen/src/views/LogisticsCenter.vue b/screen/src/views/LogisticsCenter.vue
index 1611d01..1c78c26 100644
--- a/screen/src/views/LogisticsCenter.vue
+++ b/screen/src/views/LogisticsCenter.vue
@@ -3,8 +3,8 @@
<div class="main_app">
<img src="@/assets/images/LogisticsCenter/bg@2x.png" class="main_bg" alt="" />
<div class="main_header">
- <img src="@/assets/images/maintitle@2x.png" class="main_header_bg" alt="" />
- <div class="title">瀹夊窘涓儫鐗╂祦涓績杩愯澶у睆</div>
+ <img src="@/assets/images/maintitle.gif" class="main_header_bg" alt="" />
+ <div class="title">鍏ㄧ渷鐗╂祦鍦ㄩ��</div>
<div class="time_wrap">
<span class="date">{{ date }}</span>
<span class="week">{{ week }}</span>
diff --git a/screen/src/views/LogisticsEfficiency.vue b/screen/src/views/LogisticsEfficiency.vue
index 1861f8d..48bf228 100644
--- a/screen/src/views/LogisticsEfficiency.vue
+++ b/screen/src/views/LogisticsEfficiency.vue
@@ -3,7 +3,7 @@
<div class="main_app">
<img src="@/assets/images/energy_ef/bg@2x.png" class="main_bg" alt="" />
<div class="main_header">
- <img src="@/assets/images/maintitle@2x.png" class="main_header_bg" alt="" />
+ <img src="@/assets/images/maintitle.gif" class="main_header_bg" alt="" />
<div class="title">瀹夋嘲鏅烘収鐗╂祦鍥尯-璋冨害鑳芥晥璺熻釜</div>
<div class="time_wrap">
<span class="date">{{ date }}</span>
diff --git a/screen/src/views/SecurityControl.vue b/screen/src/views/SecurityControl.vue
index b28bf10..f89016a 100644
--- a/screen/src/views/SecurityControl.vue
+++ b/screen/src/views/SecurityControl.vue
@@ -3,7 +3,7 @@
<div class="main_app">
<img src="@/assets/images/SecurityControl/bg@2x.png" class="main_bg" alt="" />
<div class="main_header">
- <img src="@/assets/images/maintitle@2x.png" class="main_header_bg" alt="" />
+ <img src="@/assets/images/maintitle.gif" class="main_header_bg" alt="" />
<div class="title">瀹夋嘲鏅烘収鐗╂祦鍥尯-瀹夐槻鏅鸿兘鐩戞祴</div>
<div class="time_wrap">
<span class="date">{{ date }}</span>
@@ -367,8 +367,12 @@
</div>
</div>
</div>
+ <div v-if="warningList.length == 0" class="empty_wrap">
+ <img src="@/assets/images/default_empty.png" alt="">
+ </div>
</div>
</div>
+
</div>
</div>
@@ -988,11 +992,20 @@
getData1()
getData2()
getData3()
- // getData4()
getData5()
getWarning()
+
+ setInterval(() => {
+ getData1()
+ getData2()
+ getData3()
+ getWarning()
+ }, 1000 * 60)
- // initEchart1()
+ setInterval(() => {
+ getData5()
+ }, 1000 * 60 * 60)
+
})
@@ -1575,10 +1588,11 @@
margin-right: 20px;
/* one-swiper */
- .one_swiper_wrap{
+ .one_swiper_wrap {
height: 140px;
overflow: hidden;
}
+
.list {
height: 204px;
overflow: hidden;
diff --git a/screen/src/views/TaskEfficiency.vue b/screen/src/views/TaskEfficiency.vue
index 23caa32..10a374f 100644
--- a/screen/src/views/TaskEfficiency.vue
+++ b/screen/src/views/TaskEfficiency.vue
@@ -3,7 +3,7 @@
<div class="main_app">
<img src="@/assets/images/FireFighting/bg@2x.png" class="main_bg" alt="" />
<div class="main_header">
- <img src="@/assets/images/maintitle@2x.png" class="main_header_bg" alt="" />
+ <img src="@/assets/images/maintitle.gif" class="main_header_bg" alt="" />
<div class="title">瀹夋嘲鏅烘収鐗╂祦鍥尯-浣滀笟鏁堣兘缁熺</div>
<div class="time_wrap">
<span class="date">{{ date }}</span>
@@ -277,6 +277,9 @@
<!-- <div class="status">澶勭悊涓�</div> -->
</div>
</div>
+ </div>
+ <div v-if="data7.length == 0" class="empty_wrap" style="margin-top: 50px;">
+ <img src="@/assets/images/default_empty.png" alt="">
</div>
</div>
</div>
@@ -824,6 +827,15 @@
getData6()
getData7()
+ setInterval(() => {
+ getData1()
+ getData2()
+ getData3()
+ getData4()
+ getData5()
+ getData6()
+ getData7()
+ }, 1000 * 60)
// initEchart1()
// initEchart2()
// initEchart3()
--
Gitblit v1.9.3