From 6cfb1670e56aa394b7f668daf9adf01cc965ecc9 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 08 十二月 2023 11:45:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/views/modeling/Business.vue |   25 ++++++++++++++++---------
 1 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/modeling/Business.vue b/Source/UBCS-WEB/src/views/modeling/Business.vue
index 8bbac5a..775856c 100644
--- a/Source/UBCS-WEB/src/views/modeling/Business.vue
+++ b/Source/UBCS-WEB/src/views/modeling/Business.vue
@@ -4,7 +4,7 @@
 
 <!--    </el-header>-->
     <el-container>
-      <el-aside>
+      <el-aside style="width: 20%">
         <basic-container class="businessTreeContainer">
           <div class="app">
             <div style="display: flex;margin-bottom: 10px;justify-content: space-around;">
@@ -18,13 +18,13 @@
                          @click="selectFromTable" plain> 浠庡凡鏈変腑鑾峰彇
               </el-button>
             </div>
-            <avue-tree :data="treeData" :option="treeOption" class="businessTree" @node-click="nodeClick">
-            <span slot-scope="{ node, data }" class="el-tree-node__label">
+            <avue-tree :data="treeData" :option="treeOption" class="businessTree" @node-click="nodeClick" style="width: fit-content;">
+            <template slot-scope="{ node, data }" class="el-tree-node__label">
               <span>
                 <i :class="(node || {}).level === 2 ? 'el-icon-star-off' : 'el-icon-folder-opened'"></i>
                 {{ (node || {}).label }}
               </span>
-            </span>
+            </template>
             </avue-tree>
           </div>
 
@@ -144,7 +144,7 @@
         </el-dialog>
       </el-container>
     </el-container>
-    <business-add ref="btmAdd" :btmType="addOption.btmType" :domainOption="domainOptions" :icons="icons"
+    <business-add ref="btmAdd" :btmType="addOption.btmType" :domainOption="domainOptions" :icons="icons" :type="type"
                   @refreshTable="initTreeOnLoad">
     </business-add>
   </el-container>
@@ -163,6 +163,7 @@
   name: "Business",
   data() {
     return {
+      type:"",
       //鐢熷懡鍛ㄦ湡瀵硅瘽妗嗙姸鎬�
       packageLifeBox: false,
       //鐗堟湰瑙勫垯鐘舵��
@@ -171,7 +172,7 @@
       selectionList: [],
       treeData: [],
       treeOption: {
-        defaultExpandAll: true,
+        defaultExpandAll: false,
         title: '涓氬姟绫诲瀷鏍�',
         addBtn: false,
         menu: false,
@@ -186,8 +187,8 @@
         btmType: {},
       },
       loadOption: {
+        height:'auto',
         border: true,
-        height: 478,
         editBtn: false,
         addBtn: false,
         menu: false,
@@ -362,6 +363,7 @@
     businessAdd() {
       this.$refs.btmAdd.showSubmitDialog = true;
       this.$refs.btmAdd.btmType = {};
+      this.type = 'add';
       this.ifRefreshBtmAddRefresh();
     },
     businessEdit() {
@@ -372,6 +374,7 @@
       const json = JSON.stringify(this.obj);
       this.$refs.btmAdd.btmType = JSON.parse(json);
       this.$refs.btmAdd.showSubmitDialog = true;
+      this.type = 'edit'
       this.ifRefreshBtmAddRefresh();
     },
     ifRefreshBtmAddRefresh() {
@@ -381,7 +384,7 @@
 }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 
 .businessCrud > .el-card:nth-of-type(2) > .el-card__body > .avue-crud__menu {
   display: none !important;
@@ -394,7 +397,7 @@
 
 .app {
   overflow: auto;
-  height: calc(100vh - 150px);
+  height: 84.3vh;
 }
 
 .app::-webkit-scrollbar {
@@ -407,8 +410,12 @@
 
 // 婊氬姩鏉＄殑婊戝潡
 .app::-webkit-scrollbar-thumb {
+  width: 10px;
+  height: 10px;
   background-color: #ececec;
   border-radius: 20px;
   border: #ececec;
 }
+
+
 </style>

--
Gitblit v1.10.0