diff --git a/src/utils/api/index.js b/src/utils/api/index.js index 005c5ef..6357008 100644 --- a/src/utils/api/index.js +++ b/src/utils/api/index.js @@ -15,6 +15,23 @@ export function getTermStatistics(data) { params: data, }); } +//获取一周的装置告警 + +export function getWeekAlarmStatistics(data) { + return request({ + url: "/api/getWeekAlarmStatistics", + method: "get", + params: data, + }); +} +//获取当天告警分类统计 +export function getTodayAlarmStatistics(data) { + return request({ + url: "/api/getTodayAlarmStatistics", + method: "get", + params: data, + }); +} //获取所有杆塔下的图片列表，实时监控 export function getTowerAndPhotoList(data) { @@ -747,3 +764,13 @@ export function getTermStatus(data) { }, }); } + +//导出数据 + +export function getTerminalListExcel() { + return request({ + url: "/api/getTerminalListExcel", + method: "post", + responseType: "blob", + }); +} diff --git a/src/views/alarmHandling/components/historyimg copy.vue b/src/views/alarmHandling/components/historyimg copy.vue new file mode 100644 index 0000000..df3a804 --- /dev/null +++ b/src/views/alarmHandling/components/historyimg copy.vue @@ -0,0 +1,111 @@ + + + diff --git a/src/views/alarmHandling/components/historyimg.vue b/src/views/alarmHandling/components/historyimg.vue index df3a804..c196d04 100644 --- a/src/views/alarmHandling/components/historyimg.vue +++ b/src/views/alarmHandling/components/historyimg.vue @@ -1,46 +1,46 @@ diff --git a/src/views/alarmHandling/index.vue b/src/views/alarmHandling/index.vue index 56967bf..4a8fd15 100644 --- a/src/views/alarmHandling/index.vue +++ b/src/views/alarmHandling/index.vue @@ -924,8 +924,8 @@ export default { }, //历史图片 - handleHistory() { - this.$refs.historyimg_ref.display(); + handleHistory(val) { + this.$refs.historyimg_ref.display(val); this.$refs.historyimg_ref.getdataform(this.selectRow); }, //切换图片 @@ -946,7 +946,7 @@ export default { handlePicHistory(val) { console.log(val); this.selectRow = val; - this.handleHistory(); + this.handleHistory(val); }, handlePicAlarm(val, index) { console.log(val, index); diff --git a/src/views/management/monitoringEquipment/photographicDevice/index.vue b/src/views/management/monitoringEquipment/photographicDevice/index.vue index ec31492..2d3def3 100644 --- a/src/views/management/monitoringEquipment/photographicDevice/index.vue +++ b/src/views/management/monitoringEquipment/photographicDevice/index.vue @@ -3,9 +3,20 @@

拍照装置管理

