提交代码

src/api/dataCenter/dataSet.js

@@ -24,4 +24,17 @@ export function del(dataSetIds) {
     method: 'post'
   })
 }
+//删除数据集
+export function setPublic(datasetId,isPublic) {
+  let data = {
+    datasetId,
+    isPublic
+  }
+  return request({
+    url: '/ai/dataset/set-public/',
+    method: 'post',
+    data: data
+  })
+}
+
 

src/views/dataCenter/dataSet/child/addDataSetDialog.vue

@@ -172,15 +172,12 @@ export default {
     },
     updateData(data){
       if (data.folderType === 0) {
-        console.log(0)
         this.form.inputPath = data.folder;
         this.form.inputId = data.fileId
       }else {
-        console.log(1)
         this.form.outputPath = data.folder;
         this.form.outputId = data.fileId
       }
-      console.log()
     }
   },
 };

src/views/dataCenter/dataSet/child/annotationTaskDialog.vue

@@ -3,7 +3,7 @@
     <el-dialog title="创建标注任务" :visible.sync="isOpen" width="700px" append-to-body @close="cancel"
                :close-on-click-modal="false"
     >
-      <el-form ref="form" :model="form" :rules="rules" label-width="70px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="名称" prop="taskName">
           <el-input v-model="form.taskName" maxlength="20" placeholder="请输入版本名称"/>
         </el-form-item>
@@ -17,13 +17,21 @@
           >
           </el-input>
         </el-form-item>
-        <el-form-item label="标注类型" prop="annotateType">
+        <el-form-item label="标注类型" prop="annotateType" >
           <el-select v-model="form.annotateType" placeholder="请选择标注类型" clearable style="width: 100%">
             <el-option v-for="dict in dict.type.ai_annotate_type" :key="dict.value" :label="dict.label"
                        :value="dict.value"
             />
           </el-select>
         </el-form-item>
+
+        <el-form-item label="选择标签" prop="annotateType" >
+          <el-select v-model="form.labels" multiple placeholder="请选择标签" clearable style="width: 100%">
+            <el-option v-for="dict in dict.type.ai_annotate_type" :key="dict.value" :label="dict.label"
+                       :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item label="是否启用标注团队" prop="isStartTeam" label-width="130px">
           <el-switch
             v-model="form.isStartTeam"
@@ -88,7 +96,7 @@
 <script>
 
 import selectPersonnelDialog from '../child/selectPersonnelDialog.vue'
