From d0d01a4b1a561a3ae93d7149dede214e014d6caa Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Mon, 27 Jul 2020 17:27:36 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90PC=E7=AB=AF=E4=BC=98=E5=8C=96=E3=80=91?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E4=BC=98=E5=8C=96=E5=88=86=E9=A1=B5=E9=81=97?=
 =?UTF-8?q?=E6=BC=8F=E9=83=A8=E5=88=86=E6=95=B4=E4=BD=93=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?-=E7=8E=8B=E5=85=AC=E5=B3=B0-2020-07-27?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/activiti/model.vue             |  4 ++--
 src/views/modules/activiti/process.vue           |  4 ++--
 src/views/modules/activiti/running.vue           |  4 ++--
 .../analysis/user/metausergridopining.vue        |  4 ++--
 .../modules/analysis/user/metauserpartyrank.vue  |  4 ++--
 .../analysis/user/metauserregisterrank.vue       |  4 ++--
 src/views/modules/analysis/user/party.vue        |  4 ++--
 src/views/modules/api/scanswitch.vue             |  4 ++--
 src/views/modules/custom/consultconf.vue         |  2 +-
 src/views/modules/custom/evaluaterole.vue        |  4 ++--
 src/views/modules/events/category.vue            |  2 +-
 src/views/modules/events/eventcategory.vue       |  2 +-
 src/views/modules/events/faild-events.vue        |  4 ++--
 src/views/modules/events/interfacelog.vue        |  4 ++--
 src/views/modules/group/gridpartymembergroup.vue |  4 ++--
 src/views/modules/heart/actclockpic.vue          |  4 ++--
 src/views/modules/heart/actuserlog.vue           |  4 ++--
 src/views/modules/heart/volunteerrank.vue        |  4 ++--
 src/views/modules/kpi/kpimassevaluation.vue      |  4 ++--
 src/views/modules/kpi/streetpersiongoalmonth.vue |  2 +-
 src/views/modules/kpi/timeLimitIssue.vue         |  2 +-
 src/views/modules/master/masternoticeimg.vue     |  4 ++--
 .../modules/master/masternoticeuserread.vue      |  4 ++--
 src/views/modules/master/mastertopiccomment.vue  |  4 ++--
 .../master/mastertopiccommentuserattitude.vue    |  4 ++--
 src/views/modules/master/mastertopicimg.vue      |  4 ++--
 .../modules/master/mastertopicuserattitude.vue   |  4 ++--
 .../modules/master/mastertopicuserbrowse.vue     |  4 ++--
 .../modules/organize/metasysdeptManagement.vue   |  4 ++--
 src/views/modules/organize/sysdeptmanagement.vue |  4 ++--
 src/views/modules/points/pointsrule.vue          |  4 ++--
 src/views/modules/sys/analysis-menu.vue          |  2 +-
 src/views/modules/sys/app-menu.vue               |  2 +-
 src/views/modules/sys/dept.vue                   |  2 +-
 src/views/modules/sys/menu.vue                   |  2 +-
 src/views/modules/sys/resources-list.vue         |  2 +-
 src/views/modules/user/user.vue                  | 16 ++++++++--------
 src/views/modules/user/usertag.vue               |  2 +-
 src/views/modules/workRecord/dailyfile.vue       |  4 ++--
 src/views/modules/workRecord/dailyrecordinfo.vue |  8 ++------
 src/views/modules/workRecord/map-select.vue      |  5 +++++
 .../modules/workRecord/monthexcellentcase.vue    |  8 ++------
 .../modules/workRecord/monthexcellentgrid.vue    |  8 ++------
 .../modules/workRecord/monthexcellentperson.vue  |  8 ++------
 src/views/modules/workRecord/monthfile.vue       |  4 ++--
 src/views/modules/workRecord/monthgridsort.vue   |  8 ++------
 src/views/modules/workRecord/monthrecordinfo.vue | 10 +++-------
 .../modules/workRecord/resourcesdictionary.vue   |  4 ++--
 src/views/modules/workRecord/weekfile.vue        |  4 ++--
 .../modules/workRecord/weekrecorddetail.vue      |  4 ++--
 src/views/modules/workRecord/weekrecordinfo.vue  | 10 +++-------
 51 files changed, 102 insertions(+), 125 deletions(-)

diff --git a/src/views/modules/activiti/model.vue b/src/views/modules/activiti/model.vue
index 8ca2bb07..34960b9d 100644
--- a/src/views/modules/activiti/model.vue
+++ b/src/views/modules/activiti/model.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-activiti__model">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <el-form-item>
           <el-input v-model="dataForm.name" :placeholder="$t('model.name')" clearable></el-input>
         </el-form-item>
@@ -9,7 +9,7 @@
           <el-input v-model="dataForm.key" :placeholder="$t('model.key')" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
diff --git a/src/views/modules/activiti/process.vue b/src/views/modules/activiti/process.vue
index 6df380bd..8ddc2993 100644
--- a/src/views/modules/activiti/process.vue
+++ b/src/views/modules/activiti/process.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-activiti__process">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <el-form-item>
           <el-input v-model="dataForm.processName" :placeholder="$t('process.name')" clearable></el-input>
         </el-form-item>
