update

src/views/bigScreen/home/components/DeviceInfo.vue

@@ -0,0 +1,166 @@
+<template>
+  <div class="item deviceInfo-wrap">
+    <el-carousel indicator-position="none" :interval="10000">
+      <el-carousel-item v-for="(item,idx) in data" :key="idx" class="carousel-item" height="100%">
+        <div class="device-item">
+          <div class="title">
+            <span class="name">{{ item.name }}</span>
+          </div>
+          <div class="container">
+            <div class="statistic-wrap">
+              <div v-for="(state,stIdx) in item.states" :key="stIdx" class="sta-item">
+                <div class="sta-item-lf">
+                  <div class="sta-item-name">{{ state.name }}</div>
+                  <div class="sta-item-number">{{ state.num }}个</div>
+                </div>
+                <div class="sta-item-icon" />
+              </div>
+            </div>
+            <div class="device-info">
+              <h3>更新时间：{{ parseTime(item.info.time) }}</h3>
+              <div class="device-info-cont">
+                <div class="i-item">温度：{{ item.info.temperature }}</div>
+                <div class="i-item">X轴{{ item.info.x }}</div>
+                <div class="i-item">Y轴：{{ item.info.y }}</div>
+                <div class="i-item">Z轴：{{ item.info.z }}</div>
+                <div class="i-item">电压：{{ item.info.v }}</div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </el-carousel-item>
+    </el-carousel>
+  </div>
+</template>
+<script>
+import { parseTime } from '@/utils'
+export default {
+  name: 'DeviceInfo',
+  data() {
+    return {
+      data: []
+    }
+  },
+  created() {
+    this.getData()
+  },
+  methods: {
+    parseTime,
+    getData() {
+      const data = [
+        {
+          name: '发电机',
+          states: [
+            { name: '正常运转', num: 0, type: 1 },
+            { name: 'C级报警', num: 0, type: 2 },
+            { name: 'D级报警', num: 0, type: 3 },
+            { name: '离线报警', num: 0, type: 4 }
+          ],
+          info: {
+            time: new Date(),
+            temperature: '20',
+            x: '1', y: '2', z: '3',
+            v: 220
+          }
+        },
+        {
+          name: '热力传感器',
+          states: [
+            { name: '正常运转', num: 0, type: 1 },
+            { name: 'C级报警', num: 0, type: 2 },
+            { name: 'D级报警', num: 0, type: 3 },
+            { name: '离线报警', num: 0, type: 4 }
+          ],
+          info: {
+            time: new Date(),
+            temperature: '20',
+            x: '1', y: '2', z: '3',
+            v: 220
+          }
+        },
+        {
+          name: '空调',
+          states: [
+            { name: '正常运转', num: 0, type: 1 },
+            { name: 'C级报警', num: 0, type: 2 },
+            { name: 'D级报警', num: 0, type: 3 },
+            { name: '离线报警', num: 0, type: 4 }
+          ],
+          info: {
+            time: new Date(),
+            temperature: '20',
+            x: '1', y: '2', z: '3',
+            v: 220
+          }
+        }
+      ]
+      this.data = data
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.deviceInfo-wrap{
+    .statistic-wrap{
+        display: flex;
+        flex-wrap: wrap;
+        padding-top: 10px;
+    }
+    .sta-item{
+        width: 44%;
+        margin: 0 3% 10px 3%;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        padding: 10px 20px;
+        box-sizing: border-box;
+        color: #fff;
+        background-color: #071A29;
+        .sta-item-lf{
+            flex: 1;
+            .sta-item-number{
+                padding-top: 10px;
+            }
+        }
+        .sta-item-icon{
+            border: 1px solid red;
+            overflow: hidden;
+            &,img{
+                display: block;
+                width: 50px;
+                height: 50px;
+                border-radius: 50%;
+            }
+        }
+    }
+    .device-info{
+        color: #fff;
+        h3{
+            text-indent: 20px;
+            line-height: 1;
+            padding: 12px 10px;
+            text-align: right;
+            background-color: #071A29;
+        }
+        .device-info-cont{
+            display: flex;
+            flex-wrap: wrap;
+            .i-item{
+                padding-left: 10px;
+            }
+        }
+    }
+}
+</style>
+<style lang="scss">
+.deviceInfo-wrap{
+    height: 45vh !important;
+    .carousel-item,.el-carousel__container{
+        height: 45vh !important;
+    }
+    .container{
+        height: 26.5vh !important;
+    }
+}
+
+</style>

src/views/bigScreen/home/components/DeviceState.vue

@@ -10,7 +10,7 @@
             <span class="number">14台</span>
           </div>
         </div>
-        <div class="name">正常报警</div>
+        <div class="name">正常</div>
       </div>
       <div class="device-item">
         <div class="graph-box">
@@ -28,14 +28,14 @@
         </div>
         <div class="name">D级报警</div>
       </div>
-      <div class="device-item">
+      <!-- <div class="device-item">
         <div class="graph-box">
           <div class="graph offline">
             <span class="number">0台</span>
           </div>
         </div>
         <div class="name">离线报警</div>
-      </div>
+      </div> -->
     </div>
   </div>
 </template>
@@ -79,18 +79,13 @@ export default {
     height: 200;
     .container{
         display: flex;
-        justify-content: center;
         flex-wrap: wrap;
         padding: 10px 0;
+        justify-content: space-between;
         .device-item{
-            margin-bottom: 10px;
             color: #fff;
-            &:nth-child(odd){
-                margin-right: 40px;
-            }
-            &:nth-child(even){
-                margin-left: 40px;
-            }
+            margin:0 10px 10px 10px;
+            // flex-shrink: 0;
             .name{
                 text-align: center;
                 padding-top: 10px;

src/views/bigScreen/home/components/SensorStatus.vue

@@ -160,7 +160,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .container{
-    height: 18vh !important;
+    height: 15vh !important;
     // min-height: 164px;
     #sensor-status-chart{
         width: 95%;

src/views/bigScreen/home/components/index.js

@@ -11,6 +11,7 @@ import Map from './Map/index.vue'
 
 import SensorStatusCircle from './SensorStatusCircle.vue'
 import DeviceState from './DeviceState.vue'
+import DeviceInfo from './DeviceInfo.vue'
 
 export {
   WarningStatistics,
@@ -22,5 +23,6 @@ export {
   SensorInfoStatistics,
   Map,
   SensorStatusCircle,
-  DeviceState
+  DeviceState,
+  DeviceInfo
 }

src/views/bigScreen/home/index.vue

@@ -1,11 +1,9 @@
 <template>
   <div class="home-view">
     <div class="side-left">
-      <!-- <warning-statistics ref="warning-statistics" /> -->
-      <DeviceState ref="warning-statistics" />
+      <device-state ref="warning-statistics" />
       <sensor-status-circle ref="check-warn-report" />
-      <!-- <check-warn-report ref="check-warn-report" /> -->
-      <today-check-task />
+      <device-info />
     </div>
     <div class="main">
       <Map ref="map" />
@@ -14,7 +12,6 @@
       <sensor-status ref="sensor-status" />
       <sensor-warning-statistics ref="sensor-warning-statistics" />
       <sensor-warning-info ref="sensor-warning-info" />
-      <!-- <sensor-info-statistics ref="sensor-info-statistics" /> -->
     </div>
   </div>
 </template>
@@ -25,30 +22,24 @@ import { Uint8ArrayToString } from '@/utils'
 import { parseTime } from '@/utils'
 import { goafhdangerstatis } from '@/api/goaf/dangerApi'
 import {
-  // WarningStatistics,
-  TodayCheckTask,
-  // CheckWarnReport,
   SensorStatus,
   SensorWarningStatistics,
   SensorWarningInfo,
-  // SensorInfoStatistics,
   Map,
   SensorStatusCircle,
-  DeviceState
+  DeviceState,
+  DeviceInfo
 } from './components'
 export default {
   name: 'Home',
   components: {
-    // WarningStatistics,
-    TodayCheckTask,
-    // CheckWarnReport,
     SensorStatus,
     SensorWarningStatistics,
     SensorWarningInfo,
-    // SensorInfoStatistics,
     Map,
     SensorStatusCircle,
-    DeviceState
+    DeviceState,
+    DeviceInfo
   },
   mixins: [mixins],
   data() {

src/views/iiot/equipment/alarm.vue

@@ -130,7 +130,7 @@
             </template>
           </el-table-column>
         </el-table-column>
-        <el-table-column prop="goafAlarmThreshold" label="告警阈值 " />
+        <el-table-column prop="goafOrebody" label="温度阈值" align="center" />
         <el-table-column prop="goafInstallTime" label="报警时间" />
       </el-table>
       <div class="pagination-container" style="float:right;margin-right:40px;">

src/views/iiot/equipment/components/OverviewStatus.vue

@@ -41,8 +41,10 @@ export default {
             center: ['40%', '55%'],
             radius: ['40%', '70%'],
             data: [
+              { value: 0, name: '正常' },
               { value: 0, name: '严重' },
-              { value: 0, name: '一般' }
+              { value: 0, name: '一般' },
+              { value: 0, name: '离线' }
             ],
             lable: {
               normal: {

src/views/iiot/equipment/device_manager.vue

@@ -17,14 +17,117 @@
     <el-row class="m-top-15">
       <el-table v-loading="listLoading" class="page-table" border fit :data="dataList">
         <el-table-column type="index" label="序号" header-align="center" align="center" width="60" />
-        <el-table-column prop="goafDevName" label="设备名称" />
-        <el-table-column label="安装区域">
-          <template v-slot="{row}">
-            <span>{{ NumConvertLM(row.goafOrebelt) }}-{{ row.goafOrebody }}-{{ row.goafOreheight }}-{{ row.goafName }}</span>
-          </template>
+        <el-table-column type="index" label="传感器编码" header-align="center" align="center" width="60" />
+        <el-table-column prop="goafDevName" label="待测设备名称" />
+        <el-table-column prop="goafDevName" label="待测设备类型" />
+        <el-table-column prop="goafDevName" label="传感器安装位置" />
+        <el-table-column prop="goafDevName" label="监测间隔时间（分）" />
+        <el-table-column header-align="center" align="center" label="振动烈度（mm/s）">
+          <el-table-column
+            header-align="center"
+            align="center"
+            prop="name"
+            label="水平方向"
+            width="120"
+          >
+            <template v-slot="{row}">
+              <span>{{ row.goafOrebody }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            header-align="center"
+            align="center"
+            prop="name"
+            label="垂直方向"
+            width="120"
+          >
+            <template v-slot="{row}">
+              <span>{{ row.goafOreheight }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            header-align="center"
+            align="center"
+            prop="name"
+            label="轴向"
+            width="120"
+          >
+            <template v-slot="{row}">
+              <span>{{ row.goafName }}</span>
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column header-align="center" label="加速度（m/s2）">
+          <el-table-column
+            header-align="center"
+            align="center"
+            prop="name"
+            label="水平方向"
+            width="120"
+          >
+            <template v-slot="{row}">
+              <span>{{ row.goafOrebody }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            header-align="center"
+            align="center"
+            prop="name"
+            label="垂直方向"
+            width="120"
+          >
+            <template v-slot="{row}">
+              <span>{{ row.goafOreheight }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            header-align="center"
+            align="center"
+            prop="name"
+            label="轴向"
+            width="120"
+          >
+            <template v-slot="{row}">
+              <span>{{ row.goafName }}</span>
+            </template>
+          </el-table-column>
         </el-table-column>
-        <el-table-column prop="goafDevLocation" label="安装地点" />
-        <el-table-column prop="goafDevTypename" label="设备类型" />
+        <el-table-column header-align="center" label="位移（m）">
+          <el-table-column
+            header-align="center"
+            align="center"
+            prop="name"
+            label="水平方向"
+            width="120"
+          >
+            <template v-slot="{row}">
+              <span>{{ row.goafOrebody }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            header-align="center"
+            align="center"
+            prop="name"
+            label="垂直方向"
+            width="120"
+          >
+            <template v-slot="{row}">
+              <span>{{ row.goafOreheight }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            header-align="center"
+            align="center"
+            prop="name"
+            label="轴向"
+            width="120"
+          >
+            <template v-slot="{row}">
+              <span>{{ row.goafName }}</span>
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column prop="goafInstallTime" label="温度阈值" />
         <el-table-column prop="goafInstallTime" label="安装时间" />
         <el-table-column label="操作" header-align="center" align="center" width="170">
           <template v-slot="{row}">
@@ -119,3 +222,25 @@ export default {
   }
 }
 </script>
+<style lang="scss" scoped>
+
+::v-deep {
+      .el-table thead.is-group th.el-table__cell{
+      background-color: #132938;
+    }
+  .el-table--border th.el-table__cell{
+    // border-bottom: 1px solid #5994bb;
+    border-right: 1px solid #5994bb;
+    border-top: 1px solid #5994bb;
+    border-color: #5994bb;
+  }
+  .el-table.el-table--border  th.el-table__cell.is-leaf, .el-table td.el-table__cell{
+    border-right: 1px solid #5994bb;
+    border-top: 1px solid #5994bb;
+  }
+  .el-table.el-table--border {
+    border-bottom: 1px solid #5994bb;
+    border-left: 1px solid #5994bb;
+  }
+}
+</style>

src/views/iiot/equipment/monitor.vue

@@ -122,11 +122,7 @@
             </template>
           </el-table-column>
         </el-table-column>
-        <!-- <el-table-column header-align="center" align="center" prop="goafDevLocation" label="安装地点" />
-        <el-table-column header-align="center" align="center" prop="goafDevTypename" label="设备类型" />
-        <el-table-column header-align="center" align="center" prop="goafDevGroupname" label="设备负责人部门" />
-        <el-table-column header-align="center" align="center" prop="goafDevAccountName" label="设备责任人" />
-        <el-table-column header-align="center" align="center" prop="goafAlarmThreshold" label="告警阈值 " /> -->
+        <el-table-column header-align="center" align="center" prop="temperature" label="温度（℃）" />
         <el-table-column header-align="center" align="center" prop="goafInstallTime" label="上传时间" />
         <el-table-column label="操作" header-align="center" align="center" width="180">
           <template v-slot="{row}">

src/views/iiot/equipment/overview.vue

@@ -23,17 +23,13 @@
     <el-row class="m-top-15">
       <el-table v-loading="listLoading" class="page-table" border fit :data="dataList">
         <el-table-column type="index" label="序号" header-align="center" align="center" width="60" />
+        <el-table-column prop="goafDevName" label="传感器编码" />
         <el-table-column prop="goafDevName" label="设备名称" />
-        <el-table-column label="安装区域">
-          <template v-slot="{row}">
-            <span>{{ NumConvertLM(row.goafOrebelt) }}-{{ row.goafOrebody }}-{{ row.goafOreheight }}-{{ row.goafName }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="goafDevLocation" label="安装地点" />
         <el-table-column prop="goafDevTypename" label="设备类型" />
-        <el-table-column prop="goafDevGroupname" label="设备负责人部门" />
-        <el-table-column prop="goafDevAccountName" label="设备责任人" />
-        <el-table-column prop="goafAlarmThreshold" label="告警阈值 " />
+        <el-table-column prop="goafDevLocation" label="安装地点" />
+        <el-table-column prop="goafDevLocation" label="状态" />
+        <el-table-column prop="goafDevLocation" label="一般告警" />
+        <el-table-column prop="goafDevLocation" label="严重告警" />
         <el-table-column prop="goafInstallTime" label="安装时间" />
       </el-table>
       <div class="pagination-container" style="float:right;margin-right:40px;">

src/views/iiot/sensor/components/DeviceModel.vue

@@ -21,70 +21,6 @@
           style="width: 260px"
         />
       </el-form-item>
-      <el-form-item label="安装区域" required>
-        <div class="safe-area">
-          <el-select
-            v-model="formData.goafOrebelt"
-            class="safe-area-item"
-            filterable
-            placeholder="矿带"
-            @change="changeArea(1)"
-          >
-            <el-option :value="0" label="请选择矿带" disabled />
-            <el-option
-              v-for="(item, index) in goafOrebelts"
-              :key="index"
-              :value="item.goafOrebelt"
-              :label="item.goafOrebelt"
-            />
-          </el-select>
-          <el-select
-            v-model="formData.goafOrebody"
-            class="safe-area-item"
-            filterable
-            placeholder="矿体"
-            @change="changeArea(2)"
-          >
-            <el-option :value="0" label="请选择矿体" disabled />
-            <el-option
-              v-for="(item, index) in goafOrebodys"
-              :key="index"
-              :value="item.goafOrebody"
-              :label="item.goafOrebody"
-            />
-          </el-select>
-          <el-select
-            v-model="formData.goafOreheight"
-            class="safe-area-item"
-            filterable
-            placeholder="中段"
-            @change="changeArea(3)"
-          >
-            <el-option :value="0" label="请选择中段" disabled />
-            <el-option
-              v-for="(item, index) in goafOreheights"
-              :key="index"
-              :value="item.goafOreheight"
-              :label="item.goafOreheight"
-            />
-          </el-select>
-          <el-select
-            v-model="formData.goafId"
-            class="safe-area-item"
-            filterable
-            placeholder="采空区名称"
-            @change="changeArea(4)"
-          >
-            <el-option :value="0" label="请选择采空区" disabled />
-            <el-option
-              v-for="item in goafNames"
-              :key="item.goafId"
-              :value="item.goafId"
-              :label="item.goafName"
-            />
-          </el-select>
-        </div>
-      </el-form-item>
       <el-form-item label="安装地点" required>
         <el-input v-model="formData.goafDevLocation" placeholder="请输入安装地点" style="width:260px" />
       </el-form-item>
@@ -147,7 +83,6 @@ import { toTree } from '@/utils/build-tree'
 import { getGroupByList } from '@/api/system/groupApi'
 import { getUserByPage } from '@/api/system/userApi'
 import { getSensorCat } from '@/api/goaf/sensorCatApi'
-import { getGoafBaseInfo } from '@/api/goaf/info'
 import { createSensor, updateSensor } from '@/api/goaf/sensor'
 export default {
   name: 'SensorModel',
@@ -203,13 +138,6 @@ export default {
       getSensorCat().then((res) => {
         this.sensorCats = res.data.filter(item => item.sensorTypeName.includes('传感器'))
       })
-      getGoafBaseInfo().then((res) => {
-        this.goaf = res.data
-        this.goafOrebelts = this.unique(res.data, 'goafOrebelt')
-        this.goafOrebodys = res.data
-        this.goafOreheights = res.data
-        this.goafNames = res.data
-      })
       getGroupByList().then((resp) => {
         const { code, data } = resp
         if (code === 0) {
@@ -251,43 +179,6 @@ export default {
         this.userList = data
       })
     },
-    changeArea(type) {
-      const goafs = this.deeepClone(this.goaf)
-      let goafOrebodys = this.deeepClone(this.goafOrebodys)
-      let goafOreheights = this.deeepClone(this.goafOreheights)
-      let goafNames = this.deeepClone(this.goafNames)
-      if (type === 1) {
-        goafOrebodys = goafs.filter(item => item.goafOrebelt === this.formData.goafOrebelt)
-        goafOrebodys = this.unique(goafOrebodys, 'goafOrebody')
-        this.goafOrebodys = goafOrebodys
-        this.goafOreheights = []
-        this.goafNames = []
-        this.formData.goafOrebody = ''
-        this.formData.goafOreheight = ''
-        this.formData.goafName = ''
-        this.formData.goafId = ''
-      } else if (type === 2) {
-        goafOreheights = goafs.filter(item => (item.goafOrebody === this.formData.goafOrebody) && (item.goafOrebelt === this.formData.goafOrebelt))
-        goafOreheights = this.unique(goafOrebodys, 'goafOreheight')
-        this.goafOreheights = goafOreheights
-        this.goafNames = []
-        this.formData.goafOreheight = ''
-        this.formData.goafName = ''
-        this.formData.goafId = ''
-      } else if (type === 3) {
-        goafNames = goafs.filter(item => (item.goafOreheight === this.formData.goafOreheight) && (item.goafOrebody === this.formData.goafOrebody) && (item.goafOrebelt === this.formData.goafOrebelt))
-        this.goafNames = goafNames
-        this.formData.goafName = ''
-        this.formData.goafId = ''
-      } else {
-        for (let i = 0; i < goafNames.length; i++) {
-          if (this.formData.goafId === goafNames[i].goafId) {
-            this.formData.goafName = goafNames[i].goafName
-          }
-        }
-      }
-      this.$forceUpdate()
-    },
     // Show Add Dialog
     showAddModel() {
       this.resetFormData()

src/views/iiot/sensor/components/SensorStatus.vue

@@ -34,15 +34,17 @@ export default {
             center: ['40%', '55%'],
             radius: ['40%', '70%'],
             data: [
-              { value: 0, name: '严重' },
-              { value: 0, name: '一般' }
+              { value: 0, name: '正常' },
+              { value: 0, name: 'C级' },
+              { value: 0, name: 'D级' },
+              { value: 0, name: '离线' }
             ],
-            lable: {
-              normal: {
-                show: true
-              }
+            label: {
+              show: true
+              // ,position: 'center'
             },
             emphasis: {
+              show: true,
               itemStyle: {
                 color: '#fff'
               }

src/views/iiot/sensor/index.vue

@@ -23,17 +23,114 @@
     <el-row class="m-top-15">
       <el-table v-loading="listLoading" class="page-table" border fit :data="dataList">
         <el-table-column type="index" label="序号" header-align="center" align="center" width="60" />
-        <el-table-column prop="goafDevName" label="设备名称" />
-        <el-table-column label="安装区域">
-          <template v-slot="{row}">
-            <span>{{ NumConvertLM(row.goafOrebelt) }}-{{ row.goafOrebody }}-{{ row.goafOreheight }}-{{ row.goafName }}</span>
-          </template>
+        <el-table-column prop="goafDevName" label="设备名称" align="center" />
+        <el-table-column prop="goafDevLocation" label="安装地点" align="center" />
+        <el-table-column header-align="center" align="center" label="速度（m/s）">
+          <el-table-column
+            header-align="center"
+            align="center"
+            prop="name"
+            label="X轴阈值"
+            width="120"
+          >
+            <template v-slot="{row}">
+              <span>{{ row.goafOrebody }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            header-align="center"
+            align="center"
+            prop="name"
+            label="Y轴阈值"
+            width="120"
+          >
+            <template v-slot="{row}">
+              <span>{{ row.goafOreheight }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            header-align="center"
+            align="center"
+            prop="name"
+            label="Z轴阈值"
+            width="120"
+          >
+            <template v-slot="{row}">
+              <span>{{ row.goafName }}</span>
+            </template>
+          </el-table-column>
         </el-table-column>
-        <el-table-column prop="goafDevLocation" label="安装地点" />
-        <el-table-column prop="goafDevTypename" label="设备类型" />
-
-        <el-table-column prop="goafAlarmThreshold" label="告警阈值 " />
-        <el-table-column prop="goafInstallTime" label="安装时间" />
+        <el-table-column header-align="center" label="加速度（m/s2）">
+          <el-table-column
+            header-align="center"
+            align="center"
+            prop="name"
+            label="X轴阈值"
+            width="120"
+          >
+            <template v-slot="{row}">
+              <span>{{ row.goafOrebody }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            header-align="center"
+            align="center"
+            prop="name"
+            label="Y轴阈值"
+            width="120"
+          >
+            <template v-slot="{row}">
+              <span>{{ row.goafOreheight }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            header-align="center"
+            align="center"
+            prop="name"
+            label="Z轴阈值"
+            width="120"
+          >
+            <template v-slot="{row}">
+              <span>{{ row.goafName }}</span>
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column header-align="center" label="位移（m）">
+          <el-table-column
+            header-align="center"
+            align="center"
+            prop="name"
+            label="X轴阈值"
+            width="120"
+          >
+            <template v-slot="{row}">
+              <span>{{ row.goafOrebody }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            header-align="center"
+            align="center"
+            prop="name"
+            label="Y轴阈值"
+            width="120"
+          >
+            <template v-slot="{row}">
+              <span>{{ row.goafOreheight }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            header-align="center"
+            align="center"
+            prop="name"
+            label="Z轴阈值"
+            width="120"
+          >
+            <template v-slot="{row}">
+              <span>{{ row.goafName }}</span>
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column prop="goafInstallTime" label="安装时间" align="center" />
       </el-table>
       <div class="pagination-container" style="float:right;margin-right:40px;">
         <pagination v-show="total>0" :total="total" :page.sync="conditions.page" :limit.sync="conditions.limit" @pagination="getData" />
@@ -101,7 +198,25 @@ export default {
             height:280px;
         }
       }
+      ::v-deep {
+        .el-table thead.is-group th.el-table__cell{
+        background-color: #132938;
+      }
+        .el-table--border th.el-table__cell{
+          // border-bottom: 1px solid #5994bb;
+          border-right: 1px solid #5994bb;
+          border-top: 1px solid #5994bb;
+          border-color: #5994bb;
+        }
+        .el-table.el-table--border  th.el-table__cell.is-leaf, .el-table td.el-table__cell{
+          border-right: 1px solid #5994bb;
+          border-top: 1px solid #5994bb;
+        }
+        .el-table.el-table--border {
+          border-bottom: 1px solid #5994bb;
+          border-left: 1px solid #5994bb;
+        }
+      }
   }
 
 </style>
-