设备类型管理-提交

src/views/dashboard/Analysis/homePage/workerFace.vue

@@ -1,21 +1,16 @@
 <template>
   <div class="center-container">
     <div class="lr-box left-box">
-      <div class = "container-title">
-          <a-select
-          class="title-select"
-          ref="select"
-          v-model:value="currentTitleValue"
-          @change="handleTitleChange"
-        >
+      <div class="container-title">
+        <a-select class="title-select" ref="select" v-model:value="currentTitleValue" @change="handleTitleChange">
           <a-select-option value="2">15212工作面</a-select-option>
           <a-select-option value="1598491318007898113">采煤工作面</a-select-option>
           <a-select-option value="3">掘进工作面</a-select-option>
         </a-select>
       </div>
-      
+
       <div class="item">
-        <dv-decoration7 style="height:30px;">
+        <dv-decoration7 style="height: 30px">
           <div class="base-title">监测信息</div>
         </dv-decoration7>
         <div class="need-air-group vent-flex-row">
@@ -33,17 +28,11 @@
           </div>
         </div>
         <div class="item-container">
-
-          <BarAndLineCustom
-          xAxisPropType="time"
-          :chartData="monitorData"
-          height="240px"
-          :propTypeArr="['jin', 'hui']"
-          :option="echartsOption" />
+          <!-- <BarAndLineCustom xAxisPropType="time" :chartData="monitorData" height="240px" :propTypeArr="['jin', 'hui']" :option="echartsOption" /> -->
         </div>
       </div>
-      <div class="item ">
-        <dv-decoration7 style="height:30px;">
+      <div class="item">
+        <dv-decoration7 style="height: 30px">
           <div class="base-title">基本信息</div>
         </dv-decoration7>
         <div class="base-information-box">
@@ -56,13 +45,12 @@
               </div>
             </div>
           </div>
-          
         </div>
       </div>
     </div>
     <div class="lr-box right-box">
       <div class="warning-box">
-        <dv-decoration7 style="height:30px;">
+        <dv-decoration7 style="height: 30px">
           <div class="base-title">报警信息</div>
         </dv-decoration7>
         <div class="warning-top">
@@ -91,19 +79,26 @@
         </div>
       </div>
       <div class="warning-monitor">
-        <dv-scroll-board ref="scrollBoard" :config="warningConfig" style="width:100%;height:220px"  />
+        <dv-scroll-board ref="scrollBoard" :config="warningConfig" style="width: 100%; height: 220px" />
       </div>
       <div class="device-monitor-box">
-        <dv-decoration7 style="height:30px;">
+        <dv-decoration7 style="height: 30px">
           <div class="base-title">设备信息</div>
         </dv-decoration7>
         <div class="device-btn-group">
-          <div v-for="deviceType in  deviceTypes" class="device-btn" :class="{'device-active': deviceActive ===  deviceType.type}"  :key="deviceType.type" @click="showDeviceMonitor(deviceType)">{{ deviceType.text }}</div>
+          <div
+            v-for="deviceType in deviceTypes"
+            class="device-btn"
+            :class="{ 'device-active': deviceActive === deviceType.type }"
+            :key="deviceType.type"
+            @click="showDeviceMonitor(deviceType)"
+            >{{ deviceType.text }}</div
+          >
         </div>
-        <div class="device-table"  :class="{'device-table-open': deviceActive, 'device-table-close': !deviceActive }">
+        <div class="device-table" :class="{ 'device-table-open': deviceActive, 'device-table-close': !deviceActive }">
           <div class="vent-flex-row device-tab">
             <div class="tab tab-active">设备监测</div>
-            <a-divider type="vertical" style=" height: 10px; background-color: #aaa" />
+            <a-divider type="vertical" style="height: 10px; background-color: #aaa" />
             <div class="tab">历史信息</div>
           </div>
           <div class="device-animation">
@@ -113,30 +108,46 @@
               :dataSource="deviceMonitorData"
               title="风门监测"
               :isShowSelect="false"
-              :isShowPagination = "false"
+              :isShowPagination="false"
               :isShowActionColumn="true"
               :scroll="{ y: 160 }"
             >
               <template #filterCell="{ column, record }">
                 <template v-if="record.frontGateOpenCtrl">
-                  <a-tag v-if="column.dataIndex === 'frontGateOpen' && record.frontGateOpen == 0 && record.frontGateClose == 0" color="red">正在打开</a-tag>
+                  <a-tag v-if="column.dataIndex === 'frontGateOpen' && record.frontGateOpen == 0 && record.frontGateClose == 0" color="red"
+                    >正在打开</a-tag
+                  >
                   <a-tag v-else-if="column.dataIndex === 'frontGateOpen'" color="processing">打开</a-tag>
                 </template>
                 <template v-else>
-                  <a-tag v-if="column.dataIndex === 'frontGateOpen' && record.frontGateOpen == 0 && record.frontGateClose == 0" color="red">正在关闭</a-tag>
-                  <a-tag v-else-if="column.dataIndex === 'frontGateOpen' && record.frontGateOpen == 0 && record.frontGateClose == 1" color="default">关闭</a-tag>
-                  <a-tag v-else-if="column.dataIndex === 'frontGateOpen' && record.frontGateOpen == 1 && record.frontGateClose == 0" color="default">打开</a-tag>
+                  <a-tag v-if="column.dataIndex === 'frontGateOpen' && record.frontGateOpen == 0 && record.frontGateClose == 0" color="red"
+                    >正在关闭</a-tag
+                  >
+                  <a-tag v-else-if="column.dataIndex === 'frontGateOpen' && record.frontGateOpen == 0 && record.frontGateClose == 1" color="default"
+                    >关闭</a-tag
+                  >
+                  <a-tag v-else-if="column.dataIndex === 'frontGateOpen' && record.frontGateOpen == 1 && record.frontGateClose == 0" color="default"
+                    >打开</a-tag
+                  >
                 </template>
                 <template v-if="record.rearGateOpenCtrl">
-                  <a-tag v-if="column.dataIndex === 'rearGateOpen' && record.rearGateOpen == 0 && record.rearGateClose == 0" color="red">正在打开</a-tag>
+                  <a-tag v-if="column.dataIndex === 'rearGateOpen' && record.rearGateOpen == 0 && record.rearGateClose == 0" color="red"
+                    >正在打开</a-tag
+                  >
                   <a-tag v-else-if="column.dataIndex === 'rearGateOpen'" color="processing">打开</a-tag>
                 </template>
                 <template v-else>