@@ -9,7 +9,7 @@
           <el-input v-model="dataForm.key" :placeholder="$t('process.key')" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="deployHandle()">{{ $t('process.deployFile') }}</el-button>
diff --git a/src/views/modules/activiti/running.vue b/src/views/modules/activiti/running.vue
index a4247e40..570f2596 100644
--- a/src/views/modules/activiti/running.vue
+++ b/src/views/modules/activiti/running.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-activiti__running">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <el-form-item>
           <el-input v-model="dataForm.id" :placeholder="$t('running.id')" clearable></el-input>
         </el-form-item>
@@ -9,7 +9,7 @@
           <el-input v-model="dataForm.definitionKey" :placeholder="$t('running.definitionKey')" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table
diff --git a/src/views/modules/analysis/user/metausergridopining.vue b/src/views/modules/analysis/user/metausergridopining.vue
index a3f3d867..0edf9558 100644
--- a/src/views/modules/analysis/user/metausergridopining.vue
+++ b/src/views/modules/analysis/user/metausergridopining.vue
@@ -4,7 +4,7 @@
     <div class="mod-__metausergridopining}">
       <el-form :inline="true"
                :model="dataForm"
-               @keyup.enter.native="getDataList()">
+               @keyup.enter.native="getDataListSearch()">
         <el-form-item label="所属机构">
           <el-cascader v-model="deptIdList"
                        :options="options"
@@ -18,7 +18,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button type="primary"
diff --git a/src/views/modules/analysis/user/metauserpartyrank.vue b/src/views/modules/analysis/user/metauserpartyrank.vue
index d61954ba..556e1e75 100644
--- a/src/views/modules/analysis/user/metauserpartyrank.vue
+++ b/src/views/modules/analysis/user/metauserpartyrank.vue
@@ -4,7 +4,7 @@
     <div class="mod-__metauserpartyrank}">
       <el-form :inline="true"
                :model="dataForm"
-               @keyup.enter.native="getDataList()">
+               @keyup.enter.native="getDataListSearch()">
         <el-form-item label="所属机构">
           <el-cascader v-model="deptIdList"
                        :options="options"
@@ -18,7 +18,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button type="primary"
diff --git a/src/views/modules/analysis/user/metauserregisterrank.vue b/src/views/modules/analysis/user/metauserregisterrank.vue
index a572f30e..a43c0978 100644
--- a/src/views/modules/analysis/user/metauserregisterrank.vue
+++ b/src/views/modules/analysis/user/metauserregisterrank.vue
@@ -4,7 +4,7 @@
     <div class="mod-__metauserregisterrank}">
       <el-form :inline="true"
                :model="dataForm"
-               @keyup.enter.native="getDataList()">
+               @keyup.enter.native="getDataListSearch()">
         <el-form-item label="所属机构">
           <el-cascader v-model="deptIdList"
                        :options="options"
@@ -18,7 +18,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button type="primary"
diff --git a/src/views/modules/analysis/user/party.vue b/src/views/modules/analysis/user/party.vue
index 2c8a5cba..23fca7a5 100644
--- a/src/views/modules/analysis/user/party.vue
+++ b/src/views/modules/analysis/user/party.vue
@@ -4,7 +4,7 @@
     <div class="mod-news__news}">
       <el-form :inline="true"
                :model="dataForm"
-               @keyup.enter.native="getDataList()">
+               @keyup.enter.native="getDataListSearch()">
         <el-form-item label="所属机构">
           <el-cascader v-model="deptIdList"
                        :options="options"
@@ -34,7 +34,7 @@
         </el-date-picker>
         </el-form-item> 
         <el-form-item>
-          <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button type="success" @click="exportHandle()">{{ $t('export') }}</el-button>
diff --git a/src/views/modules/api/scanswitch.vue b/src/views/modules/api/scanswitch.vue
index c7a6a635..50d861f9 100644
--- a/src/views/modules/api/scanswitch.vue
+++ b/src/views/modules/api/scanswitch.vue
@@ -4,14 +4,14 @@
     <div class="mod-api__scanswitch}">
       <el-form :inline="true"
                :model="dataForm"
-               @keyup.enter.native="getDataList()">
+               @keyup.enter.native="getDataListSearch()">
         <el-form-item>
           <el-input v-model="dataForm.id"
                     placeholder="id"
                     clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()" type="success">{{ $t('query') }}</el-button>
+          <el-button @click="getDataListSearch()" type="success">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button type="primary"
diff --git a/src/views/modules/custom/consultconf.vue b/src/views/modules/custom/consultconf.vue
index 587b28db..5b80ab3e 100755
--- a/src/views/modules/custom/consultconf.vue
+++ b/src/views/modules/custom/consultconf.vue
@@ -4,7 +4,7 @@
     <div class="mod-__consultconf}">
       <el-form :inline="true"
                :model="dataForm"
-               @keyup.enter.native="getDataList()">
+               @keyup.enter.native="getDataListSearch()">
         <el-form-item>
           <el-button v-if="$hasPermission('custom:consultconf:save')"
                      type="primary"
