From 476fa242b2994ac480dedc79cde301bf14aa2026 Mon Sep 17 00:00:00 2001
From: xiejun <xiejun@vci-tech.com>
Date: 星期五, 05 一月 2024 18:40:54 +0800
Subject: [PATCH] 获取集团分类根节点前端传null传入后端直接改为空字符串bug修复
---
Source/UBCS-WEB/src/views/integration/integrationIndex.vue | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/integration/integrationIndex.vue b/Source/UBCS-WEB/src/views/integration/integrationIndex.vue
index 854de43..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']" >
@@ -22,8 +22,8 @@
</el-menu>
</el-aside>
</el-card>
- <el-main style="height: calc(100vh - 125px)">
- <el-card>
+ <el-main >
+ <el-card style="height: calc(100vh - 128px)">
<el-form :model="form">
<el-form-item label="闆嗗洟鍒嗙被" label-width="80px" size="small">
<el-select ref="selectTree" v-model="groupVal" clearable placeholder="璇烽�夋嫨"
@@ -37,7 +37,7 @@
</el-form-item>
</el-form>
- <el-card style="height:calc(100vh - 600px)">
+ <el-card style="height:38vh">
<avue-crud ref="crudMapping" :data="mappingData" :option="optionMapping" :table-loading="loading"
@select="setCurrentRow" @row-update="handleMapingUpdate"
@row-click="handleMapingClick" @row-dblclick="handleMapingRowClick" @selection-change="selectionChange"
@@ -57,7 +57,7 @@
</template>
</avue-crud>
</el-card>
- <el-card style="margin-top: 20px;height: calc(100vh - 575px)">
+ <el-card style="margin-top: 10px;height: 38vh">
<avue-crud ref="crudRange" :data="rangeData" :option="optinoRange" :style="{ marginTop: '-20px'}"
@row-update="handleUpdate"
@row-dblclick="handleRowClick">
@@ -152,7 +152,7 @@
},
// 灞炴�ф槧灏勮〃閰嶇疆
optionMapping: {
- maxHeight: '250px',
+ maxHeight: '280px',
header: true,
rowKey: 'oid',
selection: false,
--
Gitblit v1.9.3