Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev

packages/conv/creditScore/AppGridMemberScore/components/gridScoreDetail.vue

@@ -1,21 +1,19 @@
 <template>
   <section class="gridScoreDetail">
-    <!-- <ai-list> -->
+    <ai-title slot="title" title="网格员积分详情" isShowBottomBorder :isShowBack="true" @onBackClick="cancel(false)"/>
-      <ai-title slot="title" title="网格员积分详情" isShowBottomBorder :isShowBack="true" @onBackClick="cancel(false)"/>
-    <!-- </ai-list> -->
     <el-row style="margin-top: 20px;">
       <div class="card_list">
         <div class="card">
-          <h2>上报事件</h2>
+          <h2>姓名</h2>
-          <p class="color1">20</p>
+          <p class="color1">{{ data.userName }}</p>
         </div>
         <div class="card">
-          <h2>办结事件</h2>
+          <h2>积分余额</h2>
-          <p class="color2">5</p>
+          <p class="color2">{{ data.integral }}</p>
         </div>
         <div class="card">
-          <h2>待办事件</h2>
+          <h2>已用积分</h2>
-          <p class="color3">0</p>
+          <p class="color3">{{ data.usedIntegral }}</p>
         </div>
       </div>
     </el-row>
@@ -82,6 +80,7 @@ export default {
       page: {current: 1, size: 10, total: 0},
       girdList: [],
       time: '',
+      data: {},
     }
   },
   props: {
@@ -100,7 +99,18 @@ export default {
       ]
     }
   },
+  created() {
+    this.getDetail()
+  },
   methods: {
+    getDetail() {
+      this.instance.post(`/app/appintegraluser/girdDetail?id=${id}`).then(res=>{
+        if(res?.data) {
+          this.data = res.data
+        }
+      })
+    },
+
     getColEcherts() {
       let chartDom = document.getElementById('chartDom');
       chartDom.style.width = window.innerWidth - 335 + "px";

packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue

@@ -44,7 +44,7 @@
     </el-row>
 
     <ai-card>
-      <ai-title slot="title" title="积分明细" isShowBottomBorder/>
+      <ai-title slot="title" title="积分明细"/>
       <template #content>
         <ai-search-bar>
           <template #left>
@@ -120,6 +120,7 @@
 </template>
 
 <script>
+import { mapState } from "vuex"
 import * as echarts from 'echarts';
 export default {
   name: "gridScoreStatistics",
@@ -147,10 +148,14 @@ export default {
       currrntTime: '0',
       dialog: false,
       dialogDate: false,
-      timeList: ''
+      timeList: '',
+      startTime: '',
+      endTime: '',
+      data: {},
     }
   },
   computed: {
+    ...mapState(['user']),
     colConfigs() {
       return [
         { prop: "", label: '姓名', align: "left", width: "200px" },
@@ -166,8 +171,24 @@ export default {
   },
   created() {
     this.$dict.load('epidemicDangerousAreaLevel')
+    this.getStatistics()
   },
   methods: {
+    // 统计接口
+    getStatistics() {
+      this.instance.post('/app/appintegraluser/allGirdIntegral',null, {
+        params: {
+          type: 0,
+          girdId: this.user.info.girdId,
+          startTime: this.startTime,
+          endTime: this.endTime,
+        }
+      }).then(res => {
+        if(res?.data) {
+          this.data = res.data
+        }
+      })
+    },
     getColEcherts1() {
       let chartDom1 = document.getElementById('chart1');
       chartDom1.style.width = (window.innerWidth - 435) / 2 + "px";