Merge branch 'develop' of https://gitlab.redhtc.com/Berlincen/DA-Platform into develop

DAPlatform-front/src/components/CheckDetail.vue

@@ -8,12 +8,17 @@
       <pieces-table :task-id="task.id" showProgress isCheck>
         <!-- 仅当executor不为undefined时（即有人标注）显示功能按钮 -->
         <template v-slot:option="slotProps">
-          <el-button v-if="slotProps.executor && !slotProps.executor.state" type="primary" size="mini" plain
-            @click="goto(slotProps.file, slotProps.piece, slotProps.executor)">待审核</el-button>
+          <!-- 无人标注，禁用待审核，有人标注，状态为0（未审核），显示，有人标注状态为1（已审核），不显示 -->
+          <el-button v-if="!(slotProps.executor && slotProps.executor.state)"
+            type="primary" size="mini" plain
+            :disabled="!slotProps.executor"
+            @click="goto(slotProps.file, slotProps.piece, slotProps.executor)">
+            {{ slotProps.executor ? '待审核' : '无人标注' }}
+          </el-button>
 
           <el-button v-if="slotProps.executor && slotProps.executor.state" type="success" size="mini" plain
             @click="goto(slotProps.file, slotProps.piece, slotProps.executor)">修改</el-button>
-
+          <!-- 没有人标注或者未审核的的不能导出 -->
           <el-button type="primary" size="mini" plain :disabled="!slotProps.executor || !slotProps.executor.state"
             @click="exportFile(slotProps.piece.type, slotProps.executor.relation_id)" >导出</el-button>
         </template>

DAPlatform-front/src/components/PiecesTable.vue

@@ -36,7 +36,6 @@
 
 <script>
 import '@/mock/api.js'
-import {getSlice} from '@/assets/js/api/slice.js'
 export default {
   name: 'pieces-table',
   props: {
@@ -82,8 +81,6 @@ export default {
     var res = await this.axios.get('/slice/getPieces', { params })
     this.tableData = res.data
     res.data.forEach(piece => { self.getFiles(piece.id) })
-
-    getSlice()
   },
   methods: {
     selectionChange (val) {

DAPlatform-front/src/components/TaskHall.vue

@@ -6,10 +6,10 @@
           <span class="filter-lable">任务名称：</span>
           <el-input class="filter-input" prefix-icon="el-icon-search" v-model="keyword" placeholder="请输入任务名称"></el-input><br/>
         </div>
-        <div class="filter-item">
+        <!-- <div class="filter-item">
           <span class="filter-lable">发布者：</span>
           <el-input class="filter-input" prefix-icon="el-icon-search" v-model="creatorName" placeholder="请输入发布者名称"></el-input>
-        </div>
+        </div> -->
         <div class="filter-item">
           <span class="filter-lable">类型：</span>
           <el-checkbox-group v-model="taskType">
@@ -21,8 +21,8 @@
         <div class="filter-item">
           <el-button class="filter-button" type="primary" @click="search()">查询</el-button>
         </div>
-        <el-divider></el-divider>
       </div>
+      <el-divider></el-divider>
       <div class="tasklist-container">
         <div class="tasklist">
           <div class="task-item" v-for="(item, index) in tasks" :key='index'>
@@ -94,15 +94,20 @@ export default {
     float: left;
     width: 70%;
     .filter-container{
+      overflow: hidden;
       .filter-item{
         text-align: left;
+        float: left;
+        margin-left: 10px;
         margin-bottom: 15px;
+        height: 40px;
+        line-height: 40px;
         .filter-lable{
-          width: 6em;
+          width: 5em;
           display: inline-block;
         }
         .filter-input{
-          width: 300px;
+          width: 200px;
         }
         .el-checkbox-group{
           display: inline;