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

src/apps/AppEpidemicSituation/ErrorDetail.vue

@@ -10,7 +10,7 @@
       <p>异常情况：</p>
       <div v-if="datas.length">
         <div v-for="(item, index) in datas" :key="index" style="color: #ff4466">
-          <span style="color: #666" v-if="item.status == 0">{{ item.checkTime && item.checkTime.substring(0, 10) }}:</span>
+          <span style="color: #666" v-if="item.status == 0">{{ item.createTime && item.createTime.substring(0, 10) }}:</span>
 
           <div v-if="item.temperature * 1 >= 37.3">
             <span>当前体温</span>

src/apps/AppEpidemicSituation/HealthDetail.vue

@@ -49,7 +49,8 @@
       <AiEmpty description="暂无数据" class="emptyWrap" v-else></AiEmpty>
     </div>
 
-    <div class="fixedBtn" @click="toErr" v-if="userList.status == '0' && today == '1'">异常情况处理</div>
+    <div class="fixedBtn" @click="toErr" v-if="userList.status == '0'">异常情况处理</div>
+    <!-- && today == '1' -->
   </div>
 </template>
 

src/manifest.json

@@ -29,7 +29,8 @@
       "open": true,
       "proxy": {
         "/lan": {
-          "target": "http://192.168.1.87:9000",
+          // "target": "http://192.168.1.87:9000",
+          "target": "http://test87tpweb.cunwuyun.cn",
           "changeOrigin": true,
           "pathRewrite": {
             "^/lan": "/"

src/sass/AppSpecialPeople/detail.vue

@@ -7,12 +7,12 @@
     <div class="area-select">
       <div class="select-content">
         <div class="area-content">
-          <AiAreaPicker :areaId="user.areaId" v-model="areaId" @select="areaSelect" :name.sync="areaName">
+          <!-- <AiAreaPicker :areaId="user.areaId" v-model="areaId" @select="areaSelect" :name.sync="areaName">
             <img src="./img/local-icon.png" alt="">
             <span class="label" v-if="areaName">{{ areaName }}</span>
             <span v-else>请选择</span>
             <u-icon name="arrow-down" color="#666" size="24" />
-          </AiAreaPicker>
+          </AiAreaPicker> -->
         </div>
         <div class="search-input" v-if="tabIndex">
           <img src="./img/search-icon.png" alt="">
@@ -96,14 +96,15 @@ export default {
   },
   computed: { ...mapState(['user']) },
   created() {
-    this.areaId = this.user.areaId
-    this.areaName = this.user.areaName
-    this.getStatistic()
-    this.getStatisticMon()
-    this.getUserList()
+    this.$dict.load('appSpecialTypeFive').then(() => {
+      this.areaId = this.user.areaId
+      this.areaName = this.user.areaName
+      this.getStatistic()
+      this.getUserList()
+    })
+    
     uni.$on('specialPeopleList', () => {
       this.getStatistic()
-      this.getStatisticMon()
       this.getUserList()
     })
   },
@@ -115,7 +116,6 @@ export default {
     areaSelect(e) {
       this.areaId = e
       this.getStatistic()
-      this.getStatisticMon()
       this.getUserList()
     },
     tabClick(index) {
@@ -123,45 +123,45 @@ export default {
     },
     getStatistic() {
       this.statisticsList = []
-      this.$http.post(`/app/appapplicationinfo/specialStatistic?areaId=${this.areaId}&type=0&range=0`).then((res) => {
-        if (res.code == 0) {
-          for(let i in res.data){
-            var obj = {
-              label: i,
-              value: res.data[i]
-            }
-            this.statisticsList.push(obj)
-          }
-        }
+      this.$http.post(`/app/appspecialadjustment/statistic?type=0&range=0`).then((res) => {
+        // if (res.code == 0) {
+        //   for(let i in res.data){
+        //     var obj = {
+        //       label: i,
+        //       value: res.data[i]
+        //     }
+        //     this.statisticsList.push(obj)
+        //   }
+        // }
       })
     },
     getStatisticMon() {
-      this.statisticsListMon = []
-      this.$http.post(`/app/appapplicationinfo/specialStatistic?areaId=${this.areaId}&type=0&range=1`).then((res) => {
-        if (res.code == 0) {
-          for(let i in res.data){
-            var obj = {
-              label: i,
-              value: res.data[i]
-            }
-            this.statisticsListMon.push(obj)
-          }
-        }
-      })
+      // this.statisticsListMon = []
+      // this.$http.post(`/app/appapplicationinfo/specialStatistic?areaId=${this.areaId}&type=0&range=1`).then((res) => {
+      //   if (res.code == 0) {
+      //     for(let i in res.data){
+      //       var obj = {
+      //         label: i,
+      //         value: res.data[i]
+      //       }
+      //       this.statisticsListMon.push(obj)
+      //     }
+      //   }
+      // })
     },
     getUserList() {
       this.userList = []
-      this.$http.post(`/app/appapplicationinfo/queryPeople?areaId=${this.areaId}&type=0&name=${this.name}`).then((res) => {
-        if (res.code == 0) {
-          for(let i in res.data){
-            var obj = {
-              label: i,
-              value: res.data[i],
-              check: false
-            }
-            this.userList.push(obj)
-          }
-        }
+      this.$http.post(`/app/appspecialadjustment/allList?type=0&name=${this.name}`).then((res) => {
+        // if (res.code == 0) {
+        //   for(let i in res.data){
+        //     var obj = {
+        //       label: i,
+        //       value: res.data[i],
+        //       check: false
+        //     }
+        //     this.userList.push(obj)
+        //   }
+        // }
       })
     },
     toAdd() {