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

TEAMModelOS/ClientApp/src/assets/student-web/component_styles/vote.css

@@ -1,16 +1,14 @@
 .vote .checkAnswer {
-  display: flex;
-  width:100%;
-  margin-top: 20px;
-  margin-left: 0px;
+    display: inline-flex;
+    min-width:100px;
+    margin-top: 15px;
+    margin-right:20px;
 }
 .vote .checkAnswer .testBtn {
   margin: 10px 0px;
   position: relative;
   z-index: 2;
-  width:50%;
   font-weight: bolder;
-  padding-left: 20px;
   cursor: pointer;
 }
 .vote .checkAnswer .testBtn input[type="checkbox"] {
@@ -44,7 +42,7 @@
     .vote  .vote-title {
         width: 100%;
         /*display: flex;*/
-    }
+}
     .vote .vote-title .title-rect-group{
         display:flex;
     }

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

@@ -39,26 +39,25 @@
                 </div>
                 <!--和評測模組一樣-->
                 <div class="question-box"><span v-html="voteInfo.description"></span></div>
-                <div class="checkAnswer">
-                    <label class="testBtn"
-                           v-for="(item, index) in voteInfo.options"
-                           :key="index">
-                        <input type="checkbox" :value="item" v-model="voteChecked" @click="getVote(item)" />
-                        <div class="testbg">
-                            <div class="vote-info">
-                                <span style="display:flex;margin-right:5px">{{item.code}}.<span v-html="item.value"></span></span>
+                <div>
+                    <div class="checkAnswer"  v-for="(item, index) in voteInfo.options" :key="index">
+                        <label class="testBtn">
+                            <input type="checkbox" :value="item" v-model="voteChecked" @click="getVote(item)" />
+                            <div class="testbg">
+                                <div class="vote-info">
+                                    <span style="display:flex;margin-right:5px">{{item.code}}.<span v-html="item.value"></span></span>
+                                </div>
+                                <InputNumber v-model="item.count"
+                                             :formatter="value => `${value}` +$t('studentWeb.vote.tickets')"
+                                             :parser="value => value.replace($t('studentWeb.vote.tickets'), '')"
+                                             :min="0"
+                                             v-if="voteInfo.repeat"
+                                             @on-change="setVoteNum(item)"
+                                             :disabled="!voteStatus">
+                                </InputNumber>
                             </div>
-                            <InputNumber v-model="item.count"
-                                         :formatter="value => `${value}` +$t('studentWeb.vote.tickets')"
-                                         :parser="value => value.replace($t('studentWeb.vote.tickets'), '')"
-                                         :min="0"
-                                         v-if="voteInfo.repeat"
-                                         @on-change="setVoteNum(item)"
-                                         :disabled="!voteStatus"
-                                         >
-                            </InputNumber>
-                        </div>
-                    </label>
+                        </label>
+                    </div>
                 </div>
                 <Button :disabled="!isVote" size="large" type="success" @click="submitMessage()">
                     <svg-icon icon-class="vote" class="uploadBtn-icon" />

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

@@ -26,21 +26,31 @@
                             <div @click="sentEventStatus('all')">
                                 <DropdownItem>{{ $t("studentWeb.event.allStatus") }}</DropdownItem>
                             </div>
-                            <div @click="sentEventStatus('unFinsish')">
+                            <div @click="sentEventStatus('going')">
                                 <DropdownItem>{{ $t("studentWeb.event.unFinished") }}</DropdownItem>
                             </div>
                             <div @click="sentEventStatus('finish')">
                                 <DropdownItem>{{ $t("studentWeb.event.Fineshed") }}</DropdownItem>
                             </div>
-                            <div @click="sentEventStatus('overTime')">
-                                <DropdownItem>{{ $t("studentWeb.event.Timeout") }}</DropdownItem>
+                            <Dropdown placement="right-start">
+                                <DropdownItem>
+                                    时间选择
+                                    <Icon type="ios-arrow-forward"></Icon>
+                                </DropdownItem>
+                                <DropdownMenu slot="list">
+                                    <DropdownItem>学期</DropdownItem>
+                                    <DropdownItem>学年</DropdownItem>
+                                </DropdownMenu>
+                            </Dropdown>
+                            <!--<div @click="sentEventStatus('finish')">
+                                <DropdownItem divided>当月</DropdownItem>
                             </div>
-                            <div @click="sentEventStatus('reExam')">
-                                <DropdownItem divided>{{ $t("studentWeb.event.makeupExam") }}</DropdownItem>
-                            </div>
-                            <div @click="sentEventStatus('reMake')">
-                                <DropdownItem>{{ $t("studentWeb.event.makeupHw") }}</DropdownItem>
+                            <div @click="sentEventStatus('finish')">
+                                <DropdownItem>学期</DropdownItem>
                             </div>
+                            <div @click="sentEventStatus('finish')">
+                                <DropdownItem>学年</DropdownItem>
+                            </div>-->
                         </DropdownMenu>
                     </Dropdown>
                 </div>
@@ -179,6 +189,28 @@
                         iconClass: "quesnaire",
                     },
                 ],
+                activityType: [
+                    {
+                        type: "all",
+                        status:"所有活动状态"
+                    },
+                    {
+                        type: "going",
+                        status:"进行中"
+                    },
+                    {
+                        type: "finish",
+                        status:"已完成"
+                    },
+                    //{
+                    //    type: "all",
+                    //    status:"所有活动状态"
+                    //},
+                    //{
+                    //    type: "all",
+                    //    status:"所有活动状态"
+                    //},
+                ],
                 mockdata: "",
                 eventPageType: ["preview", "exam", "homeWork", "vote", "survey"], //本頁出現的類型
                 openSearch: false, //打開搜尋器
@@ -288,12 +320,10 @@
                 var y = 0;
                 if (!e) var e = window.event;
                 if (e.pageX || e.pageY) {
-                    x =
-                        e.pageX -
+                    x = e.pageX -
                         document.documentElement.scrollLeft -
                         document.body.scrollLeft;
-                    y =
-                        e.pageY -
+                    y = e.pageY -
                         document.documentElement.scrollTop -
                         document.body.scrollTop;
                 } else if (e.clientX || e.clientY) {
@@ -372,6 +402,7 @@
             },
             //下拉数据筛选
             dropDownShowCondition(status, item) {
+                console.log(status,item)
                 if (status == "reMake") {
                     this.hideIconbtn = true;
                     return (
@@ -390,9 +421,15 @@
                         item.isDone == false
                     );
                 } else if (status == "unFinish") {
+                    return (
+                        item.progress == "going"
+                    );
                     this.hideIconbtn = false;
                     return item.isDone == false;
                 } else if (status == "finish") {
+                    return (
+                        item.progress == "finish"
+                    );
                     this.hideIconbtn = false;
                     return item.isDone == true;
                 } else if (status == "overTime") {