diff --git a/src/views/modules/custom/evaluaterole.vue b/src/views/modules/custom/evaluaterole.vue
index 2080f4a1..7ce3de4a 100644
--- a/src/views/modules/custom/evaluaterole.vue
+++ b/src/views/modules/custom/evaluaterole.vue
@@ -1,12 +1,12 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-custom__evaluaterole}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <el-form-item>
           <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
diff --git a/src/views/modules/events/category.vue b/src/views/modules/events/category.vue
index 5792c7e9..77237511 100644
--- a/src/views/modules/events/category.vue
+++ b/src/views/modules/events/category.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-sys__dept">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <el-form-item>
           <el-button v-if="$hasPermission('events:category:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
diff --git a/src/views/modules/events/eventcategory.vue b/src/views/modules/events/eventcategory.vue
index e4514169..e86b4f40 100755
--- a/src/views/modules/events/eventcategory.vue
+++ b/src/views/modules/events/eventcategory.vue
@@ -5,7 +5,7 @@
         <el-tab-pane label="类别设置" name="first"></el-tab-pane>
         <el-tab-pane label="敏感词设置" name="second"></el-tab-pane>
       </el-tabs>
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <el-form-item>
           <el-button v-if="$hasPermission('events:category:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
diff --git a/src/views/modules/events/faild-events.vue b/src/views/modules/events/faild-events.vue
index 43c37b58..993574e2 100644
--- a/src/views/modules/events/faild-events.vue
+++ b/src/views/modules/events/faild-events.vue
@@ -4,7 +4,7 @@
     <div class="mod-demo__epdcevents}">
       <el-form :inline="true"
                :model="dataForm"
-               @keyup.enter.native="getDataList()">
+               @keyup.enter.native="getDataListSearch()">
         <el-form-item label="街道">
           <el-select v-model="dataForm.streetId"
                      placeholder="请选择"
@@ -62,7 +62,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading"
diff --git a/src/views/modules/events/interfacelog.vue b/src/views/modules/events/interfacelog.vue
index 911ce607..3b0a1cc0 100644
--- a/src/views/modules/events/interfacelog.vue
+++ b/src/views/modules/events/interfacelog.vue
@@ -1,7 +1,7 @@
 <template>
     <el-card shadow="never" class="aui-card--fill">
         <div class="mod-events__interfacelog}">
-            <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+            <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
                 <el-form-item label="接口名称">
                     <el-input v-model="dataForm.interfaceName" clearable></el-input>
                 </el-form-item>
@@ -50,7 +50,7 @@
                     </el-date-picker>
                 </el-form-item>
                 <el-form-item>
-                    <el-button @click="getDataList()">{{ $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:interfacelog:save')" type="primary"
diff --git a/src/views/modules/group/gridpartymembergroup.vue b/src/views/modules/group/gridpartymembergroup.vue
index a7c0a5cb..be828dfc 100644
--- a/src/views/modules/group/gridpartymembergroup.vue
+++ b/src/views/modules/group/gridpartymembergroup.vue
@@ -1,12 +1,12 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__group}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <el-form-item label="网格">
           <el-input v-model="dataForm.grid" @keyup.native="btKeyUpGrid" placeholder="请输入网格名称" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
           <el-button @click="createPartys()" type="primary">批量生成党员群</el-button>
         </el-form-item>
       </el-form>
diff --git a/src/views/modules/heart/actclockpic.vue b/src/views/modules/heart/actclockpic.vue
index 0ff95857..7533f898 100644
--- a/src/views/modules/heart/actclockpic.vue
+++ b/src/views/modules/heart/actclockpic.vue
@@ -1,12 +1,12 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-heart__actclockpic}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <el-form-item>
           <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $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('heart:actclockpic:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
diff --git a/src/views/modules/heart/actuserlog.vue b/src/views/modules/heart/actuserlog.vue
index ccf0e217..c1fdaa34 100644
--- a/src/views/modules/heart/actuserlog.vue
+++ b/src/views/modules/heart/actuserlog.vue
@@ -1,12 +1,12 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-heart__actuserlog}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <el-form-item>
           <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $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('heart:actuserlog:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
diff --git a/src/views/modules/heart/volunteerrank.vue b/src/views/modules/heart/volunteerrank.vue
index 009827be..52f1e291 100644
--- a/src/views/modules/heart/volunteerrank.vue
+++ b/src/views/modules/heart/volunteerrank.vue
@@ -1,12 +1,12 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-heart__volunteerrank}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <el-form-item>
           <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $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('heart:volunteerrank:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
diff --git a/src/views/modules/kpi/kpimassevaluation.vue b/src/views/modules/kpi/kpimassevaluation.vue
index 448a2bb6..a22199db 100644
--- a/src/views/modules/kpi/kpimassevaluation.vue
+++ b/src/views/modules/kpi/kpimassevaluation.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-kpi__kpimassevaluation}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <el-form-item>
           <el-form-item label="部门" label-width="68px">
             <el-cascader
