Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into dev...

qushaowei

2023-12-13 41d50b20c975faeaa9e5277bdcff13b5acecb575

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

@@ -9,7 +9,6 @@
      cancelText="关闭"
      wrap-class-name="full-modal"
      centered
      :closable="false"
      :footer="null"
    >
      <div
@@ -230,13 +229,24 @@
                v-show="mdcDriveTypeParamConfigList != null"
                v-if="driverType != 'PLC'"
                :column="4"
                class="operationData"
              >

                <a-descriptions-item
                  v-for="(item,id) in mdcDriveTypeParamConfigList  "
                  :key="item.id"
                  :label="item.chineseName"
                >{{item.value}}
                >
                  <a-popover v-if="item.value&&item.value.length>18">
                    <template slot="content">
                      {{item.value}}
                    </template>
                    {{item.value}}
                  </a-popover>

                  <template v-else>
                    {{item.value}}
                  </template>
                </a-descriptions-item>

              </a-descriptions>
@@ -254,16 +264,17 @@
              <!--&gt;{{item.value}}</a-descriptions-item>-->
              <!--</a-descriptions>-->

              <a-descriptions
                title="版本信息 for lsv2"
                v-if="driverType == 'LSV2'"
                :column="4"
              >
                <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>
              <!--<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>
@@ -287,10 +298,11 @@
    postAction
  } from '@/api/manage'
  import { ajaxGetDictItems, getDictItemsFromCache, duplicateCheck } from '@/api/api'
  import Template1 from '../../../../jeecg/JVxeDemo/layout-demo/Template1'

  export default {
    name: 'EqumentDetaiModal',
    components: {},
    components: { Template1 },
    props: {},
    data() {
      return {
@@ -471,7 +483,7 @@
                  show: false
                },
                axisTick: {
                  show: true,
                  show: false,
                  length: 20,
                  splitNumber: 1,
                  lineStyle: {
@@ -526,7 +538,10 @@
                },
                pointer: {
                  show: true,
                  width: 3
                  width: 3,
                  itemStyle:{
                    color:'#fff'
                  }
                },
                data: [{
                  name: '',
@@ -724,7 +739,7 @@
                  show: false
                },
                axisTick: {
                  show: true,
                  show: false,
                  length: 20,
                  splitNumber: 1,
                  lineStyle: {
@@ -779,7 +794,10 @@
                },
                pointer: {
                  show: true,
                  width: 3
                  width: 3,
                  itemStyle:{
                    color:'#fff'
                  }
                },
                data: [{
                  name: '',
@@ -874,7 +892,7 @@
                type: 'gauge',
                radius: '80%',
                min: 0, //最小刻度
                max: 300, //最大刻度
                max: 100, //最大刻度
                splitNumber: 10, //刻度数量
                startAngle: 225,
                endAngle: -45,
@@ -977,7 +995,7 @@
                  show: false
                },
                axisTick: {
                  show: true,
                  show: false,
                  length: 20,
                  splitNumber: 1,
                  lineStyle: {
@@ -1001,12 +1019,12 @@
                radius: '52.5%',
                z: 3,
                startAngle: 225,
                max: 300,
                max: 100,
                endAngle: -45,
                axisLine: {
                  lineStyle: {
                    color: [
                      [_this.spindleload / 300, '#31F3FF'], // 动态
                      [_this.spindleload / 100, '#31F3FF'], // 动态
                      [1, '#185363']
                    ],
                    width: 4
@@ -1032,7 +1050,10 @@
                },
                pointer: {
                  show: true,
                  width: 3
                  width: 3,
                  itemStyle:{
                    color:'#fff'
                  }
                },
                data: [{
                  name: '',
@@ -1230,7 +1251,7 @@
                  show: false
                },
                axisTick: {
                  show: true,
                  show: false,
                  length: 20,
                  splitNumber: 1,
                  lineStyle: {
@@ -1285,7 +1306,10 @@
                },
                pointer: {
                  show: true,
                  width: 3
                  width: 3,
                  itemStyle:{
                    color:'#fff'
                  }
                },
                data: [{
                  name: '',
@@ -1419,7 +1443,7 @@
      padding-bottom: 0;
      margin: 0;
      background-color: #4a4a48 !important;
      opacity: 0.5;
      opacity: 0.9;
    }
    /deep/ .ant-modal-content {
      display: flex;
@@ -1440,7 +1464,7 @@
    /*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.7;
    opacity: 1;
  }

  /deep/ .ant-modal-close {
@@ -1535,4 +1559,19 @@
  .ant-tabs-content .ant-form-item {
    margin-bottom: 0px;
  }

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

  /deep/ .operationData .ant-descriptions-item-content,
  .lsv2Data .ant-descriptions-item-content
  {
    width: 130px;
    overflow: hidden;
    white-space: nowrap;
    text-overflow: ellipsis;
  }
</style>