feat:合并

This commit is contained in:
lixg
2022-12-11 20:46:44 +08:00
parent 2ae27f7c75
commit 18e9c7781c
4 changed files with 100 additions and 61 deletions

View File

@@ -24,9 +24,9 @@
<div class="left">
<div class="title">
<img
width="20px"
height="20px"
src="../../assets/image/yuan.png"
width="20px"
height="20px"
src="../../assets/image/yuan.png"
/>
<div class="text">参与情况</div>
<div class="box"></div>
@@ -34,24 +34,30 @@
<!-- <div style="display: flex; align-items: center"></div> -->
<div class="all">
<div class="item allbox1">
<div class="item1" style="color: #089dff">{{ data.accessCnt }}</div>
<!-- <div class="item1" style="color: #089dff">
{{ data.accessCnt }}
</div> -->
<div class="item2">参与数</div>
</div>
<div class="item allbox2">
<div class="item1" style="color: #387df7">{{ data.voteCnt }}</div>
<!-- <div class="item1" style="color: #387df7">
{{ data.voteCnt }}
</div> -->
<div class="item2">总票数</div>
</div>
<div class="item allbox3">
<div class="item1" style="color: #00c6ff">{{ data.viewCnt }}</div>
<!-- <div class="item1" style="color: #00c6ff">
{{ data.viewCnt }}
</div> -->
<div class="item2">浏览数</div>
</div>
</div>
<div class="title">
<img
width="20px"
height="20px"
src="../../assets/image/yuan.png"
width="20px"
height="20px"
src="../../assets/image/yuan.png"
/>
<div class="text">参与投票</div>
<div class="box"></div>
@@ -65,23 +71,23 @@
<!-- todo #投票任务 参与投票下面这段文字是固定的么-->
<div class="ontitle">
通过对各级人员的软件平台培训使其能够了解如何运用乾元坤和智能信息管理系统来提升企业管理水平最大限度发挥软件产品在企业中的作用;
<br/>
<br/>
<br />
<br />
培训目标
<br/>
<br/>
<br />
<br />
1.使企业不同部门人员掌握便捷有效的系统平台操作方法;
<br/>
<br/>
<br />
<br />
2.通过系统平台的培训提高员工对企业的管理理念认识与提升
<br/>
<br/>
<br />
<br />
3.通过系统平台培训加强沟通统一部署协同工作提高效率
<br/>
<br/>
<br />
<br />
培训对象
<br/>
<br/>
<br />
<br />
集团领导各相关部门领导总经理车间主管车间操作员等;
</div>
</div>
@@ -89,40 +95,52 @@
<div class="right">
<div class="righttitle">
<img
width="20px"
height="20px"
src="../../assets/image/yuan.png"
width="20px"
height="20px"
src="../../assets/image/yuan.png"
/>
<div class="text">投票时间</div>
<div class="box"></div>
</div>
<div class="timebox clearfix">
<div class="innertime">
<!-- <div class="innertime">
{{
data.detail?.voteStartTime
}}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ data.detail?.voteEndTime }}
</div>
}}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{
data.detail?.voteEndTime
}}
</div> -->
<div class="endtime clearfix">
<div class="endtimetext">
距离结束还有&nbsp;&nbsp;
<span class="te">{{ parseInt(dayjs(data.detail?.voteEndTime).diff(dayjs(), 'minute') / 60) }}</span>&nbsp;&nbsp;
小时&nbsp;&nbsp;<span
class="te">{{ dayjs(data.detail?.voteEndTime).diff(dayjs(), 'minute') % 60 }}</span>&nbsp;&nbsp;分钟
<!-- <span class="te">{{
parseInt(
dayjs(data.detail?.voteEndTime).diff(dayjs(), "minute") /
60
)
}}</span
>&nbsp;&nbsp; 小时&nbsp;&nbsp;<span class="te">{{
dayjs(data.detail?.voteEndTime).diff(dayjs(), "minute") % 60
}}</span
>&nbsp;&nbsp;分钟 -->
</div>
</div>
</div>
<div class="righttitle">
<img
width="20px"
height="20px"
src="../../assets/image/yuan.png"
width="20px"
height="20px"
src="../../assets/image/yuan.png"
/>
<div class="text">投票说明</div>
<div class="box"></div>
</div>
<div class="explain clearfix">
<div class="explaincontent" v-html="data.detail?.voteExplain"></div>
<!-- <div
class="explaincontent"
v-html="data.detail?.voteExplain"
></div> -->
</div>
</div>
</div>
@@ -133,16 +151,22 @@
</template>
<script setup>
import {useRequest} from "@/api/request";
import {ROUTER_CHAPTER_LIST, ROUTER_LIST, TASK_VOTE_DETAIL} from "@/api/api";
import { useRequest } from "@/api/request";
import {
ROUTER_CHAPTER_LIST,
ROUTER_LIST,
TASK_VOTE_DETAIL,
VOTE_DETAIL2,
} from "@/api/api";
import dayjs from "dayjs";
const {data} = useRequest(TASK_VOTE_DETAIL, {})
// const { data } = useRequest(TASK_VOTE_DETAIL, {});
// console.log("datadatadata", data);
const { dataInfo } = useRequest(VOTE_DETAIL2, { ballotId: 3 });
console.log("dataInfo", dataInfo);
const handleClick = (tab, event) => {
console.log(tab, event);
};
</script>
<!-- Add "scoped" attribute to limit CSS to this component only -->
@@ -342,26 +366,26 @@ const handleClick = (tab, event) => {
.allbox1 {
margin-right: 22px;
background: linear-gradient(
0deg,
rgba(160, 193, 230, 0) 0%,
rgba(161, 195, 231, 0.2) 100%
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%
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%
0deg,
rgba(195, 209, 234, 0) 0%,
rgba(191, 206, 231, 0.2) 100%
);
}