submit

src/views/goaf/info/components/GoafInfo.vue

@@ -32,7 +32,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="goafOrebody" label="矿体"><template v-slot="{row}">{{ row.goafOrebody|isNull }}</template></el-table-column>
-        <el-table-column prop="goafOreheight" label="中段"><template v-slot="{row}">{{ row.goafOrebody|isNull }}</template></el-table-column>
+        <el-table-column prop="goafOreheight" label="中段"><template v-slot="{row}">{{ row.goafOreheight|isNull }}</template></el-table-column>
         <el-table-column prop="goafName" label="采空区名称" show-overflow-tooltip><template v-slot="{row}">{{ row.goafName|isNull }}</template></el-table-column>
         <el-table-column prop="goafRoofpillarThickness" label="顶板矿柱厚度" width="150"><template v-slot="{row}">{{ row.goafRoofpillarThickness|isNull }}</template></el-table-column>
         <el-table-column prop="goafIncoavThickness" label="	保安间柱平均厚度" width="150"><template v-slot="{row}">{{ row.goafIncoavThickness|isNull }}</template></el-table-column>

src/views/goaf/sensor/Model.vue

@@ -83,6 +83,7 @@
               :label="item.goafName"
             />
           </el-select>
+          <span style="color: #fff;padding-left: 10px;cursor: pointer;font-size: 10px;" @click="resetgoaf">重新选择</span>
         </div>
       </el-form-item>
       <el-form-item label="安装地点" required>
@@ -90,6 +91,7 @@
       </el-form-item>
       <el-form-item label="告警阈值" required>
         <el-input-number v-model="formData.goafAlarmThreshold" placeholder="告警阈值" :controls="false" />
+        <span v-if="thresholdUnit" style="color: #fff;padding-left: 10px;">{{ thresholdUnit }}</span>
       </el-form-item>
       <el-form-item label="设备类型" required>
         <el-select
@@ -164,6 +166,7 @@ export default {
       dialogVisible: false,
       sensorCats: [],
       goaf: [],
+      thresholdUnit: '',
       formData: {
         goafOrebelt: 0,
         goafOrebody: 0,
@@ -195,10 +198,36 @@ export default {
       groupList: []
     }
   },
+  watch: {
+    'formData.goafDevTypeId': {
+      handler() {
+        this.formatUnit()
+      },
+      immediate: true
+    }
+  },
   mounted() {
     this.init()
   },
   methods: {
+    formatUnit() {
+      let name = ''
+      if (this.formData.goafDevTypeId) {
+        const sensorCat = this.sensorCats.filter(
+          (item) => item.sensorTypeId === this.formData.goafDevTypeId
+        )[0]
+        const goafDevTypename = sensorCat.sensorTypeName
+        if (goafDevTypename.indexOf('位移') > -1) name = 'mm'
+        if (goafDevTypename.indexOf('压力') > -1) name = 'MPa'
+      }
+      this.thresholdUnit = name
+    },
+    resetgoaf() {
+      this.formData.goafOrebelt = ''
+      this.formData.goafOrebody = ''
+      this.formData.goafOreheight = ''
+      this.formData.goafId = ''
+    },
     init() {
       getSensorCat().then((res) => {
         this.sensorCats = res.data.filter(item => item.sensorTypeName.includes('传感器'))

src/views/goaf/sensor/index.vue

@@ -28,6 +28,7 @@
         <el-table-column prop="goafDevGroupname" label="设备负责人部门" />
         <el-table-column prop="goafDevAccountName" label="设备责任人" />
         <el-table-column prop="goafAlarmThreshold" label="告警阈值 " />
+        <el-table-column prop="goafAlarmThreshold" label="单位"> <template v-slot="{row}">{{ row|formatUnit }}</template></el-table-column>
         <el-table-column prop="goafInstallTime" label="安装时间" />
         <el-table-column label="操作" header-align="center" align="center" width="170">
           <template v-slot="{row}">
@@ -51,6 +52,12 @@ import { NumConvertLM } from '@/utils'
 import sensorModel from './Model'
 export default {
   components: { Pagination, sensorModel },
+  filters: {
+    formatUnit(row) {
+      if (row.goafDevTypename.indexOf('位移') > -1) return 'mm'
+      if (row.goafDevTypename.indexOf('压力') > -1) return 'MPa'
+    }
+  },
   data() {
     return {
       dataList: [],