Merge branch '20201014_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201014_pc_vue_new_branch

src/App.vue

@@ -17,11 +17,7 @@ export default {
       showWsErr: false,
     }
   },
-  computed: {
-    websocket() {
-      return this.$store.state.user.websocket;
-    }
-  },
+
   created(){
     // getOrgs().then(response => {
     //   if (response.data.state === 1) {
@@ -32,7 +28,7 @@ export default {
     //     this.getToken(creator.org_id,creator.admin_user_id)
     //   }
     // });
-    
+
   },
   methods: {
     reload () {
@@ -41,42 +37,9 @@ export default {
         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/views/layout/components/Navbar.vue

@@ -131,6 +131,7 @@
 </template>
 
 <script>
+import axios from 'axios'
 import { mapGetters } from "vuex";
 // import Breadcrumb from "@/components/Breadcrumb";
 // import Hamburger from "@/components/Hamburger";
@@ -167,6 +168,9 @@ export default {
       return avatar.length > 0
         ? avatar
         : require("../../../assets/home/userData.png");
+    },
+    websocket() {
+      return this.$store.state.user.websocket;
     }
   },
   methods: {
@@ -280,8 +284,42 @@ export default {
         "/org/admin/apps?org=" +
         this.$store.getters.xt_user.org_id
       );
+    },
+    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 = 'wss://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 = "网络已断开，请检查网络后重新打开页面";
+              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;
+        });
     }
   },
+  
   created() {
     getOrgs().then(response => {
       if (response.data.state === 1) {
@@ -297,9 +335,13 @@ export default {
             this.org_name = this.orgs[i].org_name;
           }
         }
+        localStorage.setItem("org_id",creator.org_id);
+        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)
       }
     });
-  }
+  },
 };
 </script>
 

src/xt_pages/dialysis/details/dialog/assessmentBeforeDislysisDialog.vue

@@ -582,6 +582,7 @@
 </template>
 
 <script>
+  import axios from 'axios'
   import multiSelectBox from './MultiSelectBox'
   import { getDataConfig } from '@/utils/data'
   import { postAssessmentBeforeDislysis, CreateDryWeight } from '@/api/dialysis'
@@ -1087,6 +1088,11 @@
               // predialysis_evaluation[index] = assessment_before_dislysis_resp[index];
               this.$set(predialysis_evaluation, index, assessment_before_dislysis_resp[index])
             }
+            let orgId = parseInt(sessionStorage.getItem("org_id"));
+            axios.get('/api/index/patientsign/'+ orgId + '/'+ this.patient.id).then((res) => {
+              console.log('res',res.data)
+
+            }) 
             this.hide()
           }
         })

src/xt_pages/dialysis/details/dialog/computer_dialog.vue

@@ -61,6 +61,7 @@
 </template>
 
 <script>
+  import axios from 'axios'
   import { GetSchedualNumber, PostModifyStartDialysis, startDialysis } from '@/api/dialysis_record'
   import { parseTime } from '@/utils'
   import store from '@/store'
@@ -312,6 +313,11 @@
             for (const key in resp_dialysis_order) {
               this.$set(this_order, key, resp_dialysis_order[key])
             }
