From fe903b2a6834ac06a2d1b49b705c74ad1ccb10d8 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 28 七月 2023 12:04:53 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/const/omd/enum.js | 4 ++--
Source/UBCS-WEB/src/views/work/todo.vue | 2 +-
Source/UBCS-WEB/src/views/modeling/cycle.vue | 2 ++
Source/UBCS-WEB/src/views/modeling/LinkType.vue | 13 ++++++-------
Source/UBCS-WEB/src/views/modeling/LinkTypeAdd.vue | 7 +++++--
Source/UBCS-WEB/src/views/work/start.vue | 2 +-
Source/UBCS-WEB/src/views/modeling/original.vue | 3 ++-
Source/UBCS-WEB/src/views/omd/enum.vue | 2 ++
Source/UBCS-WEB/src/views/modeling/status.vue | 2 ++
Source/UBCS-WEB/src/views/work/send.vue | 2 +-
Source/UBCS-WEB/src/views/modeling/Business.vue | 10 ++++++----
Source/UBCS-WEB/src/views/work/done.vue | 2 +-
Source/UBCS-WEB/src/views/work/claim.vue | 2 +-
13 files changed, 32 insertions(+), 21 deletions(-)
diff --git a/Source/UBCS-WEB/src/const/omd/enum.js b/Source/UBCS-WEB/src/const/omd/enum.js
index 20d2e6b..bd33829 100644
--- a/Source/UBCS-WEB/src/const/omd/enum.js
+++ b/Source/UBCS-WEB/src/const/omd/enum.js
@@ -1,6 +1,6 @@
export const optionParent = {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 20,
tip: false,
searchShow: true,
searchMenuSpan: 10,
@@ -94,7 +94,7 @@
export const optionChild = {
height: 'auto',
- calcHeight: 95,
+ calcHeight: 200,
tip: false,
searchShow: true,
searchMenuSpan: 10,
diff --git a/Source/UBCS-WEB/src/views/modeling/Business.vue b/Source/UBCS-WEB/src/views/modeling/Business.vue
index 6dd1b28..317fdb0 100644
--- a/Source/UBCS-WEB/src/views/modeling/Business.vue
+++ b/Source/UBCS-WEB/src/views/modeling/Business.vue
@@ -1,6 +1,6 @@
<template>
<el-container>
- <el-header class="businessHeader" style="height: 40px;">
+ <el-header class="businessHeader" style="height: 40px;padding:0 8px">
<el-button-group>
<el-button type="primary" @click="businessAdd" size="small"> <i class="el-icon-plus"></i> 鏂板</el-button>
<el-button type="primary" @click="businessEdit" size="small"><i class="el-icon-edit"></i> 淇敼</el-button>
@@ -58,9 +58,10 @@
<i :class="icons.domain"></i>
鎵�灞為鍩�
</template>
- <el-tag size="small">
+ <el-tag v-if="obj.domainText" size="small">
{{ obj.domainText }}
</el-tag>
+ <span v-else></span>
</el-descriptions-item>
<!-- <el-descriptions-item>
<template slot="label">
@@ -98,9 +99,10 @@
<i :class="icons.view"></i>
瑙嗗浘
</template>
- <el-tag size="small">
+ <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">
@@ -189,7 +191,7 @@
},
loadOption: {
border: true,
- height: 466,
+ height: 478,
editBtn: false,
addBtn: false,
menu: false,
diff --git a/Source/UBCS-WEB/src/views/modeling/LinkType.vue b/Source/UBCS-WEB/src/views/modeling/LinkType.vue
index 43e926a..4f2371b 100644
--- a/Source/UBCS-WEB/src/views/modeling/LinkType.vue
+++ b/Source/UBCS-WEB/src/views/modeling/LinkType.vue
@@ -64,7 +64,7 @@
<i :class="icons.domain"></i>
鎵�灞為鍩�
</template>
- <el-tag size="small">
+ <el-tag v-if="obj.domainText" size="small">
{{ obj.domainText }}
</el-tag>
</el-descriptions-item>
@@ -97,7 +97,7 @@
</el-descriptions>
<el-descriptions class="margin-top" :column="2" size="medium" border>
- <!--
+ <!--
<el-descriptions-item :labelStyle="descriptionOption.labelStyle"
:contentStyle="descriptionOption.contentStyle">
<template slot="label">
@@ -122,7 +122,7 @@
</template>
{{ obj.description }}
</el-descriptions-item>
- </el-descriptions>
+ </el-descriptions>
</basic-container>
<!-- 灞炴�у垪琛�-->
<basic-container>
@@ -142,7 +142,7 @@
</el-container>
</template>
-
+
<script>
import {
initTree,
@@ -179,7 +179,7 @@
},
loadOption: {
border: true,
- height: 360,
+ height: 395,
editBtn: false,
addBtn: false,
menu: false,
@@ -276,10 +276,9 @@
}
}
</script>
-
+
<style lang="scss">
.attributeCrud>.el-card:nth-of-type(2)>.el-card__body>.avue-crud__menu {
display: none !important;
}
</style>
-
\ No newline at end of file
diff --git a/Source/UBCS-WEB/src/views/modeling/LinkTypeAdd.vue b/Source/UBCS-WEB/src/views/modeling/LinkTypeAdd.vue
index 050c526..d0a0be0 100644
--- a/Source/UBCS-WEB/src/views/modeling/LinkTypeAdd.vue
+++ b/Source/UBCS-WEB/src/views/modeling/LinkTypeAdd.vue
@@ -376,8 +376,8 @@
display: none !important;
}
-.linkTypeForm>.el-form-item>.el-form-item__content>.el-input>.el-input__inner {
- width: 200px;
+.linkTypeForm>.el-form-item>.el-form-item__content>.el-input>.el-input__inner,.linkTypeForm>.el-form-item>.el-form-item__content>.el-select{
+ width: 290px;
}
.descClass>.el-input__inner {
@@ -387,4 +387,7 @@
#descId {
width: 57vw;
}
+.el-tag + .el-tag{
+ margin-top: 2px;
+}
</style>
diff --git a/Source/UBCS-WEB/src/views/modeling/cycle.vue b/Source/UBCS-WEB/src/views/modeling/cycle.vue
index 07e770e..784f890 100644
--- a/Source/UBCS-WEB/src/views/modeling/cycle.vue
+++ b/Source/UBCS-WEB/src/views/modeling/cycle.vue
@@ -111,6 +111,8 @@
layout: "total, sizes, prev, pager, next, jumper",
},
option: {
+ height:'auto',
+ calcHeight:20,
selection: true,
searchMenuSpan: 6,
searchMenuPosition: "right",
diff --git a/Source/UBCS-WEB/src/views/modeling/original.vue b/Source/UBCS-WEB/src/views/modeling/original.vue
index 2cfd7c7..11490ee 100644
--- a/Source/UBCS-WEB/src/views/modeling/original.vue
+++ b/Source/UBCS-WEB/src/views/modeling/original.vue
@@ -161,7 +161,8 @@
editAttribute: {},
applyRangeData: [],
option: {
- height: "550px",
+ height: "auto",
+ calcHeight:20,
headerAlign: "center",
border: true,
index: true,
diff --git a/Source/UBCS-WEB/src/views/modeling/status.vue b/Source/UBCS-WEB/src/views/modeling/status.vue
index 63e257a..134e5f1 100644
--- a/Source/UBCS-WEB/src/views/modeling/status.vue
+++ b/Source/UBCS-WEB/src/views/modeling/status.vue
@@ -56,6 +56,8 @@
],
form:{},
option:{
+ height:'auto',
+ calcHeight:20,
headerAlign:'center',
align: 'center',
border: true,
diff --git a/Source/UBCS-WEB/src/views/omd/enum.vue b/Source/UBCS-WEB/src/views/omd/enum.vue
index 2ab2b41..79ee533 100644
--- a/Source/UBCS-WEB/src/views/omd/enum.vue
+++ b/Source/UBCS-WEB/src/views/omd/enum.vue
@@ -52,6 +52,8 @@
<el-dialog :title="`[${name}]鏋氫妇椤归厤缃甡"
append-to-body
:visible.sync="box"
+ top="-6vh"
+ class="avue-dialog avue-dialog--top"
width="1000px">
<avue-crud
:option="optionChild"
diff --git a/Source/UBCS-WEB/src/views/work/claim.vue b/Source/UBCS-WEB/src/views/work/claim.vue
index 9129e51..60dcb16 100644
--- a/Source/UBCS-WEB/src/views/work/claim.vue
+++ b/Source/UBCS-WEB/src/views/work/claim.vue
@@ -65,7 +65,7 @@
workBox: false,
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 0,
tip: false,
simplePage: true,
searchShow: true,
diff --git a/Source/UBCS-WEB/src/views/work/done.vue b/Source/UBCS-WEB/src/views/work/done.vue
index a4d9ad6..677ee06 100644
--- a/Source/UBCS-WEB/src/views/work/done.vue
+++ b/Source/UBCS-WEB/src/views/work/done.vue
@@ -60,7 +60,7 @@
workBox: false,
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 0,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/Source/UBCS-WEB/src/views/work/send.vue b/Source/UBCS-WEB/src/views/work/send.vue
index aa8acd3..54e54d7 100644
--- a/Source/UBCS-WEB/src/views/work/send.vue
+++ b/Source/UBCS-WEB/src/views/work/send.vue
@@ -64,7 +64,7 @@
workBox: false,
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 20,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/Source/UBCS-WEB/src/views/work/start.vue b/Source/UBCS-WEB/src/views/work/start.vue
index 3496c11..7298ed5 100644
--- a/Source/UBCS-WEB/src/views/work/start.vue
+++ b/Source/UBCS-WEB/src/views/work/start.vue
@@ -79,7 +79,7 @@
workBox: false,
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 20,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/Source/UBCS-WEB/src/views/work/todo.vue b/Source/UBCS-WEB/src/views/work/todo.vue
index 688fb27..c03cc4c 100644
--- a/Source/UBCS-WEB/src/views/work/todo.vue
+++ b/Source/UBCS-WEB/src/views/work/todo.vue
@@ -65,7 +65,7 @@
workBox: false,
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 0,
tip: false,
simplePage: true,
searchShow: true,
--
Gitblit v1.9.3