From 21f3125855d271c8060c51aad9f3e6cb8f860a6e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 16 五月 2023 22:19:53 +0800
Subject: [PATCH] 代码被覆盖重新整合上传
---
Source/UBCS-WEB/src/views/modeling/Business.vue | 78 ++++++++++++++++-----------------------
1 files changed, 32 insertions(+), 46 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/modeling/Business.vue b/Source/UBCS-WEB/src/views/modeling/Business.vue
index ce72565..eca59a8 100644
--- a/Source/UBCS-WEB/src/views/modeling/Business.vue
+++ b/Source/UBCS-WEB/src/views/modeling/Business.vue
@@ -50,7 +50,9 @@
<i class="el-icon-folder-opened"></i>
鎵�灞為鍩�
</template>
- {{ obj.domain }}
+ <el-tag size="small">
+ {{ obj.domainText }}
+ </el-tag>
</el-descriptions-item>
<!-- <el-descriptions-item>
<template slot="label">
@@ -85,7 +87,9 @@
<i class="el-icon-view"></i>
瑙嗗浘
</template>
- {{ obj.viewFlag }}
+ <el-tag size="small">
+ {{ obj.viewText }}
+ </el-tag>
</el-descriptions-item>
<!-- <el-descriptions-item>
<template slot="label">
@@ -106,21 +110,32 @@
<!-- 灞炴�у垪琛�-->
<basic-container>
<p style="margin-top: 10px;font-weight: 570;font-size: 19px">灞炴�у垪琛�</p>
- <avue-crud v-model="obj" :data="obj.attributes" :option="loadOption" @row-save="loadSave"></avue-crud>
+ <avue-crud class="attributeCrud" v-model="obj" :data="obj.attributes" :option="loadOption">
+ <template slot="attrDataType" slot-scope="{row}" >
+ <el-tag>{{row.attrDataType}}</el-tag>
+ </template>
+ </avue-crud>
</basic-container>
</el-main>
<el-dialog :visible="ref.visible" title="浠庢暟鎹簱涓坊鍔�" width="700px" append-to-body @close="dialoghandelfalse">
閫夋嫨棰嗗煙锛�
<el-select v-model="domain" placeholder="璇烽�夋嫨" @change="refOnLoad">
- <el-option v-for="item in domainOptions" :key="item" :label="item" :value="item">
+ <el-option v-for="item in domainOptions" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</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>
@@ -171,18 +186,19 @@
columnBtn:false,
column: [
{
- label: '灞炴�ц嫳鏂囧悕绉�',
+ label: '鑻辨枃鍚嶇О',
prop: 'id',
align: 'center'
}, {
- label: '灞炴�т腑鏂囧悕绉�',
+ label: '涓枃鍚嶇О',
prop: 'name',
align: 'center'
},
{
- label: "灞炴�х被鍨�",
+ label: "绫诲瀷",
prop: "attrDataType",
- align: 'center'
+ align: 'center',
+ slot: true
},
{
label: "榛樿鍊�",
@@ -240,38 +256,6 @@
this.initDomainOption();
},
methods: {
- //鐢熷懡鍛ㄦ湡瀵硅瘽妗嗗彇娑堢偣鍑讳簨浠�
- dialoghandelfalse() {
- this.packageLifeBox = false
- },
- //鐢熷懡鍛ㄦ湡瀵硅瘽妗嗙‘瀹氱偣鍑讳簨浠�
- dialoghandeltrue() {
- this.packageLifeBox = false
- },
- //閫夋嫨鐢熷懡鍛ㄦ湡瀵硅瘽妗�
- handelLife() {
- this.packageLifeBox = true
- },
- //鐗堟湰瑙勫垯鎵嬪姩杈撳叆鍜岄�夋嫨妗嗙殑鐘舵�佸彇鍙�
- handelRules() {
- this.rulesFalg = !this.rulesFalg
- },
- //鐗堟湰瑙勫垯涓変釜鎸夐挳鐨勬樉绀洪殣钘�
- radioChange(val) {
- if (val.value == 0) {
- this.basicOption.group[1].column[1].display = false;
- this.basicOption.group[1].column[2].display = false;
- this.basicOption.group[1].column[3].display = false;
- } else if (val.value == 1) {
- this.basicOption.group[1].column[1].display = true;
- this.basicOption.group[1].column[2].display = true;
- this.basicOption.group[1].column[3].display = false;
- } else if (val.value == 2) {
- this.basicOption.group[1].column[1].display = true;
- this.basicOption.group[1].column[2].display = true;
- this.basicOption.group[1].column[3].display = true;
- }
- },
nodeClick(data) {
getDetail(data.oid).then(res => {
this.obj = res.data.data;
@@ -312,7 +296,6 @@
},
initTreeOnLoad() {
initTree().then(res => {
- console.log('123');
this.treeData = res.data.data;
});
},
@@ -323,7 +306,6 @@
},
selectionChange(list) {
this.selectionList = list;
- console.log(this.selectionList);
},
dialoghandelfalse() {
this.ref.visible = false;
@@ -339,12 +321,15 @@
},
businessAdd(){
this.$refs.btmAdd.showSubmitDialog = true;
- console.log('娣诲姞');
+ this.ifRefreshBtmAddRefresh();
},
businessEdit(){
- this.addOption.btmType = this.obj;
- this.$refs.addOption.showSubmitDialog = true;
- console.log('缂栬緫');
+ this.$refs.btmAdd.btmType = this.obj;
+ this.$refs.btmAdd.showSubmitDialog = true;
+ this.ifRefreshBtmAddRefresh();
+ },
+ ifRefreshBtmAddRefresh(){
+ this.$refs.btmAdd.refreshAttrTable();
}
},
}
@@ -359,4 +344,5 @@
.businessCrud > .el-card > .el-card__body > .avue-crud_menu{
display: none!important;
}
+
</style>
--
Gitblit v1.9.3