feat:增加投票模块提交查询及时间判断

This commit is contained in:
wyx
2023-02-01 21:44:32 +08:00
parent 5e8a11feaf
commit f5eddf6236
6 changed files with 742 additions and 36 deletions

View File

@@ -47,9 +47,9 @@ export const DISCUSS_SUBMIT_REVIEW_LIST = '/discussSubmit/queryDiscussSubmitAndR
export const COMMENT_LIST = '/comment/list'
export const VOTE_DETAIL2 = voteId => `/vote/queryVoteAndVoteStemDetailByVoteId?voteId=${voteId} post`
export const VOTE_DETAIL2 = `/voteSubmit/queryVoteTaskDetailById post`
// 投票详情接口
export const VOTE_DETAIL_SUBMIT = `/voteSubmit/queryVoteSubmitDetailListByTaskId post`
export const VOTE_DETAIL_SUBMIT = `/voteSubmit/vote/commit post`
export const COMMENT_ADD = '/comment post'
export const COMMENT_PRAISE = '/comment/praise post'
@@ -68,3 +68,6 @@ export const FACETEACH_SIGNUP = `/stu/project/stuFaceTeachSignUp`
// 外部考试详情接口
export const EXTERNALEXAM = `/external/exam/queryExternalExam`
// 外链详情接口
export const LINKGETONE = `/link/getOne`

View File

