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/EventContent.vue

@@ -1,5 +1,6 @@
 <template>
-    <div class="event-content">
+    <!-- <div class="event-content"> -->
+    <div class="eventContentArea-view">
         <!--<VoteHint v-if="this.$store.getters.getisVoteResulthover==true"/>-->
         <div v-if="getIsSelectedNow">
 
@@ -34,7 +35,7 @@
     import PaperView from "./EventContentTypeTemplate/PaperView";
     import VoteHint from "./EventContentTypeTemplate/VoteHint";
     import QuesNaire from "./EventContentTypeTemplate/QuesNaire";
-import { mapGetters } from 'vuex';
+    import { mapGetters } from 'vuex';
     export default {
         name: "EventContent",
         components: {
@@ -62,5 +63,6 @@ import { mapGetters } from 'vuex';
     };
 </script>
 
-<style>
+<style scoped>
+@import "EventContentArea.css";
 </style>

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

@@ -163,12 +163,43 @@
                             }
                             this.opentestWithSubject(this.paperData[0])
                         } else {
-                            this.$Message.warning('试卷已删除！')
+                            // this.$Message.warning('试卷已删除！')
+                            this.$Modal.confirm({
+                                title: "评测已被删除，是否删除此条记录？",
+                                okText: "删除",
+                                cancelText: "取消",
+                                onOk: () => {
+                                    this.delActivity()
+                                }
+                            })
                         }
                     })
                 }
                 this.isLoad = false
             },
+            // 删除不存在的问卷
+            delActivity() {
+                let roles = ""
+                if(this.$store.state.userInfo.roles.indexOf('student') > -1) {
+                    roles = 'student'
+                } else {
+                    roles = 'taecher'
+                }
+                let param = {
+                    'id': this.getItemTitle.id,
+                    'code': this.getItemTitle.code,
+                    "role": roles
+                }
+                this.$api.studentWeb.delActivity(param).then(res => {
+                    if(res) {
+						if(res.status == 200) {
+							this.$Message.success('评测已删除！')
+							this.$EventBus.$emit('delNotFound', this.getItemTitle.id)
+                            this.$store.commit("ChangeItemName", {})
+						}
+					}
+                })
+            },
             opentestWithSubject(item) {
                 if (item !== undefined) {
                     this.getPaper(item)

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

@@ -242,7 +242,15 @@ import { mapGetters } from 'vuex';
 						this.$api.studentWeb.getSurveyInfo(params).then(async res => {
 							if (res) {
 								if(res.status == 404) {
-									this.delActivity()
+									this.isLoad = false
+									this.$Modal.confirm({
+										title: "问卷已被删除，是否删除此条记录？",
+										okText: "删除",
+										cancelText: "取消",
+										onOk: () => {
+											this.delActivity()
+										}
+									})
 								} else if(res.status == 200) {
 									this.surveyInfo = res.survey
 									this.surveyInfo.items = await this.getBlobItems(res.survey)
@@ -263,15 +271,23 @@ import { mapGetters } from 'vuex';
 			},
 			// 删除不存在的问卷
             delActivity() {
+                let roles = ""
+                if(this.$store.state.userInfo.roles.indexOf('student') > -1) {
+                    roles = 'student'
+                } else {
+                    roles = 'taecher'
+                }
                 let param = {
                     'id': this.getItemTitle.id,
                     'code': this.getItemTitle.code,
-                    "role": "teacher"
+                    "role": roles
                 }
                 this.$api.studentWeb.delActivity(param).then(res => {
                     if(res) {
-						if(res.status == 500) {
-							this.$Message.warning('问卷已删除！')
+						if(res.status == 200) {
+							this.$Message.success('问卷已删除！')
+							this.$EventBus.$emit('delNotFound', this.getItemTitle.id)
+							this.$store.commit("ChangeItemName", {})
 						}
 					}
                 }).finally(()=>{

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

@@ -235,15 +235,23 @@
             },
             // 删除不存在的投票
             delActivity() {
+                let roles = ""
+                if(this.$store.state.userInfo.roles.indexOf('student') > -1) {
+                    roles = 'student'
+                } else {
+                    roles = 'taecher'
+                }
                 let param = {
                     'id': this.getItemTitle.id,
                     'code': this.getItemTitle.code,
-                    "role": "teacher"
+                    "role": roles
                 }
                 this.$api.studentWeb.delActivity(param).then(res => {
                     if(res) {
-                        if(res.status == 500) {
-                            this.$Message.warning('投票已删除！')
+                        if(res.status == 200) {
+                            this.$Message.success('投票已删除！')
+                            this.$EventBus.$emit('delNotFound', this.getItemTitle.id)
+                            this.$store.commit("ChangeItemName", {})
                         }
                     }
                 }).finally(()=>{

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

@@ -216,7 +216,12 @@ import { mapGetters, mapState } from 'vuex';
     import PreviewProgressPie from "../EventView/PreviewProgressPie";
     export default {
         name: "EventList",
-        mounted() { 
+        mounted() {
+            this.$EventBus.$off('delNotFound')
+            this.$EventBus.$on('delNotFound', id => {
+                console.log(id);
+                this.delListData(id)
+            })
             this.getActivityInfo()
             this.selectedCondition(this.getItemTitle);
             if (this.getIsSelectedNow == false) {
@@ -524,6 +529,18 @@ import { mapGetters, mapState } from 'vuex';
                     return true;
                 } else return false;
             },
+            // 删除页面上不不存在的数据
+            delListData(id) {
+                if(this.eventList) {
+                    for(let i = 0; i < this.eventList.length; i++) {
+                        if(this.eventList[i].id == id) {
+                            this.eventList.splice(i, 1)
+                            break
+                        }
+                    }
+                    this.predealMockdatafirstItem()
+                }
+            },
 
             /* =======未调用======== */
             //取得目前滑鼠座標

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

@@ -1,7 +1,8 @@
 <template>
     <div class="event-view">
         <EventList :class="{ 'hide-sidebars': getSidebarisOpen == false}"></EventList>
-        <EventContentArea :class="{'eventContentArea-Span': getSidebarisOpen == false}"></EventContentArea>
+        <!-- <EventContentArea :class="{'eventContentArea-Span': getSidebarisOpen == false}"></EventContentArea> -->
+        <EventContent :class="{'eventContentArea-Span': getSidebarisOpen == false}"></EventContent>
         <!--<CommentList v-if=" $store.getters.getOpenCommentList == true && getSidebarisOpen == false" />-->
     </div>
 </template>
@@ -10,6 +11,7 @@
     import CommentList from "./CommentList.vue";
     import EventList from "./EventList";
     import EventContentArea from "./EventContentArea.vue";
+    import EventContent from "./EventContent.vue";
     import { mapGetters } from 'vuex';
     export default {
         name: "EventView",
@@ -17,6 +19,7 @@
             EventList,
             EventContentArea,
             CommentList,
+            EventContent,
         },
         data() {
             return {

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

@@ -299,7 +299,7 @@ export default {
 
     created() {
         (this.MyName = this.$t("studentWeb.homeView-title")),
-            this.$emit("onNavNo", this.MyNo)
+        this.$emit("onNavNo", this.MyNo)
         this.$emit("onNavName", this.MyName)
     },
     mounted() {