From 0671d04dde9a179914525d0e39eefc2f31a207db Mon Sep 17 00:00:00 2001 From: wuqilewuqile <11627406+wuqilewuqile@user.noreply.gitee.com> Date: Mon, 3 Jul 2023 13:48:43 +0800 Subject: [PATCH 1/3] sync --- src/wuqile/views/AddOccupation.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/wuqile/views/AddOccupation.vue b/src/wuqile/views/AddOccupation.vue index 816c94a..570565b 100644 --- a/src/wuqile/views/AddOccupation.vue +++ b/src/wuqile/views/AddOccupation.vue @@ -177,7 +177,6 @@ }, methods: { onPreview(){ - /* axios.get(`http://43.142.90.238:20235/api/downloadFiles/${encodeURIComponent(this.form.fileUrl)}`) */ axios({ url: `http://43.142.90.238:20235/api/downloadFiles/${encodeURIComponent(this.form.fileUrl)}`, method: 'GET', @@ -187,7 +186,7 @@ const url = window.URL.createObjectURL(new Blob([response.data])); const link = document.createElement('a'); link.href = url; - link.setAttribute('download', this.form.fileUrl); // 这里的 'file.txt' 是下载后的文件名，你可以根据实际情况修改 + link.setAttribute('download', this.form.fileUrl); // 这里的 'this.form.fileUrl' 是数据库中存储的url,可根据实际情况修改 document.body.appendChild(link); link.click(); // handle your response here @@ -197,7 +196,6 @@ this.$message.error('未上传证明文件') // handle your error here }); - }, handleUploadSuccess(response) { // TODO: replace with your actual code -- Gitee From fe78bb9dfc73ea64d54250057ecf7f7cf2c12d59 Mon Sep 17 00:00:00 2001 From: wuqilewuqile <11627406+wuqilewuqile@user.noreply.gitee.com> Date: Mon, 3 Jul 2023 20:01:24 +0800 Subject: [PATCH 2/3] save --- src/router/index.js | 4 +- src/views/evals/CompetitionEvalView.vue | 142 ---------------- src/views/evals/ServiceEvalView.vue | 206 ----------------------- src/wuqile/api/Comp.js | 10 ++ src/wuqile/api/CompEval.js | 18 ++ src/wuqile/api/OccuEval.js | 18 ++ src/wuqile/api/Occupation.js | 9 + src/wuqile/api/student.js | 7 + src/wuqile/views/AddComp.vue | 1 - src/wuqile/views/CompetitionEvalView.vue | 199 ++++++++++++++++++++++ src/wuqile/views/ServiceEvalView.vue | 199 ++++++++++++++++++++++ vue.config.js | 3 +- 12 files changed, 464 insertions(+), 352 deletions(-) delete mode 100644 src/views/evals/CompetitionEvalView.vue delete mode 100644 src/views/evals/ServiceEvalView.vue create mode 100644 src/wuqile/api/CompEval.js create mode 100644 src/wuqile/api/OccuEval.js create mode 100644 src/wuqile/api/student.js create mode 100644 src/wuqile/views/CompetitionEvalView.vue create mode 100644 src/wuqile/views/ServiceEvalView.vue diff --git a/src/router/index.js b/src/router/index.js index 5945536..38dedd1 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -83,13 +83,13 @@ const routes = [ { path: '/eval/service', name: '学生服务岗位评审', - component: () => import('@/views/evals/ServiceEvalView'), + component: () => import('@/wuqile/views/ServiceEvalView'), meta: { title: 'Report', icon: 'el-icon-edit'} }, { path: '/eval/competition', name: '竞赛得奖评审', - component: () => import('@/views/evals/CompetitionEvalView'), + component: () => import('@/wuqile/views/CompetitionEvalView'), meta: { title: 'Report', icon: 'el-icon-edit'} }, { diff --git a/src/views/evals/CompetitionEvalView.vue b/src/views/evals/CompetitionEvalView.vue deleted file mode 100644 index 7f005b1..0000000 --- a/src/views/evals/CompetitionEvalView.vue +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/views/evals/ServiceEvalView.vue b/src/views/evals/ServiceEvalView.vue deleted file mode 100644 index 4d3d311..0000000 --- a/src/views/evals/ServiceEvalView.vue +++ /dev/null @@ -1,206 +0,0 @@ - - - - - - diff --git a/src/wuqile/api/Comp.js b/src/wuqile/api/Comp.js index 4fd9e65..af52691 100644 --- a/src/wuqile/api/Comp.js +++ b/src/wuqile/api/Comp.js @@ -15,6 +15,16 @@ export function getComp() { }) } +export function getCompByCardId(card_id) { + return service({ + url: '/competition/get-list-by-cardId', + method: 'get', + params:{ + card_id:card_id + } + }) +} + export function updateComp(Comp) { const data=Comp return service({ diff --git a/src/wuqile/api/CompEval.js b/src/wuqile/api/CompEval.js new file mode 100644 index 0000000..e937bf9 --- /dev/null +++ b/src/wuqile/api/CompEval.js @@ -0,0 +1,18 @@ +import service from "@/utils/service" +export function getEval(evalRecord) { + const data=evalRecord + return service({ + url: '/student/get-list', + method: 'get', + data:data + }) +} + +export function insertEval(evalRecord) { + const data=evalRecord + return service({ + url: '/eval-record/insert', + method: 'post', + data:data + }) +} \ No newline at end of file diff --git a/src/wuqile/api/OccuEval.js b/src/wuqile/api/OccuEval.js new file mode 100644 index 0000000..e937bf9 --- /dev/null +++ b/src/wuqile/api/OccuEval.js @@ -0,0 +1,18 @@ +import service from "@/utils/service" +export function getEval(evalRecord) { + const data=evalRecord + return service({ + url: '/student/get-list', + method: 'get', + data:data + }) +} + +export function insertEval(evalRecord) { + const data=evalRecord + return service({ + url: '/eval-record/insert', + method: 'post', + data:data + }) +} \ No newline at end of file diff --git a/src/wuqile/api/Occupation.js b/src/wuqile/api/Occupation.js index f564822..ff475a9 100644 --- a/src/wuqile/api/Occupation.js +++ b/src/wuqile/api/Occupation.js @@ -13,6 +13,15 @@ export function getOccu() { method: 'get', }) } +export function getOccuByCardId(card_id) { + return service({ + url: '/occupation/get-list-by-cardId', + method: 'get', + params:{ + card_id:card_id + } + }) +} export function updateOccu(Occu) { const data=Occu return service({ diff --git a/src/wuqile/api/student.js b/src/wuqile/api/student.js new file mode 100644 index 0000000..7ead902 --- /dev/null +++ b/src/wuqile/api/student.js @@ -0,0 +1,7 @@ +import service from "@/utils/service" +export function getStu() { + return service({ + url: '/student/get-list', + method: 'get', + }) +} \ No newline at end of file diff --git a/src/wuqile/views/AddComp.vue b/src/wuqile/views/AddComp.vue index b4bb1f0..027623a 100644 --- a/src/wuqile/views/AddComp.vue +++ b/src/wuqile/views/AddComp.vue @@ -200,7 +200,6 @@ this.$message.error('未上传证明文件') // handle your error here }); - }, /* onPreview(){ getFile(this.form.fileUrl).then((response)=> { diff --git a/src/wuqile/views/CompetitionEvalView.vue b/src/wuqile/views/CompetitionEvalView.vue new file mode 100644 index 0000000..fc7710a --- /dev/null +++ b/src/wuqile/views/CompetitionEvalView.vue @@ -0,0 +1,199 @@ + + + + + + \ No newline at end of file diff --git a/src/wuqile/views/ServiceEvalView.vue b/src/wuqile/views/ServiceEvalView.vue new file mode 100644 index 0000000..a342b80 --- /dev/null +++ b/src/wuqile/views/ServiceEvalView.vue @@ -0,0 +1,199 @@ + + + + + + diff --git a/vue.config.js b/vue.config.js index 832431e..b762e45 100644 --- a/vue.config.js +++ b/vue.config.js @@ -6,7 +6,8 @@ module.exports = defineConfig({ // 设置代理 proxy: { '/api': { - target: 'http://43.142.90.238:20235', + /* target: 'http://43.142.90.238:20235', */ + target: 'http://localhost:20235', changeOrigin: true, // 跨域 pathRewrite: { '^/api': '' -- Gitee From e5adf21a0683e372cca4c0319ad035b7453c0a0f Mon Sep 17 00:00:00 2001 From: wuqilewuqile <11627406+wuqilewuqile@user.noreply.gitee.com> Date: Mon, 3 Jul 2023 20:19:06 +0800 Subject: [PATCH 3/3] add --- src/wuqile/views/ServiceEvalView.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/wuqile/views/ServiceEvalView.vue b/src/wuqile/views/ServiceEvalView.vue index a342b80..3c2d142 100644 --- a/src/wuqile/views/ServiceEvalView.vue +++ b/src/wuqile/views/ServiceEvalView.vue @@ -22,11 +22,10 @@ - - - + + - +