Merge branch '20200710_pc_vue_new_branch' into 20200916_pc_vue_new_branch

src/App.vue

@@ -5,78 +5,20 @@
 </template>
 
 <script>
-import axios from 'axios'
-import { getOrgs, changeOrg } from "@/api/config";
 export default {
   name: "App",
   data () {
     return {
-      isRouterAlive: true,
-
-      showErr: false,
-      showWsErr: false,
-    }
-  },
-  computed: {
-    websocket() {
-      return this.$store.state.user.websocket;
+      isRouterAlive: true
     }
-  },
-  created(){
-    getOrgs().then(response => {
-      if (response.data.state === 1) {
-        var creator = response.data.data.creator;
-        console.log("creator", creator);
-        sessionStorage.setItem("org_id",creator.org_id);
-        sessionStorage.setItem("admin_user_id",creator.admin_user_id);
-        this.getToken(creator.org_id,creator.admin_user_id)
-      }
-    });
-    
-  },
-  methods: {
+  }, methods: {
     reload () {
       this.isRouterAlive = false
       this.$nextTick(function () {
         this.isRouterAlive = true
       })
-    },
-    getToken(orgId,adminUserId){
-      axios.get('/api/index/gettoken/'+ orgId + '/'+ adminUserId
-        ).then((res) => {
-        console.log('res',res.data)
-        
-        if(res.data.code == 0){
-          let token = res.data.data.token
-          localStorage.setItem("token",token)
-          let http = 'ws://socket.sgjyun.com?token='
-          console.log(this.$store.state.user.websocket)
-          this.$store.state.user.websocket = new ReconnectingWebSocket(
-            http + token
-          );
-          this.$store.state.user.websocket.timeoutInterval = 3000;
-          setInterval(() => {
-            if (navigator.onLine == false) {
-              this.showWsErr = true;
-              this.wsErrMsg = "网络已断开，请检查网络后重新打开页面";
-              alert(this.wsErrMsg)
-              console.log('navigator',navigator)
-            } else if (
-              navigator.onLine == true &&
-              this.websocket.readyState == 1
-            ) {
-              this.showWsErr = false;
-            }
-            this.websocket.send("1");
-          }, 3000);
-        }
-        
-      }).catch(error => {
-          window.location.href = error.response.data.redirect;
-        });
     }
-  },
-  
+  }
 };
 </script>
 

src/router/modules/dialysis.js

@@ -11,6 +11,15 @@ export default {
     icon: 'touxi'
   },
   children: [
+    {
+      path: '/dialysis/home',
+      component: () => import('@/xt_pages/home/index'),
+      name: 'home',
+      meta: {
+        title: 'home',
+        noCache: true
+      }
+    },
     {
       path: '/dialysis/watch',
       component: () => import('@/xt_pages/dialysis/bloodPresssWatch'),

src/xt_pages/index/verify_token.vue

@@ -16,6 +16,7 @@ export default {
           this.$router.addRoutes(this.$store.getters.xt_permission.addRouters) // 动态添加可访问路由表
   //        next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
           this.$router.replace({ path: '/dialysis/dialysisrecord' })
+
         })
       })
     }).catch((error) => {