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

src/project/pingchang/AppCheckpointRegistration/AppCheckpointRegistration.vue

@@ -39,20 +39,16 @@
         </div>
       </div>
     </AiTopFixed>
-    <div class="user-list">
+    <div class="user-list" v-if="list.length">
-      <u-swipe-action style="margin-bottom: 12px;"
+      <div class="item" v-for="(item,index) in list" :key="index" @click="toUser(item)">
-        :show="item.show"
-        :index="index"
-        v-for="(item,index) in list"
-        :key="item.id"
-        @click="onClick"
-        @open="onOpen"
-        @content-click="toUser(item)"
-        :options="options">
-        <div class="item">
         <div class="top">
-            <h2 class="name">{{item.name}}<span class="status" :class="'status'+item.riskLevel">{{ $dict.getLabel('EP_riskLevel', item.riskLevel) }}</span></h2>
+          <h2 class="name">{{item.name}}
-            <p class="color-999">{{item.idNumber}}</p>
+            <div class="status" :class="'status'+item.riskLevel">{{ $dict.getLabel('EP_riskLevel', item.riskLevel) }} </div>
+          </h2>
+          <p class="color-999 idnumber-flex">
+            <span>{{item.idNumber}}</span>
+            <span class="del-btn" @click.stop="del(item.id)"> <u-icon name="trash" color="#f46" size="40" /></span>
+          </p>
           <p><img src="./components/img/org-icon.png" alt=""><span class="start-name">{{item.startAreaName}}</span></p>
           <p><img src="./components/img/blue-icon.png" alt=""><span class="start-name">{{item.arriveAreaName}}</span></p>
           <p><img src="./components/img/time-icon.png" alt="">{{item.arriveTime}}</p>
@@ -62,7 +58,6 @@
           <div class="text">处置人：<span>{{item.handleUserName}}</span></div>
         </div>
       </div>
-      </u-swipe-action>
     </div>
     <AiEmpty v-if="!list.length"></AiEmpty>
     <u-select v-model="showGateSelect" :list="gateList" label-name="name" value-name="id" @confirm="gatewayconfirm"></u-select>
