diff --git a/code/web/task_schedule/package-lock.json b/code/web/task_schedule/package-lock.json
index da26dfb..5040e05 100644
--- a/code/web/task_schedule/package-lock.json
+++ b/code/web/task_schedule/package-lock.json
@@ -21,7 +21,7 @@
"devDependencies": {
"@babel/eslint-parser": "^7.22.15",
"@rushstack/eslint-patch": "^1.4.0",
- "@typescript-eslint/eslint-plugin": "^6.7.2",
+ "@typescript-eslint/eslint-plugin": "^6.7.3",
"@vitejs/plugin-vue": "^4.3.4",
"@vue/cli-plugin-eslint": "^5.0.8",
"@vue/eslint-config-typescript": "^12.0.0",
@@ -1514,9 +1514,9 @@
"peer": true
},
"node_modules/@types/semver": {
- "version": "7.5.2",
- "resolved": "https://registry.npmmirror.com/@types/semver/-/semver-7.5.2.tgz",
- "integrity": "sha512-7aqorHYgdNO4DM36stTiGO3DvKoex9TQRwsJU6vMaFGyqpBA1MNZkz+PG3gaNUPpTAOYhT1WR7M1JyA3fbS9Cw==",
+ "version": "7.5.3",
+ "resolved": "https://registry.npmmirror.com/@types/semver/-/semver-7.5.3.tgz",
+ "integrity": "sha512-OxepLK9EuNEIPxWNME+C6WwbRAOOI2o2BaQEGzz5Lu2e4Z5eDnEo+/aVEDMIXywoJitJ7xWd641wrGLZdtwRyw==",
"dev": true
},
"node_modules/@types/send": {
@@ -1578,16 +1578,16 @@
}
},
"node_modules/@typescript-eslint/eslint-plugin": {
- "version": "6.7.2",
- "resolved": "https://registry.npmmirror.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.7.2.tgz",
- "integrity": "sha512-ooaHxlmSgZTM6CHYAFRlifqh1OAr3PAQEwi7lhYhaegbnXrnh7CDcHmc3+ihhbQC7H0i4JF0psI5ehzkF6Yl6Q==",
+ "version": "6.7.3",
+ "resolved": "https://registry.npmmirror.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.7.3.tgz",
+ "integrity": "sha512-vntq452UHNltxsaaN+L9WyuMch8bMd9CqJ3zhzTPXXidwbf5mqqKCVXEuvRZUqLJSTLeWE65lQwyXsRGnXkCTA==",
"dev": true,
"dependencies": {
"@eslint-community/regexpp": "^4.5.1",
- "@typescript-eslint/scope-manager": "6.7.2",
- "@typescript-eslint/type-utils": "6.7.2",
- "@typescript-eslint/utils": "6.7.2",
- "@typescript-eslint/visitor-keys": "6.7.2",
+ "@typescript-eslint/scope-manager": "6.7.3",
+ "@typescript-eslint/type-utils": "6.7.3",
+ "@typescript-eslint/utils": "6.7.3",
+ "@typescript-eslint/visitor-keys": "6.7.3",
"debug": "^4.3.4",
"graphemer": "^1.4.0",
"ignore": "^5.2.4",
@@ -1608,6 +1608,50 @@
}
}
},
+ "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
+ "version": "6.7.3",
+ "resolved": "https://registry.npmmirror.com/@typescript-eslint/scope-manager/-/scope-manager-6.7.3.tgz",
+ "integrity": "sha512-wOlo0QnEou9cHO2TdkJmzF7DFGvAKEnB82PuPNHpT8ZKKaZu6Bm63ugOTn9fXNJtvuDPanBc78lGUGGytJoVzQ==",
+ "dev": true,
+ "dependencies": {
+ "@typescript-eslint/types": "6.7.3",
+ "@typescript-eslint/visitor-keys": "6.7.3"
+ },
+ "engines": {
+ "node": "^16.0.0 || >=18.0.0"
+ }
+ },
+ "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
+ "version": "6.7.3",
+ "resolved": "https://registry.npmmirror.com/@typescript-eslint/types/-/types-6.7.3.tgz",
+ "integrity": "sha512-4g+de6roB2NFcfkZb439tigpAMnvEIg3rIjWQ+EM7IBaYt/CdJt6em9BJ4h4UpdgaBWdmx2iWsafHTrqmgIPNw==",
+ "dev": true,
+ "engines": {
+ "node": "^16.0.0 || >=18.0.0"
+ }
+ },
+ "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
+ "version": "6.7.3",
+ "resolved": "https://registry.npmmirror.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.7.3.tgz",
+ "integrity": "sha512-HEVXkU9IB+nk9o63CeICMHxFWbHWr3E1mpilIQBe9+7L/lH97rleFLVtYsfnWB+JVMaiFnEaxvknvmIzX+CqVg==",
+ "dev": true,
+ "dependencies": {
+ "@typescript-eslint/types": "6.7.3",
+ "eslint-visitor-keys": "^3.4.1"
+ },
+ "engines": {
+ "node": "^16.0.0 || >=18.0.0"
+ }
+ },
+ "node_modules/@typescript-eslint/eslint-plugin/node_modules/eslint-visitor-keys": {
+ "version": "3.4.3",
+ "resolved": "https://registry.npmmirror.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+ "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+ "dev": true,
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ }
+ },
"node_modules/@typescript-eslint/eslint-plugin/node_modules/lru-cache": {
"version": "6.0.0",
"resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -1679,13 +1723,13 @@
}
},
"node_modules/@typescript-eslint/type-utils": {
- "version": "6.7.2",
- "resolved": "https://registry.npmmirror.com/@typescript-eslint/type-utils/-/type-utils-6.7.2.tgz",
- "integrity": "sha512-36F4fOYIROYRl0qj95dYKx6kybddLtsbmPIYNK0OBeXv2j9L5nZ17j9jmfy+bIDHKQgn2EZX+cofsqi8NPATBQ==",
+ "version": "6.7.3",
+ "resolved": "https://registry.npmmirror.com/@typescript-eslint/type-utils/-/type-utils-6.7.3.tgz",
+ "integrity": "sha512-Fc68K0aTDrKIBvLnKTZ5Pf3MXK495YErrbHb1R6aTpfK5OdSFj0rVN7ib6Tx6ePrZ2gsjLqr0s98NG7l96KSQw==",
"dev": true,
"dependencies": {
- "@typescript-eslint/typescript-estree": "6.7.2",
- "@typescript-eslint/utils": "6.7.2",
+ "@typescript-eslint/typescript-estree": "6.7.3",
+ "@typescript-eslint/utils": "6.7.3",
"debug": "^4.3.4",
"ts-api-utils": "^1.0.1"
},
@@ -1701,6 +1745,93 @@
}
}
},
+ "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": {
+ "version": "6.7.3",
+ "resolved": "https://registry.npmmirror.com/@typescript-eslint/types/-/types-6.7.3.tgz",
+ "integrity": "sha512-4g+de6roB2NFcfkZb439tigpAMnvEIg3rIjWQ+EM7IBaYt/CdJt6em9BJ4h4UpdgaBWdmx2iWsafHTrqmgIPNw==",
+ "dev": true,
+ "engines": {
+ "node": "^16.0.0 || >=18.0.0"
+ }
+ },
+ "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": {
+ "version": "6.7.3",
+ "resolved": "https://registry.npmmirror.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.7.3.tgz",
+ "integrity": "sha512-YLQ3tJoS4VxLFYHTw21oe1/vIZPRqAO91z6Uv0Ss2BKm/Ag7/RVQBcXTGcXhgJMdA4U+HrKuY5gWlJlvoaKZ5g==",
+ "dev": true,
+ "dependencies": {
+ "@typescript-eslint/types": "6.7.3",
+ "@typescript-eslint/visitor-keys": "6.7.3",
+ "debug": "^4.3.4",
+ "globby": "^11.1.0",
+ "is-glob": "^4.0.3",
+ "semver": "^7.5.4",
+ "ts-api-utils": "^1.0.1"
+ },
+ "engines": {
+ "node": "^16.0.0 || >=18.0.0"
+ },
+ "peerDependenciesMeta": {
+ "typescript": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": {
+ "version": "6.7.3",
+ "resolved": "https://registry.npmmirror.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.7.3.tgz",
+ "integrity": "sha512-HEVXkU9IB+nk9o63CeICMHxFWbHWr3E1mpilIQBe9+7L/lH97rleFLVtYsfnWB+JVMaiFnEaxvknvmIzX+CqVg==",
+ "dev": true,
+ "dependencies": {
+ "@typescript-eslint/types": "6.7.3",
+ "eslint-visitor-keys": "^3.4.1"
+ },
+ "engines": {
+ "node": "^16.0.0 || >=18.0.0"
+ }
+ },
+ "node_modules/@typescript-eslint/type-utils/node_modules/eslint-visitor-keys": {
+ "version": "3.4.3",
+ "resolved": "https://registry.npmmirror.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+ "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+ "dev": true,
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ }
+ },
+ "node_modules/@typescript-eslint/type-utils/node_modules/lru-cache": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-6.0.0.tgz",
+ "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+ "dev": true,
+ "dependencies": {
+ "yallist": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/@typescript-eslint/type-utils/node_modules/semver": {
+ "version": "7.5.4",
+ "resolved": "https://registry.npmmirror.com/semver/-/semver-7.5.4.tgz",
+ "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+ "dev": true,
+ "dependencies": {
+ "lru-cache": "^6.0.0"
+ },
+ "bin": {
+ "semver": "bin/semver.js"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/@typescript-eslint/type-utils/node_modules/yallist": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz",
+ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+ "dev": true
+ },
"node_modules/@typescript-eslint/types": {
"version": "6.7.2",
"resolved": "https://registry.npmmirror.com/@typescript-eslint/types/-/types-6.7.2.tgz",
@@ -1767,17 +1898,17 @@
"dev": true
},
"node_modules/@typescript-eslint/utils": {
- "version": "6.7.2",
- "resolved": "https://registry.npmmirror.com/@typescript-eslint/utils/-/utils-6.7.2.tgz",
- "integrity": "sha512-ZCcBJug/TS6fXRTsoTkgnsvyWSiXwMNiPzBUani7hDidBdj1779qwM1FIAmpH4lvlOZNF3EScsxxuGifjpLSWQ==",
+ "version": "6.7.3",
+ "resolved": "https://registry.npmmirror.com/@typescript-eslint/utils/-/utils-6.7.3.tgz",
+ "integrity": "sha512-vzLkVder21GpWRrmSR9JxGZ5+ibIUSudXlW52qeKpzUEQhRSmyZiVDDj3crAth7+5tmN1ulvgKaCU2f/bPRCzg==",
"dev": true,
"dependencies": {
"@eslint-community/eslint-utils": "^4.4.0",
"@types/json-schema": "^7.0.12",
"@types/semver": "^7.5.0",
- "@typescript-eslint/scope-manager": "6.7.2",
- "@typescript-eslint/types": "6.7.2",
- "@typescript-eslint/typescript-estree": "6.7.2",
+ "@typescript-eslint/scope-manager": "6.7.3",
+ "@typescript-eslint/types": "6.7.3",
+ "@typescript-eslint/typescript-estree": "6.7.3",
"semver": "^7.5.4"
},
"engines": {
@@ -1787,6 +1918,73 @@
"eslint": "^7.0.0 || ^8.0.0"
}
},
+ "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/scope-manager": {
+ "version": "6.7.3",
+ "resolved": "https://registry.npmmirror.com/@typescript-eslint/scope-manager/-/scope-manager-6.7.3.tgz",
+ "integrity": "sha512-wOlo0QnEou9cHO2TdkJmzF7DFGvAKEnB82PuPNHpT8ZKKaZu6Bm63ugOTn9fXNJtvuDPanBc78lGUGGytJoVzQ==",
+ "dev": true,
+ "dependencies": {
+ "@typescript-eslint/types": "6.7.3",
+ "@typescript-eslint/visitor-keys": "6.7.3"
+ },
+ "engines": {
+ "node": "^16.0.0 || >=18.0.0"
+ }
+ },
+ "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/types": {
+ "version": "6.7.3",
+ "resolved": "https://registry.npmmirror.com/@typescript-eslint/types/-/types-6.7.3.tgz",
+ "integrity": "sha512-4g+de6roB2NFcfkZb439tigpAMnvEIg3rIjWQ+EM7IBaYt/CdJt6em9BJ4h4UpdgaBWdmx2iWsafHTrqmgIPNw==",
+ "dev": true,
+ "engines": {
+ "node": "^16.0.0 || >=18.0.0"
+ }
+ },
+ "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/typescript-estree": {
+ "version": "6.7.3",
+ "resolved": "https://registry.npmmirror.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.7.3.tgz",
+ "integrity": "sha512-YLQ3tJoS4VxLFYHTw21oe1/vIZPRqAO91z6Uv0Ss2BKm/Ag7/RVQBcXTGcXhgJMdA4U+HrKuY5gWlJlvoaKZ5g==",
+ "dev": true,
+ "dependencies": {
+ "@typescript-eslint/types": "6.7.3",
+ "@typescript-eslint/visitor-keys": "6.7.3",
+ "debug": "^4.3.4",
+ "globby": "^11.1.0",
+ "is-glob": "^4.0.3",
+ "semver": "^7.5.4",
+ "ts-api-utils": "^1.0.1"
+ },
+ "engines": {
+ "node": "^16.0.0 || >=18.0.0"
+ },
+ "peerDependenciesMeta": {
+ "typescript": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/visitor-keys": {
+ "version": "6.7.3",
+ "resolved": "https://registry.npmmirror.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.7.3.tgz",
+ "integrity": "sha512-HEVXkU9IB+nk9o63CeICMHxFWbHWr3E1mpilIQBe9+7L/lH97rleFLVtYsfnWB+JVMaiFnEaxvknvmIzX+CqVg==",
+ "dev": true,
+ "dependencies": {
+ "@typescript-eslint/types": "6.7.3",
+ "eslint-visitor-keys": "^3.4.1"
+ },
+ "engines": {
+ "node": "^16.0.0 || >=18.0.0"
+ }
+ },
+ "node_modules/@typescript-eslint/utils/node_modules/eslint-visitor-keys": {
+ "version": "3.4.3",
+ "resolved": "https://registry.npmmirror.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+ "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+ "dev": true,
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ }
+ },
"node_modules/@typescript-eslint/utils/node_modules/lru-cache": {
"version": "6.0.0",
"resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-6.0.0.tgz",
diff --git a/code/web/task_schedule/package.json b/code/web/task_schedule/package.json
index 884dfab..745c704 100644
--- a/code/web/task_schedule/package.json
+++ b/code/web/task_schedule/package.json
@@ -22,7 +22,7 @@
"devDependencies": {
"@babel/eslint-parser": "^7.22.15",
"@rushstack/eslint-patch": "^1.4.0",
- "@typescript-eslint/eslint-plugin": "^6.7.2",
+ "@typescript-eslint/eslint-plugin": "^6.7.3",
"@vitejs/plugin-vue": "^4.3.4",
"@vue/cli-plugin-eslint": "^5.0.8",
"@vue/eslint-config-typescript": "^12.0.0",
diff --git a/code/web/task_schedule/src/router/index.js b/code/web/task_schedule/src/router/index.js
index b1a2616..b4bb793 100644
--- a/code/web/task_schedule/src/router/index.js
+++ b/code/web/task_schedule/src/router/index.js
@@ -77,7 +77,7 @@ const routes = [
title: "数据管理",
icon: "document",
},
- component: ()=> import( "../views/DataManagement.vue" ),
+ component: ()=> import( "../views/data/DataManagement.vue" ),
},
{
path:"/reward_management",
diff --git a/code/web/task_schedule/src/views/DataManagement.vue b/code/web/task_schedule/src/views/DataManagement.vue
deleted file mode 100644
index 756bd3d..0000000
--- a/code/web/task_schedule/src/views/DataManagement.vue
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
- 数据管理
-
-
-
-
diff --git a/code/web/task_schedule/src/views/data/DataManagement.vue b/code/web/task_schedule/src/views/data/DataManagement.vue
new file mode 100644
index 0000000..4a8607e
--- /dev/null
+++ b/code/web/task_schedule/src/views/data/DataManagement.vue
@@ -0,0 +1,110 @@
+
+
+
+
+
+
+ 上传
+
+
+ 清除
+
+
+
+ 文件不能大于100MB。
+
+
+
+
+
+
+
+
diff --git a/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/fileupload/FileUpload.java b/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/fileupload/FileUpload.java
index 1ad6a32..82102da 100644
--- a/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/fileupload/FileUpload.java
+++ b/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/fileupload/FileUpload.java
@@ -2,8 +2,8 @@
* @Author: Kane
* @Date: 2023-01-22 23:11:26
* @LastEditors: Kane
- * @LastEditTime: 2023-09-25 22:56:49
- * @FilePath: /desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/FileUpload/FileUpload.java
+ * @LastEditTime: 2023-09-26 15:59:40
+ * @FilePath: /desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/fileupload/FileUpload.java
* @Description: 用于接受上传文件的Controller。
*
* Copyright (c) ${2022} by Kane, All Rights Reserved.
@@ -35,7 +35,7 @@ public class FileUpload
@RequestMapping( path = "/file-upload.do" )
@ResponseBody
public FileUploadResult getUploadFile( @RequestParam( "task-name" ) String taskName,
- @RequestParam( "file" ) MultipartFile[] files, HttpServletRequest request )
+ @RequestParam( "files" ) MultipartFile[] files, HttpServletRequest request )
{
// session id用来创建临时目录,避免重复
String sessionID = request.getSession().getId();
diff --git a/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/fileupload/FileUploadResult.java b/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/fileupload/FileUploadResult.java
index 9e48aa3..a9aeecc 100644
--- a/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/fileupload/FileUploadResult.java
+++ b/code/后端/desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/fileupload/FileUploadResult.java
@@ -2,8 +2,8 @@
* @Author: Kane
* @Date: 2023-01-23 22:56:17
* @LastEditors: Kane
- * @LastEditTime: 2023-09-25 22:57:00
- * @FilePath: /desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/FileUpload/FileUploadResult.java
+ * @LastEditTime: 2023-09-26 10:30:27
+ * @FilePath: /desktop_archievement_backend/src/main/java/com/cpic/xim/web/controllers/fileupload/FileUploadResult.java
* @Description:
*
* Copyright (c) ${2022} by Kane, All Rights Reserved.
@@ -12,32 +12,24 @@
package com.cpic.xim.web.controllers.fileupload;
import java.util.Vector;
+import com.cpic.xim.web.controllers.QueryResponse;
import com.fasterxml.jackson.annotation.JsonProperty;
@SuppressWarnings( "unused" )
-public class FileUploadResult
+public class FileUploadResult extends QueryResponse
{
public FileUploadResult()
- {}
-
- public boolean isSuccess()
{
- return success;
+ super();
}
- public void setSuccess( boolean success )
+ public FileUploadResult( boolean success,
+ String message,
+ Vector fileList )
{
- this.success = success;
- }
+ super( success, message );
- public String getMessage()
- {
- return message;
- }
-
- public void setMessage( String message )
- {
- this.message = message;
+ this.fileList = fileList;
}
public Vector getFileList()
@@ -50,12 +42,6 @@ public class FileUploadResult
this.fileList = fileList;
}
- @JsonProperty( "success" )
- private boolean success;
-
- @JsonProperty( "message" )
- private String message;
-
@JsonProperty( "file-list" )
private Vector fileList;
}