Merge remote-tracking branch 'origin/master'

 Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue

@@ -43,7 +43,7 @@
                       :defaultExpandAll="false"
                       :option="Treeoption"
                       class="classifyTree"
                       style="height: calc(100vh - 280px)"
                       style="height: calc(100vh - 290px)"
                       @node-click="nodeClick"
            >
            </avue-tree>

 Source/UBCS-WEB/src/const/code/codebasic.js

@@ -1,5 +1,5 @@
export default {
    height:'260',

    tip: false,
    editBtn: false,
    addBtn: false,

 Source/UBCS-WEB/src/const/code/mdmrule.js

@@ -1,7 +1,5 @@
export default {
  height:"270",
  tip: false,
  editBtn:false,
  searchShow: true,
  searchMenuSpan: 6,
  border: true,

 Source/UBCS-WEB/src/views/code/code.vue

@@ -2,6 +2,7 @@
  <basic-container class="code-total" style=" height: 100%">
    <!-- 编码规则信息展示区域 -->
    <basic-container class="code-rule-container">
      <div style="height: 40vh;overflow: auto;">
      <p
        style="
          margin-top: -5px;
@@ -140,6 +141,8 @@
          </el-button>
        </template>
      </avue-crud>
      </div>

    </basic-container>

    <!-- 高级查询对话框 -->
@@ -217,6 +220,7 @@

    <!-- 基础码段展示区域 -->
    <basic-container class="code-basicsec-container">
    <div style="height: 38.5vh;overflow: auto">
      <p
        style="margin-top: -5px;
          margin-bottom: 4px;
@@ -316,6 +320,7 @@
          </el-button>
        </template>
      </avue-crud>
    </div>
    </basic-container>

    <!-- 码段码值管理对话框 -->
@@ -3549,10 +3554,6 @@
  font-size: 12px !important;
}

.code-rule-crud > .avue-crud__search,
.code-basic-crud > .avue-crud__search {
  margin-bottom: -15px;
}

.clone-input-textarea > .el-form-item__content {
  width: 495px;

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

@@ -4,7 +4,7 @@

<!--    </el-header>-->
    <el-container>
      <el-aside>
      <el-aside style="width: 20%">
        <basic-container class="businessTreeContainer">
          <div class="app">
            <div style="display: flex;margin-bottom: 10px;justify-content: space-around;">
@@ -18,13 +18,13 @@
                         @click="selectFromTable" plain> 从已有中获取
              </el-button>
            </div>
            <avue-tree :data="treeData" :option="treeOption" class="businessTree" @node-click="nodeClick">
            <span slot-scope="{ node, data }" class="el-tree-node__label">
            <avue-tree :data="treeData" :option="treeOption" class="businessTree" @node-click="nodeClick" style="width: fit-content;">
            <template slot-scope="{ node, data }" class="el-tree-node__label">
              <span>
                <i :class="(node || {}).level === 2 ? 'el-icon-star-off' : 'el-icon-folder-opened'"></i>
                {{ (node || {}).label }}
              </span>
            </span>
            </template>
            </avue-tree>
          </div>

@@ -171,7 +171,7 @@
      selectionList: [],
      treeData: [],
      treeOption: {
        defaultExpandAll: true,
        defaultExpandAll: false,
        title: '业务类型树',
        addBtn: false,
        menu: false,
@@ -186,8 +186,8 @@
        btmType: {},
      },
      loadOption: {
        height:'auto',
        border: true,
        height: 478,
        editBtn: false,
        addBtn: false,
        menu: false,
@@ -381,7 +381,7 @@
}
</script>

<style lang="scss">
<style lang="scss" scoped>

.businessCrud > .el-card:nth-of-type(2) > .el-card__body > .avue-crud__menu {
  display: none !important;
@@ -394,7 +394,7 @@

.app {
  overflow: auto;
  height: calc(100vh - 150px);
  height: 84.3vh;
}

.app::-webkit-scrollbar {
@@ -407,8 +407,12 @@

// 滚动条的滑块
.app::-webkit-scrollbar-thumb {
  width: 10px;
  height: 10px;
  background-color: #ececec;
  border-radius: 20px;
  border: #ececec;
}


</style>

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

@@ -1,30 +1,30 @@
<template>
    <el-container>
        <!-- 顶端按钮 -->
        <el-header class="businessHeader" style="height: 40px;">
          <div>
            <el-button type="primary" @click="linkTypeAdd" size="small" icon="el-icon-plus" v-if="permissionList.addBtn" plain>

        <!-- 侧边栏树 -->
        <el-container>
            <el-aside style="width: 20%;">
                <basic-container class="businessTreeContainer">
                  <div class="app">
                    <div style="display: flex;margin-bottom: 10px;">
                      <el-button type="primary" @click="linkTypeAdd" size="mini"  v-if="permissionList.addBtn" plain>
              新增
            </el-button>
            <el-button type="primary" @click="linkTypeEdit" size="small" icon="el-icon-edit" v-if="permissionList.editBtn" plain>
                      <el-button type="primary" @click="linkTypeEdit" size="mini" v-if="permissionList.editBtn" plain>
              修改
            </el-button>
          </div>
            </el-header>
        <!-- 侧边栏树 -->
        <el-container>
            <el-aside width="240px">
                <basic-container class="businessTreeContainer">
                    <p style="margin-top: 10px;font-weight: 570;font-size: 19px">{{ treeOption.title }}</p>
                    <avue-tree id="basic" :data="treeData" :option="treeOption" @node-click="nodeClick"
                    <avue-tree :data="treeData" :option="treeOption" @node-click="nodeClick"
                        class="businessTree">
                        <span class="el-tree-node__label" slot-scope="{ node, data }">
                      <template class="el-tree-node__label" slot-scope="{ node, data }">
                            <span>
                                <i class="el-icon-star-on"></i>
                                {{ (node || {}).label }}
                            </span>
                        </span>
                      </template>
                    </avue-tree>
                  </div>
                </basic-container>
            </el-aside>
            <el-container>
@@ -178,7 +178,7 @@
            },
            loadOption: {
                border: true,
                height: 395,
                height: 'auto',
                editBtn: false,
                addBtn: false,
                menu: false,
@@ -215,6 +215,7 @@
            },
            obj: {},
            treeOption: {
                height:'auto',
                defaultExpandAll: true,
                title: '链接类型树',
                addBtn: false,
@@ -285,8 +286,31 @@
}
</script>

<style lang="scss">
<style lang="scss" scoped>
.attributeCrud>.el-card:nth-of-type(2)>.el-card__body>.avue-crud__menu {
    display: none !important;
}
.app {
  overflow: auto;
  height: 84.3vh;
}

.app::-webkit-scrollbar {
  height: 15px; // 纵向滚动条 必写
  background: white;
  border: white;
  width: 10px;

}

// 滚动条的滑块
.app::-webkit-scrollbar-thumb {
  width: 10px;
  height: 10px;
  background-color: #ececec;
  border-radius: 20px;
  border: #ececec;
}


</style>

 Source/UBCS-WEB/src/views/statistic/statisticPage.vue

@@ -48,7 +48,7 @@
  </span>
    </el-dialog>
    <!--    echarts组件-->
    <div style="margin-top: 15px">
    <div style="margin-top: 15px;padding-bottom: 35px">
      <lineChart v-for="(item,index) in lineList" :key="index" :chartName="item.menuName"
                 :lineData="item.menuData"></lineChart>
      <pieChart v-for="(item,index) in pieList" :key="index" :chartName="item.menuName"