-import { add } from '@/api/dataCenter/releaseVersion'
+import { add } from '@/api/dataCenter/annotationTask'
 
 export default {
   dicts: ['ai_annotate_type'],
@@ -126,7 +134,13 @@ export default {
       selectOpen: false,
       form: {}, // 初始化为空
       rules: {
-        versionName: [
+        taskName: [
+          { required: true, message: '版本名称不能为空', trigger: 'blur' }
+        ],
+        annotateType: [
+          { required: true, message: '版本名称不能为空', trigger: 'blur' }
+        ],
+        labels: [
           { required: true, message: '版本名称不能为空', trigger: 'blur' }
         ]
       }
@@ -148,9 +162,27 @@ export default {
     },
     // 数据提交
     submitForm() {
+      if (this.tableData.length === 0 && this.form.isStartTeam) {
+        this.$modal.msgWarning('请选择人员')
+        return;
+      }
       this.$refs['form'].validate(valid => {
         if (valid) {
-          this.form.datasetId = this.datasetId
+          if(this.form.isStartTeam){
+              let annotators = [];
+              let reviewers =[];
+              this.tableData.forEach((item) => {
+                  if (item.type === '0') {
+                    reviewers.push(item);
+                  }
+                if (item.type === '1') {
+                  annotators.push(item);
+                }
+              })
+            this.form.annotators = annotators;
+            this.form.reviewers = annotators;
+          }
+          this.form.datasetId = this.datasetId;
           add(this.form).then(response => {
             this.$modal.msgSuccess('发布成功')
             this.cancel()

src/views/dataCenter/dataSet/child/dataSetDetails.vue

@@ -90,14 +90,18 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
+
+    <!-- 导入 -->
+    <import-dialog :get-list="getList" :open="importOpen" :dataset-id="datasetId"  @dialog-cancel="handleCancel"/>
   </div>
 </template>
 <script>
 
 
 import { list,remove} from '@/api/dataCenter/dataSetDetails'
+import importDialog from './importDialog.vue'
 export default {
-  components: {},
+  components: { importDialog },
   name: "DataSet",
   data() {
     return {
@@ -118,9 +122,7 @@ export default {
       // 表格数据
       list: [],
       // 是否显示弹出层
-      addOpen: false,
+      importOpen: false,
-      releaseOpen: false,
-      annotationOpen:false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -172,17 +174,6 @@ export default {
     },
     handleAdd(){
       this.addOpen = true;
-    },
-    handleRelease(row){
-      this.releaseOpen = true;
-      this.datasetId = row.datasetId;
-    },
-    handleAnnotation(row){
-      this.annotationOpen = true;
-      this.datasetId = row.datasetId;
-    },
-    handleUpdate(){
-
     },
     handleDelete(row){
       const datasetId = this.datasetId;
@@ -193,9 +184,6 @@ export default {
         this.getList();
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {});
-    },
-    change(){
-
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
@@ -205,9 +193,7 @@ export default {
     },
     // 处理取消事件
     handleCancel() {
-      this.addOpen = false;
+      this.importOpen= false;
-      this.releaseOpen= false;
-      this.annotationOpen = false;
     },
   }
 }

src/views/dataCenter/dataSet/child/importDialog.vue

@@ -0,0 +1,161 @@
+<template>
+  <div>
+    <el-dialog title="导入" :visible.sync="isOpen" width="700px" append-to-body :modal="false" @close="cancel" :close-on-click-modal="false">
+      <el-form ref="form"  :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="数据来源" prop="dataSource" >
+          <el-radio-group v-model="form.dataSource">
+            <el-radio :label="0" border>系统选择</el-radio>
+            <el-radio :label="1" border>本地上传</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="导入路径" prop="inputPath">
+          <el-input placeholder="请选择导入路径" readonly :disabled="true" v-model="form.inputPath" class="input-with-select">
+            <el-button slot="append" icon="el-icon-folder-opened"  @click="selectFolder(0)"></el-button>
+          </el-input>
+        </el-form-item>
+        <div v-show="form.dataSource ===1">
+          <el-form-item label="上传文件" prop="dataSource">
+            <uploadFiles :disabled="form.inputId===0" :parent-id="form.inputId.toString()" :fileUrl="form.inputPath || ''"/>
+          </el-form-item>
+          <el-form-item label="数据来源" prop="isAnnotated">
+            <el-radio-group v-model="form.isAnnotated">
+              <el-radio :label="0" border>未标注</el-radio>
+              <el-radio :label="1" border>已标注</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item v-show="form.isAnnotated === 1">
+            <div style="display: flex;flex-direction: column;">
+              <span>文件存放方式满足YOLO格式</span>
+              <img style="width: 50%" :src="ObjectDetection_YOLO" alt="Weibo">
+            </div>
+          </el-form-item>
+        </div>
+        <el-form-item label="输出路径" prop="outputPath">
+          <el-input placeholder="请选择数据集输出路径" readonly :disabled="true" v-model="form.outputPath" class="input-with-select">
+            <el-button slot="append" icon="el-icon-folder-opened" @click="selectFolder(1)"></el-button>
+          </el-input>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </template>
+    </el-dialog>
+    <selectFolderDialog :open="folderOpen" :folder-type="folderType" @dialog-cancel="handleCancel" @update-data ="updateData" />
+  </div>
+
+</template>
+
+<script>
+import ObjectDetection_YOLO from '@/assets/images/ObjectDetection_YOLO.png'
+import selectFolderDialog from './selectFolderDialog.vue'
+import uploadFiles from '../../library/child/uploadFiles.vue'
+
+export default {
+  components: { uploadFiles, selectFolderDialog},
+  props: {
+    open: {
+      type: Boolean,
+      default: false,
+    },
+    getList: {
+      type: Function,
+      required: true,
+    },
+    datasetId: {
+      type: Number,
+      default: 0,
+      required: true
+    }
+  },
+  computed: {
+    isOpen: {
+      get() {
+        return this.open;
+      },
+      set(value) {
+        this.$emit('update:open', value);
+      },
+    },
+  },
+  data() {
+    return {
+      ObjectDetection_YOLO:ObjectDetection_YOLO,
+      folderOpen: false,
+      folderType:0,
+      form: {
+        dataType:0,
+        dataSource:0,
+        inputId:0,
+        outputId:0
+      }, // 初始化为空
+      rules:{
+        dataSource:[
+          { required: true, message: '数据来源不能为空', trigger: 'blur' },
+        ],
+        inputPath:[
+          { required: true, message: '导入路径不能为空', trigger: 'blur' },
+        ],
+        outputPath:[
+          { required: true, message: '输出路径不能为空', trigger: 'blur' },
+        ],
+      }
+    };
+  },
+  methods: {
+    // 数据提交
+    submitForm() {
+      this.form.datasetId = this.datasetId
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+         console.log(this.form)
+        }
+      })
+      // 提交逻辑
+    },
+    // 取消按钮
+    cancel() {
+      this.isOpen = false;
+      this.reset();
+      this.$emit('dialog-cancel'); // 通知父组件
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        dataType:0,
+        dataSource:0,
+        inputId:0,
+        outputId:0}; // 清空表单
+      this.$refs.form.resetFields(); // 调用 Element UI 的重置方法
+    },
+    //选择文件夹
+    selectFolder(folderType){
+      this.folderType = folderType;
+      this.folderOpen = true;
+    },
+    handleCancel(){
+      this.folderOpen = false;
+    },
+    updateData(data){
+      if (data.folderType === 0) {
+        this.form.inputPath = data.folder;
+        this.form.inputId = data.fileId
+      }else {
+        this.form.outputPath = data.folder;
+        this.form.outputId = data.fileId
+      }
+    }
+  },
+};
+</script>
+
+<style scoped lang="scss">
+/* 样式按需定义 */
+.el-dialog__wrapper {
+  z-index: 2000 !important; /* Set a lower z-index for dialog */
+}
+
+input[aria-hidden=true]{
+  display: none !important;
+}
+</style>

src/views/dataCenter/dataSet/components/dataSet.vue

@@ -98,7 +98,7 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
+            @click="handleImport(scope.row)"
             v-hasPermi="['dataCenter:sample:edit']"
           >导入</el-button>
           <el-button
@@ -153,6 +153,8 @@
     <release-version-dialog :dataset-id="datasetId" :open="releaseOpen" @dialog-cancel="handleCancel"/>
     <!--创建标注任务-->
     <annotation-task-dialog :datasetNum="datasetNum" :dataset-id="datasetId" :open="annotationOpen" @dialog-cancel="handleCancel"/>
+    <!-- 导入 -->
+    <import-dialog :get-list="getList" :open="importOpen" :dataset-id="datasetId"  @dialog-cancel="handleCancel"/>
   </div>
 </template>
 <script>
@@ -160,12 +162,13 @@
 import addDataSetDialog from '../child/addDataSetDialog.vue'
 import releaseVersionDialog from '../child/releaseVersionDialog.vue'
 import annotationTaskDialog from '../child/annotationTaskDialog.vue'
+import importDialog from '../child/importDialog.vue'
 
-import { list,del} from '@/api/dataCenter/dataSet'
+import { list,del,setPublic} from '@/api/dataCenter/dataSet'
 
 
 export default {
-  components: { addDataSetDialog,releaseVersionDialog,annotationTaskDialog},
+  components: { addDataSetDialog,releaseVersionDialog,annotationTaskDialog,importDialog},
   name: "DataSet",
   data() {
     return {
@@ -190,6 +193,7 @@ export default {
       addOpen: false,
       releaseOpen: false,
       annotationOpen:false,
+      importOpen:false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -244,6 +248,10 @@ export default {
       this.datasetId = row.datasetId;
       this.datasetNum = row.notAnnotatedCount;
     },
+    handleImport(row){
+      this.importOpen = true;
+      this.datasetId = row.datasetId;
+    },
     handleUpdate(){
 
     },
@@ -267,8 +275,15 @@ export default {
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {});
     },
-    change(){
+    change(row){
-
+      let text = row.isPublic === '0' ? '不共享' : '共享'
+      this.$modal.confirm('确认要' + text + '吗？').then(function() {
+        return setPublic(row.fileId, row.isPublic)
+      }).then(() => {
+        this.$modal.msgSuccess('操作成功')
+      }).catch(function() {
+        row.isPublic = row.isPublic === '0' ? '1' : '0'
+      })
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
@@ -281,6 +296,7 @@ export default {
       this.addOpen = false;
       this.releaseOpen= false;
       this.annotationOpen = false;
+      this.importOpen = false;
     },
   }
 }