From 237b5f107cf9fab2a6b730f1a036dbdcbfb63498 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期一, 27 十一月 2023 15:45:08 +0800
Subject: [PATCH] 1、车间看板页面非全屏模式下使图纸盒子占满底部，而不是被屏幕任务栏遮盖 2、报警分析页面调整右侧表格以及图表布局，调整表格合计持续字段展示格式为时分秒 3.大屏车间管理页面选择已有设备窗口弹出方式由模态窗改为右侧抽屉

---
 src/views/system/modules/SelectDeviceModal.vue |   73 ++++++++++++++++--------------------
 1 files changed, 32 insertions(+), 41 deletions(-)

diff --git a/src/views/system/modules/SelectDeviceModal.vue b/src/views/system/modules/SelectDeviceModal.vue
index af931d0..ec57f16 100644
--- a/src/views/system/modules/SelectDeviceModal.vue
+++ b/src/views/system/modules/SelectDeviceModal.vue
@@ -1,12 +1,11 @@
 <template>
   <div>
-    <a-modal
+    <a-drawer
       :title="title"
       :visible="visible"
+      width="650"
       @ok="handleOk"
-      @cancel="handleCancel"
-      cancelText="鍏抽棴"
-      centered
+      @close="handleCancel"
     >
 
       <!--&lt;!&ndash; 鏌ヨ鍖哄煙 &ndash;&gt;-->
@@ -52,47 +51,41 @@
           <a-form-item label="杞﹂棿灞傜骇锛�">
             <a-tree showLine ref="tree" :expandedKeys.sync="expandedKeys"
                     :treeData="treeDataSource" checkable @check="onCheck" v-model="checkedKeys"
-                    :autoExpandParent="autoExpandParent" @expand="onExpand">
+                    @expand="onExpand">
             </a-tree>
           </a-form-item>
         </a-form>
 
       </a-spin>
 
-      <template slot="footer">
-        <div>
-          <div>
-            <a-dropdown
-              style="float: left"
-              :trigger="['click']"
-              placement="topCenter"
-            >
-              <a-menu slot="overlay">
-                <a-menu-item key="1" @click="expandAll">灞曞紑鎵�鏈�</a-menu-item>
-                <a-menu-item key="2" @click="closeAll">鍚堝苟鎵�鏈�</a-menu-item>
-                <a-menu-item key="3" @click="refreshTree">鍒锋柊</a-menu-item>
-              </a-menu>
-              <a-button>
-                鏍戞搷浣�
-                <a-icon type="up"/>
-              </a-button>
-            </a-dropdown>
-          </div>
-          <a-space>
-            <a-button
-              @click="handleCancel"
-            >鍏抽棴
-            </a-button>
-            <a-button
-              @click="handleOk"
-              type="primary"
-            >纭畾
-            </a-button>
-          </a-space>
-        </div>
-      </template>
 
-    </a-modal>
+      <div class="drawer-bottom-button">
+        <a-dropdown
+          style="float: left"
+          :trigger="['click']"
+          placement="topCenter"
+        >
+          <a-menu slot="overlay">
+            <a-menu-item key="1" @click="expandAll">灞曞紑鎵�鏈�</a-menu-item>
+            <a-menu-item key="2" @click="closeAll">鍚堝苟鎵�鏈�</a-menu-item>
+            <a-menu-item key="3" @click="refreshTree">鍒锋柊</a-menu-item>
+          </a-menu>
+          <a-button>
+            鏍戞搷浣�
+            <a-icon type="up"/>
+          </a-button>
+        </a-dropdown>
+        <a-popconfirm title="纭畾鏀惧純缂栬緫锛�" @confirm="handleCancel" okText="纭畾" cancelText="鍙栨秷">
+          <a-button style="margin-right: .8rem">鍏抽棴</a-button>
+        </a-popconfirm>
+        <a-button
+          @click="handleOk"
+          type="primary"
+        >纭畾
+        </a-button>
+      </div>
+
+    </a-drawer>
   </div>
 </template>
 
@@ -133,8 +126,6 @@
           getBaseTree: '/mdc/mdcEquipment/queryTreeListByProduction'
         },
         dataList: [],
-        autoExpandParent: true,
-        checkStrictly: true,
         allTreeKeys: [],
         visible: false,
         dataSource: []
@@ -401,7 +392,7 @@
     overflow-y: hidden
   }
 
-  .drawer-bootom-button {
+  .drawer-bottom-button {
     position: absolute;
     bottom: 0;
     width: 100%;

--
Gitblit v1.9.3