Merge remote-tracking branch 'origin/master'

 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-card>
      <el-main >
        <el-card style="height: calc(100vh - 128px)">
          <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: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="{ marginTop: '20px'}">
          <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,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: '280px',
        header: true,
        rowKey: 'oid',
        selection: false,