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

feat:合并

Browse Source
This commit is contained in:
lixg
2022-12-11 20:59:57 +08:00
parent 18e9c7781c feabb11d6a
commit 20043b0d4e
4 changed files with 61 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/api/api.js
View File

@@ -2,7 +2,7 @@
* @Author: lixg lixg@dongwu-inc.com * @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-12-11 16:57:58 * @Date: 2022-12-11 16:57:58
* @LastEditors: lixg lixg@dongwu-inc.com * @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 * @FilePath: /fe-stu/src/api/api.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @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 EXAMINATION_QUERYEXAMINATIONDETAILBYID = '/examination/queryExaminationDetailById'
export const DISCUSS_COLLECTION = '/discussSubmit/clickDiscussCollectionCountOr POST' export const DISCUSS_COLLECTION = '/discussSubmit/clickDiscussCollectionCountOr POST'
export const DISCUSS_LIKE = '/discussSubmit/clickDiscussLikeCountOr 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_DETAIL = '/discuss/getDiscussDetail'
export const DISCUSS_SUBMIT_REVIEW_LIST = '/discussSubmit/queryDiscussSubmitAndReview' export const DISCUSS_SUBMIT_REVIEW_LIST = '/discussSubmit/queryDiscussSubmitAndReview'
//投票 export const COMMENT_LIST = '/comment/list'
export const VOTE_DETAIL2 = '/vote/queryStemByStemId POST' 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'

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

