From 6477f78761e3368c95c554075247da2906636ec3 Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Wed, 7 Jun 2023 15:47:22 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E7=A9=BA=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E7=BB=84=E4=BB=B6=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=85=A8?=
 =?UTF-8?q?=E5=B1=80=E7=A9=BA=E7=8A=B6=E6=80=81=EF=BC=9B=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?scheduling=E6=97=A5=E6=9C=9F=E5=AD=97=E4=BD=93=E5=A4=A7?=
 =?UTF-8?q?=E5=B0=8F=EF=BC=8C=E4=BF=AE=E5=A4=8D=E7=A9=BF=E6=A2=AD=E6=A1=86?=
 =?UTF-8?q?=E4=B8=AD=E5=AD=98=E5=9C=A8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |   3 +
 src/assets/images/global/no-data.png          | Bin 0 -> 4105 bytes
 src/components/CustomEmpty/index.vue          |  14 ++++
 src/components/CustomPopoverSearch/index.vue  |   2 +-
 src/components/jeecg/JSuperQuery.vue          |   6 +-
 .../jeecgbiz/modal/JSelectDepartModal.vue     |   2 +-
 src/main.js                                   |   2 +
 src/style.less                                |   3 +-
 src/views/system/DepartList.vue               |   4 +-
 src/views/system/DepartListSync.vue           |   6 +-
 src/views/system/Scheduling.vue               |  74 ++++++++----------
 src/views/system/modules/DepartAuthModal.vue  |   4 +-
 12 files changed, 66 insertions(+), 54 deletions(-)
 create mode 100644 src/assets/images/global/no-data.png
 create mode 100644 src/components/CustomEmpty/index.vue

diff --git a/src/App.vue b/src/App.vue
index ec9f4b2..acdefdb 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -3,6 +3,9 @@
     <div id="app">
       <router-view/>
     </div>
+    <template #renderEmpty>
+      <custom-empty></custom-empty>
+    </template>
   </a-config-provider>
 </template>
 <script>
diff --git a/src/assets/images/global/no-data.png b/src/assets/images/global/no-data.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d27efd48f5e18ade4b3285719b159cab1d01e6c
GIT binary patch
literal 4105
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

literal 0
HcmV?d00001

diff --git a/src/components/CustomEmpty/index.vue b/src/components/CustomEmpty/index.vue
new file mode 100644
index 0000000..ed65e39
--- /dev/null
+++ b/src/components/CustomEmpty/index.vue
@@ -0,0 +1,14 @@
+<template>
+  <a-empty :image="emptyImg"></a-empty>
+</template>
+<script>
+import emptyImg from '@/assets/images/global/no-data.png'
+
+export default {
+  data() {
+    return {
+      emptyImg
+    }
+  }
+}
+</script>
diff --git a/src/components/CustomPopoverSearch/index.vue b/src/components/CustomPopoverSearch/index.vue
index 078c160..e5c494c 100644
--- a/src/components/CustomPopoverSearch/index.vue
+++ b/src/components/CustomPopoverSearch/index.vue
@@ -35,7 +35,7 @@
           </template>
           <template v-else>
             <div style="padding: 20px 0">
-              <a-empty></a-empty>
+              <custom-empty></custom-empty>
             </div>
           </template>
         </template>
diff --git a/src/components/jeecg/JSuperQuery.vue b/src/components/jeecg/JSuperQuery.vue
index 52feb8d..164adef 100644
--- a/src/components/jeecg/JSuperQuery.vue
+++ b/src/components/jeecg/JSuperQuery.vue
@@ -47,13 +47,13 @@
       <a-row>
         <a-col :sm="24" :md="24-5">
 
-          <a-empty v-if="queryParamsModel.length === 0" style="margin-bottom: 12px;">
+          <custom-empty v-if="queryParamsModel.length === 0" style="margin-bottom: 12px;">
             <div slot="description">
               <span>没有任何查询条件</span>
               <a-divider type="vertical"/>
               <a @click="handleAdd">点击新增</a>
             </div>
-          </a-empty>
+          </custom-empty>
 
           <a-form v-else layout="inline">
 
@@ -194,7 +194,7 @@
               保存的查询
             </div>
 
-            <a-empty v-if="saveTreeData.length === 0" class="j-super-query-history-empty" description="没有保存任何查询"/>
+            <custom-empty v-if="saveTreeData.length === 0" class="j-super-query-history-empty" description="没有保存任何查询"/>
             <a-tree
               v-else
               class="j-super-query-history-tree"
diff --git a/src/components/jeecgbiz/modal/JSelectDepartModal.vue b/src/components/jeecgbiz/modal/JSelectDepartModal.vue
index d9a7be4..323f20a 100644
--- a/src/components/jeecgbiz/modal/JSelectDepartModal.vue
+++ b/src/components/jeecgbiz/modal/JSelectDepartModal.vue
@@ -11,7 +11,7 @@
     switchFullscreen>
     <a-spin tip="Loading..." :spinning="false">
       <a-input-search v-model="searchValue" style="margin-bottom: 1px" placeholder="Enter Department Name To Search" />
