src/views/mdc/base/modules/WorkshopSignage/EquipmentDetailModal.vue
@@ -20,7 +20,7 @@
          style="border-collapse: separate;border-spacing:0px; color: #fff"
        >
          <tr>
            <td v-if="this.spindlebeilv != null">
            <td>
              <div
                class="mdcEquipMon"
                style="width: 250px; height: 200px;margin : 0 auto;padding: 0;"
@@ -34,7 +34,8 @@
                ></div>
              </div>
            </td>
            <td v-if="this.feedbeilv != null">
            <td>
              <div
                class="mdcEquipMon"
                style="width: 210px; height: 180px;margin : 0 auto;"
@@ -48,7 +49,8 @@
                ></div>
              </div>
            </td>
            <td v-if="this.spindleload != null">
            <td v-if="resultData.driveType!=='HNC8'||resultData.driveType!=='HNC7'||resultData.driveType!=='LSV2'">
              <div
                class="mdcEquipMon"
                style="width: 210px; height: 180px;margin : 0 auto;"
@@ -61,7 +63,8 @@
                ></div>
              </div>
            </td>
            <td v-if="this.rapidfeed != null">
            <td v-else>
              <div
                class="mdcEquipMon"
                style="width: 210px; height: 180px;margin : 0 auto;"
@@ -81,148 +84,30 @@
                title="基础信息"
                :column="4"
              >
                <a-descriptions-item label="设备编号">{{resultData.equipmentID|formatDescriptionsItem}}</a-descriptions-item>
                <a-descriptions-item label="设备名称">{{resultData.equipmentName|formatDescriptionsItem}}</a-descriptions-item>
                <a-descriptions-item label="IP地址">{{resultData.equipmentIP|formatDescriptionsItem}}</a-descriptions-item>
                <a-descriptions-item label="端口号">{{resultData.dataPort|formatDescriptionsItem}}</a-descriptions-item>
                <a-descriptions-item label="系统版本号">{{resultData.systemVersion|formatDescriptionsItem}}</a-descriptions-item>
                <a-descriptions-item label="驱动类型">{{resultData.driveType|formatDescriptionsItem}}</a-descriptions-item>
                <a-descriptions-item label="设备型号">{{resultData.equipmentModel|formatDescriptionsItem}}</a-descriptions-item>
                <a-descriptions-item label="设备类型">{{resultData.deviceType|formatDescriptionsItem}}</a-descriptions-item>
                <a-descriptions-item label="设备功率">{{resultData.devicePower|formatDescriptionsItem}}</a-descriptions-item>
                <a-descriptions-item label="有效轴数">{{resultData.validAxis|formatDescriptionsItem}}</a-descriptions-item>
                <a-descriptions-item label="最大轴数">{{resultData.maxAxis|formatDescriptionsItem}}</a-descriptions-item>
                <a-descriptions-item label="设备编号">{{ resultData.equipmentID|formatDescriptionsItem }}
                </a-descriptions-item>
                <a-descriptions-item label="设备名称">{{ resultData.equipmentName|formatDescriptionsItem }}
                </a-descriptions-item>
                <a-descriptions-item label="IP地址">{{ resultData.equipmentIP|formatDescriptionsItem }}
                </a-descriptions-item>
                <a-descriptions-item label="端口号">{{ resultData.dataPort|formatDescriptionsItem }}
                </a-descriptions-item>
                <a-descriptions-item label="系统版本号">{{ resultData.systemVersion|formatDescriptionsItem }}
                </a-descriptions-item>
                <a-descriptions-item label="驱动类型">{{ resultData.driveType|formatDescriptionsItem }}
                </a-descriptions-item>
                <a-descriptions-item label="设备型号">{{ resultData.equipmentModel|formatDescriptionsItem }}
                </a-descriptions-item>
                <a-descriptions-item label="设备类型">{{ resultData.deviceType|formatDescriptionsItem }}
                </a-descriptions-item>
                <a-descriptions-item label="设备功率">{{ resultData.devicePower|formatDescriptionsItem }}
                </a-descriptions-item>
                <a-descriptions-item label="有效轴数">{{ resultData.validAxis|formatDescriptionsItem }}
                </a-descriptions-item>
                <a-descriptions-item label="最大轴数">{{ resultData.maxAxis|formatDescriptionsItem }}
                </a-descriptions-item>
                <a-descriptions-item label="备注">{{resultData.remark|formatDescriptionsItem}}</a-descriptions-item>
              </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="运行数据"