-                  <a-tag v-if="column.dataIndex === 'rearGateOpen' && record.rearGateOpen == 0 && record.rearGateClose == 0" color="red">正在关闭</a-tag>
-                  <a-tag v-else-if="column.dataIndex === 'rearGateOpen' && record.rearGateOpen == 0 && record.rearGateClose == 1" color="default">关闭</a-tag>
-                  <a-tag v-else-if="column.dataIndex === 'rearGateOpen' && record.rearGateOpen == 1 && record.rearGateClose == 0" color="default">打开</a-tag>
+                  <a-tag v-if="column.dataIndex === 'rearGateOpen' && record.rearGateOpen == 0 && record.rearGateClose == 0" color="red"
+                    >正在关闭</a-tag
+                  >
+                  <a-tag v-else-if="column.dataIndex === 'rearGateOpen' && record.rearGateOpen == 0 && record.rearGateClose == 1" color="default"
+                    >关闭</a-tag
+                  >
+                  <a-tag v-else-if="column.dataIndex === 'rearGateOpen' && record.rearGateOpen == 1 && record.rearGateClose == 0" color="default"
+                    >打开</a-tag
+                  >
                 </template>
-          
+
                 <a-tag v-if="column.dataIndex === 'warnFlag'" :color="record.warnFlag == 0 ? 'green' : 'red'">{{
                   record.warnFlag == 0 ? '正常' : '报警'
                 }}</a-tag>
@@ -164,24 +175,22 @@
       </div>
     </div>
   </div>
-  
 </template>
 <script lang="ts" setup>
-import { TableAction } from '/@/components/Table';
-import { onMounted, onUnmounted, ref, reactive } from 'vue'
-import {  Decoration7 as DvDecoration7, ScrollBoard  as DvScrollBoard,  BorderBox7 as DvBorderBox7 } from '@kjgl77/datav-vue3'
-import { workerFaceDeviceList } from "../home.data";
-import BarAndLineCustom from '/@/components/chart/BarAndLineCustom.vue';
-import { list, deviceMonitor } from '../home.api'
-import echarts from '/@/utils/lib/echarts'
-import MonitorTable from '/@/views/vent/monitorManager/comment/MonitorTable.vue';
+  import { TableAction } from '/@/components/Table';
+  import { onMounted, onUnmounted, ref, reactive } from 'vue';
+  import { Decoration7 as DvDecoration7, ScrollBoard as DvScrollBoard, BorderBox7 as DvBorderBox7 } from '@kjgl77/datav-vue3';
+  import { workerFaceDeviceList } from '../home.data';
+  // import BarAndLineCustom from '/@/components/chart/BarAndLineCustom.vue';
+  import { list, deviceMonitor } from '../home.api';
+  import echarts from '/@/utils/lib/echarts';
+  import MonitorTable from '/@/views/vent/monitorManager/comment/MonitorTable.vue';
 
-const currentTitleValue = ref('2') // 监测工作面id
+  const currentTitleValue = ref('2'); // 监测工作面id
 
-const monitorData = ref([]) // 存放监测数据
+  const monitorData = ref([]); // 存放监测数据
 
-const echartsOption = reactive(
-  {
+  const echartsOption = reactive({
     tooltip: { trigger: 'axis', axisPointer: { lineStyle: { color: '#fff' } } },
     legend: {
       top: '10',
@@ -189,7 +198,7 @@ const echartsOption = reactive(
       // itemWidth: 14, itemHeight: 5, itemGap: 10,
       data: ['进风', '回风'],
       right: '10px',
-      textStyle: { fontSize: 12, color: '#fff' }
+      textStyle: { fontSize: 12, color: '#fff' },
     },
     grid: { x: 50, y: 50, x2: 12, y2: 40 },
     xAxis: {
@@ -197,499 +206,521 @@ const echartsOption = reactive(
       boundaryGap: false,
       axisLine: { lineStyle: { color: '#57617B' } },
       axisLabel: { textStyle: { color: '#ffffffcc' } },
-      splitLine: { show: true, lineStyle: { color: '#57617B22', type: 'dashed', } },
-      data: []
+      splitLine: { show: true, lineStyle: { color: '#57617B22', type: 'dashed' } },
+      data: [],
     },
-    yAxis: [{
-      type: 'value',
-      name:'m³/min',
-      axisTick: {
-        show: false
+    yAxis: [
+      {
+        type: 'value',
+        name: 'm³/min',
+        axisTick: {
+          show: false,
+        },
+        axisLine: { lineStyle: { show: true, color: '#57617B' } },
+        axisLabel: { margin: 10, textStyle: { fontSize: 12, color: '#ffffffcc' } },
+        splitLine: { show: true, lineStyle: { color: '#57617B22', type: 'dashed' } },
       },
-      axisLine: { lineStyle: { show: true, color: '#57617B' } },
-      axisLabel: { margin: 10, textStyle: { fontSize: 12, color: '#ffffffcc' }},
-      splitLine: { show: true, lineStyle: { color: '#57617B22', type: 'dashed', } }
-    }],
-    series: [{
-      name: '进风', type: 'line', smooth: true, lineStyle: { normal: { width: 2 } },
-      yAxisIndex: 0,
-      areaStyle: {
-        normal: {
-          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-            offset: 0,
-            color: 'rgba(185,150,248,0.3)'
-          }, {
-            offset: 0.8,
-            color: 'rgba(185,150,248,0)'
-          }], false),
-          shadowColor: 'rgba(0, 0, 0, 0.1)',
-          shadowBlur: 10
-        }
+    ],
+    series: [
+      {
+        name: '进风',
+        type: 'line',
+        smooth: true,
+        lineStyle: { normal: { width: 2 } },
+        yAxisIndex: 0,
+        areaStyle: {
+          normal: {
+            color: new echarts.graphic.LinearGradient(
+              0,
+              0,
+              0,
+              1,
+              [
+                {
+                  offset: 0,
+                  color: 'rgba(185,150,248,0.3)',
+                },
+                {
+                  offset: 0.8,
+                  color: 'rgba(185,150,248,0)',
+                },
+              ],
+              false
+            ),
+            shadowColor: 'rgba(0, 0, 0, 0.1)',
+            shadowBlur: 10,
+          },
+        },
+        itemStyle: { normal: { color: '#B996F8' } },
+        data: [],
       },
-      itemStyle: { normal: { color: '#B996F8' } },
-      data: []
-    }, {
-      name: '回风', type: 'line', smooth: true, lineStyle: { normal: { width: 2 } },
-      yAxisIndex: 0,
-      areaStyle: {
-        normal: {
-          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-            offset: 0,
-            color: 'rgba(3, 194, 236, 0.3)'
-          }, {
-            offset: 0.8,
-            color: 'rgba(3, 194, 236, 0)'
-          }], false),
-          shadowColor: 'rgba(0, 0, 0, 0.1)',
-          shadowBlur: 10
-        }
+      {
+        name: '回风',
+        type: 'line',
+        smooth: true,
+        lineStyle: { normal: { width: 2 } },
+        yAxisIndex: 0,
+        areaStyle: {
+          normal: {
+            color: new echarts.graphic.LinearGradient(
+              0,
+              0,
+              0,
+              1,
+              [
+                {
+                  offset: 0,
+                  color: 'rgba(3, 194, 236, 0.3)',
+                },
+                {
+                  offset: 0.8,
+                  color: 'rgba(3, 194, 236, 0)',
+                },
+              ],
+              false
+            ),
+            shadowColor: 'rgba(0, 0, 0, 0.1)',
+            shadowBlur: 10,
+          },
+        },
+        itemStyle: { normal: { color: '#03C2EC' } },
+        data: [],
       },
-      itemStyle: { normal: { color: '#03C2EC' } },
-      data: []
-    }]
-  }
-)
-
-const warningConfig = reactive({
-  data: [
-    ['15211辅运顺槽', '测风装置', '异常信息'],
-    ['2-2煤辅运大巷4联巷对面胶运联巷', '气源压力', '异常信息'],
-    ['3-1煤回风延伸', '平均风速', '异常信息'],
-    ['2-4煤辅运大巷水仓', '风门', '异常信息'],
-    ['4-2煤南部集中回风二联巷', '测风装置', '异常信息'],
-    ['5-2煤回风大巷西侧', '测风装置', '异常信息'],
-    ['2-2煤辅运大巷三联巷', '风门', '异常信息'],
-    ['利民风窗', '风窗', '异常信息'],
-  ],
-  index: false,
-  columnWidth: [150],
-  oddRowBGC: '#003B5155',
-  evenRowBGC: '#0A273255',
-  align: ['center', 'center', 'center'],
-})
-// 监测设备类型集合
-const deviceTypes = ref([
-  {
-    text: '风门',
-    type: 'gate_normal',
-    columnsType: 'gate_monitor'
-  },
-  {
-    text: '风窗',
-    type: 'window_normal',
-    columnsType: 'window_monitor'
-  },
-  {
-    text: '测风装置',
-    type: 'windrect_rect',
-    columnsType: 'windrect_monitor'
-  },
-])
-const deviceActive = ref('') //当前监测的设备
-const deviceColumnsType = ref('') //存放当前监测的Columns的key值
-const deviceMonitorData = ref([]) //存放监测的数据集合
-// const deviceType = 
+    ],
+  });
 
