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

src/api/GptController/MyDataSet.js

@@ -2,27 +2,31 @@ export default class myDataSet {
   static list (sender, params, axiosOption, httpOption) {
     return sender.doUrl('/admin/app/datasetManage/list', 'post', params, axiosOption, httpOption);
   }
-          
+
+  static findDatasets (sender, params, axiosOption, httpOption) {
+    return sender.doUrl('/admin/app/datasetManage/findDatasets', 'post', params, axiosOption, httpOption);
+  }
+
   static listForTree (sender, params, axiosOption, httpOption) {
     return sender.doUrl('/admin/app/datasetManage/listForTree', 'post', params, axiosOption, httpOption);
   }
-          
+
   static view (sender, params, axiosOption, httpOption) {
     return sender.doUrl('/admin/app/datasetManage/view', 'get', params, axiosOption, httpOption);
   }
-          
+
   static export (sender, params, fileName) {
     return sender.download('/admin/app/datasetManage/export', params, fileName);
   }
-          
+
   static add (sender, params, axiosOption, httpOption) {
     return sender.doUrl('/admin/app/datasetManage/add', 'post', params, axiosOption, httpOption);
   }
-          
+
   static update (sender, params, axiosOption, httpOption) {
     return sender.doUrl('/admin/app/datasetManage/update', 'post', params, axiosOption, httpOption);
   }
-          
+
   static delete (sender, params, axiosOption, httpOption) {
     return sender.doUrl('/admin/app/datasetManage/delete', 'post', params, axiosOption, httpOption);
   }

src/router/systemRouters.js

@@ -44,7 +44,7 @@ const routers = [
       { path: 'formSysDeptPost', component: _import('upms/formSysDeptPost/index'), name: 'formSysDeptPost', props: getProps, meta: { title: '设置部门岗位' } },
       // 数据服务
       { path: 'myDataSet', component: _import('gptTraining/dataServices/myDataSet/index'), name: 'myDataSet', props: getProps, meta: { title: '我的数据集' } },
-      { path: 'presetDataSet', component: _import('gptTraining/dataServices/presetDataSet/index'), name: 'presetDataSet', props: getProps, meta: { title: '预制数据集' } },
+      // { path: 'presetDataSet', component: _import('gptTraining/dataServices/presetDataSet/index'), name: 'presetDataSet', props: getProps, meta: { title: '预制数据集' } },
       { path: 'onlineAnnotation', component: _import('gptTraining/dataServices/onlineAnnotation/index'), name: 'onlineAnnotation', props: getProps, meta: { title: '在线标注' } },
       { path: 'dataCleansing', component: _import('gptTraining/dataServices/dataCleansing/index'), name: 'dataCleansing', props: getProps, meta: { title: '数据清洗' } },
       { path: 'dataEnhancement', component: _import('gptTraining/dataServices/dataEnhancement/index'), name: 'dataEnhancement', props: getProps, meta: { title: '数据增强' } },

src/staticDict/gptStaticDict.js

@@ -114,6 +114,34 @@ const LabelType = new DictionaryBase('标注类型', [
 ]);
 Vue.prototype.LabelType = LabelType;
 
+const ImportStatus = new DictionaryBase('导入状态', [
+  {
+    id: 0,
+    name: '未导入',
+    symbol: 'noImportStatus'
+  },
+  {
+    id: 1,
+    name: '导入完成',
+    symbol: 'yesImportStatus'
+  }
+]);
+Vue.prototype.ImportStatus = ImportStatus;
+
+const PublishStatus = new DictionaryBase('发布状态', [
+  {
+    id: 0,
+    name: '未发布',
+    symbol: 'noPublish'
+  },
+  {
+    id: 1,
+    name: '发布完成',
+    symbol: 'yesPublish'
+  }
+]);
+Vue.prototype.PublishStatus = PublishStatus;
+
 const MarkTemplate = new DictionaryBase('标注模版', [
   {
     id: 0,
@@ -640,5 +668,7 @@ export {
   DeploymentStatus,
   SegmentedMode,
   KnowledgeImportFormat,
-  KnowledgeFormat
+  KnowledgeFormat,
+  ImportStatus,
+  PublishStatus
 }

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

@@ -3,24 +3,24 @@
   <div style="position: relative">
     <el-form ref="myDataSetPage" :model="myDataSetPage" label-width="75px" :size="defaultFormItemSize" label-position="right" @submit.native.prevent>
       <filter-box :item-width="350" @search="refresh()" @reset="onReset">
+        <el-form-item label="数据集名称" prop="formFilter.searchString">
+          <el-input class="filter-item" v-model="myDataSetPage.formFilter.searchString" :clearable="true" placeholder="数据集名称" />
+        </el-form-item>
         <el-form-item label="标注类型" prop="formFilter.dimensionType">
-          <el-select v-model="myDataSetPage.formFilter.dimensionType" placeholder="请选择">
+          <el-select v-model="myDataSetPage.formFilter.dimensionType" placeholder="请选择" label-width="120px">
             <el-option v-for="item in LabelType.getList()" :key="item.value" :label="item.name" :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="数据集名称或id" prop="formFilter.searchString" label-width="120px">
-          <el-input class="filter-item" v-model="myDataSetPage.formFilter.searchString" :clearable="true" placeholder="数据集名称或id" />
-        </el-form-item>
       </filter-box>
     </el-form>
     <div class="tableBox" :style="{ height: tableHeight }">
       <el-button class="add" type="primary" icon="el-icon-plus" :size="defaultFormItemSize" @click="add()">创建数据集</el-button>
       <vxe-table border show-header-overflow show-overflow :row-config="{ isHover: true }" :data="myDataSetPage.tableData.impl.dataList" min-height="96">
         <vxe-column field="datasetName" title="数据集名称"></vxe-column>
-        <vxe-column field="datasetVersionList" title="最新版本">
+        <vxe-column field="datasetVersion" title="最新版本">
           <template slot-scope="scope">
-            V{{ scope.row.datasetVersionList[scope.row.datasetVersionList.length-1].datasetVersion }}
+            V{{ scope.row.datasetVersion  }}
           </template>
         </vxe-column>
         <vxe-column field="dataType" title="数据类型">
@@ -33,12 +33,22 @@
             {{ LabelType.getValue(scope.row.dimensionType )  }}
           </template>
         </vxe-column>
-
+        <vxe-column field="dataVolume" title="数据量"></vxe-column>
+        <vxe-column field="inputStatus" title="导入状态">
+          <template slot-scope="scope">
+            {{ ImportStatus.getValue(scope.row.inputStatus )  }}
+          </template>
+        </vxe-column>
+        <vxe-column field="releaseStatus" title="发布状态">
+          <template slot-scope="scope">
+            {{ PublishStatus.getValue(scope.row.releaseStatus )  }}
+          </template>
+        </vxe-column>
         <vxe-column field="createTime" title="创建时间"></vxe-column>
         <vxe-column field="operation" title="操作" width="280">
           <template slot-scope="scope">
-            <el-button type="text" icon="el-icon-plus" @click="addVersions(scope.row)">新增版本</el-button>
-            <el-button type="text" icon="el-icon-menu" @click="all(scope.row)">全部版本</el-button>
+            <el-button type="text" icon="el-icon-menu" @click="all(scope.row)">详情</el-button>
+            <el-button type="text" icon="el-icon-plus" @click="addVersions(scope.row)">导入</el-button>
             <el-button type="text" icon="el-icon-delete" @click="delDataset(scope.row)">删除</el-button>
           </template>
         </vxe-column>
@@ -100,7 +110,7 @@ export default {
       }
 
       return new Promise((resolve, reject) => {
-        MyDataSet.list(this, params)
+        MyDataSet.findDatasets(this, params)
           .then((res) => {
             resolve({
               dataList: res.data.dataList.map((item) => {
@@ -122,7 +132,7 @@ export default {
           {
             area: ['600px', 'auto']
           },
-          { isEdit: false, datasetId: row.datasetId, versionList: row.datasetVersionList }
+          { isEdit: false, datasetId: row.datasetId }
         )
         .then((res) => {
           this.refresh()