From 93271cd2498d73e9dc35e572d8c31ae9645b7d8b Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 12 七月 2024 11:29:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/home/components/user-panel/index.vue | 215 ++++++++++++-------
src/api/modules/user.js | 7
src/views/train/data-list/index.vue | 59 ++--
components.d.ts | 4
vite.config.js | 2
src/views/grade-list/data-list/index.vue | 7
src/mock/_exam.bundled_1720748378963_643yxkdyz9t.cjs | 334 ++++++++++++++++++++++++++++++
7 files changed, 519 insertions(+), 109 deletions(-)
diff --git a/components.d.ts b/components.d.ts
index b2d1c50..a89ff70 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -14,11 +14,15 @@
ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem']
ElCountdown: typeof import('element-plus/es')['ElCountdown']
ElDialog: typeof import('element-plus/es')['ElDialog']
+ ElDropdown: typeof import('element-plus/es')['ElDropdown']
+ ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem']
+ ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu']
ElForm: typeof import('element-plus/es')['ElForm']
ElFormItem: typeof import('element-plus/es')['ElFormItem']
ElIcon: typeof import('element-plus/es')['ElIcon']
ElImageViewer: typeof import('element-plus/es')['ElImageViewer']
ElInput: typeof import('element-plus/es')['ElInput']
+ ElLink: typeof import('element-plus/es')['ElLink']
ElOption: typeof import('element-plus/es')['ElOption']
ElPagination: typeof import('element-plus/es')['ElPagination']
ElProgress: typeof import('element-plus/es')['ElProgress']
diff --git a/src/api/modules/user.js b/src/api/modules/user.js
index 4d8fcb3..b2dd01a 100644
--- a/src/api/modules/user.js
+++ b/src/api/modules/user.js
@@ -1,6 +1,11 @@
import service from "@/api";
-
+// 鐧诲綍璇锋眰
export const login = (postData = {}) => {
return service.post('/api/user/login', postData);
}
+
+// 閫�鍑虹櫥褰�
+export const logout = () => {
+ return service.post('/api/user/logout');
+}
\ No newline at end of file
diff --git a/src/mock/_exam.bundled_1720748378963_643yxkdyz9t.cjs b/src/mock/_exam.bundled_1720748378963_643yxkdyz9t.cjs
new file mode 100644
index 0000000..3398553
--- /dev/null
+++ b/src/mock/_exam.bundled_1720748378963_643yxkdyz9t.cjs
@@ -0,0 +1,334 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+ for (var name in all)
+ __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+ if (from && typeof from === "object" || typeof from === "function") {
+ for (let key of __getOwnPropNames(from))
+ if (!__hasOwnProp.call(to, key) && key !== except)
+ __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+ }
+ return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/mock/exam.js
+var exam_exports = {};
+__export(exam_exports, {
+ default: () => exam_default
+});
+module.exports = __toCommonJS(exam_exports);
+var exam_default = [
+ // 鑾峰彇鑰冭瘯璇曞嵎
+ {
+ url: "/api/v1/getExamInfo",
+ method: "GET",
+ response: () => {
+ return {
+ code: 200,
+ msg: "Success",
+ data: {
+ examInfo: {
+ examId: 1,
+ examName: "\u6D4B\u8BD5\u540D\u79F0",
+ examType: "\u8003\u8BD5\u7C7B\u578B",
+ examStatus: "\u8003\u8BD5\u72B6\u6001",
+ examStartTime: "2021-01-01",
+ examEndTime: "2021-01-01",
+ "examTime|30-60": 50,
+ examGrade: 60
+ },
+ examQuestionList: [
+ {
+ questionType: 1,
+ questionList: [
+ {
+ "id": null,
+ "questionType": 1,
+ "gradeLevel": null,
+ "subjectId": 2,
+ "title": "1+1=\uFF1F123",
+ "img": "/test_question.png",
+ "items": [
+ {
+ "prefix": "A",
+ "content": "1"
+ },
+ {
+ "prefix": "B",
+ "content": "2"
+ },
+ {
+ "prefix": "C",
+ "content": "3"
+ },
+ {
+ "prefix": "D",
+ "content": "4"
+ }
+ ],
+ "analyze": "\u95EE\u5C0F\u670B\u53CB",
+ "correct": "",
+ "score": "3",
+ "difficult": 5
+ },
+ {
+ "id": null,
+ "questionType": 1,
+ "gradeLevel": null,
+ "subjectId": 2,
+ "title": "1+1=\uFF1F",
+ "items": [
+ {
+ "prefix": "A",
+ "content": "1"
+ },
+ {
+ "prefix": "B",
+ "content": "2"
+ },
+ {
+ "prefix": "C",
+ "content": "3"
+ },
+ {
+ "prefix": "D",
+ "content": "4"
+ }
+ ],
+ "analyze": "\u95EE\u5C0F\u670B\u53CB",
+ "correct": "",
+ "score": "3",
+ "difficult": 5
+ }
+ ]
+ },
+ {
+ questionType: 2,
+ questionList: [
+ {
+ "id": null,
+ "questionType": 1,
+ "gradeLevel": null,
+ "subjectId": 2,
+ "title": "1+1=\uFF1F",
+ "img": "/test_question.png",
+ "items": [
+ {
+ "prefix": "A",
+ "content": "1"
+ },
+ {
+ "prefix": "B",
+ "content": "2"
+ },
+ {
+ "prefix": "C",
+ "content": "3"
+ },
+ {
+ "prefix": "D",
+ "content": "4"
+ }
+ ],
+ "analyze": "\u95EE\u5C0F\u670B\u53CB",
+ "correct": "",
+ "score": "5",
+ "difficult": 5
+ },
+ {
+ "id": null,
+ "questionType": 1,
+ "gradeLevel": null,
+ "subjectId": 2,
+ "title": "1+1=\uFF1F",
+ "items": [
+ {
+ "prefix": "A",
+ "content": "1"
+ },
+ {
+ "prefix": "B",
+ "content": "2"
+ },
+ {
+ "prefix": "C",
+ "content": "3"
+ },
+ {
+ "prefix": "D",
+ "content": "4"
+ }
+ ],
+ "analyze": "\u95EE\u5C0F\u670B\u53CB",
+ "correct": "",
+ "score": "5",
+ "difficult": 5
+ },
+ {
+ "id": null,
+ "questionType": 1,
+ "gradeLevel": null,
+ "subjectId": 2,
+ "title": "1+1=\uFF1F",
+ "items": [
+ {
+ "prefix": "A",
+ "content": "1"
+ },
+ {
+ "prefix": "B",
+ "content": "2"
+ },
+ {
+ "prefix": "C",
+ "content": "3"
+ },
+ {
+ "prefix": "D",
+ "content": "4"
+ }
+ ],
+ "analyze": "\u95EE\u5C0F\u670B\u53CB",
+ "correct": "",
+ "score": "5",
+ "difficult": 5
+ },
+ {
+ "id": null,
+ "questionType": 1,
+ "gradeLevel": null,
+ "subjectId": 2,
+ "title": "1+1=\uFF1F",
+ "items": [
+ {
+ "prefix": "A",
+ "content": "1"
+ },
+ {
+ "prefix": "B",
+ "content": "2"
+ },
+ {
+ "prefix": "C",
+ "content": "3"
+ },
+ {
+ "prefix": "D",
+ "content": "4"
+ }
+ ],
+ "analyze": "\u95EE\u5C0F\u670B\u53CB",
+ "correct": "",
+ "score": "5",
+ "difficult": 5
+ }
+ ]
+ },
+ {
+ questionType: 3,
+ questionList: [
+ {
+ "id": null,
+ "questionType": 1,
+ "gradeLevel": null,
+ "subjectId": 2,
+ "title": "\u6D4B\u8BD5\u97F3\u98911",
+ "audioFile": "/test.mp3",
+ "img": "/test_question.png",
+ "items": [
+ {
+ "prefix": "A",
+ "content": "1"
+ },
+ {
+ "prefix": "B",
+ "content": "2"
+ },
+ {
+ "prefix": "C",
+ "content": "3"
+ },
+ {
+ "prefix": "D",
+ "content": "4"
+ }
+ ],
+ "analyze": "\u95EE\u5C0F\u670B\u53CB",
+ "correct": "",
+ "score": "3",
+ "difficult": 5
+ },
+ {
+ "id": null,
+ "questionType": 1,
+ "gradeLevel": null,
+ "subjectId": 2,
+ "title": "\u6D4B\u8BD5\u97F3\u98912",
+ "audioFile": "/test.mp3",
+ "items": [
+ {
+ "prefix": "A",
+ "content": "1"
+ },
+ {
+ "prefix": "B",
+ "content": "2"
+ },
+ {
+ "prefix": "C",
+ "content": "3"
+ },
+ {
+ "prefix": "D",
+ "content": "4"
+ }
+ ],
+ "analyze": "\u95EE\u5C0F\u670B\u53CB",
+ "correct": "",
+ "score": "3",
+ "difficult": 5
+ }
+ ]
+ }
+ ]
+ }
+ };
+ }
+ },
+ // 鑾峰彇鑰冭瘯鍒楄〃
+ {
+ url: "/api/v1/getExamList",
+ method: "GET",
+ response: () => {
+ return {
+ code: 200,
+ msg: "Success",
+ "data|2-8": [
+ {
+ "id|+1": 1,
+ name: "\u6D4B\u8BD5\u6D4B\u8BD5\u6D4B\u8BD5\u6D4B\u8BD5\u6D4B\u8BD5\u6D4B\u8BD5",
+ startTime: "2024-01-01 09:00:00",
+ endTime: "2024-01-01 11:00:00",
+ // 1:鏈紑濮�
+ // 2:杩涜涓�
+ // 3:宸茬粨鏉�
+ "status|1": [
+ 1,
+ 2,
+ 3
+ ],
+ "examTotal|20-60": 20,
+ "examTime|30-120": 120,
+ "examScore|60-100": 100
+ }
+ ]
+ };
+ }
+ }
+];
+//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["src/mock/exam.js"],
  "sourcesContent": ["const __injected_filename__ = \"C:\\\\Users\\\\hhy\\\\Desktop\\\\ycl\\\\jxkg-new-ui-student\\\\src\\\\mock\\\\exam.js\";const __injected_dirname__ = \"C:\\\\Users\\\\hhy\\\\Desktop\\\\ycl\\\\jxkg-new-ui-student\\\\src\\\\mock\";const __injected_import_meta_url__ = \"file:///C:/Users/hhy/Desktop/ycl/jxkg-new-ui-student/src/mock/exam.js\";export default [\r\n  // \u83B7\u53D6\u8003\u8BD5\u8BD5\u5377\r\n  {\r\n    url: '/api/v1/getExamInfo',\r\n    method: 'GET',\r\n    response: () => {\r\n      return {\r\n        code: 200,\r\n        msg: 'Success',\r\n        data: {\r\n          examInfo: {\r\n            examId: 1,\r\n            examName: '\u6D4B\u8BD5\u540D\u79F0',\r\n            examType: '\u8003\u8BD5\u7C7B\u578B',\r\n            examStatus: '\u8003\u8BD5\u72B6\u6001',\r\n            examStartTime: '2021-01-01',\r\n            examEndTime: '2021-01-01',\r\n            'examTime|30-60': 50,\r\n            examGrade: 60,\r\n          },\r\n          examQuestionList: [\r\n            {\r\n              questionType: 1,\r\n              questionList: [\r\n                {\r\n                  \"id\": null,\r\n                  \"questionType\": 1,\r\n                  \"gradeLevel\": null,\r\n                  \"subjectId\": 2,\r\n                  \"title\": \"1+1=\uFF1F123\",\r\n                  \"img\": '/test_question.png',\r\n                  \"items\": [\r\n                    {\r\n                      \"prefix\": \"A\",\r\n                      \"content\": \"1\"\r\n                    },\r\n                    {\r\n                      \"prefix\": \"B\",\r\n                      \"content\": \"2\"\r\n                    },\r\n                    {\r\n                      \"prefix\": \"C\",\r\n                      \"content\": \"3\"\r\n                    },\r\n                    {\r\n                      \"prefix\": \"D\",\r\n                      \"content\": \"4\"\r\n                    }\r\n                  ],\r\n                  \"analyze\": \"\u95EE\u5C0F\u670B\u53CB\",\r\n                  \"correct\": \"\",\r\n                  \"score\": \"3\",\r\n                  \"difficult\": 5\r\n                },\r\n                {\r\n                  \"id\": null,\r\n                  \"questionType\": 1,\r\n                  \"gradeLevel\": null,\r\n                  \"subjectId\": 2,\r\n                  \"title\": \"1+1=\uFF1F\",\r\n                  \"items\": [\r\n                    {\r\n                      \"prefix\": \"A\",\r\n                      \"content\": \"1\"\r\n                    },\r\n                    {\r\n                      \"prefix\": \"B\",\r\n                      \"content\": \"2\"\r\n                    },\r\n                    {\r\n                      \"prefix\": \"C\",\r\n                      \"content\": \"3\"\r\n                    },\r\n                    {\r\n                      \"prefix\": \"D\",\r\n                      \"content\": \"4\"\r\n                    }\r\n                  ],\r\n                  \"analyze\": \"\u95EE\u5C0F\u670B\u53CB\",\r\n                  \"correct\": \"\",\r\n                  \"score\": \"3\",\r\n                  \"difficult\": 5\r\n                }\r\n              ]\r\n            },\r\n            {\r\n              questionType: 2,\r\n              questionList: [\r\n                {\r\n                  \"id\": null,\r\n                  \"questionType\": 1,\r\n                  \"gradeLevel\": null,\r\n                  \"subjectId\": 2,\r\n                  \"title\": \"1+1=\uFF1F\",\r\n                  \"img\": '/test_question.png',\r\n                  \"items\": [\r\n                    {\r\n                      \"prefix\": \"A\",\r\n                      \"content\": \"1\"\r\n                    },\r\n                    {\r\n                      \"prefix\": \"B\",\r\n                      \"content\": \"2\"\r\n                    },\r\n                    {\r\n                      \"prefix\": \"C\",\r\n                      \"content\": \"3\"\r\n                    },\r\n                    {\r\n                      \"prefix\": \"D\",\r\n                      \"content\": \"4\"\r\n                    }\r\n                  ],\r\n                  \"analyze\": \"\u95EE\u5C0F\u670B\u53CB\",\r\n                  \"correct\": \"\",\r\n                  \"score\": \"5\",\r\n                  \"difficult\": 5\r\n                },\r\n                {\r\n                  \"id\": null,\r\n                  \"questionType\": 1,\r\n                  \"gradeLevel\": null,\r\n                  \"subjectId\": 2,\r\n                  \"title\": \"1+1=\uFF1F\",\r\n                  \"items\": [\r\n                    {\r\n                      \"prefix\": \"A\",\r\n                      \"content\": \"1\"\r\n                    },\r\n                    {\r\n                      \"prefix\": \"B\",\r\n                      \"content\": \"2\"\r\n                    },\r\n                    {\r\n                      \"prefix\": \"C\",\r\n                      \"content\": \"3\"\r\n                    },\r\n                    {\r\n                      \"prefix\": \"D\",\r\n                      \"content\": \"4\"\r\n                    }\r\n                  ],\r\n                  \"analyze\": \"\u95EE\u5C0F\u670B\u53CB\",\r\n                  \"correct\": \"\",\r\n                  \"score\": \"5\",\r\n                  \"difficult\": 5\r\n                },\r\n                {\r\n                  \"id\": null,\r\n                  \"questionType\": 1,\r\n                  \"gradeLevel\": null,\r\n                  \"subjectId\": 2,\r\n                  \"title\": \"1+1=\uFF1F\",\r\n                  \"items\": [\r\n                    {\r\n                      \"prefix\": \"A\",\r\n                      \"content\": \"1\"\r\n                    },\r\n                    {\r\n                      \"prefix\": \"B\",\r\n                      \"content\": \"2\"\r\n                    },\r\n                    {\r\n                      \"prefix\": \"C\",\r\n                      \"content\": \"3\"\r\n                    },\r\n                    {\r\n                      \"prefix\": \"D\",\r\n                      \"content\": \"4\"\r\n                    }\r\n                  ],\r\n                  \"analyze\": \"\u95EE\u5C0F\u670B\u53CB\",\r\n                  \"correct\": \"\",\r\n                  \"score\": \"5\",\r\n                  \"difficult\": 5\r\n                },\r\n                {\r\n                  \"id\": null,\r\n                  \"questionType\": 1,\r\n                  \"gradeLevel\": null,\r\n                  \"subjectId\": 2,\r\n                  \"title\": \"1+1=\uFF1F\",\r\n                  \"items\": [\r\n                    {\r\n                      \"prefix\": \"A\",\r\n                      \"content\": \"1\"\r\n                    },\r\n                    {\r\n                      \"prefix\": \"B\",\r\n                      \"content\": \"2\"\r\n                    },\r\n                    {\r\n                      \"prefix\": \"C\",\r\n                      \"content\": \"3\"\r\n                    },\r\n                    {\r\n                      \"prefix\": \"D\",\r\n                      \"content\": \"4\"\r\n                    }\r\n                  ],\r\n                  \"analyze\": \"\u95EE\u5C0F\u670B\u53CB\",\r\n                  \"correct\": \"\",\r\n                  \"score\": \"5\",\r\n                  \"difficult\": 5\r\n                }\r\n              ]\r\n            },\r\n            {\r\n              questionType: 3,\r\n              questionList: [\r\n                {\r\n                  \"id\": null,\r\n                  \"questionType\": 1,\r\n                  \"gradeLevel\": null,\r\n                  \"subjectId\": 2,\r\n                  \"title\": \"\u6D4B\u8BD5\u97F3\u98911\",\r\n                  \"audioFile\": '/test.mp3',\r\n                  \"img\": '/test_question.png',\r\n                  \"items\": [\r\n                    {\r\n                      \"prefix\": \"A\",\r\n                      \"content\": \"1\"\r\n                    },\r\n                    {\r\n                      \"prefix\": \"B\",\r\n                      \"content\": \"2\"\r\n                    },\r\n                    {\r\n                      \"prefix\": \"C\",\r\n                      \"content\": \"3\"\r\n                    },\r\n                    {\r\n                      \"prefix\": \"D\",\r\n                      \"content\": \"4\"\r\n                    }\r\n                  ],\r\n                  \"analyze\": \"\u95EE\u5C0F\u670B\u53CB\",\r\n                  \"correct\": \"\",\r\n                  \"score\": \"3\",\r\n                  \"difficult\": 5\r\n                },\r\n                {\r\n                  \"id\": null,\r\n                  \"questionType\": 1,\r\n                  \"gradeLevel\": null,\r\n                  \"subjectId\": 2,\r\n                  \"title\": \"\u6D4B\u8BD5\u97F3\u98912\",\r\n                  \"audioFile\": '/test.mp3',\r\n                  \"items\": [\r\n                    {\r\n                      \"prefix\": \"A\",\r\n                      \"content\": \"1\"\r\n                    },\r\n                    {\r\n                      \"prefix\": \"B\",\r\n                      \"content\": \"2\"\r\n                    },\r\n                    {\r\n                      \"prefix\": \"C\",\r\n                      \"content\": \"3\"\r\n                    },\r\n                    {\r\n                      \"prefix\": \"D\",\r\n                      \"content\": \"4\"\r\n                    }\r\n                  ],\r\n                  \"analyze\": \"\u95EE\u5C0F\u670B\u53CB\",\r\n                  \"correct\": \"\",\r\n                  \"score\": \"3\",\r\n                  \"difficult\": 5\r\n                }\r\n              ]\r\n            },\r\n          ]\r\n        }\r\n      };\r\n    }\r\n  },\r\n  // \u83B7\u53D6\u8003\u8BD5\u5217\u8868\r\n  {\r\n    url: '/api/v1/getExamList',\r\n    method: 'GET',\r\n    response: () => {\r\n      return {\r\n        code: 200,\r\n        msg: 'Success',\r\n        'data|2-8': [\r\n          {\r\n            'id|+1': 1,\r\n            name: '\u6D4B\u8BD5\u6D4B\u8BD5\u6D4B\u8BD5\u6D4B\u8BD5\u6D4B\u8BD5\u6D4B\u8BD5',\r\n            startTime: '2024-01-01 09:00:00',\r\n            endTime: '2024-01-01 11:00:00',\r\n            // 1:\u672A\u5F00\u59CB\r\n            // 2:\u8FDB\u884C\u4E2D\r\n            // 3:\u5DF2\u7ED3\u675F\r\n            'status|1': [\r\n              1,\r\n              2,\r\n              3\r\n            ],\r\n            'examTotal|20-60': 20,\r\n            'examTime|30-120': 120,\r\n            'examScore|60-100': 100\r\n          }\r\n        ]\r\n      };\r\n    }\r\n  }\r\n];"],
  "mappings": "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",
  "names": []
}

