diff --git a/src/views/modules/analysis/issue/hottest-issue-list.vue b/src/views/modules/analysis/issue/hottest-issue-list.vue
index 20ef8e7c..ba0e9590 100644
--- a/src/views/modules/analysis/issue/hottest-issue-list.vue
+++ b/src/views/modules/analysis/issue/hottest-issue-list.vue
@@ -1,16 +1,17 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__topic}">
-      <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-cascader v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable filterable>
           </el-cascader>
         </el-form-item>
         <el-form-item label="议题摘要" prop="topicContent">
-          <el-input v-model="dataForm.issueContent" placeholder="请输入关键字模糊搜索" clearable ></el-input>
+          <el-input v-model="dataForm.issueContent" placeholder="议题摘要" clearable ></el-input>
         </el-form-item>
+        <br>
         <el-form-item label="时间"
-                      prop="startTime">
+                      prop="startTime" label-width="68px">
           <el-date-picker v-model="dataForm.startTime"
                           type="date"
                           :picker-options="pickerBeginDateBefore"
@@ -31,20 +32,20 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary" @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%;">
         <el-table-column label="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column>
-        <el-table-column prop="issueContent" label="议题摘要" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="allDeptNames" label="来源网格" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="nickName" label="发言人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdTime" label="发布时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="issueContent" label="议题摘要" min-width=400 show-overflow-tooltip header-align="center" align="center"></el-table-column>
+        <el-table-column prop="allDeptNames" label="来源网格" width=400 show-overflow-tooltip header-align="center" align="center"></el-table-column>
+        <el-table-column prop="nickName" label="发言人" width=180 show-overflow-tooltip header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdTime" label="发布时间" width=180 header-align="center" align="center"></el-table-column>
         <el-table-column prop="approveNum" label="支持总数" header-align="center" align="center"></el-table-column>
         <el-table-column prop="opposeNum" label="反对总数" header-align="center" align="center"></el-table-column>
         <el-table-column prop="commentNum" label="评论总数" header-align="center" align="center"></el-table-column>
         <el-table-column prop="browseNum" label="浏览总数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="expressAttitudeNum" label="表达态度总数" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="expressAttitudeNum" label="表达态度总数" width=120 header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click="detailAction(scope.row.id)">{{ $t('look') }}</el-button>
diff --git a/src/views/modules/analysis/issue/latest-issue-list.vue b/src/views/modules/analysis/issue/latest-issue-list.vue
index 10c7850c..bea9bd65 100644
--- a/src/views/modules/analysis/issue/latest-issue-list.vue
+++ b/src/views/modules/analysis/issue/latest-issue-list.vue
@@ -1,16 +1,17 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__topic}">
-      <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-cascader v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable filterable>
           </el-cascader>
         </el-form-item>
         <el-form-item label="议题摘要" prop="topicContent">
-          <el-input v-model="dataForm.issueContent" placeholder="请输入关键字模糊搜索" clearable ></el-input>
+          <el-input v-model="dataForm.issueContent" placeholder="议题摘要" clearable ></el-input>
         </el-form-item>
+        <br>
         <el-form-item label="时间"
-                      prop="startTime">
+                      prop="startTime" label-width="68px">
           <el-date-picker v-model="dataForm.startTime"
                           type="date"
                           :picker-options="pickerBeginDateBefore"
@@ -31,20 +32,20 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary" @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%;">
         <el-table-column label="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column>
-        <el-table-column prop="issueContent" label="议题摘要" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="allDeptNames" label="来源网格" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="nickName" label="发言人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdTime" label="发布时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="issueContent" label="议题摘要" min-width=400 show-overflow-tooltip header-align="center" align="center"></el-table-column>
+        <el-table-column prop="allDeptNames" label="来源网格" width=400 show-overflow-tooltip header-align="center" align="center"></el-table-column>
+        <el-table-column prop="nickName" label="发言人" width=180 show-overflow-tooltip header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdTime" label="发布时间" width=180 header-align="center" align="center"></el-table-column>
         <el-table-column prop="approveNum" label="支持总数" header-align="center" align="center"></el-table-column>
         <el-table-column prop="opposeNum" label="反对总数" header-align="center" align="center"></el-table-column>
         <el-table-column prop="commentNum" label="评论总数" header-align="center" align="center"></el-table-column>
         <el-table-column prop="browseNum" label="浏览总数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="expressAttitudeNum" label="表达态度总数" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="expressAttitudeNum" label="表达态度总数"  width=120 header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click="detailAction(scope.row.id)">{{ $t('look') }}</el-button>