@@ -26,7 +26,7 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataListNew()" type="primary">{{ $t('query') }}</el-button>
+          <el-button @click="getDataListSearch()" type="success">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button type="success" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
diff --git a/src/views/modules/kpi/streetpersiongoalmonth.vue b/src/views/modules/kpi/streetpersiongoalmonth.vue
index fd32473f..9285a699 100644
--- a/src/views/modules/kpi/streetpersiongoalmonth.vue
+++ b/src/views/modules/kpi/streetpersiongoalmonth.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-__streetpersiongoalmonth}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <el-form-item>
           <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
diff --git a/src/views/modules/kpi/timeLimitIssue.vue b/src/views/modules/kpi/timeLimitIssue.vue
index 9a510de6..854bef82 100644
--- a/src/views/modules/kpi/timeLimitIssue.vue
+++ b/src/views/modules/kpi/timeLimitIssue.vue
@@ -4,7 +4,7 @@
     <div class="mod-kpi__kpitimelimitissue}">
       <el-form :inline="true"
                :model="dataForm"
-               @keyup.enter.native="getDataList()">
+               @keyup.enter.native="getDataListSearch()">
         <!-- <el-form-item>
           <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
         </el-form-item>
diff --git a/src/views/modules/master/masternoticeimg.vue b/src/views/modules/master/masternoticeimg.vue
index ebcdf50e..b496ed75 100755
--- a/src/views/modules/master/masternoticeimg.vue
+++ b/src/views/modules/master/masternoticeimg.vue
@@ -1,12 +1,12 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-__masternoticeimg}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <el-form-item>
           <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $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(':masternoticeimg:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
diff --git a/src/views/modules/master/masternoticeuserread.vue b/src/views/modules/master/masternoticeuserread.vue
index 3ca8c57c..f55446f2 100755
--- a/src/views/modules/master/masternoticeuserread.vue
+++ b/src/views/modules/master/masternoticeuserread.vue
@@ -1,12 +1,12 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-__masternoticeuserread}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <el-form-item>
           <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $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(':masternoticeuserread:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
diff --git a/src/views/modules/master/mastertopiccomment.vue b/src/views/modules/master/mastertopiccomment.vue
index d8916197..8e49a23a 100755
--- a/src/views/modules/master/mastertopiccomment.vue
+++ b/src/views/modules/master/mastertopiccomment.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-__mastertopiccomment}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <div>
           <el-form-item>
             <el-button type="primary" @click="backToDeptList(dataForm.id)">返回</el-button>
@@ -33,7 +33,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $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%;">
diff --git a/src/views/modules/master/mastertopiccommentuserattitude.vue b/src/views/modules/master/mastertopiccommentuserattitude.vue
index 1fdf7b03..568c6ae4 100755
--- a/src/views/modules/master/mastertopiccommentuserattitude.vue
+++ b/src/views/modules/master/mastertopiccommentuserattitude.vue
@@ -1,12 +1,12 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-__mastertopiccommentuserattitude}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <el-form-item>
           <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $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(':mastertopiccommentuserattitude:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
diff --git a/src/views/modules/master/mastertopicimg.vue b/src/views/modules/master/mastertopicimg.vue
index d6d2577e..e7a693fe 100755
--- a/src/views/modules/master/mastertopicimg.vue
+++ b/src/views/modules/master/mastertopicimg.vue
@@ -1,12 +1,12 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-__mastertopicimg}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <el-form-item>
           <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $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(':mastertopicimg:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
diff --git a/src/views/modules/master/mastertopicuserattitude.vue b/src/views/modules/master/mastertopicuserattitude.vue
index 24c68b21..638718a9 100755
--- a/src/views/modules/master/mastertopicuserattitude.vue
+++ b/src/views/modules/master/mastertopicuserattitude.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-__mastertopicuserattitude}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <div>
           <el-form-item>
             <el-button type="primary" @click="backToDeptList(dataForm.id)">返回</el-button>
@@ -33,7 +33,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $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%;">
diff --git a/src/views/modules/master/mastertopicuserbrowse.vue b/src/views/modules/master/mastertopicuserbrowse.vue
index ea51e813..1c4fb3ed 100755
--- a/src/views/modules/master/mastertopicuserbrowse.vue
+++ b/src/views/modules/master/mastertopicuserbrowse.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-__mastertopicuserbrowse}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <div>
           <el-form-item>
             <el-button type="primary" @click="backToDeptList(dataForm.id)">返回</el-button>
@@ -33,7 +33,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $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%;">
diff --git a/src/views/modules/organize/metasysdeptManagement.vue b/src/views/modules/organize/metasysdeptManagement.vue
index 2398f07a..58609bef 100644
--- a/src/views/modules/organize/metasysdeptManagement.vue
+++ b/src/views/modules/organize/metasysdeptManagement.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-sys__metasysdept}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <div v-if="dataForm.pid != 0">
         <el-form-item>
           <el-button type="primary" @click="backToDeptList">返回</el-button>
@@ -11,7 +11,7 @@
           <el-input v-model="dataForm.name" placeholder="组织架构名称" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $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%;">
