社区管理

src/project/pingchang/AppCommunityManagement/AppCommunityManagement.vue

@@ -5,16 +5,24 @@
         inactive-color="#A1C1E8" :bar-style="barStyle" :active-item-style="activeStyle" active-color="#ffffff " @change="change">
       </u-tabs>
       <div class="header">
-        <div class="tab-item">
-          <h2 style="color:#5AAD6A;">{{totalInfo['今日登记']}}</h2>
-          <p>今日返乡</p>
+        <div class="tab-item" v-if="!currentTabs">
+          <h2 style="color:#5AAD6A;">{{totalInfo['待管理']}}</h2>
+          <p>待管理</p>
+        </div>
+        <div class="tab-item" v-if="currentTabs == 1">
+          <h2 style="color:#5AAD6A;">{{totalInfo['管理中']}}</h2>
+          <p>管理中</p>
+        </div>
+        <div class="tab-item" v-if="currentTabs == 2">
+          <h2 style="color:#5AAD6A;">{{totalInfo['已解除']}}</h2>
+          <p>已解除</p>
         </div>
         <div class="tab-item">
-          <h2 style="color:#F5A319;">{{totalInfo['今日风险']}}</h2>
+          <h2 style="color:#F5A319;">{{totalInfo['今日新增']}}</h2>
           <p>今日新增</p>
         </div>
         <div class="tab-item">
-          <h2 style="color:#CD413A;border-right:0;">{{totalInfo['风险处理']}}</h2>
+          <h2 style="color:#CD413A;border-right:0;">{{totalInfo['新增风险']}}</h2>
           <p>新增风险</p>
         </div>
       </div>
@@ -34,25 +42,20 @@
       </div>
       <div class="top-select">
         <div class="item" @click="showDate=true">
-          <!-- <AiAreaPicker v-model="areaId" :areaId="cropAreaId" @select="areaSelect" :name.sync="areaName" style="color: #666" selectRoot>
-            <span style="margin-left: 4px" v-if="areaName">{{ areaName }}</span>
-            <span v-else style="color:#999;">地区选择</span>
-            <u-icon name="arrow-down" color="#666" size="28" style="margin-left: 4px" />
-          </AiAreaPicker> -->
           <span v-if="!dateList.length" style="color:#999;">选择日期</span>
           <span v-else>{{ dateList[0] }}-{{dateList[1]}}</span>
           <u-icon name="arrow-down" color="#666" size="28" style="margin-left: 4px" />
           <u-calendar v-model="showDate" mode="range" @change="changeDate"></u-calendar>
         </div>
         <div class="item" @click="showTypeSelect=true">
-          <span v-if="infoType === ''" style="color:#999;">处置意见</span>
-          <span v-else>{{ $dict.getLabel('EP_handleType', infoType) }}</span>
+          <span v-if="handleType === ''" style="color:#999;">处置意见</span>
+          <span v-else>{{ $dict.getLabel('EP_handleType', handleType) }}</span>
           <u-icon name="arrow-down" color="#666" size="28" style="margin-left: 4px" />
         </div>
       </div>
     </AiTopFixed>
     <div class="data-list" v-if="list && list.length">
-      <div class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item.id)">
+      <div class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item.status, item.id)">
         <div class="top">
           <div class="title">
             <div class="name">
@@ -67,15 +70,16 @@
           </div>
           <p> {{item.idNumberText}}</p>
           <p>{{item.phone}}</p>
-          <p> 出发地-目的地</p>
+          <p>{{item.registerInfo.startAreaName}}-{{item.registerInfo.arriveAreaName}}</p>
           <p> 处置意见：<span :class="'type-'+item.lastRiskDisposal.handleType">{{$dict.getLabel('EP_handleType', item.lastRiskDisposal.handleType)}}</span></p>
-          <div class="btn" v-if="item.status != 2" @click.stop="toEdit(item.id)">管理</div>
-          <img src="./components/img/status-img.png" alt="" class="status-img" v-else>
+          <div class="btn" v-if="item.status == 0" @click.stop="toEdit(item.id)">管理</div>
+          <div class="btn" v-if="item.status == 1" @click.stop="toEdit(item.id)">排查</div>
+          <img src="./components/img/status-img.png" alt="" class="status-img" v-if="item.status == 2">
         </div>
         <div class="bottom">
           <div class="text">
             <!-- 管控人：<span> {{item.controllerUserName}}</span>  -->
-            抵平时间：{{item.createTime}}
+            抵平时间：{{item.registerInfo.arriveTime}}
           </div>
         </div>
       </div>
@@ -97,7 +101,7 @@ export default {
       current: 1,
       keyword: '',
       currentTabs: 0,
-      infoType: '',
+      handleType: '',
       showTypeSelect: false,
       tabList: [
         {
@@ -131,8 +135,8 @@ export default {
     ...mapState(['user']),
   },
   onLoad() {
-    // this.areaId = this.user.areaId
-    // this.areaName = this.user.areaName
+    this.areaId = this.user.areaId
+    this.areaName = this.user.areaName
     this.$dict.load('EP_CM_status', 'EP_registerInfoType', 'EP_handleType').then(() => {
       this.registerTypeList = this.$dict.getDict('EP_handleType')
       this.registerTypeList.unshift({dictValue: '', dictName: '全部'})
@@ -163,8 +167,8 @@ export default {
       this.getList()
     },
     getList() {
-      var startDate = this.dateList[0] + ' 00:00:00'
-      var endDate = this.dateList[1] + ' 00:00:00'
+      var startDate = this.dateList.length ? this.dateList[0] + ' 00:00:00' : ''
+      var endDate = this.dateList.length ? this.dateList[1] + ' 00:00:00' : ''
       this.$http.post('/app/appepidemicpreventioncommunitymanagement/list', null, {
         params: {
           size: 10,
@@ -172,7 +176,9 @@ export default {
           status: this.currentTabs,
           areaId: this.areaId, name:
           this.keyword,
-          infoType: this.infoType
+          queryBeginTime: startDate,
+          queryEndTime: endDate,
+          handleType: this.handleType
         },
       }).then((res) => {
         if (res.code == 0) {
@@ -183,8 +189,13 @@ export default {
         }
       })
     },
-    toDetail(id) {
-      uni.navigateTo({url: `./Detail?id=${id}`})
+    toDetail(status, id) {
+      console.log(status, id)
+      if(status == 0) {
+        uni.navigateTo({url: `./HandleDetail?id=${id}`})
+      }else{
+        uni.navigateTo({url: `./Detail?id=${id}`})
+      }
     },
     toEdit(id) {
       uni.navigateTo({url: `./Add?id=${id}`})
@@ -197,15 +208,16 @@ export default {
     areaSelect(e) {
       this.areaId = e
       this.getListInit()
+      this.getTotal()
     },
     typeConfirm(e) {
-      this.infoType = e[0].value
+      this.handleType = e[0].value
       this.getListInit()
     },
 
 
     getTotal() {
-      this.$http.post(`/app/appepidemicpreventionregisterinfo/listStatistics?areaId=${this.areaId}&infoType=0`).then((res) => {
+      this.$http.post(`/app/appepidemicpreventioncommunitymanagement/listStatistics?areaId=${this.areaId}`).then((res) => {
         if (res.code == 0) {
           this.totalInfo = res.data
         }
@@ -381,7 +393,7 @@ export default {
           border-radius: 4px;
           box-sizing: border-box;
           position: absolute;
-          bottom: 32px;
+          bottom: 16px;
           right: 32px;
           font-family: PingFangSC-Regular;
           font-size: 28px;