From 3917aa1ec3ba4fd6c4f3da76c70236768fc229ee Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 25 一月 2024 22:14:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue | 42 +++++++++++++++++++++++-------------------
Source/UBCS-WEB/src/views/modeling/Business.vue | 8 ++++----
2 files changed, 27 insertions(+), 23 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index 59a9275..b7e071a 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -44,25 +44,25 @@
</el-button>
</div>
<!-- 宸︿晶鏍�-->
-
- <avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="CloneTreedata"
- :defaultExpandAll="false"
- :option="Treeoption"
- class="classifyTree"
- style="height: 610px"
- @node-click="nodeClick"
- >
- <template slot-scope="{ node, data }" class="el-tree-node__label">
- <el-tooltip :content="$createElement('div', { domProps: { innerHTML: node.label } })" class="item"
- effect="dark"
- open-delay="500"
- placement="right-start">
+ <div style="height: 690px;overflow: auto">
+ <avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="CloneTreedata"
+ :defaultExpandAll="false"
+ :option="Treeoption"
+ class="classifyTree"
+ @node-click="nodeClick"
+ >
+ <template slot-scope="{ node, data }" class="el-tree-node__label">
+ <el-tooltip :content="$createElement('div', { domProps: { innerHTML: node.label } })" class="item"
+ effect="dark"
+ open-delay="500"
+ placement="right-start">
<span style="font-size: 14px;">
{{ (node || {}).label }}
</span>
- </el-tooltip>
- </template>
- </avue-tree>
+ </el-tooltip>
+ </template>
+ </avue-tree>
+ </div>
</div>
<!-- 鏍戣妭鐐规坊鍔犲璇濇-->
@@ -1503,9 +1503,9 @@
</script>
<style lang="scss" scoped>
-.el-container {
- height: 100%;
-}
+//.el-container {
+// height: 100%;
+//}
.el-aside {
//height: calc(100% - 30px);
@@ -1550,4 +1550,8 @@
.headerCon > .el-button:nth-child(9) {
margin-left: 0;
}
+///deep/.el-scrollbar__bar.is-vertical{
+// width: 8px;
+//}
+
</style>
diff --git a/Source/UBCS-WEB/src/views/modeling/Business.vue b/Source/UBCS-WEB/src/views/modeling/Business.vue
index df22c8a..f568592 100644
--- a/Source/UBCS-WEB/src/views/modeling/Business.vue
+++ b/Source/UBCS-WEB/src/views/modeling/Business.vue
@@ -4,15 +4,15 @@
<!-- </el-header>-->
<el-container>
- <el-aside style="width: 20%">
+ <el-aside style="width: 300px">
<basic-container class="businessTreeContainer">
<div class="app">
<div style="display: flex;margin-bottom: 10px;justify-content: space-around;">
- <el-button v-if="permissionList.addBtn" plain size="mini" style="width: 60px" type="primary"
+ <el-button v-if="permissionList.addBtn" plain size="mini" type="primary"
@click="businessAdd">
鏂板
</el-button>
- <el-button v-if="permissionList.editBtn" plain size="mini" style="width: 60px" type="primary"
+ <el-button v-if="permissionList.editBtn" plain size="mini" type="primary"
@click="businessEdit">
淇敼
</el-button>
@@ -25,7 +25,7 @@
<template slot-scope="{ node, data }" class="el-tree-node__label">
<el-tooltip :content="$createElement('div', { domProps: { innerHTML: node.label } })" class="item" effect="dark"
open-delay="250"
- placement="right-start">
+ placement="top-start">
<span>
<i :class="(node || {}).level === 2 ? 'el-icon-star-off' : 'el-icon-folder-opened'"></i>
{{ (node || {}).label }}
--
Gitblit v1.9.3