28169 4 månader sedan
förälder
incheckning
176509baca

+ 4 - 4
src/xt_pages/user/components/PatientSidebar.vue Visa fil

@@ -179,10 +179,10 @@ export default {
179 179
             //   name: '3-3',
180 180
             //   label: '体格检查新'
181 181
             // },
182
-            // {
183
-            //   name: '3-5',
184
-            //   label: '病程记录新'
185
-            // },
182
+             {
183
+              name: '3-5',
184
+              label: '病程记录新'
185
+             },
186 186
             {
187 187
               name: '1-11',
188 188
               label: '首次病程记录'

+ 199 - 47
src/xt_pages/user/courseOfDisease_new.vue Visa fil

@@ -252,7 +252,7 @@
252 252
             :max_befor_systolic_blood_pressure="max_befor_systolic_blood_pressure" :min_befor_systolic_blood_pressure="min_befor_systolic_blood_pressure" :max_befor_diastolic_blood_pressure="max_befor_diastolic_blood_pressure"  :min_befor_diastolic_blood_pressure="min_befor_diastolic_blood_pressure"
253 253
             :max_after_systolic_blood_pressure="max_after_systolic_blood_pressure" :min_after_systolic_blood_pressure="min_after_systolic_blood_pressure" :max_after_diastolic_blood_pressure="max_after_diastolic_blood_pressure" :min_after_diastolic_blood_pressure="min_after_diastolic_blood_pressure"
254 254
             :max_monitor_systolic_blood_pressure="max_monitor_systolic_blood_pressure" :min_monitor_systolic_blood_pressure="min_monitor_systolic_blood_pressure" :max_monitor_diastolic_blood_pressure="max_monitor_diastolic_blood_pressure" :min_monitor_diastolic_blood_pressure="min_monitor_diastolic_blood_pressure"
255
-            :lastDryWeight="lastDryWeight"></text_content>
255
+            :lastDryWeight="lastDryWeight" :patientVascularAccess="patientVascularAccess" :lastBefor="lastBefor"></text_content>
256 256
           </div>
257 257
         </div>
258 258
 
@@ -369,8 +369,9 @@
369 369
         min_monitor_systolic_blood_pressure:"",
370 370
         max_monitor_diastolic_blood_pressure:"",
371 371
         min_monitor_diastolic_blood_pressure:"",
372
-        lastDryWeight:{}
373
-
372
+        lastDryWeight:{},
373
+        patientVascularAccess:{},
374
+        lastBefor:{}
374 375
       }
375 376
     },
376 377
     created() {
@@ -577,51 +578,197 @@
577 578
         // this.auto_dialog = true
578 579
       },
