- 为拓宽人民群众的表达途径、畅听民意，及时了解
- 和解决人民群众反映强烈的公共法律服务问题，我
- 局将在浈江区公共法律服务中心开展领导干部接待
- 活动，现将2022年8月的活动安排公告如下：
- 一、接待时间
- 工作日上午9:00-12:00。
- 二、接待地点
- 浈江区公共法律服务中心（浈江区新韶镇乐土路3号
- 曲仁田螺冲党群服务中心一楼）。
- 三、接待受理范围
（一）听取人民群众对公共法律服务工作的批评和
- 意见建议。
（二）解答或接收公共法律服务相关业务咨询。
+ {{ data.activityNotice }}
- {{ disDetail.discussName }}
+ {{ projectInfo.name }}
-
+
-
- {{ disDetail.discussExplain }}
-
-
- 进行中
-
-
-
-
-
-
-
{{ d.discussSubmitTitle }}
-
- {{ d.discussSubmitContent }}
+
+
+
- {{ item.name }}
+
+
+ 进行中
-
Date: Sun, 11 Dec 2022 20:46:44 +0800
Subject: [PATCH 06/72] =?UTF-8?q?feat:=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/App.vue | 10 ++-
src/api/api.js | 13 +++-
src/api/request.js | 18 ++---
src/views/ballot/BallotPage.vue | 120 +++++++++++++++++++-------------
4 files changed, 100 insertions(+), 61 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 612d1ed..ac98fc0 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -2,7 +2,7 @@
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-11-21 17:28:10
* @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-11-22 12:54:09
+ * @LastEditTime: 2022-12-11 20:19:39
* @FilePath: /fe-stu/src/App.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -40,6 +40,10 @@ export default defineComponent({
const currentRouteName = computed(() => route.name);
+ localStorage.setItem(
+ "token",
+ "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NzA3NjExNzIsImV4cCI6MTY3MDc2ODM3MiwiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.9e8c4d3933c3a6d9b660e0b849940c813e1c245b3d17646ff7a793100640bc42"
+ );
return {
routes,
name: currentRouteName,
@@ -63,8 +67,8 @@ export default defineComponent({
display: flex;
width: 100%;
min-height: 100%;
- background-color: rgba(242, 245, 247, 1);
- // background-color: #ccc;
+ // background-color: rgba(242, 245, 247, 1);
+ background-color: #ccc;
#nav {
width: 220px;
height: 100%;
diff --git a/src/api/api.js b/src/api/api.js
index 0229e8f..156521d 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -1,4 +1,12 @@
-export const BASE = 'http://localhost:3000'
+/*
+ * @Author: lixg lixg@dongwu-inc.com
+ * @Date: 2022-12-11 16:57:58
+ * @LastEditors: lixg lixg@dongwu-inc.com
+ * @LastEditTime: 2022-12-11 19:15:07
+ * @FilePath: /fe-stu/src/api/api.js
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+export const BASE = 'http://111.231.196.214:30001/manageApi'
// export const FILE_UPLOAD = 'http://111.231.196.214:30001/file/upload'
export const FILE_UPLOAD = '/file/upload'
export const COMMON_TOKEN = 'https://upload-z2.qiniup.com'
@@ -27,3 +35,6 @@ export const DISCUSS_LIKE = '/discussSubmit/clickDiscussLikeCountOr POST'
export const DISCUSS_LIST = '/discussSubmit/queryDiscussSubmitDetailByDiscussId'
export const DISCUSS_DETAIL = '/discuss/getDiscussDetail'
export const DISCUSS_SUBMIT_REVIEW_LIST = '/discussSubmit/queryDiscussSubmitAndReview'
+
+//投票
+export const VOTE_DETAIL2 = '/vote/queryStemByStemId POST'
\ No newline at end of file
diff --git a/src/api/request.js b/src/api/request.js
index 995f57e..79e8f87 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -1,5 +1,5 @@
import router from "@/router";
-import {ref, watch} from "vue";
+import { ref, watch } from "vue";
import axios from 'axios';
export function useRequest(_url, params = {}) {
@@ -49,20 +49,20 @@ export async function request(_url, params) {
method,
headers: {
'X-Token': localStorage.getItem('token'),
- ...method !== 'get' ? {'Content-Type': 'application/json'} : {}
+ ...method !== 'get' ? { 'Content-Type': 'application/json' } : {}
},
baseURL: '',
- ...method !== 'get' ? {data: JSON.stringify(body)} : {}
- }).then(resp=>resp.data).then(response => {
+ ...method !== 'get' ? { data: JSON.stringify(body) } : {}
+ }).then(resp => resp.data).then(response => {
if (response.code !== 200 && response.code !== 0) {
if (response.code === 3 || response.code === 4 || response.code === 100) {
-// router.push({path: '/login'})
+ // router.push({path: '/login'})
return
} else {
-// response.showMsg && notification.open({
-// message: response.showMsg,
-// duration: 2,
-// });
+ // response.showMsg && notification.open({
+ // message: response.showMsg,
+ // duration: 2,
+ // });
return
}
}
diff --git a/src/views/ballot/BallotPage.vue b/src/views/ballot/BallotPage.vue
index 5c2b91c..6ca36b9 100644
--- a/src/views/ballot/BallotPage.vue
+++ b/src/views/ballot/BallotPage.vue
@@ -24,9 +24,9 @@
@@ -89,40 +95,52 @@
@@ -133,16 +151,22 @@
@@ -342,26 +366,26 @@ const handleClick = (tab, event) => {
.allbox1 {
margin-right: 22px;
background: linear-gradient(
- 0deg,
- rgba(160, 193, 230, 0) 0%,
- rgba(161, 195, 231, 0.2) 100%
+ 0deg,
+ rgba(160, 193, 230, 0) 0%,
+ rgba(161, 195, 231, 0.2) 100%
);
}
.allbox2 {
margin-right: 22px;
background: linear-gradient(
- 0deg,
- rgba(177, 219, 229, 0) 0%,
- rgba(172, 216, 227, 0.2) 100%
+ 0deg,
+ rgba(177, 219, 229, 0) 0%,
+ rgba(172, 216, 227, 0.2) 100%
);
}
.allbox3 {
background: linear-gradient(
- 0deg,
- rgba(195, 209, 234, 0) 0%,
- rgba(191, 206, 231, 0.2) 100%
+ 0deg,
+ rgba(195, 209, 234, 0) 0%,
+ rgba(191, 206, 231, 0.2) 100%
);
}
From 874ac9e6130e6f0c586dd9af709faa7829944680 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sun, 11 Dec 2022 20:48:52 +0800
Subject: [PATCH 07/72] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=88=9D=E5=A7=8B?=
=?UTF-8?q?=E5=8C=96=20=E7=AC=AC=E4=B8=80=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/api.js | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/api/api.js b/src/api/api.js
index fcd3e44..f39940a 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -22,13 +22,13 @@ export const STU_OFFCOURSE_DETAIL = '/stu/offcourse/detail'
export const WORK_QUERYWORKDETAILBYID = '/work/queryWorkDetailById'
export const WORK_HISTROY = '/workSubmit/queryWorkDetailListByStuId'
export const EXAMINATION_QUERYEXAMINATIONDETAILBYID = '/examination/queryExaminationDetailById'
-export const DISCUSS_COLLECTION = '/discussSubmit/clickDiscussCollectionCountOr POST'
-export const DISCUSS_LIKE = '/discussSubmit/clickDiscussLikeCountOr POST'
+export const DISCUSS_COLLECTION = '/discussSubmit/clickDiscussCollectionCountOr post'
+export const DISCUSS_LIKE = '/discussSubmit/clickDiscussLikeCountOr post'
export const DISCUSS_LIST = '/discussSubmit/list'
export const DISCUSS_DETAIL = '/discuss/getDiscussDetail'
export const DISCUSS_SUBMIT_REVIEW_LIST = '/discussSubmit/queryDiscussSubmitAndReview'
export const COMMENT_LIST = '/comment/list'
-export const COMMENT_ADD = '/comment POST'
-export const COMMENT_PRAISE = '/comment/praise POST'
-export const COMMENT_COLLECTION = '/comment/collection POST'
+export const COMMENT_ADD = '/comment post'
+export const COMMENT_PRAISE = '/comment/praise post'
+export const COMMENT_COLLECTION = '/comment/collection post'
From b98e1f29be603cf964549d21fa624e48583aa46f Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sun, 11 Dec 2022 21:18:27 +0800
Subject: [PATCH 08/72] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=88=9D=E5=A7=8B?=
=?UTF-8?q?=E5=8C=96=20=E7=AC=AC=E4=B8=80=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/api.js | 2 +-
src/views/ballot/BallotPage.vue | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/api/api.js b/src/api/api.js
index 176d87f..3359976 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -39,7 +39,7 @@ export const DISCUSS_SUBMIT_REVIEW_LIST = '/discussSubmit/queryDiscussSubmitAndR
export const COMMENT_LIST = '/comment/list'
-export const VOTE_DETAIL2 = '/vote/queryStemByStemId post'
+export const VOTE_DETAIL2= ballotId => `/vote/queryStemByStemId?ballotId=${ballotId} post`
export const COMMENT_ADD = '/comment post'
export const COMMENT_PRAISE = '/comment/praise post'
export const COMMENT_COLLECTION = '/comment/collection post'
diff --git a/src/views/ballot/BallotPage.vue b/src/views/ballot/BallotPage.vue
index 1761b5c..31f9d57 100644
--- a/src/views/ballot/BallotPage.vue
+++ b/src/views/ballot/BallotPage.vue
@@ -165,7 +165,7 @@ import { useRoute } from "vue-router/dist/vue-router";
const {
query: { ballotId = 3 },
} = useRoute();
-const { data: dataInfo } = useRequest(VOTE_DETAIL2, { ballotId });
+const { data: dataInfo } = useRequest(VOTE_DETAIL2(ballotId));
console.log("dataInfo", dataInfo);
const handleClick = (tab, event) => {
console.log(tab, event);
From 322d1313287bb103dad01b8e38ff54eb1080bfbe Mon Sep 17 00:00:00 2001
From: lixg
Date: Sun, 11 Dec 2022 21:23:51 +0800
Subject: [PATCH 09/72] =?UTF-8?q?feat:=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/api.js | 4 +-
vite.config.js | 114 +++++++++++++++++++++++++------------------------
2 files changed, 61 insertions(+), 57 deletions(-)
diff --git a/src/api/api.js b/src/api/api.js
index 176d87f..591c295 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -2,7 +2,7 @@
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-12-11 16:57:58
* @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-12-11 21:00:20
+ * @LastEditTime: 2022-12-11 21:21:16
* @FilePath: /fe-stu/src/api/api.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
@@ -39,7 +39,7 @@ export const DISCUSS_SUBMIT_REVIEW_LIST = '/discussSubmit/queryDiscussSubmitAndR
export const COMMENT_LIST = '/comment/list'
-export const VOTE_DETAIL2 = '/vote/queryStemByStemId post'
+export const VOTE_DETAIL2 = ballotId => `/vote/queryStemByStemId?ballotId=${ballotId} post`
export const COMMENT_ADD = '/comment post'
export const COMMENT_PRAISE = '/comment/praise post'
export const COMMENT_COLLECTION = '/comment/collection post'
diff --git a/vite.config.js b/vite.config.js
index 2226a4d..738747b 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -2,69 +2,73 @@
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-11-21 17:28:10
* @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-11-22 12:45:57
+ * @LastEditTime: 2022-12-11 21:11:35
* @FilePath: /fe-stu/vite.config.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
-import {defineConfig} from 'vite'
+import { defineConfig } from 'vite'
import vue from '@vitejs/plugin-vue'
import legacy from '@vitejs/plugin-legacy'
-import {viteMockServe} from 'vite-plugin-mock'
+import { viteMockServe } from 'vite-plugin-mock'
import topLevelAwait from "vite-plugin-top-level-await";
const path = require('path')
-export default defineConfig(({command}) =>
- ({
- base: '/fe-student',
- plugins: [
- vue(),
- // legacy({
- // targets: ['chrome 64', 'defaults', 'not IE 11']
- // }),
- topLevelAwait({
- promiseExportName: '__tla',
- promiseImportName: i => `__tla_${i}`
- }),
- // viteMockServe({
- // mockPath: './src/mock/mocks',
- // })
- ],
- resolve: {
- alias: [
- {find: '@', replacement: path.resolve(__dirname, 'src')}
- ]
- }, server: {
- proxy: {
- '/file/upload': {
- target: 'http://111.231.196.214:30001',
- changeOrigin: true,
- },
- '/stu': {
- target: 'http://localhost:30001',
- changeOrigin: true,
- },
- '/queryVoteSubmitDetailById': {
- target: 'http://localhost:30001',
- changeOrigin: true,
- },
- '/work': {
- target: 'http://localhost:30001',
- changeOrigin: true,
- },
- '/discuss': {
- target: 'http://localhost:30001',
- changeOrigin: true,
- },
- '/discussSubmit': {
- target: 'http://localhost:30001',
- changeOrigin: true,
- },
- '/comment': {
- target: 'http://localhost:30001',
- changeOrigin: true,
- },
- }
+export default defineConfig(({ command }) =>
+({
+ base: '/fe-student',
+ plugins: [
+ vue(),
+ // legacy({
+ // targets: ['chrome 64', 'defaults', 'not IE 11']
+ // }),
+ topLevelAwait({
+ promiseExportName: '__tla',
+ promiseImportName: i => `__tla_${i}`
+ }),
+ // viteMockServe({
+ // mockPath: './src/mock/mocks',
+ // })
+ ],
+ resolve: {
+ alias: [
+ { find: '@', replacement: path.resolve(__dirname, 'src') }
+ ]
+ }, server: {
+ proxy: {
+ '/file/upload': {
+ target: 'http://111.231.196.214:30001',
+ changeOrigin: true,
+ },
+ '/stu': {
+ target: 'http://localhost:30001',
+ changeOrigin: true,
+ },
+ '/queryVoteSubmitDetailById': {
+ target: 'http://localhost:30001',
+ changeOrigin: true,
+ },
+ '/work': {
+ target: 'http://localhost:30001',
+ changeOrigin: true,
+ },
+ '/discuss': {
+ target: 'http://localhost:30001',
+ changeOrigin: true,
+ },
+ '/discussSubmit': {
+ target: 'http://localhost:30001',
+ changeOrigin: true,
+ },
+ '/comment': {
+ target: 'http://localhost:30001',
+ changeOrigin: true,
+ },
+ '/vote': {
+ target: 'http://111.231.196.214:12013/manageApi',
+ changeOrigin: true,
+ },
}
- })
+ }
+})
)
From 1693c2db1d1f923a091caae159d2f78b0c3e5711 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sun, 11 Dec 2022 23:56:13 +0800
Subject: [PATCH 10/72] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=88=9D=E5=A7=8B?=
=?UTF-8?q?=E5=8C=96=20=E7=AC=AC=E4=B8=80=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/api.js | 1 +
src/api/request.js | 25 ++++++------
src/api/utils.js | 12 +++++-
src/views/discuss/DiscussPage.vue | 45 +++++++++++-----------
src/views/login/login.vue | 64 +++++++++++++++++++++++++++++++
5 files changed, 111 insertions(+), 36 deletions(-)
create mode 100644 src/views/login/login.vue
diff --git a/src/api/api.js b/src/api/api.js
index 3359976..fd80dfc 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -7,6 +7,7 @@
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
export const BASE = 'http://111.231.196.214:30001/manageApi'
+export const LOGIN = '/admin/CheckUser/userLogin post'
// export const FILE_UPLOAD = 'http://111.231.196.214:30001/file/upload'
export const FILE_UPLOAD = '/file/upload'
export const COMMON_TOKEN = 'https://upload-z2.qiniup.com'
diff --git a/src/api/request.js b/src/api/request.js
index 79e8f87..689d18b 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -1,5 +1,5 @@
import router from "@/router";
-import { ref, watch } from "vue";
+import {ref, watch} from "vue";
import axios from 'axios';
export function useRequest(_url, params = {}) {
@@ -30,7 +30,7 @@ export function useRequest(_url, params = {}) {
export async function request(_url, params) {
const s = _url.split(' ')
let url = s[0]
- const method = s[1] || 'get'
+ const method = s[1]?.toLowerCase() || 'get'
if (method === 'get') {
let paramsArray = [];
//拼接参数
@@ -49,22 +49,23 @@ export async function request(_url, params) {
method,
headers: {
'X-Token': localStorage.getItem('token'),
- ...method !== 'get' ? { 'Content-Type': 'application/json' } : {}
+ ...method !== 'get' ? {'Content-Type': 'application/json'} : {}
},
baseURL: '',
- ...method !== 'get' ? { data: JSON.stringify(body) } : {}
+ ...method !== 'get' ? {data: JSON.stringify(body)} : {}
}).then(resp => resp.data).then(response => {
if (response.code !== 200 && response.code !== 0) {
- if (response.code === 3 || response.code === 4 || response.code === 100) {
- // router.push({path: '/login'})
- return
+ console.log(1111111111)
+ console.log(response.code)
+ if (import.meta.env.DEV && response.code === 1000) {
+ router.push({path: '/login'})
} else {
- // response.showMsg && notification.open({
- // message: response.showMsg,
- // duration: 2,
- // });
- return
+ // response.showMsg && notification.open({
+ // message: response.showMsg,
+ // duration: 2,
+ // });
}
+ throw new Error('接口异常')
}
return response
}).catch(e => {
diff --git a/src/api/utils.js b/src/api/utils.js
index b749636..bf71f6e 100644
--- a/src/api/utils.js
+++ b/src/api/utils.js
@@ -1,3 +1,13 @@
-export function useImage(src){
+export function useImage(src) {
return new URL(`../assets/image/${src}`, import.meta.url).href
+}
+
+export function setCookie(name, value, perpetual) {
+ const d = new Date()
+ d.setDate(perpetual * 24 * 60 * 60 * 1000)
+ document.cookie = `${name}=${value};expires=${d.toGMTString()};path=/`
+}
+
+export function getCookie(name) {
+ return document.cookie?.split(";").find(e => e.includes(name)).replace(`${name}=`, '') || ''
}
\ No newline at end of file
diff --git a/src/views/discuss/DiscussPage.vue b/src/views/discuss/DiscussPage.vue
index fcbfd6c..3fdd151 100644
--- a/src/views/discuss/DiscussPage.vue
+++ b/src/views/discuss/DiscussPage.vue
@@ -63,18 +63,18 @@
{{ d.discussExplain }}
-
-
@@ -90,14 +92,15 @@ import {reactive, ref, toRefs} from "vue";
import {useRoute, useRouter} from "vue-router";
const router = useRouter()
-const {query: {id: discussId}} = useRoute()
+const {query: {id = 317}} = useRoute()
const param = ref({
- searchType: 1,
- discussId
+ type: 1,
+ id
})
-const {data} = useRequest(DISCUSS_LIST, param.value)
-const {data: disDetail} = useRequest(DISCUSS_DETAIL, {discussId})
+const {data: projectInfo} = useRequest(DISCUSS_LIST, param.value)
+
+const {data: disDetail} = useRequest(DISCUSS_DETAIL, {id})
const state = reactive({
activeName: "first",
});
diff --git a/vite.config.js b/vite.config.js
index 30b8b45..2226a4d 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -41,23 +41,27 @@ export default defineConfig(({command}) =>
changeOrigin: true,
},
'/stu': {
- target: 'http://111.231.196.214:12013/manageApi',
+ target: 'http://localhost:30001',
changeOrigin: true,
},
'/queryVoteSubmitDetailById': {
- target: 'http://111.231.196.214:12013/manageApi',
+ target: 'http://localhost:30001',
changeOrigin: true,
},
'/work': {
- target: 'http://111.231.196.214:12013/manageApi',
+ target: 'http://localhost:30001',
changeOrigin: true,
},
'/discuss': {
- target: 'http://111.231.196.214:12013/manageApi',
+ target: 'http://localhost:30001',
changeOrigin: true,
},
'/discussSubmit': {
- target: 'http://111.231.196.214:12013/manageApi',
+ target: 'http://localhost:30001',
+ changeOrigin: true,
+ },
+ '/comment': {
+ target: 'http://localhost:30001',
changeOrigin: true,
},
}
From 18e9c7781c8bad0426cc2916e121d32383312fde Mon Sep 17 00:00:00 2001
From: lixg {{ d.discussReviewCount }}
+
+
+
+
+
+
+
{{ d.discussName }}
+
+ {{ d.discussExplain }}
-
-
-
- {{ d.discussLikeCount }}
-
+
-
+
+
+
+
+ {{ d.discussReviewCount }}
+
+
+
+ {{ d.discussLikeCount }}
+
-
{{ d.discussCollectionCount }}
+ {{ d.discussCollectionCount }}
+
参与情况
@@ -34,24 +34,30 @@
-
{{ data.accessCnt }}
+
参与数
-
{{ data.voteCnt }}
+
总票数
-
{{ data.viewCnt }}
+
浏览数
参与投票
@@ -65,23 +71,23 @@
通过对各级人员的软件平台培训，使其能够了解如何运用乾元坤和智能信息管理系统来提升企业管理水平，最大限度发挥软件产品在企业中的作用;
-
-
+
+
● 培训目标 -
-
+
+
1.使企业不同部门人员掌握便捷、有效的系统平台操作方法; -
-
+
+
2.通过系统平台的培训提高员工对企业的管理理念认识与提升。 -
-
+
+
3.通过系统平台培训加强沟通，统一部署，协同工作，提高效率。 -
-
+
+
●培训对象 -
-
+
+
集团领导、各相关部门领导、总经理、车间主管、车间操作员等;
-
+
+
● 培训目标 -
-
+
+
1.使企业不同部门人员掌握便捷、有效的系统平台操作方法; -
-
+
+
2.通过系统平台的培训提高员工对企业的管理理念认识与提升。 -
-
+
+
3.通过系统平台培训加强沟通，统一部署，协同工作，提高效率。 -
-
+
+
●培训对象 -
-
+
+
集团领导、各相关部门领导、总经理、车间主管、车间操作员等;
投票时间
-
+
距离结束还有
- {{ parseInt(dayjs(data.detail?.voteEndTime).diff(dayjs(), 'minute') / 60) }}
- 小时 {{ dayjs(data.detail?.voteEndTime).diff(dayjs(), 'minute') % 60 }} 分钟
+
投票说明
-
+
-
+
@@ -75,15 +74,14 @@
Date: Mon, 12 Dec 2022 14:19:31 +0800
Subject: [PATCH 16/72] =?UTF-8?q?feat:=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/api.js | 4 +-
src/views/ballot/BallotPage.vue | 80 ++++++++++++++++++++-------------
2 files changed, 51 insertions(+), 33 deletions(-)
diff --git a/src/api/api.js b/src/api/api.js
index 591c295..d66a927 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -2,7 +2,7 @@
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-12-11 16:57:58
* @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-12-11 21:21:16
+ * @LastEditTime: 2022-12-12 13:42:24
* @FilePath: /fe-stu/src/api/api.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
@@ -39,7 +39,7 @@ export const DISCUSS_SUBMIT_REVIEW_LIST = '/discussSubmit/queryDiscussSubmitAndR
export const COMMENT_LIST = '/comment/list'
-export const VOTE_DETAIL2 = ballotId => `/vote/queryStemByStemId?ballotId=${ballotId} post`
+export const VOTE_DETAIL2 = voteId => `/vote/queryVoteAndVoteStemDetailByVoteId?voteId=${voteId} post`
export const COMMENT_ADD = '/comment post'
export const COMMENT_PRAISE = '/comment/praise post'
export const COMMENT_COLLECTION = '/comment/collection post'
diff --git a/src/views/ballot/BallotPage.vue b/src/views/ballot/BallotPage.vue
index 4848c1d..8be9eba 100644
--- a/src/views/ballot/BallotPage.vue
+++ b/src/views/ballot/BallotPage.vue
@@ -16,7 +16,7 @@
-
-
- {{ d.discussReviewCount }}
+ {{ d.commentNum || 0 }}
-
-
{{ d.discussLikeCount }}
+
+
+
- {{ d.praiseNum || 0 }}
+
@@ -87,7 +87,11 @@
diff --git a/src/views/login/login.vue b/src/views/login/login.vue
new file mode 100644
index 0000000..6fd8bcd
--- /dev/null
+++ b/src/views/login/login.vue
@@ -0,0 +1,64 @@
+
+
-
{{ d.discussCollectionCount }}
+ :style="{color:d.collected?'red':'#b3bdc4',marginLeft: '19px'}">
+ {{ d.collectionNum || 0 }}
+
+
+
From ea0d1f6fa670a03eb5e94579b6480289b2fee071 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Mon, 12 Dec 2022 12:29:04 +0800
Subject: [PATCH 11/72] =?UTF-8?q?=E8=AE=A8=E8=AE=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/api.js | 2 +-
src/api/request.js | 52 +++++--
src/views/discuss/DiscussPage.vue | 19 +--
src/views/discussdetail/DiscussDetail.vue | 168 ++++++++++------------
4 files changed, 130 insertions(+), 111 deletions(-)
diff --git a/src/api/api.js b/src/api/api.js
index e5ffb5a..9358e99 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -34,7 +34,7 @@ export const EXAMINATION_QUERYEXAMINATIONDETAILBYID = '/examination/queryExamina
export const DISCUSS_COLLECTION = '/discussSubmit/clickDiscussCollectionCountOr post'
export const DISCUSS_LIKE = '/discussSubmit/clickDiscussLikeCountOr post'
export const DISCUSS_LIST = '/discussSubmit/list'
-export const DISCUSS_DETAIL = '/discuss/getDiscussDetail'
+export const DISCUSS_DETAIL = '/discussSubmit/detail'
export const DISCUSS_SUBMIT_REVIEW_LIST = '/discussSubmit/queryDiscussSubmitAndReview'
export const COMMENT_LIST = '/comment/list'
diff --git a/src/api/request.js b/src/api/request.js
index 689d18b..bfe5eb0 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -1,28 +1,64 @@
import router from "@/router";
-import {ref, watch} from "vue";
+import {reactive, ref, toRefs, watch} from "vue";
import axios from 'axios';
+export function usePage(_url, param) {
+
+ const state = reactive({
+ data: {},
+ loading: false,
+ total: 0,
+ size: 10,
+ current: 1,
+ params: {pageNo: 1, pageSize: 10, ...param}
+ })
+
+ watch(param, () => {
+ state.params = {...state.params, ...param}
+ fetchData()
+ })
+
+ function fetchData() {
+ state.loading = true
+ request(_url, state.params).then(r => {
+ state.params.pageNo === 1 ? (state.data = r.data.records) : (state.data = [...state.data, ...r.data.records])
+ state.size = r.data.size
+ state.total = r.data.total
+ state.current = r.data.current
+ state.loading = false
+ })
+ }
+
+ fetchData()
+ return {
+ ...toRefs(state),
+ fetchData,
+ };
+}
+
export function useRequest(_url, params = {}) {
- const data = ref({})
- const loading = ref(false)
+ const state = reactive({
+ data: {},
+ loading: false,
+
+ })
watch(params, () => {
fetchData()
})
function fetchData() {
- loading.value = true
+ state.loading = true
request(_url, params).then(r => {
- data.value = r.data
- loading.value = false
+ state.data = r.data
+ state.loading = false
})
}
fetchData()
return {
- data,
- loading,
+ ...toRefs(state),
fetchData,
};
}
diff --git a/src/views/discuss/DiscussPage.vue b/src/views/discuss/DiscussPage.vue
index 3fdd151..68bcbd9 100644
--- a/src/views/discuss/DiscussPage.vue
+++ b/src/views/discuss/DiscussPage.vue
@@ -39,21 +39,18 @@
+
+ 用户登录
+
+
+
+
+
+
{{ projectInfo.name }}
-
-
+
{{ item.name }}
-
进行中
-
-
-
+
@@ -115,13 +112,13 @@ function comment({discussId: id}) {
function like(d) {
d.praised ? (d.praiseNum -= 1) : (d.praiseNum += 1)
d.praised = !d.praised
- request(COMMENT_PRAISE, {targetId: d.discussId, type: 5})
+ request(COMMENT_PRAISE, {targetId: d.discussId, type: 3})
}
function collection(d) {
d.collected ? (d.collectionNum -= 1) : (d.collectionNum += 1)
d.collected = !d.collected
- request(COMMENT_COLLECTION, {targetId: d.discussId, type: 6})
+ request(COMMENT_COLLECTION, {targetId: d.discussId, type: 4})
}
@@ -174,9 +171,7 @@ function collection(d) {
background: #ffffff;
border-radius: 8px;
margin-top: 24px;
- // display: flex;
- // flex-direction: column;
- // align-items: center;
+ display: block;
.middletitle {
display: flex;
margin-top: 64px;
@@ -216,7 +211,7 @@ function collection(d) {
.line {
display: flex;
margin: 47px 45px 0 75px;
- max-width: 1810px;
+ //max-width: 1810px;
// height: 50px;
background: #f9f9f9;
position: relative;
diff --git a/src/views/discussdetail/DiscussDetail.vue b/src/views/discussdetail/DiscussDetail.vue
index 31a25d2..f06f442 100644
--- a/src/views/discussdetail/DiscussDetail.vue
+++ b/src/views/discussdetail/DiscussDetail.vue
@@ -37,37 +37,36 @@
- {{ disDetail.discussName }}
+ {{ disDetail.projectName }}
-
-
{{ disDetail.discussExplain }}
+ {{ disDetail.stageName }}
-
进行中
-
{{ data.discussSubmitTitle }}
- {{ disDetail.discussName }}
+
-
-
- {{ data.discussLikeCount }}
+
+ {{ disDetail.praiseNum || 0 }}
-
{{ data.discussCollectionCount }}
+ :style="{color: disDetail.collected?'red':'#b3bdc4',marginLeft: '19px'}">
+ {{ disDetail.collectionNum || 0 }}
- {{ data.discussSubmitTitle }}
+ {{ disDetail.discussExplain }}
{{ textarealength }}/100
+ {{ disComment.content.length }}/100
@@ -105,62 +103,61 @@
-
+
-
-
-
@@ -54,7 +54,7 @@
@@ -70,17 +70,7 @@
-
{{ row.stuName }}
-
+ {{ row.userName }}
(显示事业)
理性思考，崇尚科学
- {{ row.discussReviewContent }}
+ {{ row.content }}
{{ row.createTime }}
+ {{ row.ctime }}
-
-
{{ row.discussLikeCount }}
+
+
-
-
{{ row.discussLikeCount }}
+
+ {{ row.praiseNum || 0 }}
+
@@ -171,15 +168,14 @@
Date: Mon, 12 Dec 2022 12:35:32 +0800
Subject: [PATCH 12/72] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E6=8A=95=E7=A5=A8?=
=?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/ballot/BallotPage.vue | 54 +++++++++++++++------------------
1 file changed, 25 insertions(+), 29 deletions(-)
diff --git a/src/views/ballot/BallotPage.vue b/src/views/ballot/BallotPage.vue
index 31f9d57..4848c1d 100644
--- a/src/views/ballot/BallotPage.vue
+++ b/src/views/ballot/BallotPage.vue
@@ -16,7 +16,7 @@
-
-
-
-
-
+
@@ -529,6 +531,35 @@ function submitReplayComment() {
.uploadAnd {
margin-top: 21px;
+ .btwwo{
+ cursor: pointer;
+
+ .image {
+ padding-top: 8px;
+ width: 18px;
+ height: 17px;
+ // margin-top: 10px;
+ margin-left: -60px;
+ }
+
+ .shangchuan {
+ position: absolute;
+ right: 20px;
+ top: 7px;
+ display: inline-block;
+ margin-left: 10px;
+ font-size: 14px;
+ font-weight: 500;
+ color: #2478ff;
+ line-height: 24px;
+ }
+
+ width: 126px;
+ height: 36px;
+ border: none;
+ background-color: #fff;
+ }
+
.btnone {
cursor: pointer;
position: absolute;
@@ -578,7 +609,7 @@ function submitReplayComment() {
}
.thinline {
- margin-top: 26px;
+ margin-top: 66px;
// width: 1635px;
border-top: 1px solid #878b92;
margin-left: -50px;
From 0b848318eddfd8e02617fe647f13fd71d4291bd8 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Mon, 12 Dec 2022 13:17:02 +0800
Subject: [PATCH 14/72] =?UTF-8?q?=E8=AE=A8=E8=AE=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/api.js | 4 ++--
src/views/moreActive/MoreActive.vue | 29 +++++++++--------------------
2 files changed, 11 insertions(+), 22 deletions(-)
diff --git a/src/api/api.js b/src/api/api.js
index 9358e99..a44d761 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -15,8 +15,8 @@ export const ROUTER_CHAPTER_LIST = '/stu/router/chapterList'
export const ROUTER_LIST = '/stu/router/list post'
export const ROUTER_PROCESS = '/stu/router/process'
export const ROUTER_UNCOMPLETE_LIST = '/stu/router/unCompleteTaskList'
-export const TAS_ACTIVITY_DETAIL = '/stu/task/activity/detail'
-export const TASK_ACTIVITY_SIGN = '/stu/task/activity/sign'
+export const TAS_ACTIVITY_DETAIL = '/activity'
+export const TASK_ACTIVITY_SIGN = '/activitySubmit/updateActivitySignInStatus post'
export const TASK_BROADCAST_COMMIT = '/stu/task/broadcast/commit'
export const TASK_BROADCAST_DETAIL = '/stu/task/broadcast/detail'
export const TASK_BROADCAST_SIGN = '/stu/task/broadcast/sign'
diff --git a/src/views/moreActive/MoreActive.vue b/src/views/moreActive/MoreActive.vue
index 9387653..968cc95 100644
--- a/src/views/moreActive/MoreActive.vue
+++ b/src/views/moreActive/MoreActive.vue
@@ -21,10 +21,10 @@
-
{{ replay.stuName }}
+ {{ replay.userName }}
回复
- {{ row.stuName }}
- {{ replay.createTime }}
+ {{ row.userName }}
+ {{ replay.ctime }}
- {{ replay.replyContent }}
+ {{ replay.content }}
-
{{ replay.discussLikeCount }}
+
-
-
{{ replay.discussLikeCount }}
+
+ {{ replay.praiseNum || 0 }}
{{ textarealength2 }}/100
+ {{ replayComment.content.length }}/100
@@ -194,8 +190,7 @@
上传图片
-
-
+
【投票】管理者进阶腾飞班 - 授课方式
+ 【投票】{{ dataInfo?.ballotName }}
@@ -64,31 +64,17 @@
-
@@ -160,16 +146,26 @@ import {
} from "@/api/api";
import dayjs from "dayjs";
import { useRoute } from "vue-router/dist/vue-router";
+import { watch, reactive, toRefs } from "vue";
// const { data } = useRequest(TASK_VOTE_DETAIL, {});
// console.log("datadatadata", data);
+// const state = reactive({
+// votedetail: null,
+// });
+// let { votedetail } = toRefs(state);
const {
query: { ballotId = 3 },
} = useRoute();
+//获取基本信息
const { data: dataInfo } = useRequest(VOTE_DETAIL2(ballotId));
console.log("dataInfo", dataInfo);
-const handleClick = (tab, event) => {
- console.log(tab, event);
-};
+// watch(dataInfo, () => {
+// if (dataInfo._rawValue) {
+// votedetail = dataInfo._rawValue;
+// console.log("votedetail.", votedetail);
+// }
+// });
+// console.log("votedetail.", votedetail);
From 0a7360606fdd9eb1a8ca6737f0411976456077f1 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Mon, 12 Dec 2022 12:57:46 +0800
Subject: [PATCH 13/72] =?UTF-8?q?=E8=AE=A8=E8=AE=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/discussdetail/DiscussDetail.vue | 49 ++++++++++++++++++-----
1 file changed, 40 insertions(+), 9 deletions(-)
diff --git a/src/views/discussdetail/DiscussDetail.vue b/src/views/discussdetail/DiscussDetail.vue
index f06f442..8996358 100644
--- a/src/views/discussdetail/DiscussDetail.vue
+++ b/src/views/discussdetail/DiscussDetail.vue
@@ -89,16 +89,18 @@
-
-
-
-
-
- 通过对各级人员的软件平台培训，使其能够了解如何运用乾元坤和智能信息管理系统来提升企业管理水平，最大限度发挥软件产品在企业中的作用;
-
-
- ● 培训目标 -
-
- 1.使企业不同部门人员掌握便捷、有效的系统平台操作方法; -
-
- 2.通过系统平台的培训提高员工对企业的管理理念认识与提升。 -
-
- 3.通过系统平台培训加强沟通，统一部署，协同工作，提高效率。 -
-
- ●培训对象 -
-
- 集团领导、各相关部门领导、总经理、车间主管、车间操作员等; +
-
- ● 培训目标 -
-
- 1.使企业不同部门人员掌握便捷、有效的系统平台操作方法; -
-
- 2.通过系统平台的培训提高员工对企业的管理理念认识与提升。 -
-
- 3.通过系统平台培训加强沟通，统一部署，协同工作，提高效率。 -
-
- ●培训对象 -
-
- 集团领导、各相关部门领导、总经理、车间主管、车间操作员等; +
+
+
+ {{ item.orderNumber }}、
+ {{ item.voteStemName }}
+
+
{{ value.optionName }}
+
+
+
+
+
+
-
+
-
-
-
- {{ data.detail?.workName }}
+ {{ data?.activityName }}
- {{ data.detail?.createTime }}
+ {{ data?.createTime }}
- {{ data.detail?.workEnclosureAddress }}
+ {{ data?.activityAddress }}
签到
+ 签到
-
+
-
-
![]()
直播公告
-
+
【直播】{{ data.detail?.liveName }}
+ 【直播】{{ data?.liveName }}
- {{ data.detail?.liveStartTime }}
+ {{ data?.liveStartTime }}
@@ -128,9 +128,9 @@
![]()
@@ -148,7 +148,7 @@ import {request, useRequest} from "@/api/request";
import {TASK_BROADCAST_COMMIT, TASK_BROADCAST_DETAIL, TASK_BROADCAST_SIGN} from "@/api/api";
-const {data} = useRequest(TASK_BROADCAST_DETAIL, {})
+const {data} = useRequest(TASK_BROADCAST_DETAIL, {liveId:352})
const state = reactive({
activeName: "first",
teacher: [
@@ -159,12 +159,6 @@ const state = reactive({
"教师是学生的镜子,学生是老师的影子。教师是学生的镜子,学生是老师的影子。教师是学生的镜子,学生是老师的影子。",
peopleimg: img,
},
- {
- id: 2,
- name: "王星天（显示事业）",
- introduce: "教师是学生的镜子,学生是老师的影子。",
- peopleimg: img,
- },
],
});
const {activeName, teacher} = toRefs(state)
From 3ae9e0702c0c245a04a0f5af4a717d5d138f6830 Mon Sep 17 00:00:00 2001
From: lixg
- {{ el.name }}
+ {{ data.userInfoBo.userName }}
- {{ el.introduce }}
+ {{ data.userInfoBo.bandDesc }}
+ 关注
【投票】{{ dataInfo?.ballotName }}
+ 【投票】{{ dataInfo?.voteName }}
@@ -24,8 +24,7 @@
@@ -154,10 +165,10 @@ import { watch, reactive, toRefs } from "vue";
// });
// let { votedetail } = toRefs(state);
const {
- query: { ballotId = 3 },
+ query: { voteId = 136 },
} = useRoute();
//获取基本信息
-const { data: dataInfo } = useRequest(VOTE_DETAIL2(ballotId));
+const { data: dataInfo } = useRequest(VOTE_DETAIL2(voteId));
console.log("dataInfo", dataInfo);
// watch(dataInfo, () => {
// if (dataInfo._rawValue) {
@@ -417,8 +428,15 @@ console.log("dataInfo", dataInfo);
// background: #f5f6f7;
// border-radius: 8px;
margin-top: 32px;
+ margin-left: 21px;
flex: 1;
-
+ .stem {
+ display: flex;
+ font-size: 16px;
+ font-weight: 500;
+ color: #333330;
+ line-height: 38px;
+ }
.imgcontent {
display: flex;
From cd68647ace6b8ee9029fe7e75568efd5ea5d8886 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Mon, 12 Dec 2022 14:49:54 +0800
Subject: [PATCH 17/72] =?UTF-8?q?=E8=80=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/api.js | 4 +-
src/views/examination/ExamPage.vue | 71 ++++++++++++----
vite.config.js | 131 ++++++++++++++++-------------
3 files changed, 127 insertions(+), 79 deletions(-)
diff --git a/src/api/api.js b/src/api/api.js
index d63c73b..b9860fe 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -30,8 +30,8 @@ export const TASK_VOTE_LIST = '/queryVoteSubmitDetailListByTaskId'
export const STU_OFFCOURSE_DETAIL = '/stu/offcourse/detail'
export const WORK_QUERYWORKDETAILBYID = '/work/queryWorkDetailById'
export const WORK_HISTROY = '/workSubmit/queryWorkDetailListByStuId'
-export const EXAMINATION_QUERYEXAMINATIONDETAILBYID = '/examination/queryExaminationDetailById'
-export const DISCUSS_COLLECTION = '/discussSubmit/clickDiscussCollectionCountOr post'
+export const EXAMINATION_QUERY = examinationId => `/examination/queryExaminationDetailById?examinationId=${examinationId} post`
+
export const DISCUSS_LIKE = '/discussSubmit/clickDiscussLikeCountOr post'
export const DISCUSS_LIST = '/discussSubmit/list'
export const DISCUSS_DETAIL = '/discussSubmit/detail'
diff --git a/src/views/examination/ExamPage.vue b/src/views/examination/ExamPage.vue
index 2c75e8e..6c79b13 100644
--- a/src/views/examination/ExamPage.vue
+++ b/src/views/examination/ExamPage.vue
@@ -2,7 +2,7 @@
@@ -37,20 +37,20 @@
@@ -60,7 +60,7 @@
-
+
-
参与情况
@@ -34,29 +33,40 @@
-
+
+ {{
+ dataInfo.numberOfInvolved || dataInfo.numberOfInvolved == 0
+ ? dataInfo.numberOfInvolved
+ : "-"
+ }}
+
参与数
-
+
+ {{
+ dataInfo.votesTotal || dataInfo.votesTotal == 0
+ ? dataInfo.votesTotal
+ : "-"
+ }}
+
总票数
-
+
+ {{
+ dataInfo.numberOfBrowse || dataInfo.numberOfBrowse == 0
+ ? dataInfo.numberOfBrowse
+ : "-"
+ }}
+
浏览数
参与投票
@@ -65,10 +75,10 @@
-
@@ -123,10 +132,12 @@
+
@@ -89,26 +99,25 @@
{{ item.orderNumber }}、
{{ item.voteStemName }}
-
+
距离结束还有
-
+ > 分钟
-
+ v-html="
+ dataInfo?.voteExplain ? dataInfo?.voteExplain : '暂无说明'
+ "
+ >
混合制项目
@@ -14,16 +14,16 @@
上一个
下一个
-
+
-
+
- 考试测试
+ {{ data.examinationName }}
- 考试时间：30分钟
- 及格线：60
+ 考试时间：{{ data.examinationDuration }}分钟
+ 及格线：{{data.passLine || 60}}
- 考试时间：2022-7-20 00:00 至 2022-8-29 23:59:59
+ 考试时间：{{ data.examinationStartTime }} 至 {{ data.examinationEndTime }}
-
+
+
历史纪录
@@ -88,8 +88,8 @@
2022-7-14 00:00
10分
@@ -101,13 +101,19 @@