1、设备信息弹窗修改字段 2、调整设备开动率等报表样式

zhaowei

2024-11-27 bebed734a1651f29042678af2223f046cf02b4e5

1、设备信息弹窗修改字段
2、调整设备开动率等报表样式

 src/views/mdc/base/modules/DeviceBaseInfo/EquipmentDetailModal.vue

@@ -1,7 +1,6 @@
<template>
  <div ref="wrap">
    <a-modal
      :title="title"
      width="70%"
      :visible="visible"
      :getContainer="() => this.$refs.wrap"
@@ -74,20 +73,21 @@
              </div>
            </td>
          </tr>

          <tr>
            <td colspan="5">
              <a-descriptions
                title="基础信息"
                :column="4"
              >
                <a-descriptions-item label="设备编号">{{resultData.equipmentID}}</a-descriptions-item>
                <a-descriptions-item label="设备编号">{{resultData.equipmentId}}</a-descriptions-item>
                <a-descriptions-item label="设备名称">{{resultData.equipmentName}}</a-descriptions-item>
                <a-descriptions-item label="IP地址">{{resultData.equipmentIP}}</a-descriptions-item>
                <a-descriptions-item label="IP地址">{{resultData.equipmentIp}}</a-descriptions-item>
                <a-descriptions-item label="端口号">{{resultData.dataPort}}</a-descriptions-item>
                <a-descriptions-item label="系统版本号">{{resultData.systemVersion}}</a-descriptions-item>
                <a-descriptions-item label="驱动类型">{{resultData.driveType}}</a-descriptions-item>
                <a-descriptions-item label="设备型号">{{resultData.equipmentModel}}</a-descriptions-item>
                <a-descriptions-item label="设备类型">{{resultData.deviceType}}</a-descriptions-item>
                <a-descriptions-item label="设备类型">{{resultData.driveType}}</a-descriptions-item>
                <a-descriptions-item label="设备功率">{{resultData.devicePower}}</a-descriptions-item>
                <a-descriptions-item label="有效轴数">{{resultData.validAxis}}</a-descriptions-item>
                <a-descriptions-item label="最大轴数">{{resultData.maxAxis}}</a-descriptions-item>
@@ -95,147 +95,20 @@

              </a-descriptions>

              <!-- <a-descriptions
                title="运行数据"
                v-if="driverType != 'LSV2' && driverType != 'ZUOLAN' "
                :column="4"
              >
                <a-descriptions-item label="主轴倍率(%)">{{resultData.spindlebeilv}}</a-descriptions-item>
                <a-descriptions-item label="进给倍率(%)">{{resultData.feedbeilv}}</a-descriptions-item>
                <a-descriptions-item label="主轴负荷(%)">{{resultData.spindleload}}</a-descriptions-item>
                <a-descriptions-item label="主轴转速(rpm)">{{resultData.spindlespeed}}</a-descriptions-item>
                <a-descriptions-item label="进给速度(mm/min)">{{resultData.feedrate}}</a-descriptions-item>
              </a-descriptions>

              <a-descriptions
                title="运行数据 for lsv2"
                v-if="driverType == 'LSV2'"
                :column="4"
              >
                <a-descriptions-item label="主轴倍率(%)">{{resultData.spindlebeilv}}</a-descriptions-item>
                <a-descriptions-item label="设备正常运行时间">{{resultData.equipmentNormalTime}}</a-descriptions-item>
                <a-descriptions-item label="快速进给倍率(%)">{{resultData.rapidfeed}}</a-descriptions-item>
                <a-descriptions-item label="NC正常运行时间">{{resultData.nCNormalTime}}</a-descriptions-item>
                <a-descriptions-item label="进给倍率(%)">{{resultData.feedbeilv}}</a-descriptions-item>
                <a-descriptions-item label="设备运行时间">{{resultData.equipmentTime}}</a-descriptions-item>
                <a-descriptions-item label="当前刀具号">{{resultData.toolNum}}</a-descriptions-item>
              </a-descriptions> -->

              <!-- <a-descriptions
                title="程序信息"
                v-if="driverType != 'LSV2' && driverType != 'ZUOLAN' "
                :column="4"
              >
                <a-descriptions-item label="序列号">{{resultData.sequencenumber}}</a-descriptions-item>
                <a-descriptions-item
                  label="当前执行代码"
                  :span="2"
                >{{resultData.executingcode}}</a-descriptions-item>
                <a-descriptions-item label="工件名称">{{resultData.productName}}</a-descriptions-item>
              </a-descriptions> -->

              <!-- <a-descriptions
                title="程序信息  for lsv2"
                v-if="driverType == 'LSV2'"
                :column="4"
              >
                <a-descriptions-item label="当前程序">{{resultData.program}}</a-descriptions-item>
                <a-descriptions-item label="程序执行点">{{resultData.programPosition}}</a-descriptions-item>
                <a-descriptions-item label="操作模式">{{resultData.operationType}}</a-descriptions-item>
                <a-descriptions-item label="错误信息编号一">{{resultData.firstErrorNum}}</a-descriptions-item>
                <a-descriptions-item label="错误信息一">{{resultData.firstError}}</a-descriptions-item>
                <a-descriptions-item label="错误信息">{{resultData.errorinfo}}</a-descriptions-item>
                <a-descriptions-item label="错误信息编号二">{{resultData.secondErrorNum}}</a-descriptions-item>
                <a-descriptions-item label="错误信息二">{{resultData.secondError}}</a-descriptions-item>
              </a-descriptions> -->

              <!--<a-descriptions
                title="轴监控数据 fro SIEMENS840DSL"
                v-if="driverType == 'SIEMENS840DSL'"
                :column="4"
              >
                <a-descriptions-item label="X轴温度">{{resultData.temperatureX}}</a-descriptions-item>
                <a-descriptions-item label="Y轴温度">{{resultData.temperatureY}}</a-descriptions-item>
                <a-descriptions-item label="Z轴温度">{{resultData.temperatureZ}}</a-descriptions-item>
                <a-descriptions-item label="A轴温度">{{resultData.temperatureA}}</a-descriptions-item>
                <a-descriptions-item label="B轴温度">{{resultData.temperatureB}}</a-descriptions-item>
                <a-descriptions-item label="X轴电流">{{resultData.equipmentCurrentX}}</a-descriptions-item>
                <a-descriptions-item label="Y轴电流">{{resultData.equipmentCurrentY}}</a-descriptions-item>
                <a-descriptions-item label="Z轴电流">{{resultData.equipmentCurrentZ}}</a-descriptions-item>
                <a-descriptions-item label="A轴电流">{{resultData.equipmentCurrentA}}</a-descriptions-item>
                <a-descriptions-item label="B轴电流">{{resultData.equipmentCurrentB}}</a-descriptions-item>
                <a-descriptions-item label="X轴随动误差">{{resultData.equipmentLagErrorX}}</a-descriptions-item>
                <a-descriptions-item label="Y轴随动误差">{{resultData.equipmentLagErrorY}}</a-descriptions-item>
                <a-descriptions-item label="Z轴随动误差">{{resultData.equipmentLagErrorZ}}</a-descriptions-item>
                <a-descriptions-item label="A轴随动误差">{{resultData.equipmentLagErrorA}}</a-descriptions-item>
                <a-descriptions-item label="B轴随动误差">{{resultData.equipmentLagErrorB}}</a-descriptions-item>
              </a-descriptions>
