From f8668b057747f2982afafcc1ce9a2842a4abd50c Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 29 十一月 2023 16:36:39 +0800
Subject: [PATCH] 1、设备车间管理页面车间名称新增、修改以及批量删除成功后提示为warning图标 2、设备车间管理页面调整修改车间信息中的排序字段由departOrder为productionOrder 3、删除树节点时需判断节点下是否有子节点,若有子节点则不能删除并提示 4、大屏车间管理页面左右两侧卡片区域布局保持一致 5、设备综合效率分析页面由于ant-design-vie的table组件固定列功能导致导出报表布局混乱

---
 src/views/mdc/base/modules/deviceBaseInfo/EqumentDetaiModel.vue |   24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/views/mdc/base/modules/deviceBaseInfo/EqumentDetaiModel.vue b/src/views/mdc/base/modules/deviceBaseInfo/EqumentDetaiModel.vue
index a0b54c9..e3506f2 100644
--- a/src/views/mdc/base/modules/deviceBaseInfo/EqumentDetaiModel.vue
+++ b/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"

--
Gitblit v1.9.3