diff --git a/src/views/modules/analysis/item/hottest-item-list.vue b/src/views/modules/analysis/item/hottest-item-list.vue
index 344969ee..57a76184 100644
--- a/src/views/modules/analysis/item/hottest-item-list.vue
+++ b/src/views/modules/analysis/item/hottest-item-list.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__topic}">
-      <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-cascader v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable filterable>
           </el-cascader>
@@ -9,8 +9,9 @@
         <el-form-item label="项目摘要" prop="topicContent">
           <el-input v-model="dataForm.searchContent" placeholder="请输入关键字模糊搜索" clearable ></el-input>
         </el-form-item>
+        <br>
         <el-form-item label="时间"
-                      prop="startTime">
+                      prop="startTime" label-width="68px">
           <el-date-picker v-model="dataForm.startTime"
                           type="date"
                           :picker-options="pickerBeginDateBefore"
@@ -31,20 +32,20 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary" @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%;">
         <el-table-column label="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column>
-        <el-table-column prop="itemContent" label="项目摘要" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="allDeptNames" label="来源网格" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="nickName" label="发言人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="releaseTime" label="发布时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="itemContent" label="项目摘要" min-width=400 show-overflow-tooltip header-align="center" align="center"></el-table-column>
+        <el-table-column prop="allDeptNames" label="来源网格" width=400 show-overflow-tooltip header-align="center" align="center"></el-table-column>
+        <el-table-column prop="nickName" label="发言人" width=180 show-overflow-tooltip header-align="center" align="center"></el-table-column>
+        <el-table-column prop="releaseTime" label="发布时间" width=180 header-align="center" align="center"></el-table-column>
         <el-table-column prop="approveNum" label="支持总数" header-align="center" align="center"></el-table-column>
         <el-table-column prop="opposeNum" label="反对总数" header-align="center" align="center"></el-table-column>
         <el-table-column prop="commentNum" label="评论总数" header-align="center" align="center"></el-table-column>
         <el-table-column prop="browseNum" label="浏览总数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="expressAttitudeNum" label="表达态度总数" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="expressAttitudeNum" label="表达态度总数" width=120 header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click="look(scope.row.id)">{{ $t('look') }}</el-button>
diff --git a/src/views/modules/analysis/item/report-solved-item-list.vue b/src/views/modules/analysis/item/report-solved-item-list.vue
index 73f08a20..c2a9e91c 100644
--- a/src/views/modules/analysis/item/report-solved-item-list.vue
+++ b/src/views/modules/analysis/item/report-solved-item-list.vue
@@ -40,7 +40,7 @@
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
         <el-table-column label="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column>
-        <el-table-column prop="itemContent" label="项目内容" min-width=400 show-overflow-tooltip header-align="center" align="center"></el-table-column>
+        <el-table-column prop="itemContent" label="项目内容"  min-width=400 show-overflow-tooltip header-align="center" align="center"></el-table-column>
         <el-table-column prop="createdTime" label="转项目时间" width=180 header-align="center" align="center"></el-table-column>
         <el-table-column prop="grid" label="网格名称" width=180 show-overflow-tooltip header-align="center" align="center"></el-table-column>
         <el-table-column prop="reportDept" label="上报部门" width=180 show-overflow-tooltip header-align="center" align="center"></el-table-column>
diff --git a/src/views/modules/analysis/topic/hottest-topic-list.vue b/src/views/modules/analysis/topic/hottest-topic-list.vue
index 4f3add1e..9ec39727 100644
--- a/src/views/modules/analysis/topic/hottest-topic-list.vue
+++ b/src/views/modules/analysis/topic/hottest-topic-list.vue
@@ -1,16 +1,17 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__topic}">
-      <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-cascader v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable filterable>
           </el-cascader>
         </el-form-item>
         <el-form-item label="话题摘要" prop="topicContent">
-          <el-input v-model="dataForm.topicContent" placeholder="请输入关键字模糊搜索" clearable ></el-input>
+          <el-input v-model="dataForm.topicContent" placeholder="话题摘要" clearable ></el-input>
         </el-form-item>
+        <br>
         <el-form-item label="时间"