@@ -81,6 +76,7 @@ export default {
       areaName: '',
       tabIndex: 0,
       current: 1,
+      pages: 2,
       list: [],
       totalInfo: {},
       keyword: '',
@@ -133,10 +129,21 @@ export default {
       this.$http.post(`/app/appepidemicpreventionregisterinfo/list?infoType=0&current=${this.current}&size=10&listType=${this.tabIndex}&gatewayId=${this.gatewayId}&name=${this.keyword}&arriveAreaId=${this.areaId}`)
       .then((res) => {
         if (res.code == 0) {
-          res.data.records.map((item) => {
+
-            item.idNumber = item.idNumber.replace(/(.{6}).*(.{4})/,"$1********$2")
+          this.list = this.current > 1 ? [...this.list, ...res.data.records.map(v => {
+              return {
+                ...v,
+                show: false,
+                idNumber: v.idNumber.replace(/(.{6}).*(.{4})/,"$1********$2")
+              }
+            })] : res.data.records.map(v => {
+              return {
+                ...v,
+                show: false,
+                idNumber: v.idNumber.replace(/(.{6}).*(.{4})/,"$1********$2")
+              }
             })
-          this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records
+            this.pages = res.data.pages
         }
       })
     },
@@ -312,6 +319,7 @@ export default {
     .item{
       background-color: #fff;
       border-radius: 16px;
+      margin-bottom: 24px;
       .top {
         padding: 32px 32px 24px;
         position: relative;
@@ -359,6 +367,15 @@ export default {
             vertical-align: top;
           }
         }
+        .idnumber-flex {
+          width: 100%;
+          display: flex;
+          justify-content: space-between;
+          .del-btn {
+            display: inline-block;
+            padding: 8px;
+          }
+        }
         .start-name{
           display: inline-block;
           width: calc(100% - 50px);
@@ -402,7 +419,7 @@ export default {
     }
   }
   .gateway-name {  
-    width: calc(100% - 48px);
+    max-width: calc(100% - 48px);
     word-break: break-all;
     overflow: hidden;
     text-overflow: ellipsis;

src/project/pingchang/AppCheckpointRegistration/RiskContent.vue

@@ -207,9 +207,8 @@ export default {
     this.areaId = this.user.areaId
     this.areaName = this.user.areaName
     this.$dict.load('yesOrNo', 'EP_registerPersonType', 'EP_travelType', 'EP_abnormalType', 'epidemicTouchInFourteen', 'EP_homeStatus2', 'EP_quarantineStrategy', 'EP_communityHandleType').then(() => {
-      // this.id = option.id
+      this.id = option.id
       this.handleTypeList = this.$dict.getDict('EP_communityHandleType')
-      this.id = '5ba23169ca3f46fe86c17a7e0af366b9'
       this.getDetail()
     })
     
@@ -238,7 +237,9 @@ export default {
           this.$u.toast('提交成功')
           uni.$emit('updateDetail')
           uni.$emit('updateList')
-          uni.navigateBack()
+          setTimeout(() => {
+            uni.navigateTo({ url: './AppCheckpointRegistration' })
+          }, 600)
         }
       }).catch((err) => {
         this.$u.toast(err)

src/project/pingchang/AppCheckpointRegistration/UserInfo.vue

@@ -223,6 +223,7 @@ export default {
     uni.$on('updateDetail', () => {
       this.getDetail()
     })
+    uni.$emit('updateList')
   },
   methods: {
     getDetail() {

src/project/pingchang/AppCommunityManagement/Statistics.vue

@@ -4,13 +4,13 @@
       <img src="./components/img/header.png" alt="" />
       <div class="content-info">
         <div class="title">
-          <div>
+          <div class="time-select">
             <span v-if="beginDate" @click="showDateSelect=true">{{ beginDate }} 至 {{ endDate }}</span>
             <span v-else @click="showDateSelect=true">日期选择</span>
             <u-icon name="arrow-down" color="#666" size="28" style="margin-left: 4px"  v-if="!beginDate" @click="showDateSelect=true"/>
             <u-icon name="close-circle" color="#666" size="34" style="margin-left: 4px"  v-else @click="clearDate" />
           </div>
-          <div style="width:calc(100% - 200px);text-align: right;">
+          <div class="area-select">
             <AiAreaPicker v-model="areaId" :areaId="user.areaId" @select="areaSelect" :name.sync="areaName" style="color: #666" selectRoot>
               <span v-if="areaName" class="area-name">{{ areaName }}</span>
               <span v-else>地区选择</span>
@@ -84,7 +84,8 @@ export default {
       endDate: '',
       showDateSelect: false,
       backVal: 0,
-      pointVal: 0
+      pointVal: 0,
+      firstGet: true, //第一次请求
     }
   },
   computed: { ...mapState(['user']) },
@@ -115,7 +116,14 @@ export default {
     getData() {
       this.$http.post(`/app/appepidemicpreventioncommunitymanagement/statistics?areaId=${this.areaId}&beginTime=${this.beginDate}&endTime=${this.endDate}`).then((res) => {
         if (res.code == 0) {
+          if(this.firstGet) {
+            var myDate = new Date();
+            this.beginDate = myDate.getFullYear() + res.data.trend[0].ymd
+            this.endDate = myDate.getFullYear() + res.data.trend[6].ymd
+            this.firstGet = false
+          }
           this.info = res.data
+          
           var xData = [], yDataScreening = [], yDataNucleicAcid = []
           res.data.trend.map((item) => {
             xData.push(item.ymd)
@@ -231,6 +239,13 @@ export default {
         display: flex;
         justify-content: space-between;
         padding: 32px;
+        .time-select{
+          width: 400px;
+        }
+        .area-select {
+          width: calc(100% - 400px);
+          text-align: right;
+        }
         h2 {
           font-size: 36px;
           font-family: PingFang-SC-Heavy, PingFang-SC;