diff --git a/src/views/alarmHandling/index.vue b/src/views/alarmHandling/index.vue index fb2388c..d475860 100644 --- a/src/views/alarmHandling/index.vue +++ b/src/views/alarmHandling/index.vue @@ -282,14 +282,14 @@ export default { zoomable: true, url: "src", }, - dyOptions: [{ id: 0, name: "全部" }], //电压数据 - xlOptions: [{ id: 0, name: "全部" }], //线路数据 - gtOptions: [{ id: 0, name: "全部" }], //杆塔数据 - gjOptions: [{ id: 0, label: -1, name: "全部" }], //告警数据 + dyOptions: [{ id: -1, name: "全部" }], //电压数据 + xlOptions: [{ id: -1, name: "全部" }], //线路数据 + gtOptions: [{ id: -1, name: "全部" }], //杆塔数据 + gjOptions: [{ id: -1, label: -1, name: "全部" }], //告警数据 formdata: { - dyId: 0, - lineId: 0, - towerId: 0, + dyId: -1, + lineId: -1, + towerId: -1, label: -1, // timeVal: "", }, @@ -355,7 +355,7 @@ export default { getSearchxl() { getSearchInfo({ type: 2, id: this.formdata.dyId }) .then((res) => { - this.xlOptions = [{ id: 0, name: "全部" }]; + this.xlOptions = [{ id: -1, name: "全部" }]; this.xlOptions = this.xlOptions.concat(res.data.list); this.formdata.lineId = this.xlOptions[0].id; this.getSearchgt(); @@ -366,7 +366,7 @@ export default { getSearchgt() { getSearchInfo({ type: 3, id: this.formdata.lineId }) .then((res) => { - this.gtOptions = [{ id: 0, name: "全部" }]; + this.gtOptions = [{ id: -1, name: "全部" }]; this.gtOptions = this.gtOptions.concat(res.data.list); this.formdata.towerId = this.gtOptions[0].id; this.getSearchgj(); @@ -377,7 +377,7 @@ export default { getSearchgj() { getAlarmTypeList() .then((res) => { - this.gjOptions = [{ id: 0, label: -1, name: "全部" }]; + this.gjOptions = [{ id: -1, label: -1, name: "全部" }]; this.gjOptions = this.gjOptions.concat(res.data.list); console.log(this.gjOptions); this.formdata.label = this.gjOptions[0].label; diff --git a/src/views/management/monitoringEquipment/photographicDevice/index.vue b/src/views/management/monitoringEquipment/photographicDevice/index.vue index d32486f..191d756 100644 --- a/src/views/management/monitoringEquipment/photographicDevice/index.vue +++ b/src/views/management/monitoringEquipment/photographicDevice/index.vue @@ -45,12 +45,13 @@ 查询 + 重置 @@ -443,14 +444,14 @@ export default { }, data() { return { - dyOptions: [{ id: 0, name: "全部" }], //电压数据 - xlOptions: [{ id: 0, name: "全部" }], //线路数据 - gtOptions: [{ id: 0, name: "全部" }], //杆塔数据 + dyOptions: [{ id: -1, name: "全部" }], //电压数据 + xlOptions: [{ id: -1, name: "全部" }], //线路数据 + gtOptions: [{ id: -1, name: "全部" }], //杆塔数据 formdata: { - dyId: 0, - lineId: 0, - towerId: 0, - searchnr: "", + dyId: -1, + lineId: -1, + towerId: -1, + search: "", }, roleUser: "", terminalTableData: [], //表格数据 @@ -478,8 +479,8 @@ export default { }; }, created() { - this.terminalList(); this.getSearchdy(); + this.terminalList(); this.roleUser = localStorage.getItem("role"); console.log(this.roleUser); }, @@ -498,7 +499,7 @@ export default { getSearchxl() { getSearchInfo({ type: 2, id: this.formdata.dyId }) .then((res) => { - this.xlOptions = [{ id: 0, name: "全部" }]; + this.xlOptions = [{ id: -1, name: "全部" }]; this.xlOptions = this.xlOptions.concat(res.data.list); this.formdata.lineId = this.xlOptions[0].id; this.getSearchgt(); @@ -509,7 +510,7 @@ export default { getSearchgt() { getSearchInfo({ type: 3, id: this.formdata.lineId }) .then((res) => { - this.gtOptions = [{ id: 0, name: "全部" }]; + this.gtOptions = [{ id: -1, name: "全部" }]; this.gtOptions = this.gtOptions.concat(res.data.list); this.formdata.towerId = this.gtOptions[0].id; }) @@ -522,10 +523,9 @@ export default { ////获取拍照装置列表数据 terminalList() { this.loading = true; - getTerminalJoggle({ - pageindex: this.page, - pagesize: this.pageSize, - }) + this.$set(this.formdata, "pageindex", this.page); + this.$set(this.formdata, "pagesize", this.pageSize); + getTerminalJoggle(this.formdata) .then((res) => { console.log(res); this.terminalTableData = res.data.list; diff --git a/src/views/realTimeSearch/index.vue b/src/views/realTimeSearch/index.vue index fcd2490..b68a201 100644 --- a/src/views/realTimeSearch/index.vue +++ b/src/views/realTimeSearch/index.vue @@ -206,17 +206,17 @@ export default { zoomable: true, url: "src", }, - dyOptions: [{ id: 0, name: "全部" }], //电压数据 - xlOptions: [{ id: 0, name: "全部" }], //线路数据 - gtOptions: [{ id: 0, name: "全部" }], //杆塔数据 - zzOptions: [{ id: 0, name: "全部" }], //装置数据 - tdOptions: [{ id: 0, name: "全部" }], //通道数据 + dyOptions: [{ id: -1, name: "全部" }], //电压数据 + xlOptions: [{ id: -1, name: "全部" }], //线路数据 + gtOptions: [{ id: -1, name: "全部" }], //杆塔数据 + zzOptions: [{ id: -1, name: "全部" }], //装置数据 + tdOptions: [{ id: -1, name: "全部" }], //通道数据 formdata: { - dyid: "", - lineid: "", - towerid: "", - channelid: "", - termid: "", + dyid: -1, + lineid: -1, + towerid: -1, + channelid: -1, + termid: -1, // timeVal: "", }, picList: [], @@ -263,7 +263,7 @@ export default { getSearchxl() { getSearchInfo({ type: 2, id: this.formdata.dyid }) .then((res) => { - this.xlOptions = [{ id: 0, name: "全部" }]; + this.xlOptions = [{ id: -1, name: "全部" }]; this.xlOptions = this.xlOptions.concat(res.data.list); this.formdata.lineid = this.xlOptions[0].id; this.getSearchgt(); @@ -274,7 +274,7 @@ export default { getSearchgt() { getSearchInfo({ type: 3, id: this.formdata.lineid }) .then((res) => { - this.gtOptions = [{ id: 0, name: "全部" }]; + this.gtOptions = [{ id: -1, name: "全部" }]; this.gtOptions = this.gtOptions.concat(res.data.list); this.formdata.towerid = this.gtOptions[0].id; this.getSearchzz(); @@ -285,7 +285,7 @@ export default { getSearchzz() { getSearchInfo({ type: 4, id: this.formdata.towerid }) .then((res) => { - this.zzOptions = [{ id: 0, name: "全部" }]; + this.zzOptions = [{ id: -1, name: "全部" }]; this.zzOptions = this.zzOptions.concat(res.data.list); this.formdata.termid = this.zzOptions[0].id; this.getSearchtd(); @@ -296,7 +296,7 @@ export default { getSearchtd() { getSearchInfo({ type: 5, id: this.formdata.termid }) .then((res) => { - this.tdOptions = [{ id: 0, name: "全部" }]; + this.tdOptions = [{ id: -1, name: "全部" }]; this.tdOptions = this.tdOptions.concat(res.data.list); this.formdata.channelid = this.tdOptions[0].id; // if (this.signtype == 0) {