-                      prop="startTime">
+                      prop="startTime" label-width="68px">
           <el-date-picker v-model="dataForm.startTime"
                           type="date"
                           :picker-options="pickerBeginDateBefore"
@@ -31,19 +32,19 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary" @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%;">
         <el-table-column label="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column>
-        <el-table-column prop="topicContent" label="话题摘要" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="allDeptNames" label="来源网格" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="groupName" label="话题来源群名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="nickName" label="发言人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="releaseTime" label="发布时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="topicContent" label="话题摘要" min-width=400 show-overflow-tooltip header-align="center" align="center"></el-table-column>
+        <el-table-column prop="allDeptNames" label="来源网格" width=400 show-overflow-tooltip header-align="center" align="center"></el-table-column>
+        <el-table-column prop="groupName" label="话题来源群名称" width=180 show-overflow-tooltip header-align="center" align="center"></el-table-column>
+        <el-table-column prop="nickName" label="发言人" width=180 show-overflow-tooltip header-align="center" align="center"></el-table-column>
+        <el-table-column prop="releaseTime" label="发布时间" width=180 header-align="center" align="center"></el-table-column>
         <el-table-column prop="commentNum" label="评论数" header-align="center" align="center"></el-table-column>
         <el-table-column prop="browseNum" label="浏览数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="expressAttitudeNum" label="表达态度总数" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="expressAttitudeNum" label="表达态度总数" width=120 header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click="look(scope.row.id)">{{ $t('look') }}</el-button>
diff --git a/src/views/modules/analysis/topic/latest-topic-list.vue b/src/views/modules/analysis/topic/latest-topic-list.vue
index 02bf46c5..3d297fa7 100644
--- a/src/views/modules/analysis/topic/latest-topic-list.vue
+++ b/src/views/modules/analysis/topic/latest-topic-list.vue
@@ -1,16 +1,17 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__topic}">
-      <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-cascader v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable filterable>
           </el-cascader>
         </el-form-item>
         <el-form-item label="话题摘要" prop="topicContent">
-          <el-input v-model="dataForm.topicContent" placeholder="请输入关键字模糊搜索" clearable ></el-input>
+          <el-input v-model="dataForm.topicContent" placeholder="话题摘要" clearable ></el-input>
         </el-form-item>
+        <br>
         <el-form-item label="时间"
-                      prop="startTime">
+                      prop="startTime" label-width="68px">
           <el-date-picker v-model="dataForm.startTime"
                           type="date"
                           :picker-options="pickerBeginDateBefore"
@@ -31,19 +32,19 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary" @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%;">
         <el-table-column label="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column>
-        <el-table-column prop="topicContent" label="话题摘要" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="allDeptNames" label="来源网格" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="groupName" label="话题来源群名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="nickName" label="发言人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="releaseTime" label="发布时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="topicContent" label="话题摘要" min-width=400 show-overflow-tooltip header-align="center" align="center"></el-table-column>
+        <el-table-column prop="allDeptNames" label="来源网格" width=400 show-overflow-tooltip header-align="center" align="center"></el-table-column>
+        <el-table-column prop="groupName" label="话题来源群名称" width=180 show-overflow-tooltip header-align="center" align="center"></el-table-column>
+        <el-table-column prop="nickName" label="发言人" width=180 show-overflow-tooltip header-align="center" align="center"></el-table-column>
+        <el-table-column prop="releaseTime" label="发布时间" width=180 header-align="center" align="center"></el-table-column>
         <el-table-column prop="commentNum" label="评论数" header-align="center" align="center"></el-table-column>
         <el-table-column prop="browseNum" label="浏览数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="expressAttitudeNum" label="表达态度总数" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="expressAttitudeNum" label="表达态度总数" width=120 header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click="look(scope.row.id)">{{ $t('look') }}</el-button>
diff --git a/src/views/modules/analysis/user/gridopening.vue b/src/views/modules/analysis/user/gridopening.vue
index af53ee9e..4d6843e0 100644
--- a/src/views/modules/analysis/user/gridopening.vue
+++ b/src/views/modules/analysis/user/gridopening.vue
@@ -44,6 +44,7 @@
         </el-form-item>
         <el-form-item>
           <el-button type="primary"
+                     :disabled="isAble"
                      @click="getAllCount()">总计</el-button>
         </el-form-item>
         <el-form-item>
@@ -166,7 +167,7 @@
                      ref="addOrUpdate"
                      @refreshDataList="getDataList"></add-or-update>
       <!-- 总计表格 -->
