jc
fanluyan 1 year ago
parent 88d2c58bc4
commit f00a7a98ed

@ -142,10 +142,10 @@ export default {
index: "/roleManagement", index: "/roleManagement",
title: "角色管理", title: "角色管理",
}, },
{ // {
index: "/menuManagement", // index: "/menuManagement",
title: "菜单功能管理", // title: "",
}, // },
{ {
index: "/deviceUpgrade", index: "/deviceUpgrade",
title: "升级管理", title: "升级管理",

@ -275,6 +275,8 @@ export default {
this.paramsData = data; this.paramsData = data;
let pullParams; let pullParams;
console.log(data); console.log(data);
const sTime = Math.floor(this.formdata.starttime / 1000);
const eTime = Math.floor(this.formdata.endtime / 1000);
if (data.dyValue) { if (data.dyValue) {
console.log("电压-公司"); console.log("电压-公司");
this.dyFlag = true; this.dyFlag = true;
@ -283,6 +285,8 @@ export default {
dyId: data.id, dyId: data.id,
pageNum: this.page, pageNum: this.page,
pageSize: this.pageSize, pageSize: this.pageSize,
start: sTime,
end: eTime,
}; };
this.getIcingData(pullParams); this.getIcingData(pullParams);
this.termalFlag = false; this.termalFlag = false;
@ -294,6 +298,8 @@ export default {
lineId: data.id, lineId: data.id,
pageNum: this.page, pageNum: this.page,
pageSize: this.pageSize, pageSize: this.pageSize,
start: sTime,
end: eTime,
}; };
this.getIcingData(pullParams); this.getIcingData(pullParams);
this.termalFlag = false; this.termalFlag = false;
@ -301,8 +307,8 @@ export default {
this.dyFlag = false; this.dyFlag = false;
this.lineFlag = false; this.lineFlag = false;
console.log("装置-杆塔"); console.log("装置-杆塔");
const sTime = Math.floor(this.formdata.starttime / 1000); // const sTime = Math.floor(this.formdata.starttime / 1000);
const eTime = Math.floor(this.formdata.endtime / 1000); // const eTime = Math.floor(this.formdata.endtime / 1000);
console.log(data); console.log(data);
pullParams = { pullParams = {
lineId: data.lineid, lineId: data.lineid,
@ -649,6 +655,8 @@ export default {
dyId: this.paramsData.id, dyId: this.paramsData.id,
pageNum: this.page, pageNum: this.page,
pageSize: this.pageSize, pageSize: this.pageSize,
start: sTime,
end: eTime,
}; };
this.getIcingData(pullParams); this.getIcingData(pullParams);
} else if (this.lineFlag) { } else if (this.lineFlag) {
@ -656,6 +664,8 @@ export default {
lineId: this.paramsData.id, lineId: this.paramsData.id,
pageNum: this.page, pageNum: this.page,
pageSize: this.pageSize, pageSize: this.pageSize,
start: sTime,
end: eTime,
}; };
this.getIcingData(pullParams); this.getIcingData(pullParams);
} else if (this.termalFlag) { } else if (this.termalFlag) {
@ -676,67 +686,13 @@ export default {
handleCurrentChange(val) { handleCurrentChange(val) {
this.page = val; this.page = val;
this.tableData = []; this.tableData = [];
const sTime = Math.floor(this.formdata.starttime / 1000); this.onSubmit();
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);
}
}, },
// //
handleSizeChange(val) { handleSizeChange(val) {
this.pageSize = val; this.pageSize = val;
this.tableData = []; this.tableData = [];
const sTime = Math.floor(this.formdata.starttime / 1000); this.onSubmit();
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);
}
}, },
}, },
}; };

@ -17,14 +17,14 @@ module.exports = defineConfig({
transpileDependencies: true, transpileDependencies: true,
lintOnSave: false, lintOnSave: false,
devServer: { devServer: {
port: 9527, // 端口号的配置 port: 8080, // 端口号的配置
proxy: { proxy: {
"/api": { "/api": {
//表示拦截以/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.1.190:8080", //liu 本机ip 需要去掉/Api
//target: "http://192.168.50.7:8093", //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, //是否开启跨域 changOrigin: true, //是否开启跨域
pathRewrite: { pathRewrite: {
"^/api": "/api", //重写api把api变成空字符因为我们真正请求的路径是没有api的 "^/api": "/api", //重写api把api变成空字符因为我们真正请求的路径是没有api的

Loading…
Cancel
Save