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

src/staticDict/gptStaticDict.js

@@ -190,9 +190,9 @@ Vue.prototype.OutputStatus = OutputStatus;
 
 const CleanStatus = new DictionaryBase('清洗状态', [
   {
-    id: 0,
-    name: '清洗中',
-    symbol: '0'
+    id: 3,
+    name: '未清洗',
+    symbol: '3'
   },
   {
     id: 1,
@@ -200,9 +200,9 @@ const CleanStatus = new DictionaryBase('清洗状态', [
     symbol: '1'
   },
   {
-    id: 2,
-    name: '暂停清洗',
-    symbol: '2'
+    id: 0,
+    name: '清洗中',
+    symbol: '0'
   }
 ]);
 Vue.prototype.CleanStatus = CleanStatus;

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

@@ -65,9 +65,9 @@
         <vxe-column field="finishTime" title="完成时间"></vxe-column>
         <vxe-column field="operation" title="操作">
           <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" v-if="scope.row.cleanStatus===1" @click='details(scope.row)'>详情</el-button>
+<!--            <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>
           </template>
         </vxe-column>

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

@@ -88,10 +88,10 @@
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item @click.native="addVersions(scope.row)">新增版本</el-dropdown-item>
                   <el-dropdown-item v-if="scope.row.inputStatus === 1 && scope.row.releaseStatus === 0" @click.native="putOut(scope.row)">发布</el-dropdown-item>
-                  <el-dropdown-item v-if="scope.row.inputStatus === 1">清洗</el-dropdown-item>
+                  <el-dropdown-item v-if="scope.row.inputStatus === 1 && scope.row.releaseStatus === 0" @click.native='clean(scope.row)'>清洗</el-dropdown-item>
                   <el-dropdown-item v-if="scope.row.inputStatus === 1" @click.native="derived(scope.row)">导出</el-dropdown-item>
                   <el-dropdown-item @click.native="delDataset(scope.row)">删除数据集</el-dropdown-item>
-                  <el-dropdown-item @click.native="delVersions(scope.row)">删除该版本</el-dropdown-item>
+                  <el-dropdown-item v-if="scope.row.releaseStatus === 0" @click.native="delVersions(scope.row)">删除该版本</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </template>
@@ -348,6 +348,10 @@ export default {
       console.log(data)
       this.$router.push({ name: 'sft' })
     },
+    clean(data) {
+      // 去清洗
+      this.$router.push({ name: 'dataCleansing' })
+    },
     putOut(data) {
       console.log(data)
       this.$confirm('是否确认发布', '提示', {

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

@@ -17,7 +17,7 @@
         <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="releaseStatus===0">标注</el-button>
-          <el-button type="text" :size="defaultFormItemSize" @click="del(scope.row)">删除</el-button>
+          <el-button type="text" :size="defaultFormItemSize" @click="del(scope.row)" v-if="releaseStatus===0">删除</el-button>
         </template>
       </vxe-column>
     </vxe-table>
@@ -159,7 +159,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        let params = { id: item._id, versionId: item.versionId }
+        let params = { id: item.id, versionId: item.versionId }
         DatasetData.delete(this, params)
           .then((res) => {
             this.$message.success('删除成功')

src/views/gptTraining/dataServices/myDataSet/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" @click="del(nowVersion)" v-if="nowVersion.releaseStatus === 0">删除</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">
@@ -144,7 +144,7 @@ export default {
     },
     del(data) {
       if (this.versionList.length === 1) {
-        this.$message.warning('必须存在一个版本')
+        this.$message.warning('必须保留一个数据集版本！')
         return
       }
       this.$confirm('是否确认删除', '提示', {

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

@@ -37,7 +37,7 @@
       <vxe-table border show-header-overflow show-overflow :row-config="{ isHover: true }" :data="myDataSetPage.tableData.impl.dataList" min-height="96">
         <vxe-column field="versionName" title="数据集名称 > 版本">
           <template slot-scope="scope">
-            {{ scope.row.versionName + ' > V' + scope.row.datasetVersion}}
+            {{ scope.row.versionName}}
           </template>
         </vxe-column>
         <vxe-column field="dimensionType" title="标注类型 > 模版">
@@ -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)">删除</el-button>
+            <el-button type="text" :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/particulars.vue

@@ -159,7 +159,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        let params = { id: item._id, versionId: item.versionId }
+        let params = { id: item.id, versionId: item.versionId }
         DatasetData.delete(this, params)
           .then((res) => {
             this.$message.success('删除成功')

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

@@ -143,7 +143,7 @@ export default {
     },
     del(data) {
       if (this.versionList.length === 1) {
-        this.$message.warning('必须存在一个版本')
+        this.$message.warning('必须保留一个数据集版本！')
         return
       }
       this.$confirm('是否确认删除', '提示', {