-      <el-dialog :visible.sync="totalVisible"
+      <el-dialog :visible.sync="totalVisible" @close="changeDialog()"
                  title="总计">
         <el-table :data="totalList"
                   border
@@ -178,16 +179,17 @@
                            align="center"></el-table-column>
           <el-table-column prop="unWorkGridCount"
                            label="未开通网格"
+                           width="120px"
                            header-align="center"
                            align="center"></el-table-column>
           <el-table-column prop="registerCount"
                            label="注册用户数"
-                           width="70px"
+                           width="120px"
                            header-align="center"
                            align="center"></el-table-column>
           <el-table-column prop="residentCount"
                            label="认证居民数"
-                           width="70px"
+                           width="120px"
                            header-align="center"
                            align="center"></el-table-column>
           <el-table-column prop="partyCount"
@@ -197,12 +199,12 @@
                            align="center"></el-table-column>
           <el-table-column prop="unAuthorizedCount"
                            label="未认证用户数"
-                           width="70px"
+                           width="120px"
                            header-align="center"
                            align="center"></el-table-column>
           <el-table-column prop="newsCount"
                            label="新闻发布数"
-                           width="70px"
+                           width="120px"
                            header-align="center"
                            align="center"></el-table-column>
           <el-table-column prop="communityCount"
@@ -212,17 +214,17 @@
                            align="center"></el-table-column>
           <el-table-column prop="communityMemberCount"
                            label="群成员数"
-                           width="70px"
+                           width="120px"
                            header-align="center"
                            align="center"></el-table-column>
           <el-table-column prop="communityTopicCount"
                            label="群话题数"
-                           width="70px"
+                           width="120px"
                            header-align="center"
                            align="center"></el-table-column>
           <el-table-column prop="eventCount"
                            label="议题总数"
-                           width="70px"
+                           width="120px"
                            header-align="center"
                            align="center"></el-table-column>
           <el-table-column prop="itemCount"
@@ -232,12 +234,12 @@
                            align="center"></el-table-column>
           <el-table-column prop="itemCloseCount"
                            label="项目已解决数"
-                           width="70px"
+                           width="120px"
                            header-align="center"
                            align="center"></el-table-column>
           <el-table-column prop="itemPendingCount"
                            label="项目待解决数"
-                           width="70px"
+                           width="120px"
                            header-align="center"
                            align="center">
             <template slot-scope="scope">
@@ -253,7 +255,7 @@
         </el-table>
         <template slot="footer">
           <el-button type="primary"
-                     @click="totalVisible = false">确定</el-button>
+                     @click= "changeDialog()">确定</el-button>
         </template>
       </el-dialog>
     </div>
