设备管理状态。

git-svn-id: https://202.107.226.68:8443/svn/Services/ResistanceMonitor@45 a05970a1-87b9-9d4f-9ee5-fa77e2ec115b

2.Web/src/views/Equipment.vue

@@ -34,6 +34,7 @@
    >
     <el-radio-button :label="1">全部设备</el-radio-button>
     <el-radio-button :label="0">离线设备</el-radio-button>
+    <el-radio-button :label="2">异常设备</el-radio-button>
    </el-radio-group>
   </div>
   <!-- 表格 -->
@@ -87,6 +88,11 @@
       <span>{{ scope.row.version || '-' }}</span>
      </template>
     </el-table-column>
+    <el-table-column prop="is_alive" label="是否在线" width="95" align="center">
+     <template slot-scope="scope">
+      <span>{{ alive_map.get(scope.row.is_alive) || '-' }}</span>
+     </template>
+    </el-table-column>
     <el-table-column
      prop="updatetime"
      label="在线时间"
@@ -143,6 +149,16 @@
        <span>{{ scope.row.zl_1_no || '-' }}</span>
       </template>
      </el-table-column>
+     <el-table-column prop="p1" label="状态" align="center">
+      <template slot-scope="scope">
+       <span>{{ p_map.get(scope.row.p1) || '-' }}</span>
+      </template>
+     </el-table-column>
+     <el-table-column prop="d1" label="晶振" align="center">
+      <template slot-scope="scope">
+       <span>{{ d_map.get(scope.row.d1) || '-' }}</span>
+      </template>
+     </el-table-column>
     </el-table-column>
     <el-table-column label="2号测力片" align="center">
      <el-table-column prop="zl_2_loca" label="位置" align="center">
@@ -155,6 +171,16 @@
        <span>{{ scope.row.zl_2_no || '-' }}</span>
       </template>
      </el-table-column>
+     <el-table-column prop="p2" label="状态" align="center">
+      <template slot-scope="scope">
+       <span>{{ p_map.get(scope.row.p2) || '-' }}</span>
+      </template>
+     </el-table-column>
+     <el-table-column prop="d2" label="晶振" align="center">
+      <template slot-scope="scope">
+       <span>{{ d_map.get(scope.row.d2) || '-' }}</span>
+      </template>
+     </el-table-column>
     </el-table-column>
     <el-table-column label="3号测力片" align="center">
      <el-table-column prop="direct1" label="伸出位" align="center">
@@ -172,6 +198,16 @@
        <span>{{ scope.row.zl_3_no || '-' }}</span>
       </template>
      </el-table-column>
+     <el-table-column prop="p3" label="状态" align="center">
+      <template slot-scope="scope">
+       <span>{{ p_map.get(scope.row.p3) || '-' }}</span>
+      </template>
+     </el-table-column>
+     <el-table-column prop="d3" label="晶振" align="center">
+      <template slot-scope="scope">
+       <span>{{ d_map.get(scope.row.d3) || '-' }}</span>
+      </template>
+     </el-table-column>
     </el-table-column>
     <el-table-column v-if="$store.state.admin" fixed="right" width="190" label="操作" align="left">
      <template slot-scope="scope">
@@ -548,6 +584,20 @@ export default {
     [0, '未安装'],
     [1, '安装'],
    ]),
+   p_map: new Map([
+    [0, '不在线'],
+    [1, '在线'],
+    [2, '高频干扰'],
+    [3, '固定值异常'],
+   ]),
+   d_map: new Map([
+    [0, '正常'],
+    [1, '异常'],
+   ]),
+   alive_map: new Map([
+    [0, '离线'],
+    [1, '在线'],
+   ]),
    unbind_list: [],
    bind_equ: {
     mo: '',
@@ -619,6 +669,11 @@ export default {
      label: '转辙机类型',
      isExport: true,
     },
+    {
+     prop: 'zzjno',
+     label: '转辙机编号',
+     isExport: true,
+    },
     {
      prop: 'mp',
      label: '牵引点名称',
@@ -634,6 +689,11 @@ export default {
      label: '设备版本',
      isExport: true,
     },
+    {
+     prop: 'is_alive',
+     label: '是否在线',
+     isExport: true,
+    },
     {
      prop: 'updatetime',
      label: '在线时间',
@@ -679,6 +739,16 @@ export default {
      label: '1号测力片/编号',
      isExport: true,
     },
+    {
+     prop: 'p1',
+     label: '1号测力片/状态',
+     isExport: true,
+    },
+    {
+     prop: 'd1',
+     label: '1号测力片/晶振',
+     isExport: true,
+    },
     {
      prop: 'zl_2_loca',
      label: '2号测力片/位置',
@@ -689,6 +759,16 @@ export default {
      label: '2号测力片/编号',
      isExport: true,
     },
+    {
+     prop: 'p2',
+     label: '2号测力片/状态',
+     isExport: true,
+    },
+    {
+     prop: 'd2',
+     label: '2号测力片/晶振',
+     isExport: true,
+    },
     {
      prop: 'direct1',
      label: '3号测力片/伸出位',
@@ -704,6 +784,16 @@ export default {
      label: '3号测力片/编号',
      isExport: true,
     },
+    {
+     prop: 'p3',
+     label: '3号测力片/状态',
+     isExport: true,
+    },
+    {
+     prop: 'd3',
+     label: '3号测力片/晶振',
+     isExport: true,
+    },
    ],
    export_table: [], // 导出的数据
    btnSize: 'small',
@@ -809,7 +899,12 @@ export default {
   // 设备在离线变化
   equ_state_change(val) {
    if (val == 0) {
-    this.tableData = this.copy_tableData.filter(item => item.bOnline == 0)
+    // this.tableData = this.copy_tableData.filter(item => item.bOnline == 0)
+    this.tableData = this.copy_tableData.filter(item => item.is_alive == 0)
+   } else if (val == 2) {
+    this.tableData = this.copy_tableData.filter(item => {
+     return item.d1 == 1 || item.d2 == 1 || item.d3 == 1
+    })
    } else {
     this.tableData = _.cloneDeep(this.copy_tableData)
    }
@@ -913,6 +1008,13 @@ export default {
       item.install_1 = this.install_map.get(item.install_1) || '-'
       item.install_2 = this.install_map.get(item.install_2) || '-'
       item.install_3 = this.install_map.get(item.install_3) || '-'
+      item.p1 = this.p_map.get(item.p1) || '-'
+      item.p2 = this.p_map.get(item.p2) || '-'
+      item.p3 = this.p_map.get(item.p3) || '-'
+      item.d1 = this.d_map.get(item.d1) || '-'
+      item.d2 = this.d_map.get(item.d2) || '-'
+      item.d3 = this.d_map.get(item.d3) || '-'
+      item.is_alive = this.alive_map.get(item.is_alive) || '-'
       item.idx += 1
      })
      this.export_table = _.cloneDeep(copy_res)