From bbfec1dce46556faae84e2f2aa5b4d85b1293d76 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 07 十二月 2023 15:48:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/modeling/LinkType.vue | 60 ++++++--
Source/UBCS-WEB/src/views/code/code.vue | 273 +++++++++++++++++++-------------------
Source/UBCS-WEB/src/views/statistic/statisticPage.vue | 2
Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue | 4
Source/UBCS-WEB/src/views/modeling/Business.vue | 20 +-
Source/UBCS-WEB/src/const/code/codebasic.js | 2
Source/UBCS-WEB/src/const/code/mdmrule.js | 2
7 files changed, 195 insertions(+), 168 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index a8f99fe..91b2025 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -43,7 +43,7 @@
:defaultExpandAll="false"
:option="Treeoption"
class="classifyTree"
- style="height: calc(100vh - 280px)"
+ style="height: calc(100vh - 290px)"
@node-click="nodeClick"
>
</avue-tree>
@@ -53,7 +53,7 @@
<el-dialog v-loading="AddLoading" :before-close="TreeEscHandler"
:title="this.TreeFlag ? '娣诲姞鍒嗙被' :'娣诲姞涓婚搴�'" :visible.sync="TreeAddFormVisible" append-to-body
style="width: 1700px;margin: auto">
- <el-form ref="myForm" :model="TreeAddform" :rules="rules">
+ <el-form ref="myForm" :model="TreeAddform" :rules= "rules">
<el-form-item :label="this.TreeFlag ? '鍒嗙被缂栧彿锛�' :'涓婚搴撶紪鍙凤細'" label-width="150px" prop="id"
style="display: inline-block">
<el-input v-model="TreeAddform.id" autocomplete="off" style="width: 170px"></el-input>
diff --git a/Source/UBCS-WEB/src/const/code/codebasic.js b/Source/UBCS-WEB/src/const/code/codebasic.js
index 712b74a..511f52b 100644
--- a/Source/UBCS-WEB/src/const/code/codebasic.js
+++ b/Source/UBCS-WEB/src/const/code/codebasic.js
@@ -1,5 +1,5 @@
export default {
- height:'260',
+
tip: false,
editBtn: false,
addBtn: false,
diff --git a/Source/UBCS-WEB/src/const/code/mdmrule.js b/Source/UBCS-WEB/src/const/code/mdmrule.js
index 855f936..0b1d4c3 100644
--- a/Source/UBCS-WEB/src/const/code/mdmrule.js
+++ b/Source/UBCS-WEB/src/const/code/mdmrule.js
@@ -1,7 +1,5 @@
export default {
- height:"270",
tip: false,
- editBtn:false,
searchShow: true,
searchMenuSpan: 6,
border: true,
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 9455958..e5f4d23 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -2,144 +2,147 @@
<basic-container class="code-total" style=" height: 100%">
<!-- 缂栫爜瑙勫垯淇℃伅灞曠ず鍖哄煙 -->
<basic-container class="code-rule-container">
- <p
- style="
+ <div style="height: 40vh;overflow: auto;">
+ <p
+ style="
margin-top: -5px;
margin-bottom: 4px;
font-weight: 570;
font-size: 19px;
color: #0e2d5f;
"
- >
- 缂栫爜瑙勫垯
- </p>
- <avue-crud
- ref="crud"
- v-model="ruleForm"
- :before-open="beforeOpen"
- :data="data"
- :option="optionRule"
- :page.sync="page"
- :permission="permissionList"
- :table-loading="loading"
- class="code-rule-crud"
- @row-click="codeRuleRowClick"
- @row-update="rowUpdate"
- @row-save="rowSave"
- @search-change="searchChange"
- @search-reset="searchReset"
- @selection-change="selectionChange"
- @current-change="currentChange"
- @size-change="sizeChange"
- @refresh-change="refreshChange"
- @on-load="onLoad"
- >
- <!-- 琛ㄦ牸鍐呮搷浣滄寜閽� -->
- <template slot="menu" slot-scope="scope">
- <el-button v-if="permissionList.editBtn && (scope.row.lcStatus == 'Editing' ? true : false)"
- icon="el-icon-edit"
- plain
- size="small"
- type="text"
- @click="openEdit(scope.row)"
- >缂� 杈�
- </el-button>
- <el-button v-if="permissionList.releaseBtn && (scope.row.lcStatus == 'Editing' ? true : false)"
- :loading="releadDisabled"
- icon="el-icon-position"
- plain
- size="small"
- type="text"
- @click="enableOrDeactivatse(scope.row.oid, 'release')"
- >鍙� 甯�
- </el-button>
- <el-button v-if="permissionList.deactivateBtn && (scope.row.lcStatus == 'Released' ? true : false)"
- icon="el-icon-video-pause"
- plain
- size="small"
- type="text"
- @click="enableOrDeactivatse(scope.row.oid, 'disable')"
- >鍋� 鐢�
- </el-button>
- <el-button v-if="permissionList.enableBtn && (scope.row.lcStatus == 'Disabled' ? true : false)"
- icon="el-icon-video-play"
- plain
- size="small"
- type="text"
- @click="enableOrDeactivatse(scope.row.oid, 'enable')"
- >鍚� 鐢�
- </el-button>
- </template>
- <!-- 琛ㄦ牸涓婃柟鎸夐挳鍖哄煙 -->
- <template slot="menuLeft" slot-scope="scope">
- <el-button v-if="permissionList.rulDelBtn"
- icon="el-icon-delete"
- plain
- size="small"
- type="danger"
- @click="handleDelete"
- >
- 鍒� 闄�
- </el-button>
- <el-button v-if="permissionList.advancedQueryBtn"
- icon="el-icon-search"
- plain
- size="small"
- type="primary"
- @click="openAdvancedQuery('codeRule')">
- 楂樼骇鏌ヨ
- </el-button>
- <el-button v-if="permissionList.cloneBtn"
- icon="icon-kelong"
- plain
- size="small"
- @click="openCodeRuleDialog"
- >
- 鍏� 闅�
- </el-button>
- <el-button v-if="permissionList.otherCloneBtn"
- icon="icon-lianjiekelong"
- plain
- size="small"
- style="font-size: 12px"
- @click="openOtherCodeRuleDialog"
- >
- 浠庡叾浠栬鍒欎腑鍏嬮殕鐮佹
- </el-button>
- <el-button v-if="permissionList.usescopeBtn"
- icon="el-icon-s-help"
- plain
- size="small"
- @click="handleRange"
- >
- 浣跨敤鑼冨洿
- </el-button>
- <el-button v-if="permissionList.clearBtn"
- icon="icon-qingkong"
- plain
- size="small"
- @click="clearAllCodeSec"
- >
- 娓呯┖鐮佸��
- </el-button>
- <el-button v-if="permissionList.escapeOwnerBtn"
- icon="el-icon-guide"
- plain
- size="small"
- @click="escapeOwner"
- >
- 杞Щ鎵�鏈夎��
- </el-button>
- <el-button v-if="permissionList.maxSerialnumBtn"
- icon="el-icon-data-analysis"
- plain
- size="small"
- @click="maxSerialNum"
- >
- 鏈�澶ф祦姘村彿
- </el-button>
- </template>
- </avue-crud>
+ >
+ 缂栫爜瑙勫垯
+ </p>
+ <avue-crud
+ ref="crud"
+ v-model="ruleForm"
+ :before-open="beforeOpen"
+ :data="data"
+ :option="optionRule"
+ :page.sync="page"
+ :permission="permissionList"
+ :table-loading="loading"
+ class="code-rule-crud"
+ @row-click="codeRuleRowClick"
+ @row-update="rowUpdate"
+ @row-save="rowSave"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @selection-change="selectionChange"
+ @current-change="currentChange"
+ @size-change="sizeChange"
+ @refresh-change="refreshChange"
+ @on-load="onLoad"
+ >
+ <!-- 琛ㄦ牸鍐呮搷浣滄寜閽� -->
+ <template slot="menu" slot-scope="scope">
+ <el-button v-if="permissionList.editBtn && (scope.row.lcStatus == 'Editing' ? true : false)"
+ icon="el-icon-edit"
+ plain
+ size="small"
+ type="text"
+ @click="openEdit(scope.row)"
+ >缂� 杈�
+ </el-button>
+ <el-button v-if="permissionList.releaseBtn && (scope.row.lcStatus == 'Editing' ? true : false)"
+ :loading="releadDisabled"
+ icon="el-icon-position"
+ plain
+ size="small"
+ type="text"
+ @click="enableOrDeactivatse(scope.row.oid, 'release')"
+ >鍙� 甯�
+ </el-button>
+ <el-button v-if="permissionList.deactivateBtn && (scope.row.lcStatus == 'Released' ? true : false)"
+ icon="el-icon-video-pause"
+ plain
+ size="small"
+ type="text"
+ @click="enableOrDeactivatse(scope.row.oid, 'disable')"
+ >鍋� 鐢�
+ </el-button>
+ <el-button v-if="permissionList.enableBtn && (scope.row.lcStatus == 'Disabled' ? true : false)"
+ icon="el-icon-video-play"
+ plain
+ size="small"
+ type="text"
+ @click="enableOrDeactivatse(scope.row.oid, 'enable')"
+ >鍚� 鐢�
+ </el-button>
+ </template>
+ <!-- 琛ㄦ牸涓婃柟鎸夐挳鍖哄煙 -->
+ <template slot="menuLeft" slot-scope="scope">
+ <el-button v-if="permissionList.rulDelBtn"
+ icon="el-icon-delete"
+ plain
+ size="small"
+ type="danger"
+ @click="handleDelete"
+ >
+ 鍒� 闄�
+ </el-button>
+ <el-button v-if="permissionList.advancedQueryBtn"
+ icon="el-icon-search"
+ plain
+ size="small"
+ type="primary"
+ @click="openAdvancedQuery('codeRule')">
+ 楂樼骇鏌ヨ
+ </el-button>
+ <el-button v-if="permissionList.cloneBtn"
+ icon="icon-kelong"
+ plain
+ size="small"
+ @click="openCodeRuleDialog"
+ >
+ 鍏� 闅�
+ </el-button>
+ <el-button v-if="permissionList.otherCloneBtn"
+ icon="icon-lianjiekelong"
+ plain
+ size="small"
+ style="font-size: 12px"
+ @click="openOtherCodeRuleDialog"
+ >
+ 浠庡叾浠栬鍒欎腑鍏嬮殕鐮佹
+ </el-button>
+ <el-button v-if="permissionList.usescopeBtn"
+ icon="el-icon-s-help"
+ plain
+ size="small"
+ @click="handleRange"
+ >
+ 浣跨敤鑼冨洿
+ </el-button>
+ <el-button v-if="permissionList.clearBtn"
+ icon="icon-qingkong"
+ plain
+ size="small"
+ @click="clearAllCodeSec"
+ >
+ 娓呯┖鐮佸��
+ </el-button>
+ <el-button v-if="permissionList.escapeOwnerBtn"
+ icon="el-icon-guide"
+ plain
+ size="small"
+ @click="escapeOwner"
+ >
+ 杞Щ鎵�鏈夎��
+ </el-button>
+ <el-button v-if="permissionList.maxSerialnumBtn"
+ icon="el-icon-data-analysis"
+ plain
+ size="small"
+ @click="maxSerialNum"
+ >
+ 鏈�澶ф祦姘村彿
+ </el-button>
+ </template>
+ </avue-crud>
+ </div>
+
</basic-container>
<!-- 楂樼骇鏌ヨ瀵硅瘽妗� -->
@@ -217,6 +220,7 @@
<!-- 鍩虹鐮佹灞曠ず鍖哄煙 -->
<basic-container class="code-basicsec-container">
+ <div style="height: 38.5vh;overflow: auto">
<p
style="margin-top: -5px;
margin-bottom: 4px;
@@ -316,6 +320,7 @@
</el-button>
</template>
</avue-crud>
+ </div>
</basic-container>
<!-- 鐮佹鐮佸�肩鐞嗗璇濇 -->
@@ -3549,10 +3554,6 @@
font-size: 12px !important;
}
-.code-rule-crud > .avue-crud__search,
-.code-basic-crud > .avue-crud__search {
- margin-bottom: -15px;
-}
.clone-input-textarea > .el-form-item__content {
width: 495px;
diff --git a/Source/UBCS-WEB/src/views/modeling/Business.vue b/Source/UBCS-WEB/src/views/modeling/Business.vue
index 8bbac5a..fb9fdec 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>
@@ -171,7 +171,7 @@
selectionList: [],
treeData: [],
treeOption: {
- defaultExpandAll: true,
+ defaultExpandAll: false,
title: '涓氬姟绫诲瀷鏍�',
addBtn: false,
menu: false,
@@ -186,8 +186,8 @@
btmType: {},
},
loadOption: {
+ height:'auto',
border: true,
- height: 478,
editBtn: false,
addBtn: false,
menu: false,
@@ -381,7 +381,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 +394,7 @@
.app {
overflow: auto;
- height: calc(100vh - 150px);
+ height: 84.3vh;
}
.app::-webkit-scrollbar {
@@ -407,8 +407,12 @@
// 婊氬姩鏉＄殑婊戝潡
.app::-webkit-scrollbar-thumb {
+ width: 10px;
+ height: 10px;
background-color: #ececec;
border-radius: 20px;
border: #ececec;
}
+
+
</style>
diff --git a/Source/UBCS-WEB/src/views/modeling/LinkType.vue b/Source/UBCS-WEB/src/views/modeling/LinkType.vue
index a26c55d..d28d2bc 100644
--- a/Source/UBCS-WEB/src/views/modeling/LinkType.vue
+++ b/Source/UBCS-WEB/src/views/modeling/LinkType.vue
@@ -1,30 +1,30 @@
<template>
<el-container>
<!-- 椤剁鎸夐挳 -->
- <el-header class="businessHeader" style="height: 40px;">
- <div>
- <el-button type="primary" @click="linkTypeAdd" size="small" icon="el-icon-plus" v-if="permissionList.addBtn" plain>
- 鏂板
- </el-button>
- <el-button type="primary" @click="linkTypeEdit" size="small" icon="el-icon-edit" v-if="permissionList.editBtn" plain>
- 淇敼
- </el-button>
- </div>
- </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" @node-click="nodeClick"
- class="businessTree">
- <span class="el-tree-node__label" slot-scope="{ node, data }">
+ <div class="app">
+ <div style="display: flex;margin-bottom: 10px;">
+ <el-button type="primary" @click="linkTypeAdd" size="mini" v-if="permissionList.addBtn" plain>
+ 鏂板
+ </el-button>
+ <el-button type="primary" @click="linkTypeEdit" size="mini" v-if="permissionList.editBtn" plain>
+ 淇敼
+ </el-button>
+ </div>
+ <avue-tree :data="treeData" :option="treeOption" @node-click="nodeClick"
+ class="businessTree">
+ <template class="el-tree-node__label" slot-scope="{ node, data }">
<span>
<i class="el-icon-star-on"></i>
{{ (node || {}).label }}
</span>
- </span>
+ </template>
</avue-tree>
+ </div>
</basic-container>
</el-aside>
<el-container>
@@ -178,7 +178,7 @@
},
loadOption: {
border: true,
- height: 395,
+ height: 'auto',
editBtn: false,
addBtn: false,
menu: false,
@@ -215,6 +215,7 @@
},
obj: {},
treeOption: {
+ height:'auto',
defaultExpandAll: true,
title: '閾炬帴绫诲瀷鏍�',
addBtn: false,
@@ -285,8 +286,31 @@
}
</script>
-<style lang="scss">
+<style lang="scss" scoped>
.attributeCrud>.el-card:nth-of-type(2)>.el-card__body>.avue-crud__menu {
display: none !important;
}
+.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>
diff --git a/Source/UBCS-WEB/src/views/statistic/statisticPage.vue b/Source/UBCS-WEB/src/views/statistic/statisticPage.vue
index 9403436..cf4ee2f 100644
--- a/Source/UBCS-WEB/src/views/statistic/statisticPage.vue
+++ b/Source/UBCS-WEB/src/views/statistic/statisticPage.vue
@@ -48,7 +48,7 @@
</span>
</el-dialog>
<!-- echarts缁勪欢-->
- <div style="margin-top: 15px">
+ <div style="margin-top: 15px;padding-bottom: 35px">
<lineChart v-for="(item,index) in lineList" :key="index" :chartName="item.menuName"
:lineData="item.menuData"></lineChart>
<pieChart v-for="(item,index) in pieList" :key="index" :chartName="item.menuName"
--
Gitblit v1.9.3