From c76a16e77c5551582bc8415ce7f30a362a765e09 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 04 一月 2024 16:05:53 +0800
Subject: [PATCH] 整合代码
---
Source/UBCS-WEB/src/views/integration/integrationIndex.vue | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/integration/integrationIndex.vue b/Source/UBCS-WEB/src/views/integration/integrationIndex.vue
index b461465..854de43 100644
--- a/Source/UBCS-WEB/src/views/integration/integrationIndex.vue
+++ b/Source/UBCS-WEB/src/views/integration/integrationIndex.vue
@@ -1,21 +1,31 @@
<template>
<div>
<el-container style="height: 100%; border: 1px solid #fff">
- <el-card :style="{ marginRight: '10px' }">
- <el-aside style="background-color: #fff" width="220px">
+ <el-card style="margin-right: 10px;height: calc(100vh - 125px)">
+ <el-aside style="background-color: #fff" width="210px">
<el-input v-model="filterText" placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�">
</el-input>
<el-menu :default-openeds="['1', '3']" >
<el-tree ref="tree" :data="treeData" :filter-node-method="filterNode" :props="defaultProps"
accordion class="filter-tree" empty-text="鏆傛棤鏁版嵁" @node-click="handelTreeCell">
+ <template slot-scope="{ node, data }" class="el-tree-node__label">
+ <el-tooltip :content="$createElement('div', { domProps: { innerHTML: node.label } })" class="item"
+ effect="dark"
+ open-delay="500"
+ placement="right-start">
+ <span style="font-size: 14px;">
+ {{ (node || {}).label }}
+ </span>
+ </el-tooltip>
+ </template>
</el-tree>
</el-menu>
</el-aside>
</el-card>
- <el-main>
+ <el-main style="height: calc(100vh - 125px)">
<el-card>
<el-form :model="form">
- <el-form-item label="闆嗗洟鍒嗙被" label-width="70px" size="small">
+ <el-form-item label="闆嗗洟鍒嗙被" label-width="80px" size="small">
<el-select ref="selectTree" v-model="groupVal" clearable placeholder="璇烽�夋嫨"
popper-class="popperTreeSelect">
<el-option :label="groupVal" :value="groupVal">
@@ -27,7 +37,7 @@
</el-form-item>
</el-form>
- <el-card>
+ <el-card style="height:calc(100vh - 600px)">
<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"
@@ -47,7 +57,7 @@
</template>
</avue-crud>
</el-card>
- <el-card :style="{ marginTop: '20px'}">
+ <el-card style="margin-top: 20px;height: calc(100vh - 575px)">
<avue-crud ref="crudRange" :data="rangeData" :option="optinoRange" :style="{ marginTop: '-20px'}"
@row-update="handleUpdate"
@row-dblclick="handleRowClick">
@@ -117,21 +127,21 @@
// 灞炴�ф槧灏勫彇鍊艰〃閰嶇疆
optinoRange: {
title: '灞炴�ф槧灏勫彇鍊艰寖鍥�',
- maxHeight: '300px',
+ maxHeight: '280px',
header: false,
rowKey: 'oid',
column: [
{label: '灞炴�ч泦鍥㈡灇涓惧��', prop: 'numTextValue', minWidth: 80},
{label: '闆嗗洟灞炴�ф灇涓炬樉绀哄悕绉�', prop: 'numText', minWidth: 80},
{
- label: 'MDM鏋氫妇鍊�',
+ label: 'CODE鏋氫妇鍊�',
prop: 'targetNumTextValue',
minWidth: 80,
cell: true,
blur: (value) => window.handleBlur(value, 'range')
},
{
- label: 'MDM鏋氫妇鏄剧ず鍚嶇О',
+ label: 'CODE鏋氫妇鏄剧ず鍚嶇О',
prop: 'targetNumText',
minWidth: 80,
cell: true,
@@ -142,7 +152,7 @@
},
// 灞炴�ф槧灏勮〃閰嶇疆
optionMapping: {
- maxHeight: '500px',
+ maxHeight: '250px',
header: true,
rowKey: 'oid',
selection: false,
@@ -268,7 +278,7 @@
// 鎺ュ彛鑾峰彇闆嗗洟鍒嗙被鏍�
async referTree(oid, checked) {
this.groupTreeData = []
- const response = await referTree({'conditionMap[codeclsfid]': oid, parentOid: null})
+ const response = await referTree({'conditionMap[codeclsfid]': oid, parentOid:'0'})
if (response.status === 200) {
if (checked) {
let items = response.data.map(item => {
@@ -331,7 +341,7 @@
const findRow = that.mappingData.findIndex(item => item.metaListId === that.mappingForm.metaListId)
that.mappingData[findRow].targetAttrName = transferValue[0].name
that.mappingData[findRow].targetAttrId = transferValue[0].oid
- this.dialogPush = false
+ this.dialogPush = false;
}
},
--
Gitblit v1.9.3