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/OEEAnalysis/OEEAnalysisList.vue |   48 ++++++++++++++++++++++++------------------------
 1 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue b/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue
index 7331180..34a3e82 100644
--- a/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue
+++ b/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue
@@ -17,31 +17,31 @@
                   />
                 </a-form-item>
               </a-col>
-              <a-col :md="5" :sm="5" :xs="5">
-                <a-form-item label="鐝埗">
-                  <a-select v-model="queryParam.shiftId" placeholder="璇烽�夋嫨鐝埗"
-                            @change="initShiftSubList" :allowClear="allowClear">
-                    <a-select-option v-for="(em,index) in shiftList" :key="index" :value="em.value">
-                      {{ em.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 v-model="queryParam.shiftSubId" placeholder="璇烽�夋嫨鐝" @change="initShiftSubListChange"
-                            :allowClear="allowClearSu">
-                    <a-select-option v-for="(em,index) in shiftSubList" :key="index" :value="em.value">
-                      {{ em.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 v-model="queryParam.shiftId" placeholder="璇烽�夋嫨鐝埗"-->
+                            <!--@change="initShiftSubList" :allowClear="allowClear">-->
+                    <!--<a-select-option v-for="(em,index) in shiftList" :key="index" :value="em.value">-->
+                      <!--{{ em.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 v-model="queryParam.shiftSubId" placeholder="璇烽�夋嫨鐝" @change="initShiftSubListChange"-->
+                            <!--:allowClear="allowClearSu">-->
+                    <!--<a-select-option v-for="(em,index) in shiftSubList" :key="index" :value="em.value">-->
+                      <!--{{ em.label }}-->
+                    <!--</a-select-option>-->
+                  <!--</a-select>-->
+                <!--</a-form-item>-->
+              <!--</a-col>-->
 
               <a-col :md="8" :sm="8" :xs="8">
                 <a-space>
                   <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
-                  <a-button type="primary" @click="searchReset" icon="reload">閲嶇疆</a-button>
+                  <!--<a-button type="primary" @click="searchReset" icon="reload">閲嶇疆</a-button>-->
                   <a-button type="primary" @click="exportExcel" icon="download">瀵煎嚭</a-button>
                 </a-space>
               </a-col>
@@ -118,21 +118,21 @@
             customRender: function(t, r, index) {
               return parseInt(index) + 1
             },
-            fixed: 'left'
+            // fixed: 'left'
           },
           {
             title: '璁惧缁熶竴缂栧彿',
             align: 'center',
             dataIndex: 'equipmentId',
             width: 120,
-            fixed: 'left'
+            // fixed: 'left'
           },
           {
             title: '璁惧鍚嶇О',
             align: 'center',
             width: 150,
             dataIndex: 'equipmentName',
-            fixed: 'left'
+            // fixed: 'left'
           },
           {
             title: '璁惧鍨嬪彿',

--
Gitblit v1.9.3