From ec68cffd70d2a2788f7c74af55a11563aaf611d1 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 06 十二月 2023 15:47:38 +0800
Subject: [PATCH] 1、登录页面优化首次登录会出现404字样，需要明确用户登录后显示页面是否为首页/消息页或者角色中可设置 2、驱动参数管理页面新增或修改控制系统中英文名称规则限制字符数最少6位调整为2位 3、效率段管理页面效率段颜色可自定义 4、设备利用率、设备开动率、班次利用率页面增加可按照设备类型筛选查询 5、对比分析页面增加通过选择设备来对比 6、设备日利用率和设备日利用率对比页面优化选择树节点后查询区域的设备名称字段不会更新问题

---
 src/views/system/modules/SelectDeviceModal.vue |   85 ++++++++++++++++++++----------------------
 1 files changed, 40 insertions(+), 45 deletions(-)

diff --git a/src/views/system/modules/SelectDeviceModal.vue b/src/views/system/modules/SelectDeviceModal.vue
index af931d0..12c2b26 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>
 
@@ -119,11 +112,13 @@
         default() {
           return true
         }
+      },
+      title: {
+        type: String
       }
     },
     data() {
       return {
-        title: '娣诲姞宸叉湁璁惧',
         cardLoading: false,
         loading: false,
         treeDataSource: [],
@@ -133,8 +128,6 @@
           getBaseTree: '/mdc/mdcEquipment/queryTreeListByProduction'
         },
         dataList: [],
-        autoExpandParent: true,
-        checkStrictly: true,
         allTreeKeys: [],
         visible: false,
         dataSource: []
@@ -273,19 +266,21 @@
       refreshTree() {
         this.queryTreeData()
       },
-      onCheck(value) {
+      onCheck(value, obj) {
         this.checkedKeys = value
+        console.log('obj,', obj)
+        this.deviceNodes = obj.checkedNodes.filter(item => item.data.props.equipmentId).map(item => item.data.props.equipmentId)
+        console.log(this.deviceNodes)
       },
       handleCancel() {
         this.visible = false
       },
       handleOk() {
         if (this.checkedKeys.length > 0) {
-          this.$emit('selectFinished', this.checkedKeys)
+          this.$emit('selectFinished', this.deviceNodes)
         }
         this.visible = false
       }
-
 
       // add() {
       //   this.visible = true
@@ -401,7 +396,7 @@
     overflow-y: hidden
   }
 
-  .drawer-bootom-button {
+  .drawer-bottom-button {
     position: absolute;
     bottom: 0;
     width: 100%;

--
Gitblit v1.9.3