1、设备管理页面设备种类字段改成重要程度字段；新增设备异常状态字段，若表格记录的设备状态不为正常时，则标红此表格记录 2、设备利用率、设备开动率、班次...

zhaowei

2024-09-13 65a5e8c7ec6d6eab78b76c5831eaf40c30e23c61

 src/views/mdc/base/EquipmentList.vue

@@ -6,19 +6,19 @@
      <a-form layout="inline" @keyup.enter.native="searchQuery">
        <a-row :gutter="24">

          <a-col :md="4" :sm="4">
          <a-col :md="6" :sm="6">
            <a-form-item label="设备编号">
              <a-input placeholder="请输入设备编号" v-model="queryParam.equipmentId"></a-input>
            </a-form-item>
          </a-col>

          <a-col :md="4" :sm="4">
          <a-col :md="6" :sm="6">
            <a-form-item label="设备名称">
              <a-input placeholder="请输入设备名称" v-model="queryParam.equipmentName"></a-input>
            </a-form-item>
          </a-col>

          <a-col :md="4" :sm="4">
          <a-col :md="6" :sm="6">
            <a-form-item label="车间名称">
              <!--<a-input placeholder="请输入车间名称" v-model="queryParam.productionName"></a-input>-->
              <a-tree-select v-model="queryParam.productionName" :treeData="workshopTreeData" placeholder="请选择车间"
@@ -26,29 +26,45 @@
            </a-form-item>
          </a-col>

          <a-col :md="4" :sm="4">
            <a-form-item label="设备级别">
              <j-dict-select-tag placeholder="请选择设备级别" dictCode="device_level" v-model="queryParam.deviceLevel"
                                 allow-clear/>
            </a-form-item>
          </a-col>
          <template v-if="toggleSearchStatus">
            <a-col :md="6" :sm="6">
              <a-form-item label="设备级别">
                <j-dict-select-tag placeholder="请选择设备级别" dictCode="device_level" v-model="queryParam.deviceLevel"
                                   allow-clear/>
              </a-form-item>
            </a-col>
            <a-col :md="6" :sm="6">
              <a-form-item label="设备种类">
                <j-dict-select-tag placeholder="请选择设备种类" dictCode="device_category" v-model="queryParam.deviceCategory"
                                   allow-clear/>
              </a-form-item>
            </a-col>

          <a-col :md="4" :sm="4">
            <a-form-item label="设备种类">
              <j-dict-select-tag placeholder="请选择设备种类" dictCode="device_category" v-model="queryParam.deviceCategory"
                                 allow-clear/>
            </a-form-item>
          </a-col>
            <a-col :md="6" :sm="6">
              <a-form-item label="异常状态">
                <j-dict-select-tag placeholder="请选择设备异常状态" dictCode="device_abnormal_status"
                                   v-model="queryParam.deviceAbnormalStatus"
                                   allow-clear/>
              </a-form-item>
            </a-col>
          </template>

          <a-col :md="4" :sm="4">
          <a-col :md="6" :sm="6">
            <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
            <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
            <a
              @click="toggleSearchStatus=!toggleSearchStatus"
              style="margin-left: 8px"
            >
              {{ toggleSearchStatus ? '收起' : '展开' }}
              <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
            </a>
          </a-col>
        </a-row>
      </a-form>
    </div>

    <!-- 操作按钮区域 -->
    <!-- 操作按钮区域· -->
    <div class="table-operator" style="border-top: 5px">
      <a-button @click="handleAdd" type="primary" icon="plus">添加设备</a-button>
      <a-button type="primary" icon="download" @click="handleExportXls('设备信息')">导出</a-button>
@@ -86,6 +102,33 @@
        :loading="loading"
        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
        @change="handleTableChange">
        <!--<template slot="equipmentId" slot-scope="text,record">-->
          <!--<div :style="{color:record.deviceAbnormalStatus===1?null:'#f00'}">{{text}}</div>-->
        <!--</template>-->
        <!--<template slot="equipmentName" slot-scope="text,record">-->
          <!--<div :style="{color:record.deviceAbnormalStatus===1?null:'#f00'}">{{text}}</div>-->
        <!--</template>-->
        <!--<template slot="productionName" slot-scope="text,record">-->
          <!--<div :style="{color:record.deviceAbnormalStatus===1?null:'#f00'}">{{text}}</div>-->
        <!--</template>-->
        <!--<template slot="equipmentType" slot-scope="text,record">-->
          <!--<div :style="{color:record.deviceAbnormalStatus===1?null:'#f00'}">{{text}}</div>-->
        <!--</template>-->
        <!--<template slot="driveType" slot-scope="text,record">-->
          <!--<div :style="{color:record.deviceAbnormalStatus===1?null:'#f00'}">{{text}}</div>-->
        <!--</template>-->
        <!--<template slot="equipmentIp" slot-scope="text,record">-->
          <!--<div :style="{color:record.deviceAbnormalStatus===1?null:'#f00'}">{{text}}</div>-->
        <!--</template>-->
        <!--<template slot="devicePower" slot-scope="text,record">-->
          <!--<div :style="{color:record.deviceAbnormalStatus===1?null:'#f00'}">{{text}}</div>-->
        <!--</template>-->
        <!--<template slot="systemVersion" slot-scope="text,record">-->
          <!--<div :style="{color:record.deviceAbnormalStatus===1?null:'#f00'}">{{text}}</div>-->
        <!--</template>-->
        <template slot="deviceAbnormalStatus" slot-scope="text,record">
          <div :style="{color:text&&text!==1?'#f00':null}">{{record.deviceAbnormalStatus_dictText}}</div>
        </template>
        <span slot="action" slot-scope="text, record">
          <a @click="handleEdit(record)">编辑</a>

