From 1d27a8f44b68784d7854199211c03489fa178231 Mon Sep 17 00:00:00 2001 From: jiang Date: Wed, 27 Nov 2024 13:43:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/dataCenter/annotationTask.js | 24 ++ src/router/index.js | 4 +- .../annotationTask/child/allTasks.vue | 4 +- .../annotationTask/child/dataAnnotations.vue | 287 +++++++++++++++--- .../annotationTask/child/initiatedTasks.vue | 4 +- .../child/participatedTasks.vue | 4 +- ...tDetails.vue => taskAnnotationDetails.vue} | 0 .../dialog/releaseVersionDialog.vue | 6 + .../dataSet/child/addDataSetDialog.vue | 9 +- .../dataSet/child/dataSetDetails.vue | 12 +- .../dataSet/child/datasetVersion.vue | 41 ++- .../dataCenter/dataSet/components/dataSet.vue | 31 +- 12 files changed, 347 insertions(+), 79 deletions(-) rename src/views/dataCenter/annotationTask/child/{dataSetDetails.vue => taskAnnotationDetails.vue} (100%) diff --git a/src/api/dataCenter/annotationTask.js b/src/api/dataCenter/annotationTask.js index 9a30b8b6..fe04697b 100644 --- a/src/api/dataCenter/annotationTask.js +++ b/src/api/dataCenter/annotationTask.js @@ -8,6 +8,22 @@ export function list(query) { params: query }) } +export function creation(query) { + return request({ + url: '/ai/annotationTask/list/creation', + method: 'get', + params: query + }) +} + +export function participant(query) { + return request({ + url: '/ai/annotationTask/list/participant', + method: 'get', + params: query + }) +} + //创建数据集 export function add(data) { return request({ @@ -16,5 +32,13 @@ export function add(data) { data: data }) } +// 获取标注任务文件详情 +export function getAnnotationDetails(data) { + return request({ + url: '/ai/annotationTask/create', + method: 'post', + data: data + }) +} diff --git a/src/router/index.js b/src/router/index.js index 3ce77c33..454a7e29 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -138,7 +138,7 @@ export const dynamicRoutes = [ path: '/dataCenter/dataSet-details', component: Layout, hidden: true, - permissions: ['system:dict:list'], + permissions: ['dataCenter:dataSet:file:list'], children: [ { path: 'index/:dataSetId(\\d+)', @@ -152,7 +152,7 @@ export const dynamicRoutes = [ path: '/dataCenter/dataSet-version', component: Layout, hidden: true, - permissions: ['system:dict:list'], + permissions: ['dataCenter:version:list'], children: [ { path: 'index/:dataSetId(\\d+)', diff --git a/src/views/dataCenter/annotationTask/child/allTasks.vue b/src/views/dataCenter/annotationTask/child/allTasks.vue index 4c146516..67168f22 100644 --- a/src/views/dataCenter/annotationTask/child/allTasks.vue +++ b/src/views/dataCenter/annotationTask/child/allTasks.vue @@ -104,7 +104,7 @@ - + @@ -120,6 +120,7 @@ export default { name: "allTasks", data() { return { + taskId:0, datasetId: 0, // 遮罩层 loading: true, @@ -187,6 +188,7 @@ export default { handleRelease(row){ this.releaseOpen = true; this.datasetId = row.datasetId; + this.taskId = row.taskId; }, handleDimension(row){ diff --git a/src/views/dataCenter/annotationTask/child/dataAnnotations.vue b/src/views/dataCenter/annotationTask/child/dataAnnotations.vue index 56b5bda6..8b90d6d2 100644 --- a/src/views/dataCenter/annotationTask/child/dataAnnotations.vue +++ b/src/views/dataCenter/annotationTask/child/dataAnnotations.vue @@ -1,53 +1,262 @@ + + + diff --git a/src/views/dataCenter/annotationTask/child/initiatedTasks.vue b/src/views/dataCenter/annotationTask/child/initiatedTasks.vue index c2beca13..fdfe2cbd 100644 --- a/src/views/dataCenter/annotationTask/child/initiatedTasks.vue +++ b/src/views/dataCenter/annotationTask/child/initiatedTasks.vue @@ -95,7 +95,7 @@ -import { list,del,setPublic} from '@/api/dataCenter/annotationTask' +import { creation,del} from '@/api/dataCenter/annotationTask' import addTaskDialog from '../dialog/addTaskDialog' import releaseVersionDialog from '../dialog/releaseVersionDialog.vue' export default { @@ -147,7 +147,7 @@ export default { /**获取数据 **/ getList(){ this.loading =true - list(this.queryParams).then(response => { + creation(this.queryParams).then(response => { console.log(response); this.list = response.rows; this.total = response.total; diff --git a/src/views/dataCenter/annotationTask/child/participatedTasks.vue b/src/views/dataCenter/annotationTask/child/participatedTasks.vue index c2beca13..be7a6836 100644 --- a/src/views/dataCenter/annotationTask/child/participatedTasks.vue +++ b/src/views/dataCenter/annotationTask/child/participatedTasks.vue @@ -95,7 +95,7 @@ -import { list,del,setPublic} from '@/api/dataCenter/annotationTask' +import { participant,del} from '@/api/dataCenter/annotationTask' import addTaskDialog from '../dialog/addTaskDialog' import releaseVersionDialog from '../dialog/releaseVersionDialog.vue' export default { @@ -147,7 +147,7 @@ export default { /**获取数据 **/ getList(){ this.loading =true - list(this.queryParams).then(response => { + participant(this.queryParams).then(response => { console.log(response); this.list = response.rows; this.total = response.total; diff --git a/src/views/dataCenter/annotationTask/child/dataSetDetails.vue b/src/views/dataCenter/annotationTask/child/taskAnnotationDetails.vue similarity index 100% rename from src/views/dataCenter/annotationTask/child/dataSetDetails.vue rename to src/views/dataCenter/annotationTask/child/taskAnnotationDetails.vue diff --git a/src/views/dataCenter/annotationTask/dialog/releaseVersionDialog.vue b/src/views/dataCenter/annotationTask/dialog/releaseVersionDialog.vue index 2e9c076b..2fc022d3 100644 --- a/src/views/dataCenter/annotationTask/dialog/releaseVersionDialog.vue +++ b/src/views/dataCenter/annotationTask/dialog/releaseVersionDialog.vue @@ -41,6 +41,11 @@ export default { type: Number, default: 0, required: true, + }, + taskId:{ + type: Number, + default: 0, + required: true, } }, computed: { @@ -69,6 +74,7 @@ export default { this.$refs["form"].validate(valid => { if (valid) { this.form.datasetId = this.datasetId; + this.form.taskId = this.taskId; add(this.form).then(response => { this.$modal.msgSuccess("发布成功"); this.cancel(); diff --git a/src/views/dataCenter/dataSet/child/addDataSetDialog.vue b/src/views/dataCenter/dataSet/child/addDataSetDialog.vue index 6201f590..4588dbb3 100644 --- a/src/views/dataCenter/dataSet/child/addDataSetDialog.vue +++ b/src/views/dataCenter/dataSet/child/addDataSetDialog.vue @@ -109,7 +109,9 @@ export default { dataType:0, dataSource:0, inputId:0, - outputId:0 + outputId:0, + inputPath:'', + outputPath:'', }, // 初始化为空 rules:{ datasetName:[ @@ -160,7 +162,10 @@ export default { dataType:0, dataSource:0, inputId:0, - outputId:0}; // 清空表单 + outputId:0, + inputPath:'', + outputPath:'', + }; // 清空表单 this.$refs.form.resetFields(); // 调用 Element UI 的重置方法 }, //选择文件夹 diff --git a/src/views/dataCenter/dataSet/child/dataSetDetails.vue b/src/views/dataCenter/dataSet/child/dataSetDetails.vue index 6a817b00..b430d61f 100644 --- a/src/views/dataCenter/dataSet/child/dataSetDetails.vue +++ b/src/views/dataCenter/dataSet/child/dataSetDetails.vue @@ -23,7 +23,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['dataCenter:dataSet:add']" + v-hasPermi="['dataCenter:dataSet:import']" >导入 @@ -34,7 +34,7 @@ size="mini" :disabled="multiple" @click="handleDelete" - v-hasPermi="['dataCenter:dataSet:remove']" + v-hasPermi="['dataCenter:dataSet:file:delete']" >删除 @@ -51,7 +51,7 @@ - + @@ -142,6 +142,10 @@ export default { window.addEventListener("resize", this.updateTableHeight); }, methods: { + indexMethod(index){ + console.log(index); + return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + index + 1; + }, updateTableHeight() { // 设置表格高度为窗口高度减去其他元素高度 const headerHeight = 200; // 头部高度,可以调整 diff --git a/src/views/dataCenter/dataSet/child/datasetVersion.vue b/src/views/dataCenter/dataSet/child/datasetVersion.vue index e28ea26e..a0a308b5 100644 --- a/src/views/dataCenter/dataSet/child/datasetVersion.vue +++ b/src/views/dataCenter/dataSet/child/datasetVersion.vue @@ -1,10 +1,10 @@