diff --git a/src/views/modules/analysis/export/operation.vue b/src/views/modules/analysis/export/operation.vue
index 184a198a..b15653e5 100644
--- a/src/views/modules/analysis/export/operation.vue
+++ b/src/views/modules/analysis/export/operation.vue
@@ -18,7 +18,7 @@
                          collapse-tags></el-cascader>
           </el-form-item>
         </el-row>
-        <el-form-item label="时间筛选类型">
+        <el-form-item label="时间筛选类型" label-width="100px">
           <template>
             <el-radio v-model="timeFlag"
                       label="1">有效时间</el-radio>
@@ -60,7 +60,7 @@
         <br>
         <el-row>
           <el-form-item label-width="500px">
-            <el-button type="primary"
+            <el-button type="success"
                        @click="this.exportHandlee">{{ $t('export') }}</el-button>
           </el-form-item>
         </el-row>
diff --git a/src/views/modules/analysis/item/unsolved-item-list.vue b/src/views/modules/analysis/item/unsolved-item-list.vue
index c5dcb2e9..2e41c518 100644
--- a/src/views/modules/analysis/item/unsolved-item-list.vue
+++ b/src/views/modules/analysis/item/unsolved-item-list.vue
@@ -32,7 +32,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
+          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
@@ -84,19 +84,35 @@ export default {
         endTime: '',
         searchContent: ''
       },
+      // pickerBeginDateBefore: {
+      //   disabledDate: (time) => {
+      //     let beginDateVal = this.dataForm.startTime
+      //     if (beginDateVal) {
+      //       return time.getTime() > new Date(beginDateVal+ ' 00:00:00').getTime()
+      //     }
+      //   }
+      // },
+      // pickerBeginDateAfter: {
+      //   disabledDate: (time) => {
+      //     let EndDateVal = this.dataForm.endTime
+      //     if (EndDateVal) {
+      //       return time.getTime() < new Date(EndDateVal+ ' 00:00:00').getTime()
+      //     }
+      //   }
+      // },
       pickerBeginDateBefore: {
         disabledDate: (time) => {
-          let beginDateVal = this.dataForm.startTime
+          let beginDateVal = this.dataForm.endTime;
           if (beginDateVal) {
-            return time.getTime() > new Date(beginDateVal).getTime()
+            return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
           }
         }
       },
       pickerBeginDateAfter: {
         disabledDate: (time) => {
-          let EndDateVal = this.dataForm.endTime
+          let EndDateVal = this.dataForm.startTime;
           if (EndDateVal) {
-            return time.getTime() < new Date(EndDateVal).getTime()
+            return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
           }
         }
       },
diff --git a/src/views/modules/contentSecurity/checkrecords.vue b/src/views/modules/contentSecurity/checkrecords.vue
index 43bdfbb3..be6ec626 100644
--- a/src/views/modules/contentSecurity/checkrecords.vue
+++ b/src/views/modules/contentSecurity/checkrecords.vue
@@ -28,7 +28,7 @@
             </el-select>
           </el-form-item>
         <br>
-        <el-form-item label="时间"
+        <el-form-item label="提交时间"
                       prop="startTime" label-width="75px">
           <el-date-picker v-model="dataForm.startTime"
                           type="date"
@@ -52,7 +52,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
+          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('news:checkrecords:save')" type="success" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
diff --git a/src/views/modules/events/issue-change-list.vue b/src/views/modules/events/issue-change-list.vue
index 6e797621..d79fbd05 100644
--- a/src/views/modules/events/issue-change-list.vue
+++ b/src/views/modules/events/issue-change-list.vue
@@ -57,7 +57,7 @@
                 </el-form-item>
                 <br>
                 <div>
-                    <el-form-item label="时间" prop="startTime" label-width="70px">
+                    <el-form-item label="提交时间" prop="startTime" label-width="70px">
                         <el-date-picker
                                 v-model="dataForm.startTime"
                                 type="date"
@@ -82,7 +82,7 @@
                         </el-date-picker>
                     </el-form-item>
                     <el-form-item>
-                        <el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
+                        <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
                     </el-form-item>
                 </div>
             </el-form>
@@ -240,22 +240,22 @@
                 }],
                 ids: [],
                 options: [],
