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

src/xt_pages/dialysis/template/DialysisPrintOrderThirteen.vue

@@ -86,13 +86,13 @@
           （<label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-左') > -1 ? true : false" showValue="左"></label-box>
               <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-右') > -1 ? true : false" showValue="右"></label-box>）部位
           &nbsp;
-          <label-box :isChecked="getPartName(predialysis.blood_access_part_id).indexOf('颈内') > -1 ? true : false" showValue="颈内"></label-box>
+          <label-box :isChecked="predialysis.blood_access_part_id ? (getPartName(predialysis.blood_access_part_id).indexOf('颈内') > -1 ? true : false) : false" showValue="颈内"></label-box>
           &nbsp;
-          <label-box :isChecked="getPartName(predialysis.blood_access_part_id).indexOf('锁骨下') > -1 ? true : false" showValue="锁骨下"></label-box>
+          <label-box :isChecked="predialysis.blood_access_part_id ? (getPartName(predialysis.blood_access_part_id).indexOf('锁骨下') > -1 ? true : false) : false" showValue="锁骨下"></label-box>
           &nbsp;
-          <label-box :isChecked="getPartName(predialysis.blood_access_part_id).indexOf('股') > -1 ? true : false" showValue="股"></label-box>
+          <label-box :isChecked="predialysis.blood_access_part_id ? (getPartName(predialysis.blood_access_part_id).indexOf('股') > -1 ? true : false) : false" showValue="股"></label-box>
           &nbsp;
-          <label-box :isChecked="getPartName(predialysis.blood_access_part_id).indexOf('其他') > -1? true : false" showValue="其他"></label-box>
+          <label-box :isChecked="predialysis.blood_access_part_id ? (getPartName(predialysis.blood_access_part_id).indexOf('其他') > -1? true : false) :false" showValue="其他"></label-box>
           &nbsp;
         </div>
       </div>

src/xt_pages/qcd/basicInformationAnalysis.vue

@@ -61,6 +61,8 @@
                 <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">
@@ -189,6 +191,10 @@ export default {
     };
   },
   methods: {
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
+    },
     changeTime() {},
     changeEndTime(val) {
       var time =

src/xt_pages/qcd/checkStatistical.vue

@@ -15,10 +15,10 @@
       </el-row>
       <div class="configTable">
         <el-table :data="checkList" border style="width: 100%">
-          <el-table-column prop="date" label="检验检查项" width="180">
+          <el-table-column prop="date" label="检验检查项">
               <template slot-scope="scope">{{ scope.row.project_name }}</template>
           </el-table-column>
-          <el-table-column prop="name" label="检查频次(天)" width="180">
+          <el-table-column prop="name" label="检查频次(天)">
               <template slot-scope="scope">{{ scope.row.inspection_frequency }}</template>
           </el-table-column>
           <el-table-column prop="address" label="排序">
@@ -47,7 +47,7 @@
       <el-dialog title="新增" :visible.sync="newDialog">
         <el-form :model="form" ref="form" :rules="rules">
           <el-form-item label="检查大项" :label-width="formLabelWidth" required prop="inspectionMajor">
-            <el-select v-model="form.inspectionMajor" placeholder="请选择活动区域">
+            <el-select v-model="form.inspectionMajor" placeholder="请选择检查大项">
                 <el-option
                   v-for="it in InspectionMajor"
                   :key="it.project_id"
@@ -66,7 +66,7 @@
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button @click="newDialog = false">取 消</el-button>
-          <el-button type="primary" @click="SaveCheckConfiguration('form')">保存</el-button>
+          <el-button type="primary" @click="SaveCheckConfiguration('form')">保 存</el-button>
         </div>
       </el-dialog>
 
@@ -75,7 +75,7 @@
       <el-dialog title="编辑" :visible.sync="editDialog">
         <el-form :model="editform" ref="editform" :rules="rules">
           <el-form-item label="检查大项" :label-width="formLabelWidth" required prop="inspectionMajor">
-            <el-select v-model="editform.inspectionMajor" placeholder="请选择活动区域">
+            <el-select v-model="editform.inspectionMajor" placeholder="请选择检查大项">
                 <el-option
                   v-for="it in InspectionMajor"
                   :key="it.project_id"
@@ -94,7 +94,7 @@
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button @click="editDialog = false">取 消</el-button>
-          <el-button type="primary" @click="UpdateCheck('editform')">保存</el-button>
+          <el-button type="primary" @click="UpdateCheck('editform')">保 存</el-button>
         </div>
       </el-dialog>
     </div>

src/xt_pages/user/inspection.vue

@@ -543,6 +543,8 @@ export default {
                 console.log(this.patient_info.remind_cycle);
 
                 this.itemDate = this.form.inspect_date;
+                console.log(this.itemDate);
+
                 this.items = [];
                 for (var index in this.projects) {
                   if (this.projects[index].project_id == this.form.project_id) {
@@ -668,7 +670,8 @@ export default {
           if (response.data.state == 1) {
             var inspections = response.data.data.inspections;
             this.total = response.data.data.total;
-            this.itemDate = response.data.data.date;
+            this.itemDate = response.data.data.date.split(" ")[0];
+            console.log("1111"+this.itemDate)
             this.inspections = response.data.data.inspections;
             if (inspections == null) {
               this.inspections = [];