From 002f66e66afef6e8ad2beec681c78f36296ded3c Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 23 Jul 2020 16:22:07 +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=AFUI=E8=B0=83=E6=95=B4-=E7=8E=8B=E5=85=AC?=
 =?UTF-8?q?=E5=B3=B0-2020-07-23?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/analysis/user/gridopening.vue     | 46 +++++------
 src/views/modules/analysis/user/party.vue     | 79 ++++++++++---------
 src/views/modules/analysis/user/register.vue  | 50 +++++++-----
 src/views/modules/case/typicalcase-list.vue   | 23 +++---
 src/views/modules/custom/epidemic.vue         | 37 +++++----
 .../custom/gridoperatorinfo-add-or-update.vue |  7 +-
 src/views/modules/custom/gridoperatorinfo.vue | 13 ++-
 src/views/modules/group/group.vue             | 19 +++--
 src/views/modules/group/leaderboard.vue       | 37 +++++----
 src/views/modules/group/topic-list.vue        | 59 +++++++-------
 src/views/modules/kpi/formula.vue             | 24 +++---
 .../modules/kpi/kpicommunitybuilding.vue      | 35 ++++----
 src/views/modules/kpi/kpigridentity.vue       | 35 ++++----
 src/views/modules/kpi/kpipublicopinion.vue    | 35 ++++----
 src/views/modules/kpi/kpitypicalculture.vue   | 36 ++++-----
 src/views/modules/kpi/manualScore.vue         | 29 +++----
 src/views/modules/kpi/manualScoreRule.vue     | 22 +++---
 src/views/modules/kpi/manualscore-zlph.vue    | 21 ++---
 src/views/modules/kpi/resultGrid.vue          | 20 ++---
 src/views/modules/kpi/resultSuperior.vue      | 18 ++---
 src/views/modules/kpi/rule.vue                | 26 +++---
 .../modules/kpi/streetpersiongoalmonth.vue    | 10 +--
 src/views/modules/kpi/streetpersonbase.vue    | 11 ++-
 src/views/modules/kpi/timeLimitItem.vue       | 19 +++--
 .../organize/deptofficer-add-or-update.vue    |  2 +-
 .../modules/organize/deptofficer-add.vue      |  2 +-
 src/views/modules/organize/deptofficer.vue    |  8 +-
 27 files changed, 390 insertions(+), 333 deletions(-)

diff --git a/src/views/modules/analysis/user/gridopening.vue b/src/views/modules/analysis/user/gridopening.vue
index ecc016a6..af53ee9e 100644
--- a/src/views/modules/analysis/user/gridopening.vue
+++ b/src/views/modules/analysis/user/gridopening.vue
@@ -4,27 +4,19 @@
     <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"
                        :props="{ checkStrictly: true }"
-                       clearable></el-cascader>
+                       clearable
+                       style="width:250px"></el-cascader>
         </el-form-item>
-        <br>
-        <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; &nbsp;
         <el-form-item label="排序规则">
           <el-select v-model="dataForm.category"
                      clearable
-                     placeholder="排序规则">
+                     placeholder="排序规则"
+                     style="width:250px">
             <el-option v-for="item in categorys"
                        :key="item.value"
                        :label="item.label"
@@ -32,11 +24,22 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <br>
+        <el-form-item label="提交时间">
+          <el-date-picker @change='setRegistTime'
+                        v-model="time"
+                        value-format="yyyy-MM-dd"
+                        type="daterange"
+                        range-separator="至"
+                        start-placeholder="开始日期"
+                        end-placeholder="结束日期">
+          </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-item>
-          <el-button type="primary"
+          <el-button type="success"
                      @click="exportHandle()">{{ $t('export') }}</el-button>
         </el-form-item>
         <el-form-item>
@@ -59,11 +62,10 @@
                 border
                 @selection-change="dataListSelectionChangeHandle"
                 style="width: 100%;">
-        <el-table-column label="序号"
-                         width="70px">
-          <template slot-scope="scope">
-            {{scope.$index+1}}
-          </template>
+        <el-table-column label="序号" header-align="center" align="center" width="50px">
+            <template slot-scope="scope">
+                {{scope.$index+1}}
+            </template>
         </el-table-column>
         <el-table-column prop="allDeptName"
                          label="网格名称"
@@ -133,12 +135,12 @@
                          align="center"></el-table-column>
         <el-table-column prop="itemCloseCount"
                          label="项目已解决数"
-                         width="100px"
+                         width="120px"
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="itemPendingCount"
                          label="项目待解决数"
-                         width="100px"
+                         width="120px"
                          header-align="center"
                          align="center">
           <template slot-scope="scope">
diff --git a/src/views/modules/analysis/user/party.vue b/src/views/modules/analysis/user/party.vue
index 41eebd2a..2c8a5cba 100644
--- a/src/views/modules/analysis/user/party.vue
+++ b/src/views/modules/analysis/user/party.vue
@@ -11,16 +11,6 @@
                        :props="{ checkStrictly: true }"
                        clearable></el-cascader>
         </el-form-item>
-        <br>
-        <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; &nbsp;
         <el-form-item label="排序规则">
           <el-select v-model="dataForm.category"
                      clearable
