diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue index 22a0fc3..8ea5b1c 100644 --- a/src/components/Sidebar.vue +++ b/src/components/Sidebar.vue @@ -287,6 +287,33 @@ export default { ], }, ], + hnjcitems: [ + { + icon: "el-icon-s-home", + index: "stritl", + title: "首页", + }, + { + icon: "el-icon-camera", + index: "/realTimeMonitor", + title: "实时监控", + }, + { + icon: "el-icon-film", + index: "/pictureRotation", + title: "图片轮巡", + }, + { + icon: "el-icon-bell", + index: "photoAlarm", + title: "告警处理", + }, + { + icon: "el-icon-search", + index: "/realTimeSearch", + title: "历史图片", + }, + ], role: "", }; @@ -313,6 +340,8 @@ export default { this.items = this.items1; } else if (this.role == 2) { this.items = this.items2; + } else if (this.role == 4) { + this.items = this.hnjcitems; } console.log(this.items); diff --git a/src/router/index.js b/src/router/index.js index eccd840..5a020c1 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -126,6 +126,12 @@ const routes = [ ), meta: { title: "拍照时间表设置", icon: "" }, }, + { + path: "/waterMark", + component: () => + import(/* webpackChunkName: "tabs" */ "../views/waterMark/index.vue"), + meta: { title: "水印下发", icon: "" }, + }, ], }, diff --git a/src/utils/api/index.js b/src/utils/api/index.js index c893de2..2a749c9 100644 --- a/src/utils/api/index.js +++ b/src/utils/api/index.js @@ -667,3 +667,15 @@ export function updateTermCamera(data) { params: data, }); } + +//郑州检测左侧树状结构接口 +export function getzzdyTreeList(data) { + return request({ + url: "/api/getzzdyTreeList", + method: "get", + params: data, + headers: { + "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8", + }, + }); +} diff --git a/src/views/photographicDevice/components/imageCapture.vue b/src/views/photographicDevice/components/imageCapture.vue index 061448b..c7e38a0 100644 --- a/src/views/photographicDevice/components/imageCapture.vue +++ b/src/views/photographicDevice/components/imageCapture.vue @@ -799,7 +799,7 @@ export default { } if (val.protocol == 65281) { - this.$set(this.setForm, "resolution", this.ratiolist[12].id); + this.$set(this.setForm, "resolution", this.ratiolist[5].id); this.$set(this.setForm, "luminance", 50); this.$set(this.setForm, "contrast", 50); this.$set(this.setForm, "saturation", 50); diff --git a/src/views/photographicDevice/components/parameterSetDialog.vue b/src/views/photographicDevice/components/parameterSetDialog.vue index 5de3c1b..fceebc0 100644 --- a/src/views/photographicDevice/components/parameterSetDialog.vue +++ b/src/views/photographicDevice/components/parameterSetDialog.vue @@ -306,6 +306,7 @@ v-model="channelId" placeholder="请选择" class="mr20" + @change="waterChange" > 1 @@ -721,7 +723,24 @@ export default { ); } console.log(params); - this.setTermFnRule(params); + for (var k = 0; k < timeArr.length; k++) { + //console.log(moment(dayArr[k]).hour()); + timeArrList.push({ + hour: this.$moment(timeArr[k]).hour(), + minute: this.$moment(timeArr[k]).minute(), + preset: 255, + }); + } + console.log(timeArrList); + var parmsobj = { + termid: this.areaData.id, + channelid: this.timeChannel, + offset: this.setNum, + list: timeArrList, + }; + console.log(parmsobj); + this.setTimeRuleJava(parmsobj); //使用java接口调用下发时间表 + //this.setTermFnRule(params); } else { this.sureloading = false; this.$message({ @@ -733,6 +752,33 @@ export default { } }); }, + //使用接口下发时间表会写进数据库 + setTimeRuleJava(parmsobj) { + console.log(parmsobj); + setScheduleRulel({ + scheduleid: this.currentTimeRule.id, + list: [parmsobj], + }) + .then((res) => { + console.log(res); + this.requestid = res.data.list[0].requestid; + console.log(this.requestid); + clearInterval(this.timer); + this.deviceTimer = window.setInterval(() => { + this.getinfoRules(); + this.deviceNum++; + console.log(this.deviceNum, this.deviceNum * 1000); + }, 1000 * this.deviceNum); + }) + .catch((err) => { + // this.$message({ + // duration: 1500, + // showClose: true, + // message: "添加失败", + // type: "error", + // }); + }); + }, //下发时间表 setTermFnRule(dataParams) { setTermCamera({ diff --git a/src/views/realTimeMonitor/components/siderBar.vue b/src/views/realTimeMonitor/components/siderBar.vue index 0ba17fc..2262a79 100644 --- a/src/views/realTimeMonitor/components/siderBar.vue +++ b/src/views/realTimeMonitor/components/siderBar.vue @@ -51,7 +51,10 @@ - {{ node.label }} + {{ node.label }} + ({{ data.list.length }}) diff --git a/src/views/waterMark/index.vue b/src/views/waterMark/index.vue new file mode 100644 index 0000000..0f8d731 --- /dev/null +++ b/src/views/waterMark/index.vue @@ -0,0 +1,286 @@ + + +