Merge branch 'develop5.0-tmd' of http://106.12.23.251:10000/TEAMMODEL/TEAMModelOS into develop5.0-tmd

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

@@ -264,6 +264,8 @@
                                 }
                                 this.votesNum = res.vote.voteNum
                                 this.voteInfo = res.vote
+                                this.radioCheck = ""
+                                this.voteChecked = []
                                 if (res.vote.progress == "finish") {
                                     this.getVoteRecord()
                                     this.getVoteRes()

TEAMModelOS/ClientApp/src/components/student-web/EventView/EventList.vue

@@ -221,8 +221,15 @@ import { mapGetters, mapState } from 'vuex';
         },
         components: { PreviewProgressPie },
         watch: {
+            // 根据活动名称来搜索关键字
             search: function (value) {
-                let countfit = 0;
+                this.predealMockdatafirstItem()
+                let list = this.eventShow.filter(item => item.name.indexOf(value) >= 0)
+                if (!list.length) {
+                    this.isListNoItem = true;
+                }
+                this.eventShow = list
+                /* let countfit = 0;
                 for (let i = 0; i < this.eventList.length; i++) {
                     if (
                         this.eventPageType.includes(this.eventList[i].eventType) &&
@@ -246,7 +253,7 @@ import { mapGetters, mapState } from 'vuex';
                 }
                 if (countfit == 0 && value != "") {
                     this.isListNoItem = true;
-                } else this.isListNoItem = false;
+                } else this.isListNoItem = false; */
             },
         },
         computed: {

TEAMModelOS/ClientApp/src/components/student-web/HomeView/CourseList.vue

@@ -363,7 +363,7 @@ export default {
                                                 delete data.schedule
                                                 data.school = item.stuCourse.school
                                                 data.scope = item.stuCourse.scope
-                                                data.unique = 'person' + item.course.no + sch.time[m].week + sch.time[m].id + sI + m
+                                                data.unique = 'person' + item.course.no + sch.time[m].week + sch.time[m].id + sI + m + Math.floor(Math.random() * 10000)
                                                 personList.push(this.getNewClass(data, sch, m))
                                             }
                                         }
@@ -373,7 +373,7 @@ export default {
                                             delete datas.schedule
                                             datas.school = item.stuCourse.school
                                             datas.scope = item.stuCourse.scope
-                                            datas.unique = 'person' + item.course.no + "008" + "000" + sI + "-1"
+                                            datas.unique = 'person' + item.course.no + Math.floor(Math.random() * 100000000)
                                             datas.classId = sch.classId
                                             datas.room = sch.room
                                             datas.teacherId = sch.teacherId
@@ -411,7 +411,7 @@ export default {
                                                     delete data.schedule
                                                     data.school = item.stuCourse.school
                                                     data.scope = item.stuCourse.scope
-                                                    data.unique = 'person' + item.course.no + sch.time[m].week + sch.time[m].id + j + m
+                                                    data.unique = 'person' + item.course.no + sch.time[m].week + sch.time[m].id + j + m + Math.floor(Math.random() * 10000)
                                                     personList.push(this.getNewClass(data, sch, m))
                                                 }
                                             }
@@ -421,7 +421,7 @@ export default {
                                                 delete datas.schedule
                                                 datas.school = item.stuCourse.school
                                                 datas.scope = item.stuCourse.scope
-                                                datas.unique = 'person' + item.course.no + "008" + "000" + Math.round(Math.random()*10) + "-1"
+                                                datas.unique = 'person' + item.course.no + Math.floor(Math.random() * 100000000)
                                                 datas.classId = sch.classId
                                                 datas.room = sch.room
                                                 datas.teacherId = sch.teacherId
@@ -448,9 +448,6 @@ export default {
                             }
                         })
                     }
-                    
-                    console.log(fixList)
-                    console.log(personList)
                     this.fixList = fixList
                     this.personList = personList
                     this.getClassTime()