-->
              <!-- <a-descriptions
                title="坐标信息 "
                v-if="driverType == 'FANUC'"
                :column="3"
              >
                <a-descriptions-item label="绝对坐标X">{{resultData.xabsolute}}</a-descriptions-item>
                <a-descriptions-item label="绝对坐标Y">{{resultData.yabsolute}}</a-descriptions-item>
                <a-descriptions-item label="绝对坐标Z">{{resultData.zabsolute}}</a-descriptions-item>
                <a-descriptions-item label="机床坐标X">{{resultData.xmachine}}</a-descriptions-item>
                <a-descriptions-item label="机床坐标Y">{{resultData.ymachine}}</a-descriptions-item>
                <a-descriptions-item label="机床坐标Z">{{resultData.zmachine}}</a-descriptions-item>
              </a-descriptions>

              <a-descriptions
                title="坐标信息 for lsv2"
                v-if="driverType == 'LSV2'"
                :column="4"
              >
                <a-descriptions-item label="X坐标">{{resultData.xmachine}}</a-descriptions-item>
                <a-descriptions-item label="Y坐标">{{resultData.ymachine}}</a-descriptions-item>
                <a-descriptions-item label="Z坐标">{{resultData.zmachine}}</a-descriptions-item>
                <a-descriptions-item label="A坐标">{{resultData.amachine}}</a-descriptions-item>
                <a-descriptions-item label="B坐标">{{resultData.bmachine}}</a-descriptions-item>
                <a-descriptions-item label="C坐标">{{resultData.cmachine}}</a-descriptions-item>
              </a-descriptions>

              <a-descriptions
                title="坐标信息 for lsv2"
                v-if="driverType == 'LSV2'"
                :column="4"
              >
                <a-descriptions-item label="X坐标">{{resultData.xmachine}}</a-descriptions-item>
                <a-descriptions-item label="Y坐标">{{resultData.ymachine}}</a-descriptions-item>
                <a-descriptions-item label="Z坐标">{{resultData.zmachine}}</a-descriptions-item>
                <a-descriptions-item label="A坐标">{{resultData.amachine}}</a-descriptions-item>
                <a-descriptions-item label="B坐标">{{resultData.bmachine}}</a-descriptions-item>
                <a-descriptions-item label="C坐标">{{resultData.cmachine}}</a-descriptions-item>
              </a-descriptions>

              <a-descriptions
                title="坐标信息"
                v-if="driverType == 'LSV2'"
                :column="4"
              >
                <a-descriptions-item label="X坐标">{{resultData.xmachine}}</a-descriptions-item>
                <a-descriptions-item label="Y坐标">{{resultData.ymachine}}</a-descriptions-item>
                <a-descriptions-item label="Z坐标">{{resultData.zmachine}}</a-descriptions-item>
                <a-descriptions-item label="A坐标">{{resultData.amachine}}</a-descriptions-item>
                <a-descriptions-item label="B坐标">{{resultData.bmachine}}</a-descriptions-item>
                <a-descriptions-item label="C坐标">{{resultData.cmachine}}</a-descriptions-item>
              </a-descriptions> -->
              <!---数据源调整  动态展示 运行数据---->

              <a-descriptions
                title="运行数据"
                v-show="mdcDriveTypeParamConfigList != null"
                v-if="driverType != 'PLC'"
                v-show="runData"
                v-if="resultData.driveType != 'PLC'"
                :column="4"
                class="operationData"
              >

                <a-descriptions-item
                  v-for="(item,id) in mdcDriveTypeParamConfigList  "
                  v-for="(item,id) in runData"
                  :key="item.id"
                  :label="item.chineseName"
                  :label="item.key"
                >
                  <a-tooltip @mouseenter="mouseEnterItem">
                    <template slot="title">
@@ -257,7 +130,8 @@
          :style="{ marginRight: '8px' }"
          @click="handleCancel"
          style="color: #1191b0;"
        >关闭</a-button>
        >关闭
        </a-button>
      </template>
    </a-modal>
  </div>
