Merge branch 'develop3.0-tmd' of http://106.12.23.251:10080/TEAMMODEL/TEAMModelOS into develop3.0-tmd

TEAMModelOS/ClientApp/src/components/student-web/EventView/EventContentTypeTemplate/Vote.vue

@@ -184,13 +184,13 @@ export default {
                         "code": this.$store.getters.getItemTitle.scode,
                         "userid": this.$store.state.userInfo.sub
                     }
-                    console.log('777777', params)
                     this.$api.studentWeb.getVoteResult(params).then(res => {
                         if (res) {
-                            console.log('获取投票结果数据')
-                            console.log(res)
                             this.voteRes = res
-                            this.timeStatus(this.voteInfo, this.voteRes)
+                           
+                            if (this.timeStatus(this.voteInfo, this.voteRes)) {
+
+                            }
                             //this.voteInfo = res.vote
                         }
                     })
@@ -205,9 +205,7 @@ export default {
                     }
                     this.$api.studentWeb.getVoteInfo(params).then(res => {
                         if (res) {
-                            console.log('获取投票数据')
                             this.voteInfo = res.vote
-                            console.log(this.voteInfo)
                             this.getVoteResult()
                         }
                         })
@@ -220,7 +218,6 @@ export default {
                     this.voteChecked.length = 0
                     this.voteChecked.push(data)
                 }
-                console.log(this.voteChecked)
             },
             //获取当前时间状态
             getDates(day, type) {
@@ -235,14 +232,12 @@ export default {
             },
             //投票活动的时间状态 data投票活动信息  time 已投票数据
             timeStatus(data, time) {
-                console.log(data,time)
                 let date = (new Date()).getTime() //当前时间
                 let status = false //判断时间是否过期或处于当前时间段
                 //处于活动时间内
                 let inDate = new Date(date)
                 let year = inDate.getFullYear()
                 let month = inDate.getMonth()
-                console.log('时间判定测试')
                 if (data.startTime <= date <= data.endTime && time.records.length > 0) {
                     switch (data.times) {
                         case 'day':
@@ -322,36 +317,27 @@ export default {
                 }
             },
             submitMessage() {
-                console.log(this.voteInfo)
-                console.log(this.voteChecked)
                 this.clickbutnoChoose = false;
                 if (this.voteChecked.length) {
                     this.WarmMessageisOpen = true;
                     this.isFirstVoted = true;
-                    console.log(this.$store.getters.getItemTitle)
                     let params = {
-                        "id": this.$store.state.userInfo.sub,
-                        "code": this.$store.getters.getItemTitle.id,
+                        "id": this.$store.getters.getItemTitle.id,
+                        "code": this.$store.getters.getItemTitle.scode,
                         "option": {}
                     }
                     for (let item of this.voteChecked) {
                         params.option[item.code] = item.count
                     }
-                    console.log(params)
                     this.$api.studentWeb.sendVoteResult(params).then(res => {
-                        console.log(res)
-                        //if (res) {
-                        //    console.log('获取投票结果数据')
-                        //    console.log(res)
-                        //    this.voteRes = res
-                        //    this.timeStatus(this.voteInfo, this.voteRes)
-                        //    //this.voteInfo = res.vote
-                        //}
-                        setTimeout(() => {
-                            this.WarmMessageisOpen = false;
-                        }, 2000);
+                        if (res.msgid == 1) {
+                            setTimeout(() => {
+                                this.WarmMessageisOpen = false;
+                            }, 1000);
+                        } else {
+                            this.$Message.warning("投票失败，请检查投票信息！")
+                        }
                     })
-
                     //this.previewNext();
                     //加入下一個活動的提示框
                     //console.log(localStorage.getItem("hintNextItem")); //讀取是否顯示提示下一個
@@ -396,7 +382,6 @@ export default {
             },
             voteCount() {
                 if (this.voteInfo.voteNum !== undefined) {
-                    console.log('00000000000',this.voteInfo)
                     let num = 0
                     this.isOverCount = false
                     for (let item of this.voteInfo.options) {
@@ -424,16 +409,16 @@ export default {
                 deep: true
             },
 
-            listData: {
-                handler() {
-                    if (this.$store.getters.getItemTitle.id !== '') {
-                        console.log('88888888888')
-                        this.getVoteInfo()
-                    }
-                },
-                // 深度观察监听
-                deep: true
-            },
+            //listData: {
+            //    handler() {
+            //        if (this.$store.getters.getItemTitle.id !== '') {
+            //            console.log('88888888888')
+            //            this.getVoteInfo()
+            //        }
+            //    },
+            //    // 深度观察监听
+            //    deep: true
+            //},
         },
 };
 </script>

TEAMModelOS/ClientApp/src/view/questionnaire/ManageQuestionnaire.vue

@@ -437,7 +437,6 @@
 			/* 获取未作答学生清单 */
 			getNoFinishList(answerdList,allList){
 				let result = []
-				console.log(allList.map(i => i.id))
 				allList.forEach(i => {
 					if(!answerdList.includes(i.id)){
 						result.push(i)