From 6a5d1fda15176a5866eaccb31f0e78ef65dd1461 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 07 十一月 2023 17:33:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/modeling/LinkType.vue | 4 ++--
Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue | 2 +-
Source/UBCS-WEB/src/views/level/levelPage.vue | 13 +++++++++++++
Source/UBCS-WEB/src/views/modeling/Business.vue | 6 +++---
Source/UBCS-WEB/src/components/Master/MasterTree.vue | 2 +-
5 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index d49490c..7eb9ae4 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
@@ -6,7 +6,7 @@
<span v-html="node.label"></span>
</template>
</avue-tree>
- <div style="display: inline-block;"><i class="el-icon-refresh refresh-icon" @click="getTreeLists"></i></div>
+ <div style="display: inline-block;"><el-link icon="el-icon-refresh" class="refresh-icon" @click="getTreeLists"></el-link></div>
</div>
</template>
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index 3a5e81f..3be138c 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -1656,4 +1656,4 @@
width: 500px;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/Source/UBCS-WEB/src/views/level/levelPage.vue b/Source/UBCS-WEB/src/views/level/levelPage.vue
new file mode 100644
index 0000000..6d1843f
--- /dev/null
+++ b/Source/UBCS-WEB/src/views/level/levelPage.vue
@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+ name: "levelPage"
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/Source/UBCS-WEB/src/views/modeling/Business.vue b/Source/UBCS-WEB/src/views/modeling/Business.vue
index 95a2129..c9fcc0e 100644
--- a/Source/UBCS-WEB/src/views/modeling/Business.vue
+++ b/Source/UBCS-WEB/src/views/modeling/Business.vue
@@ -2,14 +2,14 @@
<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 v-if="permissionList.addBtn" icon="el-icon-plus" size="small" type="primary" @click="businessAdd" plain>
鏂板
</el-button>
- <el-button v-if="permissionList.editBtn" icon="el-icon-edit" size="small" type="primary" @click="businessEdit">
+ <el-button v-if="permissionList.editBtn" icon="el-icon-edit" size="small" type="primary" @click="businessEdit" plain>
淇敼
</el-button>
<el-button v-if="permissionList.table" icon="el-icon-thumb" size="small" type="primary"
- @click="selectFromTable"> 浠庡凡鏈変腑鑾峰彇
+ @click="selectFromTable" plain> 浠庡凡鏈変腑鑾峰彇
</el-button>
</div>
</el-header>
diff --git a/Source/UBCS-WEB/src/views/modeling/LinkType.vue b/Source/UBCS-WEB/src/views/modeling/LinkType.vue
index 23417ee..a26c55d 100644
--- a/Source/UBCS-WEB/src/views/modeling/LinkType.vue
+++ b/Source/UBCS-WEB/src/views/modeling/LinkType.vue
@@ -3,10 +3,10 @@
<!-- 椤剁鎸夐挳 -->
<el-header class="businessHeader" style="height: 40px;">
<div>
- <el-button type="primary" @click="linkTypeAdd" size="small" icon="el-icon-plus" v-if="permissionList.addBtn">
+ <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">
+ <el-button type="primary" @click="linkTypeEdit" size="small" icon="el-icon-edit" v-if="permissionList.editBtn" plain>
淇敼
</el-button>
</div>
--
Gitblit v1.9.3