投票说明:
@@ -272,15 +327,23 @@ export default {
fileList: [],
voteCount: null,
projectTemplateId: null,
+
+ partakeNum: 0, //参与数
+ totalVoteNum: 0, //总票数
+ browseNum: 0, //浏览数
});
const closeDrawer = () => {
- (state.inputV1 = ""),
- (state.textV1 = ""),
- (state.time = undefined),
- (state.basevote = ""),
- (state.ballotId = ""),
- ctx.emit("update:addvoteVisible", false);
+ state.inputV1 = "";
+ state.textV1 = "";
+ state.time = undefined;
+ state.basevote = "";
+ state.ballotId = "";
+ ctx.emit("update:addvoteVisible", false);
ctx.emit("update:edit", false);
+
+ state.partakeNum = 0; //参与数
+ state.totalVoteNum = 0; //总票数
+ state.browseNum = 0; //浏览数
};
const afterVisibleChange = (bool) => {
if (props.edit && bool) {
@@ -337,6 +400,9 @@ export default {
dayjs(res.data.data.voteStartTime, "YYYY-MM-DD"),
dayjs(res.data.data.voteEndTime, "YYYY-MM-DD"),
];
+ state.totalVoteNum = res.data.data.votesTotal; //总票数
+ state.partakeNum = res.data.data.numberOfInvolved; //参与数
+ state.browseNum = res.data.data.numberOfBrowse; //浏览数
})
.catch((err) => {
console.log("获取投票信息失败", err);
@@ -411,9 +477,9 @@ export default {
message.destroy();
return message.warning("请输入直播时间");
}
- if (!state.basevote) {
- return message.warning("请上传投票基数");
- }
+ // if (!state.basevote) {
+ // return message.warning("请上传投票基数");
+ // }
if (state.time != undefined) {
state.startTime = dayjs(state.time[0]).format("YYYY-MM-DD");
state.endTime = dayjs(state.time[1]).format("YYYY-MM-DD");
@@ -427,6 +493,9 @@ export default {
ballotId: state.ballotId,
baseVote: state.basevote,
voteExplain: state.textV1,
+ votesTotal: state.totalVoteNum, //总票数
+ numberOfInvolved: state.partakeNum, //参与数
+ numberOfBrowse: state.browseNum, //浏览数
};
if (props.edit) {
api
@@ -469,7 +538,7 @@ export default {
};
function downloadTemplate() {
- window.open('/manageApi/投票基础数据模版.xlsx')
+ window.open("/manageApi/投票基础数据模版.xlsx");
}
return {
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index c17ff298..3b94f2cb 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -16,7 +16,16 @@
src="../../assets/images/leveladd/ma.png"
@click="showCodeModel2()"
/>
-
+

@@ -46,8 +55,8 @@
{{ act }}
@@ -55,7 +64,7 @@
@@ -73,7 +82,7 @@
@@ -5170,7 +5179,7 @@ export default {
.img2 {
width: 42px;
height: 42px;
- margin-right: 22px;
+ margin-right: 10px;
}
.pub {