diff --git a/src/views/modules/organize/sysdeptmanagement.vue b/src/views/modules/organize/sysdeptmanagement.vue
index 9fbeebab..999708c2 100644
--- a/src/views/modules/organize/sysdeptmanagement.vue
+++ b/src/views/modules/organize/sysdeptmanagement.vue
@@ -1,12 +1,12 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-sys__dept">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <el-form-item label="组织架构名称" prop="name">
           <el-input v-model="dataForm.name" placeholder="组织架构名称" clearable @keyup.native="btKeyUpName"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button type="danger" @click="deptUpdate()">同步</el-button>
diff --git a/src/views/modules/points/pointsrule.vue b/src/views/modules/points/pointsrule.vue
index 27e9c109..c32412da 100644
--- a/src/views/modules/points/pointsrule.vue
+++ b/src/views/modules/points/pointsrule.vue
@@ -4,7 +4,7 @@
       <el-form
         :inline="true"
         :model="dataForm"
-        @keyup.enter.native="getDataList()"
+        @keyup.enter.native="getDataListSearch()"
       >
       <el-form-item label="规则编码">
           <el-input v-model="dataForm.ruleCode"  clearable></el-input>
@@ -59,7 +59,7 @@
           <span class="demonstration">创建时间</span>&nbsp;&nbsp;
           <el-date-picker @change='setRegistTime' v-model="time" value-format="yyyy-MM-dd" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>&nbsp;
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t("query") }}</el-button>
+          <el-button type="success" @click="getDataListSearch()">{{ $t("query") }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button
diff --git a/src/views/modules/sys/analysis-menu.vue b/src/views/modules/sys/analysis-menu.vue
index b722ae64..a4e3a262 100644
--- a/src/views/modules/sys/analysis-menu.vue
+++ b/src/views/modules/sys/analysis-menu.vue
@@ -4,7 +4,7 @@
       <el-form
         :inline="true"
         :model="dataForm"
-        @keyup.enter.native="getDataList()"
+        @keyup.enter.native="getDataListSearch()"
       >
         <el-form-item>
           <el-button
diff --git a/src/views/modules/sys/app-menu.vue b/src/views/modules/sys/app-menu.vue
index bf3bed7f..35ac2480 100644
--- a/src/views/modules/sys/app-menu.vue
+++ b/src/views/modules/sys/app-menu.vue
@@ -4,7 +4,7 @@
       <el-form
         :inline="true"
         :model="dataForm"
-        @keyup.enter.native="getDataList()"
+        @keyup.enter.native="getDataListSearch()"
       >
         <el-form-item>
           <el-button
diff --git a/src/views/modules/sys/dept.vue b/src/views/modules/sys/dept.vue
index c815ad4f..5ae7e9b1 100644
--- a/src/views/modules/sys/dept.vue
+++ b/src/views/modules/sys/dept.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-sys__dept">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <el-form-item>
           <el-button v-if="$hasPermission('sys:dept:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
diff --git a/src/views/modules/sys/menu.vue b/src/views/modules/sys/menu.vue
index 05744e24..534096ac 100644
--- a/src/views/modules/sys/menu.vue
+++ b/src/views/modules/sys/menu.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-sys__menu">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <el-form-item>
           <el-button v-if="$hasPermission('sys:menu:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
diff --git a/src/views/modules/sys/resources-list.vue b/src/views/modules/sys/resources-list.vue
index f7c7a6a5..7b7c2c24 100644
--- a/src/views/modules/sys/resources-list.vue
+++ b/src/views/modules/sys/resources-list.vue
@@ -4,7 +4,7 @@
       <el-form
         :inline="true"
         :model="dataForm"
-        @keyup.enter.native="getDataList()"
+        @keyup.enter.native="getDataListSearch()"
       >
         <el-form-item>
           <el-button
diff --git a/src/views/modules/user/user.vue b/src/views/modules/user/user.vue
index b1ddb1aa..ed3b9fba 100644
--- a/src/views/modules/user/user.vue
+++ b/src/views/modules/user/user.vue
@@ -6,7 +6,7 @@
           <el-tab-pane  name="0">
             <span slot="label"><i class="el-icon-date"></i> 未认证用户</span>
             <template>
-              <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+              <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
                 <el-form-item label="街道">
                   <el-select v-model="dataForm.streetId" clearable placeholder="请选择" @change="getCommunityList">
                     <el-option v-for="(item,index) in streetOptions" :key="index" :label="item.name" :value="item.id"></el-option>
@@ -28,7 +28,7 @@
                 <div class="block">
                   <span class="demonstration">注册时间</span>&nbsp;&nbsp;
                   <el-date-picker @change='setRegistTime' v-model="time" value-format="yyyy-MM-dd" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>&nbsp;
-                  <el-form-item><el-button @click="getDataList()">{{ $t('query') }}</el-button></el-form-item>
+                  <el-form-item><el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button></el-form-item>
                   <el-form-item>
                     <el-button v-if="$hasPermission('epdc:user:export')" type="primary" @click="exportHandle()">{{ $t('export') }}</el-button>
                   </el-form-item>
@@ -53,7 +53,7 @@
           <el-tab-pane  name="1">
             <span slot="label"><i class="el-icon-date"></i> 待审核用户</span>
             <template>
-              <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+              <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
                 <el-form-item label="街道">
                   <el-select v-model="dataForm.streetId" clearable placeholder="请选择" @change="getCommunityList">
                     <el-option v-for="(item,index) in streetOptions" :key="index" :label="item.name" :value="item.id"></el-option>
@@ -75,7 +75,7 @@
                 <div class="block">
                   <span class="demonstration">注册时间</span>&nbsp;&nbsp;
                   <el-date-picker @change='setRegistTime' v-model="time" value-format="yyyy-MM-dd" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>&nbsp;
-                  <el-form-item><el-button @click="getDataList()">{{ $t('query') }}</el-button></el-form-item>
+                  <el-form-item><el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button></el-form-item>
                   <el-form-item>
                     <el-button v-if="$hasPermission('epdc:user:export')" type="primary" @click="exportHandle()">{{ $t('export') }}</el-button>
                   </el-form-item>
@@ -100,7 +100,7 @@
           <el-tab-pane  name="3">
             <span slot="label"><i class="el-icon-date"></i> 审核通过</span>
             <template>
-              <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+              <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
                 <el-form-item label="街道">
                   <el-select v-model="dataForm.streetId" clearable placeholder="请选择" @change="getCommunityList">
                     <el-option v-for="(item, index) in streetOptions" :key="index" :label="item.name" :value="item.id"></el-option>
@@ -127,7 +127,7 @@
                   </el-form-item>
                   <span class="demonstration">注册时间</span>&nbsp;&nbsp;
                   <el-date-picker @change='setRegistTime' v-model="time" value-format="yyyy-MM-dd" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>&nbsp;
-                  <el-form-item><el-button @click="getDataList()">{{ $t('query') }}</el-button></el-form-item>
+                  <el-form-item><el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button></el-form-item>
                   <el-form-item><el-button v-if="$hasPermission('epdc:user:export')" type="primary" @click="exportHandle()">{{ $t('export') }}</el-button></el-form-item>
                 </div>
               </el-form>
@@ -151,7 +151,7 @@
           <el-tab-pane  name="2">
             <span slot="label"><i class="el-icon-date"></i> 审核未通过</span>
             <template>
-              <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+              <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
                 <el-form-item label="街道">
                   <el-select v-model="dataForm.streetId" clearable placeholder="请选择" @change="getCommunityList">
                     <el-option v-for="(item, index) in streetOptions" :key="index" :label="item.name" :value="item.id"></el-option>
@@ -173,7 +173,7 @@
                 <div class="block">
                   <span class="demonstration">注册时间</span>&nbsp;&nbsp;
                   <el-date-picker @change='setRegistTime' v-model="time" value-format="yyyy-MM-dd" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>&nbsp;
-                  <el-form-item><el-button @click="getDataList()">{{ $t('query') }}</el-button></el-form-item>
+                  <el-form-item><el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button></el-form-item>
                   <el-form-item>
                     <el-button v-if="$hasPermission('epdc:user:export')" type="primary" @click="exportHandle()">{{ $t('export') }}</el-button>
                   </el-form-item>
diff --git a/src/views/modules/user/usertag.vue b/src/views/modules/user/usertag.vue
index 1db690e7..886be982 100755
--- a/src/views/modules/user/usertag.vue
+++ b/src/views/modules/user/usertag.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-__usertag}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <!-- <el-form-item>
           <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
         </el-form-item>