+            let orgId = parseInt(sessionStorage.getItem("org_id"));
+            axios.get('/api/index/uppatient?org_id='+ orgId + '&admin_user_id='+ this.form.nurse_id + '&patient_id=' + this.patient_id + '&up_time=' + (new Date(this.form.start_time).getTime() / 1000)).then((res) => {
+              console.log('res',res.data)
+
+            }) 
             this.hide()
             this.$emit('monitor', resp.data.monitor)
             this.$message.success('上机成功')

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) => {

src/xt_pages/sign/components/beforeDialysisCalling.vue

@@ -55,7 +55,6 @@ export default {
         },
     },
     created(){
-        console.log('beforeDialysisCallingbeforeDialysisCalling')
         this.initData = {
             cmd: "queue/join",
             data: {type:3,page:0,size:0},

src/xt_pages/sign/components/called.vue

@@ -12,7 +12,7 @@
                     </p>
                     <p>
                         <span class="nameTips">透前体重：{{ item.weight_before ? item.weight_before : '/' }}kg</span>
-                        <span class="nameTips lastNameTips">透前血压：{{ item.systolic_blood_pressure }}/{{ item.diastolic_blood_pressure }}mmHg</span>
+                        <span class="nameTips lastNameTips">透前血压：{{ item.systolic_blood_pressure ? parseInt(item.systolic_blood_pressure) : '' }}/{{ item.diastolic_blood_pressure ? parseInt(item.diastolic_blood_pressure) : '' }}mmHg</span>
                     </p>
                 </div>
             </div>

src/xt_pages/sign/lineUp.vue

@@ -60,13 +60,12 @@
                                 <p style="width:14%">
                                     <span v-if="item.status == 1">待接诊</span>
                                     <span v-if="item.status == 2">接诊中</span>
-                                    <span v-if="item.status == 3">接诊中</span>
-                                    <span v-if="item.status == 4">待上机</span>
-                                    <span v-if="item.status == 5">透析中</span>
-                                    <span v-if="item.status == 6">已下机</span>
+                                    <span v-if="item.status == 3">待上机</span>
+                                    <span v-if="item.status == 4">透析中</span>
+                                    <span v-if="item.status == 5">已下机</span>
                                 </p>
-                                <p style="width:14%">--</p>
-                                <p style="width:16%">--</p>
+                                <p style="width:14%">{{ item.start_time ? item.start_time : '--' }}</p>
+                                <p style="width:16%">{{ item.end_time ? item.end_time : '--' }}</p>
                             </div>
                         </div>
                     </div> 
@@ -140,13 +139,12 @@
                                 <p style="width:14%">
                                     <span v-if="item.status == 1">待接诊</span>
                                     <span v-if="item.status == 2">接诊中</span>
-                                    <span v-if="item.status == 3">接诊中</span>
-                                    <span v-if="item.status == 4">待上机</span>
-                                    <span v-if="item.status == 5">透析中</span>
-                                    <span v-if="item.status == 6">已下机</span>
+                                    <span v-if="item.status == 3">待上机</span>
+                                    <span v-if="item.status == 4">透析中</span>
+                                    <span v-if="item.status == 5">已下机</span>
                                 </p>
-                                <p style="width:14%">--</p>
-                                <p style="width:16%">--</p>
+                                <p style="width:14%">{{ item.start_time ? item.start_time : '--' }}</p>
+                                <p style="width:16%">{{ item.end_time ? item.end_time : '--' }}</p>
                             </div>
                         </div>
                     </div> 
@@ -253,8 +251,8 @@ export default {
     },
     mounted(){
         this.timer = setInterval(() => {
-            if(this.page < Math.ceil(this.count / 10)){
-                console.log('执行')
+            if(this.page < Math.ceil(this.count / 6)){
+                console.log('执行',Math.ceil(this.count / 6),this.page)
                 this.page++
                 let obj = {
                     cmd: "queue/queuelist",
@@ -262,8 +260,8 @@ export default {
                 };
                 this.websocketSend(obj)
             }else{
-                console.log('执行2222')
-                this.page = 0
+                console.log('执行22223333')
+                this.page = 1
                 let obj = {
                     cmd: "queue/queuelist",
                     data: {page:this.page,size:6}
@@ -320,6 +318,12 @@ export default {
                     this.lineUpList.map(item => {
                         item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
                         // item.start_time = moment(item.start_time * 1000).format('HH:mm')
+                        if(item.start_time != null){
+                            item.start_time = moment(item.start_time * 1000).format('HH:mm:ss')
+                        }
+                        if(item.status == 4){
+                            item.end_time = moment(item.end_time * 1000).format('HH:mm:ss')
+                        }
                     })
                 }else if(res.channel == 'patientCallInfo'){
                     console.log(999999999999,res.data)

src/xt_pages/sign/signIn.vue

@@ -257,7 +257,6 @@ export default {
         updateTime() {
             var cd = new Date();
             var week = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'];
-            console.log('哈哈哈哈')
             this.time = this.zeroPadding(cd.getHours(), 2) + ':' + this.zeroPadding(cd.getMinutes(), 2) + ':' + this.zeroPadding(cd.getSeconds(), 2) + ' （' + week[cd.getDay()] + "）";
             this.newdate = this.zeroPadding(cd.getFullYear(), 4) + '-' + this.zeroPadding(cd.getMonth() + 1, 2) + '-' + this.zeroPadding(cd.getDate(), 2);
         },