diff --git a/src/api/api.js b/src/api/api.js index 156521d..3df3adc 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 19:15:07 + * @LastEditTime: 2022-12-11 20:51:51 * @FilePath: /fe-stu/src/api/api.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -32,9 +32,13 @@ 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_LIST = '/discussSubmit/queryDiscussSubmitDetailByDiscussId' +export const DISCUSS_LIST = '/discussSubmit/list' 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 +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 VOTE_DETAIL2 = '/vote/queryStemByStemId post' diff --git a/src/views/ballot/BallotPage.vue b/src/views/ballot/BallotPage.vue index 6ca36b9..8e2f126 100644 --- a/src/views/ballot/BallotPage.vue +++ b/src/views/ballot/BallotPage.vue @@ -159,10 +159,13 @@ import { VOTE_DETAIL2, } from "@/api/api"; import dayjs from "dayjs"; - +import { useRoute } from "vue-router/dist/vue-router"; // const { data } = useRequest(TASK_VOTE_DETAIL, {}); // console.log("datadatadata", data); -const { dataInfo } = useRequest(VOTE_DETAIL2, { ballotId: 3 }); +const { + query: { ballotId = 3 }, +} = useRoute(); +const { data: dataInfo } = useRequest(VOTE_DETAIL2, { ballotId: ballotId }); console.log("dataInfo", dataInfo); const handleClick = (tab, event) => { console.log(tab, event); diff --git a/src/views/discuss/DiscussPage.vue b/src/views/discuss/DiscussPage.vue index 413dd03..fcbfd6c 100644 --- a/src/views/discuss/DiscussPage.vue +++ b/src/views/discuss/DiscussPage.vue @@ -30,53 +30,55 @@ -
【调研】管理者进阶腾飞班 - 班内成员讨论
+
{{ projectInfo.name }}
- {{ disDetail.discussName }} + {{ projectInfo.name }}
- +
-
-
{{ disDetail.discussExplain }}
-
- -
进行中
-
-
- - - -
-
-
{{ d.discussSubmitTitle }}
-
- {{ d.discussSubmitContent }} +
+
+
{{ item.name }}
+
+ +
进行中
-
-
- -
{{ d.discussReviewCount }}
+
+ + + +
+
+
{{ d.discussName }}
+
+ {{ d.discussExplain }}
-
- -
{{ d.discussLikeCount }}
-
-
+
+
+ +
{{ d.discussReviewCount }}
+
+
+ +
{{ d.discussLikeCount }}
+
+
-
{{ d.discussCollectionCount }}
+
{{ d.discussCollectionCount }}
+
+
-
@@ -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, }, }