+  const warningConfig = reactive({
+    data: [
+      ['15211辅运顺槽', '测风装置', '异常信息'],
+      ['2-2煤辅运大巷4联巷对面胶运联巷', '气源压力', '异常信息'],
+      ['3-1煤回风延伸', '平均风速', '异常信息'],
+      ['2-4煤辅运大巷水仓', '风门', '异常信息'],
+      ['4-2煤南部集中回风二联巷', '测风装置', '异常信息'],
+      ['5-2煤回风大巷西侧', '测风装置', '异常信息'],
+      ['2-2煤辅运大巷三联巷', '风门', '异常信息'],
+      ['利民风窗', '风窗', '异常信息'],
+    ],
+    index: false,
+    columnWidth: [150],
+    oddRowBGC: '#003B5155',
+    evenRowBGC: '#0A273255',
+    align: ['center', 'center', 'center'],
+  });
+  // 监测设备类型集合
+  const deviceTypes = ref([
+    {
+      text: '风门',
+      type: 'gate_normal',
+      columnsType: 'gate_monitor',
+    },
+    {
+      text: '风窗',
+      type: 'window_normal',
+      columnsType: 'window_monitor',
+    },
+    {
+      text: '测风装置',
+      type: 'windrect_rect',
+      columnsType: 'windrect_monitor',
+    },
+  ]);
+  const deviceActive = ref(''); //当前监测的设备
+  const deviceColumnsType = ref(''); //存放当前监测的Columns的key值
+  const deviceMonitorData = ref([]); //存放监测的数据集合
+  // const deviceType =
 
