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

packages/bigscreen/designer/components/SourceData.vue

@@ -401,20 +401,23 @@
         this.$refs.form.validate((valid) => {
           if (valid) {
             let configs = []
-            this.filedList.forEach(item => {
-              if (item.value.length) {
-                item.value.forEach(v => {
-                  configs.push({
-                    alias: item.fieldCnName,
-                    calcType: v,
-                    fieldCnName: item.fieldCnName,
-                    fieldName: item.fieldName,
-                    dictCode: item.dictCode,
-                    orderType: this.orderType
+
+            if (this.filedList.length) {
+              this.filedList.forEach(item => {
+                if (item.value.length) {
+                  item.value.forEach(v => {
+                    configs.push({
+                      alias: item.fieldCnName,
+                      calcType: v,
+                      fieldCnName: item.fieldCnName,
+                      fieldName: item.fieldName,
+                      dictCode: item.dictCode,
+                      orderType: this.orderType
+                    })
                   })
-                })
-              }
-            })
+                }
+              })
+            }
 
             this.instance.post(`${this.urlPrefix}/appdiylargescreen/addOrUpdateDatasource`, {
               ...this.form,

packages/jianping/AppAssessment/components/List.vue

@@ -1,14 +1,14 @@
 <template>
   <ai-list class="notice">
     <template slot="title">
-      <ai-title title="走访排查情况统计" isShowBottomBorder :isShowArea="true" isShowBack @onBackClick="back" v-model="search.areaId" :instance="instance" @change="getList"></ai-title>
+      <ai-title title="走访排查情况统计" isShowBottomBorder isShowBack @onBackClick="back"></ai-title>
     </template>
     <template slot="content">
       <ai-search-bar>
         <template #left>
           <el-date-picker
             value-format="yyyy-MM"
-            v-model="search.beginDate"
+            v-model="search.startDate"
             type="month"
             size="small"
             unlink-panels
@@ -25,12 +25,12 @@
         </template>
         <template #right>
           <el-input
-            v-model="search.name"
+            v-model="search.createUserName"
             size="small"
             placeholder="网格员姓名"
             clearable
             v-throttle="() => {search.current = 1, getList()}"
-            @clear="search.current = 1, search.name = '', getList()"
+            @clear="search.current = 1, search.createUserName = '', getList()"
             suffix-icon="iconfont iconSearch">
           </el-input>
         </template>
@@ -64,12 +64,10 @@
         search: {
           current: 1,
           size: 10,
-          title: '',
-          areaId: '',
-          beginDate: '',
-          endDate: ''
+          createUserName: '',
+          endDate: '',
+          startDate: ''
         },
-        ids: [],
         total: 10,
         tableData: []
       }
@@ -80,27 +78,24 @@
 
       colConfigs () {
         return [
-          { prop: 'title', label: '考核月份', align: 'left' },
+          { prop: 'month', label: '考核月份', align: 'left' },
           { prop: 'createUserName', label: '网格员姓名', align: 'center' },
-          { prop: 'createTime', label: '网格员联系方式', align: 'center' },
-          { prop: 'createTime', label: '监测家庭数量', align: 'center' },
-          { prop: 'createUserName', label: '开展走访次数', align: 'center' },
-          { prop: 'createTime', label: '已走访家庭数量', align: 'center' },
-          { prop: 'createTime', label: '走访进度', align: 'center' }
+          { prop: 'phone', label: '网格员联系方式', align: 'center' },
+          { prop: 'povertyNumber', label: '监测家庭数量', align: 'center' },
+          { prop: 'logNumber', label: '开展走访次数', align: 'center' },
+          { prop: 'povertyHouseholdNumber', label: '已走访家庭数量', align: 'center' },
+          { prop: 'finishRate', label: '走访进度', align: 'center', formart: v => v * 100 + '%' }
         ]
       }
     },
 
     created () {
-      this.search.areaId = this.user.info.areaId
-      this.dict.load('epidemicRecentTestResult').then(() => {
-        this.getList()
-      })
+      this.getList()
     },
 
     methods: {
       getList() {
-        this.instance.post(`/app/appmininotice/list`, null, {
+        this.instance.post(`/app/statistics/preventionreturntopoverty/queryPreventionPovertyLogCount`, null, {
           params: {
             ...this.search
           }

packages/jianping/AppAssessment/components/Statistics.vue

@@ -42,9 +42,9 @@
           <template #content>
             <div class="progress-wrapper">
               <div class="progress">
-                <div class="item" v-for="(item, index) in 10" :key="index">
-                  <h2>网格</h2>
-                  <el-progress :percentage="99"></el-progress>
+                <div class="item" v-for="(item, index) in logList" :key="index">
+                  <h2>{{ item.createUserName }}</h2>
+                  <el-progress :percentage="item.finishRate * 100"></el-progress>
                 </div>
               </div>
             </div>
@@ -155,6 +155,7 @@
           dictName: '大于0次',
           dictValue: '1'
         }],
+        logList: [],
         info: {},
         ids: [],
         total: 10,
@@ -190,10 +191,24 @@
         this.getList()
       })
       this.getTotal()
+      this.getLogCount()
     },
 
     methods: {
       getList() {
+        this.instance.post(`/app/statistics/preventionreturntopoverty/queryPreventionPovertyLogCount`, null, {
+          params: {
+            size: 15,
+            current: 1
+          }
+        }).then(res => {
+          if (res.code == 0) {
+            this.logList = res.data.records
+          }
+        })
+      },
+
+      getLogCount() {
         this.instance.post(`/app/apppreventionreturntopovertylog/service-rating-list`, null, {
           params: {
             ...this.search
@@ -290,8 +305,10 @@
             }
 
             h2 {
-              margin-right: 10px;
+              width: 90px;
+              margin-right: 30px;
               font-size: 14px;
+              text-align: right;
               color: #333;
             }
           }

packages/jianping/AppRiskWarning/components/List.vue

@@ -127,7 +127,8 @@
       getList() {
         this.instance.post(`/app/apppreventionreturntopovertyriskperson/list`, null, {
           params: {
-            ...this.search
+            ...this.search,
+            listType: 1
           }
         }).then(res => {
           if (res.code == 0) {