diff --git a/src/views/view/index.vue b/src/views/view/index.vue index 824b866..78746fd 100644 --- a/src/views/view/index.vue +++ b/src/views/view/index.vue @@ -1007,19 +1007,20 @@ background: #2b6bb6; margin: 7px 5px 0 0; ">设备控制 - + 发送

- + 电伴热设备: - + - +
@@ -1806,24 +1807,27 @@ export default { }, pileNumMap: { 1: { - left: 'K30+600', - right: 'K34+800', + // left: 'K30+600', + // right: 'K34+800', + left: 'K33+327', + right: 'K37+527', // length1: '4000', // length2: '2616', length1: '2616', length2: '2606', width: 5000, - pileNumData: ['K31+294', 'K33+916'], + pileNumData: ['K33+747', 'K37+107'], n: 10, }, 2: { - left: 'K58+176', - right: 'K60+976', - // length1: '2800', + // left: 'K58+176', + // right: 'K60+976', + left: 'K60+903', + right: 'K63+703', length1: '2200', length2: '2200', width: 5000, - pileNumData: ['K58+476', 'K60+676'], + pileNumData: ['K61+203', 'K63+403'], n: 10, }, // 1: { @@ -1833,7 +1837,6 @@ export default { // length2: '624', // width: 1893, // pileNumData: ['K9+933', 'K10+595'], - // n: 5, // }, // 2: { // left: 'K16+650', @@ -1842,7 +1845,6 @@ export default { // length2: '965.647', // width: 1993, // pileNumData: ['K17+015', 'K17+935'], - // n: 5, // }, // 3: { // left: 'K18+220', @@ -1851,7 +1853,6 @@ export default { // length2: '2897.232', // width: 6000, // pileNumData: ['K18+302', 'K20+990'], - // n: 19, // }, }, pileNumList: [], @@ -2197,7 +2198,7 @@ export default { h: imgForm.h, bg: '#fff', } - let km = item.pileNum.replace('K', '').replace('+', '.') + let km = item.pileNumShow.replace('K', '').replace('+', '.') let km1 = that.pileNumMap[that.searchForm.area].left .replace('K', '') .replace('+', '.') @@ -2839,7 +2840,7 @@ export default { return } data.forEach((item, index) => { - if (item.pileNum) { + if (item.pileNumShow) { that.warnIdOptions.push(item.id) let imgForm = window.config.drapWarnElMap[item.type] var json = item @@ -2854,7 +2855,7 @@ export default { h: imgForm.h, bg: '#fff', } - let km = item.pileNum.replace('K', '').replace('+', '.') + let km = item.pileNumShow.replace('K', '').replace('+', '.') let km1 = that.pileNumMap[that.searchForm.area].left .replace('K', '') .replace('+', '.') @@ -2985,10 +2986,10 @@ export default { } var km1 = that.planForm.pileNum.replace('K', '').replace('+', '.') res.data.result.forEach((item) => { - var km2 = item.pileNum.replace('K', '').replace('+', '.') + var km2 = item.pileNumShow.replace('K', '').replace('+', '.') var obj = { id: item.deviceId, - pileNum: item.pileNum, + pileNum: item.pileNumShow, stream: '0', } diff --git a/vue.config.js b/vue.config.js index 37f6d04..6db7025 100644 --- a/vue.config.js +++ b/vue.config.js @@ -24,7 +24,7 @@ module.exports = { // target: 'http://link.ser99.vip:8080/zhongkai', target: 'http://65.73.11.246:7774', // target: 'http://172.16.1.111:8000', - // target: "http://172.16.1.148:8084", + // target: "http://172.16.1.148:8084", // 汤 // target: 'http://172.16.1.162:8233', // target: 'http://192.168.13.138:8233', // target: 'http://172.16.1.113:8012',