From 21fa32646dc87f443b1c860a45b5905d5b7b3c44 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 05 一月 2024 14:36:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/modeling/original.vue | 105 +++++++++++++++++++++++++++-------------------------
Source/UBCS-WEB/src/views/system/PasswordManagement/passwords.vue | 1
Source/UBCS-WEB/src/views/integration/integrationIndex.vue | 4 +-
Source/UBCS-WEB/src/views/system/user.vue | 8 ++--
4 files changed, 61 insertions(+), 57 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/integration/integrationIndex.vue b/Source/UBCS-WEB/src/views/integration/integrationIndex.vue
index 6cac650..ed218ad 100644
--- a/Source/UBCS-WEB/src/views/integration/integrationIndex.vue
+++ b/Source/UBCS-WEB/src/views/integration/integrationIndex.vue
@@ -1,8 +1,8 @@
<template>
<div>
<el-container style="height: 100%; border: 1px solid #fff">
- <el-card style="margin-right: 10px;height: calc(100vh - 125px)">
- <el-aside style="background-color: #fff" width="210px">
+ <el-card style="margin-right: 10px;height: calc(100vh - 125px);overflow: auto">
+ <el-aside style="background-color: #fff;" width="210px">
<el-input v-model="filterText" placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�">
</el-input>
<el-menu :default-openeds="['1', '3']" >
diff --git a/Source/UBCS-WEB/src/views/modeling/original.vue b/Source/UBCS-WEB/src/views/modeling/original.vue
index f95fbbf..5b1b1f8 100644
--- a/Source/UBCS-WEB/src/views/modeling/original.vue
+++ b/Source/UBCS-WEB/src/views/modeling/original.vue
@@ -3,7 +3,7 @@
<el-main>
<basic-container>
<avue-crud v-model="form" ref="crud" :option="option" :data="data" @on-load="onLoad" :page.sync="page" :permission="permissionList"
- @refresh-change="refreshChange" @row-click="rowClick">
+ @refresh-change="refreshChange" @row-click="rowClick" style="height: calc(100vh - 148px)">
<template slot="radio" slot-scope="{row}">
<el-radio v-model="selectRow" :label="row.$index">
</el-radio>
@@ -35,7 +35,8 @@
</el-main>
<el-aside>
<basic-container class="itemForm">
- <el-descriptions class="margin-top" :column="1" size="medium" border title="灞炴�ч」">
+ <div style="height: 44vh">
+ <el-descriptions class="margin-top" :column="1" size="medium" border title="灞炴�ч」" >
<el-descriptions-item>
<template slot="label">
灞炴�х紪鍙�
@@ -54,12 +55,12 @@
</template>
{{ itemForm.itemData.typeValue }}
</el-descriptions-item>
-<!-- <el-descriptions-item>
- <template slot="label">
- 鏍囩
- </template>
- {{ itemForm.itemData.hashtag }}
- </el-descriptions-item>-->
+ <!-- <el-descriptions-item>
+ <template slot="label">
+ 鏍囩
+ </template>
+ {{ itemForm.itemData.hashtag }}
+ </el-descriptions-item>-->
<el-descriptions-item>
<template slot="label">
榛樿鍊�
@@ -85,48 +86,50 @@
{{ itemForm.itemData.description }}
</el-descriptions-item>
</el-descriptions>
- <div style="height:15px"></div>
- <el-descriptions class="margin-top" :column="1" size="medium" border title="灞炴�ч厤缃�"></el-descriptions>
- <el-tabs v-model="itemForm.activeName" @tab-click="handleClick" stretch="true" style="height:235px">
- <el-tab-pane label="鍙傜収" name="referTab">
- <el-descriptions class="margin-top" :column="1" size="medium" border>
- <el-descriptions-item>
- <template slot="label">
- 浣跨敤鍙傜収
- </template>
- {{ itemForm.itemData.referTypeValue ? '鏄�' : '鍚�' }}
- </el-descriptions-item>
- <el-descriptions-item>
- <template slot="label">
- 鍙傜収绫诲瀷
- </template>
- {{ itemForm.itemData.referTypeValue }}
- </el-descriptions-item>
- <el-descriptions-item>
- <template slot="label">
- 鍙傜収鍚嶇О
- </template>
- {{ itemForm.itemData.referToName }}
- </el-descriptions-item>
- </el-descriptions>
- </el-tab-pane>
- <el-tab-pane label="鏋氫妇" name="enumTab">
- <el-descriptions class="margin-top" :column="1" :size="small" border>
- <el-descriptions-item>
- <template slot="label">
- 浣跨敤鏋氫妇
- </template>
- {{ itemForm.itemData.usingDict ? '鏄�' : '鍚�' }}
- </el-descriptions-item>
- <el-descriptions-item>
- <template slot="label">
- 鏋氫妇绫诲瀷
- </template>
- {{ itemForm.itemData.dictValue }}
- </el-descriptions-item>
- </el-descriptions>
- </el-tab-pane>
- </el-tabs>
+ </div>
+ <div style="height: 40vh">
+ <el-descriptions class="margin-top" :column="1" size="medium" border title="灞炴�ч厤缃�"></el-descriptions>
+ <el-tabs v-model="itemForm.activeName" @tab-click="handleClick" stretch="true" style="height:235px">
+ <el-tab-pane label="鍙傜収" name="referTab">
+ <el-descriptions class="margin-top" :column="1" size="medium" border>
+ <el-descriptions-item>
+ <template slot="label">
+ 浣跨敤鍙傜収
+ </template>
+ {{ itemForm.itemData.referTypeValue ? '鏄�' : '鍚�' }}
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template slot="label">
+ 鍙傜収绫诲瀷
+ </template>
+ {{ itemForm.itemData.referTypeValue }}
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template slot="label">
+ 鍙傜収鍚嶇О
+ </template>
+ {{ itemForm.itemData.referToName }}
+ </el-descriptions-item>
+ </el-descriptions>
+ </el-tab-pane>
+ <el-tab-pane label="鏋氫妇" name="enumTab">
+ <el-descriptions class="margin-top" :column="1" :size="small" border>
+ <el-descriptions-item>
+ <template slot="label">
+ 浣跨敤鏋氫妇
+ </template>
+ {{ itemForm.itemData.usingDict ? '鏄�' : '鍚�' }}
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template slot="label">
+ 鏋氫妇绫诲瀷
+ </template>
+ {{ itemForm.itemData.dictValue }}
+ </el-descriptions-item>
+ </el-descriptions>
+ </el-tab-pane>
+ </el-tabs>
+ </div>
</basic-container>
</el-aside>
<originalAdd ref="originalAdd" @refreshTable="refreshChange" :attribute="editAttribute"></originalAdd>
@@ -162,7 +165,7 @@
editAttribute: {},
applyRangeData: [],
option: {
- height: "auto",
+ height:'auto',
calcHeight:20,
headerAlign: "center",
border: true,
diff --git a/Source/UBCS-WEB/src/views/system/PasswordManagement/passwords.vue b/Source/UBCS-WEB/src/views/system/PasswordManagement/passwords.vue
index 60c4488..4ffee46 100644
--- a/Source/UBCS-WEB/src/views/system/PasswordManagement/passwords.vue
+++ b/Source/UBCS-WEB/src/views/system/PasswordManagement/passwords.vue
@@ -101,6 +101,7 @@
editBtn:false,
height:700,
delBtn:false,
+ refreshBtn:false,
column: [
{
label: '绛栫暐鍚嶇О',
diff --git a/Source/UBCS-WEB/src/views/system/user.vue b/Source/UBCS-WEB/src/views/system/user.vue
index 02d3363..9fc25cd 100644
--- a/Source/UBCS-WEB/src/views/system/user.vue
+++ b/Source/UBCS-WEB/src/views/system/user.vue
@@ -94,19 +94,19 @@
</template>
<template slot="tenantName"
slot-scope="{row}">
- <el-tag>{{ row.tenantName }}</el-tag>
+ <el-tag v-if="row.tenantName">{{ row.tenantName }}</el-tag>
</template>
<template slot="roleName"
slot-scope="{row}">
- <el-tag>{{ row.roleName }}</el-tag>
+ <el-tag v-if="row.roleName">{{ row.roleName }}</el-tag>
</template>
<template slot="deptName"
slot-scope="{row}">
- <el-tag>{{ row.deptName }}</el-tag>
+ <el-tag v-if="row.deptName">{{ row.deptName }}</el-tag>
</template>
<template slot="userTypeName"
slot-scope="{row}">
- <el-tag>{{ row.userTypeName }}</el-tag>
+ <el-tag v-if="row.userTypeName">{{ row.userTypeName }}</el-tag>
</template>
</avue-crud>
</div>
--
Gitblit v1.9.3