diff --git a/src/utils/api/index.js b/src/utils/api/index.js index 08cfdc9..079fd80 100644 --- a/src/utils/api/index.js +++ b/src/utils/api/index.js @@ -532,3 +532,20 @@ export function getCmaSchelduleUpload(data) { data, }); } +//通过Cma获取装置的实际拍照时间调用 + +export function cmaSchelduleDetials(data) { + return request({ + url: "/api/cmaSchelduleDetials", + method: "post", + data, + }); +} +//获取Cma调用实际拍照时间的结果 +export function getCmaSchelduleDetials(data) { + return request({ + url: "/api/getCmaSchelduleDetials", + method: "post", + data, + }); +} diff --git a/src/utils/request.js b/src/utils/request.js index a967af5..a7e8653 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -6,16 +6,15 @@ const service = axios.create({ // baseURL: '', // timeout: 5000 baseURL: "api", //把原来的项目地址，改成api，解决跨域问题 - timeout: 30000 + timeout: 30000, }); service.interceptors.request.use((config) => { - if(localStorage.getItem('token')){ - config.headers.sessionId = localStorage.getItem('token') + if (localStorage.getItem("token")) { + config.headers.sessionId = localStorage.getItem("token"); } return config; }); - service.interceptors.response.use( (response) => { if (response.status === 200) { diff --git a/src/views/devicePhotoSchedule/components/setdevice.vue b/src/views/devicePhotoSchedule/components/setdevice.vue index 1ca8caf..ff800f2 100644 --- a/src/views/devicePhotoSchedule/components/setdevice.vue +++ b/src/views/devicePhotoSchedule/components/setdevice.vue @@ -46,18 +46,11 @@ slot-scope="{ data }" > {{ data.name }}--{{ data.id }} - 装置下发成功装置下发成功 + 装置下发中 - 装置下发中 - + 装置下发失败 --> {{ data.name }} @@ -124,7 +117,8 @@ export default { allCheckNode: [], //获取选中的节点 requestArr: [], //通过requestid获取状态 - termzzid: "", + termzzid: [], + flag: false, }; }, mounted() {}, @@ -200,6 +194,11 @@ export default { console.log(res); this.requestList = res.data.list; this.requestTime(); + this.timer = window.setInterval(() => { + //console.log(this.requestList); + this.requestTime(); + this.i++; + }, 3000); }) .catch((err) => { this.$message({ @@ -215,13 +214,26 @@ export default { list: this.requestList, }) .then((res) => { - console.log(res); this.requestArr = res.data.list; - for (var i = 0; i < this.requestArr.length; i++) { - console.log(this.requestArr[i].status); - if (this.requestArr[i].status == 1) { - } else { - } + this.requestList = this.requestArr.filter(function ( + value, + index, + arr + ) { + console.log(value, index, arr); + return value.status !== 1; + }); + if (this.requestList.length == 0) { + this.$message.success("下发成功"); + clearInterval(this.timer); + this.timer = null; + this.isShow = false; + } else if (this.i > 9) { + this.i = 0; + this.$message.warning("下发失败，请稍后再试！"); + clearInterval(this.timer); + this.timer = null; + this.isShow = false; } }) .catch((err) => {}); @@ -232,6 +244,7 @@ export default { hide() { this.isShow = false; clearTimeout(this.timer); + this.timer = null; }, }, }; diff --git a/src/views/realTimeMonitor/components/setschedule.vue b/src/views/realTimeMonitor/components/setschedule.vue index 9a9bf9a..bbad413 100644 --- a/src/views/realTimeMonitor/components/setschedule.vue +++ b/src/views/realTimeMonitor/components/setschedule.vue @@ -30,13 +30,13 @@ >查询实际时间表 --> -
+
-
+
时间表:
- +
+
+ 暂无拍照时间表 +
-
暂无设置时间表
+ 装置时间表对比 @@ -187,7 +190,12 @@
取 消 - 确 定 + 确 定
@@ -204,6 +212,9 @@ import { selectPhotoTimeGetJoggle, selectPhotoTimeJoggle, getPhotoTimeJoggle, + cmaSchelduleDetials, + getCmaSchelduleDetials, + getCmaSchelduleUpload, } from "@/utils/api/index"; export default { props: { @@ -242,8 +253,16 @@ export default { newcmdzzid: "", newrequestId: "", timer: null, //定时器 + timers: null, timernum: 0, + i: 0, timeloading: false, + + requestId: "", + newshedulenr: [], //装置时间表 + requestList: [], + requestArr: [], //通过requestid获取状态 + sureloading: false, }; }, mounted() { @@ -270,7 +289,7 @@ export default { terminalid: this.selfacilityId, }) .then((res) => { - this.$message.success("查询成功"); + // this.$message.success("查询成功"); // this.shedulenr = res.data.list.join("; ") this.shedulenr = res.data.list; this.loading = false; @@ -290,7 +309,7 @@ export default { terminalid: this.selfacilityId, }) .then((res) => { - this.$message.success("查询成功"); + // this.$message.success("查询成功"); // this.shedulenr = res.data.list.join("; ") this.shedulenr = res.data.list; this.loading = false; @@ -300,9 +319,57 @@ export default { }); }, //查询时间表 - + inquirebtn() { + console.log(this.selaccess, this.selfacilityId); + cmaSchelduleDetials({ + channelid: this.selaccess, + terminalid: this.selfacilityId, + }) + .then((res) => { + console.log(res); + this.requestId = res.data.requestId; + this.realNewtime(); + this.timer = window.setInterval(() => { + //console.log(this.requestList); + this.realNewtime(); + this.timernum++; + }, 3000); + }) + .catch((err) => { + this.$message.error("查询失败"); + }); + }, //查询真是时间时间表 - + realNewtime() { + getCmaSchelduleDetials({ + requestid: this.requestId, + }) + .then((res) => { + if (res.code == 200) { + if (res.data.isNew == true) { + // this.shedulenr = res.data.list.join("; ") + this.newshedulenr = res.data.list; + this.timernum = 0; + // this.$message.success("查询成功"); + clearInterval(this.timer); + this.timer = null; + } else if (this.timernum > 9) { + this.searchloading = false; + this.timernum = 0; + this.$message.warning("暂无时间表！"); + clearInterval(this.timer); + this.timer = null; + } + } else { + this.$message.error(res.code.msg); + } + }) + .catch((err) => { + clearInterval(this.timer); + this.timer = null; + this.$message.error("查询失败"); + }); + }, //获取线路列表数据 deviceList() { getScheduleRulelListJoggle({ @@ -419,17 +486,14 @@ export default { ], }) .then((res) => { - this.isShowset = false; console.log(res); - // // this.$message({ - // showClose: true, - // message: '添加成功',type: 'success' - // });; - console.log(this.checkList); - // this.$store.commit("SET_CHANNELID", this.checkList); //将通道保存在vuex中 - // this.$store.commit("SET_TERMID", this.deviceListData.zzid); //将装置保存在vuex中 - this.handlexfTime(this.deviceListData.zzid, this.checkList); - this.deviceList(); + this.requestList = res.data.list; + this.requestTime(); + this.timers = window.setInterval(() => { + //console.log(this.requestList); + this.requestTime(); + this.i++; + }, 3000); }) .catch((err) => { this.$message({ @@ -441,19 +505,37 @@ export default { } }, //下发时间表 - handlexfTime(termid, channelid) { - console.log("下发时间表"); - console.log(termid); - console.log(channelid); - console.log("下发时间表结束"); - getPhotoTimeJoggle({ - channel: channelid, - termId: termid, + requestTime() { + // + this.sureloading = true; + getCmaSchelduleUpload({ + list: this.requestList, }) .then((res) => { - console.log(res); - if (res.code == 200) { - this.$message.success("拍照时间表设置下发成功"); + console.log("aaaaaaaaaaaaaaaaaaaaaaaa"); + this.requestArr = res.data.list; + this.requestList = this.requestArr.filter(function ( + value, + index, + arr + ) { + console.log(value, index, arr); + return value.status !== 1; + }); + console.log(this.requestArr); + if (this.requestList.length == 0) { + this.isShowset = false; + this.sureloading = false; + this.$message.success("下发成功"); + clearInterval(this.timers); + this.timers = null; + } else if (this.i > 9) { + this.isShowset = false; + this.sureloading = false; + this.i = 0; + this.$message.warning("下发失败，请稍后再试！"); + clearInterval(this.timers); + this.timers = null; } }) .catch((err) => {}); @@ -462,6 +544,8 @@ export default { this.isShowset = false; clearInterval(this.timer); this.deviceList(); + clearInterval(this.timers); + this.timers = null; }, display() { this.isShow = true; @@ -472,6 +556,8 @@ export default { handleclose() { clearInterval(this.timer); console.log("关闭轮询"); + clearInterval(this.timers); + this.timers = null; }, }, };