@@ -159,10 +159,13 @@ import {
VOTE_DETAIL2, VOTE_DETAIL2,
} from "@/api/api"; } from "@/api/api";
import dayjs from "dayjs"; import dayjs from "dayjs";
import { useRoute } from "vue-router/dist/vue-router";
// const { data } = useRequest(TASK_VOTE_DETAIL, {}); // const { data } = useRequest(TASK_VOTE_DETAIL, {});
// console.log("datadatadata", data); // 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); console.log("dataInfo", dataInfo);
const handleClick = (tab, event) => { const handleClick = (tab, event) => {
console.log(tab, event); console.log(tab, event);

75
src/views/discuss/DiscussPage.vue
View File

@@ -30,53 +30,55 @@
</div> </div>
<!-- 面包屑导航 --> <!-- 面包屑导航 -->
<!-- 标题 --> <!-- 标题 -->
<div class="title">【调研】管理者进阶腾飞班 - 班内成员讨论</div> <div class="title">{{ projectInfo.name }}</div>
<!-- 标题 --> <!-- 标题 -->
<!-- 详细内容 --> <!-- 详细内容 -->
<div class="bascinfo clearfix"> <div class="bascinfo clearfix">
<!-- 中间部分 --> <!-- 中间部分 -->
<div class="middletitle"> <div class="middletitle">
<div class="title"> <div class="title">
{{ disDetail.discussName }} {{ projectInfo.name }}
</div> </div>
<!-- todo #讨论页面 发表帖子跳转到哪里--> <!-- todo #讨论页面 发表帖子跳转到哪里-->
<button class="btn">发表帖子</button> <button class="btn">发表帖子</button>
</div> </div>
<div class="line clearfix"> <div v-for="(item,i) in projectInfo.stageVoList" :key="i">
<div class="linetitle">{{ disDetail.discussExplain }}</div> <div class="line clearfix">
<div class="radi"></div> <div class="linetitle">{{ item.name }}</div>
<!-- todo #讨论页面 状态字段没有--> <div class="radi"></div>
<div class="intime">进行中</div> <!-- todo #讨论页面 状态字段没有-->
</div> <div class="intime">进行中</div>
<div class="allbtn">
<!-- todo #讨论页面 查询条件最新 最热 查询字段-->
<button :class="`btnone ${param.searchType==1?'active':''}`" @click="param.searchType=1">最新</button>
<button :class="`btntwo ${param.searchType==2?'active':''}`" @click="param.searchType=2"
style="margin-left: 20px">最热
</button>
</div>
<div class="discusslist" v-for="(d,i) in data.rows">
<div class="itemtitle">{{ d.discussSubmitTitle }}</div>
<div class="itemdiscuss">
{{ d.discussSubmitContent }}
</div> </div>
<div class="allstar clearfix"> <div class="allbtn">
<div @click="comment(i)" style="display: flex;cursor: pointer"> <!-- todo #讨论页面 查询条件最新 最热 查询字段-->
<span class="iconfont icon-pinglun" style="color:#b3bdc4"></span> <button :class="`btnone ${param.searchType==1?'active':''}`" @click="param.searchType=1">最新</button>
<div class="count"> {{ d.discussReviewCount }}</div> <button :class="`btntwo ${param.searchType==2?'active':''}`" @click="param.searchType=2"
style="margin-left: 20px">最热
</button>
</div>
<div class="discusslist" v-for="(d,j) in item?.discussDtoList">
<div class="itemtitle">{{ d.discussName }}</div>
<div class="itemdiscuss">
{{ d.discussExplain }}
</div> </div>
<div @click="like(i)" style="display: flex;cursor: pointer"> <div class="allstar clearfix">
<span class="iconfont icon-dianzan" :style="{color:d.isLike?'red':'#b3bdc4',marginLeft: '19px'}"></span> <div @click="comment(i)" style="display: flex;cursor: pointer">
<div class="count"> {{ d.discussLikeCount }}</div> <span class="iconfont icon-pinglun" style="color:#b3bdc4"></span>
</div> <div class="count"> {{ d.discussReviewCount }}</div>
<div @click="collection(i)" style="display: flex;cursor: pointer"> </div>
<div @click="like(i)" style="display: flex;cursor: pointer">
<span class="iconfont icon-dianzan" :style="{color:d.isLike?'red':'#b3bdc4',marginLeft: '19px'}"></span>
<div class="count"> {{ d.discussLikeCount }}</div>
</div>
<div @click="collection(i)" style="display: flex;cursor: pointer">
<span class="iconfont icon-shoucang" <span class="iconfont icon-shoucang"
:style="{color:d.isCollection?'red':'#b3bdc4',marginLeft: '19px'}"></span> :style="{color:d.isCollection?'red':'#b3bdc4',marginLeft: '19px'}"></span>
<div class="count"> {{ d.discussCollectionCount }}</div> <div class="count"> {{ d.discussCollectionCount }}</div>
</div>
</div> </div>
<div class="thinline"></div>
</div> </div>
<div class="thinline"></div>
</div> </div>
</div> </div>
<!-- 详细内容 --> <!-- 详细内容 -->
@@ -90,14 +92,15 @@ import {reactive, ref, toRefs} from "vue";
import {useRoute, useRouter} from "vue-router"; import {useRoute, useRouter} from "vue-router";
const router = useRouter() const router = useRouter()
const {query: {id: discussId}} = useRoute() const {query: {id = 317}} = useRoute()
const param = ref({ const param = ref({
searchType: 1, type: 1,
discussId id
}) })
const {data} = useRequest(DISCUSS_LIST, param.value) const {data: projectInfo} = useRequest(DISCUSS_LIST, param.value)
const {data: disDetail} = useRequest(DISCUSS_DETAIL, {discussId})
const {data: disDetail} = useRequest(DISCUSS_DETAIL, {id})
const state = reactive({ const state = reactive({
activeName: "first", activeName: "first",
}); });

14
vite.config.js
View File

@@ -41,23 +41,27 @@ export default defineConfig(({command}) =>
changeOrigin: true, changeOrigin: true,
}, },
'/stu': { '/stu': {
target: 'http://111.231.196.214:12013/manageApi', target: 'http://localhost:30001',
changeOrigin: true, changeOrigin: true,
}, },
'/queryVoteSubmitDetailById': { '/queryVoteSubmitDetailById': {
target: 'http://111.231.196.214:12013/manageApi', target: 'http://localhost:30001',
changeOrigin: true, changeOrigin: true,
}, },
'/work': { '/work': {
target: 'http://111.231.196.214:12013/manageApi', target: 'http://localhost:30001',
changeOrigin: true, changeOrigin: true,
}, },
'/discuss': { '/discuss': {
target: 'http://111.231.196.214:12013/manageApi', target: 'http://localhost:30001',
changeOrigin: true, changeOrigin: true,
}, },
'/discussSubmit': { '/discussSubmit': {
target: 'http://111.231.196.214:12013/manageApi', target: 'http://localhost:30001',
changeOrigin: true,
},
'/comment': {
target: 'http://localhost:30001',
changeOrigin: true, changeOrigin: true,
}, },
} }