feat:增加投票选项图片

This commit is contained in:
lixg
2023-02-09 15:45:07 +08:00
parent 160204d715
commit fd9c4c31c6
4 changed files with 41 additions and 28 deletions

View File

@@ -101,11 +101,23 @@
:key="key" :key="key"
> >
<div class="left"> <div class="left">
<div style="display: flex; align-items: center">
<img
class="leftimg"
src="../../assets/image/ballotpage/left.png"
/>
<div class="leftcontent">{{ elem.optionName }}</div>
</div>
<img <img
class="leftimg" v-if="elem.optionPictureAddress"
src="../../assets/image/ballotpage/left.png" :src="elem.optionPictureAddress"
style="
width: 70px;
height: 70px;
margin-left: 20px;
margin-top: 10px;
"
/> />
<div class="leftcontent">{{ elem.optionName }}</div>
</div> </div>
<button <button
class="btn" class="btn"
@@ -469,21 +481,21 @@ const submitVote = () => {
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
border-bottom: 1px solid rgba(241, 242, 243, 1); border-bottom: 1px solid rgba(241, 242, 243, 1);
height: 50px; padding-bottom: 13px;
.left { .left {
display: flex; display: flex;
flex-direction: column;
.leftimg { .leftimg {
width: 4.5px; width: 4.5px;
height: 14.5px; height: 14.5px;
margin-top: 1px; // margin-top: 1px;
} }
.leftcontent { .leftcontent {
margin-left: 9px; margin-left: 9px;
color: #6e7b84; color: #6e7b84;
font-size: 13px; font-size: 13px;
line-height: 30px; line-height: 30px;
margin-top: -5px; // margin-top: -5px;
} }
} }
.btn { .btn {

View File

@@ -68,29 +68,26 @@
v-for="(el, index) in data?.taskBoList" v-for="(el, index) in data?.taskBoList"
:key="index" :key="index"
> >
<div> <div style="width: calc(100% - 80px)">
<div class="issue"> <div class="issue">
{{ el.name }} {{ el.name }}
</div> </div>
<div class="coursetag"> <div class="coursetag">
<div <div
class="tag1" class="tag1"
style="margin-right: 11px; margin-top: 16px" style="margin-right: 11px; margin-top: 3px"
v-if="el.flag" v-if="el.flag"
> >
必修 必修
</div> </div>
<div <div
class="tag2" class="tag2"
style="margin-right: 11px; margin-top: 16px" style="margin-right: 11px; margin-top: 3px"
v-if="!el.flag" v-if="!el.flag"
> >
选修 选修
</div> </div>
<div <div class="tag3" style="margin-right: 11px; margin-top: 3px">
class="tag3"
style="margin-right: 11px; margin-top: 16px"
>
{{ types.typeName[el.type] || "" }} {{ types.typeName[el.type] || "" }}
</div> </div>
</div> </div>
@@ -702,10 +699,12 @@ function toFinish(d) {
.issue { .issue {
width: 100%; width: 100%;
display: flex;
font-size: 13px; font-size: 13px;
line-height: 30.29px; line-height: 30.29px;
color: rgba(110, 123, 132, 1); color: rgba(110, 123, 132, 1);
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
} }
.coursetag { .coursetag {
display: flex; display: flex;

View File

@@ -2,7 +2,7 @@
* @Author: lixg lixg@dongwu-inc.com * @Author: lixg lixg@dongwu-inc.com
* @Date: 2023-01-19 11:28:11 * @Date: 2023-01-19 11:28:11
* @LastEditors: lixg lixg@dongwu-inc.com * @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2023-02-08 09:57:37 * @LastEditTime: 2023-02-09 10:20:19
* @FilePath: /stu_h5/src/views/projectdetails/ProjectPath.vue * @FilePath: /stu_h5/src/views/projectdetails/ProjectPath.vue
* @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
--> -->
@@ -179,14 +179,14 @@ const handleClick = (tab, event) => {
console.log("selectTab", selectTab.value); console.log("selectTab", selectTab.value);
}; };
const goDetails = () => { const goDetails = () => {
// router.push({
// path: "/pathmappage",
// query: { routerId: 290 },
// });
router.push({ router.push({
path: "/projectdetails", path: "/pathmappage",
query: { projectId: 485 }, query: { routerId: 290 },
}); });
// router.push({
// path: "/projectdetails",
// query: { projectId: 485 },
// });
}; };
</script> </script>

View File

@@ -86,28 +86,28 @@
v-for="(el, index) in item.taskProcessList" v-for="(el, index) in item.taskProcessList"
:key="index" :key="index"
> >
<div> <div style="width: calc(100% - 80px)">
<div class="issue"> <div class="issue">
{{ el.name }} {{ el.name }}
</div> </div>
<div class="coursetag"> <div class="coursetag">
<div <div
class="tag1" class="tag1"
style="margin-right: 11px; margin-top: 16px" style="margin-right: 11px; margin-top: 3px"
v-if="el.flag" v-if="el.flag"
> >
必修 必修
</div> </div>
<div <div
class="tag2" class="tag2"
style="margin-right: 11px; margin-top: 16px" style="margin-right: 11px; margin-top: 3px"
v-if="!el.flag" v-if="!el.flag"
> >
选修 选修
</div> </div>
<div <div
class="tag3" class="tag3"
style="margin-right: 11px; margin-top: 16px" style="margin-right: 11px; margin-top: 3px"
> >
{{ types.typeName[el.type] || "" }} {{ types.typeName[el.type] || "" }}
</div> </div>
@@ -396,7 +396,7 @@ function toFinish(d, sName, chapterOrStageId) {
ElMessage.error("暂时未开放"); ElMessage.error("暂时未开放");
return; return;
} }
if (d.type == 3 || d.type == 7) { if (d.type == 3) {
d.status !== 1 && d.status !== 1 &&
request(STUDY_RECORD, { request(STUDY_RECORD, {
studentId: data.value.userInfoBo.userId, studentId: data.value.userInfoBo.userId,
@@ -809,10 +809,12 @@ const queryAllStatus = (data) => {
.issue { .issue {
width: 100%; width: 100%;
display: flex;
font-size: 13px; font-size: 13px;
line-height: 30.29px; line-height: 30.29px;
color: rgba(110, 123, 132, 1); color: rgba(110, 123, 132, 1);
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
} }
.coursetag { .coursetag {
display: flex; display: flex;