579 580
       autotext_click(){
581
+
582
+          //  医嘱
583
+          if(this.longAdvice!=null && this.longAdvice.length>0){
584
+            for(let i=0;i<this.longAdvice.length;i++){
585
+                this.longAdvice[i].advice_type_name = ""
586
+                if(this.longAdvice[i].advice_type == 1){
587
+                  this.longAdvice[i].advice_type_name = "长期医嘱"
588
+                }
589
+                if(this.longAdvice[i].stop_state == 1){
590
+                  this.longAdvice[i].stop_state_name = "停用"
591
+                }
592
+                if(this.longAdvice[i].stop_state == 2){
593
+                  this.longAdvice[i].stop_state_name = "未停用"
594
+                }
595
+            }
596
+        }
597
+
598
+
599
+        if(this.inpectionList!=null && this.inpectionList.length>0){
600
+          let dataInfo = {}
601
+          this.inpectionList.forEach((item, index) => {
602
+          let { group_no } = item
603
+          if (!dataInfo[group_no]) {
604
+            dataInfo[group_no] = {
605
+              group_no:group_no,
606
+              project_id:item.project_id,
607
+              name:item.project_name,
608
+              date:this.getTime(item.inspect_date),
609
+              child:[],
610
+              left: [],
611
+              right:[]
612
+            }
613
+          }
614
+        })
615
+        let arr = Object.values(dataInfo)
616
+        console.log("arr----------------------",arr)
617
+
618
+        if(arr!=null && arr.length>0){
619
+          for(let i=0;i<arr.length;i++){
620
+            for(let j=0;j<this.inpectionList.length;j++){
621
+              if(arr[i].group_no == this.inpectionList[j].group_no){
622
+                  arr[i].child.push(this.inpectionList[j])
623
+              }
624
+            }
625
+          }
626
+        }
627
+          
628
+        for(let i=0;i<arr.length;i++){
629
+          for(let j=0;j<arr[i].child.length;j++){
630
+             if(j%2 ==0){
631
+               arr[i].left.push(arr[i].child[j])
632
+             }
633
+             if(j%2 == 1){
634
+              arr[i].right.push(arr[i].child[j])
635
+             }
636
+          }
637
+        }
638
+
639
+        this.Inspect = []
640
+        this.Inspect = arr
641
+        console.log("newarr----------------",arr)
642
+       }
580 643
         
581
-        // this.$nextTick(()=>{
582
-        //   const iframeDoc = document.getElementsByClassName('edui-editor-iframeholder')[0].getElementsByTagName('iframe')[0].contentDocument.getElementsByTagName('tbody')[0].children[9].children[1]
583
-        //   var newListArr =[]
584
-        //   for(let j in this.tab){
585
-        //     const obj={
586
-        //       id:this.tab[j].id,
587
-        //       newlist:'newList'+j
588
-        //     }
589
-        //     newListArr.push(obj) 
590
-        //   }
591
-        //   for(let i in this.tab){
592
-        //     for(let j in newListArr){
593
-        //       if(this.tab[i].id==newListArr[j].id){
594
-        //         let newList = document.createElement('p');
595
-        //         newList.style.cssText='display: flex;text-align: center;border-bottom: 1px solid black;';
596
-        //         let newListItem1 = document.createElement('span');
597
-        //         newListItem1.style.cssText= 'width: 30%;display: inline-block;padding: 5px 0;border-right: 1px solid black;'
598
-        //         let newListItem2 = document.createElement('span');
599
-        //         newListItem2.style.cssText= 'width: 20%;display: inline-block;padding: 5px 0;border-right: 1px solid black;'
600
-        //         let newListItem3 = document.createElement('span');
601
-        //         newListItem3.style.cssText= 'width: 20%;display: inline-block;padding: 5px 0;border-right: 1px solid black;'
602
-        //         let newListItem4 = document.createElement('span');
603
-        //         newListItem4.style.cssText= 'width: 20%;display: inline-block;padding: 5px 0;border-right: 1px solid black;'
604
-        //         let newListItem5 = document.createElement('span');
605
-        //         newListItem5.style.cssText= 'width: 20%;display: inline-block;padding: 5px 0;border-right: 1px solid black;'
606
-        //         let newListItem6 = document.createElement('span');
607
-        //         newListItem6.style.cssText= 'width: 10%;display: inline-block;padding: 5px 0;'
608
-        //         newListItem1.textContent = this.tab[i].name;
609
-        //         newListItem2.textContent = this.tab[i].type;
610
-        //         newListItem3.textContent = this.tab[i].start;
611
-        //         newListItem4.textContent = this.tab[i].dosage;
612
-        //         newListItem5.textContent = this.tab[i].pinlv;
613
-        //         newListItem6.textContent = this.tab[i].status;
614
-        //         newList.appendChild(newListItem1);
615
-        //         newList.appendChild(newListItem2);
616
-        //         newList.appendChild(newListItem3);
617
-        //         newList.appendChild(newListItem4);
618
-        //         newList.appendChild(newListItem5);
619
-        //         newList.appendChild(newListItem6);
620
-        //         iframeDoc.appendChild(newList)
621
-        //       }
622
-        //     }
623
-        //   }
624
-        // })
644
+        this.$nextTick(()=>{
645
+          const iframeDoc = document.getElementsByClassName('edui-editor-iframeholder')[0].getElementsByTagName('iframe')[0].contentDocument.getElementsByTagName('tbody')[0].children[9].children[1]
646
+        
647
+          const jiancDoc = document.getElementById('editer').getElementsByTagName('tbody')[0].children[8].children[1]
648
+
649
+            if(this.Inspect.length<1){
650
+              let newList = document.createElement('p');
651
+              newList.style.cssText = 'padding: 5px;'
652
+              newList.textContent = '无';
653
+              jiancDoc.appendChild(newList)
654
+            }else{
655
+              let newList = document.createElement('p');
656
+                  newList.style.cssText='display: flex;text-align: center;border-bottom: 1px solid black;';
657
+                  let newListItem1 = document.createElement('span');
658
+                  newListItem1.style.cssText= 'width: 20%;display: inline-block;padding: 5px 0;border-right: 1px solid black;'
659
+                  let newListItem2 = document.createElement('span');
660
+                  newListItem2.style.cssText= 'width: 20%;display: inline-block;padding: 5px 0;border-right: 1px solid black;'
661
+                  let newListItem3 = document.createElement('span');
662
+                  newListItem3.style.cssText= 'width: 20%;display: inline-block;padding: 5px 0;border-right: 1px solid black;'
663
+                  let newListItem4 = document.createElement('span');
664
+                  newListItem4.style.cssText= 'width: 20%;display: inline-block;padding: 5px 0;border-right: 1px solid black;'
665
+                  let newListItem5 = document.createElement('span');
666
+                  newListItem5.style.cssText= 'width: 20%;display: inline-block;padding: 5px 0;border-right: 1px solid black;'
667
+                  let newListItem6 = document.createElement('span');
668
+                  newListItem6.style.cssText= 'width: 20%;display: inline-block;padding: 5px 0;'
669
+                  newListItem1.textContent = '检验项目';
670
+                  newListItem2.textContent = '检验时间';
671
+                  newListItem3.textContent = '检验内容';
672
+                  newListItem4.textContent = '结果';
673
+                  newListItem5.textContent = '检验内容';
674
+                  newListItem6.textContent = '结果';
675
+                  newList.appendChild(newListItem1);
676
+                  newList.appendChild(newListItem2);
677
+                  newList.appendChild(newListItem3);
678
+                  newList.appendChild(newListItem4);
679
+                  newList.appendChild(newListItem5);
680
+                  newList.appendChild(newListItem6);
681
+                  jiancDoc.appendChild(newList)
682
+              for(let i in this.Inspect){
683
+                let newList1 = document.createElement('p');
684
+                const child1 = document.createElement('p')
685
+                const child2 = document.createElement('p')
686
+                const child3 = document.createElement('p')
687
+                newList1.appendChild(child1);
688
+                newList1.appendChild(child2);
689
+                newList1.appendChild(child3);
690
+                newList1.style.cssText='display: flex;text-align: center;border-bottom: 1px solid black;';
691
+                child1.style.cssText= 'width: 40%;display: inline-block;border-right: 1px solid black;display: flex;'
692
+                child2.style.cssText= 'width: 40%;display: inline-block;border-right: 1px solid black;display: flex;flex-wrap: wrap;'
693
+                child3.style.cssText= 'width: 40%;display: inline-block;display: flex;flex-wrap: wrap;'
694
+
695
+                let newListItem1 = document.createElement('span');
696
+                newListItem1.style.cssText= 'flex:1;display: inline-block;padding: 5px 0;border-right: 1px solid black;'
697
+                let newListItem2 = document.createElement('span');
698
+                newListItem2.style.cssText= 'flex:1;display: inline-block;padding: 5px 0;'
699
+                newListItem1.textContent = this.Inspect[i].name;
700
+                newListItem2.textContent = this.Inspect[i].date;
701
+                child1.appendChild(newListItem1);
702
+                child1.appendChild(newListItem2);
703
+                for(let j in this.Inspect[i].left){
704
+                  let newListItem3 = document.createElement('span');
705
+                  newListItem3.style.cssText= 'border-bottom: 1px solid black;width:50%;display: inline-block;padding: 5px 0;border-right: 1px solid black;'
706
+                  let newListItem4 = document.createElement('span');
707
+                  newListItem4.style.cssText= 'border-bottom: 1px solid black;width:50%;display: inline-block;padding: 5px 0;'
708
+                  newListItem3.textContent = this.Inspect[i].left[j].item_name;
709
+                  newListItem4.textContent = this.Inspect[i].left[j].inspect_value;
710
+                  child2.appendChild(newListItem3);
711
+                  child2.appendChild(newListItem4);
712
+                }
713
+                for(let x in this.Inspect[i].right){
714
+                  let newListItem5 = document.createElement('span');
715
+                  newListItem5.style.cssText= 'width: 50%;display: inline-block;padding: 5px 0;border-right: 1px solid black;border-bottom: 1px solid black;'
716
+                  let newListItem6 = document.createElement('span');
717
+                  newListItem6.style.cssText= 'width: 50%;display: inline-block;padding: 5px 0;border-bottom: 1px solid black;'
718
+                  newListItem5.textContent = this.Inspect[i].right[x].item_name;
719
+                  newListItem6.textContent = this.Inspect[i].right[x].inspect_value;
720
+                  child3.appendChild(newListItem5);
721
+                  child3.appendChild(newListItem6);
722
+                }
723
+                jiancDoc.appendChild(newList1)
724
+              }
725
+            }
726
+
727
+          
728
+          var newListArr =[]
729
+          for(let j in this.longAdvice){
730
+            const obj={
731
+              id:this.longAdvice[j].id,
732
+              newlist:'newList'+j
733
+            }
734
+            newListArr.push(obj) 
735
+          }
736
+          for(let i in this.longAdvice){
737
+            for(let j in newListArr){
738
+              if(this.longAdvice[i].id==newListArr[j].id){
739
+                let newList = document.createElement('p');
740
+                newList.style.cssText='display: flex;text-align: center;border-bottom: 1px solid black;';
741
+                let newListItem1 = document.createElement('span');
742
+                newListItem1.style.cssText= 'width: 30%;display: inline-block;padding: 5px 0;border-right: 1px solid black;'
743
+                let newListItem2 = document.createElement('span');
744
+                newListItem2.style.cssText= 'width: 20%;display: inline-block;padding: 5px 0;border-right: 1px solid black;'
745
+                let newListItem3 = document.createElement('span');
746
+                newListItem3.style.cssText= 'width: 20%;display: inline-block;padding: 5px 0;border-right: 1px solid black;'
747
+                let newListItem4 = document.createElement('span');
748
+                newListItem4.style.cssText= 'width: 20%;display: inline-block;padding: 5px 0;border-right: 1px solid black;'
749
+                let newListItem5 = document.createElement('span');
750
+                newListItem5.style.cssText= 'width: 20%;display: inline-block;padding: 5px 0;border-right: 1px solid black;'
751
+                let newListItem6 = document.createElement('span');
752
+                newListItem6.style.cssText= 'width: 10%;display: inline-block;padding: 5px 0;'
753
+                newListItem1.textContent = this.longAdvice[i].advice_name;
754
+                newListItem2.textContent = this.longAdvice[i].advice_type_name;
755
+                newListItem3.textContent = this.getTime(this.longAdvice[i].start_time)
756
+                newListItem4.textContent = this.longAdvice[i].single_dose +this.longAdvice[i].single_dose_unit ;
757
+                newListItem5.textContent = this.longAdvice[i].execution_frequency;
758
+                newListItem6.textContent = this.longAdvice[i].stop_state_name;
759
+                newList.appendChild(newListItem1);
760
+                newList.appendChild(newListItem2);
761
+                newList.appendChild(newListItem3);
762
+                newList.appendChild(newListItem4);
763
+                newList.appendChild(newListItem5);
764
+                newList.appendChild(newListItem6);
765
+                iframeDoc.appendChild(newList)
766
+              }
767
+            }
768
+          }
769
+        })
770
+
771
+
625 772
          this.AuToShow = true
626 773
 
627 774
       //  this.getAutoPatientContent()
@@ -882,8 +1029,13 @@
882 1029
 
883 1030
          this.min_monitor_diastolic_blood_pressure = response.data.data.min_monitor_diastolic_blood_pressure
884 1031
 
1032
+         
885 1033
          this.lastDryWeight = response.data.data.lastDryWeight 
886 1034
 
1035
+         this.patientVascularAccess = response.data.data.patientVascularAccess
1036
+
1037
+         this.lastBefor = response.data.data.lastBefor
1038
+
887 1039
          this.auto_dialog  =  true
888 1040
 
889 1041
             

+ 90 - 13
src/xt_pages/user/text_content.vue Visa fil

@@ -91,6 +91,12 @@ export default{
91 91
     },
92 92
     lastDryWeight:{
93 93
       type:Object
94
+    },
95
+    patientVascularAccess:{
96
+      type:Object
97
+    },
98
+    lastBefor:{
99
+      type:Object
94 100
     }
95 101
     
96 102
    },
