From 19a9bc81ca7d90046b67f35adc5b7386be53e27f Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 04 一月 2024 15:46:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/integration/integrationIndex.vue | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/integration/integrationIndex.vue b/Source/UBCS-WEB/src/views/integration/integrationIndex.vue
index b461465..59f0ec7 100644
--- a/Source/UBCS-WEB/src/views/integration/integrationIndex.vue
+++ b/Source/UBCS-WEB/src/views/integration/integrationIndex.vue
@@ -1,7 +1,7 @@
<template>
<div>
<el-container style="height: 100%; border: 1px solid #fff">
- <el-card :style="{ marginRight: '10px' }">
+ <el-card style="margin-right: 10px;height: calc(100vh - 125px)">
<el-aside style="background-color: #fff" width="220px">
<el-input v-model="filterText" placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�">
</el-input>
@@ -12,10 +12,10 @@
</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 +27,7 @@
</el-form-item>
</el-form>
- <el-card>
+ <el-card style="height:calc(100vh - 635px)">
<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 +47,7 @@
</template>
</avue-crud>
</el-card>
- <el-card :style="{ marginTop: '20px'}">
+ <el-card style="margin-top: 20px;height: height:calc(100vh - 545px)">
<avue-crud ref="crudRange" :data="rangeData" :option="optinoRange" :style="{ marginTop: '-20px'}"
@row-update="handleUpdate"
@row-dblclick="handleRowClick">
@@ -124,14 +124,14 @@
{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,
@@ -268,7 +268,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 +331,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