-// 标题选择
-function handleTitleChange() {
-  //
-}
-function showDeviceMonitor(deviceType) {
-  if(deviceActive.value === deviceType.type){
-    deviceActive.value = ''
-  }else {
-    
-    deviceColumnsType.value = deviceType.columnsType
-    deviceActive.value = deviceType.type
+  // 标题选择
+  function handleTitleChange() {
+    //
   }
-}
-let timer: null | NodeJS.Timeout | undefined = null;
-function getMonitor() {
-  if (timer == null) {
-    timer = setTimeout(async () => {
-      // 首页监测
-      const result = await list({})
-      if (result) {
-        const list = result['sys_surface']
-        const currentObj = list.find((item) => {
-          return item.deviceID == currentTitleValue.value
-        })
-        if(currentObj){
-          monitorData.value = currentObj['history']
-        }
-        
-      }
-      // 设备监测
-      const deviceMonitorList = await deviceMonitor({ devicetype: 'sys', pagetype: 'normal', systemID: '2'})
-      deviceMonitorList.forEach(item => {
-        if(item['msgTxt']['type'] === deviceActive.value){
-          deviceMonitorData.value = item['msgTxt']['datalist']
+  function showDeviceMonitor(deviceType) {
+    if (deviceActive.value === deviceType.type) {
+      deviceActive.value = '';
+    } else {
+      deviceColumnsType.value = deviceType.columnsType;
+      deviceActive.value = deviceType.type;
+    }
+  }
+  let timer: null | NodeJS.Timeout | undefined = null;
+  function getMonitor() {
+    if (timer == null) {
+      timer = setTimeout(async () => {
+        // 首页监测
+        const result = await list({});
+        if (result) {
+          const list = result['sys_surface'];
+          const currentObj = list.find((item) => {
+            return item.deviceID == currentTitleValue.value;
+          });
+          if (currentObj) {
+            monitorData.value = currentObj['history'];
+          }
         }
-      })
+        // 设备监测
+        const deviceMonitorList = await deviceMonitor({ devicetype: 'sys', pagetype: 'normal', systemID: '2' });
+        deviceMonitorList.forEach((item) => {
+          if (item['msgTxt']['type'] === deviceActive.value) {
+            deviceMonitorData.value = item['msgTxt']['datalist'];
+          }
+        });
 
-      if (timer) {
-        timer = null
-      }
-      getMonitor()
-    }, 1000)
-    
+        if (timer) {
+          timer = null;
+        }
+        getMonitor();
+      }, 1000);
+    }
   }
-}
-
-function goDetail() {
 
-}
+  function goDetail() {}
 
-onMounted(() => {
-  getMonitor()
-})
-
-onUnmounted(() => {
-  if(timer)
-  timer = undefined
-})
+  onMounted(() => {
+    getMonitor();
+  });
 
+  onUnmounted(() => {
+    if (timer) timer = undefined;
+  });
 </script>
 
 <style lang="less" scoped>
-@ventSpace: zxm;
-.center-container{
-  width: 100%;
-  height: calc(100% - 100px);
-  display: flex;
-  justify-content: space-between;
-  position: absolute;
-  top: 90px;
-  .lr-box {
-    height: 100%;
-    width: 347px;
-    color: #fff;
+  @ventSpace: zxm;
+  .center-container{
+    width: 100%;
+    height: calc(100% - 100px);
     display: flex;
-    flex-direction: column;
-    pointer-events: auto;
-    
-    .container-title {
-      width: 398px;
-      height: 34px;
-      position: relative;
-      top: -30px;
-      background: url('/@/assets/images/vent/new-home/container-title-bg.png') no-repeat;
-      background-size: contain;
-      padding: 0 0 0 180px;
-      font-size: 20px;
+    justify-content: space-between;
+    position: absolute;
+    top: 90px;
+    .lr-box {
+      height: 100%;
+      width: 347px;
+      color: #fff;
+      display: flex;
+      flex-direction: column;
       pointer-events: auto;
-      position: relative;
 
-      .title-select {
-        width: 198px;
-        position: absolute;
-        top: 0;
-        left: 180px;
+      .container-title {
+        width: 398px;
+        height: 34px;
+        position: relative;
+        top: -30px;
+        background: url('/@/assets/images/vent/new-home/container-title-bg.png') no-repeat;
+        background-size: contain;
+        padding: 0 0 0 180px;
+        font-size: 20px;
+        pointer-events: auto;
+        position: relative;
+
+        .title-select {
+          width: 198px;
+          position: absolute;
+          top: 0;
+          left: 180px;
+        }
       }
-    }
-    .item {
-      // flex: 1;
-      width: 100%;
-      display: flex;
-      justify-content: center;
-      flex-direction: column;
-      min-height: 200px;
-      margin-bottom: 20px;
-      align-items: center;
-      .item-container {
+      .item {
+        // flex: 1;
         width: 100%;
-        height: 100%;
-      }
-    }
-    .need-air-group{
-      width: calc(100% - 20px);
-      display: flex;
-      justify-content: space-between;
-      border: 1px solid #20dbfd22;
-      box-shadow: 0 0 5px #00d8ff22 inset;
-      padding: 10px;
-      margin: 10px 10px 0 10px;
-      .air-box{
         display: flex;
-        flex-direction: column;
         justify-content: center;
+        flex-direction: column;
+        min-height: 200px;
+        margin-bottom: 20px;
         align-items: center;
-        .title{
-          margin-left: 5px;
-        }
-        .air-num{
-          font-family: 'numberFont';
-          color: #20dbfd;
-          text-shadow: 0 0 25px #00d8ff;
-          font-size: 28px;
-          font-weight: bolder;
+        .item-container {
+          width: 100%;
+          height: 100%;
         }
       }
-      
-    }
-    .base-title {
-      width: calc(100% - 60px);
-      text-align: center;
-      color: #00d8ff;
-    }
-    .base-information-box{
-      display: flex;
-      margin-left: 5px;
-      .base-information {
+      .need-air-group{
+        width: calc(100% - 20px);
         display: flex;
-        flex-direction: row;
-        flex-wrap: wrap;
-        .device-num-box {
-          width: 170px;
-          height: 82px;
-          background: url('/@/assets/images/vent/new-home/num-bg.png') no-repeat;
-          background-size: contain;
-          margin: 5px 0px;
-          position: relative;
+        justify-content: space-between;
+        border: 1px solid #20dbfd22;
+        box-shadow: 0 0 5px #00d8ff22 inset;
+        padding: 10px;
+        margin: 10px 10px 0 10px;
+        .air-box{
+          display: flex;
+          flex-direction: column;
+          justify-content: center;
+          align-items: center;
+          .title{
+            margin-left: 5px;
+          }
+          .air-num{
+            font-family: 'numberFont';
+            color: #20dbfd;
+            text-shadow: 0 0 25px #00d8ff;
+            font-size: 28px;
+            font-weight: bolder;
+          }
+        }
 
-          .icon {
-            position: absolute;
-            width: 40px;
-            height: 40px;
-            background: url('/@/assets/images/vent/new-home/base-icon1.png') no-repeat;
+      }
+      .base-title {
+        width: calc(100% - 60px);
+        text-align: center;
+        color: #00d8ff;
+      }
+      .base-information-box{
+        display: flex;
+        margin-left: 5px;
+        .base-information {
+          display: flex;
+          flex-direction: row;
+          flex-wrap: wrap;
+          .device-num-box {
+            width: 170px;
+            height: 82px;
+            background: url('/@/assets/images/vent/new-home/num-bg.png') no-repeat;
             background-size: contain;
-            top: 22px;
-            left: 16px;
-          }
+            margin: 5px 0px;
+            position: relative;
 
-          .text-box {
-            height: 100%;
-            margin-left: 70px;
-            display: flex;
-            justify-content: center;
-            flex-direction: column;
-            margin-top: 2px;
+            .icon {
+              position: absolute;
+              width: 40px;
+              height: 40px;
+              background: url('/@/assets/images/vent/new-home/base-icon1.png') no-repeat;
+              background-size: contain;
+              top: 22px;
+              left: 16px;
+            }
 
-            .value {
-              font-family: 'douyuFont';
-              color: #28DCE4;
-              margin-top: 5px;
+            .text-box {
+              height: 100%;
+              margin-left: 70px;
+              display: flex;
+              justify-content: center;
+              flex-direction: column;
+              margin-top: 2px;
+
+              .value {
+                font-family: 'douyuFont';
+                color: #28DCE4;
+                margin-top: 5px;
+              }
             }
           }
         }
       }
-    }
-    
-    .warning-box{
-      .warning-top{
-        display: flex;
-        justify-content: space-between;
-        padding: 10px 2px 0px 2px;
-        .warning-icon{
-          width: 168px;
-          height: 105px;
+
+      .warning-box{
+        .warning-top{
           display: flex;
-          flex-direction: column;
-          background: url('/@/assets/images/vent/new-home/warning-bg.png') no-repeat;
-          background-size: contain;
-          .title{
-            font-size: 13px;
-            margin: 5px 0 5px 14px;
-            
-          }
-          .num-box{
+          justify-content: space-between;
+          padding: 10px 2px 0px 2px;
+          .warning-icon{
+            width: 168px;
+            height: 105px;
             display: flex;
-            margin-left: 20px;
-            .num{
-              font-family: 'numberFont';
-              font-size: 34px;
-              color: #20dbfd;
-              text-shadow: 0 0 25px #00d8ff;
-              margin-right: 10px;
+            flex-direction: column;
+            background: url('/@/assets/images/vent/new-home/warning-bg.png') no-repeat;
+            background-size: contain;
+            .title{
+              font-size: 13px;
+              margin: 5px 0 5px 14px;
+
             }
-            .rate-box{
-              font-size: 12px;
-              .day-rate{
-                color: #FE3E12;
-              }
-              .week-rate{
-                color: #FADB3E;
+            .num-box{
+              display: flex;
+              margin-left: 20px;
+              .num{
+                font-family: 'numberFont';
+                font-size: 34px;
+                color: #20dbfd;
+                text-shadow: 0 0 25px #00d8ff;
+                margin-right: 10px;
               }
-              .moth-rate{
-                color: #12FE81;
+              .rate-box{
+                font-size: 12px;
+                .day-rate{
+                  color: #FE3E12;
+                }
+                .week-rate{
+                  color: #FADB3E;
+                }
+                .moth-rate{
+                  color: #12FE81;
+                }
               }
             }
           }
+
         }
-        
       }
-    }
-    .device-monitor-box{
-      margin-top: 20px;
-      position: reactive;
-      .device-btn-group{
-        display: flex;
-        flex-wrap: wrap;
-        margin-top: 10px;
-        .device-active{
-          &::before{
-            border-color: #0efcff;
-            box-shadow: 1px 1px 3px 1px #0efcff inset;
+      .device-monitor-box{
+        margin-top: 20px;
+        position: reactive;
+        .device-btn-group{
+          display: flex;
+          flex-wrap: wrap;
+          margin-top: 10px;
+          .device-active{
+            &::before{
+              border-color: #0efcff;
+              box-shadow: 1px 1px 3px 1px #0efcff inset;
+            }
+          }
+          .device-btn{
+            width: 100px;
+            height: 40px;
+            position: relative;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            font-size: 14px;
+            color: #0efcff;
+            cursor: pointer;
+            margin: 0 6px;
+            &::before{
+              content: '';
+              position: absolute;
+              top: 0;
+              right: 0;
+              bottom: 0;
+              left: 0;
+              border: 1px solid #6176AF;
+              transform: skewX(-38deg);
+            }
           }
         }
-        .device-btn{
-          width: 100px;
-          height: 40px;
-          position: relative;
-          display: flex;
-          justify-content: center;
-          align-items: center;
-          font-size: 14px;
-          color: #0efcff;
-          cursor: pointer;
-          margin: 0 6px;
+        .device-table{
+          position: absolute;
+          width: 1550px;
+          height: 270px;
+          right: 0;
+          bottom: 0;
+          backdrop-filter: blur(30px);
+          border: 1px solid #8b8b8b22;
+          padding: 2px 0 10px 10px;
+          z-index: 9999;
+
           &::before{
+            position: absolute;
             content: '';
+            width: 10px;
+            height: 10px;
+            border-top: 1px solid #00d8ff;
+            border-left: 1px solid #00d8ff;
+            left: 0px;
+            top: -1px;
+          }
+          &::after{
             position: absolute;
-            top: 0;
-            right: 0;
-            bottom: 0;
-            left: 0;
-            border: 1px solid #6176AF;
-            transform: skewX(-38deg);
+            content: '';
+            width: 10px;
+            height: 10px;
+            border-bottom: 1px solid #00d8ff;
+            border-left: 1px solid #00d8ff;
+            left: 0px;
+            bottom: -1px;
           }
-        }
-      }
-      .device-table{
-        position: absolute;
-        width: 1550px;
-        height: 270px;
-        right: 0;
-        bottom: 0;
-        backdrop-filter: blur(30px);
-        border: 1px solid #8b8b8b22;
-        padding: 2px 0 10px 10px;
-        z-index: 9999;
-        
-        &::before{
-          position: absolute;
-          content: '';
-          width: 10px;
-          height: 10px;
-          border-top: 1px solid #00d8ff;
-          border-left: 1px solid #00d8ff;
-          left: 0px;
-          top: -1px;
-        }
-        &::after{
-          position: absolute;
-          content: '';
-          width: 10px;
-          height: 10px;
-          border-bottom: 1px solid #00d8ff;
-          border-left: 1px solid #00d8ff;
-          left: 0px;
-          bottom: -1px;
-        }
-        .device-tab{
-          width: 100%;
-          .tab{
-            margin: 5px;
-            cursor: pointer;
+          .device-tab{
+            width: 100%;
+            .tab{
+              margin: 5px;
+              cursor: pointer;
+            }
+            .tab-active{
+              color: #00d8ff;
+            }
+          }
+          .device-animation{
+            border-bottom: 1px solid #91e9fe44;
           }
-          .tab-active{
-            color: #00d8ff;
+          .monitor-table{
+            background-color: #67e6fd05;
           }
         }
-        .device-animation{
-          border-bottom: 1px solid #91e9fe44;
+        .device-table-open{
+          width: 1550;
+          animation-name: open;
+          /* 持续时间 */
+          animation-duration: 2s;
+          transition: all 2s linear 1s;
         }
-        .monitor-table{
-          background-color: #67e6fd05;
+        .device-table-close{
+          width: 0px;
+          animation-name: close;
+          /* 持续时间 */
+          animation-duration: 2s;
+          transition: all 2s linear 1s;
         }
+
       }
-      .device-table-open{
-        width: 1550;
-        animation-name: open;
-        /* 持续时间 */
-        animation-duration: 2s;
-        transition: all 2s linear 1s;
-      }
-      .device-table-close{
-        width: 0px;
-        animation-name: close;
-        /* 持续时间 */
-        animation-duration: 2s;
-        transition: all 2s linear 1s;
-      }
-      
     }
   }
-}
 
-:deep(.@{ventSpace}-table-thead){
-  background-color: transparent !important;
-  
-  th{
-    color: #00d8ff !important;
-    border-color: #91e9fe44 !important;
-    border: none !important;
-    border-top: 1px solid #91e9fe44 !important;
-    &:first-child{
-      border-left: 1px solid #91e9fe44 !important;
-    }
-    &:last-child{
-      border-right: 1px solid #91e9fe44 !important;
-    }
-    .@{ventSpace}-table-column-title{
+  :deep(.@{ventSpace}-table-thead){
+    background-color: transparent !important;
+
+    th{
       color: #00d8ff !important;
-    }
-    .@{ventSpace}-table-cell-scrollbar{
-      box-shadow: none !important;
-    }
-  }
-}
-:deep(.@{ventSpace}-table-tbody){
-  tr{
-    td{
-      background-color: transparent !important;
-      border-bottom: 1px solid #91e9fe33 !important;
-      // border-top: none !important;
-      // border-left: none !important;
+      border-color: #91e9fe44 !important;
+      border: none !important;
+      border-top: 1px solid #91e9fe44 !important;
       &:first-child{
         border-left: 1px solid #91e9fe44 !important;
       }
       &:last-child{
         border-right: 1px solid #91e9fe44 !important;
       }
+      .@{ventSpace}-table-column-title{
+        color: #00d8ff !important;
+      }
+      .@{ventSpace}-table-cell-scrollbar{
+        box-shadow: none !important;
+      }
     }
-    &:last-child{
+  }
+  :deep(.@{ventSpace}-table-tbody){
+    tr{
       td{
-        border-bottom: 1px solid #91e9fe44 !important;
+        background-color: transparent !important;
+        border-bottom: 1px solid #91e9fe33 !important;
+        // border-top: none !important;
+        // border-left: none !important;
+        &:first-child{
+          border-left: 1px solid #91e9fe44 !important;
+        }
+        &:last-child{
+          border-right: 1px solid #91e9fe44 !important;
+        }
+      }
+      &:last-child{
+        td{
+          border-bottom: 1px solid #91e9fe44 !important;
+        }
       }
     }
+
   }
-  
-}
 
-@keyframes open {
-    /* 开始状态 */
-    0% {
-        opacity: 0;
-        width: 0px;
-    }
-    /* 结束状态 */
-    100% {
-        opacity: 1;
-        width: 1550px;
-    }
-}
-@keyframes close {
-    /* 开始状态 */
-    0% {
-        opacity: 1;
-        width: 1550px;
-    }
-    /* 结束状态 */
-    100% {
-        opacity: 0;
-        width: 0px;
-    }
-}
+  @keyframes open {
+      /* 开始状态 */
+      0% {
+          opacity: 0;
+          width: 0px;
+      }
+      /* 结束状态 */
+      100% {
+          opacity: 1;
+          width: 1550px;
+      }
+  }
+  @keyframes close {
+      /* 开始状态 */
+      0% {
+          opacity: 1;
+          width: 1550px;
+      }
+      /* 结束状态 */
+      100% {
+          opacity: 0;
+          width: 0px;
+      }
+  }
 </style>

src/views/vent/deviceManager/comment/DeviceModal.vue

@@ -106,4 +106,11 @@
     cameraDeleteById({ id: id }, reload);
   };
 </script>
-<style scoped lang="less"></style>
+<style scoped lang="less">
+  ::v-deep .suffix {
+    height: 32px;
+    line-height: 32px;
+    margin-left: 5px;
+    color: #fff;
+  }
+</style>

src/views/vent/deviceManager/comment/normalBtnTable.vue

@@ -0,0 +1,354 @@
+<template>
+  <div>
+    <BasicTable @register="registerTable">
+      <template #tableTitle>
+        <a-button preIcon="ant-design:plus-outlined" type="primary" @click="handleAdd">新增</a-button>
+        <!-- <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+        <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <template #overlay>
+            <a-menu>
+              <a-menu-item key="1" @click="batchHandleDelete">
+                <Icon icon="ant-design:delete-outlined" />
+                删除
+              </a-menu-item>
+            </a-menu>
+          </template>
+          <a-button
+            >批量操作
+            <Icon style="fontsize: 12px" icon="ant-design:down-outlined" />
+          </a-button>
+        </a-dropdown> -->
+      </template>
+      <template #action="{ record }">
+        <TableAction :actions="getActions(record)" :dropDownActions="getDropDownAction(record)" />
+      </template>
+      <template #bodyCell="{ column, record }">
+        <slot name="filterCell" v-bind="{ column, record }"></slot>
+      </template>
+    </BasicTable>
+    <DeviceModal @register="registerModal" @saveOrUpdate="saveOrUpdateHandler" :showTab="showTab" :deviceType="deviceType" />
+  </div>
+</template>
+
+<script lang="ts" name="system-user" setup>
+  //ts语法
+  import { ref, provide, reactive, toRaw, defineExpose } from 'vue';
+  import { BasicTable, TableAction } from '/@/components/Table';
+  import { useModal } from '/@/components/Modal';
+  import DeviceModal from './DeviceModal.vue';
+  // import { getToken } from '/@/utils/auth';
+  // import { useGlobSetting } from '/@/hooks/setting';
+  import { getTableHeaderColumns } from '/@/hooks/web/useWebColumns';
+  import { useListPage } from '/@/hooks/system/useListPage';
+
+  const props = defineProps({
+    columnsType: {
+      type: String,
+      // required: true,
+    },
+    columns: {
+      type: Array,
+      // required: true,
+      default: () => [],
+    },
+    searchFormSchema: {
+      type: Array,
+      required: true,
+      default: () => [],
+    },
+    formSchema: {
+      type: Array,
+      required: true,
+    },
+    list: {
+      type: Function,
+      required: true,
+    },
+    getImportUrl: {
+      type: String,
+      required: true,
+    },
+    getExportUrl: {
+      type: String,
+      required: true,
+    },
+    deleteById: {
+      type: Function,
+      required: true,
+    },
+    batchDelete: {
+      type: Function,
+      // required: true,
+    },
+    saveOrUpdate: {
+      type: Function,
+      required: true,
+    },
+    pointList: {
+      type: Function,
+      // required: true,
+    },
+    showTab: {
+      type: Boolean,
+      default: false,
+    },
+    designScope: {
+      type: String,
+    },
+    title: {
+      type: String,
+    },
+    deviceType: {
+      type: String,
+    },
+  });
+
+  const isUpdate = ref(false);
+  //lxh
+  let dictId = ref(null);
+  const record = reactive({});
+
+  provide('formSchema', props.formSchema);
+  provide('isUpdate', isUpdate);
+  provide('formData', record);
+  provide('deviceType', props.deviceType);
+  // const glob = useGlobSetting();
+  const [registerModal, { openModal, closeModal }] = useModal();
+
+  const columnList = getTableHeaderColumns(props.columnsType);
+  console.log('aaa', columnList);
+
+  // 列表页面公共参数、方法
+  const { prefixCls, tableContext, onExportXls, onImportXls, doRequest } = useListPage({
+    designScope: props.designScope,
+    tableProps: {
+      title: props.title, //table标题
+      api: props.list, //api请求
+      columns: props.columns.length > 0 ? (props.columns as any[]) : columnList, //列信息
+      // size: 'small',
+      // bordered: false,
+      formConfig: {
+        //表单配置
+        // labelWidth: 100,
+        labelAlign: 'left',
+        labelCol: {
+          xs: 24,
+          sm: 24,
+          md: 24,
+          lg: 9,
+          xl: 7,
+          xxl: 5,
+        },
+        schemas: props.searchFormSchema as any[],
+        showActionButtonGroup: false,
+      },
+      striped: true, //斑马纹
+      showIndexColumn: false, //是否显示序号列
+      actionColumn: {
+        //操作列配置
+        width: 180,
+      },
+      beforeFetch: (params) => {
+        return Object.assign({ column: 'createTime', order: 'desc' }, params);
+      },
+    },
+    exportConfig: {
+      name: props.title,
+      url: props.getExportUrl,
+    },
+    importConfig: {
+      url: props.getImportUrl,
+    },
+  });
+
+  //注册table数据
+  const [registerTable, { reload }] = tableContext;
+
+  const saveOrUpdateHandler = async (params) => {
+    Object.assign(params, { dictId: dictId.value });
+    console.log(params, 'params111');
+    try {
+      await props.saveOrUpdate(params, isUpdate.value);
+      !props.showTab ? closeModal() : '';
+      await doRequest(props.list, { confirm: false });
+    } catch (error) {
+      message.error('保存失败，请联系管理员');
+    }
+  };
+
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    dictId.value = null;
+    for (let key in record) {
+      delete record[key];
+    }
+    isUpdate.value = false;
+    openModal(true);
+  }
+  /**
+   * 新增下级
+   */
+  function handleAdds(data) {
+    dictId.value = data.dictId;
+    for (let key in record) {
+      delete record[key];
+    }
+    isUpdate.value = false;
+    openModal(true);
+  }
+  /**
+   * 编辑事件
+   */
+  function handleEdit(data) {
+    isUpdate.value = true;
+    Object.assign(record, toRaw(data));
+    openModal(true, {
+      record,
+    });
+  }
+
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await props.deleteById({ id: record }, reload);
+  }
+
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    doRequest(() => props.batchDelete({ ids: selectedRowKeys.value }));
+  }
+  /**
+   * 查看
+   */
+  // function handleDetail(record) {
+  //   iframeUrl.value = `${glob.uploadUrl}/sys/annountCement/show/${record.id}?token=${getToken()}`;
+  //   openDetail(true);
+  // }
+  /**
+   * 操作列定义
+   * @param record
+   */
+  function getActions(record) {
+    return [
+      {
+        label: '编辑',
+        onClick: handleEdit.bind(null, record),
+      },
+      {
+        label: '新增下级',
+        onClick: handleAdds.bind(null, record),
+      },
+      {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        },
+      },
+      // {
+      //   label: '查看',
+      //   onClick: handleDetail.bind(null, record),
+      // },
+    ];
+  }
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record) {
+    return [
+      // {
+      //   label: '删除',
+      //   popConfirm: {
+      //     title: '是否确认删除',
+      //     confirm: handleDelete.bind(null, record),
+      //   },
+      // },
+      // {
+      //   label: '查看',
+      //   onClick: handleDetail.bind(null, record),
+      // },
+    ];
+  }
+  defineExpose({
+    doRequest,
+  });
+</script>
+
+<style scoped lang="less">
+  @ventSpace: zxm;
+
+  @vent-table-no-hover: #00bfff10;
+  // :deep(.ant-table-header){
+  //   background-color:transparent;
+  //   height: 0;
+  // }
+  // :deep(.jeecg-basic-table .ant-table-wrapper){
+  //   background-color: #ffffff00;
+  // }
+  // :deep(.ant-table-body) {
+  //   height: auto !important;
+  // }
+  // :deep(.ant-table){
+  //   background-color: #ffffff00 !important;
+  // }
+  // :deep(.ant-table-thead > tr > th){
+  //   background-color:transparent
+  // }
+  // :deep(.ant-table-body > tr > th){
+  //   background-color:transparent
+  // }
+  // :deep(.ant-table-body > tr > td){
+  //   border: none;
+  // }
+  // :deep(.ant-table-fixed-header > .ant-table-content > .ant-table-scroll > .ant-table-body){
+  //   background-color:transparent
+  // }
+  // :deep(.jeecg-basic-table-row__striped td){
+  //   background-color: transparent;
+  // }
+  :deep(.@{ventSpace}-table-cell-row-hover) {
+    background: #264d8833 !important;
+  }
+  :deep(.@{ventSpace}-table-row-selected) {
+    background: #268bc522 !important;
+  }
+  // :deep(.ant-table-tbody) {
+  //   tr.ant-table-row-selected {
+  //     td {
+  //       background: #007cc415 !important;
+  //     }
+  //   }
+  // }
+
+  :deep(.@{ventSpace}-table-tbody > tr > td) {
+    background-color: #0dc3ff05;
+  }
+  :deep(.jeecg-basic-table-row__striped) {
+    // background: #97efff11 !important;
+    td {
+      // background-color: #97efff11 !important;
+      background-color: @vent-table-no-hover !important;
+    }
+  }
+  // :deep(.ant-table-thead) {
+  //   // background: linear-gradient(#003f77 0%, #004a86aa 10%) !important; //#003f77, #0a134c
+  //   background-color: #3d9dd45d !important;
+  //   & > tr > th,
+  //   .ant-table-column-title {
+  //     // color: #70f9fc !important;
+  //     color: #fff !important;
+  //     border-color: #91e9fe !important;
+  //     border-left: none !important;
+  //     // border-right: none !important;
+  //     &:last-child {
+  //       border-right: none !important;
+  //     }
+  //   }
+  // }
+</style>

src/views/vent/deviceManager/equipManager/equip.api.ts

@@ -0,0 +1,45 @@
+import { defHttp } from '/@/utils/http/axios';
+
+enum Api {
+  list = '/sys/dict/DeviceKind/query',
+  save = '/sys/dict/DeviceKind/add',
+  edit = '/sys/dict/DeviceKind/edit',
+  //   selectDevice = '/jeecg-system/sys/dict/DeviceKind/query',
+  deleteById = '/sys/dict/DeviceKind/delete',
+  //   queryDevice = '/sys/dict/DeviceKind/query',
+}
+// /**
+//  * 列表接口
+//  * @param params
+//  */
+// export const queryDeviceList = (params) => defHttp.get({ url: Api.queryDevice, params });
+
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) => defHttp.get({ url: Api.list, params });
+
+/**
+ * 设备类型查询接口
+ * @param params
+ */
+// export const selectDevice = (params) => defHttp.get({ url: Api.selectDevice, params });
+
+/**
+ * 删除用户
+ */
+export const deleteById = (params, handleSuccess) => {
+  return defHttp.delete({ url: Api.deleteById, params: params.id }, { joinParamsToUrl: true }).then(() => {
+    handleSuccess();
+  });
+};
+
+/**
+ * 保存或者更新用户
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  const url = isUpdate ? Api.edit : Api.save;
+  return isUpdate ? defHttp.put({ url: url, params }) : defHttp.post({ url: url, params });
+};

src/views/vent/deviceManager/equipManager/equip.data.ts

@@ -0,0 +1,65 @@
+import { BasicColumn } from '/@/components/Table';
+import { FormSchema } from '/@/components/Table';
+// import { queryDeviceList } from './point.api';
+// import { defHttp } from '/@/utils/http/axios';
+
+export const columns: BasicColumn[] = [
+  {
+    title: '类型名称',
+    dataIndex: 'itemText',
+    align: 'left',
+    width: 120,
+  },
+
+  {
+    title: '值',
+    dataIndex: 'itemValue',
+    width: 100,
+  },
+  {
+    title: '描述',
+    dataIndex: 'description',
+    width: 100,
+  },
+  {
+    title: '排序',
+    dataIndex: 'sortOrder',
+    width: 100,
+  },
+];
+
+export const formSchema: FormSchema[] = [
+  {
+    label: '',
+    field: 'id',
+    component: 'Input',
+    show: false,
+  },
+  {
+    label: '',
+    field: 'dictId',
+    component: 'Input',
+    show: false,
+  },
+  {
+    label: '名称',
+    field: 'itemText',
+    component: 'Input',
+  },
+  {
+    label: '数据值',
+    field: 'itemValue',
+    component: 'Input',
+  },
+  {
+    label: '描述',
+    field: 'description',
+    component: 'Input',
+  },
+  {
+    label: '排序值',
+    field: 'sortOrder',
+    suffix: '值越小越靠前',
+    component: 'InputNumber',
+  },
+];

src/views/vent/deviceManager/equipManager/index.vue

@@ -0,0 +1,23 @@
+<template>
+  <div class="device-manager-box">
+    <NormalTable
+      :columns="columns"
+      :formSchema="formSchema"
+      :list="list"
+      :saveOrUpdate="saveOrUpdate"
+      :deleteById="deleteById"
+      designScope="equip-tabel"
+      title="设备管理列表"
+      :showTab="false"
+    />
+  </div>
+</template>
+
+<script lang="ts" name="system-user" setup>
+  //ts语法
+  import NormalTable from '../comment/normalBtnTable.vue';
+  import { columns, formSchema } from './equip.data';
+  import { list, saveOrUpdate, deleteById } from './equip.api';
+</script>
+
+<style scoped lang="less"></style>

src/views/vent/deviceManager/pointTabel/index.vue

@@ -13,8 +13,7 @@
       designScope="point-tabel"
       title="点表列表"
       :showTab="false"
-    >
-  </NormalTable>>
+    />>
   </div>
 </template>
 

src/views/vent/deviceManager/pointTabel/point.data.ts

@@ -145,7 +145,7 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    label: '点表分类',
+    label: '点表类型',
     field: 'devicetype',
     component: 'ApiSelect',
     componentProps: ({ formModel, formActionType }) => {
@@ -180,7 +180,16 @@ export const formSchema: FormSchema[] = [
       stringToNumber: true,
     },
   },
-
+  {
+    label: '指令默认写入值',
+    field: 'value',
+    component: 'Input',
+  },
+  {
+    label: 'plc地址',
+    field: 'plcaddr',
+    component: 'Input',
+  },
   {
     label: '数据类型',
     field: 'datakind',
@@ -191,6 +200,11 @@ export const formSchema: FormSchema[] = [
       stringToNumber: true,
     },
   },
+  {
+    label: '字节数',
+    field: 'len',
+    component: 'Input',
+  },
   {
     label: '最小值',
     field: 'fmin',
@@ -212,9 +226,19 @@ export const formSchema: FormSchema[] = [
     component: 'InputNumber',
   },
   {
-    label: '小数位数',
-    field: 'floatnum',
-    component: 'InputNumber',
+    label: '开始指令',
+    field: 'startcommand ',
+    component: 'InputTextArea',
+  },
+  {
+    label: '结束指令',
+    field: 'endcommand',
+    component: 'InputTextArea',
+  },
+  {
+    label: '控制指令设置模拟数据',
+    field: 'setTestdata',
+    component: 'InputTextArea',
   },
   {
     label: '是否保存',
@@ -226,28 +250,32 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    label: '开始指令',
-    field: 'startcommand ',
-    component: 'InputTextArea',
-  },
-  {
-    label: '结束指令',
-    field: 'endcommand',
-    component: 'InputTextArea',
+    label: '是否报警',
+    field: 'bwarning',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: 'booltype',
+      placeholder: '是否报警',
+    },
   },
   {
-    label: '指令默认写入值',
-    field: 'value',
-    component: 'Input',
+    label: '是否计算平均值',
+    field: 'avgflag',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: 'booltype',
+      placeholder: '是否计算平均值',
+    },
   },
   {
-    label: '控制指令设置模拟数据',
-    field: 'setTestdata',
-    component: 'InputTextArea',
+    label: '小数位数',
+    field: 'floatnum',
+    component: 'InputNumber',
   },
+
   {
     label: '备注',
-    field: 'remark',
+    field: 'strremark',
     component: 'InputTextArea',
   },
 ];

src/views/vent/deviceManager/tableColumns/tableColumns.data.ts

@@ -65,46 +65,69 @@ export const formSchema: FormSchema[] = [
   },
   {
     label: '设备类型',
-    field: 'monitorflag',
+    // field: 'monitorflag',lxh
+    field: 'devicetype',
     component: 'JDictSelectTag',
     componentProps: {
       dictCode: 'devicekind',
       placeholder: '请选择状态',
     },
   },
+
   {
-    label: '数据类型',
-    field: 'datatype',
-    component: 'Input',
+    label: '页面类型',
+    field: 'pagetype',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: 'pagetype',
+      placeholder: '请选择状态',
+    },
   },
   {
-    label: '图表名',
-    field: 'legend',
-    component: 'Input',
+    label: '描述',
+    field: 'des',
+    component: 'InputTextArea',
   },
   {
-    label: '样式',
-    field: 'linetype',
+    label: '监测字段Code',
+    field: 'monitorcode',
     component: 'Input',
-    // customRender: render.renderAvatar,
-  },
-  {
-    label: '显示范围',
-    field: 'maxshow',
-    component: 'Input',
-    // sorter: true,
-    // customRender: ({ text }) => {
-    //   return render.renderDict(text, 'sex');
-    // },
   },
   {
     label: '是否显示',
     field: 'showflag',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: 'booltype',
+      placeholder: '请选择状态',
+    },
+  },
+  {
+    label: '数据类型',
+    field: 'datatype',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: 'datatype',
+      placeholder: '请选择状态',
+    },
+  },
+  {
+    label: '输入类型',
+    field: 'type',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: 'type',
+      placeholder: '请选择状态',
+    },
+  },
+  {
+    label: '排序值',
+    field: 'sort',
     component: 'Input',
   },
   {
-    label: '编辑规则',
-    field: 'rules',
+    label: '宽度',
+    field: 'width',
     component: 'Input',
   },
   {
@@ -113,15 +136,31 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
   },
   {
-    label: '宽度',
-    field: 'width',
+    label: '提示文字',
+    field: 'placeholder',
     component: 'Input',
   },
+  {
+    label: '字典值',
+    field: 'dict',
+    component: 'Input',
+  },
+  {
+    label: '编辑规则',
+    field: 'rules',
+    component: 'InputTextArea',
+  },
   {
     label: '坐标轴位置显示',
     field: 'yaxispos',
     component: 'Input',
   },
+  {
+    label: '样式',
+    field: 'linetype',
+    component: 'Input',
+    // customRender: render.renderAvatar,
+  },
   {
     label: 'y轴名称',
     field: 'yname',
@@ -132,4 +171,25 @@ export const formSchema: FormSchema[] = [
     field: 'ymax',
     component: 'Input',
   },
+
+  {
+    label: '图表名',
+    field: 'legend',
+    component: 'Input',
+  },
+  {
+    label: '默认值',
+    field: 'defaultval',
+    component: 'Input',
+  },
+
+  {
+    label: '显示范围',
+    field: 'maxshow',
+    component: 'Input',
+    // sorter: true,
+    // customRender: ({ text }) => {
+    //   return render.renderDict(text, 'sex');
+    // },
+  },
 ];