diff --git a/src/views/modules/workRecord/dailyfile.vue b/src/views/modules/workRecord/dailyfile.vue
index 487158e3..e7867132 100644
--- a/src/views/modules/workRecord/dailyfile.vue
+++ b/src/views/modules/workRecord/dailyfile.vue
@@ -1,12 +1,12 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__dailyfile}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <el-form-item>
           <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $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:dailyfile:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
diff --git a/src/views/modules/workRecord/dailyrecordinfo.vue b/src/views/modules/workRecord/dailyrecordinfo.vue
index b31beeaf..fcac0a7e 100644
--- a/src/views/modules/workRecord/dailyrecordinfo.vue
+++ b/src/views/modules/workRecord/dailyrecordinfo.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__dailyrecordinfo}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <div>
         <el-form-item v-if="dailyTypeArr.length > 0" label="随手记类型" prop="dailyType" label-width="90px">
           <el-select v-model="dataForm.dailyType" placeholder="随手记类型" @change="selectModel($event)" clearable style="width:200px">
@@ -53,7 +53,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="getDataListOverWrite()">{{ $t('query') }}</el-button>
+          <el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
         </el-form-item>
         <!-- <el-form-item>
           <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
@@ -177,10 +177,6 @@ export default {
         })
         .catch(() => {})
     },
