diff --git a/src/views/lineInformation/components/addLineDialog.vue b/src/views/lineInformation/components/addLineDialog.vue index 358b1c2..8f40d1b 100644 --- a/src/views/lineInformation/components/addLineDialog.vue +++ b/src/views/lineInformation/components/addLineDialog.vue @@ -154,7 +154,7 @@ export default { created() { getdyListJoggle().then((res) => { console.log(res); - this.dyOptions = res.data.list; + this.dyOptions = res.data; console.log(this.dyOptions); }); }, diff --git a/src/views/lineInformation/index.vue b/src/views/lineInformation/index.vue index 5eaa09b..fd0997d 100644 --- a/src/views/lineInformation/index.vue +++ b/src/views/lineInformation/index.vue @@ -48,7 +48,7 @@ - - + + @@ -274,7 +274,7 @@ export default { ], protocolOptions: [], //规约版本 rules: { - cmdId: [ + cmdid: [ { required: true, message: "请输入装置ID", trigger: "blur" }, { validator: validCmid, trigger: "blur" }, ], @@ -306,7 +306,7 @@ export default { return (this.formInfo = { lineId: "", towerId: "", - cmdId: "", + cmdid: "", equipName: "", devType: this.devTypeOptions[0].id, hasPan: this.hasPanOptions[0].id, @@ -399,7 +399,7 @@ export default { // displayName: this.formInfo.cmdId, // }; this.$set(this.formInfo, "workingDate", new Date().getTime()); - this.$set(this.formInfo, "displayName", this.formInfo.cmdId); + this.$set(this.formInfo, "displayName", this.formInfo.cmdid); console.log(this.formInfo); addTerminalJoggle(this.formInfo) .then((res) => { diff --git a/src/views/photographicDevice/index.vue b/src/views/photographicDevice/index.vue index 1a3d1f8..4cc07f3 100644 --- a/src/views/photographicDevice/index.vue +++ b/src/views/photographicDevice/index.vue @@ -130,7 +130,7 @@ > 删除 - @@ -607,7 +600,7 @@ export default { this.$message({ duration: 1500, type: "success", - message: "关闭成功!", + message: "删除成功!", showClose: true, }); }) diff --git a/src/views/realTimeMonitor/components/parameterArea.vue b/src/views/realTimeMonitor/components/parameterArea.vue index 097dc44..74da36f 100644 --- a/src/views/realTimeMonitor/components/parameterArea.vue +++ b/src/views/realTimeMonitor/components/parameterArea.vue @@ -18,6 +18,7 @@ type="date" placeholder="选择日期" format="yyyy 年 MM 月 dd 日" + value-format="timestamp" :picker-options="pickerOptions" @change="changedate" @focus="handleDateFocus" @@ -291,7 +292,7 @@ export default { }, //选择时间 changedate() { - console.log(this.dateValue.getTime()); + console.log(this.dateValue); this.$parent.getPhotoList( this.selectChannelValue, this.dateValue, diff --git a/src/views/realTimeSearch/index.vue b/src/views/realTimeSearch/index.vue index e078d71..3aadc6c 100644 --- a/src/views/realTimeSearch/index.vue +++ b/src/views/realTimeSearch/index.vue @@ -266,6 +266,7 @@ export default { "starttime", new Date(new Date().toLocaleDateString()).getTime() ); + this.getSearchdy(); } else { this.getSearchdy(); @@ -274,7 +275,7 @@ export default { this.formdata.towerid = this.$route.query.towerId; this.formdata.channelid = this.$route.query.channelId; this.formdata.termid = this.$route.query.termId; - this.$set(this.formdata, "starttime", this.$route.query.date); + this.$set(this.formdata, "starttime", Number(this.$route.query.date)); } }, methods: { @@ -370,7 +371,7 @@ export default { this.loading = true; this.$set(this.formdata, "pageindex", this.page); this.$set(this.formdata, "pagesize", this.pageSize); - + console.log(this.formdata); getRealtimePhoto(this.formdata) .then((res) => { this.picList = [];