From 05d45bd440ffc92e14e6c8728ac8956a0488c0ab Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 07 十二月 2023 17:20:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/modeling/Business.vue | 117 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 62 insertions(+), 55 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/modeling/Business.vue b/Source/UBCS-WEB/src/views/modeling/Business.vue
index 7a4f178..fb9fdec 100644
--- a/Source/UBCS-WEB/src/views/modeling/Business.vue
+++ b/Source/UBCS-WEB/src/views/modeling/Business.vue
@@ -1,30 +1,33 @@
<template>
<el-container>
- <el-header class="businessHeader" style="height: 40px;padding:0 8px">
- <div>
- <el-button v-if="permissionList.addBtn" icon="el-icon-plus" size="small" type="primary" @click="businessAdd">
- 鏂板
- </el-button>
- <el-button v-if="permissionList.editBtn" icon="el-icon-edit" size="small" type="primary" @click="businessEdit">
- 淇敼
- </el-button>
- <el-button v-if="permissionList.table" icon="el-icon-thumb" size="small" type="primary"
- @click="selectFromTable"> 浠庡凡鏈変腑鑾峰彇
- </el-button>
- </div>
- </el-header>
+<!-- <el-header class="businessHeader" style="height: 40px;padding:0 8px">-->
+
+<!-- </el-header>-->
<el-container>
- <el-aside width="240px">
+ <el-aside style="width: 20%">
<basic-container class="businessTreeContainer">
- <p style="margin-top: 10px;font-weight: 570;font-size: 19px">{{ treeOption.title }}</p>
- <avue-tree id="basic" :data="treeData" :option="treeOption" class="businessTree" @node-click="nodeClick">
- <span slot-scope="{ node, data }" class="el-tree-node__label">
+ <div class="app">
+ <div style="display: flex;margin-bottom: 10px;justify-content: space-around;">
+ <el-button v-if="permissionList.addBtn" size="mini" type="primary" @click="businessAdd" plain style="width: 60px">
+ 鏂板
+ </el-button>
+ <el-button v-if="permissionList.editBtn" size="mini" type="primary" @click="businessEdit" plain style="width: 60px">
+ 淇敼
+ </el-button>
+ <el-button v-if="permissionList.table" size="mini" type="primary"
+ @click="selectFromTable" plain> 浠庡凡鏈変腑鑾峰彇
+ </el-button>
+ </div>
+ <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>
- </avue-tree>
+ </template>
+ </avue-tree>
+ </div>
+
</basic-container>
</el-aside>
<el-container>
@@ -68,20 +71,6 @@
</el-tag>
<span v-else></span>
</el-descriptions-item>
- <!-- <el-descriptions-item>
- <template slot="label">
- <i class="el-icon-s-ticket"></i>
- 鏍囩
- </template>
- {{obj.hashtag}}
- </el-descriptions-item> -->
- <!-- <el-descriptions-item>
- <template slot="label">
- <i class="el-icon-arrow-up"></i>
- 缁ф壙鑷�
- </template>
- {{ obj.sss }}
- </el-descriptions-item> -->
<el-descriptions-item :contentStyle="descriptionOption.contentStyle"
:labelStyle="descriptionOption.labelStyle">
<template slot="label">
@@ -98,17 +87,17 @@
</template>
{{ obj.lifeCycleName ? obj.lifeCycleName + '(' + obj.lifeCycleId + ')' : '' }}
</el-descriptions-item>
- <el-descriptions-item :contentStyle="descriptionOption.contentStyle"
- :labelStyle="descriptionOption.labelStyle">
- <template slot="label">
- <i :class="icons.view"></i>
- 瑙嗗浘
- </template>
- <el-tag v-if="obj.viewText" size="small">
- {{ obj.viewText }}
- </el-tag>
- <span v-else></span>
- </el-descriptions-item>
+<!-- <el-descriptions-item :contentStyle="descriptionOption.contentStyle"-->
+<!-- :labelStyle="descriptionOption.labelStyle">-->
+<!-- <template slot="label">-->
+<!-- <i :class="icons.view"></i>-->
+<!-- 瑙嗗浘-->
+<!-- </template>-->
+<!-- <el-tag v-if="obj.viewText" size="small">-->
+<!-- {{ obj.viewText }}-->
+<!-- </el-tag>-->
+<!-- <span v-else></span>-->
+<!-- </el-descriptions-item>-->
<!-- <el-descriptions-item>
<template slot="label">
<i class="el-icon-arrow-down"></i>
@@ -136,7 +125,7 @@
</avue-crud>
</basic-container>
</el-main>
- <el-dialog :visible="ref.visible" append-to-body title="浠庢暟鎹簱涓坊鍔�" width="700px" @close="dialoghandelfalse">
+ <el-dialog :visible="ref.visible" append-to-body title="浠庢暟鎹簱涓坊鍔�" width="700px" @close="dialoghandelfalse" top="9vh">
閫夋嫨棰嗗煙锛�
<el-select v-model="domain" placeholder="璇烽�夋嫨" size="small" @change="refOnLoad">
<el-option v-for="item in domainOptions" :key="item.value" :label="item.label" :value="item.value">
@@ -182,7 +171,7 @@
selectionList: [],
treeData: [],
treeOption: {
- defaultExpandAll: true,
+ defaultExpandAll: false,
title: '涓氬姟绫诲瀷鏍�',
addBtn: false,
menu: false,
@@ -197,8 +186,8 @@
btmType: {},
},
loadOption: {
+ height:'auto',
border: true,
- height: 478,
editBtn: false,
addBtn: false,
menu: false,
@@ -392,11 +381,7 @@
}
</script>
-<style lang="scss">
-#basic {
- height: 770px;
- border-radius: 10px;
-}
+<style lang="scss" scoped>
.businessCrud > .el-card:nth-of-type(2) > .el-card__body > .avue-crud__menu {
display: none !important;
@@ -406,6 +391,28 @@
display: none !important;
}
-.businessTreeContainer > .el-card > .el-card__body {
- height: 775px;
-}</style>
+
+.app {
+ overflow: auto;
+ height: 84.3vh;
+}
+
+.app::-webkit-scrollbar {
+ height: 15px; // 绾靛悜婊氬姩鏉� 蹇呭啓
+ background: white;
+ border: white;
+ width: 10px;
+
+}
+
+// 婊氬姩鏉＄殑婊戝潡
+.app::-webkit-scrollbar-thumb {
+ width: 10px;
+ height: 10px;
+ background-color: #ececec;
+ border-radius: 20px;
+ border: #ececec;
+}
+
+
+</style>
--
Gitblit v1.9.3