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

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

@@ -21,7 +21,7 @@
       <div class="title">
         <h4>事件汇总</h4>
         <div class="timecSelect">
-          时间：<el-date-picker size="small" value-format="yyyy-MM-dd" @change="timeChange" v-model="timeList" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+          时间：<el-date-picker size="small" value-format="yyyy-MM-dd" @change="timeChange" v-model="timeList" type="daterange" range-separator="至" :start-placeholder="startPla" :end-placeholder="endPla"></el-date-picker>
         </div>
       </div>
       <div class="bar_Box">
@@ -71,6 +71,7 @@
 </template>
 
 <script>
+import dayjs from "dayjs";
 import * as echarts from 'echarts';
 export default {
   name: "gridScoreDetail",
@@ -93,6 +94,8 @@ export default {
       endTime: '',
       xData: [],
       yData: [],
+      startPla: '',
+      endPla: ''
     }
   },
   props: {
@@ -113,10 +116,16 @@ export default {
     }
   },
   created() {
-    this.$dict.load('integralType')
-    this.getDetail()
-    this.getIntegralChange()
-    this.getEventSummary()
+    this.$dict.load('integralType').then(() => {
+      this.getDetail()
+      this.getIntegralChange()
+      this.getEventSummary()
+      let nowTime = dayjs().format('YYYY-MM-DD')
+      let timeAgo = dayjs().subtract(29, 'day').format('YYYY-MM-DD')
+      this.startPla = timeAgo
+      this.endPla = nowTime
+    })
+    
   },
   methods: {
     // 详情
@@ -197,16 +206,12 @@ export default {
           data: xData,
         },
         yAxis: {
-          type: 'value'
+          type: 'value',
         },
         series: [
           {
             data: yData,
             type: 'bar',
-            showBackground: true,
-            backgroundStyle: {
-              color: 'rgba(180, 180, 180, 0.2)'
-            },
             itemStyle: {
               normal: {
                 color: "#5087ec",

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

@@ -18,7 +18,7 @@
             </ai-download>
           </template>
         </ai-search-bar>
-        <ai-table :tableData="tableData" :total="page.total" :current.sync="current" :size.sync="page.size"
+        <ai-table :tableData="tableData" :total="total" :current.sync="current" :size.sync="size"
                   @getList="getTableData()" :col-configs="colConfigs" :dict="dict" @sort-change="changeTableSort">
 
           
@@ -90,7 +90,8 @@ export default {
       },
       girdIdList: [],
       tableData: [],
-      page: {size: 10, total: 0},
+      size: 10, 
+      total: 0,
       current: 1,
       girdList: [],
       form: {
@@ -124,9 +125,9 @@ export default {
       return [
         { prop: "userName", label: '姓名', align: "left",  },
         { prop: "girdName", label: '所属网格' },
-        { prop: "integral", label: '积分余额', align: "center", sortable: true },
-        { prop: "totalIntegral", label: '累计积分', align: "center", sortable: true },
-        { prop: "usedIntegral", label: '已用积分', align: "center", sortable: true  },
+        { prop: "integral", label: '积分余额', align: "center", sortable: "custom" },
+        { prop: "totalIntegral", label: '累计积分', align: "center", sortable: "custom" },
+        { prop: "usedIntegral", label: '已用积分', align: "center", sortable: "custom"  },
         { slot: "options" },
       ]
     },
@@ -144,14 +145,15 @@ export default {
     getTableData() {
       this.instance.post(`/app/appintegraluser/integralManager`,null,{
         params: {
-          ...this.page,
           ...this.search,
           current: this.current,
+          size: this.size,
+          total: this.total
         }
       }).then(res => {
         if(res?.data) {
           this.tableData = res.data.records
-          this.page.total = res.data.total
+          this.total = res.data.total
         }
       })
     },

packages/meta/AppResident/AppResident.vue

@@ -1,8 +1,7 @@
 <template>
   <section class="AppResident">
     <ai-list v-if="!showDetail" isTabs>
-      <ai-title slot="title" title="居民档案" :instance="instance" :hideLevel="hideLevel-1" isShowArea
-                v-model="areaId"/>
+      <ai-title slot="title" title="居民档案" :instance="instance" :hideLevel="hideLevel-1" :isShowArea="permissions('app_datastatistics')" v-model="areaId"/>
       <template #tabs>
         <el-tabs v-model="activeName">
           <el-tab-pane v-for="op in tabs" :key="op.value" :name="op.value" :label="op.label">
@@ -67,14 +66,14 @@ export default {
           comp: ResidentList,
           detail: ResidentDetail
         })),
-        {label: "居民统计", value: "3", comp: ResidentSta},
+        {label: "居民统计", value: "3", comp: ResidentSta, permit: "app_datastatistics"},
         {label: "居民档案审核", value: "4", comp: auditList, detail: auditDetail, permit: "app_appresident_examine"}
       ].filter(e => !e.permit || this.permissions(e.permit))
     }
   },
   created() {
     this.activeName = this.$route.query?.type
-    this.areaId = this.$copy(this.user.info.areaId)
+    this.areaId = this.permissions("app_datastatistics") ? this.$copy(this.user.info.areaId) : ""
     this.dict.load('residentType', "sex", "faithType", "fileStatus", "legality", "education", "maritalStatus",
         "politicsStatus", "householdName", "nation", "liveReason", "certificateType", "job", "militaryStatus",
         "householdRelation", "logoutReason", "nation", "registerStatus", "residentTipType", "liveCategory",