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

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

 <!--导入 -->
 <template>
-  <el-form label-position="left" ref="form" label-width="100px" :model="form" :size="defaultFormItemSize" :rules="rules"  v-loading.fullscreen.lock="fullscreenLoading">
+  <el-form label-position="left" ref="form" label-width="120px" :model="form" :size="defaultFormItemSize" :rules="rules"  v-loading.fullscreen.lock="fullscreenLoading">
 
     <!-- <el-form-item label="数据标注状态:">
       <el-radio v-for="item in DataAnnotationState.getList()" :key="item.id" v-model="form.dimensionType"
@@ -10,10 +10,10 @@
       <el-radio v-for="item in ImportFormat.getList()" :key="item.id" v-model="form.dimensionType"
         :label="item.id">{{ item.name }}</el-radio>
     </el-form-item> -->
-    <el-form-item label="上传jsonl文件:" prop="importFile">
+    <el-form-item label="上传JSONL文件:" prop="importFile">
 
       <el-button @click="clickUp" :size="defaultFormItemSize"  type="primary">上传<i class="el-icon-upload el-icon--right"></i></el-button>
-      <input style="display:none" ref="upFile" type="file" accept="application/json"  @change="fileinfo($event.target.files)" >
+      <input style="display:none" ref="upFile" type="file" accept=".JSONL"  @change="fileinfo($event.target.files)" >
 
       <div class="itemFile" v-if="form.importFile">{{ form.importFile?.name }}
       <i class="el-icon-circle-close" style="color:#0092FF;cursor: pointer;" @click="clearFile()"></i>

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

@@ -4,7 +4,7 @@
     <div class="versionsList">
       <div class="title">版本列表</div>
       <el-button type="text" icon="el-icon-plus" @click="addVersions()">新增版本</el-button>
-      <div :class="['versionsItem','omit',item?.versionId===nowVersion?.versionId?'isActive':'']" v-for="item in versionList" :key="item.versionId" @click="cutVersions(item)">{{ item.versionName }}</div>
+      <div :class="['versionsItem','omit',item?.versionId===nowVersion?.versionId?'isActive':'']" v-for="item in versionList" :key="item.versionId" @click="cutVersions(item)">V{{ item.datasetVersion }}</div>
     </div>
 
     <el-tabs v-model="activeName" style="width:calc(100% - 200px)" v-if="nowVersion">

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

@@ -35,7 +35,11 @@
       </el-form>
 
       <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="数据集名称 > 版本"></vxe-column>
+        <vxe-column field="versionName" title="数据集名称 > 版本">
+          <template slot-scope="scope">
+            {{ scope.row.versionName + ' > V' + scope.row.datasetVersion}}
+          </template>
+        </vxe-column>
         <vxe-column field="dimensionType" title="标注类型 > 模版">
           <template slot-scope="scope">
             {{ LabelType.getValue(scope.row.dimensionType) }}

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

 <!--导入 -->
 <template>
-  <el-form label-position="left" ref="form" label-width="100px" :model="form" :size="defaultFormItemSize" :rules="rules"  v-loading.fullscreen.lock="fullscreenLoading">
+  <el-form label-position="left" ref="form" label-width="120px" :model="form" :size="defaultFormItemSize" :rules="rules"  v-loading.fullscreen.lock="fullscreenLoading">
 
     <!-- <el-form-item label="数据标注状态:">
       <el-radio v-for="item in DataAnnotationState.getList()" :key="item.id" v-model="form.dimensionType"
@@ -10,10 +10,10 @@
       <el-radio v-for="item in ImportFormat.getList()" :key="item.id" v-model="form.dimensionType"
         :label="item.id">{{ item.name }}</el-radio>
     </el-form-item> -->
-    <el-form-item label="上传jsonl文件:" prop="importFile">
+    <el-form-item label="上传JSONL文件:" prop="importFile">
 
       <el-button @click="clickUp" :size="defaultFormItemSize"  type="primary">上传<i class="el-icon-upload el-icon--right"></i></el-button>
-      <input style="display:none" ref="upFile" type="file" accept="application/json"  @change="fileinfo($event.target.files)" >
+      <input style="display:none" ref="upFile" type="file" accept=".JSONL"  @change="fileinfo($event.target.files)" >
 
       <div class="itemFile" v-if="form.importFile">{{ form.importFile?.name }}
       <i class="el-icon-circle-close" style="color:#0092FF;cursor: pointer;" @click="clearFile()"></i>

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

@@ -4,7 +4,7 @@
     <div class="versionsList">
       <div class="title">版本列表</div>
       <el-button type="text" icon="el-icon-plus" @click="addVersions()">新增版本</el-button>
-      <div :class="['versionsItem','omit',item?.versionId===nowVersion?.versionId?'isActive':'']" v-for="item in versionList" :key="item.versionId" @click="cutVersions(item)">{{ item.versionName }}</div>
+      <div :class="['versionsItem','omit',item?.versionId===nowVersion?.versionId?'isActive':'']" v-for="item in versionList" :key="item.versionId" @click="cutVersions(item)">V{{ item.datasetVersion }}</div>
     </div>
 
     <el-tabs v-model="activeName" style="width:calc(100% - 200px)" v-if="nowVersion">