@@ -276,29 +150,27 @@
    props: {},
    data() {
      return {
        mdcDriveTypeParamConfigList: [],
        xyzAliasesList: [],
        title: '',
        runData: [],
        // xyzAliasesList: [],
        //主轴倍率
        spindlebeilv: 1,
        spindlebeilv: 0,
        //进给倍率
        feedbeilv: 1,
        feedbeilv: 0,
        // 主轴负荷
        spindleload: 1,
        spindleload: 0,
        //快速进给倍率
        rapidfeed: 1,
        rapidfeed: 0,
        visible: false,
        resultData: {},
        driverType: '',
        deviceTypeDict: '',
        url: {
          mdcEquipmentDetailedInfo: '/mdc/mdcEquipment/mdcEquipmentDetailedInfo'
        },
        modalTimer:null,
        ee:" "
        modalTimer: null
      }
    },
    mounted() {
    beforeDestroy() {
      clearInterval(this.modalTimer)
      this.modalTimer = null
    },
    methods: {
      drawLine() {
@@ -308,12 +180,12 @@
          let mdcEquiMoniGauge1 = this.$echarts.init(document.getElementById('mdcEquiMoniGauge1'), 'macarons')
          let mdcEquiMoniGaugeOption1 = {
            tooltip: {
              formatter: "{a} <br/>{b} : {c}%"
              formatter: '{a} <br/>{b} : {c}%'
            },

            series: [{
              name: "外部线",
              type: "gauge",
              name: '外部线',
              type: 'gauge',
              radius: '65%', // 动态
              startAngle: 225,
              endAngle: -45,
@@ -326,19 +198,19 @@
                }
              },
              axisLabel: {
                show: false,
                show: false
              },
              axisTick: {
                show: false,
                show: false
              },
              splitLine: {
                show: false,
                show: false
              },
              detail: {
                show: false
              },
              title: { //标题
                show: false,
                show: false
              }
            },
              {
@@ -355,26 +227,26 @@
                  lineStyle: {
                    color: [
                      [1, 'rgba(0,0,0,0)']
                    ],
                    ]
                  }
                }, //仪表盘轴线
                axisLabel: {
                  show: true,
                  color: '#31F3FF',
                  fontSize: 10, // 动态
                  distance: -20, // 动态
                  distance: -20 // 动态

                }, //刻度标签。
                axisTick: {
                  show: false,
                  show: false
                }, //刻度样式
                splitLine: {
                  show: false,
                },
                  show: false
                }
              },
              {
                name: "内部宽线条",
                type: "gauge",
                name: '内部宽线条',
                type: 'gauge',
                radius: '55%',
                startAngle: 225,
                endAngle: -45,
@@ -387,24 +259,24 @@
                  }
                },
                axisLabel: {
                  show: false,
                  show: false
                },
                axisTick: {
                  show: false,
                  show: false
                },
                splitLine: {
                  show: false,
                  show: false
                },
                detail: {
                  show: false
                },
                title: {
                  show: false,
                  show: false
                }
              },
              {
                name: "内部细线条",
                type: "gauge",
                name: '内部细线条',
                type: 'gauge',
                radius: '40%',
                startAngle: 225,
                endAngle: -45,
@@ -417,24 +289,24 @@
                  }
                },
                axisLabel: {
                  show: false,
                  show: false
                },
                axisTick: {
                  show: false,
                  show: false
                },
                splitLine: {
                  show: false,
                  show: false
                },
                detail: {
                  show: false
                },
                title: {
                  show: false,
                  show: false
                }
              },
              {
                name: "间隔条形",
                type: "gauge",
                name: '间隔条形',
                type: 'gauge',
                radius: '52.5%',
                z: 4,
                splitNumber: 35,
@@ -446,7 +318,7 @@
                  }
                },
                axisLabel: {
                  show: false,
                  show: false
                },
                axisTick: {
                  show: false,
@@ -464,12 +336,12 @@
                  show: false
                },
                title: {
                  show: false,
                  show: false
                }
              },
              {
                name: "数据",
                type: "gauge",
                name: '数据',
                type: 'gauge',
                radius: '52.5%',
                z: 3,
                startAngle: 225,
@@ -488,10 +360,10 @@
                  show: false
                },
                axisLabel: {
                  show: false,
                  show: false
                },
                axisTick: {
                  show: false,
                  show: false
                },
                splitLine: {
                  show: false
@@ -505,8 +377,8 @@
                pointer: {
                  show: true,
                  width: 3,
                  itemStyle:{
                    color:'#fff',
                  itemStyle: {
                    color: '#fff'
                  }
                },
                data: [{
@@ -516,60 +388,60 @@
              },
              // 内圆
              {
                "name": '内圆环',
                "type": 'pie',
                "radius": ['4%', '2%'],
                "hoverAnimation": false,
                'name': '内圆环',
                'type': 'pie',
                'radius': ['4%', '2%'],
                'hoverAnimation': false,
                tooltip: {
                  show: false
                },
                cursor: "default",
                "labelLine": {
                  "normal": {
                    "show": false
                cursor: 'default',
                'labelLine': {
                  'normal': {
                    'show': false
                  }
                },
                itemStyle: {
                  color: '#fff'
                },
                animation: false,
                "data": [1]
                'data': [1]
              },
              // 内圆
              {
                "name": '内圆环2',
                "type": 'pie',
                "radius": '2%',
                "hoverAnimation": false,
                cursor: "default",
                'name': '内圆环2',
                'type': 'pie',
                'radius': '2%',
                'hoverAnimation': false,
                cursor: 'default',
                tooltip: {
                  show: false
                },
                "labelLine": {
                  "normal": {
                    "show": false
                'labelLine': {
                  'normal': {
                    'show': false
                  }
                },
                itemStyle: {
                  color: '#31F3FF'
                },
                animation: false,
                "data": [1]
              },
                'data': [1]
              }
            ]
          };
          }
          mdcEquiMoniGauge1.setOption(mdcEquiMoniGaugeOption1)
        }
        if (_this.feedbeilv) {
          let mdcEquiMoniGauge2 = this.$echarts.init(document.getElementById('mdcEquiMoniGauge2'), 'macarons')
          let mdcEquiMoniGaugeOption2 = {
            tooltip: {
              formatter: "{a} <br/>{b} : {c}%"
              formatter: '{a} <br/>{b} : {c}%'
            },

            series: [{
              name: "外部线",
              type: "gauge",
              name: '外部线',
              type: 'gauge',
              radius: '65%', // 动态
              startAngle: 225,
              endAngle: -45,
@@ -582,19 +454,19 @@
                }
              },
              axisLabel: {
                show: false,
                show: false
              },
              axisTick: {
                show: false,
                show: false
              },
              splitLine: {
                show: false,
                show: false
              },
              detail: {
                show: false
              },
              title: { //标题
                show: false,
                show: false
              }
            },
              {
@@ -611,26 +483,26 @@
                  lineStyle: {
                    color: [
                      [1, 'rgba(0,0,0,0)']
                    ],
                    ]
                  }
                }, //仪表盘轴线
                axisLabel: {
                  show: true,
                  color: '#31F3FF',
                  fontSize: 10, // 动态
                  distance: -20, // 动态
                  distance: -20 // 动态

                }, //刻度标签。
                axisTick: {
                  show: false,
                  show: false
                }, //刻度样式
                splitLine: {
                  show: false,
                },
                  show: false
                }
              },
              {
                name: "内部宽线条",
                type: "gauge",
                name: '内部宽线条',
                type: 'gauge',
                radius: '55%',
                startAngle: 225,
                endAngle: -45,
@@ -643,24 +515,24 @@
                  }
                },
                axisLabel: {
                  show: false,
                  show: false
                },
                axisTick: {
                  show: false,
                  show: false
                },
                splitLine: {
                  show: false,
                  show: false
                },
                detail: {
                  show: false
                },
                title: {
                  show: false,
                  show: false
                }
              },
              {
                name: "内部细线条",
                type: "gauge",
                name: '内部细线条',
                type: 'gauge',
                radius: '40%',
                startAngle: 225,
                endAngle: -45,
@@ -673,24 +545,24 @@
                  }
                },
                axisLabel: {
                  show: false,
                  show: false
                },
                axisTick: {
                  show: false,
                  show: false
                },
                splitLine: {
                  show: false,
                  show: false
                },
                detail: {
                  show: false
                },
                title: {
                  show: false,
                  show: false
                }
              },
              {
                name: "间隔条形",
                type: "gauge",
                name: '间隔条形',
                type: 'gauge',
                radius: '52.5%',
                z: 4,
                splitNumber: 35,
@@ -702,7 +574,7 @@
                  }
                },
                axisLabel: {
                  show: false,
                  show: false
                },
                axisTick: {
                  show: false,
@@ -720,12 +592,12 @@
                  show: false
                },
                title: {
                  show: false,
                  show: false
                }
              },
              {
                name: "数据",
                type: "gauge",
                name: '数据',
                type: 'gauge',
                radius: '52.5%',
                z: 3,
                startAngle: 225,
@@ -744,10 +616,10 @@
                  show: false
                },
                axisLabel: {
                  show: false,
                  show: false
                },
                axisTick: {
                  show: false,
                  show: false
                },
                splitLine: {
                  show: false
@@ -761,8 +633,8 @@
                pointer: {
                  show: true,
                  width: 3,
                  itemStyle:{
                    color:'#fff'
                  itemStyle: {
                    color: '#fff'
                  }
                },
                data: [{
@@ -772,60 +644,60 @@
              },
              // 内圆
              {
                "name": '内圆环',
                "type": 'pie',
                "radius": ['4%', '2%'],
                "hoverAnimation": false,
                'name': '内圆环',
                'type': 'pie',
                'radius': ['4%', '2%'],
                'hoverAnimation': false,
                tooltip: {
                  show: false
                },
                cursor: "default",
                "labelLine": {
                  "normal": {
                    "show": false
                cursor: 'default',
                'labelLine': {
                  'normal': {
                    'show': false
                  }
                },
                itemStyle: {
                  color: '#fff'
                },
                animation: false,
                "data": [1]
                'data': [1]
              },
              // 内圆
              {
                "name": '内圆环2',
                "type": 'pie',
                "radius": '2%',
                "hoverAnimation": false,
                cursor: "default",
                'name': '内圆环2',
                'type': 'pie',
                'radius': '2%',
                'hoverAnimation': false,
                cursor: 'default',
                tooltip: {
                  show: false
                },
                "labelLine": {
                  "normal": {
                    "show": false
                'labelLine': {
                  'normal': {
                    'show': false
                  }
                },
                itemStyle: {
                  color: '#31F3FF'
                },
                animation: false,
                "data": [1]
              },
                'data': [1]
              }
            ]
          };
          }
          mdcEquiMoniGauge2.setOption(mdcEquiMoniGaugeOption2)
        }
        if (_this.spindleload) {
          let mdcEquiMoniGauge3 = this.$echarts.init(document.getElementById('mdcEquiMoniGauge3'), 'macarons')
          let mdcEquiMoniGaugeOption3 = {
            tooltip: {
              formatter: "{a} <br/>{b} : {c}%"
              formatter: '{a} <br/>{b} : {c}%'
            },

            series: [{
              name: "外部线",
              type: "gauge",
              name: '外部线',
              type: 'gauge',
              radius: '65%', // 动态
              startAngle: 225,
              endAngle: -45,
@@ -838,19 +710,19 @@
                }
              },
              axisLabel: {
                show: false,
                show: false
              },
              axisTick: {
                show: false,
                show: false
              },
              splitLine: {
                show: false,
                show: false
              },
              detail: {
                show: false
              },
              title: { //标题
                show: false,
                show: false
              }
            },
              {
@@ -867,26 +739,26 @@
                  lineStyle: {
                    color: [
                      [1, 'rgba(0,0,0,0)']
                    ],
                    ]
                  }
                }, //仪表盘轴线
                axisLabel: {
                  show: true,
                  color: '#31F3FF',
                  fontSize: 10, // 动态
                  distance: -20, // 动态
                  distance: -20 // 动态

                }, //刻度标签。
                axisTick: {
                  show: false,
                  show: false
                }, //刻度样式
                splitLine: {
                  show: false,
                },
                  show: false
                }
              },
              {
                name: "内部宽线条",
                type: "gauge",
                name: '内部宽线条',
                type: 'gauge',
                radius: '55%',
                startAngle: 225,
                endAngle: -45,
@@ -899,24 +771,24 @@
                  }
                },
                axisLabel: {
                  show: false,
                  show: false
                },
                axisTick: {
                  show: false,
                  show: false
                },
                splitLine: {
                  show: false,
                  show: false
                },
                detail: {
                  show: false
                },
                title: {
                  show: false,
                  show: false
                }
              },
              {
                name: "内部细线条",
                type: "gauge",
                name: '内部细线条',
                type: 'gauge',
                radius: '40%',
                startAngle: 225,
                endAngle: -45,
@@ -929,24 +801,24 @@
                  }
                },
                axisLabel: {
                  show: false,
                  show: false
                },
                axisTick: {
                  show: false,
                  show: false
                },
                splitLine: {
                  show: false,
                  show: false
                },
                detail: {
                  show: false
                },
                title: {
                  show: false,
                  show: false
                }
              },
              {
                name: "间隔条形",
                type: "gauge",
                name: '间隔条形',
                type: 'gauge',
                radius: '52.5%',
                z: 4,
                splitNumber: 35,
@@ -958,7 +830,7 @@
                  }
                },
                axisLabel: {
                  show: false,
                  show: false
                },
                axisTick: {
                  show: false,
@@ -976,12 +848,12 @@
                  show: false
                },
                title: {
                  show: false,
                  show: false
                }
              },
              {
                name: "数据",
                type: "gauge",
                name: '数据',
                type: 'gauge',
                radius: '52.5%',
                z: 3,
                startAngle: 225,
@@ -1000,10 +872,10 @@
                  show: false
                },
                axisLabel: {
                  show: false,
                  show: false
                },
                axisTick: {
                  show: false,
                  show: false
                },
                splitLine: {
                  show: false
@@ -1017,8 +889,8 @@
                pointer: {
                  show: true,
                  width: 3,
                  itemStyle:{
                    color:'#fff'
                  itemStyle: {
                    color: '#fff'
                  }
                },
                data: [{
@@ -1028,60 +900,60 @@
              },
              // 内圆
              {
                "name": '内圆环',
                "type": 'pie',
                "radius": ['4%', '2%'],
                "hoverAnimation": false,
                'name': '内圆环',
                'type': 'pie',
                'radius': ['4%', '2%'],
                'hoverAnimation': false,
                tooltip: {
                  show: false
                },
                cursor: "default",
                "labelLine": {
                  "normal": {
                    "show": false
                cursor: 'default',
                'labelLine': {
                  'normal': {
                    'show': false
                  }
                },
                itemStyle: {
                  color: '#fff'
                },
                animation: false,
                "data": [1]
                'data': [1]
              },
              // 内圆
              {
                "name": '内圆环2',
                "type": 'pie',
                "radius": '2%',
                "hoverAnimation": false,
                cursor: "default",
                'name': '内圆环2',
                'type': 'pie',
                'radius': '2%',
                'hoverAnimation': false,
                cursor: 'default',
                tooltip: {
                  show: false
                },
                "labelLine": {
                  "normal": {
                    "show": false
                'labelLine': {
                  'normal': {
                    'show': false
                  }
                },
                itemStyle: {
                  color: '#31F3FF'
                },
                animation: false,
                "data": [1]
              },
                'data': [1]
              }
            ]
          };
          }
          mdcEquiMoniGauge3.setOption(mdcEquiMoniGaugeOption3)
        }
        if (_this.rapidfeed) {
          let mdcEquiMoniGauge4 = this.$echarts.init(document.getElementById('mdcEquiMoniGauge4'), 'macarons')
          let mdcEquiMoniGaugeOption4 = {
            tooltip: {
              formatter: "{a} <br/>{b} : {c}%"
              formatter: '{a} <br/>{b} : {c}%'
            },

            series: [{
              name: "外部线",
              type: "gauge",
              name: '外部线',
              type: 'gauge',
              radius: '65%', // 动态
              startAngle: 225,
              endAngle: -45,
@@ -1094,19 +966,19 @@
                }
              },
              axisLabel: {
                show: false,
                show: false
              },
              axisTick: {
                show: false,
                show: false
              },
              splitLine: {
                show: false,
                show: false
              },
              detail: {
                show: false
              },
              title: { //标题
                show: false,
                show: false
              }
            },
              {
@@ -1123,26 +995,26 @@
                  lineStyle: {
                    color: [
                      [1, 'rgba(0,0,0,0)']
                    ],
                    ]
                  }
                }, //仪表盘轴线
                axisLabel: {
                  show: true,
                  color: '#31F3FF',
                  fontSize: 10, // 动态
                  distance: -20, // 动态
                  distance: -20 // 动态

                }, //刻度标签。
                axisTick: {
                  show: false,
                  show: false
                }, //刻度样式
                splitLine: {
                  show: false,
                },
                  show: false
                }
              },
              {
                name: "内部宽线条",
                type: "gauge",
                name: '内部宽线条',
                type: 'gauge',
                radius: '55%',
                startAngle: 225,
                endAngle: -45,
@@ -1155,24 +1027,24 @@
                  }
                },
                axisLabel: {
                  show: false,
                  show: false
                },
                axisTick: {
                  show: false,
                  show: false
                },
                splitLine: {
                  show: false,
                  show: false
                },
                detail: {
                  show: false
                },
                title: {
                  show: false,
                  show: false
                }
              },
              {
                name: "内部细线条",
                type: "gauge",
                name: '内部细线条',
                type: 'gauge',
                radius: '40%',
                startAngle: 225,
                endAngle: -45,
@@ -1185,24 +1057,24 @@
                  }
                },
                axisLabel: {
                  show: false,
                  show: false
                },
                axisTick: {
                  show: false,
                  show: false
                },
                splitLine: {
                  show: false,
                  show: false
                },
                detail: {
                  show: false
                },
                title: {
                  show: false,
                  show: false
                }
              },
              {
                name: "间隔条形",
                type: "gauge",
                name: '间隔条形',
                type: 'gauge',
                radius: '52.5%',
                z: 4,
                splitNumber: 35,
@@ -1214,7 +1086,7 @@
                  }
                },
                axisLabel: {
                  show: false,
                  show: false
                },
                axisTick: {
                  show: false,
@@ -1232,12 +1104,12 @@
                  show: false
                },
                title: {
                  show: false,
                  show: false
                }
              },
              {
                name: "数据",
                type: "gauge",
                name: '数据',
                type: 'gauge',
                radius: '52.5%',
                z: 3,
                startAngle: 225,
@@ -1256,10 +1128,10 @@
                  show: false
                },
                axisLabel: {
                  show: false,
                  show: false
                },
                axisTick: {
                  show: false,
                  show: false
                },
                splitLine: {
                  show: false
@@ -1273,8 +1145,8 @@
                pointer: {
                  show: true,
                  width: 3,
                  itemStyle:{
                    color:'#fff'
                  itemStyle: {
                    color: '#fff'
                  }
                },
                data: [{
@@ -1284,131 +1156,99 @@
              },
              // 内圆
              {
                "name": '内圆环',
                "type": 'pie',
                "radius": ['4%', '2%'],
                "hoverAnimation": false,
                'name': '内圆环',
                'type': 'pie',
                'radius': ['4%', '2%'],
                'hoverAnimation': false,
                tooltip: {
                  show: false
                },
                cursor: "default",
                "labelLine": {
                  "normal": {
                    "show": false
                cursor: 'default',
                'labelLine': {
                  'normal': {
                    'show': false
                  }
                },
                itemStyle: {
                  color: '#fff'
                },
                animation: false,
                "data": [1]
                'data': [1]
              },
              // 内圆
              {
                "name": '内圆环2',
                "type": 'pie',
                "radius": '2%',
                "hoverAnimation": false,
                cursor: "default",
                'name': '内圆环2',
                'type': 'pie',
                'radius': '2%',
                'hoverAnimation': false,
                cursor: 'default',
                tooltip: {
                  show: false
                },
                "labelLine": {
                  "normal": {
                    "show": false
                'labelLine': {
                  'normal': {
                    'show': false
                  }
                },
                itemStyle: {
                  color: '#31F3FF'
                },
                animation: false,
                "data": [1]
              },
                'data': [1]
              }
            ]
          };
          }
          mdcEquiMoniGauge4.setOption(mdcEquiMoniGaugeOption4)
        }
      },
      close() {
        this.$emit('close')
        this.visible = false
        clearInterval(this.modalTimer);
        clearInterval(this.modalTimer)
        this.modalTimer = null
      },
      handleCancel() {
        this.close()
        clearInterval(this.modalTimer);
        clearInterval(this.modalTimer)
        this.modalTimer = null
      },
      // initDeviceType(deviceTypeId) {
      //   let dictCode = 'mdc_equipmentType'
      //   let items = []
      //   items = getDictItemsFromCache(dictCode)
      //   if (items && items.length > 0) {
      //     for (let i = 0; i < items.length; i++) {
      //       if (deviceTypeId == items[i].value) {
      //         this.deviceTypeDict = items[i].title
      //       }
      //     }
      //   } else {
      //     ajaxGetDictItems(dictCode, null).then((res) => {
      //       if (res.success) {
      //         let items = res.result
      //         for (let i = 0; i < items.length; i++) {
      //           if (deviceTypeId == items[i].value) {
      //             this.deviceTypeDict = items[i].title
      //           }
      //         }
      //       }
      //     })
      //   }
      // },
      timerModel(id){
        this.ee = id
      timerModel(id) {
        this.modalTimer = setInterval(() => {
          setTimeout( this.initData(this.ee),0)
        },1000*4)
          setTimeout(this.initData(id), 0)
        }, 1000 * 4)
      },

      initData(id) {
        let _this = this
        this.visible = true
        // _this.drawLine()
        getAction(this.url.mdcEquipmentDetailedInfo, { id: id }).then((res) => {
          if (res.success) {
            _this.resultData = res.result
            _this.driverType = res.result.deviceType
            _this.resultData = res.result.equipment
            _this.spindlebeilv = res.result.spindlebeilv
            _this.feedbeilv = res.result.feedbeilv
            _this.spindleload = res.result.spindleload
            _this.rapidfeed = res.result.rapidfeed;
            _this.mdcDriveTypeParamConfigList = res.result.mdcDriveTypeParamConfigList;
            _this.xyzAliasesList = res.result.xyzAliasesList;
            _this.rapidfeed = res.result.rapidfeed
            _this.runData = res.result.runData
            // _this.xyzAliasesList = res.result.xyzAliasesList
            this.$nextTick(() => {
              _this.drawLine()
            })
            // _this.initDeviceType(_this.resultData.deviceType)
          } else {
            // _this.$message.warn(res.message)
            _this.$notification.warning({
              message:'消息',
              description:res.message
            });
              message: '消息',
              description: res.message
            })
          }
        })

      },

      mouseEnterItem(e){
      mouseEnterItem(e) {
        console.log(e, e.target, e.target.clientWidth, e.target.scrollWidth)
        if (e.target.clientWidth >= e.target.scrollWidth) {
          e.target.style.pointerEvents = 'none' // 阻止鼠标事件    pointer-events 属性用于设置元素是否对鼠标事件做出反应。
        }
      }
    },
    beforeDestroy(){
      clearInterval(this.modalTimer);
      this.modalTimer = null
    }
  }
