diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 33741fa7..0bc7d287 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -41,7 +41,7 @@ if (process.env.NODE_ENV == 'development') { // tag: 本地 // axios.defaults.baseURL = 'http://192.168.34.174:6023/' // 老大本地 // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1 - axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地 + // axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地 // axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上 // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1 // axios.defaults.baseURL = 'http://192.168.34.216:18070/' // 邱平毅本地 @@ -49,7 +49,7 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://47.97.202.104:6023/'; // axios.defaults.baseURL = 'http://139.9.66.234:8/'; // axios.defaults.baseURL = 'http://120.196.217.6:7000/'; // 鹤洲 - // axios.defaults.baseURL = 'http://182.90.224.237:7000/'; // 广西 + axios.defaults.baseURL = 'http://182.90.224.237:7000/'; // 广西 // axios.defaults.baseURL = 'http://120.196.217.6:7000/' //鹤洲 // axios.defaults.baseURL = 'http://117.156.17.59:9090/'; // diff --git a/src/views/projectFront/deepFoundationPitManage/monitorData.vue b/src/views/projectFront/deepFoundationPitManage/monitorData.vue index 09fc6ded..4ebd0fe4 100644 --- a/src/views/projectFront/deepFoundationPitManage/monitorData.vue +++ b/src/views/projectFront/deepFoundationPitManage/monitorData.vue @@ -1555,7 +1555,8 @@ export default { }, yAxis: { type: "value", - name: this.echartData7.unit, + // name: this.echartData7.unit, + name:`${'单位/'} ${this.echartData7.unit }`, splitLine: { lineStyle: { color: "#F4F5F8", @@ -1582,7 +1583,8 @@ export default { series: [ { // '报警值' - name: this.$t("message.deepFoundConfig.alarmNum"), + // name: this.$t("message.deepFoundConfig.alarmNum"), + name: '测点值', type: "line", smooth: true, symbol: "circle", @@ -1788,11 +1790,12 @@ export default { xAxis: [], data: [] }; - this.detailData.tableHeader.forEach(item => { - if (item.key == "data") { - this.echartData7.unit = "(" + item.keyName.split("(")[1]; - } - }); + this.echartData7.unit = res.result.unit + // this.detailData.tableHeader.forEach(item => { + // if (item.key == "data") { + // this.echartData7.unit = "(" + item.keyName.split("(")[1]; + // } + // }); res.result.data.records.forEach(item => { this.echartData7.xAxis.push(item.receiveTime.split(" ")[0]); this.echartData7.data.push(item.data);