diff --git a/.env.development b/.env.development index 99c3f9f..bb18d75 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ VITE_APP_PORT = 3000 VITE_APP_BASE_API = '/api' #VITE_APP_API_URL = http://62.234.3.186/mk/ai/api # 线上接口地址 -#VITE_APP_API_URL = http://10.5.1.137:8800 +#VITE_APP_API_URL = http://10.5.1.21:8800 VITE_APP_API_URL = http://62.234.3.186/api # 开发接口地址 # VITE_APP_API_URL = http://localhost:8989 diff --git a/package.json b/package.json index a634a36..f5991df 100644 --- a/package.json +++ b/package.json @@ -56,12 +56,14 @@ "echarts": "^5.5.0", "element-plus": "^2.7.2", "js-md5": "^0.8.3", + "json-editor-vue3": "^1.1.1", "lodash-es": "^4.17.21", "net": "^1.0.2", "nprogress": "^0.2.0", "path-browserify": "^1.0.1", "path-to-regexp": "^6.2.2", - "pinia": "^2.1.7", + "pinia": "^2.1.7", + "print-js": "^1.6.0", "sockjs-client": "1.6.1", "sortablejs": "^1.15.2", "stompjs": "^2.3.3", @@ -91,7 +93,6 @@ "commitizen": "^4.3.0", "cz-git": "^1.9.1", "eslint": "^8.57.0", - "rollup-plugin-terser": "^7.0.2", "eslint-config-prettier": "^9.1.0", "eslint-plugin-import": "^2.29.1", "eslint-plugin-prettier": "^5.1.3", @@ -103,6 +104,7 @@ "postcss-html": "^1.6.0", "postcss-scss": "^4.0.9", "prettier": "^3.2.5", + "rollup-plugin-terser": "^7.0.2", "sass": "^1.76.0", "stylelint": "^16.5.0", "stylelint-config-html": "^1.1.0", diff --git a/src/api/log/index.js b/src/api/log/index.js index fe6ed0c..b86ad49 100644 --- a/src/api/log/index.js +++ b/src/api/log/index.js @@ -37,9 +37,9 @@ const compileDeploy=(operation_id)=>{ } //获取推理最新的模型推理日志 -const inferenceTaskLatest=task_id=>{ +const inferenceTaskLatest=(task_id,DeviceId)=>{ return request({ - url: `/logs/inference/${task_id}/latest`, + url: `/logs/inference/${task_id}/latest?DeviceId=${DeviceId}&LogCount=50`, method: "get" }); } diff --git a/src/api/menu/index.ts b/src/api/menu/index.ts index 34b4cec..2e0d562 100644 --- a/src/api/menu/index.ts +++ b/src/api/menu/index.ts @@ -34,7 +34,7 @@ class MenuAPI { alwaysShow: false, }, }, - ] + ], }, { path: "/modelMgr", @@ -87,7 +87,7 @@ class MenuAPI { keepAlive: true, alwaysShow: false, }, - } + }, ], }, { @@ -102,7 +102,7 @@ class MenuAPI { roles: ["GUEST", "ADMIN", "ADMIN6"], alwaysShow: false, }, - children: [ + children: [ { path: "index", component: "connection/index", @@ -141,7 +141,7 @@ class MenuAPI { keepAlive: true, alwaysShow: false, }, - } + }, ], }, { @@ -169,19 +169,47 @@ class MenuAPI { keepAlive: true, alwaysShow: false, }, - },{ - path: "taskDesc", - component: "simulationEvaluation/taskDesc", - name: "simulationEvaluationTaskDesc", + }, + { + path: "reportList", + component: "simulationEvaluation/reportList", + name: "simulationEvaluationReportList", meta: { - title: "评估报告-查看", + title: "评估报告", + icon: "user", + hidden: false, + roles: ["ADMIN", "GUEST"], + keepAlive: true, + alwaysShow: false, + }, + }, + { + path: "addReport", + component: "simulationEvaluation/addReport", + name: "simulationEvaluationAddReport", + meta: { + title: "新建评估报告", icon: "user", hidden: true, roles: ["ADMIN", "GUEST"], keepAlive: true, alwaysShow: false, }, - },{ + }, + { + path: "reportDesc", + component: "simulationEvaluation/reportDesc", + name: "simulationEvaluationReportDesc", + meta: { + title: "评估报告详情", + icon: "user", + hidden: true, + roles: ["ADMIN", "GUEST"], + keepAlive: true, + alwaysShow: false, + }, + }, + { path: "addTask", component: "simulationEvaluation/addTask", name: "simulationEvaluationAddTask", @@ -206,7 +234,8 @@ class MenuAPI { keepAlive: true, alwaysShow: false, }, - },{ + }, + { path: "hisTaskList", component: "simulationEvaluation/hisTaskList", name: "simulationEvaluationHisTaskList", @@ -471,7 +500,7 @@ class MenuAPI { roles: ["ADMIN6", "GUEST", "ADMIN"], keepAlive: true, alwaysShow: false, - } + }, }, { path: "otherToolDetail", @@ -483,7 +512,7 @@ class MenuAPI { roles: ["ADMIN6", "GUEST", "ADMIN"], keepAlive: true, alwaysShow: false, - } + }, }, ], }, diff --git a/src/api/report/index.js b/src/api/report/index.js new file mode 100644 index 0000000..73a12ad --- /dev/null +++ b/src/api/report/index.js @@ -0,0 +1,39 @@ +import request from "@/utils/request"; +//获取评估报告列表 +const reports = (data) => { + return request({ + url: "/reports", + method: "get", + params: data, + }); +}; + +const addReport=data=>{ + return request({ + url: "/reports", + method: "post", + data: data, + }); +} + +const deleteReport=id=>{ + return request({ + url: "/reports/"+id, + method: "delete", + }); +} + +const getReport=id=>{ + return request({ + url: "/reports/"+id, + method: "get", + }); +} + + +export default { + reports, + addReport, + deleteReport, + getReport +}; diff --git a/src/api/user/index.ts b/src/api/user/index.ts index 783b2a6..a5fe283 100644 --- a/src/api/user/index.ts +++ b/src/api/user/index.ts @@ -11,7 +11,7 @@ class UserAPI { "userId": 2, "username": "admin", "nickname": "系统管理员", - "avatar": "https://oss.youlai.tech/youlai-boot/2023/05/16/811270ef31f548af9cffc026dfc3777b.gif", + "avatar": "", "roles": [ "ADMIN" ], diff --git a/src/views/dashboard/components/ModelFlow.vue b/src/views/dashboard/components/ModelFlow.vue index 5181f9b..ab40323 100644 --- a/src/views/dashboard/components/ModelFlow.vue +++ b/src/views/dashboard/components/ModelFlow.vue @@ -1,5 +1,5 @@