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

src/xt_pages/dialysis/template/DialysisPrintOrderThirteen.vue

@@ -222,8 +222,8 @@
           <td>执行者签名</td>
         </tr>
         <tr v-for="(advice, advice_index) in tableAdvice" :key="advice_index">
-          <td style="height:30px;line-height:30px">{{ getTime(advice.start_time, "{y}-{m}-{d} {h}:{i}") }}</td>
-          <td class="parent">
+          <td style="height:40px;line-height:40px">{{ getTime(advice.start_time, "{y}-{m}-{d} {h}:{i}") }}</td>
+          <td class="parent" style="max-width:400px">
             <span v-if="advice.parent_id > 0">---></span>
             <span>{{ advice.advice_name }}</span>
             <span v-if="advice && advice.advice_desc">({{ advice.advice_desc }}{{ advice.drug_spec_unit }})</span>
@@ -281,7 +281,7 @@
 
 
             <tr v-for="monitor in monitors" :key="monitor.id">
-              <td>&nbsp;
+              <td style="height:40px;line-height:40px">&nbsp;
                 {{getTime(monitor.operate_time,'{h}:{i}')}}
               </td>
               <td>&nbsp;{{monitor.systolic_blood_pressure?monitor.systolic_blood_pressure:''}} /
@@ -346,10 +346,10 @@
             </td>
             <td width="50" style="border:none;padding-left:5px">透析器凝血:</td>
             <td width="120" style="text-align:left;border:none;">
-              <label-box :isChecked="afterdialysis.cruor.indexOf('透析器-0度') > -1 ? true : false" showValue="0"></label-box>
-              <label-box :isChecked="afterdialysis.cruor.indexOf('透析器-Ⅰ度') > -1 ? true : false" showValue="+"></label-box>
-              <label-box :isChecked="afterdialysis.cruor.indexOf('透析器-Ⅱ度') > -1" showValue="+ +"></label-box>
-              <label-box :isChecked="afterdialysis.cruor.indexOf('透析器-Ⅲ度') > -1 ? true : false" showValue="+ + +"></label-box>
+              <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('透析器-0度') > -1 ? true : false) : false" showValue="0"></label-box>
+              <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('透析器-Ⅰ度') > -1 ? true : false) : false" showValue="+"></label-box>
+              <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('透析器-Ⅱ度') > -1 ? true : false) : false" showValue="+ +"></label-box>
+              <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('透析器-Ⅲ度') > -1 ? true : false) : false" showValue="+ + +"></label-box>
             </td>
           </tr>
         </tbody>
@@ -358,7 +358,7 @@
       <table class="print-table" border="1">
         <tr style="height:36px;text-align:left;border:none;">
           <td style="padding-left:5px;border:none">
-              <p style="margin-bottom:60px">
+              <p style="margin-bottom:160px">
                 透析小结：{{ summary.dialysis_summary ? summary.dialysis_summary : "" }}
               </p>
           </td>
