diff --git a/src/assets/js/api/highModulus.js b/src/assets/js/api/highModulus.js index e037f5c4..5630db8d 100644 --- a/src/assets/js/api/highModulus.js +++ b/src/assets/js/api/highModulus.js @@ -36,6 +36,7 @@ export const getHighFormworkAlarmDataApi = data => get('/xmgl/highFormworkAlarm // 添加混凝土监测-平面图配置信息 export const addHighFormworkPlaneFigureApi2 = data => post('xmgl/concreteMonitorPlaneFigure/add', data); +export const editHighFormworkPlaneFigureApi2 = data => post('xmgl/concreteMonitorPlaneFigure/edit', data); export const deleteHighFormworkPlaneFigureApi2 = data => post('xmgl/concreteMonitorPlaneFigure/delete', data); export const selectHighFormworkPlaneFigureListApi2 = data => post('xmgl/concreteMonitorPlaneFigure/selectList', data); export const selectPointPositionList = data => get('xmgl/concreteMonitorDevPointPosition/list', data); // 查设备下的点位 diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 8bb90779..3f54a678 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -67,7 +67,6 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://183.234.150.152:9090/' //华发 huaxin 123456789 // axios.defaults.baseURL = 'http://182.90.224.147:18170' //瑞士恒通线上 // axios.defaults.baseURL = 'http://58.250.210.9:9090/' //深汕线上 - // axios.defaults.baseURL = 'http://101.43.164.214:11111/' //百色线上 // axios.defaults.baseURL = 'http://101.43.164.214:12345/'//内蒙古线上 // axios.defaults.baseURL = 'http://121.196.214.246/api/'//金林湾线上新 // axios.defaults.baseURL = 'http://42.194.144.62:8088/'//中建四局线上(新)地址 diff --git a/src/views/projectFront/concreteMonitoring/planConfig.vue b/src/views/projectFront/concreteMonitoring/planConfig.vue index ce6affff..20d38df2 100644 --- a/src/views/projectFront/concreteMonitoring/planConfig.vue +++ b/src/views/projectFront/concreteMonitoring/planConfig.vue @@ -1,636 +1,829 @@ \ No newline at end of file + diff --git a/src/views/projectFront/deepFoundationPitManage/monitorData.vue b/src/views/projectFront/deepFoundationPitManage/monitorData.vue index b28d7026..a8fe11f9 100644 --- a/src/views/projectFront/deepFoundationPitManage/monitorData.vue +++ b/src/views/projectFront/deepFoundationPitManage/monitorData.vue @@ -211,16 +211,16 @@ v-show="item.isShow" >
-

测点编号:{{ item.measurePointName }}

+

测点编号:{{ item.measurePointNumber }}

测点名称:{{ item.monitorTypeName }}{{ item.measurePointName }}

diff --git a/src/views/projectFront/highModulus/pointManage.vue b/src/views/projectFront/highModulus/pointManage.vue index f04fafda..b4a5ca49 100644 --- a/src/views/projectFront/highModulus/pointManage.vue +++ b/src/views/projectFront/highModulus/pointManage.vue @@ -277,7 +277,7 @@