hz/fe-student
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-student.git synced 2025-12-09 19:06:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat:合并

Browse Source
This commit is contained in:
lixg
2022-12-11 20:46:44 +08:00
parent 2ae27f7c75
commit 18e9c7781c
4 changed files with 100 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/App.vue
View File

@@ -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%;

13
src/api/api.js
View File

@@ -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'

52
src/views/ballot/BallotPage.vue
View File

@@ -34,15 +34,21 @@
<!-- <div style="display: flex; align-items: center"></div> -->
<div class="all">
<div class="item allbox1">
<div class="item1" style="color: #089dff">{{ data.accessCnt }}</div>
<!-- <div class="item1" style="color: #089dff">
{{ data.accessCnt }}
</div> -->
<div class="item2">参与数</div>
</div>
<div class="item allbox2">
<div class="item1" style="color: #387df7">{{ data.voteCnt }}</div>
<!-- <div class="item1" style="color: #387df7">
{{ data.voteCnt }}
</div> -->
<div class="item2">总票数</div>
</div>
<div class="item allbox3">
<div class="item1" style="color: #00c6ff">{{ data.viewCnt }}</div>
<!-- <div class="item1" style="color: #00c6ff">
{{ data.viewCnt }}
</div> -->
<div class="item2">浏览数</div>
</div>
</div>
@@ -97,17 +103,26 @@
<div class="box"></div>
</div>
<div class="timebox clearfix">
<div class="innertime">
<!-- <div class="innertime">
{{
data.detail?.voteStartTime
}}&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;{{ data.detail?.voteEndTime }}
</div>
}}&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;{{
data.detail?.voteEndTime
}}
</div> -->
<div class="endtime clearfix">
<div class="endtimetext">
距离结束还有&nbsp;&nbsp;
<span class="te">{{ parseInt(dayjs(data.detail?.voteEndTime).diff(dayjs(), 'minute') / 60) }}</span>&nbsp;&nbsp;
小时&nbsp;&nbsp;<span
class="te">{{ dayjs(data.detail?.voteEndTime).diff(dayjs(), 'minute') % 60 }}</span>&nbsp;&nbsp;分钟
<!-- <span class="te">{{
parseInt(
dayjs(data.detail?.voteEndTime).diff(dayjs(), "minute") /
60
)
}}</span
>&nbsp;&nbsp; 小时&nbsp;&nbsp;<span class="te">{{
dayjs(data.detail?.voteEndTime).diff(dayjs(), "minute") % 60
}}</span
>&nbsp;&nbsp;分钟 -->
</div>
</div>
</div>
@@ -122,7 +137,10 @@
<div class="box"></div>
</div>
<div class="explain clearfix">
<div class="explaincontent" v-html="data.detail?.voteExplain"></div>
<!-- <div
class="explaincontent"
v-html="data.detail?.voteExplain"
></div> -->
</div>
</div>
</div>
@@ -134,15 +152,21 @@
<script setup>
import { useRequest } from "@/api/request";
import {ROUTER_CHAPTER_LIST, ROUTER_LIST, TASK_VOTE_DETAIL} from "@/api/api";
import {
ROUTER_CHAPTER_LIST,
ROUTER_LIST,
TASK_VOTE_DETAIL,
VOTE_DETAIL2,
} from "@/api/api";
import dayjs from "dayjs";
const {data} = useRequest(TASK_VOTE_DETAIL, {})
// const { data } = useRequest(TASK_VOTE_DETAIL, {});
// console.log("datadatadata", data);
const { dataInfo } = useRequest(VOTE_DETAIL2, { ballotId: 3 });
console.log("dataInfo", dataInfo);
const handleClick = (tab, event) => {
console.log(tab, event);
};
</script>
<!-- Add "scoped" attribute to limit CSS to this component only -->