Merge branch 'master' of http://106.12.23.251:10080/CDHABOOK/TEAMModelOS

TEAMModelOS.SmartClass/ClientApp/view/smart-class/ReviewActivity.vue

@@ -56,7 +56,7 @@
       },
 
       goDetails() {
-        this.$router.push('/activityDetails')
+        this.$router.push('activityDetails')
       }
 
 

TEAMModelOS.SmartClass/ClientApp/view/smart-class/notice.vue

@@ -19,7 +19,7 @@
     <div class="right-box center-col">
       <p class="title">{{typeName}}</p>
       <Table :columns="newColumns" :data="noticeList" @on-row-click="rowClick" no-data-text="暂无数据"></Table>
-      <Page :total="50" show-elevator show-total />
+      <Page :total="noticeList.length" show-elevator show-total />
     </div>
   </div>
 
@@ -44,12 +44,12 @@
             key: 'startTime'
           }
         ],
-        noticeList: []
+        noticeList: noticeList.list
       }
     },
 
     created() {
-      this.getList(1);
+      this.getList(0);
     },
     methods: {
       getList(type) {
@@ -57,7 +57,7 @@
         var newArray = list.filter(function(item){
             return item.noticeTypeId == type;
         });
-        this.noticeList = newArray;
+        this.noticeList = type==0 ? list : newArray;
       },
 
       handleMenuClick(index,typeId,name) {
@@ -68,7 +68,7 @@
 
       rowClick(data) {
         this.$router.push({
-          path:'/noticeDetails',
+          path:'noticeDetails',
           query:{
             id:data.id
           }