@@ -32,17 +22,25 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <br>
+        <el-form-item label="提交时间">
+          <el-date-picker @change='setRegistTime'
+                        v-model="time"
+                        value-format="yyyy-MM-dd"
+                        type="daterange"
+                        range-separator="至"
+                        start-placeholder="开始日期"
+                        end-placeholder="结束日期">
+        </el-date-picker>
+        </el-form-item> 
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary"
-                     @click="exportHandle()">{{ $t('export') }}</el-button>
+          <el-button type="success" @click="exportHandle()">{{ $t('export') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('news:news:save')"
-                     type="primary"
-                     @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button v-if="$hasPermission('news:news:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('news:news:delete')"
@@ -55,28 +53,32 @@
                 border
                 @selection-change="dataListSelectionChangeHandle"
                 style="width: 100%;">
-        <el-table-column label="序号"
-                         width="70px">
-          <template slot-scope="scope">
-            {{scope.$index+1}}
-          </template>
+        <el-table-column label="序号" header-align="center" align="center" width="50px">
+            <template slot-scope="scope">
+                {{scope.$index+1}}
+            </template>
         </el-table-column>
         <el-table-column prop="streetName"
                          label="街道名称"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         min-width="150"
+                         show-overflow-tooltip></el-table-column>
         <el-table-column prop="partyMemberCount"
                          label="注册党员数量（已认证）"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         width="180"></el-table-column>
         <el-table-column prop="oldCount"
                          label="年龄超过50岁党员数量"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         width="180"></el-table-column>
         <el-table-column prop=""
                          label="老龄化比例"
                          header-align="center"
-                         align="center">
+                         align="center"
+                         width="120">
           <template slot-scope="scope">
             {{(scope.row.oldPercent*100).toFixed(2)}}%
           </template>
@@ -84,12 +86,14 @@
         <el-table-column prop="youngCount"
                          label="50岁以下党员数量"
                          header-align="center"
-                         align="center">
+                         align="center"
+                         width="150">
         </el-table-column>
         <el-table-column prop=""
                          label="年轻化比例"
                          header-align="center"
-                         align="center">
+                         align="center"
+                         width="150">
           <template slot-scope="scope">
             {{(scope.row.youngPercent*100).toFixed(2)}}%
           </template>
@@ -98,28 +102,32 @@
                          prop="maleCount"
                          label="男"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         width="50"></el-table-column>
         <el-table-column prop="femaleCount"
                          label="女"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         width="50"></el-table-column>
         <el-table-column prop="unknownSexCount"
                          label="未知性别"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         width="80"></el-table-column>
         <el-table-column prop="partyAuthFailureCount"
                          label="党员认证失败数"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         width="140"></el-table-column>
       </el-table>
-      <el-pagination :current-page="page"
+      <!-- <el-pagination :current-page="page"
                      :page-sizes="[10, 20, 50, 100]"
                      :page-size="limit"
                      :total="total"
                      layout="total, sizes, prev, pager, next, jumper"
                      @size-change="pageSizeChangeHandle"
                      @current-change="pageCurrentChangeHandle">
-      </el-pagination>
+      </el-pagination> -->
       <!-- 弹窗, 新增 / 修改 -->
       <add-or-update v-if="addOrUpdateVisible"
                      ref="addOrUpdate"
@@ -129,7 +137,6 @@
 </template>
 <script>
 import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from '../../news/news-add-or-update'
 export default {
   mixins: [mixinViewModule],
   data () {
@@ -137,7 +144,6 @@ export default {
       mixinViewModuleOptions: {
         getDataListURL: '/analysis/user/page/dataRank',
         getDataListIsPage: true,
-        deleteURL: '/news/news',
         deleteIsBatch: true,
         exportURL: '/analysis/user/export/party'
       },
@@ -384,9 +390,6 @@ export default {
       })
     }
   },
-  components: {
-    AddOrUpdate
-  },
   watch: {
     'deptIdList': function (val) {
       if (val.length !== 0) {
diff --git a/src/views/modules/analysis/user/register.vue b/src/views/modules/analysis/user/register.vue
index b2c8376c..d0945f7f 100644
--- a/src/views/modules/analysis/user/register.vue
+++ b/src/views/modules/analysis/user/register.vue
@@ -55,52 +55,62 @@
                 border
                 @selection-change="dataListSelectionChangeHandle"
                 style="width: 100%;">
-        <el-table-column label="序号"
-                         width="70px">
-          <template slot-scope="scope">
-            {{scope.$index+1}}
-          </template>
+        <el-table-column label="序号" header-align="center" align="center" width="50px">
+            <template slot-scope="scope">
+                {{scope.$index+1}}
+            </template>
         </el-table-column>
         <el-table-column prop="streetName"
                          label="街道"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         min-width="200"
+                         show-overflow-tooltip></el-table-column>
         <el-table-column prop="userCount"
                          label="用户总数"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         width="120"></el-table-column>
         <el-table-column prop="partyMemberCount"
                          label="党员数"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         width="120"></el-table-column>
         <el-table-column prop="residentCount"
                          label="已注册居民"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         width="120"></el-table-column>
         <el-table-column prop="unAuthorizedCount"
                          label="未注册居民"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         width="120"></el-table-column>
         <el-table-column prop="maleCount"
                          label="男"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         width="80"></el-table-column>
         <el-table-column prop="femaleCount"
                          label="女"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         width="80"></el-table-column>
         <el-table-column prop="unknownSexCount"
                          label="未知性别"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         width="80"></el-table-column>
         <el-table-column prop="oldCount"
                          label="年龄超过50岁"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         width="120"></el-table-column>
         <el-table-column prop="oldPercent"
                          label="老龄化比例"
                          header-align="center"
-                         align="center">
+                         align="center"
+                         width="120">
           <template slot-scope="scope">
             {{(scope.row.oldPercent*100).toFixed(2)}}%
           </template>
@@ -108,25 +118,27 @@
         <el-table-column prop="youngCount"
                          label="50岁以下用户数量"
                          header-align="center"
-                         align="center">
+                         align="center"
+                         width="150">
         </el-table-column>
         <el-table-column prop="youngPercent"
                          label="年轻化比例"
                          header-align="center"
-                         align="center">
+                         align="center"
+                         width="120">
           <template slot-scope="scope">
             {{(scope.row.youngPercent*100).toFixed(2)}}%
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination :current-page="page"
+      <!-- <el-pagination :current-page="page"
                      :page-sizes="[10, 20, 50, 100]"
                      :page-size="limit"
                      :total="total"
                      layout="total, sizes, prev, pager, next, jumper"
                      @size-change="pageSizeChangeHandle"
                      @current-change="pageCurrentChangeHandle">
-      </el-pagination>
+      </el-pagination> -->
       <!-- 弹窗, 新增 / 修改 -->
       <add-or-update v-if="addOrUpdateVisible"
                      ref="addOrUpdate"
diff --git a/src/views/modules/case/typicalcase-list.vue b/src/views/modules/case/typicalcase-list.vue
index b6f2f7d1..303ca86c 100644
--- a/src/views/modules/case/typicalcase-list.vue
+++ b/src/views/modules/case/typicalcase-list.vue
@@ -1,18 +1,19 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__typicalcase}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item label="案例标题">
-          <el-input v-model="dataForm.caseTitle" placeholder="请输入" clearable></el-input>
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
+        <el-form-item label="优秀案例标题" label-width="100px">
+          <el-input v-model="dataForm.caseTitle" placeholder="请输入" clearable style="width:230px;"></el-input>
         </el-form-item>
-          <el-form-item label="时间"
-                        prop="startTime">
+        <div>
+          <el-form-item label="创建时间" prop="startTime" label-width="100px">
               <el-date-picker v-model="dataForm.startTime"
                               type="date"
                               :picker-options="pickerBeginDateBefore"
                               value-format="yyyy-MM-dd"
                               format="yyyy-MM-dd"
-                              placeholder="选择日期时间">
+                              placeholder="选择日期时间"
+                              style="width:230px;">
               </el-date-picker>
           </el-form-item>
           <el-form-item label="至"
@@ -23,19 +24,19 @@
                               :picker-options="pickerBeginDateAfter"
                               value-format="yyyy-MM-dd"
                               format="yyyy-MM-dd"
-                              placeholder="选择日期时间">
+                              placeholder="选择日期时间"
+                              style="width:230px;">
               </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-form>
         <!--添加按钮-->
         <el-form-item>
-          <el-button type="primary" @click="addHandle()">{{"新增典型案例"}}</el-button>
+          <el-button type="success" @click="addHandle()">{{"新增典型案例"}}</el-button>
         </el-form-item>
+        </div>
       </el-form>
       <!-- 列表-->
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
diff --git a/src/views/modules/custom/epidemic.vue b/src/views/modules/custom/epidemic.vue
index ef081995..3d2fbf56 100644
--- a/src/views/modules/custom/epidemic.vue
+++ b/src/views/modules/custom/epidemic.vue
@@ -1,22 +1,26 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-custom__epidemic}">
-      <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="区域">
-            <el-cascader v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable>
+          <el-form-item label="区域" label-width="90px">
+            <el-cascader v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable style="width:250px">
             </el-cascader>
           </el-form-item>
+          <el-form-item label="上报人" label-width="90px"><el-input v-model="dataForm.reporter" placeholder="请输入" clearable style="width:250px"></el-input></el-form-item>
+          <el-form-item label="联系方式" label-width="90px"><el-input v-model="dataForm.mobile" placeholder="请输入" clearable style="width:250px"></el-input></el-form-item>
         </div>
         <div class="block">
-          <el-form-item label="时间"
-                        prop="startTime">
+          <el-form-item label="提交时间"
+                        prop="startTime"
+                        label-width="90px">
             <el-date-picker v-model="dataForm.startTime"
                             type="date"
                             :picker-options="pickerBeginDateBefore"
                             value-format="yyyy-MM-dd"
                             format="yyyy-MM-dd"
-                            placeholder="选择日期时间">
+                            placeholder="选择日期时间"
+                            style="width:250px">
             </el-date-picker>
           </el-form-item>
           <el-form-item label="至"
@@ -27,26 +31,25 @@
                             :picker-options="pickerBeginDateAfter"
                             value-format="yyyy-MM-dd"
                             format="yyyy-MM-dd"
-                            placeholder="选择日期时间">
+                            placeholder="选择日期时间"
+                            style="width:250px">
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="提交人"><el-input v-model="dataForm.reporter" placeholder="请输入" clearable></el-input></el-form-item>
-          <el-form-item label="手机号"><el-input v-model="dataForm.mobile" placeholder="请输入" clearable></el-input></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-item>
-            <el-button v-if="$hasPermission('epdc:custom:export')" type="primary" @click="exportHandle()">{{ $t('export') }}</el-button>
+            <el-button v-if="$hasPermission('epdc:custom:export')" type="success" @click="exportHandle()">{{ $t('export') }}</el-button>
           </el-form-item>
         </div>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column prop="allDeptNames" label="区域名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="address" label="上报地点" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="content" 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="reporter" label="上报人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="mobile" label="电话" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="allDeptNames" label="区域名称" header-align="center" align="center" min-width="250" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="address" label="上报地点" header-align="center" align="center" min-width="250" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="content" label="上报内容" header-align="center" align="left" min-width="400" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="createdTime" label="提交时间" header-align="center" align="center" width="180"></el-table-column>
+        <el-table-column prop="reporter" label="上报人" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="mobile" label="联系方式" header-align="center" align="center" width="150"></el-table-column>
       </el-table>
       <el-pagination
         :current-page="page"
diff --git a/src/views/modules/custom/gridoperatorinfo-add-or-update.vue b/src/views/modules/custom/gridoperatorinfo-add-or-update.vue
index c345e7b5..1e5aba1a 100755
--- a/src/views/modules/custom/gridoperatorinfo-add-or-update.vue
+++ b/src/views/modules/custom/gridoperatorinfo-add-or-update.vue
@@ -99,8 +99,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>
@@ -132,6 +131,7 @@ export default {
       loading: false,
       uploadUrl: '',
       options: [],
+      isAble: false,
       dutyCategorys: []
     }
   },
@@ -168,6 +168,7 @@ export default {
       this.getListCategory()
       this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/upload?token=${Cookies.get('token')}`
       this.visible = true
+      this.isAble = false
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
         if (this.dataForm.id) {
@@ -195,8 +196,10 @@ export default {
         if (!valid) {
           return false
         }
+        this.isAble = true
         this.$http[!this.dataForm.id ? 'post' : 'put']('/custom/gridoperatorinfo/', 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/custom/gridoperatorinfo.vue b/src/views/modules/custom/gridoperatorinfo.vue
index 33bd768f..747c42ff 100755
--- a/src/views/modules/custom/gridoperatorinfo.vue
+++ b/src/views/modules/custom/gridoperatorinfo.vue
@@ -4,7 +4,7 @@
     <div class="mod-__gridoperatorinfo}">
       <el-form :inline="true"
                :model="dataForm"
-               @keyup.enter.native="getDataList()">
+               @keyup.enter.native="getDataListSearch()">
         <el-form-item label="区域">
           <el-cascader v-model="ids"
                        :options="options"
@@ -14,11 +14,11 @@
           </el-cascader>
         </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-item>
           <el-button v-if="$hasPermission('custom:gridoperatorinfo:save')"
-                     type="primary"
+                     type="success"
                      @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
@@ -36,6 +36,11 @@
                          header-align="center"
                          align="center"
                          width="50"></el-table-column>
+        <el-table-column label="序号" header-align="center" align="center" width="50px">
+            <template slot-scope="scope">
+                {{scope.$index+1}}
+            </template>
+        </el-table-column>
         <el-table-column prop="realName"
                          label="姓名"
                          header-align="center"
@@ -63,7 +68,7 @@
                          label="网格员类型"
                          header-align="center"
                          align="center"
-                         :formatter="dutyCategoryFormat" width="100"></el-table-column>
+                         :formatter="dutyCategoryFormat" width="150"></el-table-column>
         <el-table-column prop="workUnit"
                          label="工作单位"
                          header-align="center"
diff --git a/src/views/modules/group/group.vue b/src/views/modules/group/group.vue
index c16ee65c..a1f4ec13 100644
--- a/src/views/modules/group/group.vue
+++ b/src/views/modules/group/group.vue
@@ -4,7 +4,7 @@
     <div class="mod-news__group}">
       <el-form :inline="true"
                :model="dataForm"
-               @keyup.enter.native="getDataList()">
+               @keyup.enter.native="getDataListSearch()">
         <el-form-item label="所属机构">
           <el-cascader v-model="ids"
                        :options="options"
@@ -24,7 +24,7 @@
           </el-select>
         </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"
@@ -32,9 +32,11 @@
                 border
                 @selection-change="dataListSelectionChangeHandle"
                 style="width: 100%;">
-        <el-table-column type="index"
-                         width="50"
-                         label="序号"></el-table-column>
+        <el-table-column label="序号" header-align="center" align="center" width="50px">
+            <template slot-scope="scope">
+                {{scope.$index+1}}
+            </template>
+        </el-table-column>
         <el-table-column prop="groupName"
                          label="社群名称"
                          header-align="center"
@@ -43,11 +45,13 @@
                          label="性质"
                          header-align="center"
                          :formatter="formatGroupCategory"
-                         align="center"></el-table-column>
+                         align="center"
+                         width="120"></el-table-column>
         <el-table-column prop="createdTime"
                          label="创建时间"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         width="180"></el-table-column>
         <el-table-column prop="nickname"
                          label="群主"
                          header-align="center"
@@ -56,6 +60,7 @@
                          label="状态"
                          header-align="center"
                          align="center"
+                         width="120"
                          :formatter="formatState"></el-table-column>
         <el-table-column :label="$t('handle')"
                          fixed="right"
diff --git a/src/views/modules/group/leaderboard.vue b/src/views/modules/group/leaderboard.vue
index fb83ca51..2bdf9b62 100644
--- a/src/views/modules/group/leaderboard.vue
+++ b/src/views/modules/group/leaderboard.vue
@@ -1,19 +1,31 @@
 <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-item label="所属机构">
-          <el-cascader v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable>
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
+        <el-form-item label="所属机构" label-width="90px">
+          <el-cascader v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable style="width:250px">
           </el-cascader>
         </el-form-item>
-        <el-form-item label="时间"
+        <el-form-item label="排名类别" label-width="90px">
+          <el-select v-model="orderType" clearable
+                     placeholder="请选择" style="width:250px">
+            <el-option v-for="item in orderTypeOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <br>
+        <el-form-item label="时间" label-width="90px" 
                       prop="startTime">
           <el-date-picker v-model="dataForm.startTime"
                           type="date"
                           :picker-options="pickerBeginDateBefore"
                           value-format="yyyy-MM-dd"
                           format="yyyy-MM-dd"
-                          placeholder="选择日期时间">
+                          placeholder="选择日期时间"
+                          style="width:250px">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="至"
@@ -24,21 +36,12 @@
                           :picker-options="pickerBeginDateAfter"
                           value-format="yyyy-MM-dd"
                           format="yyyy-MM-dd"
-                          placeholder="选择日期时间">
+                          placeholder="选择日期时间"
+                          style="width:250px">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="排名">
-          <el-select v-model="orderType" clearable
-                     placeholder="请选择">
-            <el-option v-for="item in orderTypeOptions"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
-            </el-option>
-          </el-select>
-        </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-if="this.orderType === '0'" v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
diff --git a/src/views/modules/group/topic-list.vue b/src/views/modules/group/topic-list.vue
index a1efd753..1cb81ca3 100644
--- a/src/views/modules/group/topic-list.vue
+++ b/src/views/modules/group/topic-list.vue
@@ -1,35 +1,14 @@
 <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>
+          <el-cascader v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable style="width:200px;">
           </el-cascader>
         </el-form-item>
-        <el-form-item label="时间"
-                      prop="startTime">
-          <el-date-picker v-model="dataForm.startTime"
-                          type="date"
-                          :picker-options="pickerBeginDateBefore"
-                          value-format="yyyy-MM-dd"
-                          format="yyyy-MM-dd"
-                          placeholder="选择日期时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="至"
-                      label-width="25px"
-                      prop="endTime">
-          <el-date-picker v-model="dataForm.endTime"
-                          type="date"
-                          :picker-options="pickerBeginDateAfter"
-                          value-format="yyyy-MM-dd"
-                          format="yyyy-MM-dd"
-                          placeholder="选择日期时间">
-          </el-date-picker>
-        </el-form-item>
         <el-form-item label="群名">
           <el-select v-model="dataForm.groupId" clearable
-                     placeholder="请选择">
+                     placeholder="请选择" style="width:200px;">
             <el-option v-for="item in groupOptions"
                        :key="item.groupId"
                        :label="item.groupName"
@@ -38,10 +17,11 @@
           </el-select>
         </el-form-item>
         <el-form-item label="关键词" prop="keyword">
-          <el-input v-model="dataForm.keyword" placeholder="" clearable ></el-input>
+          <el-input v-model="dataForm.keyword" placeholder="" clearable style="width:200px;"></el-input>
         </el-form-item>
+        <br>
         <el-form-item label="排序方式">
-          <el-select v-model="dataForm.orderType" clearable
+          <el-select v-model="dataForm.orderType" clearable style="width:200px;" 
                      placeholder="请选择">
             <el-option v-for="item in orderTypeOptions"
                        :key="item.id"
@@ -50,11 +30,34 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="时间"
+                      prop="startTime">
+          <el-date-picker v-model="dataForm.startTime"
+                          type="date"
+                          :picker-options="pickerBeginDateBefore"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间"
+                          style="width:200px;">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="至"
+                      label-width="25px"
+                      prop="endTime">
+          <el-date-picker v-model="dataForm.endTime"
+                          type="date"
+                          :picker-options="pickerBeginDateAfter"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间"
+                          style="width:200px;">
+          </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-item>
-          <el-button v-if="$hasPermission('epdc:topic:export')" type="primary" @click="exportHandle()">{{ $t('export') }}</el-button>
+          <el-button v-if="$hasPermission('epdc:topic:export')" type="success" @click="exportHandle()">{{ $t('export') }}</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/kpi/formula.vue b/src/views/modules/kpi/formula.vue
index 542f73ff..0e6673c7 100644
--- a/src/views/modules/kpi/formula.vue
+++ b/src/views/modules/kpi/formula.vue
@@ -1,15 +1,15 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-kpi__kpiformula}">
-      <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.name" placeholder="" clearable></el-input>
         </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-item>
-          <el-button v-if="$hasPermission('kpi:kpiformula:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button v-if="$hasPermission('kpi:kpiformula:save')" type="success" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('kpi:kpiformula:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
@@ -17,13 +17,17 @@
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column type="index" width="50" label="序号"></el-table-column>
-        <el-table-column prop="name" label="公式名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="code" label="公式编码" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="functionName" label="方法名" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="paramAmount" width='50' label="参数数量" header-align="center" align="center" ></el-table-column>
-        <el-table-column prop="description" width='400' 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 label="序号" header-align="center" align="center" width="50px">
+            <template slot-scope="scope">
+                {{scope.$index+1}}
+            </template>
+        </el-table-column>
+        <el-table-column prop="name" label="公式名称" header-align="center" align="center" min-width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="code" label="公式编码" header-align="center" align="center" min-width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="functionName" label="方法名" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="paramAmount"  label="参数数量" header-align="center" align="center" width="100"></el-table-column>
+        <el-table-column prop="description"  label="公式描述" header-align="center" align="center" min-width="400" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center" width="180"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
             <el-button v-if="$hasPermission('kpi:kpiformula:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
diff --git a/src/views/modules/kpi/kpicommunitybuilding.vue b/src/views/modules/kpi/kpicommunitybuilding.vue
index 69f6a61b..09de4c2c 100644
--- a/src/views/modules/kpi/kpicommunitybuilding.vue
+++ b/src/views/modules/kpi/kpicommunitybuilding.vue
@@ -1,9 +1,9 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-kpi__kpicommunitybuilding}">
-      <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="部门">
+          <el-form-item label="部门" label-width="90px">
             <el-cascader
               v-model="deptIdList"
               :options="options"
@@ -13,25 +13,26 @@
             ></el-cascader>
           </el-form-item>
         </el-form-item>
-        <el-form-item label="考核周期起始月">
+        <el-form-item label="考核周期起始月" label-width="120px">
           <el-date-picker v-model="dataForm.monthYear"
               type="month" clearable placeholder="选择月"
               value-format="yyyy-MM"  format="yyyy-MM">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="部门类型" prop="deptTypeKey">
+        <br>
+        <el-form-item label="部门类型" prop="deptTypeKey" label-width="90px">
           <el-select v-model="dataForm.deptTypeKey" placeholder="部门类型" clearable>
             <el-option v-for="item in paramNameArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue" ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataListNew()">{{ $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>
+          <el-button type="success" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="info" @click="exportTemplate()">导出录入模板</el-button>
+          <el-button type="success" @click="exportTemplate()">导出录入模板</el-button>
         </el-form-item>
         <el-form-item>
           <el-upload class="upload-demo"
@@ -55,14 +56,14 @@
                 {{scope.$index+1}}
             </template>
         </el-table-column>
-        <el-table-column prop="deptName" label="部门" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="monthYear" label="年月" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="deptTypeKey" label="部门类型" header-align="center" align="center" :formatter = "stateFormat"></el-table-column>
-        <el-table-column prop="democraticConsultationMechanism" label="民主协商机制分数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="residentConventionSystem" label="居民公约制度分数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="gridNegotiationCase" label="网格协商案例分数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="parentDeptNames" 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="deptName" label="部门" header-align="center" align="center" min-width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="monthYear" label="年月" header-align="center" align="center" width="180"></el-table-column>
+        <el-table-column prop="deptTypeKey" label="部门类型" header-align="center" align="center" :formatter = "stateFormat" width="120"></el-table-column>
+        <el-table-column prop="democraticConsultationMechanism" label="民主协商机制分数" header-align="center" align="center" width="140"></el-table-column>
+        <el-table-column prop="residentConventionSystem" label="居民公约制度分数" header-align="center" align="center" width="140"></el-table-column>
+        <el-table-column prop="gridNegotiationCase" label="网格协商案例分数" header-align="center" align="center" width="140"></el-table-column>
+        <el-table-column prop="parentDeptNames" label="上级部门" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="allDeptNames" label="所有部门" header-align="center" align="center" min-width="150" show-overflow-tooltip></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="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
@@ -131,10 +132,6 @@ export default {
     this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/kpi/kpicommunitybuilding/importManualScoreExcel?token=${Cookies.get('token')}`
   },
   methods: {
-    getDataListNew () {
-      this.page = 1
-      this.getDataList()
-    },
     stateFormat (row, column) {
       for (var i = 0; i < this.paramNameArr.length; i++) {
         if (row.deptTypeKey === this.paramNameArr[i].dictValue) {
diff --git a/src/views/modules/kpi/kpigridentity.vue b/src/views/modules/kpi/kpigridentity.vue
index 8897dac3..0bb77e03 100644
--- a/src/views/modules/kpi/kpigridentity.vue
+++ b/src/views/modules/kpi/kpigridentity.vue
@@ -1,9 +1,9 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-kpi__kpigridentity}">
-      <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="部门">
+          <el-form-item label="部门" label-width="90px">
             <el-cascader
               v-model="deptIdList"
               :options="options"
@@ -13,25 +13,26 @@
             ></el-cascader>
           </el-form-item>
         </el-form-item>
-        <el-form-item label="考核周期起始月">
+        <el-form-item label="考核周期起始月" label-width="120px">
           <el-date-picker v-model="dataForm.monthYear"
               type="month" clearable placeholder="选择月"
               value-format="yyyy-MM"  format="yyyy-MM">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="部门类型" prop="deptTypeKey">
+        <br>
+        <el-form-item label="部门类型" prop="deptTypeKey" label-width="90px">
           <el-select v-model="dataForm.deptTypeKey" placeholder="部门类型" clearable>
             <el-option v-for="item in paramNameArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue" ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataListNew()">{{ $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>
+          <el-button type="success" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="info" @click="exportTemplate()">导出录入模板</el-button>
+          <el-button type="success" @click="exportTemplate()">导出录入模板</el-button>
         </el-form-item>
         <el-form-item>
           <el-upload class="upload-demo"
@@ -55,14 +56,14 @@
                 {{scope.$index+1}}
             </template>
         </el-table-column>
-        <el-table-column prop="deptName" label="部门名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="monthYear" label="年月" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="deptTypeKey" label="部门类型" header-align="center" align="center" :formatter = "stateFormat"></el-table-column>
-        <el-table-column prop="stationEstablishment" label="建站达标分数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="staffingPlacement" label="人员配备分数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="gridOperation" label="网格运行分数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="parentDeptNames" 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="deptName" label="部门名称" header-align="center" align="center" min-width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="monthYear" label="年月" header-align="center" align="center" width="180"></el-table-column>
+        <el-table-column prop="deptTypeKey" label="部门类型" header-align="center" align="center" :formatter = "stateFormat" width="120"></el-table-column>
+        <el-table-column prop="stationEstablishment" label="建站达标分数" header-align="center" align="center" width="120"></el-table-column>
+        <el-table-column prop="staffingPlacement" label="人员配备分数" header-align="center" align="center" width="120"></el-table-column>
+        <el-table-column prop="gridOperation" label="网格运行分数" header-align="center" align="center" width="120"></el-table-column>
+        <el-table-column prop="parentDeptNames" label="上级部门" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="allDeptNames" label="所有部门" header-align="center" align="center" min-width="150" show-overflow-tooltip></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="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
@@ -131,10 +132,6 @@ export default {
     this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/kpi/kpigridentity/importManualScoreExcel?token=${Cookies.get('token')}`
   },
   methods: {
-    getDataListNew () {
-      this.page = 1
-      this.getDataList()
-    },
     stateFormat (row, column) {
       for (var i = 0; i < this.paramNameArr.length; i++) {
         if (row.deptTypeKey === this.paramNameArr[i].dictValue) {
diff --git a/src/views/modules/kpi/kpipublicopinion.vue b/src/views/modules/kpi/kpipublicopinion.vue
index 3e6df9fe..16217601 100644
--- a/src/views/modules/kpi/kpipublicopinion.vue
+++ b/src/views/modules/kpi/kpipublicopinion.vue
@@ -1,9 +1,9 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-kpi__kpipublicopinion}">
-      <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="部门">
+          <el-form-item label="部门" label-width="90px">
             <el-cascader
               v-model="deptIdList"
               :options="options"
@@ -13,25 +13,26 @@
             ></el-cascader>
           </el-form-item>
         </el-form-item>
-        <el-form-item label="考核周期起始月">
+        <el-form-item label="考核周期起始月" label-width="120px">
           <el-date-picker v-model="dataForm.monthYear"
               type="month" clearable placeholder="选择月"
               value-format="yyyy-MM"  format="yyyy-MM">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="部门类型" prop="deptTypeKey">
+        <br>
+        <el-form-item label="部门类型" prop="deptTypeKey" label-width="90px">
           <el-select v-model="dataForm.deptTypeKey" placeholder="部门类型" clearable>
             <el-option v-for="item in paramNameArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue" ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataListNew()">{{ $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>
+          <el-button type="success" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="info" @click="exportTemplate()">导出录入模板</el-button>
+          <el-button type="success" @click="exportTemplate()">导出录入模板</el-button>
         </el-form-item>
         <el-form-item>
           <el-upload class="upload-demo"
@@ -55,14 +56,14 @@
                 {{scope.$index+1}}
             </template>
         </el-table-column>
-        <el-table-column prop="deptName" label="部门名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="deptTypeKey" label="部门类型" header-align="center" align="center" :formatter = "stateFormat"></el-table-column>
-        <el-table-column prop="monthYear" label="年月" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="publicityFoundation" label="宣传基础分数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="innovationBreakthrough" label="创新突破分数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="publicOpinionResponse" label="舆情应对分数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="parentDeptNames" 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="deptName" label="部门名称" header-align="center" align="center" min-width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="deptTypeKey" label="部门类型" header-align="center" align="center" :formatter = "stateFormat" width="120"></el-table-column>
+        <el-table-column prop="monthYear" label="年月" header-align="center" align="center" width="180"></el-table-column>
+        <el-table-column prop="publicityFoundation" label="宣传基础分数" header-align="center" align="center" width="120"></el-table-column>
+        <el-table-column prop="innovationBreakthrough" label="创新突破分数" header-align="center" align="center" width="120"></el-table-column>
+        <el-table-column prop="publicOpinionResponse" label="舆情应对分数" header-align="center" align="center" width="120"></el-table-column>
+        <el-table-column prop="parentDeptNames" label="上级部门" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="allDeptNames" label="所有部门" header-align="center" align="center" min-width="150" show-overflow-tooltip></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="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
@@ -131,10 +132,6 @@ export default {
     this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/kpi/kpipublicopinion/importManualScoreExcel?token=${Cookies.get('token')}`
   },
   methods: {
-    getDataListNew () {
-      this.page = 1
-      this.getDataList()
-    },
     stateFormat (row, column) {
       for (var i = 0; i < this.paramNameArr.length; i++) {
         if (row.deptTypeKey === this.paramNameArr[i].dictValue) {
diff --git a/src/views/modules/kpi/kpitypicalculture.vue b/src/views/modules/kpi/kpitypicalculture.vue
index b62a15b0..7464e370 100644
--- a/src/views/modules/kpi/kpitypicalculture.vue
+++ b/src/views/modules/kpi/kpitypicalculture.vue
@@ -1,9 +1,9 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-kpi__kpitypicalculture}">
-      <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="部门">
+        <el-form-item label="部门" label-width="90px">
           <el-cascader
             v-model="deptIdList"
             :options="options"
@@ -12,35 +12,35 @@
             clearable
           ></el-cascader>
         </el-form-item>
-        <el-form-item label="考核周期起始年">
+        <el-form-item label="考核周期起始年" label-width="110px">
           <el-date-picker v-model="dataForm.year"
               type="year" clearable placeholder="选择年"
               value-format="yyyy"  format="yyyy">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="部门类型" prop="deptTypeKey">
+        <el-form-item label="部门类型" prop="deptTypeKey" label-width="90px">
           <el-select v-model="dataForm.deptTypeKey" placeholder="部门类型" clearable>
             <el-option v-for="item in paramNameArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue" ></el-option>
           </el-select>
         </el-form-item>
         </div>
-        <el-form-item label="加分类别" prop="bonusCategory">
+        <el-form-item label="加分类别" prop="bonusCategory" label-width="90px">
             <el-select v-model="dataForm.bonusCategory" placeholder="加分类别" clearable>
               <el-option v-for="item in bonusCategoryArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue" >
               </el-option>
             </el-select>
         </el-form-item>
-        <el-form-item label="加分级别" prop="bonusLevel">
+        <el-form-item label="加分级别" prop="bonusLevel" label-width="110px">
             <el-select v-model="dataForm.bonusLevel" placeholder="加分级别" clearable>
               <el-option v-for="item in bonusLevelArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue" >
               </el-option>
             </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataListNew()">{{ $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>
+          <el-button type="success" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('kpi:kpitypicalculture:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
@@ -52,14 +52,14 @@
                 {{scope.$index+1}}
             </template>
         </el-table-column>
-        <el-table-column prop="deptName" label="部门名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="deptTypeKey" label="部门类别" header-align="center" align="center" :formatter = "deptTypeKeyFormat"></el-table-column>
-        <el-table-column prop="year" label="年份" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="bonusCategory" label="加分类别" header-align="center" align="center" :formatter = "bonusCategoryFormat"></el-table-column>
-        <el-table-column prop="bonus" label="加分分值" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="bonusLevel" label="加分级别" header-align="center" align="center" :formatter = "bonusLevelFormat"></el-table-column>
-        <el-table-column prop="parentDeptNames" 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="deptName" label="部门名称" header-align="center" align="center" min-width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="deptTypeKey" label="部门类别" header-align="center" align="center" :formatter = "deptTypeKeyFormat" width="120"></el-table-column>
+        <el-table-column prop="year" label="年份" header-align="center" align="center" width="180"></el-table-column>
+        <el-table-column prop="bonusCategory" label="加分类别" header-align="center" align="center" :formatter = "bonusCategoryFormat" width="120"></el-table-column>
+        <el-table-column prop="bonus" label="加分分值" header-align="center" align="center" width="120"></el-table-column>
+        <el-table-column prop="bonusLevel" label="加分级别" header-align="center" align="center" :formatter = "bonusLevelFormat" width="120"></el-table-column>
+        <el-table-column prop="parentDeptNames" label="上级部门" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="allDeptNames" label="所有部门" header-align="center" align="center" min-width="150" show-overflow-tooltip></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="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
@@ -130,10 +130,6 @@ export default {
     this.getBonusLevelListInfo('bonus_level')
   },
   methods: {
-    getDataListNew () {
-      this.page = 1
-      this.getDataList()
-    },
     deptTypeKeyFormat (row, column) {
       for (var i = 0; i < this.paramNameArr.length; i++) {
         if (row.deptTypeKey === this.paramNameArr[i].dictValue) {
diff --git a/src/views/modules/kpi/manualScore.vue b/src/views/modules/kpi/manualScore.vue
index 2522ed36..dc6393d7 100644
--- a/src/views/modules/kpi/manualScore.vue
+++ b/src/views/modules/kpi/manualScore.vue
@@ -1,8 +1,8 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-kpi__kpimanualscore}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item label="所属机构">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
+        <el-form-item label="所属机构" label-width="110px">
           <el-cascader
             v-model="deptIdList"
             :options="options"
@@ -10,7 +10,7 @@
             clearable
           ></el-cascader>
         </el-form-item>
-        <el-form-item label="考核规则名称">
+        <el-form-item label="考核规则名称" label-width="110px">
           <el-select clearable v-model="dataForm.ruleId">
             <el-option
               v-for="item in kpiManualRuleList"
@@ -20,23 +20,24 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="考核周期起始月">
+        <br>
+        <el-form-item label="考核周期起始月" label-width="110px">
           <el-date-picker v-model="dataForm.scoreStartDate"
               type="month" clearable placeholder="选择月"
               value-format="yyyy-MM"  format="yyyy-MM">
           </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-item>
-          <el-button v-if="$hasPermission('kpi:kpimanualscore:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button v-if="$hasPermission('kpi:kpimanualscore:save')" type="success" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('kpi:kpimanualscore:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('kpi:kpimanualscore:export')" type="info" @click="exportTemplate()">导出录入模板</el-button>
+          <el-button v-if="$hasPermission('kpi:kpimanualscore:export')" type="success" @click="exportTemplate()">导出录入模板</el-button>
         </el-form-item>
         <el-form-item>
           <el-upload class="upload-demo"
@@ -53,13 +54,13 @@
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="allDeptNames" label="部门名称" header-align="center" align="center"  width="400"></el-table-column>
-        <el-table-column prop="ruleName" label="考核规则名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="kpiCycle" label="考核周期" header-align="center" align="center"  width="100" :formatter="showKpiCycleFormatter"></el-table-column>
-        <el-table-column prop="scoreStartDate" label="考核起始日" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="scoreEndDate" label="考核终止日" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="score" label="得分" header-align="center" align="center"  width="50"></el-table-column>
-        <el-table-column prop="createdTime" label="打分时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="allDeptNames" label="部门名称" header-align="center" align="center" min-width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="ruleName" label="考核规则名称" header-align="center" align="center" width="120"></el-table-column>
+        <el-table-column prop="kpiCycle" label="考核周期" header-align="center" align="center"  width="120" :formatter="showKpiCycleFormatter"></el-table-column>
+        <el-table-column prop="scoreStartDate" label="考核起始日" header-align="center" align="center" width="180"></el-table-column>
+        <el-table-column prop="scoreEndDate" label="考核终止日" header-align="center" align="center" width="180"></el-table-column>
+        <el-table-column prop="score" label="得分" header-align="center" align="center"  width="100"></el-table-column>
+        <el-table-column prop="createdTime" label="打分时间" header-align="center" align="center" width="180"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
             <el-button v-if="$hasPermission('kpi:kpimanualscore:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
diff --git a/src/views/modules/kpi/manualScoreRule.vue b/src/views/modules/kpi/manualScoreRule.vue
index 1ca55d94..381ddce5 100644
--- a/src/views/modules/kpi/manualScoreRule.vue
+++ b/src/views/modules/kpi/manualScoreRule.vue
@@ -1,15 +1,15 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-kpi__kpimanualscorerule}">
-      <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.scoreName" placeholder="考核名称" clearable></el-input>
         </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-item>
-          <el-button v-if="$hasPermission('kpi:kpimanualscorerule:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button v-if="$hasPermission('kpi:kpimanualscorerule:save')" type="success" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('kpi:kpimanualscorerule:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
@@ -17,15 +17,19 @@
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column type="index" width="50" label="序号"></el-table-column>
+        <el-table-column label="序号" header-align="center" align="center" width="50px">
+            <template slot-scope="scope">
+                {{scope.$index+1}}
+            </template>
+        </el-table-column>
         <el-table-column prop="id" label="主键" header-align="center" align="center" v-if="false"></el-table-column>
-        <el-table-column prop="scoreName" label="考核名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="deptTypeKey" label="考核部门类别" header-align="center" align="center" :formatter="showDeptTypeKeyFormatter"></el-table-column>
-        <el-table-column prop="scoreCycle" label="考核周期" header-align="center" align="center" :formatter="showScoreCycleFormatter"></el-table-column>
-        <el-table-column prop="fullMarks" label="满分" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="scoreName" label="考核名称" header-align="center" align="center" min-width="200" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="deptTypeKey" label="考核部门类别" header-align="center" align="center" :formatter="showDeptTypeKeyFormatter" width="130"></el-table-column>
+        <el-table-column prop="scoreCycle" label="考核周期" header-align="center" align="center" :formatter="showScoreCycleFormatter" width="100"></el-table-column>
+        <el-table-column prop="fullMarks" label="满分" header-align="center" align="center" width="100"></el-table-column>
         <el-table-column prop="revision" label="乐观锁" header-align="center" align="center" v-if="false"></el-table-column>
         <el-table-column prop="createdBy" label="创建人" header-align="center" align="center" v-if="false"></el-table-column>
-        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center" width="180"></el-table-column>
         <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center" v-if="false"></el-table-column>
         <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center" v-if="false"></el-table-column>
         <el-table-column prop="delFlag" label="删除标记" header-align="center" align="center" v-if="false"></el-table-column>
diff --git a/src/views/modules/kpi/manualscore-zlph.vue b/src/views/modules/kpi/manualscore-zlph.vue
index 527ffc8f..4eb340e6 100644
--- a/src/views/modules/kpi/manualscore-zlph.vue
+++ b/src/views/modules/kpi/manualscore-zlph.vue
@@ -1,9 +1,9 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-__manualscore}">
-      <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="所属机构">
+          <el-form-item label="所属机构" label-width="120px">
             <el-cascader
               v-model="deptIdList"
               :options="options"
@@ -13,13 +13,14 @@
             ></el-cascader>
           </el-form-item>
         </el-form-item>
-        <el-form-item label="考核周期起始月">
+        <el-form-item label="考核周期起始月" label-width="120px">
           <el-date-picker v-model="dataForm.month"
               type="month" clearable placeholder="选择月"
               value-format="yyyy-MM"  format="yyyy-MM">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="被打分机构类型">
+        <br>
+        <el-form-item label="被打分机构类型" label-width="120px">
           <el-select v-model="dataForm.deptType">
             <el-option
               v-for="item in kpiManualRuleList"
@@ -30,13 +31,13 @@
           </el-select>
         </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-item>
-          <el-button v-if="$hasPermission('manualscore-zlph:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button v-if="$hasPermission('manualscore-zlph:save')" type="success" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
           <el-form-item>
-          <el-button type="info" @click="exportTemplate()">导出录入模板</el-button>
+          <el-button type="success" @click="exportTemplate()">导出录入模板</el-button>
         </el-form-item>
         <el-form-item>
           <el-upload class="upload-demo"
@@ -54,11 +55,11 @@
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
         <!-- <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column> -->
         <el-table-column prop="deptName" label="被打分部门" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="month" :formatter="showMonthYMD" label="考核起始日" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="month" :formatter="showMonthYMD" label="考核起始日" header-align="center" align="center" width="180"></el-table-column>
         <!-- <el-table-column prop="year" label="考核年度" header-align="center" align="center"></el-table-column> -->
-        <el-table-column prop="scoreType" label="考核打分类型" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="scoreType" label="考核打分类型" header-align="center" align="center" width="120"></el-table-column>
         <el-table-column prop="creatorDeptName" label="打分的部门名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="score" label="得分" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="score" label="得分" header-align="center" align="center" width="120"></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="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button></template>
diff --git a/src/views/modules/kpi/resultGrid.vue b/src/views/modules/kpi/resultGrid.vue
index 2dbacd6e..622599cf 100644
--- a/src/views/modules/kpi/resultGrid.vue
+++ b/src/views/modules/kpi/resultGrid.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-kpi__kpiresultgrid}">
-      <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="deptIdList"
@@ -17,21 +17,21 @@
           </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-item>
-          <el-button v-if="$hasPermission('kpi:gridResult:export')" type="primary" @click="tableExport()">{{ $t('export') }}</el-button>
+          <el-button v-if="$hasPermission('kpi:gridResult:export')" type="success" @click="tableExport()">{{ $t('export') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column prop="allDeptNames" label="所属机构" header-align="center" align="center" width="440"></el-table-column>
-        <el-table-column prop="leaderName" label="网格长" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="startDate" label="考核周期开始日" header-align="center" align="center" :formatter="startDateFormat"></el-table-column>
-        <el-table-column prop="endDate" label="考核周期结束日" header-align="center" align="center" :formatter="endDateFormat"></el-table-column>
+        <el-table-column prop="allDeptNames" label="所属机构" header-align="center" align="center" min-width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="leaderName" label="网格长" header-align="center" align="center" width="130"></el-table-column>
+        <el-table-column prop="startDate" label="考核周期开始日" header-align="center" align="center" :formatter="startDateFormat" width="180"></el-table-column>
+        <el-table-column prop="endDate" label="考核周期结束日" header-align="center" align="center" :formatter="endDateFormat" width="180"></el-table-column>
         <!-- 手动打分 -->
-        <el-table-column prop="manualScore" label="基层党建工作职责得分" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="workScore" label="平时工作得分" header-align="center" align="center" width="160"></el-table-column>
-        <el-table-column prop="finalScore" label="总分" header-align="center" align="center" width="160"></el-table-column>
+        <el-table-column prop="manualScore" label="基层党建工作职责得分" header-align="center" align="center" width="170"></el-table-column>
+        <el-table-column prop="workScore" label="平时工作得分" header-align="center" align="center" width="150"></el-table-column>
+        <el-table-column prop="finalScore" label="总分" header-align="center" align="center" width="120"></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="detailQuery(scope.row.id)">详情</el-button>
diff --git a/src/views/modules/kpi/resultSuperior.vue b/src/views/modules/kpi/resultSuperior.vue
index 6f95c849..0793eb55 100644
--- a/src/views/modules/kpi/resultSuperior.vue
+++ b/src/views/modules/kpi/resultSuperior.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-kpi__kpiresultsuperior}">
-      <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="deptIdList"
@@ -17,19 +17,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-item>
-          <el-button v-if="$hasPermission('kpi:gridResult:export')" type="primary" @click="tableExport()">{{ $t('export') }}</el-button>
+          <el-button v-if="$hasPermission('kpi:gridResult:export')" type="success" @click="tableExport()">{{ $t('export') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column prop="allDeptNames" label="所属机构" header-align="center" align="center" width="440"></el-table-column>
-        <el-table-column prop="finalScore" label="最终得分" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="startDate" label="考核周期开始日" header-align="center" :formatter="startDateFormat" align="center"></el-table-column>
-        <el-table-column prop="endDate" label="考核周期结束日" header-align="center" :formatter="endDateFormat" align="center"></el-table-column>
-        <el-table-column prop="kpiCycle" label="考核周期" header-align="center" :formatter="kpiCycleFormat" align="center"></el-table-column>
-        <el-table-column prop="deptTypeKey" label="机构类别" header-align="center" :formatter="deptTypeKeyFormat" align="center"></el-table-column>
+        <el-table-column prop="allDeptNames" label="所属机构" header-align="center" align="center" min-width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="finalScore" label="最终得分" header-align="center" align="center" width="120"></el-table-column>
+        <el-table-column prop="startDate" label="考核周期开始日" header-align="center" :formatter="startDateFormat" align="center" width="180"></el-table-column>
+        <el-table-column prop="endDate" label="考核周期结束日" header-align="center" :formatter="endDateFormat" align="center" width="180"></el-table-column>
+        <el-table-column prop="kpiCycle" label="考核周期" header-align="center" :formatter="kpiCycleFormat" align="center" width="120"></el-table-column>
+        <el-table-column prop="deptTypeKey" label="机构类别" header-align="center" :formatter="deptTypeKeyFormat" align="center" width="120"></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="detailQuery(scope.row.id)">详情</el-button>
diff --git a/src/views/modules/kpi/rule.vue b/src/views/modules/kpi/rule.vue
index 12426c9a..4507c9f7 100644
--- a/src/views/modules/kpi/rule.vue
+++ b/src/views/modules/kpi/rule.vue
@@ -4,23 +4,23 @@
     <div class="mod-kpi__kpirule}">
       <el-form :inline="true"
                :model="dataForm"
-               @keyup.enter.native="getDataList()">
+               @keyup.enter.native="getDataListSearch()">
         <el-form-item label="考核规则名称">
           <el-input v-model="dataForm.ruleName"
                     placeholder="考核规则名称"
                     clearable></el-input>
         </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-item>
           <el-button v-if="$hasPermission('kpi:kpirule:save')"
-                     type="primary"
+                     type="success"
                      @click="addOrUpdateHandle('0')">新增公式规则</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('kpi:kpirule:save')"
-                     type="primary"
+                     type="success"
                      @click="addOrUpdateHandle('1')">新增手动打分规则</el-button>
         </el-form-item>
         <el-form-item>
@@ -40,15 +40,18 @@
                          width="50"></el-table-column>
         <el-table-column type="index"
                          width="50"
+                         align="center"
                          label="序号"></el-table-column>
         <el-table-column prop="ruleName"
                          label="规则名称"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         min-width="150" show-overflow-tooltip></el-table-column>
         <el-table-column prop="ruleName"
                          label="考核类别"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         min-width="150" show-overflow-tooltip></el-table-column>
         <el-table-column prop="ruleMode"
                          width="100"
                          label="生成方式"
@@ -58,9 +61,10 @@
         <el-table-column prop="referenceName"
                          label="引用"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         min-width="150" show-overflow-tooltip></el-table-column>
         <el-table-column prop="kpiCycle"
-                         width="50"
+                         width="100"
                          label="考核周期"
                          header-align="center"
                          align="center"
@@ -69,11 +73,13 @@
                          label="考核部门类别"
                          header-align="center"
                          align="center"
-                         :formatter="showDeptTypeKeyFormatter"></el-table-column>
+                         :formatter="showDeptTypeKeyFormatter"
+                         min-width="120" show-overflow-tooltip></el-table-column>
         <el-table-column prop="createdTime"
                          label="创建时间"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         width="180"></el-table-column>
         <el-table-column :label="$t('handle')"
                          fixed="right"
                          header-align="center"
diff --git a/src/views/modules/kpi/streetpersiongoalmonth.vue b/src/views/modules/kpi/streetpersiongoalmonth.vue
index 240de973..fd32473f 100644
--- a/src/views/modules/kpi/streetpersiongoalmonth.vue
+++ b/src/views/modules/kpi/streetpersiongoalmonth.vue
@@ -7,13 +7,13 @@
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="streetGoalScore" border @selection-change="dataListSelectionChangeHandle" @cell-click="clickCell" style="width: 100%;">
-        <el-table-column prop='monthYear' label="日期" width="100" header-align="center"></el-table-column>
+        <el-table-column prop='monthYear' label="日期" width="120" header-align="center" align="center"></el-table-column>
         <el-table-column v-for="(header, index) in headerContent" :key="index" :label="header.street" header-align="center">
-          <el-table-column :prop="header.streetId+'-ResidentGoalNum'" label="群众目标数" header-align="center"></el-table-column>
-          <el-table-column :prop="header.streetId+'-PartyGoalNum'" label="党员目标数" header-align="center"></el-table-column>
-          <el-table-column :prop="header.streetId+'-CompanyGoalNum'" label="企业目标数" header-align="center"></el-table-column>
+          <el-table-column :prop="header.streetId+'-ResidentGoalNum'" label="群众目标数" header-align="center" align="center" width="100"></el-table-column>
+          <el-table-column :prop="header.streetId+'-PartyGoalNum'" label="党员目标数" header-align="center" align="center" width="100"></el-table-column>
+          <el-table-column :prop="header.streetId+'-CompanyGoalNum'" label="企业目标数" header-align="center" align="center" width="100"></el-table-column>
         </el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="100">
+        <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="addOrUpdateHandle(scope.row.monthYear)" :disabled="scope.row.isDisabled=='0'">批量设置</el-button>
           </template>
diff --git a/src/views/modules/kpi/streetpersonbase.vue b/src/views/modules/kpi/streetpersonbase.vue
index e18c9d94..93502d80 100644
--- a/src/views/modules/kpi/streetpersonbase.vue
+++ b/src/views/modules/kpi/streetpersonbase.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-__streetpersonbase}">
-      <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="deptIdList"
@@ -11,13 +11,18 @@
           ></el-cascader>
         </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-item>
-          <el-button v-if="$hasPermission('streetpersonbase:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button v-if="$hasPermission('streetpersonbase:save')" type="success" @click="addOrUpdateHandle()">{{ $t('add') }}</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="序号" header-align="center" align="center" width="50px">
+            <template slot-scope="scope">
+                {{scope.$index+1}}
+            </template>
+        </el-table-column>
         <el-table-column prop="street" label="街道" header-align="center" align="center"></el-table-column>
         <el-table-column prop="residentBaseNum" label="群众底数" header-align="center" align="center"></el-table-column>
         <el-table-column prop="partyBaseNum" label="党员底数" header-align="center" align="center"></el-table-column>
diff --git a/src/views/modules/kpi/timeLimitItem.vue b/src/views/modules/kpi/timeLimitItem.vue
index ea960a5a..66bef29e 100644
--- a/src/views/modules/kpi/timeLimitItem.vue
+++ b/src/views/modules/kpi/timeLimitItem.vue
@@ -1,17 +1,17 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-kpi__kpitimelimititem}">
-      <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="categoryId">
           <div class="block">
             <el-cascader clearable v-model="categoryIds" placeholder="试试搜索：城市管理" :props="{ checkStrictly: true }" :options="categoryOptions" filterable></el-cascader>
           </div>
         </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-item>
-          <el-button v-if="$hasPermission('kpi:kpitimelimititem:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button v-if="$hasPermission('kpi:kpitimelimititem:save')" type="success" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('kpi:kpitimelimititem:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
@@ -19,10 +19,15 @@
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="allCategoryNames" label="所属类别" width="500" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="validRespondTime" label="有效响应时间(h)" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="validCloseTime"  label="有效结案时间(h)" 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 label="序号" header-align="center" align="center" width="50px">
+            <template slot-scope="scope">
+                {{scope.$index+1}}
+            </template>
+        </el-table-column>
+        <el-table-column prop="allCategoryNames" label="所属类别" header-align="center" align="center" min-width="250" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="validRespondTime" label="有效响应时间(h)" header-align="center" align="center" width="180"></el-table-column>
+        <el-table-column prop="validCloseTime"  label="有效结案时间(h)" header-align="center" align="center" width="180"></el-table-column>
+        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center" width="180"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
             <el-button v-if="$hasPermission('kpi:kpitimelimititem:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
diff --git a/src/views/modules/organize/deptofficer-add-or-update.vue b/src/views/modules/organize/deptofficer-add-or-update.vue
index d618afca..a89e11c7 100644
--- a/src/views/modules/organize/deptofficer-add-or-update.vue
+++ b/src/views/modules/organize/deptofficer-add-or-update.vue
@@ -112,6 +112,7 @@ export default {
   methods: {
     init () {
       this.visible = true
+      this.isAble = false
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
         if (this.dataForm.id) {
@@ -148,7 +149,6 @@ export default {
             type: 'success',
             duration: 500,
             onClose: () => {
-              this.isAble = false
               this.visible = false
               this.$emit('refreshDataList')
             }
diff --git a/src/views/modules/organize/deptofficer-add.vue b/src/views/modules/organize/deptofficer-add.vue
index e6faf460..1dc634f4 100644
--- a/src/views/modules/organize/deptofficer-add.vue
+++ b/src/views/modules/organize/deptofficer-add.vue
@@ -115,6 +115,7 @@ export default {
   methods: {
     init () {
       this.visible = true
+      this.isAble = false
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
         if (this.dataForm.id) {
@@ -151,7 +152,6 @@ export default {
             type: 'success',
             duration: 500,
             onClose: () => {
-              this.isAble = false
               this.visible = false
               this.$emit('refreshDataList')
             }
diff --git a/src/views/modules/organize/deptofficer.vue b/src/views/modules/organize/deptofficer.vue
index 87a47dbc..2adbf5d6 100644
--- a/src/views/modules/organize/deptofficer.vue
+++ b/src/views/modules/organize/deptofficer.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-sys__deptofficer}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListOverWrite()">
         <div>
         <el-form-item>
           <el-button type="primary" @click="backToDeptList">返回</el-button>
@@ -32,7 +32,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button @click="getDataListOverWrite()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <!-- <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button> -->
@@ -111,6 +111,10 @@ export default {
     deptofficerAdd
   },
   methods: {
+    getDataListOverWrite () {
+      this.page = 1
+      this.getDataList()
+    },
     showFlagFormat (row, column) {
       if (row.sex === '0') {
         return '女'