-                pickerBeginDateBefore: {
-                    disabledDate: time => {
-                        let beginDateVal = this.dataForm.startTime
+                   pickerBeginDateBefore: {
+                        disabledDate: (time) => {
+                        let beginDateVal = this.dataForm.endTime;
                         if (beginDateVal) {
-                            return time.getTime() > new Date(beginDateVal).getTime()
+                            return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
                         }
-                    }
-                },
-                pickerBeginDateAfter: {
-                    disabledDate: time => {
-                        let EndDateVal = this.dataForm.endTime
+                        }
+                    },
+                    pickerBeginDateAfter: {
+                        disabledDate: (time) => {
+                        let EndDateVal = this.dataForm.startTime;
                         if (EndDateVal) {
-                            return time.getTime() < new Date(EndDateVal).getTime()
+                            return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
+                        }
                         }
                     }
-                }
             }
         },
         components: {
diff --git a/src/views/modules/events/issue-close-list.vue b/src/views/modules/events/issue-close-list.vue
index bf182186..ebf45d73 100644
--- a/src/views/modules/events/issue-close-list.vue
+++ b/src/views/modules/events/issue-close-list.vue
@@ -83,7 +83,7 @@
 
 
                     <el-form-item>
-                        <el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
+                        <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
                     </el-form-item>
                 </div>
             </el-form>
@@ -243,21 +243,21 @@
                 ids: [],
                 options: [],
                 pickerBeginDateBefore: {
-                    disabledDate: time => {
-                        let beginDateVal = this.dataForm.startTime
-                        if (beginDateVal) {
-                            return time.getTime() > new Date(beginDateVal).getTime()
-                        }
+                    disabledDate: (time) => {
+                    let beginDateVal = this.dataForm.endTime;
+                    if (beginDateVal) {
+                        return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
+                    }
                     }
                 },
                 pickerBeginDateAfter: {
-                    disabledDate: time => {
-                        let EndDateVal = this.dataForm.endTime
-                        if (EndDateVal) {
-                            return time.getTime() < new Date(EndDateVal).getTime()
-                        }
+                    disabledDate: (time) => {
+                    let EndDateVal = this.dataForm.startTime;
+                    if (EndDateVal) {
+                        return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
                     }
-                }
+                    }
+                },
             }
         },
         components: {
diff --git a/src/views/modules/events/issue-reject-list.vue b/src/views/modules/events/issue-reject-list.vue
index 706fa200..e0e12bcb 100644
--- a/src/views/modules/events/issue-reject-list.vue
+++ b/src/views/modules/events/issue-reject-list.vue
@@ -61,7 +61,7 @@
                         </el-date-picker>
                     </el-form-item>
                     <el-form-item>
-                        <el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
+                        <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
                     </el-form-item>
             </el-form>
             <el-table v-loading="dataListLoading"
@@ -159,21 +159,22 @@
                 ids: [],
                 options: [],
                 pickerBeginDateBefore: {
-                    disabledDate: (time) => {
-                        let beginDateVal = this.dataForm.startTime
+                        disabledDate: (time) => {
+                        let beginDateVal = this.dataForm.endTime;
                         if (beginDateVal) {
-                            return time.getTime() > new Date(beginDateVal).getTime()
+                            return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
                         }
-                    }
-                },
+                        }
+                    },
                 pickerBeginDateAfter: {
-                    disabledDate: (time) => {
-                        let EndDateVal = this.dataForm.endTime
+                        disabledDate: (time) => {
+                        let EndDateVal = this.dataForm.startTime;
                         if (EndDateVal) {
-                            return time.getTime() < new Date(EndDateVal).getTime()
+                            return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
                         }
-                    }
-                }
+                        }
+                },
+                
             }
         },
         components: {
diff --git a/src/views/modules/events/issue-review-detail-view.vue b/src/views/modules/events/issue-review-detail-view.vue
index a71b1592..8d246bd4 100644
--- a/src/views/modules/events/issue-review-detail-view.vue
+++ b/src/views/modules/events/issue-review-detail-view.vue
@@ -61,7 +61,8 @@
                   </div>
                 </el-form-item>
                 <el-form-item label="处理意见:" prop="advice">
-                    <el-input :rows="4" v-model="dataForm.advice" type="textarea" placeholder="请您填写居民诉求的处理情况及答复意见，向居民公开展示，500字以内"></el-input>
+                    <el-input :rows="4" v-model="dataForm.advice" type="textarea"   maxlength="500"
+                      placeholder="请您填写居民诉求的处理情况及答复意见，向居民公开展示，500字以内"></el-input>
                 </el-form-item>
                 <el-form-item style="float: right;">
                     <el-button size="small" style="width: 95px" type="primary" :disabled="isAble" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
diff --git a/src/views/modules/events/item-close-list.vue b/src/views/modules/events/item-close-list.vue
index 7abdbd19..ed64599a 100644
--- a/src/views/modules/events/item-close-list.vue
+++ b/src/views/modules/events/item-close-list.vue
@@ -80,7 +80,7 @@
                         </el-date-picker>
                     </el-form-item>
                     <el-form-item>
-                        <el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
+                        <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
                     </el-form-item>
                 </div>
             </el-form>
@@ -231,21 +231,21 @@
                 options: [],
                 detailVisible: false,
                 pickerBeginDateBefore: {
-                    disabledDate: time => {
-                        let beginDateVal = this.dataForm.startTime
+                    disabledDate: (time) => {
+                        let beginDateVal = this.dataForm.endTime;
                         if (beginDateVal) {
-                            return time.getTime() > new Date(beginDateVal).getTime()
+                            return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
                         }
                     }
-                },
+                    },
                 pickerBeginDateAfter: {
-                    disabledDate: time => {
-                        let EndDateVal = this.dataForm.endTime
+                    disabledDate: (time) => {
+                        let EndDateVal = this.dataForm.startTime;
                         if (EndDateVal) {
-                            return time.getTime() < new Date(EndDateVal).getTime()
+                            return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
                         }
                     }
-                }
+                },
             }
         },
         components: {
diff --git a/src/views/modules/events/item-deal-list.vue b/src/views/modules/events/item-deal-list.vue
index e0bfdecf..9dbde901 100644
--- a/src/views/modules/events/item-deal-list.vue
+++ b/src/views/modules/events/item-deal-list.vue
@@ -80,7 +80,7 @@
                         </el-date-picker>
                     </el-form-item>
                     <el-form-item>
-                        <el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
+                        <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
                     </el-form-item>
                 </div>
             </el-form>
@@ -232,22 +232,22 @@
                 },
                 ids: [],
                 options: [],
