Merge remote-tracking branch 'origin/develop' into develop

# Conflicts: # src/pages/localTool/standAutoSplit/index.vue # src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
2021-07-13 17:55:59 +08:00
parent 7fbea78a8a 4b4c7b7da8
commit b6c4774489
27 changed files with 2175 additions and 679 deletions
@@ -29,8 +29,6 @@
    <div class="content">
      <div class="action-bar">
        <el-button size="mini"  @click="spiltStandFile" v-btn-permission="''"><i class="iconfont"></i>拆分</el-button>
-<!--        <el-button size="mini"  @click="clickButtonToUpload" v-btn-permission="''"><i class="iconfont">&#xe65d;</i>上传</el-button>-->
-<!--        <el-button size="mini"  @click="clickButtonToImport" v-btn-permission="''"><i class="iconfont">&#xe6de;</i>导入拆分结果</el-button>-->
        <el-button size="mini"  @click="batchDelete" v-btn-permission="''"><i class="iconfont">&#xe61b;</i>删除</el-button>
      </div>
      <div class="table-wrap">