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

src/xt_pages/dialysis/template/DialysisPrintOrderThirteen.vue

           （<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="predialysis.blood_access_part_opera_name.indexOf('颈内') > -1 ? true : false" showValue="颈内"></label-box>
+          <label-box :isChecked="getPartName(predialysis.blood_access_part_id).indexOf('颈内') > -1 ? true : false" showValue="颈内"></label-box>
           &nbsp;
-          <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('锁骨下') > -1 ? true : false" showValue="锁骨下"></label-box>
+          <label-box :isChecked="getPartName(predialysis.blood_access_part_id).indexOf('锁骨下') > -1 ? true : false" showValue="锁骨下"></label-box>
           &nbsp;
-          <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('股') > -1 ? true : false" showValue="股"></label-box>
+          <label-box :isChecked="getPartName(predialysis.blood_access_part_id).indexOf('股') > -1 ? true : false" showValue="股"></label-box>
           &nbsp;
-          <label-box :isChecked="['内瘘-左','内瘘-右','中心静脉置管-左','中心静脉置管-右','颈内','锁骨下','股'].indexOf(predialysis.blood_access_part_opera_name) == -1? true : false" showValue="其他"></label-box>
+          <label-box :isChecked="getPartName(predialysis.blood_access_part_id).indexOf('其他') > -1? true : false" showValue="其他"></label-box>
           &nbsp;
         </div>
       </div>
           // checker: 0,
         }
       );
+    },
+    getPartName(id) {
+      for (let i = 0; i < this.vascularAccess.length; i++) {
+        if (this.vascularAccess[i].id == id) {
+          return this.vascularAccess[i].name;
+        }
+      }
     }
   },
   watch: {
     this.nutrition_arr = getDataConfig("hemodialysis", "nutrition");
     this.displaceLiquiPartOptions = this.$store.getters.displace_liqui;
     // this.bloodAccessParOpera = getDataConfig('hemodialysis', 'vascular_access_desc')
+    var vascularAccess = getDataConfig("hemodialysis", "vascular_access");
+    this.vascularAccess = vascularAccess;
+    //console.log("hhe", vascularAccess);
+    console.log(
+      "血管通路部位",
+      getDataConfig("hemodialysis", "vascular_access")
+    );
 
     var bloodAccessParOpera = getDataConfig(
       "hemodialysis",

src/xt_pages/qcd/checkStatistical.vue

       <el-dialog title="编辑" :visible.sync="editDialog">
         <el-form :model="form">
           <el-form-item label="检查大项" :label-width="formLabelWidth">
-            <el-select v-model="form.region" placeholder="请选择活动区域">
+            <el-select v-model="form.region" placeholder="请选择检查大项">
               <el-option label="区域一" value="shanghai"></el-option>
               <el-option label="区域二" value="beijing"></el-option>
             </el-select>

src/xt_pages/qcd/indicatorControlAnalysis/bloodPressure.vue

               <line-chart :options="chart"></line-chart>
             </div>
             <div class="cell clearfix" style="margin:0;margin-bottom:10px">
-              <div class="tableTitle" style="margin:0 20px 0 0;">统计表</div>
-              <el-input v-model="input" placeholder="收缩压" style="width: 80px;"></el-input>&nbsp;-&nbsp;
-              <el-input v-model="input" placeholder="收缩压" style="width: 80px;"></el-input>&nbsp;/&nbsp;
-              <el-input v-model="input" placeholder="舒张压" style="width: 80px;"></el-input>&nbsp;-&nbsp;
-              <el-input v-model="input" placeholder="舒张压" style="width: 80px;"></el-input>
-              <el-button type="primary">查询</el-button>
+              <div class="tableTitle">统计表</div>
             </div>
             <div>
               <el-table :data="tableData1" style="width: 100%" border>

src/xt_pages/qcd/statisticalConfiguration.vue

           <el-table-column prop="date" label="检验检查大项" width="180">
               <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="检查小项" width="300">
              <template slot-scope="scope">{{ scope.row.item_name }}</template>
           </el-table-column>
           <el-table-column prop="address" label="范围">
       <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="请选择活动区域" @change="changeInspection">
+            <el-select v-model="form.inspectionMajor" placeholder="请选择检查大项" @change="changeInspection">
                <el-option
                   v-for="item in InspectionMajor"
                   :key="item.project_id"
             </el-select>
           </el-form-item>
           <el-form-item label="检查小项" :label-width="formLabelWidth" required prop="inspectionMinor">
-            <el-select v-model="form.inspectionMinor" placeholder="请选择活动区域" @change="changeInspectionMonior">
+            <el-select v-model="form.inspectionMinor" placeholder="请选择检查小项" @change="changeInspectionMonior">
                 <el-option
                   v-for="it in InspectionMinor"
                   :key="it.id"
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button @click="newDialog = false">取 消</el-button>
-          <el-button type="primary" @click="saveInspection('form')">保存</el-button>
+          <el-button type="primary" @click="saveInspection('form')">保 存</el-button>
         </div>
       </el-dialog>
 
       <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="请选择活动区域" @change="changeInspectionTwo">
+            <el-select v-model="editform.inspectionMajor" placeholder="请选择检查大项" @change="changeInspectionTwo">
               <el-option
                   v-for="patient in InspectionMajor"
                   :key="patient.project_id"
             </el-select>
           </el-form-item>
           <el-form-item label="检查小项" :label-width="formLabelWidth" required prop="inspectionMinor">
-            <el-select v-model="editform.inspectionMinor" placeholder="请选择活动区域"  @change="changeInspectionMonior">
+            <el-select v-model="editform.inspectionMinor" placeholder="请选择检查小项"  @change="changeInspectionMonior">
                <el-option
                   v-for="item in InspectionMinorTwo"
                   :key="item.id"
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button @click="editDialog = false">取 消</el-button>
-          <el-button type="primary" @click="EditConfiguration('editform')">保存</el-button>
+          <el-button type="primary" @click="EditConfiguration('editform')">保 存</el-button>
         </div>
       </el-dialog>
     </div>