@@ -22,7 +22,7 @@
</div>
</div>
<!-- 面包屑导航 -->
<div class="debateTitle">投票{{ dataInfo?.voteName }}</div>
<div class="debateTitle">投票{{ state.dataInfo?.voteName }}</div>
<!-- 详细信息 -->
<div class="detailinfo">
<div class="detail">
@@ -41,8 +41,8 @@
<div class="item allbox1">
<div class="item1" style="color: #089dff">
{{
dataInfo.numberOfInvolved || dataInfo.numberOfInvolved == 0
? dataInfo.numberOfInvolved
state.dataInfo.numberOfInvolved || state.dataInfo.numberOfInvolved == 0
? state.dataInfo.numberOfInvolved
: "-"
}}
</div>
@@ -51,8 +51,8 @@
<div class="item allbox2">
<div class="item1" style="color: #387df7">
{{
dataInfo.votesTotal || dataInfo.votesTotal == 0
? dataInfo.votesTotal
state.dataInfo.votesTotal || state.dataInfo.votesTotal == 0
? state.dataInfo.votesTotal
: "-"
}}
</div>
@@ -61,8 +61,8 @@
<div class="item allbox3">
<div class="item1" style="color: #00c6ff">
{{
dataInfo.numberOfBrowse || dataInfo.numberOfBrowse == 0
? dataInfo.numberOfBrowse
state.dataInfo.numberOfBrowse || state.dataInfo.numberOfBrowse == 0
? state.dataInfo.numberOfBrowse
: "-"
}}
</div>
@@ -81,7 +81,7 @@
<div class="join">
<div
v-for="(item, index) in dataInfo.ballotVo?.voteStemVoList"
v-for="(item, index) in state.dataInfo.ballotVo?.voteStemVoList"
:key="index"
style="margin-bottom: 41px"
>
@@ -102,7 +102,7 @@
:src="value.optionPictureAddress"
/> -->
<div class="radio">
<label @click="choiceQuestion(key,value.optionId,dataInfo,index)">
<label @click="choiceQuestion(key,value.optionId,state.dataInfo,index)">
<!-- <input type="radio" name="one" value="right"/> -->
<div v-if="value.isAnswer" style="width:10px;height:10px;background:#4a9cf8;position:relative;left:15px;border-radius:10px;"></div>
<div v-else style="width:10px;height:10px;background:#fff;position:relative;left:15px;border-radius:10px;"></div>
@@ -115,12 +115,16 @@
</div>
</div>
<div
style="
width: 100%;
style="width: 100%;
display: flex;
justify-content: center;
margin-top: 30px;">
<button class="submitbtn btn01" :style="{background:dataInfo.isSubmit?'#ccc':''}" @click="submitVote(dataInfo)">{{dataInfo.isSubmit?'已提交':'提交'}}</button>
<button
class="submitbtn btn01"
:style="{background: (new Date().getTime() > new Date(state.dataInfo.voteEndTime).getTime() || new Date().getTime() < new Date(state.dataInfo.voteStartTime).getTime() )? '#ccc' : state.dataInfo.isSubmit?'#ccc':'' }"
@click="submitVote(state.dataInfo)">
{{state.dataInfo.isSubmit?'已提交':'提交'}}
</button>
</div>
</div>
<div class="right">
@@ -135,9 +139,9 @@
<div class="timebox clearfix">
<div class="innertime">
{{
dataInfo?.voteStartTime
state.dataInfo?.voteStartTime
}}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{
dataInfo?.voteEndTime
state.dataInfo?.voteEndTime
}}
</div>
<div class="endtime clearfix">
@@ -145,11 +149,11 @@
距离结束还有&nbsp;&nbsp;
<span class="te">{{
parseInt(
dayjs(dataInfo?.voteEndTime).diff(dayjs(), "minute") / 60
dayjs(state.dataInfo?.voteEndTime).diff(dayjs(), "minute") / 60
)
}}</span
>&nbsp;&nbsp; 小时&nbsp;&nbsp;<span class="te">{{
dayjs(dataInfo?.voteEndTime).diff(dayjs(), "minute") % 60
dayjs(state.dataInfo?.voteEndTime).diff(dayjs(), "minute") % 60
}}</span
>&nbsp;&nbsp;分钟
</div>
@@ -168,7 +172,7 @@
<div
class="explaincontent"
v-html="
dataInfo?.voteExplain ? dataInfo?.voteExplain : '暂无说明'
state.dataInfo?.voteExplain ? state.dataInfo?.voteExplain : '暂无说明'
"
></div>
</div>
@@ -181,15 +185,16 @@
</template>
<script setup>
import {useRequest} from "@/api/request";
import {useRequest,request} from "@/api/request";
import {
VOTE_DETAIL2,
VOTE_DETAIL_SUBMIT
} from "@/api/api";
import dayjs from "dayjs";
import store from "@/store";
import { ElMessage } from "element-plus";
import {useRoute,useRouter} from "vue-router/dist/vue-router";
import {watch, reactive, toRefs} from "vue";
import {computed, reactive, toRefs} from "vue";
// const { data } = useRequest(TASK_VOTE_DETAIL, {});
// console.log("datadatadata", data);
// const state = reactive({
@@ -197,43 +202,90 @@ import {watch, reactive, toRefs} from "vue";
// });
// let { votedetail } = toRefs(state);
const {
query: {courseId, pName, sName, chapterOrStageId, infoId, id},
query: {courseId, pName, sName, chapterOrStageId, infoId, id, btype},
} = useRoute();
const router = useRouter();
const returnclick = () => {
router.back();
};
//获取基本信息
const {data: dataInfo} = useRequest(VOTE_DETAIL2(courseId));
const state = reactive({
dataInfo: {},
});
console.log('我是获取的投票基本信息', dataInfo)
//获取基本信息
// const {data: dataInfo} = useRequest(VOTE_DETAIL2(courseId));
const userInfo = computed(() => store.state.userInfo);
let timer = setInterval(() => {
if(userInfo.value.id){
clearInterval(timer)
console.log('获取信息传递参数',{
"chapterOrStageId": chapterOrStageId ? chapterOrStageId : 0,
"courseId": courseId,
"studentId": userInfo.value.id,
"targetId": infoId,
"type": btype
})
request(VOTE_DETAIL2, {
"chapterOrStageId": chapterOrStageId ? chapterOrStageId : 0,
"courseId": courseId,
"studentId": userInfo.value.id,
"targetId": infoId,
"type": btype
}).then(res=>{
console.log(res)
state.dataInfo = res.data
}).catch(err=>{
console.log(err)
});
}
}, 500);
console.log('我是获取的投票基本信息', state.dataInfo)
// 答题时间
const answerTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss');
// 选择题目
const choiceQuestion = (order, id, dates, torder) => {
// 当已经提交过时候 不让选择题目
if(state.dataInfo.isSubmit){
return
}
console.log('当前选择题目的id及序号', order, id, dates,torder)
for(let i=0;i<dates.ballotVo.voteStemVoList[torder].optionDetailList.length;i++){
dates.ballotVo.voteStemVoList[torder].optionDetailList[i].isAnswer = false;
}
dates.ballotVo.voteStemVoList[torder].optionDetailList[order].isAnswer = true;
console.log(dataInfo)
console.log(state.dataInfo)
}
// 提交投票
const submitVote = () => {
console.log(state.dataInfo)
let nowTime = new Date().getTime()
let maxTime = new Date(state.dataInfo.voteEndTime).getTime()
let minTime = new Date(state.dataInfo.voteStartTime).getTime()
console.log(nowTime, maxTime, minTime)
// 当未到开始时间
if(nowTime < minTime || nowTime > maxTime) {
ElMessage.error("未到投票开始时间")
return
}
// 当已经提交过时候 不让提交即可
if(dataInfo.value.isSubmit){
if(state.dataInfo.isSubmit){
return
}
let isSubmit = true;
let isSubArr = []
for(let i=0;i<dataInfo.value.ballotVo.voteStemVoList.length;i++){
for(let j=0; j<dataInfo.value.ballotVo.voteStemVoList[i].optionDetailList.length;j++){
if(dataInfo.value.ballotVo.voteStemVoList[i].optionDetailList[j].isAnswer){
isSubArr[i] = dataInfo.value.ballotVo.voteStemVoList[i].optionDetailList[j].isAnswer
for(let i=0;i<state.dataInfo.ballotVo.voteStemVoList.length;i++){
for(let j=0; j<state.dataInfo.ballotVo.voteStemVoList[i].optionDetailList.length;j++){
if(state.dataInfo.ballotVo.voteStemVoList[i].optionDetailList[j].isAnswer){
isSubArr[i] = state.dataInfo.ballotVo.voteStemVoList[i].optionDetailList[j].isAnswer
break
}else{
isSubArr[i] = false
@@ -254,17 +306,30 @@ const submitVote = () => {
let obj = {
"beginTime": answerTime,
"chapterOrStageId": chapterOrStageId ? chapterOrStageId : 0,
"result": JSON.stringify(dataInfo.value),
"result": JSON.stringify(state.dataInfo),
"targetId": infoId, // 项目 路径图 id
"taskId": id,
"type": 1, // 1 项目 2 路径图
"voteId": dataInfo.value.voteId
"type": btype, // 1 项目 2 路径图
"voteId": state.dataInfo.voteId
}
console.log('我是投票提交的信息', obj)
useRequest(VOTE_DETAIL_SUBMIT,obj,(e)=>{
console.log(e)
request(VOTE_DETAIL2, {
"chapterOrStageId": chapterOrStageId ? chapterOrStageId : 0,
"courseId": courseId,
"studentId": userInfo.value.id,
"targetId": infoId,
"type": btype
}).then(res=>{
console.log(res)
ElMessage.success("投票成功")
state.dataInfo = res.data
}).catch(err=>{
console.log(err)
});
})
};
</script>

View File

@@ -526,6 +526,23 @@ function toFinish(d, sName, chapterOrStageId) {
stageOrChapterId: chapterOrStageId,
taskId: d.projectTaskId,
});
// 此处判断外链跳转详情界面
if(d.type==7){
router.push({
path: '/outerchain',
query: {
id: d.projectTaskId,
type: PROJECT,
infoId: data.value.projectId,
courseId: d.courseId,
pName: data.value.name,
sName,
chapterOrStageId,
exname: d.name, // 外链名称
},
});
return
}
}
if (typeof types.value.path[d.type] === "string") {
@@ -544,6 +561,7 @@ function toFinish(d, sName, chapterOrStageId) {
pName: data.value.name,
sName,
chapterOrStageId,
btype: 1
},
});
} else if (typeof types.value.path[d.type] === "function") {

View File

@@ -467,6 +467,24 @@ function toFinish(d) {
stageOrChapterId: data.value.currentStageId,
taskId: d.routerTaskId,
});
// 此处判断外链跳转详情界面
if(d.type==7){
router.push({
path: '/outerchain',
query: {
id: d.routerTaskId,
type: ROUTER,
infoId: routerId,
courseId: d.courseId,
pName: data.value.name,
sName: data.value.currentStageName,
chapterOrStageId: data.value.currentStageId,
exname: d.name, // 外链名称
},
});
return
}
}
if (typeof types.value.path[d.type] === "string") {
types.value.path[d.type] &&
@@ -483,7 +501,8 @@ function toFinish(d) {
courseId: d.courseId,
pName: data.value.name,
sName: data.value.currentStageName,
chapterOrStageId: data.value.currentStageId
chapterOrStageId: data.value.currentStageId,
btype: 2
},
});
} else if (typeof types.value.path[d.type] === "function") {

View File

@@ -0,0 +1,598 @@
<template>
<div class="moreactive" style="padding: 30px">
<!-- 面包屑导航 -->
<div class="crumb">
<div>{{ pName }}</div>
<div style="margin-left: 6px; margin-right: 6px">/</div>
<div>{{ sName }}</div>
<div style="margin-left: 6px; margin-right: 6px">/</div>
<div style="font-weight: 700; font-size: 16px">外链详情</div>
<!--
<div class="preNext">
<button class="btn btn01"></button>
<span class="content" style="margin-left: 6px">上一个</span>
<span class="content" style="margin-left: 31px">下一个</span>
<button class="btn btn02" style="margin-left: 6px"></button>
</div>
-->
<div class="return">
<div style="display: flex" @click="returnclick">
<el-button style="color:#0073FB"> <img class="img2" style="margin-right:11px;cursor: pointer;" src="../../assets/image/return.png" />返回</el-button>
</div>
</div>
</div>
<!-- 面包屑导航 -->
<!-- <div class="debateTitle">考试{{ dataInfo?.voteName }}</div> -->
<!-- 详细信息 -->
<div class="detailinfo">
<div class="detail">
<div class="detailT">
<div class="left">
<div class="debateTitle" style="color:rgba(51, 51, 51, 1);font-size:20px;margin-top:46px;">外链{{ exname }}</div>
<div style="display: flex;justify-content: space-between;align-items: center;">
<div class="title">
<img
style="width: 20px; height: 20px"
src="../../assets/image/yuan.png"
/>
<div class="text">链接网址</div>
<div class="box"></div>
</div>
<div class="">
<button class="tijiao" @click="handleClick(state.datainfo.linkAddress)">查看</button>
</div>
</div>
<div class="all" style="font-size:14px;color:rgba(51, 51, 48, 1);">
{{ state.datainfo.linkAddress ? state.datainfo.linkAddress : "-" }}
</div>
</div>
</div>
<div class="detailT" style="margin-top:20px;height:671px;">
<div class="left">
<div class="title">
<img
style="width: 20px; height: 20px"
src="../../assets/image/yuan.png"
/>
<div class="text">链接说明</div>
<div class="box"></div>
</div>
<!-- <div style="display: flex; align-items: center"></div> -->
<div class="all" style="font-size:14px;color:rgba(51, 51, 48, 1);">
<div>
{{ state.datainfo.linkDescription ? state.datainfo.linkDescription : "暂无链接说明" }}
</div>
</div>
</div>
</div>
</div>
</div>
<!-- 详细信息 -->
</div>
</template>
<script setup>
import {useRequest, request} from "@/api/request";
import {
LINKGETONE
} from "@/api/api";
import {reactive} from "vue";
import {useRoute,useRouter} from "vue-router/dist/vue-router";
const {
query: {courseId, pName, sName, chapterOrStageId, infoId, id, exname},
} = useRoute();
const router = useRouter();
const returnclick = () => {
router.back();
};
const state = reactive({
datainfo: {}
})
//获取基本信息
request(LINKGETONE, {linkId:courseId}).then(res=>{
console.log(res)
state.datainfo = res.data
}).catch(err=>{
console.log(err)
});
console.log('我是获取的外链基本信息', state.dataInfo)
// 查看外链
const handleClick = (url) => {
window.open(url);
}
</script>
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style scoped lang="scss">
.tijiao {
z-index: 999;
cursor: pointer;
margin-top: 22px;
margin-right: 40px;
width: 33px;
height: 16px;
font-size: 16px;
font-weight: 800;
color: #ffffff;
line-height: 24px;
border: 0;
background-color: #fff;
width: 162px;
height: 62px;
background-image: url("../../assets/image/tijiao.png");
}
.clearfix:before,
.clearfix:after {
content: "";
display: table;
clear: both;
}
.moreactive {
.crumb {
color: #fff;
display: flex;
font-size: 14px;
line-height: 24px;
position: relative;
}
.return{
position: absolute;
right: 10%;
.text{
text-align: center;
display: flex;
flex-direction: row;
align-items: center;
}
}
.preNext {
position: absolute;
right: 0px;
.content {
font-size: 14px;
color: #fff;
width: 43px;
height: 14px;
display: inline-block;
position: relative;
top: -6px;
cursor: pointer;
}
.btn {
width: 23px;
height: 23px;
border-radius: 50%;
border: 0;
cursor: pointer;
}
.btn01 {
background-image: url("../../assets/image/prev.png");
}
.btn02 {
background-image: url("../../assets/image/next.png");
}
}
.debateTitle {
margin-top: 15px;
font-size: 20px;
line-height: 24px;
height: 24px;
font-weight: 600;
color: #fff;
margin-left: -10px;
}
.detailinfo {
width: 100%;
margin-top: 20px;
display: flex;
.detail {
flex: 1;
// margin-right: 20px;
.detailT {
min-height: 95px;
background: #ffffff;
border-radius: 8px;
color: rgba(51, 51, 51, 1);
display: flex;
padding-bottom: 20px;
.left {
margin-left: 48px;
flex: 1;
}
.right {
width: 417px;
margin-right: 48px;
.righttitle {
display: flex;
padding-top: 39px;
position: relative;
.text {
margin-left: 8px;
font-size: 16px;
color: rgba(51, 51, 51, 1);
font-weight: 800;
}
.box {
width: 75px;
height: 10px;
background-color: rgba(36, 120, 255, 0.15);
position: absolute;
left: 23px;
top: 53px;
}
}
.timebox {
width: 417px;
height: 149px;
background: linear-gradient(90deg, #b6c6e1 0%, #89aed6 100%);
border-radius: 4px;
margin-top: 42px;
}
.innertime {
margin-top: 17px;
margin-left: 55px;
font-size: 14px;
font-weight: 500;
color: #ffffff;
line-height: 24px;
}
.endtime {
margin-left: 10px;
margin-top: 16px;
width: 397px;
height: 81px;
background: #f2f5f7;
border-radius: 0px 8px 0px 8px;
.endtimetext {
margin-top: 25px;
margin-left: 46px;
.te {
font-size: 28px;
font-weight: 800;
color: #4a9cf8;
line-height: 24px;
}
}
}
.explain {
margin-top: 30px;
width: 416px;
padding-bottom: 50px;
background: #f2f5f7;
border-radius: 8px;
}
.explaincontent {
width: 368px;
font-size: 16px;
font-weight: 500;
color: #333330;
line-height: 24px;
margin-left: 24px;
margin-top: 47px;
}
}
.title {
display: flex;
align-items: center;
padding-top: 39px;
position: relative;
}
.title .text {
margin-left: 8px;
font-size: 16px;
color: rgba(51, 51, 51, 1);
font-weight: 800;
}
.title .box {
width: 75px;
height: 10px;
background-color: rgba(36, 120, 255, 0.15);
position: absolute;
left: 23px;
top: 53px;
}
.all {
display: flex;
justify-content: space-between;
// width: 1280px;
margin-right: 48px;
margin-top: 43px;
.allbox1 {
margin-right: 22px;
background: linear-gradient(
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%
);
}
.allbox3 {
background: linear-gradient(
0deg,
rgba(195, 209, 234, 0) 0%,
rgba(191, 206, 231, 0.2) 100%
);
}
.item {
// width: 410px;
width: calc(100% - 44px);
height: 149px;
text-align: center;
border-radius: 4px;
.item1 {
color: #089dff;
font-size: 24px;
font-weight: bold;
margin-top: 36px;
}
.item2 {
color: #333330;
font-size: 14px;
margin-top: 29px;
}
}
}
.join {
// width: 1280px;
margin-right: 48px;
// min-height: 408px;
// background: #f5f6f7;
// border-radius: 8px;
margin-top: 32px;
margin-left: 21px;
flex: 1;
.stem {
display: flex;
font-size: 16px;
font-weight: 500;
color: #333330;
line-height: 38px;
}
.options {
display: flex;
align-items: center;
flex-wrap: wrap;
}
.radio {
margin-top: 14px;
margin-left: -16px;
position: relative;
}
.radio label {
line-height: 20px;
position: relative;
display: flex;
align-items: center;
font-weight: normal;
.opt-text {
font-size: 14px;
font-weight: bold;
color: #333330;
line-height: 18px;
margin-left: 10px;
}
}
.radio .option {
width: 19px;
height: 18px;
// position: absolute;
// top: 1px;
// // top: 32px;
// left: 0px;
background-size: cover;
background: url(../../assets/image/noselect.png) no-repeat;
background-size: cover;
}
.radio input[type="radio"] {
display: inline-block;
margin-right: -3px;
opacity: 0;
}
.radio input[type="radio"]:checked + div {
background: url(../../assets/image/select.png) no-repeat;
background-size: cover;
}
.imgcontent {
display: flex;
.imgone {
width: 140px;
height: 140px;
border-radius: 8px;
background-image: url(../../assets/image/px.png);
background-size: 100% 100%;
background-position: center;
}
}
.ontitle {
margin-top: 27px;
font-size: 14px;
color: #333330;
}
}
}
.detailB {
min-height: 363px;
background: #ffffff;
border-radius: 8px;
margin-top: 20px;
.el-tabs__item {
height: 69px;
padding: 25px 7px 0px 52px;
font-size: 14px;
font-weight: 500;
}
.el-tabs__nav-wrap::after {
background-color: rgba(56, 125, 247, 0.2);
}
.enclosure {
height: 89px;
margin-left: 51px;
margin-right: 40px;
// border-bottom: 1px solid rgba(56, 125, 247, 0.2);
display: flex;
justify-content: space-between;
align-items: center;
.enclosureL {
display: flex;
align-items: center;
font-size: 14px;
font-weight: 400;
color: #677d86;
line-height: 24px;
}
.download {
display: flex;
align-items: center;
font-size: 16px;
font-weight: 400;
color: #2478ff;
line-height: 24px;
cursor: pointer;
}
}
.work {
margin-left: 51px;
margin-right: 40px;
display: flex;
justify-content: space-between;
align-items: center;
margin-top: 37px;
}
.work .question {
font-size: 14px;
font-weight: 500;
color: #333330;
line-height: 18px;
}
.work .active {
width: 82px;
height: 28px;
background: linear-gradient(90deg, #a5d4e0 0%, #b4dce6 100%);
border-radius: 4px;
font-size: 14px;
font-weight: 500;
color: #ffffff;
line-height: 24px;
display: flex;
align-items: center;
justify-content: center;
cursor: pointer;
margin-right: 11px;
}
.work .unactive {
width: 80px;
height: 26px;
border: 1px solid #a5d4e0;
border-radius: 4px;
font-size: 14px;
font-weight: 500;
color: #a5d4e0;
line-height: 24px;
display: flex;
align-items: center;
justify-content: center;
margin-right: 11px;
cursor: pointer;
}
.work .btncolor {
background: linear-gradient(90deg, #84aad2 0%, #a4c5e9 100%);
}
.work .bordercolor {
border: 1px solid #85aad2;
}
.work .fontcolor {
color: rgba(133, 170, 210, 1);
}
.work .submit {
width: 126px;
height: 46px;
background: #2478ff;
box-shadow: 0px 1px 8px 0px rgba(56, 125, 247, 0.7);
border-radius: 4px;
font-size: 16px;
font-weight: 800;
color: #ffffff;
line-height: 24px;
display: flex;
align-items: center;
justify-content: center;
cursor: pointer;
}
}
}
}
}
</style>

View File

@@ -99,6 +99,9 @@ export default defineConfig(({ command, mode }) =>
},'/external/exam/queryExternalExam': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
},'/link/getOne': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
},
}
}