diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue index 34ffb43..2be7300 100644 --- a/src/components/Sidebar.vue +++ b/src/components/Sidebar.vue @@ -142,10 +142,10 @@ export default { index: "/roleManagement", title: "角色管理", }, - { - index: "/menuManagement", - title: "菜单功能管理", - }, + // { + // index: "/menuManagement", + // title: "菜单功能管理", + // }, { index: "/deviceUpgrade", title: "升级管理", diff --git a/src/views/iceWeather/icing/index.vue b/src/views/iceWeather/icing/index.vue index bb0c534..ba72a8f 100644 --- a/src/views/iceWeather/icing/index.vue +++ b/src/views/iceWeather/icing/index.vue @@ -275,6 +275,8 @@ export default { this.paramsData = data; let pullParams; console.log(data); + const sTime = Math.floor(this.formdata.starttime / 1000); + const eTime = Math.floor(this.formdata.endtime / 1000); if (data.dyValue) { console.log("电压-公司"); this.dyFlag = true; @@ -283,6 +285,8 @@ export default { dyId: data.id, pageNum: this.page, pageSize: this.pageSize, + start: sTime, + end: eTime, }; this.getIcingData(pullParams); this.termalFlag = false; @@ -294,6 +298,8 @@ export default { lineId: data.id, pageNum: this.page, pageSize: this.pageSize, + start: sTime, + end: eTime, }; this.getIcingData(pullParams); this.termalFlag = false; @@ -301,8 +307,8 @@ export default { this.dyFlag = false; this.lineFlag = false; console.log("装置-杆塔"); - const sTime = Math.floor(this.formdata.starttime / 1000); - const eTime = Math.floor(this.formdata.endtime / 1000); + // const sTime = Math.floor(this.formdata.starttime / 1000); + // const eTime = Math.floor(this.formdata.endtime / 1000); console.log(data); pullParams = { lineId: data.lineid, @@ -649,6 +655,8 @@ export default { dyId: this.paramsData.id, pageNum: this.page, pageSize: this.pageSize, + start: sTime, + end: eTime, }; this.getIcingData(pullParams); } else if (this.lineFlag) { @@ -656,6 +664,8 @@ export default { lineId: this.paramsData.id, pageNum: this.page, pageSize: this.pageSize, + start: sTime, + end: eTime, }; this.getIcingData(pullParams); } else if (this.termalFlag) { @@ -676,67 +686,13 @@ export default { handleCurrentChange(val) { this.page = val; this.tableData = []; - const sTime = Math.floor(this.formdata.starttime / 1000); - const eTime = Math.floor(this.formdata.endtime / 1000); - if (this.dyFlag) { - let pullParams = { - dyId: this.paramsData.id, - pageNum: this.page, - pageSize: this.pageSize, - }; - this.getIcingData(pullParams); - } else if (this.lineFlag) { - let pullParams = { - lineId: this.paramsData.id, - pageNum: this.page, - pageSize: this.pageSize, - }; - this.getIcingData(pullParams); - } else if (this.termalFlag) { - let pullParams = { - lineId: this.paramsData.lineid, - termId: this.paramsData.id, - towerId: this.paramsData.towerid, - start: sTime, - end: eTime, - pageNum: this.page, - pageSize: this.pageSize, - }; - this.getIcingListData(pullParams); - } + this.onSubmit(); }, //每页条数 handleSizeChange(val) { this.pageSize = val; this.tableData = []; - const sTime = Math.floor(this.formdata.starttime / 1000); - const eTime = Math.floor(this.formdata.endtime / 1000); - if (this.dyFlag) { - let pullParams = { - dyId: this.paramsData.id, - pageNum: this.page, - pageSize: this.pageSize, - }; - this.getIcingData(pullParams); - } else if (this.lineFlag) { - let pullParams = { - lineId: this.paramsData.id, - pageNum: this.page, - pageSize: this.pageSize, - }; - this.getIcingData(pullParams); - } else if (this.termalFlag) { - let pullParams = { - lineId: this.paramsData.lineid, - termId: this.paramsData.id, - towerId: this.paramsData.towerid, - start: sTime, - end: eTime, - pageNum: this.page, - pageSize: this.pageSize, - }; - this.getIcingListData(pullParams); - } + this.onSubmit(); }, }, }; diff --git a/vue.config.js b/vue.config.js index 5bdec9f..b547eaa 100644 --- a/vue.config.js +++ b/vue.config.js @@ -17,14 +17,14 @@ module.exports = defineConfig({ transpileDependencies: true, lintOnSave: false, devServer: { - port: 9527, // 端口号的配置 + port: 8080, // 端口号的配置 proxy: { "/api": { //表示拦截以/api开头的请求路径 - //target: "http://180.166.218.222:40080", //dell + target: "http://localhost:8080", // 使用本地端口,这个端口是 PuTTY SSH 隧道映射的本地端口 //target: "http://192.168.1.190:8080", //liu 本机ip 需要去掉/Api //target: "http://192.168.50.7:8093", //liu 本机ip 需要去掉/Api - target: "http://192.168.111.211:80", //东视 + //target: "http://192.168.111.211:80", //东视 changOrigin: true, //是否开启跨域 pathRewrite: { "^/api": "/api", //重写api,把api变成空字符,因为我们真正请求的路径是没有api的