Prechádzať zdrojové kódy

fix:优化二次扫码直接进入结果页

magic v 3 rokov pred
rodič
commit
d98e69c7fd

+ 2 - 2
config/index.js

@@ -22,8 +22,8 @@ module.exports = {
     },
 
     // Various Dev Server settings
-    host: 'localhost', // can be overwritten by process.env.HOST
-    // host: '10.0.3.171', // can be overwritten by process.env.HOST
+    // host: 'localhost', // can be overwritten by process.env.HOST
+    host: '10.0.1.25', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: false,
     errorOverlay: true,

+ 1 - 1
src/pages/FormResult/index.vue

@@ -4,7 +4,7 @@
   <div size-xl bold color-des padding-top-xl text-center>请出示给门诊员工</div>
   <div margin-top-md margin-left-lg margin-right-lg>
     <div class="bl-flex" bg-color color-f center padding-sm active
-      @click="$router.replace({ name: 'FormVolume', query: $route.query })">
+      @click="$router.replace({ name: 'FormVolume', query: { ...$route.query, jump: 1 } })">
       <i class="font-ileads ileads-icon-plus-bold">&nbsp;</i>
       <span>添加被流调人</span>
     </div>

+ 6 - 0
src/pages/FormResult/mixins/index.js

@@ -26,6 +26,12 @@ export default {
         // let data = res.data
         let objData = lStorage.getItem('AHR')
         let data = Object.keys(objData).map(k => objData[k])
+        let d1 = new Date().toString('yyyyMMdd')
+        data = data.filter(item => {
+          if (item.timer) {
+            return new Date(item.timer).toString('yyyyMMdd') === d1
+          }
+        })
         data.forEach(item => {
           item.result.some(it => {
             if (new RegExp('当日体温').test(it.title)) {

+ 14 - 2
src/pages/FormVolume/mixins/index.js

@@ -70,7 +70,19 @@ export default {
     clearInterval(this.codeMess.t)
   },
   created() {
-    this.vueWatchRoute()
+    let objData = lStorage.getItem('AHR')
+    let data = Object.keys(objData).map(k => objData[k])
+    let d1 = new Date().toString('yyyyMMdd')
+    data = data.filter(item => {
+      if (item.timer) {
+        return new Date(item.timer).toString('yyyyMMdd') === d1
+      }
+    })
+    if (data.length && !this.$route.query.jump) {
+      this.$router.replace({ name: 'FormResult', query: this.$route.query })
+    } else {
+      this.vueWatchRoute()
+    }
   },
   methods: {
     vueWatchRoute (a, b) {
@@ -222,7 +234,7 @@ export default {
           dt.created = date.toString('yyyy-MM-dd HH:mm:ss')
           dt.timer = date.getTime()
           lStorage.setItem('FormResultAbnormal', dt)
-          this.$router.replace({ name: 'FormResult', query: { ...this.$route.query, result_id } })
+          this.$router.replace({ name: 'FormResult', query: { ...this.$route.query, result_id, jump: undefined, history: undefined } })
         } else {
           this.btnOpenSuccess(() => this.btnLinkBack())
         }