振兴乡村首页

src/views/eventdetailsdialog.vue

@@ -213,11 +213,16 @@
                                 </el-button>
                               </div>
                               <div class="z-info-btm-input-btn" v-else-if="eventStatusValue=='forest_event_status_5'">
-                                <el-button size="small"
+                                <el-button size="small" v-if="eventType=='1'"
                                            icon="el-icon-success" style="text-align:left"
                                            @click="updateCentereventTEventcatalogueStatus('gd',false)">
                                   填报
                                 </el-button>
+                                <el-button size="small" v-else
+                                           icon="el-icon-success" style="text-align:left"
+                                           @click="updateCentereventTEventcatalogueStatus('gd',true)">
+                                  归档
+                                </el-button>
                                 <el-button size="small" icon="el-icon-chat-dot-square" @click="sendEventLog()">发送
                                 </el-button>
                               </div>
@@ -1182,7 +1187,9 @@ export default {
     }
   },
   props: {
-    calendarDay: null//首页日历选择
+    calendarDay: null,//首页日历选择
+    bigEventTypeId: null,//事件大类
+    smallEventTypeId: null//事件小类
   },
   methods: {
     /************************************责任制-开始****************************************/
@@ -1651,7 +1658,7 @@ export default {
               this.refreshEvent(this.eventCode)
               this.cancelEventConfirm_send()
               this.showEventConfirm_gd = false
-              this.$emit('getEventList', this.calendarDay)
+              this.$emit('getEventList', this.calendarDay,this.bigEventTypeId,this.smallEventTypeId)
             }
           })
         } else {
@@ -1679,7 +1686,7 @@ export default {
               this.refreshEvent(this.eventCode)
               this.cancelEventConfirm_send()
               this.showEventConfirm = false
-              this.$emit('getEventList', this.calendarDay)
+              this.$emit('getEventList', this.calendarDay,this.bigEventTypeId,this.smallEventTypeId)
             }
           })
         }
@@ -2318,5 +2325,93 @@ table tr td input:hover {
 	padding: 0.5rem 1.5rem;
 }
 
+.bottom {
+  width: 100%;
+  height: calc(100% - 80px);
+  display: flex;
+
+  .bottomLeft {
+    width: 288px;
+    height: 500px;
+    overflow-y: auto;
+
+    .leftItem {
+      width: 100%;
+      height: 50px;
+      line-height: 50px;
+      text-align: center;
+      cursor: pointer;
+    }
+  }
+
+  .bottomRight {
+    width: calc(100% - 288px);
+    height: 500px;
+    box-sizing: border-box;
+    padding: 36px 36px 0 36px;
+    overflow-y: auto;
 
+    .bottomRightContent {
+      width: 100%;
+      box-sizing: border-box;
+      padding-bottom: 36px;
+
+      .bottomRightContentHead {
+        height: 25px;
+        font-family: PingFang SC;
+        font-style: normal;
+        font-weight: 600;
+        font-size: 24px;
+        line-height: 25px;
+        text-transform: capitalize;
+        color: rgba(0, 0, 0, 0.85);
+        margin-bottom: 32px;
+      }
+
+      .bottomRightContentBody {
+        .el-col {
+          position: relative;
+          margin-bottom: 18px;
+
+          .circle {
+            display: inline-block;
+            width: 6px;
+            height: 6px;
+            background: #4677f6;
+            border-radius: 50%;
+            position: absolute;
+            top: 8px;
+            left: 0;
+          }
+
+          .word {
+            margin-left: 12px;
+            font-family: PingFang SC;
+            font-style: normal;
+            font-weight: normal;
+            font-size: 14px;
+            color: #4677f6;
+            cursor: pointer;
+          }
+
+          .word:hover {
+            text-decoration: underline;
+          }
+
+          .topPlace {
+            position: absolute;
+            top: 1px;
+            margin-left: 8px;
+          }
+        }
+      }
+
+      .bottomRightContentFooter {
+        height: 1px;
+        width: 100%;
+        margin-top: 14px;
+      }
+    }
+  }
+}
 </style>

src/views/forest.vue

@@ -135,7 +135,8 @@
       </div>
       <vBottomMenu ref="bottomMenu"></vBottomMenu>
     </div>
-    <eventdetailsdialog ref="eventdetailsdialog" :calendarDay="calendarDay"
+    <eventdetailsdialog ref="eventdetailsdialog" :calendarDay="calendarDay" :bigEventTypeId="bigEventTypeId" :smallEventTypeId="smallEventTypeId"
+
                         @getEventList="getEventList"></eventdetailsdialog>
     <eventLocation ref="eventLocation"></eventLocation>
     <TVWall ref="TVWall"></TVWall>
@@ -216,6 +217,8 @@ export default {
       eventListAll: [],
       eventSearch: '',//事件列表搜索
       listCurrentIndex1: '',
+      bigEventTypeId: '',
+      smallEventTypeId: '',
       /** ----------------------------------weosocket开始------------------------------------- */
       weosocket: false,
       websock: '',
@@ -371,7 +374,10 @@ export default {
       })
     },
     getEventList(day,bigEventTypeId,smallEventTypeId) {
+      debugger
       this.listCurrentIndex1=smallEventTypeId
+      this.bigEventTypeId=bigEventTypeId
+      this.smallEventTypeId=smallEventTypeId
       let that = this
       this.eventList = []
       this.eventListAll = []