feat:合并

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

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);

src/views/discuss/DiscussPage.vue

@@ -30,21 +30,22 @@
     </div>
     <!-- 面包屑导航 -->
     <!-- 标题 -->
-    <div class="title">【调研】管理者进阶腾飞班 - 班内成员讨论</div>
+    <div class="title">{{ projectInfo.name }}</div>
     <!-- 标题 -->
     <!-- 详细内容 -->
     <div class="bascinfo clearfix">
       <!-- 中间部分 -->
       <div class="middletitle">
         <div class="title">
-          {{ disDetail.discussName }}
+          {{ projectInfo.name }}
         </div>
         <!--        todo #讨论页面  发表帖子跳转到哪里-->
         <button class="btn">发表帖子</button>
       </div>
 
+      <div v-for="(item,i) in projectInfo.stageVoList" :key="i">
         <div class="line clearfix">
-        <div class="linetitle">{{ disDetail.discussExplain }}</div>
+          <div class="linetitle">{{ item.name }}</div>
           <div class="radi"></div>
           <!--        todo #讨论页面 状态字段没有-->
           <div class="intime">进行中</div>
@@ -56,10 +57,10 @@
                   style="margin-left: 20px">最热
           </button>
         </div>
-      <div class="discusslist" v-for="(d,i) in data.rows">
-        <div class="itemtitle">{{ d.discussSubmitTitle }}</div>
+        <div class="discusslist" v-for="(d,j) in item?.discussDtoList">
+          <div class="itemtitle">{{ d.discussName }}</div>
           <div class="itemdiscuss">
-          {{ d.discussSubmitContent }}
+            {{ d.discussExplain }}
           </div>
           <div class="allstar clearfix">
             <div @click="comment(i)" style="display: flex;cursor: pointer">
@@ -79,6 +80,7 @@
           <div class="thinline"></div>
         </div>
       </div>
+    </div>
     <!-- 详细内容 -->
   </div>
 </template>
@@ -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",
 });

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,
                 },
             }