-
+
+ >
+
+
{
- onSelectAccount(_, props, itemSelect)
+ onSelectAccount(_, props, itemSelect, itemSelectAll)
}
"
- />
+ >
+
+
@@ -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 @@