-      <a-empty v-if="filterTreeData.length===0"></a-empty>
+      <custom-empty v-if="filterTreeData.length===0"></custom-empty>
       <a-tree
         v-else
         checkable
diff --git a/src/main.js b/src/main.js
index c4dd546..3ce7142 100644
--- a/src/main.js
+++ b/src/main.js
@@ -56,6 +56,7 @@ import CustomTable from '@/components/CustomTable'
 import CustomModal from '@/components/CustomModal'
 import CustomDatePicker from '@/components/CustomDatePicker'
 import CustomMonthPicker from '@/components/CustomMonthPicker'
+import CustomEmpty from '@/components/CustomEmpty'
 
 
 Vue.prototype.rules = rules
@@ -77,6 +78,7 @@ Vue.component('custom-table', CustomTable)
 Vue.component('custom-modal', CustomModal)
 Vue.component('custom-date-picker', CustomDatePicker)
 Vue.component('custom-month-picker', CustomMonthPicker)
+Vue.component('custom-empty', CustomEmpty)
 
 SSO.init(() => {
   main()
diff --git a/src/style.less b/src/style.less
index 743f634..7841c75 100644
--- a/src/style.less
+++ b/src/style.less
@@ -255,7 +255,6 @@ body {
   }
 
   &-date {
-    padding: 20px 10px 10px !important;
     margin: 0 !important;
     height: 159px !important;
     border-top: none !important;
@@ -603,7 +602,7 @@ body {
 // 空状态
 .ant-empty {
   background-color: transparent;
-  color: #fff;
+  color: #145b5c;
 }
 
 // 分页器样式
diff --git a/src/views/system/DepartList.vue b/src/views/system/DepartList.vue
index c11def5..3863ca2 100644
--- a/src/views/system/DepartList.vue
+++ b/src/views/system/DepartList.vue
@@ -132,9 +132,9 @@
             </div>
           </a-card>
           <a-card v-else >
-            <a-empty>
+            <custom-empty>
               <span slot="description"> 请先选择一个部门! </span>
-            </a-empty>
+            </custom-empty>
           </a-card>
         </a-tab-pane>
         <a-tab-pane tab="部门权限" key="2" forceRender>
diff --git a/src/views/system/DepartListSync.vue b/src/views/system/DepartListSync.vue
index c29c6b6..6655ec1 100644
--- a/src/views/system/DepartListSync.vue
+++ b/src/views/system/DepartListSync.vue
@@ -24,7 +24,7 @@
           <a-input-search @search="onSearch" style="width:100%;margin-top: 10px" placeholder="请输入部门名称"/>
           <!-- 树-->
           <div>
-            <a-empty v-if="departTree.length===0" description="暂无部门" style="margin-top: 8px;"/>
+            <custom-empty v-if="departTree.length===0" description="暂无部门" style="margin-top: 8px;"/>
             <template v-else>
               <a-dropdown :trigger="[this.dropTrigger]" @visibleChange="dropStatus">
                <span style="user-select: none">
@@ -127,9 +127,9 @@
             </div>
           </a-card>
           <a-card v-else >
-            <a-empty>
+            <custom-empty>
               <span slot="description"> 请先选择一个部门! </span>
-            </a-empty>
+            </custom-empty>
           </a-card>
         </a-tab-pane>
         <a-tab-pane tab="部门权限" key="2" forceRender>
diff --git a/src/views/system/Scheduling.vue b/src/views/system/Scheduling.vue
index 3a2cfa0..ef1b7b7 100644
--- a/src/views/system/Scheduling.vue
+++ b/src/views/system/Scheduling.vue
@@ -50,7 +50,7 @@
             <!-- 右侧边框结束 -->
           </div>
         </div>
-        <a-empty v-if="!schedulingInfo || !schedulingInfo.length" style="margin-top: 40px;"></a-empty>
+        <custom-empty v-if="!schedulingInfo || !schedulingInfo.length" style="margin-top: 40px;"></custom-empty>
       </div>
       <!-- 内容结束 -->
     </a-card>
@@ -117,16 +117,18 @@
       <a-spin :spinning="isGettingDetail">
         <div class="account-assign">
           <a-transfer
-            :selectedKeys="selectedStationKeys"
+            :selected-keys.sync="selectedStationKeys"
             :target-keys="targetKeys"
             :render="item => item.title"
             :operations="['Assign', 'Remove']"
             :titles="['Particulate Station', 'Roster personnel']"
             :show-select-all="false"
             @change="onChange"
-            @selectChange="handleSelectChange"
           >
-            <template slot="children" slot-scope="{ props: { direction, selectedKeys }, on: { itemSelect } }">
+            <template
+              slot="children"
+              slot-scope="{ props: { direction, selectedKeys }, on: { itemSelect, itemSelectAll } }"
+            >
               <!-- 左侧穿梭框中的树 -->
               <a-tree
                 v-if="direction === 'left'"
@@ -146,7 +148,9 @@
                     onChecked(_, props, [...selectedKeys, ...targetKeys], itemSelect)
                   }
                 "
-              />
+              >
+                <a-icon slot="switcherIcon" type="down" />
+              </a-tree>
               <!-- 右侧穿梭框中的树 -->
               <a-tree
                 v-if="direction === 'right'"
@@ -157,10 +161,12 @@
                 :expandedKeys.sync="rightAccountChildExpandedKeys"
                 @select="
                   (_, props) => {
-                    onSelectAccount(_, props, itemSelect)
+                    onSelectAccount(_, props, itemSelect, itemSelectAll)
                   }
                 "
-              />
+              >
+                <a-icon slot="switcherIcon" type="down" />
+              </a-tree>
             </template>
           </a-transfer>
 
@@ -522,10 +528,6 @@ export default {
       itemSelect(eventKey, !this.isChecked(checkedKeys, eventKey))
     },
 
-    handleSelectChange(sourceSelectedKeys, targetSelectedKeys) {
-      this.selectedStationKeys = [...sourceSelectedKeys, ...targetSelectedKeys]
-    },
-
     // 处理station列表
     handleTreeData(data, targetKeys = [], level) {
       data.forEach(item => {
@@ -557,34 +559,23 @@ export default {
     },
 
     // 选中了穿梭框右侧的树节点
-    onSelectAccount(_, e, itemSelect) {
-      const { eventKey, isLeaf, selected } = e.node
-      // selected 是前一个状态，也就是selected 为false时，其实是选中了
+    onSelectAccount(_, e, itemSelect, itemSelectAll) {
+      const { eventKey, isLeaf, selected } = e.node // selected 是前一个状态，也就是selected 为false时，其实是选中了
+      this.rightAccountChildSelectedKeys = [eventKey]
+
+      // 将所有右侧的穿梭状态重置
+      const allChildKeys = this.accountTreeData.reduce(
+        (prev, curr) => prev.concat(curr.children.map(child => child.key)),
+        []
+      )
+      itemSelectAll(allChildKeys, false)
+
       if (isLeaf) {
         // 选中了子节点，也就是站点
         this.checkedAccount = ''
-
-        if (selected) {
-          // 取消选中
-          itemSelect(eventKey, false)
-        } else {
-          this.accountTreeData.forEach(account => {
-            // 将所有右侧的穿梭状态重置
-            account.children.forEach(child => {
-              itemSelect(child.key, false)
-            })
-          })
-          itemSelect(eventKey, true) // 选中该栏
-        }
+        itemSelect(eventKey, true) // 选中该栏
       } else {
         this.checkedAccount = selected ? '' : eventKey
-        // 将所有右侧的穿梭状态重置
-        this.accountTreeData.forEach(account => {
-          // 将所有右侧的穿梭状态重置
-          account.children.forEach(child => {
-            itemSelect(child.key, false)
-          })
-        })
       }
     },
 
@@ -606,9 +597,10 @@ export default {
             }
           })
           findAccount.children.push(...children)
-          this.rightAccountChildExpandedKeys = [findAccount.key]
+          this.rightAccountChildExpandedKeys = [findAccount.key] // 展开右侧树
         }
       } else {
+        // 移除右侧穿梭框内容
         const moveKey = moveKeys[0]
         let parentIndex = -1,
           childIndex = -1
@@ -623,7 +615,6 @@ export default {
           }
         }
         this.accountTreeData[parentIndex].children.splice(childIndex, 1)
-        console.log('%c [ childIndex ]-591', 'font-size:13px; background:pink; color:#bf2c9f;', childIndex)
       }
       this.targetKeys = targetKeys
     }
@@ -649,7 +640,6 @@ export default {
   &-list {
     flex-shrink: 0;
     width: 350px;
-    height: calc(100% - 2px);
     background-color: #022024;
     border-color: rgb(12, 106, 102, 0.9);
     border-radius: 0;
@@ -806,7 +796,6 @@ export default {
   &-calendar {
     height: 100%;
     margin-left: 20px;
-    padding-right: 10px;
     .ant-fullcalendar-fullscreen {
       height: 100%;
       overflow: auto;
@@ -818,10 +807,15 @@ export default {
           padding-right: 5px;
         }
         .ant-fullcalendar-date {
-          height: 127px !important;
+          height: calc((100vh - 315px) / 6) !important;
+          padding: 10px !important;
         }
         .ant-fullcalendar-content {
-          height: 60px !important;
+          height: calc(100% - 28px) !important;
+          margin-top: 5px;
+        }
+        .ant-fullcalendar-value {
+          font-size: 20px;
         }
       }
     }
diff --git a/src/views/system/modules/DepartAuthModal.vue b/src/views/system/modules/DepartAuthModal.vue
index 92aedf0..a6b16ec 100644
--- a/src/views/system/modules/DepartAuthModal.vue
+++ b/src/views/system/modules/DepartAuthModal.vue
@@ -43,9 +43,9 @@
       </div>
     </template>
     <a-card v-else :bordered="false" style="height:200px">
-      <a-empty>
+      <custom-empty>
         <span slot="description"> 请先选择一个部门! </span>
-      </a-empty>
+      </custom-empty>
     </a-card>
     <depart-datarule-modal ref="datarule"/>
   </a-card>