From f6d041cade1081aee26ce0313eb10006e3997663 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 11 一月 2024 16:47:39 +0800
Subject: [PATCH] 整合代码
---
Source/UBCS-WEB/src/views/integration/integrationIndex.vue | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/integration/integrationIndex.vue b/Source/UBCS-WEB/src/views/integration/integrationIndex.vue
index 59f0ec7..6b902af 100644
--- a/Source/UBCS-WEB/src/views/integration/integrationIndex.vue
+++ b/Source/UBCS-WEB/src/views/integration/integrationIndex.vue
@@ -1,19 +1,29 @@
<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="220px">
+ <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']" >
<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 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="璇烽�夋嫨"
@@ -27,7 +37,7 @@
</el-form-item>
</el-form>
- <el-card style="height:calc(100vh - 635px)">
+ <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"
@@ -47,7 +57,7 @@
</template>
</avue-crud>
</el-card>
- <el-card style="margin-top: 20px;height: height:calc(100vh - 545px)">
+ <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">
@@ -117,7 +127,7 @@
// 灞炴�ф槧灏勫彇鍊艰〃閰嶇疆
optinoRange: {
title: '灞炴�ф槧灏勫彇鍊艰寖鍥�',
- maxHeight: '300px',
+ maxHeight: '280px',
header: false,
rowKey: 'oid',
column: [
@@ -142,7 +152,7 @@
},
// 灞炴�ф槧灏勮〃閰嶇疆
optionMapping: {
- maxHeight: '500px',
+ maxHeight: '280px',
header: true,
rowKey: 'oid',
selection: false,
@@ -262,7 +272,8 @@
const response = await listCodeAttributeByClassId({codeClassifyId: oid})
if (response.status === 200) {
const data = response.data.data
- this.transferData = data
+ this.transferData = data;
+ // console.log(data)
}
},
// 鎺ュ彛鑾峰彇闆嗗洟鍒嗙被鏍�
@@ -320,6 +331,7 @@
}
},
handelTransferSave(event) {
+ // console.log(event)
let that = this
const transferValue = event.value
if (Object.keys(that.mappingForm).length == 0) {
@@ -329,8 +341,9 @@
});
} else {
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
+ that.mappingData[findRow].targetAttrName = transferValue[0].name;
+ that.mappingData[findRow].targetAttrId = transferValue[0].oid;
+ that.mappingData[findRow].targetAttrKey = transferValue[0].id;
this.dialogPush = false;
}
--
Gitblit v1.10.0