</script>
@@ -1417,6 +1257,7 @@
  body {
    overflow-y: hidden !important;
  }

  .full-modal {
    .ant-modal {
      top: 0;
@@ -1428,52 +1269,55 @@
    /deep/ .ant-modal-content {
      display: flex;
      flex-direction: column;
      /*height: calc(100vh);*/
      background-color: #4a4a48;
    }
    .ant-modal-body {
      flex: 1;
    }
  }

  /deep/ .ant-modal-content {
    /*background: -moz-linear-gradient(left, rgba(0, 0, 0, 0.66) 0%, rgba(0, 0, 0, 0.27) 100%);*/
    /*background: -webkit-gradient(linear, left left, right right, color-stop(0%, rgba(0, 0, 0, 0.66)), color-stop(100%, rgba(0, 0, 0, 0.4)));*/
    /*background: -webkit-linear-gradient(left, rgba(0, 0, 0, 0.66) 0%, rgba(0, 0, 0, 0.4) 100%);*/
    /*background: -o-linear-gradient(left, rgba(0, 0, 0, 0.66) 0%, rgba(0, 0, 0, 0.4) 100%);*/
    /*background: -ms-linear-gradient(left, rgba(0, 0, 0, 0.66) 0%, rgba(0, 0, 0, 0.4) 100%);*/
    /*background: linear-gradient(to right, rgba(0, 0, 0, 0.66) 0%, rgba(0, 0, 0, 0.4) 100%);*/
    background-color: #312c2c;
    opacity: 0.9;
  }

  /deep/ .ant-modal-close {
    color: #1191b0;
    font-size: 24px;
  }

  /deep/ .ant-modal-close-x {
    font-size: 24px;
  }

  /deep/ .ant-modal-footer {
    border-top: none;
  }

  /deep/ .ant-descriptions {
    border: 1px solid #16738d;
    margin: 10px 0;
  }

  /deep/ .ant-descriptions-title {
    color: #fff;
    padding: 10px;
    margin-bottom: 0;
  }

  /deep/ .ant-descriptions-view {
    padding: 0 20px;
  }

  /deep/ .ant-descriptions-view .ant-descriptions-row .ant-descriptions-item {
    padding-bottom: 5px;
  }

  /deep/ .ant-descriptions-item-colon {
    color: #fff;
    width: 5.1vw;
  }

  /deep/ .ant-descriptions-item-content {
    color: #fff;
    border: 1px solid #4bcfc8;
@@ -1487,6 +1331,7 @@
  .mdcEquipMon {
    color: #fff;
  }

  fieldset {
    border: 1px solid #16738d;
    padding: 17px;
@@ -1529,19 +1374,18 @@
    margin-bottom: 0px;
  }

  /deep/ .ant-descriptions-item-label{
  /deep/ .ant-descriptions-item-label {
    width: 6.7vw;
    text-align: right;
    margin-right: 10px;
  }

  /deep/ .operationData .ant-descriptions-item-content
  {
  /deep/ .operationData .ant-descriptions-item-content {
    width: 130px;
    overflow: hidden;
  }

  .description-item-class{
  .description-item-class {
    overflow: hidden;
    white-space: nowrap;
    text-overflow: ellipsis;

 src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue

@@ -43,22 +43,22 @@
                                :allowClear="false"/>
              </a-form-item>
            </a-col>
<!--            <a-col :md="5" :sm="5" :xs="5">-->
<!--              <a-form-item label="设备种类">-->
<!--                <a-select-->
<!--                  :value="queryParams.deviceCategory"-->
<!--                  mode="multiple"-->
<!--                  placeholder="请选择设备种类"-->
<!--                  allow-clear-->
<!--                  :maxTagCount="1"-->
<!--                  @change="selectChange($event,'deviceCategory')"-->
<!--                >-->
<!--                  <a-select-option v-for="(item,index) in device_category_list" :value="item.value" :key="index">-->
<!--                    {{item.label}}-->
<!--                  </a-select-option>-->
<!--                </a-select>-->
<!--              </a-form-item>-->
<!--            </a-col>-->
            <!--            <a-col :md="5" :sm="5" :xs="5">-->
            <!--              <a-form-item label="设备种类">-->
            <!--                <a-select-->
            <!--                  :value="queryParams.deviceCategory"-->
            <!--                  mode="multiple"-->
            <!--                  placeholder="请选择设备种类"-->
            <!--                  allow-clear-->
            <!--                  :maxTagCount="1"-->
            <!--                  @change="selectChange($event,'deviceCategory')"-->
            <!--                >-->
            <!--                  <a-select-option v-for="(item,index) in device_category_list" :value="item.value" :key="index">-->
            <!--                    {{item.label}}-->
            <!--                  </a-select-option>-->
            <!--                </a-select>-->
            <!--              </a-form-item>-->
            <!--            </a-col>-->
            <a-col :md="5" :sm="5" :xs="5">
              <a-form-item label="设备级别">
                <a-select
@@ -150,13 +150,13 @@
                </th>
                <th class="thgu dong2 name" rowspan="2" style="min-width: 50px; max-width: 50px;width: 50px;">车间</th>
                <th class="thgu dong3 name" rowspan="2" style="min-width: 50px; max-width: 50px;width: 50px;">工段</th>
                <th class="thgu dong4 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">设备编号
                <th class="thgu dong4 name" rowspan="2" style="min-width: 150px; max-width: 150px;width: 150px;">设备编号
                </th>
                <th class="thgu dong5 name" rowspan="2" style="min-width: 162px; max-width: 162px;width: 162px;">设备名称
                </th>
                <th class="thgu dong6 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">设备类型
                <th class="thgu dong6 name" rowspan="2" style="min-width: 150px; max-width: 150px;width: 150px;">设备类型
                </th>
                <th class="thgu dong7 name" rowspan="2" style="min-width: 120px; max-width: 120px;width: 120px;">设备型号
                <th class="thgu dong7 name" rowspan="2" style="min-width: 162px; max-width: 162px;width: 162px;">设备型号
                </th>
                <!--<th rowspan="2">组别</th>-->
                <template v-for="(tableHead, index) in tableHeads">
@@ -680,19 +680,19 @@

  .table tbody tr .tdgu4 {
    position: sticky;
    left: 250px;
    left: 300px;
    z-index: 2;
  }

  .table tbody tr .tdgu5 {
    position: sticky;
    left: 412px;
    left: 462px;
    z-index: 2;
  }

  .table tbody tr .tdgu6 {
    position: sticky;
    left: 512px;
    left: 612px;
    z-index: 2;
  }

@@ -735,17 +735,17 @@

  .table2 thead .equipname .dong5 {
    z-index: 5;
    left: 250px;
    left: 300px;
  }

  .table2 thead .equipname .dong6 {
    z-index: 5;
    left: 412px;
    left: 462px;
  }

  .table2 thead .equipname .dong7 {
    z-index: 5;
    left: 512px;
    left: 612px;
  }

  #EfficiencyPO {

 src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue

@@ -123,11 +123,11 @@
                </th>
                <th class="thgu dong2 name" rowspan="2" style="min-width: 50px; max-width: 50px;width: 50px;">车间</th>
                <th class="thgu dong3 name" rowspan="2" style="min-width: 50px; max-width: 50px;width: 50px;">工段</th>
                <th class="thgu dong4 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">设备编号
                <th class="thgu dong4 name" rowspan="2" style="min-width: 150px; max-width: 150px;width: 150px;">设备编号
                </th>
                <th class="thgu dong5 name" rowspan="2" style="min-width: 162px; max-width: 162px;width: 162px;">设备名称
                </th>
                <th class="thgu dong6 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">设备类型
                <th class="thgu dong6 name" rowspan="2" style="min-width: 150px; max-width: 150px;width: 150px;">设备类型
                </th>
                <template v-for="(tableHead, index) in tableHeads">
                  <th class="timeth" :colspan="checkedList.length">{{tableHead}}</th>
@@ -659,13 +659,13 @@

  .table tbody tr .tdgu4 {
    position: sticky;
    left: 250px;
    left: 300px;
    z-index: 2;
  }

  .table tbody tr .tdgu5 {
    position: sticky;
    left: 412px;
    left: 462px;
    z-index: 2;
  }

@@ -708,12 +708,12 @@

  .table2 thead .equipname .dong5 {
    z-index: 5;
    left: 250px;
    left: 300px;
  }

  .table2 thead .equipname .dong6 {
    z-index: 5;
    left: 412px;
    left: 462px;
  }

  #Efficiency {

 src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue

@@ -148,14 +148,16 @@
                   v-if="dataList.length>0">
              <thead>
              <tr class="thead fixed equipname">
                <th class="thgu dong1 name" rowspan="2" style="min-width: 50px; max-width: 50px;width: 50px;height: 66px">公司</th>
                <th class="thgu dong1 name" rowspan="2"
                    style="min-width: 50px; max-width: 50px;width: 50px;height: 66px">公司
                </th>
                <th class="thgu dong2 name" rowspan="2" style="min-width: 50px; max-width: 50px;width: 50px;">车间</th>
                <th class="thgu dong3 name" rowspan="2" style="min-width: 50px; max-width: 50px;width: 50px;">工段</th>
                <th class="thgu dong4 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">设备编号
                <th class="thgu dong4 name" rowspan="2" style="min-width: 150px; max-width: 150px;width: 150px;">设备编号
                </th>
                <th class="thgu dong5 name" rowspan="2" style="min-width: 162px; max-width: 162px;width: 162px;">设备名称
                </th>
                <th class="thgu dong6 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">设备类型
                <th class="thgu dong6 name" rowspan="2" style="min-width: 150px; max-width: 150px;width: 150px;">设备类型
                </th>
                <th class="thgu dong7 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">班次</th>
                <template v-for="(tableHead, index) in tableHeads">
@@ -207,7 +209,9 @@
                </template>
                <!--<td>{{item.tierType}}</td>-->
                <template v-for="(tableHead, index) in item.dataList">
                  <td :style="{background:tableHead.color }" v-if="checkedList.indexOf('lyl') > -1">{{tableHead.utilizationRate | numFilter}}</td>
                  <td :style="{background:tableHead.color }" v-if="checkedList.indexOf('lyl') > -1">
                    {{tableHead.utilizationRate | numFilter}}
                  </td>
                  <td :style="{background:tableHead.color }" v-if="checkedList.indexOf('kjsj') > -1">
                    {{tableHead.openLong | getFormattedTime}}
                  </td>
@@ -699,19 +703,19 @@

  .table tbody tr .tdgu4 {
    position: sticky;
    left: 250px;
    left: 300px;
    z-index: 2;
  }

  .table tbody tr .tdgu5 {
    position: sticky;
    left: 412px;
    left: 462px;
    z-index: 2;
  }

  .table tbody tr .tdgu6 {
    position: sticky;
    left: 512px;
    left: 612px;
    z-index: 2;
  }

@@ -754,17 +758,17 @@

  .table2 thead .equipname .dong5 {
    z-index: 5;
    left: 250px;
    left: 300px;
  }

  .table2 thead .equipname .dong6 {
    z-index: 5;
    left: 412px;
    left: 462px;
  }

  .table2 thead .equipname .dong7 {
    z-index: 6;
    left: 512px;
    left: 612px;
  }

  #EfficiencyShift {