diff --git a/.env.development b/.env.development index 8a26770..83f4b20 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ NODE_ENV=development -VUE_APP_API_BASE_URL=http://182.92.183.230:8080/jeecg-boot +VUE_APP_API_BASE_URL=http://182.92.183.230:9999 VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview diff --git a/src/assets/images/global/switcher-open.png b/src/assets/images/global/switcher-open.png new file mode 100644 index 0000000..9f61831 Binary files /dev/null and b/src/assets/images/global/switcher-open.png differ diff --git a/src/assets/images/global/switcher.png b/src/assets/images/global/switcher.png new file mode 100644 index 0000000..b8c4fe0 Binary files /dev/null and b/src/assets/images/global/switcher.png differ diff --git a/src/assets/images/log/download-active.png b/src/assets/images/log/download-active.png new file mode 100644 index 0000000..a73f222 Binary files /dev/null and b/src/assets/images/log/download-active.png differ diff --git a/src/assets/images/log/download.png b/src/assets/images/log/download.png new file mode 100644 index 0000000..b482100 Binary files /dev/null and b/src/assets/images/log/download.png differ diff --git a/src/assets/images/log/operate-active.png b/src/assets/images/log/operate-active.png new file mode 100644 index 0000000..9af1e99 Binary files /dev/null and b/src/assets/images/log/operate-active.png differ diff --git a/src/assets/images/log/operate.png b/src/assets/images/log/operate.png new file mode 100644 index 0000000..8ef026b Binary files /dev/null and b/src/assets/images/log/operate.png differ diff --git a/src/components/CustomModal/index.vue b/src/components/CustomModal/index.vue index 14d176f..7cbcf9a 100644 --- a/src/components/CustomModal/index.vue +++ b/src/components/CustomModal/index.vue @@ -1,12 +1,10 @@ diff --git a/src/components/TreeWithLine/index.vue b/src/components/TreeWithLine/index.vue new file mode 100644 index 0000000..c632ca8 --- /dev/null +++ b/src/components/TreeWithLine/index.vue @@ -0,0 +1,102 @@ + + + diff --git a/src/style.less b/src/style.less index 88a27aa..b6dc193 100644 --- a/src/style.less +++ b/src/style.less @@ -490,6 +490,10 @@ body { color: #0cebc9; } } + + &-title { + user-select: none; + } } // 按钮 @@ -636,11 +640,6 @@ body { } } &-body { - padding-bottom: 0; - } - &-footer { - border-top: none; - text-align: center; padding-bottom: 22px; } } diff --git a/src/views/logManage/index.vue b/src/views/logManage/index.vue index 178caf2..432d7f6 100644 --- a/src/views/logManage/index.vue +++ b/src/views/logManage/index.vue @@ -1,3 +1,249 @@ \ No newline at end of file +
+ + + + + + + + +
+ + + +
+ + + 这里是Log内容 + +
+ + + diff --git a/src/views/system/Scheduling.vue b/src/views/system/Scheduling.vue index 0ee099f..3ce8ad8 100644 --- a/src/views/system/Scheduling.vue +++ b/src/views/system/Scheduling.vue @@ -550,6 +550,13 @@ export default { } } else { this.checkedAccount = selected ? '' : eventKey + // 将所有右侧的穿梭状态重置 + this.accountTreeData.forEach(account => { + // 将所有右侧的穿梭状态重置 + account.children.forEach(child => { + itemSelect(child.key, false) + }) + }) } }, @@ -574,6 +581,7 @@ export default { } } else { const moveKey = moveKeys[0] + console.log('%c [ moveKey ]-577', 'font-size:13px; background:pink; color:#bf2c9f;', moveKey) let parentIndex = -1, childIndex = -1 for (const pIndex in this.accountTreeData) { @@ -587,6 +595,7 @@ 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 }