diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index 9c8fbf9..c988232 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -465,7 +465,7 @@ let properties = {}; Getproperties.value.stCode = item.stCode || item.siteCode || item.lakeCode; Getproperties.value.dataCode = item.dataCode; - Getproperties.value.wellcode = item.wellCode || item.dataName || item.pipeLine; + Getproperties.value.wellCode = item.wellCode || item.dataName || item.pipeLine; Getproperties.value.id = item.id; Getproperties.value.gwMonitorId = item.gwMonitorId || item.id; //管网坡面 Getproperties.value.dataId = item.dataId || ''; diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index 9c8fbf9..c988232 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -465,7 +465,7 @@ let properties = {}; Getproperties.value.stCode = item.stCode || item.siteCode || item.lakeCode; Getproperties.value.dataCode = item.dataCode; - Getproperties.value.wellcode = item.wellCode || item.dataName || item.pipeLine; + Getproperties.value.wellCode = item.wellCode || item.dataName || item.pipeLine; Getproperties.value.id = item.id; Getproperties.value.gwMonitorId = item.gwMonitorId || item.id; //管网坡面 Getproperties.value.dataId = item.dataId || ''; diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue index 330184f..e392e78 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue @@ -126,7 +126,7 @@ listData.value = res.data; listData.value.map((e) => { let wellDepth = e.wellDepth || 2; - e.percentum = ((e.z / wellDepth) * 100).toFixed(2); + e.percentum = ((e.z / wellDepth) * 100).toFixed(2)<100?((e.z / wellDepth) * 100).toFixed(2):100; }); console.log("listData.value", listData.value); } diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index 9c8fbf9..c988232 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -465,7 +465,7 @@ let properties = {}; Getproperties.value.stCode = item.stCode || item.siteCode || item.lakeCode; Getproperties.value.dataCode = item.dataCode; - Getproperties.value.wellcode = item.wellCode || item.dataName || item.pipeLine; + Getproperties.value.wellCode = item.wellCode || item.dataName || item.pipeLine; Getproperties.value.id = item.id; Getproperties.value.gwMonitorId = item.gwMonitorId || item.id; //管网坡面 Getproperties.value.dataId = item.dataId || ''; diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue index 330184f..e392e78 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Gwfx.vue @@ -126,7 +126,7 @@ listData.value = res.data; listData.value.map((e) => { let wellDepth = e.wellDepth || 2; - e.percentum = ((e.z / wellDepth) * 100).toFixed(2); + e.percentum = ((e.z / wellDepth) * 100).toFixed(2)<100?((e.z / wellDepth) * 100).toFixed(2):100; }); console.log("listData.value", listData.value); } diff --git a/vite.config.js b/vite.config.js index c5c2346..02ad574 100644 --- a/vite.config.js +++ b/vite.config.js @@ -5,10 +5,10 @@ import autoprefixer from 'autoprefixer'; const Timestamp = new Date().getTime(); //随机时间戳 -// let ipLink = 'https://server1.wh-nf.cn:8201/prod-api'; +let ipLink = 'https://server1.wh-nf.cn:8201/prod-api'; // let ipLink = 'http://192.168.16.135:9100'; // let ipLink = 'http://192.168.16.124:9100'; -let ipLink = 'http://192.168.20.43:9100'; +// let ipLink = 'http://192.168.20.43:9100'; /* */ // https://vitejs.dev/config/ export default defineConfig(({ mode, command }) => {