Merge remote-tracking branch 'origin/dev' into dev

project/sass/apps/Announce/AppAnnounce/AppAnnounce.vue

@@ -35,7 +35,13 @@
     },
 
     mounted () {
-
+      console.log(this.$route)
+      if (this.$route.params.id) {
+        this.component = 'Detail'
+        this.params = {
+          id: this.$route.params.id
+        }
+      }
     },
 
     methods: {

project/sass/apps/Announce/AppAnnounceStatistics/AppAnnounceStatistics.vue

@@ -46,7 +46,7 @@
                     </div>
                     <div class="flex-between">
                       <div class="item-info">群发类型：<span>{{$dict.getLabel('mstSendType', item.sendType) || ''}}</span></div>
-                      <span class="item-btn">详情{{item.sendType}}</span>
+                      <span class="item-btn" @click="$router.push({name: '357e228ba8e64008ace90d095a7a0dd7', params: { id: item.id }})">详情{{item.sendType}}</span>
                     </div>
                   </el-card>
                 </el-timeline-item>
@@ -212,7 +212,7 @@
       this.getCalendarList(year, month)
       this.getEffect()
       this.getDepart()
-      this.dict.load('mstSendType') 
+      this.dict.load('mstSendType')
     },
     methods: {
       ...mapActions(['initOpenData', 'transCanvas']),
@@ -555,7 +555,7 @@
                 width: 70px;
               }
               .name{
-                width: calc(100% - 70px); 
+                width: calc(100% - 70px);
               }
             }
             .item-btn{