@@ -700,12 +700,16 @@ export default {
             var obj3 = { advice_name: "", start_time: "" };
             var obj4 = { advice_name: "", start_time: "" };
             var obj5 = { advice_name: "", start_time: "" };
+            var obj6 = { advice_name: "", start_time: "" };
+            var obj7 = { advice_name: "", start_time: "" };
             tableAdvice.push(obj);
             tableAdvice.push(obj1);
             tableAdvice.push(obj2);
             tableAdvice.push(obj3);
             tableAdvice.push(obj4);
             tableAdvice.push(obj5);
+            tableAdvice.push(obj6);
+            tableAdvice.push(obj7);
             this.tableAdvice = tableAdvice;
           }
           if (tableAdvice.length === 1) {
@@ -714,11 +718,15 @@ export default {
             var obj2 = { advice_name: "", start_time: "" };
             var obj3 = { advice_name: "", start_time: "" };
             var obj4 = { advice_name: "", start_time: "" };
+            var obj5 = { advice_name: "", start_time: "" };
+            var obj6 = { advice_name: "", start_time: "" };
             tableAdvice.push(obj);
             tableAdvice.push(obj1);
             tableAdvice.push(obj2);
             tableAdvice.push(obj3);
             tableAdvice.push(obj4);
+            tableAdvice.push(obj5);
+            tableAdvice.push(obj6);
             this.tableAdvice = tableAdvice;
           }
           if (tableAdvice.length === 2) {
@@ -726,10 +734,14 @@ export default {
             var obj1 = { advice_name: "", start_time: "" };
             var obj2 = { advice_name: "", start_time: "" };
             var obj3 = { advice_name: "", start_time: "" };
+            var obj4 = { advice_name: "", start_time: "" };
+            var obj5 = { advice_name: "", start_time: "" };
             tableAdvice.push(obj);
             tableAdvice.push(obj1);
             tableAdvice.push(obj2);
             tableAdvice.push(obj3);
+            tableAdvice.push(obj4);
+            tableAdvice.push(obj5);
             this.tableAdvice = tableAdvice;
           }
           if (tableAdvice.length === 3) {
@@ -740,10 +752,13 @@ export default {
             // eslint-disable-next-line no-redeclare
             var obj2 = { advice_name: "", start_time: "" };
             // eslint-disable-next-line no-redeclare
+            var obj3 = { advice_name: "", start_time: "" };
+            var obj4 = { advice_name: "", start_time: "" };
             tableAdvice.push(obj);
             tableAdvice.push(obj1);
             tableAdvice.push(obj2);
-
+            tableAdvice.push(obj3);
+            tableAdvice.push(obj4);
             this.tableAdvice = tableAdvice;
           }
           if (tableAdvice.length === 4) {
@@ -752,9 +767,12 @@ export default {
             // eslint-disable-next-line no-redeclare
             var obj1 = { advice_name: "", start_time: "" };
             // eslint-disable-next-line no-redeclare
-
+            var obj2 = { advice_name: "", start_time: "" };
+            var obj3 = { advice_name: "", start_time: "" };
             tableAdvice.push(obj);
             tableAdvice.push(obj1);
+            tableAdvice.push(obj2);
+            tableAdvice.push(obj3);
             this.tableAdvice = tableAdvice;
           }
           if (tableAdvice.length === 5) {
@@ -762,8 +780,12 @@ export default {
             var obj = { advice_name: "", start_time: "" };
             // eslint-disable-next-line no-redeclare
             var obj1 = { advice_name: "", start_time: "" };
+            var obj1 = { advice_name: "", start_time: "" };
+            // eslint-disable-next-line no-redeclare
+            var obj2 = { advice_name: "", start_time: "" };
             tableAdvice.push(obj);
             tableAdvice.push(obj1);
+            tableAdvice.push(obj2);
             this.tableAdvice = tableAdvice;
           }
 

src/xt_pages/qcd/basicInformationAnalysis.vue

@@ -61,8 +61,6 @@
                 <p>{{item.mode_id}}:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
                 <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
                </div>
-                <p>HD:64次(64%)</p>
-                <el-progress :percentage="70"></el-progress>
               </div>
             </div>
             <div class="infoOne">
@@ -139,15 +137,15 @@
                      <el-progress :percentage="(item.count/ageTotal*100).toFixed(1)"></el-progress>
                     </span>
                    <span v-if="item.age == 40">
-                      <p>20<年龄≤40:{{item.count}}人({{(item.count/ageTotal*100).toFixed(1)}}%)</p>
+                      <p>20&lt;年龄≤40:{{item.count}}人({{(item.count/ageTotal*100).toFixed(1)}}%)</p>
                       <el-progress :percentage="(item.count/ageTotal*100).toFixed(1)"></el-progress>
                     </span>
                     <span v-if="item.age == 60">
-                      <p>40<年龄≤60:{{item.count}}人({{(item.count/ageTotal*100).toFixed(1)}}%)</p>
+                      <p>40&lt;年龄≤60:{{item.count}}人({{(item.count/ageTotal*100).toFixed(1)}}%)</p>
                       <el-progress :percentage="(item.count/ageTotal*100).toFixed(1)"></el-progress>
                     </span>
                     <span v-if="item.age == 80">
-                     <p>60<年龄≤80:{{item.count}}人({{(item.count/ageTotal*100).toFixed(1)}}%)</p>
+                     <p>60&lt;年龄≤80:{{item.count}}人({{(item.count/ageTotal*100).toFixed(1)}}%)</p>
                      <el-progress :percentage="(item.count/ageTotal*100).toFixed(1)"></el-progress>
                     </span>
                     <span v-if="item.age ==150">
@@ -165,7 +163,7 @@
               <div class="borderBox1">
                 <p>透析龄≤12:64人(64%)</p>
                 <el-progress :percentage="70"></el-progress>
-                <p>12<透析龄≤36:64人(64%)</p>
+                <p>12&lt;透析龄≤36:64人(64%)</p>
                 <el-progress :percentage="70"></el-progress>
                 <p>36≤透析龄≤60:64人(64%)</p>
                 <el-progress :percentage="70"></el-progress>
@@ -545,6 +543,10 @@ export default {
           rgba(159, 189, 252, 1)
         );
       }
+      .el-progress-bar{
+        margin-right: -59px;
+        padding-right: 60px;
+      }
     }
     .borderBox1 {
       .el-progress-bar__inner {
@@ -554,6 +556,10 @@ export default {
           rgba(255, 153, 148, 1)
         );
       }
+      .el-progress-bar{
+        margin-right: -59px;
+        padding-right: 60px;
+      }
     }
     .borderBox2 {
       .el-progress-bar__inner {
@@ -563,6 +569,10 @@ export default {
           rgba(179, 168, 247, 1)
         );
       }
+      .el-progress-bar{
+        margin-right: -59px;
+        padding-right: 60px;
+      }
     }
   }
 }

src/xt_pages/workforce/appointment.vue

@@ -1516,12 +1516,12 @@
             break
 
           case '_6' :
-            return this.days[4]
+            return this.days[3]
 
             break
 
           case  '_7':
-            return this.days[4]
+            return this.days[3]
 
             break
 

src/xt_pages/workforce/template.vue

@@ -1759,13 +1759,13 @@
             break
 
           case '_6' :
-            return this.days[4]
+            return this.days[3]
 
 
             break
 
           case  '_7':
-            return this.days[4]
+            return this.days[3]
 
 
             break