update

src/api/goaf/device.js

@@ -0,0 +1,34 @@
+import request from '@/utils/request'
+
+// 分页获取
+export function getDeviceByPage(params) {
+  return request({
+    url: '/goaf/goafdevinfo/page',
+    params
+  })
+}
+// 增加
+export function createDevice(data) {
+  return request({
+    url: '/goaf/goafdevinfo/add',
+    method: 'POST',
+    data
+  })
+}
+
+// 删除
+export function delDevice(id) {
+  return request({
+    url: `/goaf/goafdevinfo/delete/${id}`,
+    method: 'DELETE'
+  })
+}
+
+// 修改
+export function updateDevice(data) {
+  return request({
+    url: '/goaf/goafdevinfo/update',
+    method: 'PUT',
+    data
+  })
+}

src/api/goaf/sensor.js

@@ -10,14 +10,14 @@ export function getSensor(params) {
 // 分页获取传感器
 export function getSensorByPage(params) {
   return request({
-    url: '/goaf/goafdevinfo/devreportdatapage',
+    url: '/goaf/goafsensor/page',
     params
   })
 }
 // 增加
 export function createSensor(data) {
   return request({
-    url: '/goaf/goafdevinfo/add',
+    url: '/goaf/goafsensor/add',
     method: 'POST',
     data
   })
@@ -26,14 +26,15 @@ export function createSensor(data) {
 // 删除
 export function delSensor(goafDevId) {
   return request({
-    url: `/goaf/goafdevinfo/delete/${goafDevId}`
+    url: `/goaf/goafsensor/delete/${goafDevId}`,
+    method: 'DELETE'
   })
 }
 
 // 修改
 export function updateSensor(data) {
   return request({
-    url: '/goaf/goafdevinfo/update',
+    url: '/goaf/goafsensor/update',
     method: 'PUT',
     data
   })
@@ -95,3 +96,19 @@ export function sensordevstatis() {
     url: '/goaf/goafsensor/goafdevstatis'
   })
 }
+
+// 分页获取所有温振传感器数据
+export function getSensorDataByPage(params) {
+  return request({
+    url: '/goaf/sensordata/page',
+    params
+  })
+}
+
+// 获取传感器最新数据
+export function getSensorNewSensordata(params) {
+  return request({
+    url: '/goaf/sensordata/newsensordata',
+    params
+  })
+}

src/layout/components/Navbar.vue

@@ -83,8 +83,8 @@ export default {
       logo: require('@/assets/images/logo/logo.png'),
       sideMenuTabIndex: 'iiot-eq',
       sideMenuTabList: [
-        { name: '设备', icon: require('@/assets/images/Navbar/sensor.png'), iconSelectEd: require('@/assets/images/Navbar/sensor_selected.png'), path: '/iiot-eq-overview/index', id: 'iiot-eq' },
-        { name: '传感器', icon: require('@/assets/images/Navbar/warn.png'), iconSelectEd: require('@/assets/images/Navbar/warn_selected.png'), path: '/iiot-sensor/index', id: 'iiot-sensor' },
+        { name: '设备', icon: require('@/assets/images/Navbar/sensor.png'), iconSelectEd: require('@/assets/images/Navbar/sensor_selected.png'), path: '/iiot-eq-overview/index', id: 'iiot-eq', permit: 'aqpt_system' },
+        { name: '传感器', icon: require('@/assets/images/Navbar/warn.png'), iconSelectEd: require('@/assets/images/Navbar/warn_selected.png'), path: '/iiot-sensor/index', id: 'iiot-sensor', permit: 'aqpt_system' },
         { name: '系统管理', icon: require('@/assets/images/Navbar/sys.png'), iconSelectEd: require('@/assets/images/Navbar/sys_selected.png'), path: '/aqpt/account', permit: 'aqpt_system', id: 9 },
         { name: '数字全景', icon: require('@/assets/images/Navbar/bigscreen.png'), iconSelectEd: require('@/assets/images/Navbar/bigscreen_selected.png'), path: '/bigScreen', permit: 'aqpt_panorama', id: 10 }
       ]
@@ -112,9 +112,10 @@ export default {
   },
   mounted() {
     this.getUnReadMsg()
-    // this.initSideMenu()
-    // console.log(this.$route.path === '/iiot-eq-overview/index')
-    this.initsideTab()
+    this.initSideMenu()
+    if (this.sideMenuTabList.length > 0) {
+      this.initsideTab()
+    }
   },
   methods: {
     getUnReadMsg() {
@@ -139,7 +140,8 @@ export default {
       }
       const paths = this.sideMenuTabList.filter(item => item.id === index)[0]
       const path = paths.length > 0 ? paths[0].path : this.sideMenuTabList[0].path
-      this.sideTabChange(index, { path })
+      const fullPath = this.$route.fullPath
+      this.sideTabChange(index, { path: fullPath.includes('404') ? path : fullPath })
     },
     toggleSideBar() {
       this.$store.dispatch('app/toggleSideBar')

src/router/modules/aqpt.js

@@ -7,6 +7,7 @@ const aqptRouter = [
     name: 'AqptPanorama',
     redirect: '/iiot-eq/overview',
     groupId: [0],
+    meta: { permit: 'aqpt_setting' },
     hidden: true
   },
   {
@@ -506,7 +507,7 @@ const aqptRouter = [
         path: 'sensorCat',
         component: () => import('@/views/goaf/sensorCat/index'),
         name: 'aqpt_setting_sensor_cat',
-        meta: { title: '传感器类别', noCache: true, permit: 'aqpt_setting_equipment_cat' }
+        meta: { title: '设备类型', noCache: true, permit: 'aqpt_setting_equipment_cat' }
       }
       //, {
       //   path: 'bigScreen-setting',

src/router/modules/iiot.js

@@ -6,6 +6,7 @@ const iiotRouter = [
     component: Layout,
     name: 'iiot-eq-overview',
     groupId: ['iiot-eq'],
+    meta: { permit: 'aqpt_setting' },
     children: [
       {
         path: 'index',
@@ -21,7 +22,8 @@ const iiotRouter = [
     groupId: ['iiot-eq'],
     meta: {
       title: '实时监测',
-      icon: 'icon-common_equipment'
+      icon: 'icon-common_equipment',
+      permit: 'aqpt_setting'
     },
     children: [
       {
@@ -36,6 +38,7 @@ const iiotRouter = [
     component: Layout,
     name: 'iiot-eq-deviceManager',
     groupId: ['iiot-eq'],
+    meta: { permit: 'aqpt_setting' },
     children: [
       {
         path: 'index',
@@ -49,6 +52,7 @@ const iiotRouter = [
     component: Layout,
     name: 'iiot-eq-alarm',
     groupId: ['iiot-eq'],
+    meta: { permit: 'aqpt_setting' },
     children: [
       {
         path: 'index',
@@ -62,6 +66,7 @@ const iiotRouter = [
     component: Layout,
     name: 'iiot-eq-history',
     groupId: ['iiot-eq'],
+    meta: { permit: 'aqpt_setting' },
     children: [
       {
         path: 'index',
@@ -77,7 +82,8 @@ const iiotRouter = [
     groupId: ['iiot-sensor'],
     meta: {
       title: '传感器',
-      icon: 'icon-common_equipment'
+      icon: 'icon-common_equipment',
+      permit: 'aqpt_setting'
     },
     children: [
       {
@@ -97,6 +103,7 @@ const iiotRouter = [
     path: '/bigScreen',
     hidden: true,
     name: 'iiot-bigscreen',
+    meta: { permit: 'aqpt_setting' },
     component: () => import('@/views/bigScreen')
   },
   {
@@ -104,6 +111,7 @@ const iiotRouter = [
     name: 'check',
     component: BigScreenMain,
     hidden: true,
+    meta: { permit: 'aqpt_setting' },
     children: [
       {
         path: 'check',
@@ -131,6 +139,7 @@ const iiotRouter = [
     path: '/goafcameraalarm',
     name: 'goafcameraalarm',
     hidden: true,
+    meta: { permit: 'aqpt_setting' },
     component: () => import('@/views/bigScreen/goafCameraAlarm')
   }
 ]

src/views/bigScreen/home/index.vue

@@ -142,6 +142,7 @@ export default {
         display: flex;
         justify-content: space-between;
         flex-direction: column;
+        overflow-y: auto;
         &.side-left{
           min-width: 432px;
         }

src/views/iiot/equipment/alarm.vue

@@ -15,48 +15,40 @@
 
     <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>
-        <el-table-column prop="goafDevLocation" label="测点名称" />
-        <el-table-column prop="goafDevLocation" label="传感器编号" />
-        <el-table-column prop="goafDevTypename" label="设备类型" />
-        <el-table-column header-align="center" align="center" label="速度（m/s）">
+        <el-table-column header-align="center" type="index" label="序号" align="center" width="60" />
+        <el-table-column header-align="center" align="center" prop="goafSensorName" label="设备名称" />
+        <el-table-column header-align="center" align="center" label="振动烈度（mm/s）">
           <el-table-column
             header-align="center"
             align="center"
             prop="name"
-            label="X轴阈值"
-            width="120"
+            label="水平方向"
+            width="95"
           >
             <template v-slot="{row}">
-              <span>{{ row.goafOrebody }}</span>
+              <span>{{ parseFloat((row.FAlarmVelX/100).toFixed(2)) }}</span>
             </template>
           </el-table-column>
           <el-table-column
             header-align="center"
             align="center"
             prop="name"
-            label="Y轴阈值"
-            width="120"
+            label="垂直方向"
+            width="95"
           >
             <template v-slot="{row}">
-              <span>{{ row.goafOreheight }}</span>
+              <span>{{ parseFloat((row.FAlarmVelY/100).toFixed(2)) }}</span>
             </template>
           </el-table-column>
           <el-table-column
             header-align="center"
             align="center"
             prop="name"
-            label="Z轴阈值"
-            width="120"
+            label="轴向"
+            width="95"
           >
             <template v-slot="{row}">
-              <span>{{ row.goafName }}</span>
+              <span>{{ parseFloat((row.FAlarmVelZ/100).toFixed(2)) }}</span>
             </template>
           </el-table-column>
         </el-table-column>
@@ -65,86 +57,134 @@
             header-align="center"
             align="center"
             prop="name"
-            label="X轴阈值"
-            width="120"
+            label="水平方向"
+            width="95"
+          >
+            <template v-slot="{row}">
+              <span>{{ row.FAlarmAccX }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            header-align="center"
+            align="center"
+            prop="name"
+            label="垂直方向"
+            width="95"
+          >
+            <template v-slot="{row}">
+              <span>{{ row.FAlarmAccY }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            header-align="center"
+            align="center"
+            prop="name"
+            label="轴向"
+            width="95"
           >
             <template v-slot="{row}">
-              <span>{{ row.goafOrebody }}</span>
+              <span>{{ row.FAlarmAccZ }}</span>
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column header-align="center" label="位移（um）">
+          <el-table-column
+            header-align="center"
+            align="center"
+            prop="name"
+            label="水平方向"
+            width="95"
+          >
+            <template v-slot="{row}">
+              <span>{{ row.FAlarmDisX }}</span>
             </template>
           </el-table-column>
           <el-table-column
             header-align="center"
             align="center"
             prop="name"
-            label="Y轴阈值"
-            width="120"
+            label="垂直方向"
+            width="95"
           >
             <template v-slot="{row}">
-              <span>{{ row.goafOreheight }}</span>
+              <span>{{ row.FAlarmDisY }}</span>
             </template>
           </el-table-column>
           <el-table-column
             header-align="center"
             align="center"
             prop="name"
-            label="Z轴阈值"
-            width="120"
+            label="轴向"
+            width="95"
           >
             <template v-slot="{row}">
-              <span>{{ row.goafName }}</span>
+              <span>{{ row.FAlarmDisZ }}</span>
             </template>
           </el-table-column>
         </el-table-column>
-        <el-table-column header-align="center" label="位移（m）">
+        <el-table-column header-align="center" align="center" label="振动烈度（mm/s）">
           <el-table-column
             header-align="center"
             align="center"
             prop="name"
-            label="X轴阈值"
-            width="120"
+            label="水平方向"
+            width="95"
           >
             <template v-slot="{row}">
-              <span>{{ row.goafOrebody }}</span>
+              <span>{{ parseFloat((row.frequencyX/10).toFixed(2)) }}</span>
             </template>
           </el-table-column>
           <el-table-column
             header-align="center"
             align="center"
             prop="name"
-            label="Y轴阈值"
-            width="120"
+            label="垂直方向"
+            width="95"
           >
             <template v-slot="{row}">
-              <span>{{ row.goafOreheight }}</span>
+              <span>{{ parseFloat((row.frequencyY/10).toFixed(2)) }}</span>
             </template>
           </el-table-column>
           <el-table-column
             header-align="center"
             align="center"
             prop="name"
-            label="Z轴阈值"
-            width="120"
+            label="轴向"
+            width="95"
           >
             <template v-slot="{row}">
-              <span>{{ row.goafName }}</span>
+              <span>{{ parseFloat((row.frequencyZ/10).toFixed(2)) }}</span>
             </template>
           </el-table-column>
         </el-table-column>
-        <el-table-column prop="goafOrebody" label="温度阈值" align="center" />
-        <el-table-column prop="goafInstallTime" label="报警时间" />
+        <el-table-column header-align="center" align="center" prop="sensorTemperature" label="温度（℃）">
+          <template v-slot="{row}">
+            <span>{{ parseFloat((row.sensorTemperature/10).toFixed(2)) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column header-align="center" align="center" prop="goafDatareportTime" label="上传时间" />
+        <!-- <el-table-column label="操作" header-align="center" align="center" width="180">
+          <template v-slot="{row}">
+            <el-button size="mini" type="text" style="color:#1B81FF" @click="showDetail(row)">详情</el-button>
+          </template>
+        </el-table-column> -->
       </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" />
       </div>
     </el-row>
+    <MonitorChartDetail ref="chart-detail" />
   </div>
 </template>
+
 <script>
-import { getSensor } from '@/api/goaf/sensor'
+import { getSensorDataByPage } from '@/api/goaf/sensor'
 import { Pagination } from '@/components'
 import { NumConvertLM } from '@/utils'
+import MonitorChartDetail from './components/MonitorChartDetail'
+
 export default {
-  components: { Pagination },
+  components: { Pagination, MonitorChartDetail },
   data() {
     return {
       dataList: [],
@@ -165,21 +205,25 @@ export default {
     NumConvertLM,
     getData() {
       this.listLoading = true
-      getSensor(this.conditions).then((resp) => {
+      getSensorDataByPage(this.conditions).then((resp) => {
         this.listLoading = false
-        const { code, msg, data } = resp
+        const { code, msg, data, total } = resp
         if (code === 0) {
-          const start = (this.conditions.page - 1) * this.conditions.limit
-          const end = this.conditions.page * this.conditions.limit
-          const dataList = data.filter((item) => item.goafDevTypename.includes('传感器'))
-          this.dataList = dataList.filter((item, index) => index >= start && index < end)
-          this.total = dataList.length
+          this.dataList = data
+          this.total = total
         } else {
           this.$message.error(msg)
         }
       }).catch((error) => {
         console.log(error)
       })
+    },
+    showDetail(data) {
+      const x = data.tdWaveValueX.split(',').map(item => parseFloat((item / 100).toFixed(2)))
+      const y = data.tdWaveValueY.split(',').map(item => parseFloat((item / 100).toFixed(2)))
+      const z = data.tdWaveValueZ.split(',').map(item => parseFloat((item / 100).toFixed(2)))
+      const params = { x, y, z }
+      this.$refs['chart-detail'].show(params)
     }
   }
 }
@@ -193,6 +237,9 @@ export default {
         .el-table thead.is-group th.el-table__cell{
         background-color: #132938;
       }
+        .el-table__header-wrapper{
+          border-bottom: 1px solid #5994bb;
+        }
         .el-table--border th.el-table__cell{
           // border-bottom: 1px solid #5994bb;
           border-right: 1px solid #5994bb;
@@ -208,6 +255,7 @@ export default {
           border-left: 1px solid #5994bb;
         }
       }
+
   }
   </style>
 

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

@@ -24,9 +24,6 @@
       <el-form-item label="安装地点" required>
         <el-input v-model="formData.goafDevLocation" placeholder="请输入安装地点" style="width:260px" />
       </el-form-item>
-      <el-form-item label="告警阈值" required>
-        <el-input-number v-model="formData.goafAlarmThreshold" placeholder="告警阈值" :controls="false" />
-      </el-form-item>
       <el-form-item label="设备类型" required>
         <el-select
           v-model="formData.goafDevTypeId"
@@ -45,32 +42,11 @@
           v-model="formData.goafInstallTime"
           type="date"
           placeholder="设备安装时间"
-          format="yyyy-MM-dd"
-          value-format="yyyy-MM-dd"
+          format="yyyy-MM-dd HH:mm:ss"
+          value-format="yyyy-MM-dd HH:mm:ss"
           style="width: 260px"
         />
       </el-form-item>
-      <el-form-item label="设备负责人部门">
-        <el-cascader
-          v-model="formData.goafDevGroupid"
-          :options="treeData"
-          :props="{ checkStrictly: true, emitPath: false }"
-          style="min-width: 260px"
-          filterable
-          clearable
-          @change="handleChange"
-        >
-          <template slot-scope="{ node, data }">
-            <span>{{ data.label }}</span>
-            <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
-          </template>
-        </el-cascader>
-      </el-form-item>
-      <el-form-item label="责任人员" prop="executeAccountId">
-        <el-select v-model="formData.goafDevAccountId" style="width:260px" filterable clearable @change="handleUserSelect">
-          <el-option v-for="item in userList" :key="item.accountId" :value="item.accountId" :label="item.accountName" />
-        </el-select>
-      </el-form-item>
     </el-form>
     <div class="btn-group">
       <el-button type="primary" @click="submitForm('ruleForm')">确定</el-button>
@@ -79,12 +55,10 @@
   </el-drawer>
 </template>
 <script>
-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'
+import { createDevice, updateDevice } from '@/api/goaf/device'
+import { parseTime } from '@/utils'
 export default {
   name: 'SensorModel',
   data() {
@@ -101,21 +75,12 @@ export default {
       sensorCats: [],
       goaf: [],
       formData: {
-        goafOrebelt: 0,
-        goafOrebody: 0,
-        goafOreheight: 0,
-        goafId: 0,
-        goafName: '',
-        goafDevLocation: '',
-        ocId: undefined,
-        goafDevName: '',
-        goafDevTypename: '',
-        goafDevTypeId: '',
-        goafDevAccountId: undefined,
-        goafDevGroupid: '',
-        goafDevAccountName: '',
-        goafInstallTime: '',
-        goafAlarmThreshold: 0
+        'goafDevId': 389,
+        'ocId': 790,
+        'goafDevName': '',
+        'goafDevLocation': '',
+        'goafDevTypename': '',
+        'goafInstallTime': parseTime(new Date())
       },
       rules: {},
       ctrlLevelList: [],
@@ -137,7 +102,7 @@ export default {
   methods: {
     init() {
       getSensorCat().then((res) => {
-        this.sensorCats = res.data.filter(item => item.sensorTypeName.includes('传感器'))
+        this.sensorCats = res.data
       })
       getGoafBaseInfo().then((res) => {
         this.goaf = res.data
@@ -146,52 +111,12 @@ export default {
         this.goafOreheights = res.data
         this.goafNames = res.data
       })
-      getGroupByList().then((resp) => {
-        const { code, data } = resp
-        if (code === 0) {
-          const temp = toTree(
-            data,
-            {
-              value: 'value',
-              name: 'label',
-              pValue: 'parentId'
-            },
-            {
-              value: 'groupId',
-              name: 'groupName',
-              pValue: 'parentId'
-            }
-          )
-          this.treeData = temp
-          this.groupList = data
-        }
-      })
-      getUserByPage({
-        page: 1,
-        limit: 999999
-      }).then((resp) => {
-        const { data } = resp
-        this.userList = data
-      })
-    },
-    handleChange(groupId) {
-      this.formData.goafDevAccountId = ''
-      this.formData.goafDevAccountName = ''
-      getUserByPage({
-        page: 1,
-        limit: 999999,
-        keyword: '',
-        groupId
-      }).then((resp) => {
-        const { data } = resp
-        this.userList = data
-      })
     },
     // Show Add Dialog
     showAddModel() {
       this.resetFormData()
       this.actionType = 'ADD'
-      this.title = '新增传感器配置'
+      this.title = '新增设备配置'
       this.dialogVisible = true
     },
 
@@ -199,35 +124,27 @@ export default {
     showEditModel(data) {
       this.resetFormData()
       this.actionType = 'UPDATE'
-      this.title = '修改传感器配置'
+      this.title = '修改设备配置'
       this.dialogVisible = true
       // Life minus one
-      const sensorCat = this.sensorCats.filter(
+      const goafDevTypeId = this.sensorCats.filter(
         (item) => item.sensorTypeName === data.goafDevTypename
-      )[0]
+      )[0]?.sensorTypeId
       this.formData = {
         ...data,
-        goafDevTypeId: sensorCat.sensorTypeId
+        goafDevTypeId
       }
     },
 
     // Reset Form Data
     resetFormData() {
       this.formData = {
-        goafOrebelt: 0,
-        goafOrebody: 0,
-        goafOreheight: 0,
-        goafId: 0,
-        goafName: '',
-        goafDevLocation: '',
-        ocId: undefined,
-        goafDevName: '',
-        goafDevTypename: '',
-        goafDevAccountId: undefined,
-        goafDevAccountName: '',
-        goafInstallTime: '',
-        goafAlarmThreshold: 0,
-        goafDevGroupid: ''
+        'goafDevId': undefined,
+        'ocId': undefined,
+        'goafDevName': '',
+        'goafDevLocation': '',
+        'goafDevTypename': '',
+        'goafInstallTime': parseTime(new Date())
       }
     },
     handleUserSelect(accountId) {
@@ -241,7 +158,6 @@ export default {
     },
     // 提交
     submitForm(formName) {
-      this.formData.goafDevGroupname = this.groupList.filter(item => item.groupId === this.formData.goafDevGroupid)[0].groupName
       const sensorCat = this.sensorCats.filter(
         (item) => item.sensorTypeId === this.formData.goafDevTypeId
       )[0]
@@ -249,17 +165,9 @@ export default {
       this.formData.ocId = sensorCat.ocId
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          if (
-            this.formData.goafId === undefined ||
-            this.formData.goafId === 'undefined' ||
-            this.formData.goafId === ''
-          ) {
-            this.$message.error('请选择采空区！')
-            return
-          }
           switch (this.actionType) {
             case 'ADD':
-              createSensor(this.formData)
+              createDevice(this.formData)
                 .then((resp) => {
                   const { code, msg } = resp
                   if (code === 0) {
@@ -276,7 +184,7 @@ export default {
               break
 
             case 'UPDATE':
-              updateSensor(this.formData)
+              updateDevice(this.formData)
                 .then((resp) => {
                   const { code, msg } = resp
                   if (code === 0) {
@@ -298,9 +206,6 @@ export default {
         }
       })
     },
-    handleSelectUser(item) {
-      console.log({ item })
-    },
     formSuccess() {
       this.$emit('formSuccess')
     },

src/views/iiot/equipment/device_manager.vue

@@ -13,122 +13,15 @@
         <el-button type="primary" @click="handleAdd">新增</el-button>
       </el-col>
     </el-row>
-
+    <!-- 序号、设备名称、安装区域、安装地点、设备类型、安装时间、操作 -->
     <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 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 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 type="index" label="传感器编码" header-align="center" align="center" width="120" /> -->
+        <el-table-column prop="goafDevName" label="待测设备名称" align="center" />
+        <el-table-column prop="goafDevTypename" label="待测设备类型" align="center" />
+        <el-table-column prop="goafDevLocation" label="传感器安装位置" align="center" />
+        <el-table-column prop="goafInstallTime" label="安装时间" align="center" />
         <el-table-column label="操作" header-align="center" align="center" width="170">
           <template v-slot="{row}">
             <el-button size="mini" type="primary" icon="el-icon-edit" @click="handleUpdate(row)">修改</el-button>
@@ -140,17 +33,17 @@
         <pagination v-show="total>0" :total="total" :page.sync="conditions.page" :limit.sync="conditions.limit" @pagination="getData" />
       </div>
     </el-row>
-    <sensor-Model ref="sensor" @formSuccess="getData" />
+    <device-Model ref="device" @formSuccess="getData" />
   </div>
 </template>
 
 <script>
-import { delSensor, getSensor } from '@/api/goaf/sensor'
+import { delDevice, getDeviceByPage } from '@/api/goaf/device'
 import { Pagination } from '@/components'
 import { NumConvertLM } from '@/utils'
-import sensorModel from './components/DeviceModel'
+import DeviceModel from './components/DeviceModel'
 export default {
-  components: { Pagination, sensorModel },
+  components: { Pagination, DeviceModel },
   data() {
     return {
       dataList: [],
@@ -171,15 +64,12 @@ export default {
     NumConvertLM,
     getData() {
       this.listLoading = true
-      getSensor(this.conditions).then((resp) => {
+      getDeviceByPage(this.conditions).then((resp) => {
         this.listLoading = false
-        const { code, msg, data } = resp
+        const { code, msg, data, total } = resp
         if (code === 0) {
-          const start = (this.conditions.page - 1) * this.conditions.limit
-          const end = this.conditions.page * this.conditions.limit
-          const dataList = data.filter((item) => item.goafDevTypename.includes('传感器'))
-          this.dataList = dataList.filter((item, index) => index >= start && index < end)
-          this.total = dataList.length
+          this.dataList = data
+          this.total = total
         } else {
           this.$message.error(msg)
         }
@@ -188,23 +78,23 @@ export default {
       })
     },
     handleAdd() {
-      this.$refs['sensor'].showAddModel('传感器')
+      this.$refs['device'].showAddModel('设备')
     },
 
     // "Edit Risk" Model
     handleUpdate(data) {
-      this.$refs['sensor'].showEditModel(JSON.parse(JSON.stringify(data)))
+      this.$refs['device'].showEditModel(JSON.parse(JSON.stringify(data)))
     },
 
     // Delete Action
     handleDelete(data) {
-      const { typeId, riskSource } = data
-      this.$confirm(`此操作将删除该数据${riskSource}, 是否继续?`, '提示', {
+      const { goafDevId, goafDevName } = data
+      this.$confirm(`此操作将删除该数据${goafDevName}, 是否继续?`, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        delSensor(typeId).then((resp) => {
+        delDevice(goafDevId).then((resp) => {
           const { code, msg } = resp
           if (code === 0) {
             this.getData()
@@ -225,9 +115,12 @@ export default {
 <style lang="scss" scoped>
 
 ::v-deep {
-      .el-table thead.is-group th.el-table__cell{
+    .el-table thead.is-group th.el-table__cell{
       background-color: #132938;
     }
+    .el-table__header-wrapper{
+      border-bottom: 1px solid #5994bb;
+    }
   .el-table--border th.el-table__cell{
     // border-bottom: 1px solid #5994bb;
     border-right: 1px solid #5994bb;

src/views/iiot/equipment/history.vue

@@ -3,7 +3,7 @@
     <el-row class="tool-bar">
       <el-col :span="12" class="left">
         <div class="content-title">
-          历史记录
+          实时数据
         </div>
       </el-col>
       <el-col :span="12" class="right">
@@ -16,17 +16,17 @@
     <el-row class="m-top-15">
       <el-table v-loading="listLoading" class="page-table" border fit :data="dataList">
         <el-table-column header-align="center" type="index" label="序号" align="center" width="60" />
-        <el-table-column header-align="center" align="center" prop="goafDevName" label="设备名称" />
+        <el-table-column header-align="center" align="center" prop="goafSensorName" 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"
+            width="95"
           >
             <template v-slot="{row}">
-              <span>{{ row.goafOrebody }}</span>
+              <span>{{ parseFloat((row.velX/100).toFixed(2)) }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -34,10 +34,10 @@
             align="center"
             prop="name"
             label="垂直方向"
-            width="120"
+            width="95"
           >
             <template v-slot="{row}">
-              <span>{{ row.goafOreheight }}</span>
+              <span>{{ parseFloat((row.velY/100).toFixed(2)) }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -45,10 +45,10 @@
             align="center"
             prop="name"
             label="轴向"
-            width="120"
+            width="95"
           >
             <template v-slot="{row}">
-              <span>{{ row.goafName }}</span>
+              <span>{{ parseFloat((row.velZ/100).toFixed(2)) }}</span>
             </template>
           </el-table-column>
         </el-table-column>
@@ -58,10 +58,10 @@
             align="center"
             prop="name"
             label="水平方向"
-            width="120"
+            width="95"
           >
             <template v-slot="{row}">
-              <span>{{ row.goafOrebody }}</span>
+              <span>{{ row.accX }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -69,10 +69,10 @@
             align="center"
             prop="name"
             label="垂直方向"
-            width="120"
+            width="95"
           >
             <template v-slot="{row}">
-              <span>{{ row.goafOreheight }}</span>
+              <span>{{ row.accY }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -80,23 +80,23 @@
             align="center"
             prop="name"
             label="轴向"
-            width="120"
+            width="95"
           >
             <template v-slot="{row}">
-              <span>{{ row.goafName }}</span>
+              <span>{{ row.accZ }}</span>
             </template>
           </el-table-column>
         </el-table-column>
-        <el-table-column header-align="center" label="位移（m）">
+        <el-table-column header-align="center" label="位移（um）">
           <el-table-column
             header-align="center"
             align="center"
             prop="name"
             label="水平方向"
-            width="120"
+            width="95"
           >
             <template v-slot="{row}">
-              <span>{{ row.goafOrebody }}</span>
+              <span>{{ row.disX }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -104,10 +104,10 @@
             align="center"
             prop="name"
             label="垂直方向"
-            width="120"
+            width="95"
           >
             <template v-slot="{row}">
-              <span>{{ row.goafOreheight }}</span>
+              <span>{{ row.disY }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -115,40 +115,76 @@
             align="center"
             prop="name"
             label="轴向"
-            width="120"
+            width="95"
           >
             <template v-slot="{row}">
-              <span>{{ row.goafName }}</span>
+              <span>{{ row.disZ }}</span>
             </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="goafInstallTime" label="上传时间" />
-        <!-- <el-table-column label="操作" header-align="center" align="center" width="180">
+        <el-table-column header-align="center" align="center" label="振动烈度（mm/s）">
+          <el-table-column
+            header-align="center"
+            align="center"
+            prop="name"
+            label="水平方向"
+            width="95"
+          >
+            <template v-slot="{row}">
+              <span>{{ parseFloat((row.frequencyX/10).toFixed(2)) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            header-align="center"
+            align="center"
+            prop="name"
+            label="垂直方向"
+            width="95"
+          >
+            <template v-slot="{row}">
+              <span>{{ parseFloat((row.frequencyY/10).toFixed(2)) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            header-align="center"
+            align="center"
+            prop="name"
+            label="轴向"
+            width="95"
+          >
+            <template v-slot="{row}">
+              <span>{{ parseFloat((row.frequencyZ/10).toFixed(2)) }}</span>
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column header-align="center" align="center" prop="sensorTemperature" label="温度（℃）">
+          <template v-slot="{row}">
+            <span>{{ parseFloat((row.sensorTemperature/10).toFixed(2)) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column header-align="center" align="center" prop="goafDatareportTime" label="上传时间" />
+        <el-table-column label="操作" header-align="center" align="center" width="180">
           <template v-slot="{row}">
             <el-button size="mini" type="text" style="color:#1B81FF" @click="showDetail(row)">详情</el-button>
           </template>
-        </el-table-column> -->
+        </el-table-column>
       </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" />
       </div>
     </el-row>
-    <MonitorDetail ref="detail" />
+    <MonitorChartDetail ref="chart-detail" />
   </div>
 </template>
 
 <script>
-import { getSensor } from '@/api/goaf/sensor'
+import { getSensorDataByPage } from '@/api/goaf/sensor'
 import { Pagination } from '@/components'
 import { NumConvertLM } from '@/utils'
-import MonitorDetail from './components/MonitorDetail'
+import MonitorChartDetail from './components/MonitorChartDetail'
+
 export default {
-  components: { Pagination, MonitorDetail },
+  components: { Pagination, MonitorChartDetail },
   data() {
     return {
       dataList: [],
@@ -169,15 +205,12 @@ export default {
     NumConvertLM,
     getData() {
       this.listLoading = true
-      getSensor(this.conditions).then((resp) => {
+      getSensorDataByPage(this.conditions).then((resp) => {
         this.listLoading = false
-        const { code, msg, data } = resp
+        const { code, msg, data, total } = resp
         if (code === 0) {
-          const start = (this.conditions.page - 1) * this.conditions.limit
-          const end = this.conditions.page * this.conditions.limit
-          const dataList = data.filter((item) => item.goafDevTypename.includes('传感器'))
-          this.dataList = dataList.filter((item, index) => index >= start && index < end)
-          this.total = dataList.length
+          this.dataList = data
+          this.total = total
         } else {
           this.$message.error(msg)
         }
@@ -186,36 +219,43 @@ export default {
       })
     },
     showDetail(data) {
-      this.$refs['detail'].showDetailModel(JSON.parse(JSON.stringify(data)))
+      const x = data.tdWaveValueX.split(',').map(item => parseFloat((item / 100).toFixed(2)))
+      const y = data.tdWaveValueY.split(',').map(item => parseFloat((item / 100).toFixed(2)))
+      const z = data.tdWaveValueZ.split(',').map(item => parseFloat((item / 100).toFixed(2)))
+      const params = { x, y, z }
+      this.$refs['chart-detail'].show(params)
     }
   }
 }
 </script>
-    <style lang="scss" scoped>
-    .page-wrap{
-        min-height:90vh;
-        padding: 15px;
-        background-color: #071A29;
-        ::v-deep {
-          .el-table thead.is-group th.el-table__cell{
-          background-color: #132938;
+  <style lang="scss" scoped>
+  .page-wrap{
+      min-height:90vh;
+      padding: 15px;
+      background-color: #071A29;
+      ::v-deep {
+        .el-table thead.is-group th.el-table__cell{
+        background-color: #132938;
+      }
+        .el-table__header-wrapper{
+          border-bottom: 1px solid #5994bb;
         }
-          .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;
-          }
+        .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>
+  }
+  </style>
 

src/views/iiot/equipment/monitor.vue

@@ -16,17 +16,17 @@
     <el-row class="m-top-15">
       <el-table v-loading="listLoading" class="page-table" border fit :data="dataList">
         <el-table-column header-align="center" type="index" label="序号" align="center" width="60" />
-        <el-table-column header-align="center" align="center" prop="goafDevName" label="设备名称" />
+        <el-table-column header-align="center" align="center" prop="goafSensorName" 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"
+            width="95"
           >
             <template v-slot="{row}">
-              <span>{{ row.goafOrebody }}</span>
+              <span>{{ parseFloat((row.velX/100).toFixed(2)) }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -34,10 +34,10 @@
             align="center"
             prop="name"
             label="垂直方向"
-            width="120"
+            width="95"
           >
             <template v-slot="{row}">
-              <span>{{ row.goafOreheight }}</span>
+              <span>{{ parseFloat((row.velY/100).toFixed(2)) }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -45,10 +45,10 @@
             align="center"
             prop="name"
             label="轴向"
-            width="120"
+            width="95"
           >
             <template v-slot="{row}">
-              <span>{{ row.goafName }}</span>
+              <span>{{ parseFloat((row.velZ/100).toFixed(2)) }}</span>
             </template>
           </el-table-column>
         </el-table-column>
@@ -58,10 +58,10 @@
             align="center"
             prop="name"
             label="水平方向"
-            width="120"
+            width="95"
           >
             <template v-slot="{row}">
-              <span>{{ row.goafOrebody }}</span>
+              <span>{{ row.accX }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -69,10 +69,10 @@
             align="center"
             prop="name"
             label="垂直方向"
-            width="120"
+            width="95"
           >
             <template v-slot="{row}">
-              <span>{{ row.goafOreheight }}</span>
+              <span>{{ row.accY }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -80,23 +80,23 @@
             align="center"
             prop="name"
             label="轴向"
-            width="120"
+            width="95"
           >
             <template v-slot="{row}">
-              <span>{{ row.goafName }}</span>
+              <span>{{ row.accZ }}</span>
             </template>
           </el-table-column>
         </el-table-column>
-        <el-table-column header-align="center" label="位移（m）">
+        <el-table-column header-align="center" label="位移（um）">
           <el-table-column
             header-align="center"
             align="center"
             prop="name"
             label="水平方向"
-            width="120"
+            width="95"
           >
             <template v-slot="{row}">
-              <span>{{ row.goafOrebody }}</span>
+              <span>{{ row.disX }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -104,10 +104,10 @@
             align="center"
             prop="name"
             label="垂直方向"
-            width="120"
+            width="95"
           >
             <template v-slot="{row}">
-              <span>{{ row.goafOreheight }}</span>
+              <span>{{ row.disY }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -115,15 +115,54 @@
             align="center"
             prop="name"
             label="轴向"
-            width="120"
+            width="95"
           >
             <template v-slot="{row}">
-              <span>{{ row.goafName }}</span>
+              <span>{{ row.disZ }}</span>
             </template>
           </el-table-column>
         </el-table-column>
-        <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 header-align="center" align="center" label="振动烈度（mm/s）">
+          <el-table-column
+            header-align="center"
+            align="center"
+            prop="name"
+            label="水平方向"
+            width="95"
+          >
+            <template v-slot="{row}">
+              <span>{{ parseFloat((row.frequencyX/10).toFixed(2)) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            header-align="center"
+            align="center"
+            prop="name"
+            label="垂直方向"
+            width="95"
+          >
+            <template v-slot="{row}">
+              <span>{{ parseFloat((row.frequencyY/10).toFixed(2)) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            header-align="center"
+            align="center"
+            prop="name"
+            label="轴向"
+            width="95"
+          >
+            <template v-slot="{row}">
+              <span>{{ parseFloat((row.frequencyZ/10).toFixed(2)) }}</span>
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column header-align="center" align="center" prop="sensorTemperature" label="温度（℃）">
+          <template v-slot="{row}">
+            <span>{{ parseFloat((row.sensorTemperature/10).toFixed(2)) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column header-align="center" align="center" prop="goafDatareportTime" label="上传时间" />
         <el-table-column label="操作" header-align="center" align="center" width="180">
           <template v-slot="{row}">
             <el-button size="mini" type="text" style="color:#1B81FF" @click="showDetail(row)">详情</el-button>
@@ -134,20 +173,18 @@
         <pagination v-show="total>0" :total="total" :page.sync="conditions.page" :limit.sync="conditions.limit" @pagination="getData" />
       </div>
     </el-row>
-    <MonitorDetail ref="detail" />
     <MonitorChartDetail ref="chart-detail" />
   </div>
 </template>
 
 <script>
-import { getSensor } from '@/api/goaf/sensor'
+import { getSensorNewSensordata } from '@/api/goaf/sensor'
 import { Pagination } from '@/components'
 import { NumConvertLM } from '@/utils'
-import MonitorDetail from './components/MonitorDetail'
 import MonitorChartDetail from './components/MonitorChartDetail'
 
 export default {
-  components: { Pagination, MonitorDetail, MonitorChartDetail },
+  components: { Pagination, MonitorChartDetail },
   data() {
     return {
       dataList: [],
@@ -168,15 +205,12 @@ export default {
     NumConvertLM,
     getData() {
       this.listLoading = true
-      getSensor(this.conditions).then((resp) => {
+      getSensorNewSensordata(this.conditions).then((resp) => {
         this.listLoading = false
         const { code, msg, data } = resp
         if (code === 0) {
-          const start = (this.conditions.page - 1) * this.conditions.limit
-          const end = this.conditions.page * this.conditions.limit
-          const dataList = data.filter((item) => item.goafDevTypename.includes('传感器'))
-          this.dataList = dataList.filter((item, index) => index >= start && index < end)
-          this.total = dataList.length
+          this.dataList = [data]
+          this.total = 1
         } else {
           this.$message.error(msg)
         }
@@ -185,17 +219,10 @@ export default {
       })
     },
     showDetail(data) {
-      const x = creatData()
-      const y = creatData()
-      const z = creatData()
+      const x = data.tdWaveValueX.split(',').map(item => parseFloat((item / 100).toFixed(2)))
+      const y = data.tdWaveValueY.split(',').map(item => parseFloat((item / 100).toFixed(2)))
+      const z = data.tdWaveValueZ.split(',').map(item => parseFloat((item / 100).toFixed(2)))
       const params = { x, y, z }
-      function creatData(num = 1000, max = 1) {
-        const arr = []
-        for (let i = 0; i < num; i++) {
-          arr.push(parseFloat(Math.random() * max).toFixed(2))
-        }
-        return arr
-      }
       this.$refs['chart-detail'].show(params)
     }
   }
@@ -210,6 +237,9 @@ export default {
         .el-table thead.is-group th.el-table__cell{
         background-color: #132938;
       }
+        .el-table__header-wrapper{
+          border-bottom: 1px solid #5994bb;
+        }
         .el-table--border th.el-table__cell{
           // border-bottom: 1px solid #5994bb;
           border-right: 1px solid #5994bb;

src/views/iiot/equipment/overview.vue

@@ -23,11 +23,11 @@
     <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="goafSensorName" label="传感器编码" />
         <el-table-column prop="goafDevName" label="设备名称" />
         <el-table-column prop="goafDevTypename" label="设备类型" />
-        <el-table-column prop="goafDevLocation" label="安装地点" />
-        <el-table-column prop="goafDevLocation" label="状态" />
+        <el-table-column prop="goafSensorLocation" label="安装地点" />
+        <el-table-column prop="goafSensorStatus" label="状态" />
         <el-table-column prop="goafDevLocation" label="一般告警" />
         <el-table-column prop="goafDevLocation" label="严重告警" />
         <el-table-column prop="goafInstallTime" label="安装时间" />
@@ -40,7 +40,7 @@
 </template>
 
 <script>
-import { getSensor } from '@/api/goaf/sensor'
+import { getSensorByPage } from '@/api/goaf/sensor'
 import { Pagination } from '@/components'
 import { NumConvertLM } from '@/utils'
 import OverviewStatus from './components/OverviewStatus'
@@ -66,15 +66,12 @@ export default {
     NumConvertLM,
     getData() {
       this.listLoading = true
-      getSensor(this.conditions).then((resp) => {
+      getSensorByPage(this.conditions).then((resp) => {
         this.listLoading = false
-        const { code, msg, data } = resp
+        const { code, msg, total, data } = resp
         if (code === 0) {
-          const start = (this.conditions.page - 1) * this.conditions.limit
-          const end = this.conditions.page * this.conditions.limit
-          const dataList = data.filter((item) => item.goafDevTypename.includes('传感器'))
-          this.dataList = dataList.filter((item, index) => index >= start && index < end)
-          this.total = dataList.length
+          this.dataList = data
+          this.total = total
         } else {
           this.$message.error(msg)
         }

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

@@ -4,84 +4,109 @@
     :modal-append-to-body="false"
     :modal="false"
     :wrapper-closable="false"
-    size="36%"
+    size="42%"
     :visible.sync="dialogVisible"
   >
-    <el-form
-      ref="ruleForm"
-      :model="formData"
-      :rules="rules"
-      label-position="right"
-      label-width="160px"
-    >
-      <el-form-item label="设备名称" required>
-        <el-input
-          v-model="formData.goafDevName"
-          placeholder="请输入设备名称"
-          style="width: 260px"
-        />
-      </el-form-item>
-      <el-form-item label="安装地点" required>
-        <el-input v-model="formData.goafDevLocation" placeholder="请输入安装地点" style="width:260px" />
-      </el-form-item>
-      <el-form-item label="告警阈值" required>
-        <el-input-number v-model="formData.goafAlarmThreshold" placeholder="告警阈值" :controls="false" />
-      </el-form-item>
-      <el-form-item label="设备类型" required>
-        <el-select
-          v-model="formData.goafDevTypeId"
-          style="width: 260px"
-        >
-          <el-option
-            v-for="item in sensorCats"
-            :key="item.sensorTypeId"
-            :value="item.sensorTypeId"
-            :label="item.sensorTypeName"
+    <div class="form-wrap">
+      <el-form
+        ref="ruleForm"
+        :model="formData"
+        :rules="rules"
+        label-position="right"
+        label-width="140px"
+      >
+        <el-form-item label="传感器名称(编号)" required>
+          <el-input
+            v-model="formData.goafSensorName"
+            placeholder="请输入传感器名称（编号）"
+            style="width: 260px"
           />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="设备安装时间">
-        <el-date-picker
-          v-model="formData.goafInstallTime"
-          type="date"
-          placeholder="设备安装时间"
-          format="yyyy-MM-dd"
-          value-format="yyyy-MM-dd"
-          style="width: 260px"
-        />
-      </el-form-item>
-      <el-form-item label="设备负责人部门">
-        <el-cascader
-          v-model="formData.goafDevGroupid"
-          :options="treeData"
-          :props="{ checkStrictly: true, emitPath: false }"
-          style="min-width: 260px"
-          filterable
-          clearable
-          @change="handleChange"
-        >
-          <template slot-scope="{ node, data }">
-            <span>{{ data.label }}</span>
-            <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
-          </template>
-        </el-cascader>
-      </el-form-item>
-      <el-form-item label="责任人员" prop="executeAccountId">
-        <el-select v-model="formData.goafDevAccountId" style="width:260px" filterable clearable @change="handleUserSelect">
-          <el-option v-for="item in userList" :key="item.accountId" :value="item.accountId" :label="item.accountName" />
-        </el-select>
-      </el-form-item>
-    </el-form>
-    <div class="btn-group">
-      <el-button type="primary" @click="submitForm('ruleForm')">确定</el-button>
-      <el-button class="cancel-btn" @click="dialogVisible = false">取消</el-button>
+        </el-form-item>
+        <el-form-item label="设备名称" required>
+          <el-input
+            v-model="formData.goafDevName"
+            placeholder="请输入设备名称"
+            style="width: 260px"
+          />
+        </el-form-item>
+        <el-form-item label="检测间隔时间（分）" required>
+          <el-input-number v-model="formData.goafCheckTimeInterval" placeholder="检测间隔时间（分）" :controls="false" style="width: 100px;" />
+        </el-form-item>
+        <el-form-item label="波特率" required>
+          <el-input-number v-model="formData.sensorBaudrate" placeholder="波特率" :controls="false" style="width: 100px;" />
+        </el-form-item>
+        <el-form-item label="安装地点" required>
+          <el-input v-model="formData.goafSensorLocation" placeholder="请输入安装地点" style="width:260px" />
+        </el-form-item>
+        <div class="flex-wrap">
+          <el-form-item label="X轴加速度阈值" required>
+            <el-input-number v-model="formData.thvAccX" placeholder="X轴加速度阈值" :controls="false" style="width: 100px;" />
+          </el-form-item>
+          <el-form-item label="Y轴加速度阈值" required>
+            <el-input-number v-model="formData.thvAccY" placeholder="Y轴加速度阈值" :controls="false" style="width: 100px;" />
+          </el-form-item>
+          <el-form-item label="Z轴加速度阈值" required>
+            <el-input-number v-model="formData.thvAccZ" placeholder="Z轴加速度阈值" :controls="false" style="width: 100px;" />
+          </el-form-item>
+        </div>
+        <div class="flex-wrap">
+          <el-form-item label="X轴速度阈值" required>
+            <el-input-number v-model="formData.thvVelX" placeholder="X轴速度阈值" :controls="false" style="width: 100px;" />
+          </el-form-item>
+          <el-form-item label="Y轴速度阈值" required>
+            <el-input-number v-model="formData.thvVelY" placeholder="Y轴速度阈值" :controls="false" style="width: 100px;" />
+          </el-form-item>
+          <el-form-item label="Z轴速度阈值" required>
+            <el-input-number v-model="formData.thvVelZ" placeholder="Z轴速度阈值" :controls="false" style="width: 100px;" />
+          </el-form-item>
+        </div>
+        <div class="flex-wrap">
+          <el-form-item label="X轴位移阈值" required>
+            <el-input-number v-model="formData.thvDisX" placeholder="X轴位移阈值" :controls="false" style="width: 100px;" />
+          </el-form-item>
+          <el-form-item label="Y轴位移阈值" required>
+            <el-input-number v-model="formData.thvDisY" placeholder="Y轴位移阈值" :controls="false" style="width: 100px;" />
+          </el-form-item>
+          <el-form-item label="Z轴位移阈值" required>
+            <el-input-number v-model="formData.thvDisZ" placeholder="Z轴位移阈值" :controls="false" style="width: 100px;" />
+          </el-form-item>
+        </div>
+        <el-form-item label="温度阈值" required>
+          <el-input-number v-model="formData.thvTemperature" placeholder="温度阈值" :controls="false" style="width: 100px;" />
+        </el-form-item>
+        <el-form-item label="设备类型" required>
+          <el-select
+            v-model="formData.goafDevTypeId"
+            style="width: 260px"
+          >
+            <el-option
+              v-for="item in sensorCats"
+              :key="item.sensorTypeId"
+              :value="item.sensorTypeId"
+              :label="item.sensorTypeName"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="设备安装时间">
+          <el-date-picker
+            v-model="formData.goafInstallTime"
+            type="date"
+            placeholder="设备安装时间"
+            format="yyyy-MM-dd HH:MM:SS"
+            value-format="yyyy-MM-dd HH:MM:SS"
+            style="width: 260px"
+          />
+        </el-form-item>
+      </el-form>
+      <div class="btn-group">
+        <el-button type="primary" @click="submitForm('ruleForm')">确定</el-button>
+        <el-button class="cancel-btn" @click="dialogVisible = false">取消</el-button>
+      </div>
     </div>
   </el-drawer>
 </template>
 <script>
-import { toTree } from '@/utils/build-tree'
-import { getGroupByList } from '@/api/system/groupApi'
-import { getUserByPage } from '@/api/system/userApi'
+import { parseTime } from '@/utils'
 import { getSensorCat } from '@/api/goaf/sensorCatApi'
 import { createSensor, updateSensor } from '@/api/goaf/sensor'
 export default {
@@ -100,21 +125,18 @@ export default {
       sensorCats: [],
       goaf: [],
       formData: {
-        goafOrebelt: 0,
-        goafOrebody: 0,
-        goafOreheight: 0,
-        goafId: 0,
-        goafName: '',
-        goafDevLocation: '',
-        ocId: undefined,
-        goafDevName: '',
-        goafDevTypename: '',
-        goafDevTypeId: '',
-        goafDevAccountId: undefined,
-        goafDevGroupid: '',
-        goafDevAccountName: '',
-        goafInstallTime: '',
-        goafAlarmThreshold: 0,
+        'goafSensorId': undefined,
+        'ocId': undefined,
+        'goafSensorName': '',
+        'modbusId': undefined,
+        'sensorBaudrate': 0,
+        'goafSensorIp': undefined,
+        'goafDevName': '',
+        'goafDevTypename': '',
+        'goafSensorLocation': '',
+        'goafCheckTimeInterval': '',
+        'goafInstallTime': parseTime(new Date()),
+        'goafSensorStatus': 0,
         'thvAccX': 0,
         'thvAccY': 0,
         'thvAccZ': 0,
@@ -146,47 +168,7 @@ export default {
   methods: {
     init() {
       getSensorCat().then((res) => {
-        this.sensorCats = res.data.filter(item => item.sensorTypeName.includes('传感器'))
-      })
-      getGroupByList().then((resp) => {
-        const { code, data } = resp
-        if (code === 0) {
-          const temp = toTree(
-            data,
-            {
-              value: 'value',
-              name: 'label',
-              pValue: 'parentId'
-            },
-            {
-              value: 'groupId',
-              name: 'groupName',
-              pValue: 'parentId'
-            }
-          )
-          this.treeData = temp
-          this.groupList = data
-        }
-      })
-      getUserByPage({
-        page: 1,
-        limit: 999999
-      }).then((resp) => {
-        const { data } = resp
-        this.userList = data
-      })
-    },
-    handleChange(groupId) {
-      this.formData.goafDevAccountId = ''
-      this.formData.goafDevAccountName = ''
-      getUserByPage({
-        page: 1,
-        limit: 999999,
-        keyword: '',
-        groupId
-      }).then((resp) => {
-        const { data } = resp
-        this.userList = data
+        this.sensorCats = res.data
       })
     },
     // Show Add Dialog
@@ -204,32 +186,32 @@ export default {
       this.title = '修改传感器配置'
       this.dialogVisible = true
       // Life minus one
-      const sensorCat = this.sensorCats.filter(
-        (item) => item.sensorTypeName === data.goafDevTypename
-      )[0]
+      var goafDevTypeId = ''
+      if (data.goafDevTypename) {
+        goafDevTypeId = this.sensorCats.filter(
+          (item) => item.sensorTypeName === data.goafDevTypename
+        )[0]?.sensorTypeId
+      }
       this.formData = {
         ...data,
-        goafDevTypeId: sensorCat.sensorTypeId
+        goafDevTypeId
       }
     },
-
     // Reset Form Data
     resetFormData() {
       this.formData = {
-        goafOrebelt: 0,
-        goafOrebody: 0,
-        goafOreheight: 0,
-        goafId: 0,
-        goafName: '',
-        goafDevLocation: '',
-        ocId: undefined,
-        goafDevName: '',
-        goafDevTypename: '',
-        goafDevAccountId: undefined,
-        goafDevAccountName: '',
-        goafInstallTime: '',
-        goafAlarmThreshold: 0,
-        goafDevGroupid: '',
+        'goafSensorId': undefined,
+        'ocId': undefined,
+        'goafSensorName': '',
+        'modbusId': undefined,
+        'sensorBaudrate': undefined,
+        'goafSensorIp': undefined,
+        'goafDevName': '',
+        'goafDevTypename': '',
+        'goafSensorLocation': '',
+        'goafCheckTimeInterval': '',
+        'goafInstallTime': parseTime(new Date()),
+        'goafSensorStatus': 0,
         'thvAccX': 0,
         'thvAccY': 0,
         'thvAccZ': 0,
@@ -242,18 +224,8 @@ export default {
         'thvTemperature': 0
       }
     },
-    handleUserSelect(accountId) {
-      const item = this.userList.filter((item) => item.accountId === accountId)
-      const user = item[0]
-      this.formData.groupId = user.groupId
-      this.formData.goafDevGroupname = user.groupName
-      this.formData.goafDevAccountName = user.accountName
-      this.formData.positionId = user.positionId
-      this.formData.positionName = user.positionName
-    },
     // 提交
     submitForm(formName) {
-      this.formData.goafDevGroupname = this.groupList.filter(item => item.groupId === this.formData.goafDevGroupid)[0].groupName
       const sensorCat = this.sensorCats.filter(
         (item) => item.sensorTypeId === this.formData.goafDevTypeId
       )[0]
@@ -261,14 +233,6 @@ export default {
       this.formData.ocId = sensorCat.ocId
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          if (
-            this.formData.goafId === undefined ||
-            this.formData.goafId === 'undefined' ||
-            this.formData.goafId === ''
-          ) {
-            this.$message.error('请选择采空区！')
-            return
-          }
           switch (this.actionType) {
             case 'ADD':
               createSensor(this.formData)
@@ -319,10 +283,6 @@ export default {
     resetFormField(formName) {
       this.$refs[formName].resetFields()
     },
-    unique(arr = [], name = 'name') {
-      const res = new Map()
-      return arr.filter((item) => !res.has(item[name]) && res.set(item[name], 1))
-    },
     deeepClone(params) {
       return JSON.parse(JSON.stringify(params))
     }
@@ -330,10 +290,17 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.form-wrap{
+  padding: 5px 15px;
+}
 .btn-group {
   padding-left: 160px;
   margin-top: 50px;
 }
+.flex-wrap{
+  display: flex;
+  flex-wrap: wrap;
+}
 .safe-area {
   color: #fff;
   display: flex;

src/views/iiot/sensor/index.vue

@@ -24,17 +24,17 @@
       <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="设备名称" align="center" />
-        <el-table-column prop="goafDevLocation" label="安装地点" align="center" />
-        <el-table-column header-align="center" align="center" label="速度（m/s）">
+        <el-table-column prop="goafSensorLocation" label="安装地点" align="center" />
+        <el-table-column header-align="center" align="center" label="速度（mm/s）">
           <el-table-column
             header-align="center"
             align="center"
             prop="name"
             label="X轴阈值"
-            width="120"
+            width="95"
           >
             <template v-slot="{row}">
-              <span>{{ row.goafOrebody }}</span>
+              <span>{{ parseFloat((row.thvVelX/100).toFixed(2)) }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -42,10 +42,10 @@
             align="center"
             prop="name"
             label="Y轴阈值"
-            width="120"
+            width="95"
           >
             <template v-slot="{row}">
-              <span>{{ row.goafOreheight }}</span>
+              <span>{{ parseFloat((row.thvVelY/100).toFixed(2)) }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -53,10 +53,10 @@
             align="center"
             prop="name"
             label="Z轴阈值"
-            width="120"
+            width="95"
           >
             <template v-slot="{row}">
-              <span>{{ row.goafName }}</span>
+              <span>{{ parseFloat((row.thvVelZ/100).toFixed(2)) }}</span>
             </template>
           </el-table-column>
         </el-table-column>
@@ -66,10 +66,10 @@
             align="center"
             prop="name"
             label="X轴阈值"
-            width="120"
+            width="95"
           >
             <template v-slot="{row}">
-              <span>{{ row.goafOrebody }}</span>
+              <span>{{ parseFloat((row.thvAccX/100).toFixed(2)) }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -77,10 +77,10 @@
             align="center"
             prop="name"
             label="Y轴阈值"
-            width="120"
+            width="95"
           >
             <template v-slot="{row}">
-              <span>{{ row.goafOreheight }}</span>
+              <span>{{ parseFloat((row.thvAccY/100).toFixed(2)) }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -88,23 +88,23 @@
             align="center"
             prop="name"
             label="Z轴阈值"
-            width="120"
+            width="95"
           >
             <template v-slot="{row}">
-              <span>{{ row.goafName }}</span>
+              <span>{{ parseFloat((row.thvAccX/100).toFixed(2)) }}</span>
             </template>
           </el-table-column>
         </el-table-column>
-        <el-table-column header-align="center" label="位移（m）">
+        <el-table-column header-align="center" label="位移（um）">
           <el-table-column
             header-align="center"
             align="center"
             prop="name"
             label="X轴阈值"
-            width="120"
+            width="95"
           >
             <template v-slot="{row}">
-              <span>{{ row.goafOrebody }}</span>
+              <span>{{ row.thvDisX }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -112,10 +112,10 @@
             align="center"
             prop="name"
             label="Y轴阈值"
-            width="120"
+            width="95"
           >
             <template v-slot="{row}">
-              <span>{{ row.goafOreheight }}</span>
+              <span>{{ row.thvDisY }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -123,10 +123,10 @@
             align="center"
             prop="name"
             label="Z轴阈值"
-            width="120"
+            width="95"
           >
             <template v-slot="{row}">
-              <span>{{ row.goafName }}</span>
+              <span>{{ row.thvDisX }}</span>
             </template>
           </el-table-column>
         </el-table-column>
@@ -140,7 +140,7 @@
 </template>
 
 <script>
-import { getSensor, sensordevstatis } from '@/api/goaf/sensor'
+import { getSensorByPage, sensordevstatis } from '@/api/goaf/sensor'
 import { Pagination } from '@/components'
 import { NumConvertLM } from '@/utils'
 import SensorStatus from './components/SensorStatus.vue'
@@ -167,15 +167,12 @@ export default {
     getData() {
       this.listLoading = true
       sensordevstatis()
-      getSensor(this.conditions).then((resp) => {
+      getSensorByPage(this.conditions).then((resp) => {
         this.listLoading = false
         const { code, msg, data } = resp
         if (code === 0) {
-          const start = (this.conditions.page - 1) * this.conditions.limit
-          const end = this.conditions.page * this.conditions.limit
-          const dataList = data.filter((item) => item.goafDevTypename.includes('传感器'))
-          this.dataList = dataList.filter((item, index) => index >= start && index < end)
-          this.total = dataList.length
+          this.dataList = data
+          this.total = resp.total
         } else {
           this.$message.error(msg)
         }
@@ -203,6 +200,9 @@ export default {
         .el-table thead.is-group th.el-table__cell{
         background-color: #132938;
       }
+      .el-table__header-wrapper{
+      border-bottom: 1px solid #5994bb;
+    }
         .el-table--border th.el-table__cell{
           // border-bottom: 1px solid #5994bb;
           border-right: 1px solid #5994bb;

src/views/iiot/sensor/manager.vue

@@ -17,25 +17,22 @@
     <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>
-        <el-table-column prop="goafDevLocation" label="安装地点" />
-        <el-table-column prop="goafDevTypename" label="设备类型" />
-        <el-table-column prop="goafInstallTime" label="安装时间" />
-        <el-table-column header-align="center" align="center" label="速度（m/s）">
+        <el-table-column prop="goafSensorName" label="编码" align="center" />
+        <el-table-column prop="goafDevName" label="设备名称" align="center" />
+        <el-table-column prop="goafSensorLocation" label="安装地点" align="center" />
+        <el-table-column prop="goafCheckTimeInterval" label="监测间隔时间（分）" align="center" show-overflow-tooltip />
+        <el-table-column prop="goafDevTypename" label="设备类型" align="center" />
+        <el-table-column prop="goafInstallTime" label="安装时间" align="center" />
+        <el-table-column header-align="center" align="center" label="速度（mm/s）">
           <el-table-column
             header-align="center"
             align="center"
             prop="name"
             label="X轴阈值"
-            width="120"
+            width="95"
           >
             <template v-slot="{row}">
-              <span>{{ row.goafOrebody }}</span>
+              <span>{{ parseFloat((row.thvVelX/100).toFixed(2)) }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -43,10 +40,10 @@
             align="center"
             prop="name"
             label="Y轴阈值"
-            width="120"
+            width="95"
           >
             <template v-slot="{row}">
-              <span>{{ row.goafOreheight }}</span>
+              <span>{{ parseFloat((row.thvVelY/100).toFixed(2)) }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -54,10 +51,10 @@
             align="center"
             prop="name"
             label="Z轴阈值"
-            width="120"
+            width="95"
           >
             <template v-slot="{row}">
-              <span>{{ row.goafName }}</span>
+              <span>{{ parseFloat((row.thvVelZ/100).toFixed(2)) }}</span>
             </template>
           </el-table-column>
         </el-table-column>
@@ -67,10 +64,10 @@
             align="center"
             prop="name"
             label="X轴阈值"
-            width="120"
+            width="95"
           >
             <template v-slot="{row}">
-              <span>{{ row.goafOrebody }}</span>
+              <span>{{ parseFloat((row.thvAccX/100).toFixed(2)) }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -78,10 +75,10 @@
             align="center"
             prop="name"
             label="Y轴阈值"
-            width="120"
+            width="95"
           >
             <template v-slot="{row}">
-              <span>{{ row.goafOreheight }}</span>
+              <span>{{ parseFloat((row.thvAccY/100).toFixed(2)) }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -89,23 +86,23 @@
             align="center"
             prop="name"
             label="Z轴阈值"
-            width="120"
+            width="95"
           >
             <template v-slot="{row}">
-              <span>{{ row.goafName }}</span>
+              <span>{{ parseFloat((row.thvAccX/100).toFixed(2)) }}</span>
             </template>
           </el-table-column>
         </el-table-column>
-        <el-table-column header-align="center" label="位移（m）">
+        <el-table-column header-align="center" label="位移（um）">
           <el-table-column
             header-align="center"
             align="center"
             prop="name"
             label="X轴阈值"
-            width="120"
+            width="95"
           >
             <template v-slot="{row}">
-              <span>{{ row.goafOrebody }}</span>
+              <span>{{ row.thvDisX }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -113,10 +110,10 @@
             align="center"
             prop="name"
             label="Y轴阈值"
-            width="120"
+            width="95"
           >
             <template v-slot="{row}">
-              <span>{{ row.goafOreheight }}</span>
+              <span>{{ row.thvDisY }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -124,14 +121,15 @@
             align="center"
             prop="name"
             label="Z轴阈值"
-            width="120"
+            width="95"
           >
             <template v-slot="{row}">
-              <span>{{ row.goafName }}</span>
+              <span>{{ row.thvDisX }}</span>
             </template>
           </el-table-column>
         </el-table-column>
-        <el-table-column label="操作" header-align="center" align="center" width="170">
+        <el-table-column prop="thvTemperature" label="温度阈值" align="center" />
+        <el-table-column label="操作" header-align="center" align="center" width="160">
           <template v-slot="{row}">
             <el-button size="mini" type="primary" icon="el-icon-edit" @click="handleUpdate(row)">修改</el-button>
             <el-button size="mini" type="danger" icon="el-icon-edit" @click="handleDelete(row)">删除</el-button>
@@ -147,7 +145,7 @@
 </template>
 
 <script>
-import { delSensor, getSensor } from '@/api/goaf/sensor'
+import { delSensor, getSensorByPage } from '@/api/goaf/sensor'
 import { Pagination } from '@/components'
 import { NumConvertLM } from '@/utils'
 import sensorModel from './components/DeviceModel'
@@ -173,15 +171,12 @@ export default {
     NumConvertLM,
     getData() {
       this.listLoading = true
-      getSensor(this.conditions).then((resp) => {
+      getSensorByPage(this.conditions).then((resp) => {
         this.listLoading = false
         const { code, msg, data } = resp
         if (code === 0) {
-          const start = (this.conditions.page - 1) * this.conditions.limit
-          const end = this.conditions.page * this.conditions.limit
-          const dataList = data.filter((item) => item.goafDevTypename.includes('传感器'))
-          this.dataList = dataList.filter((item, index) => index >= start && index < end)
-          this.total = dataList.length
+          this.dataList = data
+          this.total = resp.total
         } else {
           this.$message.error(msg)
         }
@@ -200,13 +195,13 @@ export default {
 
     // Delete Action
     handleDelete(data) {
-      const { typeId, riskSource } = data
-      this.$confirm(`此操作将删除该数据${riskSource}, 是否继续?`, '提示', {
+      const { goafSensorId, goafSensorName } = data
+      this.$confirm(`此操作将删除该数据${goafSensorName}, 是否继续?`, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        delSensor(typeId).then((resp) => {
+        delSensor(goafSensorId).then((resp) => {
           const { code, msg } = resp
           if (code === 0) {
             this.getData()
@@ -233,6 +228,9 @@ export default {
         .el-table thead.is-group th.el-table__cell{
         background-color: #132938;
       }
+      .el-table__header-wrapper{
+      border-bottom: 1px solid #5994bb;
+    }
         .el-table--border th.el-table__cell{
           // border-bottom: 1px solid #5994bb;
           border-right: 1px solid #5994bb;