diff --git a/dist.zip b/dist.zip index dcdab5a5..93ca47ea 100644 Binary files a/dist.zip and b/dist.zip differ diff --git a/src/assets/images/pointl.png b/src/assets/images/pointl.png new file mode 100644 index 00000000..1103e169 Binary files /dev/null and b/src/assets/images/pointl.png differ diff --git a/src/assets/js/api/deepFoundationPitManage.js b/src/assets/js/api/deepFoundationPitManage.js index 35421554..1d8d867a 100644 --- a/src/assets/js/api/deepFoundationPitManage.js +++ b/src/assets/js/api/deepFoundationPitManage.js @@ -14,7 +14,7 @@ export const selectMeasurePointListApi = data => post('xmgl/deepExcavationMeasur 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 getSensorListApi = data => post('/xmgl/deepExcavationSensor/getSensorListByMeasurePointNumber', data); //通过测点编号查询传感器列表 +export const getSensorListApi = data => get('/xmgl/deepExcavationSensor/getSensorListByMeasurePointNumber', data); //通过测点编号查询传感器列表 export const selectDeepExcavationSensorTypeListApi = data => post('xmgl/deepExcavationSensorType/selectDeepExcavationSensorTypeList', data); //列表查询深基坑-传感器类型信息 diff --git a/src/views/projectFront/deepFoundationPitManage/dataConfig.vue b/src/views/projectFront/deepFoundationPitManage/dataConfig.vue index 21a30785..bf66a7a1 100644 --- a/src/views/projectFront/deepFoundationPitManage/dataConfig.vue +++ b/src/views/projectFront/deepFoundationPitManage/dataConfig.vue @@ -479,7 +479,7 @@ @@ -621,20 +632,20 @@ :label="item.targetName" > - + @@ -919,12 +930,17 @@
{{item.measurePointName}}
+

{{item2.keyName}}:{{item.currentdata[item2.key]}}

-

{{$t('message.deepFoundConfig.gatherTime')}}:{{item.currentdata['receiveTime']}}

+
{ - console.log(res); + console.log('点点点',res); if (res.code == 200) { res.result.forEach(item => { item.status = "block"; (item.transform = ""), (item.showDetail = false); let arr = []; - let obj = JSON.parse(item.dataField); - for (let key in obj) { - arr.push({ - key: key, - keyName: obj[key] - }); - } + // let obj = JSON.parse(item.dataField); + // let obj = item.sensorlist + // for (let key in obj) { + // arr.push({ + // key: key, + // keyName: obj[key] + // }); + // } + item.detailList = arr; }); this.pointList = res.result; @@ -2113,7 +2131,7 @@ export default { } console.log(this.currentTableData); } - let nowTime = this.selectNowDate(); + // let nowTime = this.selectNowDate(); // this.acquisitionTime = [nowTime.split(' ')[0] + ' ' + '00:00:00',nowTime] this.selectDeepExcavationCurrentData(); this.showActiveDetail = true; @@ -2511,26 +2529,26 @@ export default { } .alarm_status1 { padding: 4px 6px; - background: #44d7b6; - color: #fefefe; + // background: #44d7b6; + color: #44d7b6; border-radius: 3px; } .alarm_status2 { padding: 4px 6px; - background: #7953f6; - color: #fefefe; + // background: #7953f6; + color: #f76462; border-radius: 3px; } .alarm_status3 { padding: 4px 6px; - background: #f67f52; - color: #fefefe; + // background: #f67f52; + color: #f76462; border-radius: 3px; } .alarm_status4 { padding: 4px 6px; - background: #5484f6; - color: #fefefe; + // background: #5484f6; + color: #f76462; border-radius: 3px; } .formBox { diff --git a/src/views/projectFront/deepFoundationPitManage/monitorData.vue b/src/views/projectFront/deepFoundationPitManage/monitorData.vue index 2eac6f7b..ac6f9c8d 100644 --- a/src/views/projectFront/deepFoundationPitManage/monitorData.vue +++ b/src/views/projectFront/deepFoundationPitManage/monitorData.vue @@ -1,239 +1,292 @@ \ No newline at end of file