Merge remote-tracking branch 'origin/dev' into dev

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

@@ -165,6 +165,7 @@ export default {
       if(this.timeList.length) {
         this.startTime = this.timeList[0]
         this.endTime = this.timeList[1]
+        this.getEventSummary()
       }
     },
 

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

@@ -72,6 +72,18 @@
         </ai-search-bar>
         <ai-table :tableData="tableData" :total="page.total" :current.sync="current" :size.sync="page.size"
                   @getList="getTableData" :col-configs="colConfigs" :dict="dict">
+          <el-table-column slot="eventDesc" label='事件' align="center" width="400px" show-overflow-tooltip>
+            <template slot-scope="{ row }">
+              <span v-if="row.integralType == 0">{{ row.eventDesc }}</span>
+              <span v-else>{{ row.eventName }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column slot="integralType" label="类型" align="center">
+            <template slot-scope="{ row }">
+              <span v-if="row.integralType == 0">积分调整</span>
+              <span v-else>{{ row.eventType }}</span>
+            </template>
+          </el-table-column>
           <el-table-column slot="changeIntegral" label="积分变动" align="center">
             <template slot-scope="{ row }">
               <span>{{ row.integralCalcType == 1 ? '+' : '-' }}{{ row.changeIntegral }}</span>
@@ -179,8 +191,8 @@ export default {
       return [
         { 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:"integralType" },
+        { slot: "eventDesc"},
+        { slot: "integralType", label: '类型' },
         { slot: "changeIntegral", label: '积分变动', align: "center", },
         { prop: "nowIntegral", label: '剩余积分', align: "center", },
         { prop: "createTime", label: '时间', align: "center", },
@@ -189,7 +201,7 @@ export default {
     }
   },
   created() {
-    this.$dict.load('epidemicDangerousAreaLevel','integralType').then(() => {
+    this.$dict.load('epidemicDangerousAreaLevel','integralType','integralRuleEvent','integralRuleEventType').then(() => {
       this.getStatistics()
       this.getGridList()
       this.getRanking()