@@ -104,7 +110,7 @@ export default{
104 110
       // ],
105 111
       Inspect:[{id:1,name:'血常规',date:'2024-12-09',left:[{c_id:1,c_name:'血红蛋白',c_value:110},{c_id:2,c_name:'血红蛋白2',c_value:110}],
106 112
             right:[{c_id:1,c_name:'白细胞1',c_value:110},{c_id:2,c_name:'白细胞3',c_value:110}]},
107
-            {id:2,name:'血常规',date:'2024-12-09',left:[{c_id:1,c_name:'血红蛋白',c_value:110},{c_id:2,c_name:'血红蛋白2',c_value:110}],
113
+            {id:2,name:'血常规',date:'2024-12-19',left:[{c_id:1,c_name:'血红蛋白',c_value:110},{c_id:2,c_name:'血红蛋白2',c_value:110}],
108 114
             right:[{c_id:1,c_name:'白细胞1',c_value:110},{c_id:2,c_name:'白细胞3',c_value:110}]}
109 115
       ],
110 116
        text:'',
@@ -769,11 +775,80 @@ export default{
769 775
         //干体重
770 776
         if(this.dryweightList!=null && this.dryweightList.length>0){
771 777
            for(let i=0;i<this.dryweightList.length;i++){
772
-            dry_weight_str =  this.getTimeOne(this.dryweightList[i].ctime) + this.dryweightList[i].adjusted_value
778
+            dry_weight_str =  this.getTimeOne(this.dryweightList[i].ctime)+" " +this.dryweightList[i].adjusted_value.slice(4,6)+ this.dryweightList[i].adjusted_value.slice(0,3)+"kg" + "调整到" +" "+ this.dryweightList[i].dry_weight+"kg"+","
773 779
            }
774 780
         } 
775 781
 
776
-     
782
+        //血管通路
783
+        var vascularAccess_str = ""
784
+        var created_time = ""
785
+      
786
+        if(this.patientVascularAccess!=undefined){
787
+          vascularAccess_str  = this.patientVascularAccess.blood_access_part_id + this.patientVascularAccess.blood_access_part_opera_id
788
+          created_time  = this.getTime(this.patientVascularAccess.first_start_time)
789
+        }
790
+
791
+        //并发症
792
+        var complication = ""
793
+        if(this.lastBefor!=undefined){
794
+            complication = this.lastBefor.complication
795
+        }
796
+        
797
+        if(this.inpectionList!=null&& this.inpectionList.length>0){
798
+           for(let i=0;i<this.inpectionList.length;i++){
799
+            this.inpectionList[i].group_no = ""
800
+             this.inpectionList[i].group_no = this.inpectionList[i].project_id.toString()+"_"+this.inpectionList[i].inspect_date.toString()
801
+           }
802
+        }
803
+        console.log("hhhhhhhhhhhhhhhhhhhhhhhhhhhhhh",this.inpectionList)
804
+
805
+        if(this.inpectionList!=null && this.inpectionList.length>0){
806
+          let dataInfo = {}
807
+          this.inpectionList.forEach((item, index) => {
808
+          let { group_no } = item
809
+          if (!dataInfo[group_no]) {
810
+            dataInfo[group_no] = {
811
+              group_no:group_no,
812
+              project_id:item.project_id,
813
+              name:item.project_name,
814
+              date:this.getTime(item.inspect_date),
815
+              child:[],
816
+              left: [],
817
+              right:[]
818
+            }
819
+          }
820
+        })
821
+        let arr = Object.values(dataInfo)
822
+        console.log("arr----------------------",arr)
823
+
824
+        if(arr!=null && arr.length>0){
825
+          for(let i=0;i<arr.length;i++){
826
+            for(let j=0;j<this.inpectionList.length;j++){
827
+              if(arr[i].group_no == this.inpectionList[j].group_no){
828
+                  arr[i].child.push(this.inpectionList[j])
829
+              }
830
+            }
831
+          }
832
+        }
833
+          
834
+        for(let i=0;i<arr.length;i++){
835
+          for(let j=0;j<arr[i].child.length;j++){
836
+             if(j%2 ==0){
837
+               arr[i].left.push(arr[i].child[j])
838
+             }
839
+             if(j%2 == 1){
840
+              arr[i].right.push(arr[i].child[j])
841
+             }
842
+          }
843
+        }
844
+
845
+        this.Inspect = []
846
+        this.Inspect = arr
847
+        console.log("newarr----------------",arr)
848
+       }
849
+       
850
+
851
+
777 852
        const contents = `<table border="1" class="table" style="border-collapse: collapse;width: 100%;">
778 853
               <tr>
779 854
                 <th colspan="2" style="padding: 5px;">透析阶段小结(${this.start_date}~${this.end_date})</th>
@@ -825,7 +900,7 @@ export default{
825 900
                     <span style='font-weight: bold;'>当前干体重:</span>&nbsp;<span class="">${this.lastDryWeight.dry_weight}kg;</span>
826 901
                   </p>
827 902
                   <p>
828
-                    <span style='font-weight: bold;'>调整记录:</span>&nbsp;<span class=""></span>
903
+                    <span style='font-weight: bold;'>调整记录:</span>&nbsp;<span class="">${dry_weight_str}</span>
829 904
                   </p>
830 905
                 </td>
831 906
               </tr>
@@ -833,7 +908,7 @@ export default{
833 908
                 <td style="align-items: center;padding: 5px;">血管通路</td>
834 909
                 <td style='padding: 5px;'>
835 910
                   <p>
836
-                    <span style='font-weight: bold;'>使用的血管通路:</span>&nbsp;<span class="">${ this.ceshi } &nbsp;&nbsp;建立时间:${ this.ceshi }</span>
911
+                    <span style='font-weight: bold;'>使用的血管通路:</span>&nbsp;<span class="">${vascularAccess_str } &nbsp;&nbsp;建立时间:${ created_time }</span>
837 912
                   </p>   
838 913
                 </td>
839 914
               </tr>
@@ -844,18 +919,18 @@ export default{
844 919
                     <span style='font-weight: bold;'>合并症:</span>&nbsp;<span class="">无</span>
845 920
                   </p>
846 921
                   <p>
847
-                    <span style='font-weight: bold;'>透析并发症:</span>&nbsp;<span class=""></span>
922
+                    <span style='font-weight: bold;'>透析并发症:</span>&nbsp;<span class="">${complication}</span>
848 923
                   </p>
849 924
                 </td>
850 925
               </tr>
851 926
               <tr>
852
-                <td style="align-items: center;padding: 5px;">检结果</td>
927
+                <td style="align-items: center;padding: 5px;">检结果</td>
853 928
                 <td style='padding: 5px;'>
854 929
                   <span class="">无</span>
855 930
                 </td>
856 931
               </tr>
857 932
               <tr>
858
-                <td style="align-items: center;padding: 5px;">检结果</td>
933
+                <td style="align-items: center;padding: 5px;">检结果</td>
859 934
                 <td>
860 935
                   
861 936
                 </td>
@@ -953,8 +1028,8 @@ export default{
953 1028
             newListItem3.style.cssText= 'border-bottom: 1px solid black;width:50%;display: inline-block;padding: 5px 0;border-right: 1px solid black;'
954 1029
             let newListItem4 = document.createElement('span');
955 1030
             newListItem4.style.cssText= 'border-bottom: 1px solid black;width:50%;display: inline-block;padding: 5px 0;'
956
-            newListItem3.textContent = this.Inspect[i].left[j].c_name;
957
-            newListItem4.textContent = this.Inspect[i].left[j].c_value;
1031
+            newListItem3.textContent = this.Inspect[i].left[j].item_name;
1032
+            newListItem4.textContent = this.Inspect[i].left[j].inspect_value;
958 1033
             child2.appendChild(newListItem3);
959 1034
             child2.appendChild(newListItem4);
960 1035
           }
@@ -963,8 +1038,8 @@ export default{
963 1038
             newListItem5.style.cssText= 'width: 50%;display: inline-block;padding: 5px 0;border-right: 1px solid black;border-bottom: 1px solid black;'
964 1039
             let newListItem6 = document.createElement('span');
965 1040
             newListItem6.style.cssText= 'width: 50%;display: inline-block;padding: 5px 0;border-bottom: 1px solid black;'
966
-            newListItem5.textContent = this.Inspect[i].right[x].c_name;
967
-            newListItem6.textContent = this.Inspect[i].right[x].c_value;
1041
+            newListItem5.textContent = this.Inspect[i].right[x].item_name;
1042
+            newListItem6.textContent = this.Inspect[i].right[x].inspect_value;
968 1043
             child3.appendChild(newListItem5);
969 1044
             child3.appendChild(newListItem6);
970 1045
           }
@@ -1015,6 +1090,8 @@ export default{
1015 1090
         }
1016 1091
       }
1017 1092
       this.$emit('new_content',this.content)
1093
+
1094
+      
1018 1095
     })
1019 1096
    
1020 1097
    
@@ -1024,7 +1101,7 @@ export default{
1024 1101
       return uParseTime(time, '{y}-{m}-{d}')
1025 1102
      },
1026 1103
      getTimeOne (time) {
1027
-      return uParseTime(time, '年-月-日')
1104
+      return uParseTime(time, '{y}-{m}-{d}')
1028 1105
      },
1029 1106
     
1030 1107
      getAnticoagulantName(val){

+ 13 - 13
src/xt_permission.js Visa fil

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
12 12
 
13 13
 router.beforeEach((to, from, next) => {
14 14
   // 线上注释
15
-  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
16
-  //   store.dispatch('VerifyConfigList', []).then(() => {
17
-  //     next()
18
-  //   })
19
-  // }
20
-  // if (store.getters.permission_routers === undefined) {
21
-  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
22
-  //     next()
23
-  //   })
24
-  // } else {
25
-  //   next()
26
-  // }
27
-  // return
15
+  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
16
+    store.dispatch('VerifyConfigList', []).then(() => {
17
+      next()
18
+    })
19
+  }
20
+  if (store.getters.permission_routers === undefined) {
21
+    store.dispatch('xt_GenerateRoutes', []).then(() => {
22
+      next()
23
+    })
24
+  } else {
25
+    next()
26
+  }
27
+  return
28 28
  // 线上注释
29 29
   NProgress.start()
30 30
   // console.log(store.getters.current_role_urls.indexOf(to.path))