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 @@
参与情况
@@ -34,24 +34,30 @@
-
{{ data.accessCnt }}
+
参与数
-
{{ data.voteCnt }}
+
总票数
-
{{ data.viewCnt }}
+
浏览数
参与投票
@@ -65,23 +71,23 @@
通过对各级人员的软件平台培训，使其能够了解如何运用乾元坤和智能信息管理系统来提升企业管理水平，最大限度发挥软件产品在企业中的作用; -
-
+
+
● 培训目标 -
-
+
+
1.使企业不同部门人员掌握便捷、有效的系统平台操作方法; -
-
+
+
2.通过系统平台的培训提高员工对企业的管理理念认识与提升。 -
-
+
+
3.通过系统平台培训加强沟通，统一部署，协同工作，提高效率。 -
-
+
+
●培训对象 -
-
+
+
集团领导、各相关部门领导、总经理、车间主管、车间操作员等;
@@ -89,40 +95,52 @@
投票时间
-
+
距离结束还有   - {{ parseInt(dayjs(data.detail?.voteEndTime).diff(dayjs(), 'minute') / 60) }}   - 小时  {{ dayjs(data.detail?.voteEndTime).diff(dayjs(), 'minute') % 60 }}  分钟 +
投票说明
-
+
@@ -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% ); }