Merge remote-tracking branch 'origin/master'

 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']" >

 Source/UBCS-WEB/src/views/modeling/original.vue

@@ -3,7 +3,7 @@
    <el-main>
      <basic-container>
        <avue-crud v-model="form" ref="crud" :option="option" :data="data" @on-load="onLoad" :page.sync="page" :permission="permissionList"
          @refresh-change="refreshChange" @row-click="rowClick">
          @refresh-change="refreshChange" @row-click="rowClick" style="height: calc(100vh - 148px)">
          <template slot="radio" slot-scope="{row}">
            <el-radio v-model="selectRow" :label="row.$index">&nbsp;
            </el-radio>
@@ -35,6 +35,7 @@
    </el-main>
    <el-aside>
      <basic-container class="itemForm">
      <div style="height: 44vh">
        <el-descriptions class="margin-top" :column="1" size="medium" border title="属性项">
          <el-descriptions-item>
            <template slot="label">
@@ -85,7 +86,8 @@
            {{ itemForm.itemData.description }}
          </el-descriptions-item>
        </el-descriptions>
        <div style="height:15px"></div>
      </div>
        <div style="height: 40vh">
        <el-descriptions class="margin-top" :column="1" size="medium" border title="属性配置"></el-descriptions>
        <el-tabs v-model="itemForm.activeName" @tab-click="handleClick" stretch="true" style="height:235px">
          <el-tab-pane label="参照" name="referTab">
@@ -127,6 +129,7 @@
            </el-descriptions>
          </el-tab-pane>
        </el-tabs>
        </div>
      </basic-container>
    </el-aside>
    <originalAdd ref="originalAdd" @refreshTable="refreshChange" :attribute="editAttribute"></originalAdd>
@@ -162,7 +165,7 @@
      editAttribute: {},
      applyRangeData: [],
      option: {
        height: "auto",
        height:'auto',
        calcHeight:20,
        headerAlign: "center",
        border: true,

 Source/UBCS-WEB/src/views/system/PasswordManagement/passwords.vue

@@ -101,6 +101,7 @@
          editBtn:false,
          height:700,
          delBtn:false,
          refreshBtn:false,
          column: [
            {
              label: '策略名称',

 Source/UBCS-WEB/src/views/system/user.vue

@@ -94,19 +94,19 @@
          </template>
          <template slot="tenantName"
                    slot-scope="{row}">
            <el-tag>{{ row.tenantName }}</el-tag>
            <el-tag v-if="row.tenantName">{{ row.tenantName }}</el-tag>
          </template>
          <template slot="roleName"
                    slot-scope="{row}">
            <el-tag>{{ row.roleName }}</el-tag>
            <el-tag v-if="row.roleName">{{ row.roleName }}</el-tag>
          </template>
          <template slot="deptName"
                    slot-scope="{row}">
            <el-tag>{{ row.deptName }}</el-tag>
            <el-tag v-if="row.deptName">{{ row.deptName }}</el-tag>
          </template>
          <template slot="userTypeName"
                    slot-scope="{row}">
            <el-tag>{{ row.userTypeName }}</el-tag>
            <el-tag v-if="row.userTypeName">{{ row.userTypeName }}</el-tag>
          </template>
        </avue-crud>
        </div>