Merge branch 'master' of http://192.168.0.35:3000/lmp/lmp_web

src/views/gptTraining/dataServices/dataCleansing/index.vue

@@ -67,8 +67,8 @@
           <template slot-scope="scope">
 <!--            <el-button type="text" :size="defaultFormItemSize" @click="stopClean(scope.row)" v-if="scope.row.cleanStatus===0">暂停清洗</el-button>
             <el-button type="text" :size="defaultFormItemSize" @click="restartClean(scope.row)" v-if="scope.row.cleanStatus===2">重新清洗</el-button>-->
-            <el-button type="text" :size="defaultFormItemSize" @click="details(scope.row)">详情</el-button>
-            <el-button type="text" :size="defaultFormItemSize" @click="del(scope.row)">删除</el-button>
+            <el-button type="text" icon="el-icon-menu" :size="defaultFormItemSize" @click="details(scope.row)">详情</el-button>
+            <el-button type="text" icon="el-icon-delete" :size="defaultFormItemSize" @click="del(scope.row)">删除</el-button>
           </template>
         </vxe-column>
       </vxe-table>

src/views/gptTraining/dataServices/onlineAnnotation/index.vue

@@ -54,7 +54,7 @@
               <el-button type="text" icon="el-icon-menu" :size="defaultFormItemSize" @click="all(scope.row)">{{ scope.row.releaseStatus === 1 ? '详情' : '标记' }}</el-button>
             <!-- <el-button type="text" :size="defaultFormItemSize">标注</el-button> -->
             <!-- <el-button type="text" :size="defaultFormItemSize" @click="edit(scope.row)">编辑</el-button>-->
-            <el-button type="text" :size="defaultFormItemSize" @click="del(scope.row)" :disabled="scope.row.releaseStatus === 1">删除</el-button>
+            <el-button type="text" icon="el-icon-delete" :size="defaultFormItemSize" @click="del(scope.row)" :disabled="scope.row.releaseStatus === 1">删除</el-button>
           </template>
         </vxe-column>
       </vxe-table>

src/views/gptTraining/dataServices/onlineAnnotation/versionsTableBox/dialog/label.vue

@@ -19,9 +19,9 @@
       </vxe-column>
 
     </vxe-table>
-    <el-row type="flex" justify="end" class="dialog-btn-layer mt20" v-if="isEdit">
-      <el-button :size="defaultFormItemSize" :plain="true" @click="onCancel(false)">取消</el-button>
-      <el-button type="primary" :size="defaultFormItemSize" @click="onSubmit">确定</el-button>
+    <el-row type="flex" justify="end" class="dialog-btn-layer mt20">
+      <el-button :size="defaultFormItemSize" :plain="true" @click="onCancel(false)">关闭</el-button>
+      <el-button type="primary" :size="defaultFormItemSize" @click="onSubmit" v-if="isEdit">确定</el-button>
     </el-row>
   </div>
 </template>

src/views/gptTraining/dataServices/onlineAnnotation/versionsTableBox/dialog/particulars.vue

@@ -15,8 +15,8 @@
       <vxe-column field="operation" title="操作" width="150px">
         <template slot-scope="scope">
           <el-button type="text" :size="defaultFormItemSize" @click="check(scope.row)">查看</el-button>
-          <el-button type="text" :size="defaultFormItemSize" @click="label(scope.row)" v-if="versionItem.dimensionType===0">标注</el-button>
-          <el-button type="text" :size="defaultFormItemSize" @click="del(scope.row)">删除</el-button>
+          <el-button type="text" :size="defaultFormItemSize" @click="label(scope.row)"  v-if="releaseStatus===0">标注</el-button>
+          <el-button type="text" :size="defaultFormItemSize" @click="del(scope.row)" v-if="releaseStatus===0">删除</el-button>
         </template>
       </vxe-column>
     </vxe-table>
@@ -52,7 +52,7 @@ export default {
   },
 
   components: {},
-  props: ['versionItem'],
+  props: ['versionItem', 'releaseStatus'],
   computed: {
     ...mapGetters(['getMainContextHeight']),
     tableHeight() {

src/views/gptTraining/dataServices/onlineAnnotation/versionsTableBox/index.vue

@@ -10,7 +10,7 @@
     <el-tabs v-model="activeName" style="width:calc(100% - 200px)" v-if="nowVersion">
       <div style="position: absolute; top: -55px; right: 0;">
         <el-button type="primary" plain :size="defaultFormItemSize" @click="dataImport(nowVersion)">导入</el-button>
-        <el-button type="danger" plain :size="defaultFormItemSize" @click="del(nowVersion)">删除</el-button>
+        <el-button type="danger" plain :size="defaultFormItemSize"  v-if="nowVersion.releaseStatus === 0" @click="del(nowVersion)">删除</el-button>
         <template v-if="nowVersion.inputStatus !== 0">
           <el-dropdown split-button type="primary" plain style="margin-left:10px;font-size: 12px;color: #0092FF;" :size="defaultFormItemSize">
             <span class="el-dropdown-link">