Browse Source

更改首页参数报错

wangqin
zhangzhang 7 months ago
parent
commit
365e14238e
  1. 23
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js
  2. 2
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts.js
  3. 2
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts2.js
  4. 2
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts3.js
  5. 4
      ruoyi-ui/vue.config.js

23
ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js

@ -205,23 +205,36 @@ const DeviceTypeMap = {
14: "光线在线监测", 14: "光线在线监测",
*/ */
export function getDeviceList(deviceType, options) { export function getDeviceList(deviceType, options) {
console.log("++++++++++++", options);
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
if (!deviceType) { if (!deviceType) {
Message.error(`${DeviceTypeMap[deviceType]}设备加载失败!`); Message.error(`${DeviceTypeMap[deviceType]}设备加载失败!`);
return reject(); return reject();
} }
const data = { // const data = {
deviceType, // deviceType,
...options, // ...options,
}; // };
let newEndStakeMark = [];
let newStartStakeMark = [];
options.endStakeMark.forEach((item) => {
newEndStakeMark.push(String(item));
});
options.startStakeMark.forEach((item) => {
newStartStakeMark.push(String(item));
});
request( request(
Object.keys(options || {}).length Object.keys(options || {}).length
? { ? {
url: "/business/device/pileNumberQuery", url: "/business/device/pileNumberQuery",
method: "POST", method: "POST",
data, data: {
deviceType,
endStakeMark: newEndStakeMark,
startStakeMark: newStartStakeMark,
},
} }
: { : {
url: "/business/device/query", url: "/business/device/query",

2
ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts.js

@ -79,6 +79,7 @@ let options = {
color: "#1C82C5", color: "#1C82C5",
}, },
}, },
// minInterval: 1,
splitLine: { splitLine: {
show: true, show: true,
lineStyle: { lineStyle: {
@ -109,6 +110,7 @@ let options = {
// color: "#1C82C5", // color: "#1C82C5",
// }, // },
}, },
// minInterval: 1,
splitLine: { splitLine: {
show: false, show: false,
lineStyle: { lineStyle: {

2
ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts2.js

@ -73,6 +73,7 @@ let options = {
fontSize: 10, fontSize: 10,
}, },
}, },
// minInterval: 1,
axisLine: { axisLine: {
show: false, show: false,
}, },
@ -101,6 +102,7 @@ let options = {
// formatter: "{value} °C", // formatter: "{value} °C",
}, },
}, },
// minInterval: 1,
axisLine: { axisLine: {
show: false, show: false,
}, },

2
ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts3.js

@ -101,6 +101,7 @@ var options = {
// + minNumber; // + minNumber;
}, },
}, },
// minInterval: 1,
}, },
{ {
type: "value", type: "value",
@ -115,6 +116,7 @@ var options = {
type: "dotted", type: "dotted",
}, },
}, },
// minInterval: 1,
axisTick: { axisTick: {
show: false, show: false,
}, },

4
ruoyi-ui/vue.config.js

@ -53,8 +53,8 @@ module.exports = {
// target: `http://10.168.69.255:8087`, //正晨后台 连现场物联 刘文阁 // target: `http://10.168.69.255:8087`, //正晨后台 连现场物联 刘文阁
// target: `http://10.168.78.135:8087`, //王钦 // target: `http://10.168.78.135:8087`, //王钦
// target: `http://10.168.66.196:8087`, //正晨后台 连现场物联 刘文阁2 // target: `http://10.168.66.196:8087`, //正晨后台 连现场物联 刘文阁2
// target: `http://10.168.68.42:8087`, //王思祥 target: `http://10.168.68.42:8087`, //王思祥
target: `http://10.168.72.174:8087`, //赵祥龙 // target: `http://10.168.72.174:8087`, //赵祥龙
// target: `http://10.168.65.156:8097`, //孟 // target: `http://10.168.65.156:8097`, //孟
// target: `http://10.168.56.165:8087`, //王家宝 // target: `http://10.168.56.165:8087`, //王家宝
// target: `http://10.168.77.128:8087`, //王兴琳 // target: `http://10.168.77.128:8087`, //王兴琳

Loading…
Cancel
Save