diff --git a/dist.zip b/dist.zip index 40da4b68..53d467f0 100644 Binary files a/dist.zip and b/dist.zip differ diff --git a/src/assets/js/api/deepFoundationPitManage.js b/src/assets/js/api/deepFoundationPitManage.js index 2d283725..2e6ee467 100644 --- a/src/assets/js/api/deepFoundationPitManage.js +++ b/src/assets/js/api/deepFoundationPitManage.js @@ -13,6 +13,7 @@ export const selectDeepExcavationMonitorTypeListApi = data => post('xmgl/deepExc export const selectMeasurePointListApi = data => post('xmgl/deepExcavationMeasurePoint/selectMeasurePointList', data); //列表查询深基坑-测点信息 export const addDeepExcavationMeasurePointApi = data => post('xmgl/deepExcavationMeasurePoint/add', data); //添加深基坑-测点信息 export const deleteDeepExcavationMeasurePointApi = data => post('xmgl/deepExcavationMeasurePoint/delete', data); //删除深基坑-测点信息 +export const getDetailDeepExcavationApi = data => get('/xmgl/deepExcavationMeasurePoint/getDetailsByMeasurePointNumber', data); //测点信息-测点管理-详情 export const selectDeepExcavationSensorTypeListApi = data => post('xmgl/deepExcavationSensorType/selectDeepExcavationSensorTypeList', data); //列表查询深基坑-传感器类型信息 diff --git a/src/assets/js/http.js b/src/assets/js/http.js index fd863c2f..ecd96c12 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -40,7 +40,7 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://124.71.178.44:100/' // 河南 // 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.125:6023/' //杨意本地 http/1.1 axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地 // axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地 // axios.defaults.baseURL = 'http://47.97.202.104:6023/'; diff --git a/src/store/index.js b/src/store/index.js index 0df9a857..5cafa864 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -53,11 +53,11 @@ export default new Vuex.Store({ // FILEURL: 'http://124.71.178.44:100/image/', /* 2022-06-06 杨意本地的*/ // BASEURL:'http://192.168.34.174:6023/', - UPLOADURL: 'http://192.168.34.125:6023/upload/image', - FILEURL: 'http://192.168.34.125:6023/image/', + // UPLOADURL: 'http://192.168.34.125:6023/upload/image', + // FILEURL: 'http://192.168.34.125:6023/image/', // 邱平毅的 - // UPLOADURL: 'http://192.168.34.216:6023/upload/image', - // FILEURL: 'http://192.168.34.216:6023/image/', + UPLOADURL: 'http://192.168.34.216:6023/upload/image', + FILEURL: 'http://192.168.34.216:6023/image/', // UPLOADURL:'http://'+"61.190.32.219:9050"+'/upload/image',//正式 // FILEURL:'http://'+"61.190.32.219:9050"+'/image/',//正式 diff --git a/src/views/projectFront/deepFoundationPitManage/dataConfig.vue b/src/views/projectFront/deepFoundationPitManage/dataConfig.vue index 9507e2fc..fc2d7332 100644 --- a/src/views/projectFront/deepFoundationPitManage/dataConfig.vue +++ b/src/views/projectFront/deepFoundationPitManage/dataConfig.vue @@ -468,7 +468,7 @@ -->
-
+
@@ -535,19 +535,19 @@ - + - + - + @@ -756,6 +756,7 @@ import { selectDeepExcavationAllMeasurePointListApi, deleteDeepExcavationPlaneFigureApi, editDeepExcavationPlaneFigureCoordinateApi, + getDetailDeepExcavationApi } from "@/assets/js/api/deepFoundationPitManage.js" export default { data(){ @@ -1266,12 +1267,29 @@ export default { }) }, preViewPointData(val){ + console.log('查询详情',val) this.show= false - console.log(val) this.isPreview = true this.showTestPoint = true - this.testPointForm = val - this.testPointData = val.thresholdList + let data = {} + // this.testPointForm = val + data.measurePointNumber = val.measurePointNumber + getDetailDeepExcavationApi(data).then((res)=>{ + console.log('--------------查询的结果',res.result) + res.result.sensorList.map((item)=>{ + console.log('item',item) + item.earlyWarningValue = String(item.earlyWarningValue) + item.alarmValue = String(item.alarmValue) + item.controlValue = String(item.controlValue) + item.sensorTypeId = String(item.sensorTypeId) + return + }) + console.log('转换类型',res.result.sensorList) + this.testPointForm = res.result + this.testPointForm.thresholdList = res.result.sensorList + }) + + // this.testPointData = val.thresholdList }, // 删除测点数据 deletePointData(val){ @@ -1694,7 +1712,7 @@ export default { selectMeasurePointListApi(data).then(res=>{ console.log(res) if(res.code == 200){ - console.log('====查询测点管理的列表',res) + // console.log('====查询测点管理的列表',res) this.surveyPointDetail = res.result.records } }) @@ -1849,7 +1867,7 @@ export default { border-radius: 10px; .sensorDel{ position: absolute; - right:60px; + right:68px; } } .foundationPit-config{ @@ -2067,7 +2085,7 @@ export default { border-radius: 3px; } .formBox{ - width: 90%; + width: 85%; margin: 0 auto; .tables{ min-height: 0;