-    getDataListOverWrite () {
-      this.page = 1
-      this.getDataList()
-    },
     btKeyUpContent (e) {
       e.target.value = e.target.value.replace(/[`~!@#$%^&*()_+=<>?:"{}|·~！@#￥%……&*（）——+={}|《》？：“”【】、；‘’，。、]/g, '')
       this.dataForm.content = e.target.value
diff --git a/src/views/modules/workRecord/map-select.vue b/src/views/modules/workRecord/map-select.vue
index 644dfccb..2b9855b5 100644
--- a/src/views/modules/workRecord/map-select.vue
+++ b/src/views/modules/workRecord/map-select.vue
@@ -126,6 +126,11 @@ export default {
         map: map
       })
       markerList.push(marker)
+      // 初始化mark点击事件
+      that.getAddress(that.dataForm.latitude, that.dataForm.longitude)
+      qq.maps.event.addListener(marker, 'click', function (event) {
+        that.addressCheckHandle()
+      })
       // 添加监听事件   获取鼠标单击事件
       qq.maps.event.addListener(map, 'click', function (event) {
         that.cleanMarkRadius(markerList, radiusList)
diff --git a/src/views/modules/workRecord/monthexcellentcase.vue b/src/views/modules/workRecord/monthexcellentcase.vue
index 00fd80e8..1970bee5 100644
--- a/src/views/modules/workRecord/monthexcellentcase.vue
+++ b/src/views/modules/workRecord/monthexcellentcase.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__monthexcellentcase}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <div>
         <el-form-item label="案例内容" prop="content" label-width="90px">
           <el-input v-model="dataForm.content" placeholder="案例内容" clearable maxlength="20" @keyup.native="btKeyUpContent" style="width:200px"></el-input>
@@ -40,7 +40,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="getDataListOverWrite()">{{ $t('query') }}</el-button>
+          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button type="success" @click="exportHandle()">{{ $t('export') }}</el-button>
@@ -146,10 +146,6 @@ export default {
       this.$parent.selectComponent = 'MonthexcellentcaseDetail'
       this.$router.push({ path: '/workRecord-Monthexcellentcaseroute', query: { id: id, disabled: disabled } })
     },
-    getDataListOverWrite () {
-      this.page = 1
-      this.getDataList()
-    },
     getOptions () {
       this.$http
         .get(`/sys/user/deptOptions/getDeptAuthByUser`)
diff --git a/src/views/modules/workRecord/monthexcellentgrid.vue b/src/views/modules/workRecord/monthexcellentgrid.vue
index ae470163..d0d8b091 100644
--- a/src/views/modules/workRecord/monthexcellentgrid.vue
+++ b/src/views/modules/workRecord/monthexcellentgrid.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__monthexcellentgrid}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <div>
         <el-form-item label="网格内容" prop="content" label-width="90px">
           <el-input v-model="dataForm.content" placeholder="网格内容" clearable maxlength="20" @keyup.native="btKeyUpContent" style="width:200px"></el-input>
@@ -40,7 +40,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="getDataListOverWrite()">{{ $t('query') }}</el-button>
+          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button type="success" @click="exportHandle()">{{ $t('export') }}</el-button>
@@ -147,10 +147,6 @@ export default {
       this.$parent.selectComponent = 'MonthexcellentgridDetail'
       this.$router.push({ path: '/workRecord-Monthexcellentgridroute', query: { id: id, disabled: disabled } })
     },
-    getDataListOverWrite () {
-      this.page = 1
-      this.getDataList()
-    },
     getOptions () {
       this.$http
         .get(`/sys/user/deptOptions/getDeptAuthByUser`)
diff --git a/src/views/modules/workRecord/monthexcellentperson.vue b/src/views/modules/workRecord/monthexcellentperson.vue
index b7529526..46aea6eb 100644
--- a/src/views/modules/workRecord/monthexcellentperson.vue
+++ b/src/views/modules/workRecord/monthexcellentperson.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__monthexcellentperson}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <div>
         <el-form-item label="榜样姓名" prop="name" label-width="90px">
           <el-input v-model="dataForm.name" placeholder="榜样姓名" clearable maxlength="20" @keyup.native="btKeyUpName" style="width:200px"></el-input>
@@ -51,7 +51,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="getDataListOverWrite()">{{ $t('query') }}</el-button>
+          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button type="success" @click="exportHandle()">{{ $t('export') }}</el-button>
@@ -170,10 +170,6 @@ export default {
       this.$parent.selectComponent = 'MonthexcellentpersonDetail'
       this.$router.push({ path: '/workRecord-Monthexcellentpersonroute', query: { id: id, disabled: disabled } })
     },
-    getDataListOverWrite () {
-      this.page = 1
-      this.getDataList()
-    },
     getOptions () {
       this.$http
         .get(`/sys/user/deptOptions/getDeptAuthByUser`)
diff --git a/src/views/modules/workRecord/monthfile.vue b/src/views/modules/workRecord/monthfile.vue
index 648f8180..67da0f59 100644
--- a/src/views/modules/workRecord/monthfile.vue
+++ b/src/views/modules/workRecord/monthfile.vue
@@ -1,12 +1,12 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__monthfile}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <el-form-item>
           <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $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:monthfile:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
diff --git a/src/views/modules/workRecord/monthgridsort.vue b/src/views/modules/workRecord/monthgridsort.vue
index 878583de..9317106b 100644
--- a/src/views/modules/workRecord/monthgridsort.vue
+++ b/src/views/modules/workRecord/monthgridsort.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__monthgridsort}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <div>
         <!-- <el-form-item label="网格名称" prop="deptName" label-width="90px">
           <el-input v-model="dataForm.deptName" placeholder="网格名称" clearable maxlength="20" @keyup.native="btKeyUpDeptName" style="width:200px"></el-input>
@@ -40,7 +40,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="getDataListOverWrite()">{{ $t('query') }}</el-button>
+          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button type="success" @click="exportHandle()">{{ $t('export') }}</el-button>
@@ -146,10 +146,6 @@ export default {
       this.$parent.selectComponent = 'MonthgridsortDetail'
       this.$router.push({ path: '/workRecord-Monthgridsortroute', query: { isAdd: '0', disabled: disabled, infoId: infoId } })
     },
-    getDataListOverWrite () {
-      this.page = 1
-      this.getDataList()
-    },
     getOptions () {
       this.$http
         .get(`/sys/user/deptOptions/getDeptAuthByUser`)
diff --git a/src/views/modules/workRecord/monthrecordinfo.vue b/src/views/modules/workRecord/monthrecordinfo.vue
index 0b536326..9e72a27e 100644
--- a/src/views/modules/workRecord/monthrecordinfo.vue
+++ b/src/views/modules/workRecord/monthrecordinfo.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__monthrecordinfo}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <!-- <el-form-item>
           <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
         </el-form-item> -->
@@ -43,13 +43,13 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="getDataListOverWrite()">{{ $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:monthrecordinfo:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item> -->
         <el-form-item>
-          <el-button type="success" @click="addHandle('','0','','','','')">{{ $t('add') }}</el-button>
+          <el-button type="primary" @click="addHandle('','0','','','','')">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button type="success" @click="exportHandle()">{{ $t('export') }}</el-button>
@@ -200,10 +200,6 @@ export default {
       let date = row[column.property]
       return date.length >= 10 ? date.substring(0, 10) : date
     },
-    getDataListOverWrite () {
-      this.page = 1
-      this.getDataList()
-    },
     btKeyUpContent (e) {
       e.target.value = e.target.value.replace(/[`~!@#$%^&*()_+=<>?:"{}|·~！@#￥%……&*（）——+={}|《》？：“”【】、；‘’，。、]/g, '')
       this.dataForm.content = e.target.value
diff --git a/src/views/modules/workRecord/resourcesdictionary.vue b/src/views/modules/workRecord/resourcesdictionary.vue
index fc8b7a5d..b2f7a82f 100644
--- a/src/views/modules/workRecord/resourcesdictionary.vue
+++ b/src/views/modules/workRecord/resourcesdictionary.vue
@@ -1,12 +1,12 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__resourcesdictionary}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <el-form-item>
           <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $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:resourcesdictionary:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
diff --git a/src/views/modules/workRecord/weekfile.vue b/src/views/modules/workRecord/weekfile.vue
index 82efa947..d97f67e6 100644
--- a/src/views/modules/workRecord/weekfile.vue
+++ b/src/views/modules/workRecord/weekfile.vue
@@ -1,12 +1,12 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__weekfile}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <el-form-item>
           <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $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:weekfile:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
diff --git a/src/views/modules/workRecord/weekrecorddetail.vue b/src/views/modules/workRecord/weekrecorddetail.vue
index 2480e0e7..b7daf582 100644
--- a/src/views/modules/workRecord/weekrecorddetail.vue
+++ b/src/views/modules/workRecord/weekrecorddetail.vue
@@ -1,12 +1,12 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__weekrecorddetail}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <el-form-item>
           <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $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:weekrecorddetail:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
diff --git a/src/views/modules/workRecord/weekrecordinfo.vue b/src/views/modules/workRecord/weekrecordinfo.vue
index 1978879c..1e290ad7 100644
--- a/src/views/modules/workRecord/weekrecordinfo.vue
+++ b/src/views/modules/workRecord/weekrecordinfo.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__weekrecordinfo}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <!-- <el-form-item>
           <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
         </el-form-item> -->
@@ -43,13 +43,13 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="getDataListOverWrite()">{{ $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:weekrecordinfo:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item> -->
         <el-form-item>
-          <el-button type="success" @click="addHandle('','0','1')">{{ $t('add') }}</el-button>
+          <el-button type="primary" @click="addHandle('','0','1')">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button type="success" @click="exportHandle()">{{ $t('export') }}</el-button>
@@ -170,10 +170,6 @@ export default {
         })
         .catch(() => {})
     },
-    getDataListOverWrite () {
-      this.page = 1
-      this.getDataList()
-    },
     btKeyUpContent (e) {
       e.target.value = e.target.value.replace(/[`~!@#$%^&*()_+=<>?:"{}|·~！@#￥%……&*（）——+={}|《》？：“”【】、；‘’，。、]/g, '')
       this.dataForm.content = e.target.value