业务类型页面修正被git覆盖的部分

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

@@ -1,14 +1,14 @@
<template>
  <el-container>
    <el-header>
      <el-button type="primary" @click="businessAdd">新增</el-button>
      <el-button type="primary" @click="businessEdit">修改</el-button>
      <el-button type="primary" @click="selectFromTable">从已有中获取</el-button>
    <el-header class="businessHeader" style="height: 40px;">
      <el-button type="primary" @click="businessAdd" size="small">新增</el-button>
      <el-button type="primary" @click="businessEdit" size="small">修改</el-button>
      <el-button type="primary" @click="selectFromTable" size="small">从已有中获取</el-button>
    </el-header>
    <el-container>
      <el-aside width="240px">
        <basic-container>
          <avue-tree id="basic" :data="treeData" :option="treeOption" @node-click="nodeClick">
        <basic-container class="businessTreeContainer">
          <avue-tree id="basic" :data="treeData" :option="treeOption" @node-click="nodeClick" class="businessTree">
            <span class="el-tree-node__label" slot-scope="{ node, data }">
              <span>
                <i class="el-icon-star-on"></i>
@@ -125,21 +125,14 @@
          </el-select>
          <avue-crud class="businessCrud" v-model="ref.form" :option="ref.option" :data="ref.data" @selection-change="selectionChange">
          </avue-crud>
<<<<<<< Updated upstream
          <div slot="footer" class="dialog-footer">
                <el-button @click="dialoghandeltrue">确定</el-button>
                <el-button @click="dialoghandelfalse">取消</el-button>
            </div>
=======
          <span slot="footer" class="dialog-footer">
            <el-button @click="dialoghandelfalse">取 消</el-button>
            <el-button type="primary" @click="dialoghandeltrue">确 定</el-button>
          </span>
>>>>>>> Stashed changes
        </el-dialog>
      </el-container>
    </el-container>
    <business-add ref="btmAdd" :btmType="addOption.btmType" :domainOption="domainOptions">
    <business-add ref="btmAdd" :btmType="addOption.btmType" :domainOption="domainOptions" :icons="icons" @refreshTable="initTreeOnLoad">
  </business-add>
  </el-container>
</template>
@@ -214,6 +207,16 @@
      },
      domain: null,
      domainOptions: [],
      icons:{
        key: 'el-icon-finished',
        name: 'el-icon-info',
        tableName: 'el-icon-date',
        domain: 'el-icon-folder-opened',
        revisionRule: 'el-icon-s-check',
        lifeCycle: 'el-icon-refresh-right',
        view: 'el-icon-view',
        desc: 'el-icon-chat-line-square'
      },
      ref: {
        // 从表中选择dialog状态
        visible: false,
@@ -329,7 +332,7 @@
      this.ifRefreshBtmAddRefresh();
    },
    ifRefreshBtmAddRefresh(){
      this.$refs.btmAdd.refreshAttrTable();
      // this.$refs.btmAdd.refreshAttrTable();
    }
  },
}
@@ -341,8 +344,13 @@
  border-radius: 10px;
}

.businessCrud > .el-card > .el-card__body > .avue-crud_menu{
  display: none!important;
.businessCrud > .el-card:nth-of-type(2) > .el-card__body > .avue-crud__menu{
        display: none !important;
}

.attributeCrud > .el-card:nth-of-type(2) > .el-card__body > .avue-crud__menu{
        display: none !important;
}
.businessTreeContainer > .el-card > .el-card__body {
  height: 775px;
}
</style>

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

@@ -107,6 +107,9 @@
        },
        domainOption:{
            type: Array
        },
        icons: {
            type: Array
        }
    },
    data() {
@@ -224,7 +227,7 @@
        }
    },
    created() {
        console.log('123');

    },
    methods: {
        closeSubmitDialog(){

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

@@ -1,4 +1,4 @@
<<template>
<template>
  <basic-container>
    <avue-crud ref="crud"
               v-model="form"

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

@@ -1,4 +1,4 @@
<<template>
<template>
  <basic-container>
    <avue-crud ref="crud"
               v-model="form"