diff --git a/src/utils/api/reportApi.js b/src/utils/api/reportApi.js index de4dcbf..f426a67 100644 --- a/src/utils/api/reportApi.js +++ b/src/utils/api/reportApi.js @@ -1,13 +1,13 @@ import request from "../request"; //照片统计 -export function getphotoList(data) { - return request({ - url: "/xymanager/terminal/listWithPhoto", - method: "get", - params: data, - }); -} +// export function getphotoList(data) { +// return request({ +// url: "/xymanager/terminal/listWithPhoto", +// method: "get", +// params: data, +// }); +// } //获取电压-线路-杆塔等信息 export function getSearchInfo(data) { diff --git a/src/views/devicePhotoSchedule/components/bdSchedule.vue b/src/views/devicePhotoSchedule/components/bdSchedule.vue index 73ee39f..dadef56 100644 --- a/src/views/devicePhotoSchedule/components/bdSchedule.vue +++ b/src/views/devicePhotoSchedule/components/bdSchedule.vue @@ -281,7 +281,7 @@ export default { if ( node.protocol == "65283" || node.protocol == "65285" || - this.areaData.protocol == "65290" + node.protocol == "65290" || node.protocol == "65298" ) { //湖南 河南 console.log("湖南,河南", scheduleTimeList.length); diff --git a/src/views/photographicDevice/components/baseInfor.vue b/src/views/photographicDevice/components/baseInfor.vue index 63d2856..42863dd 100644 --- a/src/views/photographicDevice/components/baseInfor.vue +++ b/src/views/photographicDevice/components/baseInfor.vue @@ -13,9 +13,12 @@ 江苏 湖南 浙江 - 河南 + 河南全景 河南郑州 河南统一视频v2020 + 宁夏 + 南网 + {{rowInfo.protocol}} diff --git a/src/views/photographicDevice/components/faultInfomation.vue b/src/views/photographicDevice/components/faultInfomation.vue index 0339093..7b0f234 100644 --- a/src/views/photographicDevice/components/faultInfomation.vue +++ b/src/views/photographicDevice/components/faultInfomation.vue @@ -13,9 +13,12 @@ 江苏 湖南 浙江 - 河南 + 河南全景 河南郑州 河南统一视频v2020 + 宁夏 + 南网 + {{rowInfo.protocol}} diff --git a/src/views/photographicDevice/components/gpsSite.vue b/src/views/photographicDevice/components/gpsSite.vue index 136fe83..70c6083 100644 --- a/src/views/photographicDevice/components/gpsSite.vue +++ b/src/views/photographicDevice/components/gpsSite.vue @@ -13,9 +13,12 @@ 江苏 湖南 浙江 - 河南 + 河南全景 河南郑州 河南统一视频v2020 + 宁夏 + 南网 + {{rowInfo.protocol}} diff --git a/src/views/photographicDevice/components/parameterSetDialog.vue b/src/views/photographicDevice/components/parameterSetDialog.vue index 749a3a3..1efa18f 100644 --- a/src/views/photographicDevice/components/parameterSetDialog.vue +++ b/src/views/photographicDevice/components/parameterSetDialog.vue @@ -16,9 +16,12 @@ 江苏 湖南 浙江 - 河南 + 河南全景 河南郑州 河南统一视频v2020 + 宁夏 + 南网 + {{rowData.protocol}} diff --git a/src/views/photographicDevice/components/runStatus.vue b/src/views/photographicDevice/components/runStatus.vue index e2a6a89..a82ebe9 100644 --- a/src/views/photographicDevice/components/runStatus.vue +++ b/src/views/photographicDevice/components/runStatus.vue @@ -13,9 +13,12 @@ 江苏 湖南 浙江 - 河南 + 河南全景 河南郑州 河南统一视频v2020 + 宁夏 + 南网 + {{rowInfo.protocol}} diff --git a/src/views/photographicDevice/components/workStatus.vue b/src/views/photographicDevice/components/workStatus.vue index b028d80..38df054 100644 --- a/src/views/photographicDevice/components/workStatus.vue +++ b/src/views/photographicDevice/components/workStatus.vue @@ -13,9 +13,12 @@ 江苏 湖南 浙江 - 河南 + 河南全景 河南郑州 河南统一视频v2020 + 宁夏 + 南网 + {{rowInfo.protocol}} diff --git a/src/views/realTimeMonitor/components/carouselChart.vue b/src/views/realTimeMonitor/components/carouselChart.vue index 99a88f8..507b5fe 100644 --- a/src/views/realTimeMonitor/components/carouselChart.vue +++ b/src/views/realTimeMonitor/components/carouselChart.vue @@ -5,12 +5,15 @@ 国网I1 陕西 安徽 - 江苏 + 江苏 湖南 浙江 - 河南 + 河南全景 河南郑州 河南统一视频v2020 + 宁夏 + 南网 + {{protocolInfo}}
diff --git a/src/views/realTimeMonitor/components/setAppDialog.vue b/src/views/realTimeMonitor/components/setAppDialog.vue index 0a32665..fcd7218 100644 --- a/src/views/realTimeMonitor/components/setAppDialog.vue +++ b/src/views/realTimeMonitor/components/setAppDialog.vue @@ -199,12 +199,20 @@ export default { }, { id: 65285, - name: "河南", + name: "河南全景", }, { id: 65286, name: "河南郑州", }, + { + id: 65298, + name: "宁夏", + }, + { + id: 2, + name: "南网", + }, ], PacketBaseOptions: [ { diff --git a/src/views/realTimeMonitor/components/setschedule.vue b/src/views/realTimeMonitor/components/setschedule.vue index 9985499..d7026a8 100644 --- a/src/views/realTimeMonitor/components/setschedule.vue +++ b/src/views/realTimeMonitor/components/setschedule.vue @@ -342,7 +342,8 @@ export default { if ( this.areaData.protocol == "65283" || this.areaData.protocol == "65285" || - this.areaData.protocol == "65290" + this.areaData.protocol == "65290" || + this.areaData.protocol == "65298" ) { //湖南规约 console.log("湖南"); @@ -543,7 +544,8 @@ export default { if ( this.areaData.protocol == "65283" || this.areaData.protocol == "65285" || - this.areaData.protocol == "65290" + this.areaData.protocol == "65290" || + this.areaData.protocol == "65298" ) { //湖南规约 console.log("湖南"); @@ -712,7 +714,8 @@ export default { if ( this.areaData.protocol == "65283" || this.areaData.protocol == "65285" || - this.areaData.protocol == "65290" + this.areaData.protocol == "65290" || + this.areaData.protocol == "65298" ) { //湖南 console.log("湖南", scheduleTimeList.length); diff --git a/src/views/realTimeMonitor/components/takePicButton.vue b/src/views/realTimeMonitor/components/takePicButton.vue index 7626949..43a9c1a 100644 --- a/src/views/realTimeMonitor/components/takePicButton.vue +++ b/src/views/realTimeMonitor/components/takePicButton.vue @@ -239,10 +239,11 @@ export default { }).then((res) => { console.log(res.data); console.log(this.picNum); + console.log(this.pzchannelId) if (res.data == true && this.picNum < 10) { // console.log(this.$parent.$parent); this.$parent.$parent.getPhotoList( - -1, + this.pzchannelId, new Date(val.date).getTime(), this.termId ); //获取图片列表是传当前设备的 id 和termid diff --git a/src/views/reportData/equipmentStatus/index.vue b/src/views/reportData/equipmentStatus/index.vue index c5057f8..e615a33 100644 --- a/src/views/reportData/equipmentStatus/index.vue +++ b/src/views/reportData/equipmentStatus/index.vue @@ -74,16 +74,16 @@ > - + 查询 - 导出 + 导出
@@ -356,7 +356,7 @@ export default { params.protocol = this.formdata.protocol; } if (this.formdata.search !== "") { - params.search = this.formdata.search; + params.cmdid = this.formdata.search; } setTimeout(() => { gettermAllList(params) diff --git a/src/views/reportData/photostatis/components/ipDialog.vue b/src/views/reportData/photostatis/components/ipDialog.vue index b58e2a9..5c4b5fd 100644 --- a/src/views/reportData/photostatis/components/ipDialog.vue +++ b/src/views/reportData/photostatis/components/ipDialog.vue @@ -7,7 +7,7 @@ width="820px" >
装置编号：{{ rowData.cmdid }} - 总数：{{ ipListData.length }} + 总数：{{ total }}
+
+
+ + +
关 闭
@@ -62,6 +75,9 @@ export default { rowData: "", iploading: false, ipListData: [], + page: 1, // 当前页数 + pageSize: 20, // 每页数量 + total: 0, //总条数 }; }, methods: { @@ -70,11 +86,13 @@ export default { setTimeout(() => { getIpList({ termId: this.rowData.id, + pageNum: this.page, + pageSize: this.pageSize, }) .then((res) => { console.log(res); - this.ipListData = res.data; - // this.total = res.data.total; + this.ipListData = res.data.list; + this.total = res.data.total; this.iploading = false; }) .catch((err) => { @@ -91,6 +109,17 @@ export default { hide() { this.isShow = false; }, + //点击分页 + handleCurrentChange(val) { + this.page = val; + this.getIPList(); + }, + + //每页条数 + handleSizeChange(val) { + this.pageSize = val; + this.getIPList(); + }, }, created() {}, @@ -111,7 +140,7 @@ export default { } } .ipContain { - height: 100%; + height:calc(100% - 32px); .el-table { color: #000; thead { diff --git a/src/views/reportData/photostatis/components/photoList.vue b/src/views/reportData/photostatis/components/photoList.vue index 455a3f0..0f4e98e 100644 --- a/src/views/reportData/photostatis/components/photoList.vue +++ b/src/views/reportData/photostatis/components/photoList.vue @@ -13,6 +13,8 @@ 全部 通道1 通道2 + 通道3 + 通道4
diff --git a/src/views/reportData/photostatis/index.vue b/src/views/reportData/photostatis/index.vue index 292872d..6d0fefa 100644 --- a/src/views/reportData/photostatis/index.vue +++ b/src/views/reportData/photostatis/index.vue @@ -64,7 +64,7 @@ > - + { gettermAllList(params)