diff --git a/src/views/grade-list/data-list/index.vue b/src/views/grade-list/data-list/index.vue
index fc82f87..221d3a2 100644
--- a/src/views/grade-list/data-list/index.vue
+++ b/src/views/grade-list/data-list/index.vue
@@ -1,15 +1,18 @@
<template>
<div class="list-container w-full h-full">
<el-scrollbar>
- <el-card shadow="hover" class="mb-3" v-for="item in props.dataList">
+ <el-card shadow="hover" class="mb-3" v-for="item in props.dataList" :key="item.id">
<div class="item flex justify-between items-center">
<div class="left-container flex flex-col justify-between">
<div class="top-container flex items-center">
<div class="title mr-5 text-xl font-bold">{{ item.examName }}</div>
<div class="tag">
- <el-tag type="primary" effect="light" round>
+ <el-tag type="primary" effect="light" round v-if="item.status === 0">
宸叉壒鏀�
</el-tag>
+ <el-tag type="danger" effect="light" round v-if="item.status === 1">
+ 缂鸿��
+ </el-tag>
</div>
</div>
<div class="mid-container flex items-center my-4 text-gray-700">
diff --git a/src/views/home/components/user-panel/index.vue b/src/views/home/components/user-panel/index.vue
index 0880ffc..f6b415c 100644
--- a/src/views/home/components/user-panel/index.vue
+++ b/src/views/home/components/user-panel/index.vue
@@ -1,110 +1,169 @@
<template>
- <div class="user-panel max-w-sm min-w-96 h-fit">
- <el-card class="card">
- <div class="panel-content flex flex-col items-center">
- <div class="avatar-container w-40 h-40 rounded-full overflow-hidden">
- <div class="avatar-content" v-if="userInfo.imagePath">
- <img :src="userInfo.imagePath" class="avatar-img" alt="">
- </div>
- <div class="avatar-content" :style="{backgroundColor: getColor}" v-else>
- <div class="name text-5xl font-bold text-white">{{ getFirstName }}</div>
- </div>
- </div>
+ <div class="user-panel max-w-sm min-w-96 h-fit">
+ <el-card class="card">
+ <div class="panel-content flex flex-col items-center">
+ <!-- 瀛︾敓淇℃伅 -->
+ <el-dropdown>
+ <div
+ class="avatar-container w-40 h-40 rounded-full overflow-hidden el-dropdown-link"
+ @click="stateClick()"
+ >
+ <div
+ class="avatar-content"
+ v-if="userInfo.imagePath"
+ >
+ <img
+ :src="userInfo.imagePath"
+ class="avatar-img"
+ alt=""
+ />
+ </div>
+ <div
+ class="avatar-content"
+ :style="{ backgroundColor: getColor }"
+ v-else
+ >
+ <div class="name text-5xl font-bold text-white">
+ {{ getFirstName }}
+ </div>
+ </div>
+ </div>
+ <template #dropdown>
+ <el-dropdown-menu>
+ <el-dropdown-item>淇敼瀵嗙爜</el-dropdown-item>
+ <el-dropdown-item>涓汉涓績</el-dropdown-item>
+ <el-dropdown-item @click="quit()"
+ >閫�鍑虹櫥褰�</el-dropdown-item
+ >
+ </el-dropdown-menu>
+ </template>
+ </el-dropdown>
- <div class="name-container text-lg font-bold mt-5 mb-2">
- {{ userInfo.realName }}
- </div>
+ <div class="name-container text-lg font-bold mt-5 mb-2">
+ {{ userInfo.realName }}
+ </div>
- <div class="department-container text-base mb-10">
- {{ userInfo.userName }}
- </div>
-
- <div class="tool-container grid grid-cols-3 gap-10">
- <div class="tool-item text-center cursor-pointer" v-for="item in toolList" @click="toolClick(item)">
- <div class="tool-icon mb-1">
- <img :src="item.iconPath" class="width-img" alt="">
+ <div class="department-container text-base mb-10">
+ {{ userInfo.userName }}
+ </div>
+ <!-- 瀛︾敓閫夐」 -->
+ <div class="tool-container grid grid-cols-3 gap-10">
+ <div
+ class="tool-item text-center cursor-pointer"
+ v-for="item in toolList"
+ @click="toolClick(item)"
+ >
+ <div class="tool-icon mb-1">
+ <img
+ :src="item.iconPath"
+ class="width-img"
+ alt=""
+ />
+ </div>
+ <div class="tool-title">
+ {{ item.title }}
+ </div>
+ </div>
+ </div>
</div>
- <div class="tool-title">
- {{ item.title }}
- </div>
- </div>
- </div>
-
- </div>
- </el-card>
- </div>
+ </el-card>
+ </div>
</template>
<script setup>
-import { ref, computed } from 'vue';
-import randomColor from '@/utils/randomColor.js';
-import { useRouter } from 'vue-router';
-import { storeToRefs } from 'pinia';
-import { useUserStore } from '@/store/index.js';
+import { ref, computed } from "vue";
+import randomColor from "@/utils/randomColor.js";
+import { useRouter } from "vue-router";
+import { storeToRefs } from "pinia";
+import { useUserStore } from "@/store/index.js";
+import { logout } from "@/api/modules/user.js";
const userStore = useUserStore();
const { userInfo } = storeToRefs(userStore);
-
-
const router = useRouter();
-
+// 鑾峰彇鍒楄〃
const toolList = ref([
- {
- id: 1,
- title: '鍦ㄧ嚎鍩硅',
- iconPath: new URL('@/assets/icons/icon1.png', import.meta.url).href,
- path: '/train'
- },
- {
- id: 2,
- title: '鎴戠殑鑰冭瘯',
- iconPath: new URL('@/assets/icons/icon2.png', import.meta.url).href,
- path: '/exam-list'
- },
- {
- id: 3,
- title: '鎴戠殑鎴愮哗',
- iconPath: new URL('@/assets/icons/icon2.png', import.meta.url).href,
- path: '/grade-list'
- },
+ {
+ id: 1,
+ title: "鍦ㄧ嚎鍩硅",
+ iconPath: new URL("@/assets/icons/icon1.png", import.meta.url).href,
+ path: "/train",
+ },
+ {
+ id: 2,
+ title: "鎴戠殑鑰冭瘯",
+ iconPath: new URL("@/assets/icons/icon2.png", import.meta.url).href,
+ path: "/exam-list",
+ },
+ {
+ id: 3,
+ title: "鎴戠殑鎴愮哗",
+ iconPath: new URL("@/assets/icons/icon2.png", import.meta.url).href,
+ path: "/grade-list",
+ },
]);
-
+// 鑾峰彇棰滆壊
const getColor = computed(() => {
- return randomColor();
+ return randomColor();
});
-
+// 鑾峰彇鐢ㄦ埛淇℃伅
const getFirstName = computed(() => {
- return userInfo.value.realName && userInfo.value.realName[0];
+ return userInfo.value.realName && userInfo.value.realName[0];
});
-
+// 鐐瑰嚮浜嬩欢
const toolClick = (item) => {
- if (item.path) {
- router.push(item.path);
- }
-}
+ if (item.path) {
+ router.push(item.path);
+ }
+};
+// 鐢ㄦ埛閫夐」
+const dropdownRef = ref();
+// 閫�鍑虹櫥褰�
+const quit = () => {
+ logout()
+ .then(() => {
+ router.push("/login").then(() => {
+ userStore.setUserInfo(null);
+ localStorage.clear("user");
+ });
+ })
+ .catch((err) => {
+ console.log("閫�鍑虹櫥褰曞け璐�,澶辫触鍘熷洜;", err);
+ });
+};
</script>
<style lang="scss" scoped>
-
-
.card {
- border-radius: 30px;
+ border-radius: 30px;
}
.avatar-content {
- width: 100%;
- height: 100%;
- display: flex;
- justify-content: center;
- align-items: center;
+ width: 100%;
+ height: 100%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
}
.avatar-img {
- width: 100%;
- height: 100%;
- object-fit: cover;
+ width: 100%;
+ height: 100%;
+ object-fit: cover;
}
-</style>
\ No newline at end of file
+.avatar-container {
+ cursor: pointer;
+ color: var(--el-color-primary);
+ display: flex;
+ align-items: center;
+}
+.example-showcase .el-dropdown-link {
+ cursor: pointer;
+ color: var(--el-color-primary);
+ display: flex;
+ align-items: center;
+}
+</style>
diff --git a/src/views/train/data-list/index.vue b/src/views/train/data-list/index.vue
index 369cad7..0c53999 100644
--- a/src/views/train/data-list/index.vue
+++ b/src/views/train/data-list/index.vue
@@ -4,10 +4,14 @@
<div class="list-content w-full overflow-x-hidden">
<el-row :gutter="20">
<el-col :span="6" v-for="item in props.dataList" class="mb-5">
- <el-card shadow="hover" class="list-card cursor-pointer" :body-style="{ padding: 0 }"
- @click="itemClick(item)">
+ <el-card
+ shadow="hover"
+ class="list-card cursor-pointer"
+ :body-style="{ padding: 0 }"
+ @click="itemClick(item)"
+ >
<div class="img-container w-full">
- <img src="@/assets/image/list-card-bg.jpg" class="w-full">
+ <img src="@/assets/image/list-card-bg.jpg" class="w-full" />
</div>
<div class="item-info p-3">
<div class="info-title font-bold">{{ item.meetName }}</div>
@@ -28,16 +32,15 @@
</el-col>
</el-row>
</div>
-
</el-scrollbar>
</div>
</template>
<script setup>
-import {storeToRefs} from 'pinia';
-import {useRouter} from 'vue-router';
-import {useUserStore} from '@/store/index.js';
-import {classMeet} from '@/api/modules/meet.js';
+import { storeToRefs } from "pinia";
+import { useRouter } from "vue-router";
+import { useUserStore } from "@/store/index.js";
+import { classMeet } from "@/api/modules/meet.js";
const userStore = useUserStore();
const { userInfo } = storeToRefs(userStore);
@@ -45,28 +48,30 @@
const props = defineProps({
dataList: {
type: Array,
- default: () => []
- }
+ default: () => [],
+ },
});
-
const itemClick = (item) => {
- classMeet(item.id).then(res => {
- if (window.webBridge) {
- window.webBridge.openNewWindow(JSON.stringify(item));
- } else {
- let path = router.resolve({
- path: "/meet",
- query: { meetName: item.meetName, id: item.id, userName: userInfo.value?.realName || '', userCode: userInfo.value?.phone || '' }
- });
- window.open(path.href, '_blank');
- }
- }).catch(err => {
-
- });
-
-}
-
+ classMeet(item.id)
+ .then((res) => {
+ if (window.webBridge) {
+ window.webBridge.openNewWindow(JSON.stringify(item));
+ } else {
+ let path = router.resolve({
+ path: "/meet",
+ query: {
+ meetName: item.meetName,
+ id: item.id,
+ userName: userInfo.value?.realName + "_" + item.id || "",
+ userCode: userInfo.value?.phone + "_" + item.id || "",
+ },
+ });
+ window.open(path.href, "_blank");
+ }
+ })
+ .catch((err) => {});
+};
</script>
<style lang="scss" scoped>
diff --git a/vite.config.js b/vite.config.js
index 8d10ea8..91c5690 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -30,7 +30,7 @@
proxy: {
'/api': {
// target: 'http://192.168.3.88:8000',
- target: 'http://localhost:8000',
+ target: 'http://42.193.1.25:8000',
changeOrigin: true,
}
}
--
Gitblit v1.8.0