@@ -247,32 +132,6 @@
                </a-descriptions-item>
              </a-descriptions>
              <!--<a-descriptions-->
              <!--title="坐标信息"-->
              <!--v-show="xyzAliasesList != null"-->
              <!--v-if="driverType != 'PLC'"-->
              <!--:column="4"-->
              <!--&gt;-->
              <!--<a-descriptions-item-->
              <!--v-for="(item,id) in xyzAliasesList  "-->
              <!--:key="item.id"-->
              <!--:label="item.title"-->
              <!--&gt;{{item.value}}</a-descriptions-item>-->
              <!--</a-descriptions>-->
              <!--<a-descriptions-->
                <!--title="版本信息 for lsv2"-->
                <!--v-if="driverType == 'LSV2'"-->
                <!--:column="4"-->
                <!--class="lsv2Data"-->
              <!--&gt;-->
                <!--<a-descriptions-item label="NC版本">{{resultData.ncversion}}</a-descriptions-item>-->
                <!--<a-descriptions-item label="TNC版本">{{resultData.tncversion}}</a-descriptions-item>-->
                <!--<a-descriptions-item label="OPT版本">{{resultData.optversion}}</a-descriptions-item>-->
                <!--<a-descriptions-item label="PLC版本">{{resultData.plcversion}}</a-descriptions-item>-->
              <!--</a-descriptions>-->
            </td>
          </tr>
        </table>
@@ -339,8 +198,7 @@
    methods: {
      drawLine() {
        let _this = this
        if (_this.spindlebeilv) {
          //基于准备好的dom,初始化echarts实例
          let mdcEquiMoniGauge1 = this.$echarts.init(document.getElementById('mdcEquiMoniGauge1'), 'macarons')
          let mdcEquiMoniGaugeOption1 = {
            tooltip: {
@@ -533,13 +391,13 @@
                  show: false
                },
                detail: {
                  show: true,
              show: _this.spindlebeilv ? true : false,
                  fontWeight: 'bold',
                  fontSize: 12,
                  color: '#fff'
                },
                pointer: {
                  show: true,
              show: _this.spindlebeilv ? true : false,
                  width: 3,
                  itemStyle:{
                    color:'#fff'
@@ -595,8 +453,7 @@
            ]
          }
          mdcEquiMoniGauge1.setOption(mdcEquiMoniGaugeOption1)
        }
        if (_this.feedbeilv) {
          let mdcEquiMoniGauge2 = this.$echarts.init(document.getElementById('mdcEquiMoniGauge2'), 'macarons')
          let mdcEquiMoniGaugeOption2 = {
            tooltip: {
@@ -789,13 +646,13 @@
                  show: false
                },
                detail: {
                  show: true,
              show: _this.feedbeilv ? true : false,
                  fontWeight: 'bold',
                  fontSize: 12,
                  color: '#fff'
                },
                pointer: {
                  show: true,
              show: _this.feedbeilv ? true : false,
                  width: 3,
                  itemStyle:{
                    color:'#fff'
@@ -851,8 +708,8 @@
            ]
          }
          mdcEquiMoniGauge2.setOption(mdcEquiMoniGaugeOption2)
        }
        if (_this.spindleload) {
      if (_this.resultData !== 'HNC7' || _this.resultData == 'HNC8' || _this.resultData == 'LSV2') {
          let mdcEquiMoniGauge3 = this.$echarts.init(document.getElementById('mdcEquiMoniGauge3'), 'macarons')
          let mdcEquiMoniGaugeOption3 = {
            tooltip: {
@@ -1045,13 +902,13 @@
                  show: false
                },
                detail: {
                  show: true,
                show: _this.spindleload ? true : false,
                  fontWeight: 'bold',
                  fontSize: 12,
                  color: '#fff'
                },
                pointer: {
                  show: true,
                show: _this.spindleload ? true : false,
                  width: 3,
                  itemStyle:{
                    color:'#fff'
@@ -1107,8 +964,7 @@
            ]
          }
          mdcEquiMoniGauge3.setOption(mdcEquiMoniGaugeOption3)
        }
        if (_this.rapidfeed) {
      } else {
          let mdcEquiMoniGauge4 = this.$echarts.init(document.getElementById('mdcEquiMoniGauge4'), 'macarons')
          let mdcEquiMoniGaugeOption4 = {
            tooltip: {
@@ -1301,13 +1157,13 @@
                  show: false
                },
                detail: {
                  show: true,
                show: _this.rapidfeed ? true : false,
                  fontWeight: 'bold',
                  fontSize: 12,
                  color: '#fff'
                },
                pointer: {
                  show: true,
                show: _this.rapidfeed ? true : false,
                  width: 3,
                  itemStyle:{
                    color:'#fff'
@@ -1451,12 +1307,14 @@
      background-color: #4a4a48 !important;
      opacity: 0.9;
    }
    /deep/ .ant-modal-content {
      display: flex;
      flex-direction: column;
      /*height: calc(100vh);*/
      background-color: #4a4a48;
    }
    .ant-modal-body {
      flex: 1;
    }
@@ -1528,8 +1386,7 @@
  }
  /deep/ .operationData .ant-descriptions-item-content,
  .lsv2Data .ant-descriptions-item-content
  {
.lsv2Data .ant-descriptions-item-content {
    width: 130px;
    vertical-align: bottom;
  }