Merge branch 'master' into develop

zenglf

2023-09-28 8e75a78f55d60565eb48b25eafd4eb07939ce2cc

 src/views/mdc/base/modules/deviceBaseInfo/EqumentDetaiModel.vue

@@ -225,6 +225,7 @@

              <a-descriptions
                title="运行数据"
                v-show="mdcDriveTypeParamConfigList != null"
                v-if="driverType != 'PLC'"
                :column="4"
              >
@@ -237,17 +238,18 @@

              </a-descriptions>

              <a-descriptions
                title="坐标信息"
                v-if="driverType != 'PLC'"
                :column="4"
              >
                <a-descriptions-item
                  v-for="(item,id) in xyzAliasesList  "
                  :key="item.id"
                  :label="item.title"
                >{{item.value}}</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"
@@ -1378,7 +1380,6 @@
        getAction(this.url.mdcEquipmentDetailedInfo, { id: id }).then((res) => {
          if (res.success) {
            _this.resultData = res.result
            console.log(_this.resultData)
            _this.driverType = res.result.deviceType
            _this.spindlebeilv = res.result.spindlebeilv
            _this.feedbeilv = res.result.feedbeilv
@@ -1391,7 +1392,11 @@
            })
            // _this.initDeviceType(_this.resultData.deviceType)
          } else {
            _this.$message.warn(res.message)
            // _this.$message.warn(res.message)
            _this.$notification.warning({
              message:'消息',
              description:res.message
            });
          }
        })