diff --git a/src/views/iceWeather/weather/index.vue b/src/views/iceWeather/weather/index.vue index 479abc4..fed1feb 100644 --- a/src/views/iceWeather/weather/index.vue +++ b/src/views/iceWeather/weather/index.vue @@ -314,7 +314,7 @@ export default { console.log("电压-公司"); weatherParams = { dyId: data.id, - pageNum: this.page, + pageNum: 1, pageSize: this.pageSize, }; this.getWeatherData(weatherParams); @@ -322,14 +322,14 @@ export default { console.log("线路-电压"); weatherParams = { lineId: data.id, - pageNum: this.page, + pageNum: 1, pageSize: this.pageSize, }; this.getWeatherData(weatherParams); } else { console.log("装置-杆塔"); weatherParams = { - pageNum: this.page, + pageNum: 1, pageSize: this.pageSize, towerId: data.towerid, }; @@ -356,14 +356,68 @@ export default { //点击分页 handleCurrentChange(val) { this.page = val; + let data = this.paramsData; + let weatherParams; this.tableData = []; - this.getWeatherData(this.paramsData); + if (data.dyValue) { + console.log("电压-公司"); + weatherParams = { + dyId: data.id, + pageNum: this.page, + pageSize: this.pageSize, + }; + this.getWeatherData(weatherParams); + } else if (data.bsManufacturer) { + console.log("线路-电压"); + weatherParams = { + lineId: data.id, + pageNum: this.page, + pageSize: this.pageSize, + }; + this.getWeatherData(weatherParams); + } else { + console.log("装置-杆塔"); + weatherParams = { + pageNum: this.page, + pageSize: this.pageSize, + towerId: data.towerid, + }; + this.getWeatherData(weatherParams); + } + //this.getCurrentData(this.paramsData); }, //每页条数 handleSizeChange(val) { this.pageSize = val; this.tableData = []; - this.getWeatherData(this.paramsData); + let data = this.paramsData; + let weatherParams; + this.tableData = []; + if (data.dyValue) { + console.log("电压-公司"); + weatherParams = { + dyId: data.id, + pageNum: this.page, + pageSize: this.pageSize, + }; + this.getWeatherData(weatherParams); + } else if (data.bsManufacturer) { + console.log("线路-电压"); + weatherParams = { + lineId: data.id, + pageNum: this.page, + pageSize: this.pageSize, + }; + this.getWeatherData(weatherParams); + } else { + console.log("装置-杆塔"); + weatherParams = { + pageNum: this.page, + pageSize: this.pageSize, + towerId: data.towerid, + }; + this.getWeatherData(weatherParams); + } }, //点击查看更多历史数据 moreDataClick(row) { diff --git a/src/views/photographicDevice/components/imageCapture.vue b/src/views/photographicDevice/components/imageCapture.vue index 90b2935..e684fa5 100644 --- a/src/views/photographicDevice/components/imageCapture.vue +++ b/src/views/photographicDevice/components/imageCapture.vue @@ -720,8 +720,32 @@ export default { id: 20, name: "", }, - ], //河南 + ], //河南统一 nxratiolist: [ + { + id: 1, + name: "320X240", + }, + { + id: 2, + name: "640X480", + }, + { + id: 3, + name: "704X576", + }, + { + id: 4, + name: "800X600 ", + }, + { + id: 5, + name: "1024X768", + }, + { + id: 6, + name: "1280X1024 ", + }, { id: 7, name: "1280X720", @@ -730,6 +754,54 @@ export default { id: 8, name: "1920X1080", }, + { + id: 9, + name: "2560X1440", + }, + { + id: 10, + name: "3840X2160", + }, + { + id: 11, + name: "2560X1920 ", + }, + { + id: 12, + name: "3264X2448", + }, + { + id: 13, + name: "4224X3136", + }, + { + id: 14, + name: "", + }, + { + id: 15, + name: "", + }, + { + id: 16, + name: "", + }, + { + id: 17, + name: "", + }, + { + id: 18, + name: "", + }, + { + id: 19, + name: "", + }, + { + id: 20, + name: "", + }, ], //宁夏 // selaccess: "", //选中的通道 diff --git a/src/views/realTimeSearch/index.vue b/src/views/realTimeSearch/index.vue index fb5c68e..1dd1841 100644 --- a/src/views/realTimeSearch/index.vue +++ b/src/views/realTimeSearch/index.vue @@ -241,7 +241,7 @@ export default { termid: -1, search: "", }, - + tdTermid: "", page: 1, // 当前页数 pageSize: 20, // 每页数量 total: 0, //总条数 @@ -365,6 +365,14 @@ export default { }) .catch((err) => {}); }, + getSearchtdAlone() { + getSearchInfo({ type: 5, id: this.tdTermid }) + .then((res) => { + this.tdOptions = [{ id: -1, name: "全部", alias: null }]; + this.tdOptions = this.tdOptions.concat(res.data.list); + }) + .catch((err) => {}); + }, //获取图片列表 getPicData() { this.loading = true; @@ -376,6 +384,8 @@ export default { this.picList = []; this.picList = res.data.list; this.total = res.data.total; + this.tdTermid = res.data.list[0].termid; + this.getSearchtdAlone(); this.loading = false; }) .catch((err) => { diff --git a/vue.config.js b/vue.config.js index 84957d3..9e1ce46 100644 --- a/vue.config.js +++ b/vue.config.js @@ -23,8 +23,8 @@ module.exports = defineConfig({ //表示拦截以/api开头的请求路径 //target: "http://192.168.1.190:8080", //190 需要去掉/Api - // target: "http://61.169.135.146:9911/", //运维 - target: "http://61.169.135.146:40080/", //dell + target: "http://61.169.135.146:9911/", //运维 + // target: "http://61.169.135.146:40080/", //dell changOrigin: true, //是否开启跨域 pathRewrite: { "^/api": "/api", //重写api,把api变成空字符,因为我们真正请求的路径是没有api的