深基坑系统(基坑配置)：测点管理详情查询

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);   //列表查询深基坑-传感器类型信息

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/';

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',
+    // UPLOADURL: 'http://192.168.34.125:6023/upload/image',
-    FILEURL: 'http://192.168.34.125:6023/image/',
+    // FILEURL: 'http://192.168.34.125:6023/image/',
     // 邱平毅的
-    // UPLOADURL: 'http://192.168.34.216:6023/upload/image',
+    UPLOADURL: 'http://192.168.34.216:6023/upload/image',
-    // FILEURL: 'http://192.168.34.216:6023/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/',//正式

src/views/projectFront/deepFoundationPitManage/dataConfig.vue

@@ -468,7 +468,7 @@
       </el-dialog>
       <!-- '详情':'新增测点' -->
       <el-dialog
-            width="50%"
+            width="45%"
             :title="isPreview ? $t('message.deepFoundConfig.details'):$t('message.deepFoundConfig.addPoint')"
             class="dialog-center"
             :visible.sync="showTestPoint"
@@ -518,7 +518,7 @@
                   </el-select>
                 </el-form-item> -->
                 <div class="sensor" v-for="(item,index) in testPointForm.sensorList" :key="index">
-                  <div class="sensorDel"><i v-if="testPointForm.sensorList.length > 1" @click="deleteRow(index)" class="el-icon-close"></i></div>
+                  <div class="sensorDel"><i v-if="testPointForm.sensorList.length > 1 && show" :disabled="isPreview" @click="deleteRow(index)" class="el-icon-close"></i></div>
                   <el-form-item :label="`传感器编号${index +1}`" :prop ="item.sensorSn" 
                   :rules="{ required: true, message: '请输入传感器编号', trigger: 'blur'}">
                   <el-input :disabled="isPreview" v-model="item.sensorSn" :placeholder="$t('message.deepFoundConfig.placeholderText')"></el-input>
@@ -535,19 +535,19 @@
                   </el-select>
                 </el-form-item>
                 <el-row>
-                  <el-col :span="6">
+                  <el-col :span="8">
                     <el-form-item label-width="120px" :label="`预警${index +1}`" :prop ="item.earlyWarningValue" 
                     :rules="{ required: true, message: '请输入预警数', trigger: 'blur'}">
                   <el-input maxlength="10" :disabled="isPreview" v-model="item.earlyWarningValue" :placeholder="$t('message.deepFoundConfig.placeholderText')"></el-input>
                 </el-form-item>
                   </el-col>
-                  <el-col :span="6">
+                  <el-col :span="8">
                     <el-form-item :label="`报警${index +1}`" :prop ="item.alarmValue" 
                     :rules="{ required: true, message: '请输入报警数', trigger: 'blur'}">
                   <el-input :disabled="isPreview" v-model="item.alarmValue" :placeholder="$t('message.deepFoundConfig.placeholderText')"></el-input>
                 </el-form-item>
                   </el-col>
-                  <el-col :span="6">
+                  <el-col :span="8">
                     <el-form-item :label="`控制${index +1}`" :prop ="item.controlValue" 
                     :rules="{ required: true, message: '请输入控制数', trigger: 'blur'}">
                   <el-input :disabled="isPreview" v-model="item.controlValue" :placeholder="$t('message.deepFoundConfig.placeholderText')"></el-input>
@@ -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
+      let data = {}
-      this.testPointData = val.thresholdList
+      // 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;