@@ -108,8 +151,6 @@
            </a-menu>
          </a-dropdown>
        </span>


      </a-table>
    </div>
    <!-- table区域-end -->
@@ -124,11 +165,13 @@
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  import { queryProductionTreeList } from '@/api/api'
  import { mapActions } from 'vuex'
  import Template1 from '../../jeecg/JVxeDemo/layout-demo/Template1'

  export default {
    name: 'EquipmentList',
    mixins: [JeecgListMixin],
    components: {
      Template1,
      UserModal
    },
    data() {
@@ -164,6 +207,7 @@
            align: 'center',
            dataIndex: 'equipmentId',
            width: 200
            // sorter: true
          },
          {
            title: '设备名称',
@@ -180,14 +224,16 @@
          {
            title: '设备类型',
            align: 'center',
            width: 200,
            width: 180,
            dataIndex: 'equipmentType'
          },

          {
            title: '驱动类型',
            align: 'center',
            width: 200,
            dataIndex: 'driveType'
            // sorter: true
          },
          {
            title: '机床IP',
@@ -198,21 +244,26 @@
          {
            title: '设备功率',
            align: 'center',
            width: 200,
            width: 150,
            dataIndex: 'devicePower'
          },
          {
            title: '部门',
            align: 'center',
            width: 200,
            dataIndex: 'orgCodeTxt'
          },

          // {
          //   title: '部门',
          //   align: "center",
          //   width: 200,
          //   dataIndex: 'orgCodeTxt'
          // },
          {
            title: '系统版本',
            align: 'center',
            width: 200,
            width: 150,
            dataIndex: 'systemVersion'
          },
          {
            title: '异常状态',
            align: 'center',
            width: 100,
            dataIndex: 'deviceAbnormalStatus'
          },
          {
            title: '操作',
@@ -222,7 +273,6 @@
            width: 150,
            fixed: 'right'
          }

        ],
        url: {
          list: '/mdc/mdcEquipment/list',
@@ -261,46 +311,53 @@
                  title: '设备编号',
                  align: 'center',
                  dataIndex: 'equipmentId',
                  width: 200
                  width: 200,
                  scopedSlots: { customRender: 'equipmentId' }
                  // sorter: true
                },
                {
                  title: '设备名称',
                  align: 'center',
                  width: 200,
                  dataIndex: 'equipmentName'
                  dataIndex: 'equipmentName',
                  scopedSlots: { customRender: 'equipmentName' }
                },
                {
                  title: '车间',
                  align: 'center',
                  width: 200,
                  dataIndex: 'productionName'
                  dataIndex: 'productionName',
                  scopedSlots: { customRender: 'productionName' }
                },
                {
                  title: '设备类型',
                  align: 'center',
                  width: 200,
                  dataIndex: 'equipmentType'
                  width: 180,
                  dataIndex: 'equipmentType',
                  scopedSlots: { customRender: 'equipmentType' }
                },

                {
                  title: '驱动类型',
                  align: 'center',
                  width: 200,
                  dataIndex: 'driveType'
                  dataIndex: 'driveType',
                  scopedSlots: { customRender: 'driveType' }
                  // sorter: true
                },
                {
                  title: '机床IP',
                  align: 'center',
                  width: 200,
                  dataIndex: 'equipmentIp'
                  dataIndex: 'equipmentIp',
                  scopedSlots: { customRender: 'equipmentIp' }
                },
                {
                  title: '设备功率',
                  align: 'center',
                  width: 200,
                  dataIndex: 'devicePower'
                  width: 150,
                  dataIndex: 'devicePower',
                  scopedSlots: { customRender: 'devicePower' }
                },
                // {
                //   title: '部门',
@@ -308,12 +365,19 @@
                //   width: 200,
                //   dataIndex: 'orgCodeTxt'
                // },

                {
                  title: '系统版本',
                  align: 'center',
                  width: 200,
                  dataIndex: 'systemVersion'
                  width: 150,
                  dataIndex: 'systemVersion',
                  scopedSlots: { customRender: 'systemVersion' }
                },
                {
                  title: '异常状态',
                  align: 'center',
                  width: 100,
                  dataIndex: 'deviceAbnormalStatus',
                  scopedSlots: { customRender: 'deviceAbnormalStatus' }
                },
                {
                  title: '操作',