- 新增 +
+ 新增 + 导出 +
@@ -402,6 +413,7 @@ import { resetTerminalApi, setTermGPSJoggle, getSearchInfo, + getTerminalListExcel, } from "@/utils/api/index"; import moment from "moment"; import addPhotoDialog from "./components/addPhotoDialog.vue"; @@ -582,6 +594,11 @@ export default { this.$refs.addPhotoDialogref.display(); this.$refs.addPhotoDialogref.getdataform(null); }, + //导出 + handleExport() { + window.location.href = "/api/api/getTerminalListExcel"; + }, + //handleResive 修改线路数据 handleRevisePhoto(data) { this.photoDialogTitle = "修改"; diff --git a/src/views/pictureRotation/index.vue b/src/views/pictureRotation/index.vue index 96644a0..dfd595c 100644 --- a/src/views/pictureRotation/index.vue +++ b/src/views/pictureRotation/index.vue @@ -305,16 +305,16 @@ export default { : 15; this.rowNum = parseInt(localStorage.getItem("row")) ? parseInt(localStorage.getItem("row")) - : 2; + : 4; this.colNum = parseInt(localStorage.getItem("col")) ? parseInt(localStorage.getItem("col")) - : 2; + : 4; this.rowradio = parseInt(localStorage.getItem("row")) ? parseInt(localStorage.getItem("row")) - : 2; + : 4; this.colradio = parseInt(localStorage.getItem("col")) ? parseInt(localStorage.getItem("col")) - : 2; + : 4; }, submitForm() { localStorage.setItem("totalTime", this.selSpeed); @@ -322,10 +322,10 @@ export default { localStorage.setItem("col", this.colradio); this.rowNum = parseInt(localStorage.getItem("row")) ? parseInt(localStorage.getItem("row")) - : 2; + : 4; this.colNum = parseInt(localStorage.getItem("col")) ? parseInt(localStorage.getItem("col")) - : 2; + : 4; this.pageSize = this.rowradio * this.colradio; this.setdialog = false; this.$message.success("设置成功"); @@ -406,10 +406,10 @@ export default { : 15; this.rowradio = this.rowNum = parseInt(localStorage.getItem("row")) ? parseInt(localStorage.getItem("row")) - : 2; + : 4; this.colradio = this.colNum = parseInt(localStorage.getItem("col")) ? parseInt(localStorage.getItem("col")) - : 2; + : 4; this.pageSize = this.rowradio * this.colradio; this.toggleCountdown(); }, diff --git a/src/views/realTimeMonitor/index.vue b/src/views/realTimeMonitor/index.vue index 30b2497..9ed916f 100644 --- a/src/views/realTimeMonitor/index.vue +++ b/src/views/realTimeMonitor/index.vue @@ -314,7 +314,7 @@ export default { selectDyId: "", //获取当前选中的电压线路等信息 selectLineId: "", selectTowerId: "", - currentId: "", + currentData: "", //保存选中的数据 }; }, watch: { @@ -375,9 +375,10 @@ export default { this.towertitle = data.name; this.zzCmdid = data.cmdid; this.getChannelList(data.id); + // this.getTerminalPhotoList(id, date, data.id); } - localStorage.setItem("currentId", data.id); + localStorage.setItem("currentData", JSON.stringify(this.selectData)); }, //轮询获取装置状态 getLineTreeStatus() { @@ -409,22 +410,29 @@ export default { console.log(this.lineTreeData); this.onlineNum = res.data.onlineNum; this.totalNum = res.data.totalNum; + this.currentData = JSON.parse(localStorage.getItem("currentData")); + if (this.lineTreeData[0].list[0].list.length > 0) { - this.selectData = this.lineTreeData[0]; //第一个选中的数据 - this.emptyText = "暂无数据"; - this.currentNodekey = this.lineTreeData[0].id; //第一个数据 - this.type = 1; - this.newCurrentId = this.lineTreeData[0].id; - this.previewData = this.lineTreeData[0]; //预览图数据 - //localStorage.setItem("currentId", this.currentNodekey); - this.$nextTick(() => { - this.$refs.tree.setCurrentKey(this.currentNodekey); //一定要加这个选中了否则样式没有出来 + if (Object.keys(this.currentData).length !== 0) { + this.currentNodekey = this.currentData.id; + this.handleNodeClick(this.currentData); + } else { + this.selectData = this.lineTreeData[0]; //第一个选中的数据 + this.emptyText = "暂无数据"; + this.currentNodekey = this.lineTreeData[0].id; //第一个数据 + this.type = 1; + this.newCurrentId = this.lineTreeData[0].id; + this.previewData = this.lineTreeData[0]; //预览图数据 this.channelId = this.currentNodekey; this.$refs.previewRef.getPicList( this.currentNodekey, this.type, this.page ); + } + + this.$nextTick(() => { + this.$refs.tree.setCurrentKey(this.currentNodekey); //一定要加这个选中了否则样式没有出来 }); } }) @@ -592,6 +600,7 @@ export default { if (node) { this.$nextTick(() => { // 通过scrollIntoView方法将对应的dom元素定位到可见区域 【block: 'center'】这个属性是在垂直方向居中显示 + console.log(node); node.scrollIntoView({ block: "center" }); }); } @@ -651,6 +660,7 @@ export default { this.picTime = res.data.taketime; //获取时间 判断获取最新视频 console.log(this.requestId); this.btnvideoloading = true; + this.getTakePicStatus(this.requestId); this.statusTimer = window.setInterval(() => { this.getTakePicStatus(this.requestId); this.statusNum++; @@ -693,6 +703,8 @@ export default { }); } else if (res.data == 1) { this.statusNum = 0; + this.btnpicloading = false; + this.btnvideoloading = false; clearInterval(this.statusTimer); this.statusTimer = null; this.$message({ @@ -707,6 +719,8 @@ export default { }, 8000); } else if (res.data == 2) { this.statusNum = 0; + this.btnpicloading = false; + this.btnvideoloading = false; clearInterval(this.statusTimer); this.statusTimer = null; this.$message({ @@ -982,6 +996,16 @@ export default { this.timer = null; } //利用vue的生命周期函数 }, + beforeRouteLeave(to, from, next) { + // 路由跳转前，清除轮询 + + next(); + if (this.timer) { + console.log(this.timer); + clearInterval(this.timer); + this.timer = null; + } + }, }; @@ -1028,13 +1052,20 @@ export default { } } .el-tree { - overflow: auto; + overflow-y: auto; + overflow-x: hidden; .el-tree-node__content { height: 32px; font-size: 12px; } .custom-tree-node { color: #333; + overflow: hidden; + span { + display: flex; + display: inline-table; + overflow: hidden; + } } } @@ -1046,6 +1077,15 @@ export default { background: #169e8c; .custom-tree-node { color: #fff; + //overflow: hidden; + span { + display: flex; + //overflow: hidden; + .iconfont { + //width: 30px; + display: inline-table; + } + } } } diff --git a/src/views/realTimeMonitor/paramArea.vue b/src/views/realTimeMonitor/paramArea.vue deleted file mode 100644 index 0eee0f5..0000000 --- a/src/views/realTimeMonitor/paramArea.vue +++ /dev/null @@ -1,216 +0,0 @@ - - - - diff --git a/src/views/realTimeSearch/index.vue b/src/views/realTimeSearch/index.vue index e4d47d9..82460d4 100644 --- a/src/views/realTimeSearch/index.vue +++ b/src/views/realTimeSearch/index.vue @@ -107,7 +107,7 @@
-
+
- +

装置数量统计

装置总数 - 260 + {{ termDataNum.totalNum }}

在线数量 - 4 + {{ termDataNum.onlineNum }}

离线率 - 99.85% + {{ (termDataNum.offlinePercent * 100).toFixed(2) }}%

在线率 - 0.15% + {{ (termDataNum.onlinePercent * 100).toFixed(2) }}%

-

装置在线统计

-
+
- -

隐患数量统计

+ +

7天告警数量统计

+ 当前日期前七天
-
+
- -

隐患分类统计

+ +

告警类型统计

-
+