From b879c1b0c43b8d57d8ed1665ddc54bc220043037 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Thu, 11 Aug 2022 17:27:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/gridScoreDetail.vue            | 27 +++++++------------
 .../components/gridScoreManage.vue            |  4 ++-
 .../components/gridScoreStatistics.vue        |  9 +++----
 3 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreDetail.vue b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreDetail.vue
index f6664669..7bc959a9 100644
--- a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreDetail.vue
+++ b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreDetail.vue
@@ -34,22 +34,22 @@
       <template #content>
         <ai-search-bar>
           <template #left>
-            <ai-select v-model="search.type" placeholder="请选择类型" @change="page.current=1,getIntegralChange()" 
-            :selectList="dict.getDict('integralDetailType')"/>
+            <ai-select v-model="search.type" placeholder="请选择类型" @change="search.current=1,getIntegralChange()" 
+            :selectList="dict.getDict('integralType')"/>
           </template>
           <template #right>
-            <ai-download :instance="instance" url="" :params="search" fileName="网格员积分"
+            <ai-download :instance="instance" :url="`/app/appintegraluser/changeIntegralExport?id=${$route.query.id}`" :params="search" fileName="网格员余额变动明细"
                          :disabled="tableData.length == 0">
               <el-button size="small">导出</el-button>
             </ai-download>
           </template>
         </ai-search-bar>
-        <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size"
+        <ai-table :tableData="tableData" :total="search.total" :current.sync="search.current" :size.sync="search.size"
                   @getList="getTableData" :col-configs="colConfigs" :dict="dict">
 
           <el-table-column slot="eventDesc" label="事件" align="center">
             <template slot-scope="{ row }">
-              <span>{{ row.integralType == 3 ? row.integralRuleName : row.integralType == 0? row.eventDesc : '' }}</span>
+              <span>{{ row.integralType == 3 ? row.integralRuleNamesearch : row.integralType == 0? row.eventDesc : '' }}</span>
             </template>
           </el-table-column>
         </ai-table>
@@ -70,10 +70,8 @@ export default {
         name: '',
         girdId: '',
         type: '',
-      },
-      page: {
-        current: 1, 
-        size: 10, 
+        current: 1,
+        size: 10,
         total: 0
       },
       girdList: [],
@@ -93,7 +91,7 @@ export default {
     colConfigs() {
       return [
         { prop: "doTime", label: '时间', align: "left", width: "200px" },
-        { prop: "integralType", label: '类型', align: "center", width: "240px", dict:"integralDetailType"},
+        { prop: "integralType", label: '类型', align: "center", width: "240px", dict:"integralType"},
         { prop: "changeIntegral", label: '变动积分', align: "center",width: "200px",render: (h, { row }) => {
           return h('span', {}, `${row.integralCalcType == 1 ? '+' : '-'}${row.changeIntegral}`)
         }},
@@ -103,7 +101,7 @@ export default {
     }
   },
   created() {
-    this.$dict.load('integralDetailType')
+    this.$dict.load('integralType')
     this.getDetail()
     this.getIntegralChange()
   },
@@ -128,8 +126,7 @@ export default {
     getIntegralChange() {
       this.instance.post(`/app/appintegraluser/getChangeDetail`, null, {
         params: {
-          ...this.page,
-          type: this.search.type,  //积分类型
+          ...this.search,  //积分类型
           id: this.$route.query.id,
         }
       }).then(res => {
@@ -205,10 +202,6 @@ export default {
       this.myChart.resize()
     },
 
-    getTableData() {},
-
-    getListInit() {},
-
     cancel(isRefresh) {
       this.$emit('change', {
         type: 'gridScoreManage',
diff --git a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue
index 0659fc9d..e8a88d81 100644
--- a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue
+++ b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue
@@ -12,7 +12,7 @@
             <el-input size="small" placeholder="请输入居民名称或真实姓名" v-model="search.userName" clearable
               @clear="page.current = 1, search.userName = '', getTableData()" suffix-icon="iconfont iconSearch"
               v-throttle="() => {(page.current = 1), getTableData();}"/>
-            <ai-download :instance="instance" url="" :params="search" fileName="网格员积分"
+            <ai-download :instance="instance" url="`/app/appintegraluser/girdIntegralExport" :params="search" fileName="网格员积分"
                          :disabled="tableData.length == 0">
               <el-button size="small">导出</el-button>
             </ai-download>
@@ -96,6 +96,8 @@ export default {
       search: {
         userName: '',
         girdId: '',
+        current: 1, 
+        size: 10,
       },
       tableData: [],
       page: {current: 1, size: 10, total: 0},
diff --git a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue
index 7db99476..c0a775b7 100644
--- a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue
+++ b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue
@@ -59,7 +59,7 @@
             <el-cascader ref="cascader2" v-model="search.girdId" :options="girdOptions" placeholder="所属网格" size="small" 
               :props="defaultProps" :show-all-levels="false" clearable @change="gridChangeOpt"></el-cascader>
             <ai-select v-model="search.integralType" placeholder="请选择类型" @change="page.current=1, getTableData()" 
-            :selectList="dict.getDict('integralDetailType')"/>
+            :selectList="dict.getDict('integralType')"/>
             <el-date-picker v-model="time" size="small" type="daterange" value-format="yyyy-MM-dd" 
               range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="onChange">
             </el-date-picker>
@@ -173,7 +173,7 @@ export default {
         { prop: "integralUserName", label: '姓名', align: "left", width: "200px" },
         { prop: "girdName", label: '所属网格', align: "center", width: "180px" },
         { prop: "eventDesc", label: '事件', align: "center",width: "200px" },
-        { prop: "integralType", label: '类型', align: "center",width: "200px", dict:"integralDetailType" },
+        { prop: "integralType", label: '类型', align: "center",width: "200px", dict:"integralType" },
         //   render: (h, {row}) => {
         //       return h('span', {
         //         style: {
@@ -189,7 +189,7 @@ export default {
     }
   },
   created() {
-    this.$dict.load('epidemicDangerousAreaLevel').then(() => {
+    this.$dict.load('epidemicDangerousAreaLevel','integralType').then(() => {
       this.getStatistics()
       this.getGridList()
       this.getRanking()
@@ -379,7 +379,7 @@ export default {
       this.getStatistics()
       this.getRanking()
     },
-
+    // 所有网格
     getGridList() {
       this.instance.post(`/app/appgirdinfo/listAll3`).then((res) => {
         if (res.code == 0) {
@@ -468,7 +468,6 @@ export default {
 
 <style lang="scss" scoped>
 .gridScoreStatistics {
-
   height: 100%;
   box-sizing: border-box;
   padding-top: 20px;