From 11be0364989a8c2702a3cf2138c1ae5181581897 Mon Sep 17 00:00:00 2001
From: z_yu <1534695664@qq.com>
Date: Sat, 17 Sep 2022 17:20:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=B7=BB=E5=8A=A0=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/archivesManage/lendManage.js | 7 ++
.../lendManage/mixins/lending.js | 10 +-
src/views/environmentalScreen/index.vue | 108 ++++++++++++------
3 files changed, 86 insertions(+), 39 deletions(-)
diff --git a/src/api/archivesManage/lendManage.js b/src/api/archivesManage/lendManage.js
index 6f2e1d6..866e917 100644
--- a/src/api/archivesManage/lendManage.js
+++ b/src/api/archivesManage/lendManage.js
@@ -196,5 +196,12 @@ export function FetchWaitBorrower(parameter) {
})
}
+// 当天当月借还数
+export function getDayYearBorrowNum() {
+ return request({
+ url: 'api/borrow/thisDayYearBorrowNum',
+ method: 'get'
+ })
+}
export default { add, edit, del }
diff --git a/src/views/archivesManage/lendManage/mixins/lending.js b/src/views/archivesManage/lendManage/mixins/lending.js
index 42e1ed1..d41dd76 100644
--- a/src/views/archivesManage/lendManage/mixins/lending.js
+++ b/src/views/archivesManage/lendManage/mixins/lending.js
@@ -249,10 +249,16 @@ export const lendingCrud = {
// const mac = '12-34-56-12-34-56'
if (!mac || mac === '') {
this.$message.error('获取mac地址失败')
+ this.btnDisabled = false
+ this.unbindWarnLoading = false
+ reject()
} else {
const dev = await RFID.getDeviceIdByMac(mac)
if (!dev || dev === {} || !dev.deviceId) {
this.$message.error('当前电脑未绑定读写器，请到档案设备里进行绑定')
+ this.btnDisabled = false
+ this.unbindWarnLoading = false
+ reject()
} else {
resolve(dev)
}
@@ -275,7 +281,7 @@ export const lendingCrud = {
} else {
// 没有读取到标签数量加1
this.isKey = !this.isKey
- this.tipTable[tipTableIndex].warnState = '未读取到该标签'
+ this.tipTable[tipTableIndex].warnState = '读取失败'
resolve()
}
} else if (res.code && res.code === '-2') {
@@ -305,7 +311,7 @@ export const lendingCrud = {
await this.readEpc({ op: 'RFID_ReadEpc', sDevID: devInfo.deviceId, ip: this.devIp }, tipTableIndex)
}
}
- if (this.tipTable.filter((item) => { return item.warnState === '未读取到该标签' }).length > 0) {
+ if (this.tipTable.filter((item) => { return item.warnState === '读取失败' }).length > 0) {
this.btnDisabled = false
this.unbindWarnLoading = false
} else if (this.tipTable.filter((item) => { return item.warnState === '解除失败' || item.warnState === '恢复失败' }).length > 0) {
diff --git a/src/views/environmentalScreen/index.vue b/src/views/environmentalScreen/index.vue
index f60d35c..e3db23e 100644
--- a/src/views/environmentalScreen/index.vue
+++ b/src/views/environmentalScreen/index.vue
@@ -183,7 +183,7 @@
@@ -195,23 +195,23 @@
-
+
-
+
@@ -246,7 +246,7 @@
离线设备
-
+
@@ -298,8 +298,6 @@
-
-
@@ -307,7 +305,7 @@
import { getCurrentTime } from '@/utils/index'
import typePie from '@/views/components/echarts/typePie.vue'
import lendAcross from '@/views/components/echarts/lendAcross.vue'
-import Video from '@/views/storeManage/warehouse3D/module/video'
+// import Video from '@/views/storeManage/warehouse3D/module/video'
import WarehouseWarning from '@/views/components/WarehouseWarning'
import SecurityDoor from '@/views/components/SecurityDoor'
import displayConfigApi from '@/api/storeManage/displayConfig'
@@ -315,13 +313,16 @@ import thirdApi from '@/api/thirdApi'
import { statisticsCrud } from '@/views/system/archiveStatistics/mixins/statistics'
import NumFlip from './module/numFlip.vue'
import CountTo from 'vue-count-to'
-
+import { getDayYearBorrowNum } from '@/api/archivesManage/lendManage'
+import { getDeviceList } from '@/api/storeManage/deviceManage/device'
+import { getOnlineDevice } from '@/api/home/device'
+import { FetchGetArchivesNum, FetchInitArchivesTypeNum } from '@/api/archivesManage/statistics'
export default {
name: 'EnvironmentalScreen',
components: {
WarehouseWarning,
SecurityDoor,
- Video,
+ // Video,
lendAcross,
typePie,
NumFlip,
@@ -385,19 +386,19 @@ export default {
waterLeakageText4: ''
},
daylend: 'daylend',
- daylendnum: 1234,
+ daylendnum: 0,
dayreturn: 'dayreturn',
- dayreturnnum: 4567,
+ dayreturnnum: 0,
monlend: 'monlend',
- monlendnum: 1001,
+ monlendnum: 0,
monreturn: 'monreturn',
- monreturnnum: 123456,
- totalNum: 12345,
- lendingNum: 54985,
- storeNum: 12456,
- allDevNum: 15,
- lineDevNum: 6,
- onlineDevNumL: 9,
+ monreturnnum: 0,
+ totalNum: 0,
+ filesNum: 0,
+ archivesNum: 0,
+ allDevNum: 0,
+ lineDevNum: 0,
+ offDevNum: 0,
echartsTimer: null,
refreshtime: 60000
}
@@ -431,6 +432,8 @@ export default {
this.dataTimer = setInterval(async() => {
await _this.getRealTimeData()
_this.handleAQI()
+ _this.getDayYearBorrowNum()
+ _this.handleLeftTableNum()
}, 10000)
// 每隔一分钟刷新档案借阅和档案类型的数据
this.echartsTimer = setInterval(() => {
@@ -471,19 +474,19 @@ export default {
},
// 点击查看设备状况 / 密集架列号
handleMessageDevice(event) {
- const _this = this
- if (event.data && event.data.data) {
- const data = event.data.data
- // 摄像头
- if (data.includes('CAM')) {
- _this.$nextTick(() => {
- this.$refs.camera.openVideoVisible = true
- // 后期看接口调试变化
- this.$refs.camera.videoSrc = 'https://qiniu.aiyxlib.com/1606275873000.mp4'
- this.$refs.camera.videoTitle = data
- })
- }
- }
+ // const _this = this
+ // if (event.data && event.data.data) {
+ // const data = event.data.data
+ // 摄像头
+ // if (data.includes('CAM')) {
+ // _this.$nextTick(() => {
+ // this.$refs.camera.openVideoVisible = true
+ // // 后期看接口调试变化
+ // this.$refs.camera.videoSrc = 'https://qiniu.aiyxlib.com/1606275873000.mp4'
+ // this.$refs.camera.videoTitle = data
+ // })
+ // }
+ // }
},
// 设置温湿度
handleAQI() {
@@ -589,8 +592,39 @@ export default {
})
})
}
+ },
+ getDayYearBorrowNum() {
+ getDayYearBorrowNum({ ids: this.allDeviceIds, url: this.url }).then((data) => {
+ if (data) {
+ this.daylendnum = data.dayBorrow
+ this.dayreturnnum = data.dayReturn
+ this.monlendnum = data.monthBorrow
+ this.monreturnnum = data.monthReturn
+ }
+ })
+ },
+ // 获取下方中间偏左table数据
+ handleLeftTableNum() {
+ // 档案总数
+ FetchGetArchivesNum().then(data => {
+ this.totalNum = data
+ })
+ // 文件总数,案卷总数
+ FetchInitArchivesTypeNum().then(data => {
+ this.filesNum = data.filesNum
+ this.archivesNum = data.archivesNum
+ })
+ // 设备总数,在线设备数,离线设备数
+ this.handleTotalDeviceNum()
+ },
+ // 设备总数,在线设备数,离线设备数
+ handleTotalDeviceNum() {
+ Promise.all([getDeviceList({ page: 0, size: 10 }), getOnlineDevice()]).then((result) => {
+ this.allDevNum = result[0].totalElements
+ this.lineDevNum = result[1]
+ this.offDevNum = this.allDevNum - this.lineDevNum
+ })
}
-
}
}