@@ -276,6 +278,7 @@ export default {
       dataForm: {
         category: '1'
       },
+      isAble:false,
       time: '',
       options: [],
       deptIdList: [],
@@ -312,6 +315,10 @@ export default {
     // this.getListCategory()
   },
   methods: {
+    changeDialog(){
+      this.totalVisible = false
+      this.isAble = false
+    },
     initTime () {
       const end = new Date()
       const start = new Date()
@@ -420,6 +427,7 @@ export default {
     },
     // 获取总计
     getAllCount () {
+      this.isAble = true
       this.$http.get(`/analysis/user/pageGridDataToal`, {
         params: {
           order: this.order,
@@ -430,6 +438,7 @@ export default {
         }
       }).then(({ data: res }) => {
         if (res.code !== 0) {
+          this.isAble = false
           return this.$message.error(res.msg)
         }
         this.totalList = []
diff --git a/src/views/modules/custom/epidemicsentrypost.vue b/src/views/modules/custom/epidemicsentrypost.vue
index 8a72258c..5575f175 100644
--- a/src/views/modules/custom/epidemicsentrypost.vue
+++ b/src/views/modules/custom/epidemicsentrypost.vue
@@ -6,7 +6,7 @@
     :close-on-press-escape="false"
   >
     <el-form :inline="true" :model="dataForm">
-      <el-form-item>
+      <el-form-item label="哨卡编码">
         <el-input v-model="dataForm.sentryPostCode" placeholder="哨卡编码" clearable></el-input>
       </el-form-item>
       <el-form-item>
diff --git a/src/views/modules/kpi/streetpersonbase-add-or-update.vue b/src/views/modules/kpi/streetpersonbase-add-or-update.vue
index fb347eff..b4dd513b 100644
--- a/src/views/modules/kpi/streetpersonbase-add-or-update.vue
+++ b/src/views/modules/kpi/streetpersonbase-add-or-update.vue
@@ -21,7 +21,7 @@
       </el-form>
     <template slot="footer">
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
-      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()" :disabled="isAble">{{ $t('confirm') }}</el-button>
     </template>
   </el-dialog>
 </template>
@@ -41,6 +41,7 @@ export default {
         partyBaseNum: '',
         companyBaseNum: ''
       },
+      isAble:false,
       // 所属机构配置
       deptIdOptions: [],
       deptIdList: []
@@ -90,6 +91,7 @@ export default {
   methods: {
     init () {
       this.visible = true
+        this.isAble = false
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
         if (this.dataForm.id) {
@@ -116,8 +118,10 @@ export default {
         if (!valid) {
           return false
         }
+          this.isAble = true
         this.$http[!this.dataForm.id ? 'post' : 'put']('/kpi/streetpersonbase/', this.dataForm).then(({ data: res }) => {
           if (res.code !== 0) {
+              this.isAble = false
             return this.$message.error(res.msg)
           }
           this.$message({
diff --git a/src/views/modules/kpi/streetpersonbase.vue b/src/views/modules/kpi/streetpersonbase.vue
index 93502d80..d7c4703d 100644
--- a/src/views/modules/kpi/streetpersonbase.vue
+++ b/src/views/modules/kpi/streetpersonbase.vue
@@ -2,7 +2,7 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-__streetpersonbase}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
-        <el-form-item label="所属机构">
+        <el-form-item label="街道">
           <el-cascader
             v-model="deptIdList"
             :options="options"
diff --git a/src/views/modules/news/banner-add-or-update.vue b/src/views/modules/news/banner-add-or-update.vue
index 0070dec3..4cae3afc 100644
--- a/src/views/modules/news/banner-add-or-update.vue
+++ b/src/views/modules/news/banner-add-or-update.vue
@@ -105,7 +105,7 @@
     </el-form>
     <template slot="footer">
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
-      <el-button type="primary"
+      <el-button type="primary" :disabled="isAble"
                  @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
     </template>
   </el-dialog>
@@ -133,6 +133,7 @@ export default {
         position: '0',
         allDeptIdsShow: []
       },
+      isAble:false,
       bannerOptions: [],
       streetList: [],
       communityList: [],
@@ -189,6 +190,7 @@ export default {
     init () {
       this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/upload?token=${Cookies.get('token')}`
       this.visible = true
+      this.isAble = false
       this.$nextTick(() => {
         this.dataForm.communityId = this.dataForm.streetId = this.dataForm.gridId = null
         this.communityList = this.gridList = []
@@ -225,8 +227,10 @@ export default {
         if (!valid) {
           return false
         }
+        this.isAble = true
         this.$http[!this.dataForm.id ? 'post' : 'put']('/news/banner/', this.dataForm).then(({ data: res }) => {
           if (res.code !== 0) {
+            this.isAble = false
             return this.$message.error(res.msg)
           }
           this.$message({
diff --git a/src/views/modules/points/volunteer-points-log.vue b/src/views/modules/points/volunteer-points-log.vue
index 5687e09d..a3d68e36 100644
--- a/src/views/modules/points/volunteer-points-log.vue
+++ b/src/views/modules/points/volunteer-points-log.vue
@@ -5,7 +5,7 @@
     :close-on-click-modal="false"
     :close-on-press-escape="false"
   >
-    <el-form :model="dataForm" ref="dataForm" :label-width="$i18n.locale === 'en-US' ? '100px' : '80px'">
+    <el-form :model="dataForm" ref="dataForm" :label-width="$i18n.locale === 'en-US' ? '100px' : '80px'" :inline="true">
       <el-form-item label="积分行为">
         <el-select v-model="dataForm.behaviorCode" placeholder="全部" clearable @change="queryByBehaviorCode">
             <el-option
@@ -16,6 +16,10 @@
             </el-option>
         </el-select>
       </el-form-item>
+      <el-form-item>
+      <el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
+    </el-form-item>
+
     </el-form>
     <el-table  v-loading="dataListLoading" :data="dataList" border style="width: 100%;">
       <el-table-column type="index" width="50" label="序号"></el-table-column>