From b826e9a0c17ddcc2c2984b71469bc9d1f4b20ac7 Mon Sep 17 00:00:00 2001
From: lihang <lihang@vci-tech.com>
Date: 星期三, 17 五月 2023 14:29:58 +0800
Subject: [PATCH] 业务类型页面修正被git覆盖的部分
---
Source/UBCS-WEB/src/views/modeling/Relationpackage.vue | 2 +-
Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue | 5 ++++-
Source/UBCS-WEB/src/views/modeling/Torelationpackage.vue | 2 +-
Source/UBCS-WEB/src/views/modeling/Business.vue | 44 ++++++++++++++++++++++++++------------------
4 files changed, 32 insertions(+), 21 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/modeling/Business.vue b/Source/UBCS-WEB/src/views/modeling/Business.vue
index eca59a8..bcdfec8 100644
--- a/Source/UBCS-WEB/src/views/modeling/Business.vue
+++ b/Source/UBCS-WEB/src/views/modeling/Business.vue
@@ -1,14 +1,14 @@
<template>
<el-container>
- <el-header>
- <el-button type="primary" @click="businessAdd">鏂板</el-button>
- <el-button type="primary" @click="businessEdit">淇敼</el-button>
- <el-button type="primary" @click="selectFromTable">浠庡凡鏈変腑鑾峰彇</el-button>
+ <el-header class="businessHeader" style="height: 40px;">
+ <el-button type="primary" @click="businessAdd" size="small">鏂板</el-button>
+ <el-button type="primary" @click="businessEdit" size="small">淇敼</el-button>
+ <el-button type="primary" @click="selectFromTable" size="small">浠庡凡鏈変腑鑾峰彇</el-button>
</el-header>
<el-container>
<el-aside width="240px">
- <basic-container>
- <avue-tree id="basic" :data="treeData" :option="treeOption" @node-click="nodeClick">
+ <basic-container class="businessTreeContainer">
+ <avue-tree id="basic" :data="treeData" :option="treeOption" @node-click="nodeClick" class="businessTree">
<span class="el-tree-node__label" slot-scope="{ node, data }">
<span>
<i class="el-icon-star-on"></i>
@@ -125,21 +125,14 @@
</el-select>
<avue-crud class="businessCrud" v-model="ref.form" :option="ref.option" :data="ref.data" @selection-change="selectionChange">
</avue-crud>
-<<<<<<< Updated upstream
- <div slot="footer" class="dialog-footer">
- <el-button @click="dialoghandeltrue">纭畾</el-button>
- <el-button @click="dialoghandelfalse">鍙栨秷</el-button>
- </div>
-=======
<span slot="footer" class="dialog-footer">
<el-button @click="dialoghandelfalse">鍙� 娑�</el-button>
<el-button type="primary" @click="dialoghandeltrue">纭� 瀹�</el-button>
</span>
->>>>>>> Stashed changes
</el-dialog>
</el-container>
</el-container>
- <business-add ref="btmAdd" :btmType="addOption.btmType" :domainOption="domainOptions">
+ <business-add ref="btmAdd" :btmType="addOption.btmType" :domainOption="domainOptions" :icons="icons" @refreshTable="initTreeOnLoad">
</business-add>
</el-container>
</template>
@@ -214,6 +207,16 @@
},
domain: null,
domainOptions: [],
+ icons:{
+ key: 'el-icon-finished',
+ name: 'el-icon-info',
+ tableName: 'el-icon-date',
+ domain: 'el-icon-folder-opened',
+ revisionRule: 'el-icon-s-check',
+ lifeCycle: 'el-icon-refresh-right',
+ view: 'el-icon-view',
+ desc: 'el-icon-chat-line-square'
+ },
ref: {
// 浠庤〃涓�夋嫨dialog鐘舵��
visible: false,
@@ -329,7 +332,7 @@
this.ifRefreshBtmAddRefresh();
},
ifRefreshBtmAddRefresh(){
- this.$refs.btmAdd.refreshAttrTable();
+ // this.$refs.btmAdd.refreshAttrTable();
}
},
}
@@ -341,8 +344,13 @@
border-radius: 10px;
}
-.businessCrud > .el-card > .el-card__body > .avue-crud_menu{
- display: none!important;
+.businessCrud > .el-card:nth-of-type(2) > .el-card__body > .avue-crud__menu{
+ display: none !important;
}
-
+.attributeCrud > .el-card:nth-of-type(2) > .el-card__body > .avue-crud__menu{
+ display: none !important;
+}
+.businessTreeContainer > .el-card > .el-card__body {
+ height: 775px;
+}
</style>
diff --git a/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue b/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue
index 8e1b6a4..909692e 100644
--- a/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue
+++ b/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue
@@ -107,6 +107,9 @@
},
domainOption:{
type: Array
+ },
+ icons: {
+ type: Array
}
},
data() {
@@ -224,7 +227,7 @@
}
},
created() {
- console.log('123');
+
},
methods: {
closeSubmitDialog(){
diff --git a/Source/UBCS-WEB/src/views/modeling/Relationpackage.vue b/Source/UBCS-WEB/src/views/modeling/Relationpackage.vue
index dc9cecd..6f6fb86 100644
--- a/Source/UBCS-WEB/src/views/modeling/Relationpackage.vue
+++ b/Source/UBCS-WEB/src/views/modeling/Relationpackage.vue
@@ -1,4 +1,4 @@
-<<template>
+<template>
<basic-container>
<avue-crud ref="crud"
v-model="form"
diff --git a/Source/UBCS-WEB/src/views/modeling/Torelationpackage.vue b/Source/UBCS-WEB/src/views/modeling/Torelationpackage.vue
index f8d7a0d..7420379 100644
--- a/Source/UBCS-WEB/src/views/modeling/Torelationpackage.vue
+++ b/Source/UBCS-WEB/src/views/modeling/Torelationpackage.vue
@@ -1,4 +1,4 @@
-<<template>
+<template>
<basic-container>
<avue-crud ref="crud"
v-model="form"
--
Gitblit v1.9.3