-                pickerBeginDateBefore: {
-                    disabledDate: time => {
-                        let beginDateVal = this.dataForm.startTime
-                        if (beginDateVal) {
-                            return time.getTime() > new Date(beginDateVal).getTime()
-                        }
-                    }
-                },
-                pickerBeginDateAfter: {
-                    disabledDate: time => {
-                        let EndDateVal = this.dataForm.endTime
-                        if (EndDateVal) {
-                            return time.getTime() < new Date(EndDateVal).getTime()
-                        }
-                    }
+            pickerBeginDateBefore: {
+                disabledDate: (time) => {
+                let beginDateVal = this.dataForm.endTime;
+                if (beginDateVal) {
+                    return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
+                }
                 }
+            },
+            pickerBeginDateAfter: {
+                disabledDate: (time) => {
+                let EndDateVal = this.dataForm.startTime;
+                if (EndDateVal) {
+                    return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
+                }
+                }
+            },
             }
         },
         components: {
diff --git a/src/views/modules/events/item-end-list.vue b/src/views/modules/events/item-end-list.vue
index 18265a11..d424cc05 100644
--- a/src/views/modules/events/item-end-list.vue
+++ b/src/views/modules/events/item-end-list.vue
@@ -80,7 +80,7 @@
                         </el-date-picker>
                     </el-form-item>
                     <el-form-item>
-                        <el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
+                        <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
                     </el-form-item>
                 </div>
             </el-form>
@@ -237,22 +237,22 @@
                 detailVisible: false,
                 ids: [],
                 options: [],
-                pickerBeginDateBefore: {
-                    disabledDate: time => {
-                        let beginDateVal = this.dataForm.startTime
+             pickerBeginDateBefore: {
+                    disabledDate: (time) => {
+                        let beginDateVal = this.dataForm.endTime;
                         if (beginDateVal) {
-                            return time.getTime() > new Date(beginDateVal).getTime()
+                            return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
                         }
                     }
-                },
+                    },
                 pickerBeginDateAfter: {
-                    disabledDate: time => {
-                        let EndDateVal = this.dataForm.endTime
+                    disabledDate: (time) => {
+                        let EndDateVal = this.dataForm.startTime;
                         if (EndDateVal) {
-                            return time.getTime() < new Date(EndDateVal).getTime()
+                            return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
                         }
                     }
-                }
+                },
             }
         },
         components: {
diff --git a/src/views/modules/heart/actbanner.vue b/src/views/modules/heart/actbanner.vue
index c9969c79..7d233658 100644
--- a/src/views/modules/heart/actbanner.vue
+++ b/src/views/modules/heart/actbanner.vue
@@ -30,7 +30,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataListSearch()" type="primary">{{ $t('query') }}</el-button>
+          <el-button @click="getDataListSearch()" type="success">{{ $t('query') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
@@ -80,7 +80,23 @@ export default {
         status: '',
         startTime: '',
         endTime: ''
-      }
+      },
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          let beginDateVal = this.dataForm.endTime;
+          if (beginDateVal) {
+            return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
+          }
+          }
+        },
+      pickerBeginDateAfter: {
+        disabledDate: (time) => {
+          let EndDateVal = this.dataForm.startTime;
+          if (EndDateVal) {
+            return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
+          }
+        }
+     },
     }
   },
   components: {
diff --git a/src/views/modules/master/masteruserrelation-add.vue b/src/views/modules/master/masteruserrelation-add.vue
index 8799fd22..593d9049 100644
--- a/src/views/modules/master/masteruserrelation-add.vue
+++ b/src/views/modules/master/masteruserrelation-add.vue
@@ -8,7 +8,7 @@
         </el-form-item>
       </el-form>
       <div v-for="(item, index) in this.formData" :key="index">
-        <el-form :inline="true" :rules="dataRule" ref="item" :model="item" @keyup.enter.native="dataFormSubmitHandle()">
+        <el-form :inline="true" :rules="dataRule" ref="item" :model="item" >
           <div style="text-align: left;">{{"书记"+(index+1)+":"}}</div>
           <el-row>
               <el-form-item label="选择书记：" prop="deptName">
diff --git a/src/views/modules/master/masteruserrelation.vue b/src/views/modules/master/masteruserrelation.vue
index 94cfd570..4fd13e1a 100755
--- a/src/views/modules/master/masteruserrelation.vue
+++ b/src/views/modules/master/masteruserrelation.vue
@@ -36,10 +36,10 @@
                     </el-date-picker>
                 </el-form-item>
                 <el-form-item>
-                    <el-button @click="getDataListOverWrite()" type="primary">{{ $t('query') }}</el-button>
+                    <el-button @click="getDataListOverWrite()" type="success">{{ $t('query') }}</el-button>
                 </el-form-item>
                 <el-form-item>
-                    <el-button type="success" @click="addHandle()">{{ $t('add') }}</el-button>
+                    <el-button type="primary" @click="addHandle()">{{ $t('add') }}</el-button>
                 </el-form-item>
                 <!-- <el-form-item>
                   <el-button type="primary" @click="addOrUpdateHandle()">测试按钮-新增</el-button>
@@ -122,22 +122,22 @@
                     nickname: '',
                     realName: ''
                 },
-                pickerBeginDateBefore: {
+               pickerBeginDateBefore: {
                     disabledDate: (time) => {
-                        let beginDateVal = this.dataForm.endTime
+                        let beginDateVal = this.dataForm.endTime;
                         if (beginDateVal) {
                             return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
                         }
                     }
-                },
+                    },
                 pickerBeginDateAfter: {
                     disabledDate: (time) => {
-                        let EndDateVal = this.dataForm.startTime
+                        let EndDateVal = this.dataForm.startTime;
                         if (EndDateVal) {
                             return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
                         }
                     }
-                }
+                },
             }
         },
         components: {