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

src/xt_pages/qcd/basicInformationAnalysis.vue

@@ -52,7 +52,6 @@
           align="right"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
-          :picker-options="pickerOptions"
         ></el-date-picker>
         <span class>-</span>
         <el-date-picker
@@ -66,7 +65,6 @@
           align="right"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
-          :picker-options="pickerOptions"
         ></el-date-picker>
       </div>
 

src/xt_pages/qcd/indicatorControlAnalysis/bloodPressure.vue

@@ -46,7 +46,6 @@
             :editable="false"
             style="width: 150px;"
             type="date"
-            :picker-options="pickerOptions"
             placeholder="选择日期时间"
             align="right"
             format="yyyy-MM-dd"
@@ -58,7 +57,6 @@
             prefix-icon="el-icon-date"
             @change="changeEndTime"
             :editable="false"
-            :picker-options="pickerOptions"
             style="width: 150px;"
             type="date"
             placeholder="选择日期时间"
@@ -70,13 +68,13 @@
         <el-container>
           <div style="width:160px">
             <div class="tableTitle">患者列表</div>
-            
+
 
             <el-table :data="patientsData" ref="table" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }"
                       :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                       highlight-current-row
                       @current-change="handleChange">
-              <el-table-column prop="dialysis_no" label="透析号" width="70" align="center"> 
+              <el-table-column prop="dialysis_no" label="透析号" width="70" align="center">
                 <template slot-scope="scope">{{scope.row.dialysis_no}}</template>
               </el-table-column>
               <el-table-column prop="name" label="姓名" width="90" align="center">
@@ -296,7 +294,7 @@
                       { offset: 1, color: colorList[index][1] }
                     ])
                   },
-                  lineStyle:{ 
+                  lineStyle:{
                     color:'#409eff' //改变折线颜色
                   },
                   barBorderRadius: [5, 5, 0, 0] //柱状角成椭圆形

src/xt_pages/qcd/indicatorControlAnalysis/bloodPressureDetails.vue

@@ -48,7 +48,6 @@
                 :editable="false"
                 style="width: 150px;"
                 type="date"
-                :picker-options="pickerOptions"
                 placeholder="选择日期时间"
                 align="right"
                 format="yyyy-MM-dd"
@@ -60,7 +59,6 @@
                 prefix-icon="el-icon-date"
                 @change="changeEndTime"
                 :editable="false"
-                :picker-options="pickerOptions"
                 style="width: 150px;"
                 type="date"
                 placeholder="选择日期时间"
@@ -72,7 +70,7 @@
         <el-container>
           <div style="width:160px">
             <div class="tableTitle">患者列表</div>
-            
+
 
             <el-table ref="table" :data="patientsData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }"
                       :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
@@ -88,7 +86,7 @@
 
           </div>
           <div class="containerRight" style="flex:1;overflow: hidden">
-            
+
             <div class="tableTitle">指标趋势<span style="font-weight:normal">&nbsp;&nbsp;（当前患者: {{patient_name}}）</span></div>
             <div>
               <line-chart :options="chart"></line-chart>

src/xt_pages/qcd/indicatorControlAnalysis/monitor.vue

@@ -46,7 +46,6 @@
             :editable="false"
             style="width: 150px;"
             type="date"
-            :picker-options="pickerOptions"
             placeholder="选择日期时间"
             align="right"
             format="yyyy-MM-dd"
@@ -58,7 +57,6 @@
             prefix-icon="el-icon-date"
             @change="changeEndTime"
             :editable="false"
-            :picker-options="pickerOptions"
             style="width: 150px;"
             type="date"
             placeholder="选择日期时间"
@@ -70,7 +68,7 @@
         <el-container>
           <div style="width:160px">
             <div class="tableTitle">患者列表</div>
-            
+
 
             <el-table ref="table" :data="patientsData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }"
                       :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
@@ -321,7 +319,7 @@
                       { offset: 1, color: colorList[index][1] }
                     ])
                   },
-                  lineStyle:{ 
+                  lineStyle:{
                     color:'#409eff' //改变折线颜色
                   },
                   barBorderRadius: [5, 5, 0, 0] //柱状角成椭圆形

src/xt_pages/qcd/indicatorControlAnalysis/patientInspectionDetail.vue

@@ -57,7 +57,6 @@
           align="right"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
-          :picker-options="pickerOptions"
         ></el-date-picker>
         <span v-if="stateType == 5"
               class>-</span>
@@ -73,7 +72,6 @@
           align="right"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
-          :picker-options="pickerOptions"
         ></el-date-picker>
       </div>
       <el-container>

src/xt_pages/qcd/indicatorControlAnalysis/process.vue

@@ -47,7 +47,6 @@
             :editable="false"
             style="width: 150px;"
             type="date"
-            :picker-options="pickerOptions"
             placeholder="选择日期时间"
             align="right"
             format="yyyy-MM-dd"
@@ -59,7 +58,6 @@
             prefix-icon="el-icon-date"
             @change="changeEndTime"
             :editable="false"
-            :picker-options="pickerOptions"
             style="width: 150px;"
             type="date"
             placeholder="选择日期时间"
@@ -72,7 +70,7 @@
           <div style="width:160px">
 
             <div class="tableTitle">患者列表</div>
-            
+
 
             <el-table ref="table" :data="patientsData" border style="width: 100%;" height="500"
                       :row-style="{ color: '#303133' }"
@@ -413,7 +411,7 @@
                       { offset: 1, color: colorList[index][1] }
                     ])
                   },
-                  lineStyle:{ 
+                  lineStyle:{
                     color:'#409eff' //改变折线颜色
                   },
                   barBorderRadius: [5, 5, 0, 0] //柱状角成椭圆形

src/xt_pages/qcd/indicatorControlAnalysis/weight.vue

@@ -46,7 +46,6 @@
             :editable="false"
             style="width: 150px;"
             type="date"
-            :picker-options="pickerOptions"
             placeholder="选择日期时间"
             align="right"
             format="yyyy-MM-dd"
@@ -58,7 +57,6 @@
             prefix-icon="el-icon-date"
             @change="changeEndTime"
             :editable="false"
-            :picker-options="pickerOptions"
             style="width: 150px;"
             type="date"
             placeholder="选择日期时间"

src/xt_pages/qcd/indicatorControlAnalysis/weightDetails.vue

@@ -49,7 +49,6 @@
                 :editable="false"
                 style="width: 150px;"
                 type="date"
-                :picker-options="pickerOptions"
                 placeholder="选择日期时间"
                 align="right"
                 format="yyyy-MM-dd"
@@ -61,7 +60,6 @@
                 prefix-icon="el-icon-date"
                 @change="changeEndTime"
                 :editable="false"
-                :picker-options="pickerOptions"
                 style="width: 150px;"
                 type="date"
                 placeholder="选择日期时间"
@@ -73,7 +71,7 @@
         <el-container>
           <div style="width:160px">
             <div class="tableTitle">患者列表</div>
-            
+
             <el-table ref="table" :data="patientsData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }"
                       :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                       highlight-current-row
@@ -89,7 +87,7 @@
 
           </div>
           <div class="containerRight" style="flex:1;overflow: hidden">
-            
+
             <div class="tableTitle">指标趋势</div>
             <div>
               <line-chart :options="chart"></line-chart>

src/xt_pages/qcd/officesControlAnalysis/time.vue

@@ -40,7 +40,6 @@
               align="right"
               format="yyyy-MM-dd"
               value-format="yyyy-MM-dd"
-              :picker-options="pickerOptions"
           ></el-date-picker>
           <span class>-</span>
           <el-date-picker
@@ -54,7 +53,6 @@
               align="right"
               format="yyyy-MM-dd"
               value-format="yyyy-MM-dd"
-              :picker-options="pickerOptions"
           ></el-date-picker>
         </div>
       </div>

src/xt_pages/qcd/patientComplianceDetails.vue

@@ -74,7 +74,6 @@
                 align="right"
                 format="yyyy-MM-dd"
                 value-format="yyyy-MM-dd"
-                :picker-options="pickerOptions"
               ></el-date-picker>
               <span class>-</span>
               <el-date-picker
@@ -88,7 +87,6 @@
                 align="right"
                 format="yyyy-MM-dd"
                 value-format="yyyy-MM-dd"
-                :picker-options="pickerOptions"
               ></el-date-picker>
             </div>
             <div class="tableTitle">指标监控</div>

src/xt_pages/qcd/patientControlAnalysis.vue

@@ -47,7 +47,6 @@
               align="right"
               format="yyyy-MM-dd"
               value-format="yyyy-MM-dd"
-              :picker-options="pickerOptions"
           ></el-date-picker>
           <span class>-</span>
           <el-date-picker
@@ -61,7 +60,6 @@
               align="right"
               format="yyyy-MM-dd"
               value-format="yyyy-MM-dd"
-              :picker-options="pickerOptions"
           ></el-date-picker>
         </div>
         <div class="cell clearfix">

src/xt_pages/qcd/processIndicators.1.vue

@@ -13,7 +13,6 @@
         type="date"
         placeholder="选择日期时间"
         align="right"
-        :picker-options="pickerOptions"
         format="yyyy-MM-dd"
         value-format="yyyy-MM-dd"
       ></el-date-picker>
@@ -27,7 +26,6 @@
         type="date"
         placeholder="选择日期时间"
         align="right"
-        :picker-options="pickerOptions"
         format="yyyy-MM-dd"
         value-format="yyyy-MM-dd"
       ></el-date-picker>
@@ -204,7 +202,7 @@ export default {
           this.$message.error(response.data.msg);
           return false;
         } else {
-          
+
           this.tableData = [];
           this.tableRowData = []
 
@@ -212,7 +210,7 @@ export default {
           var references = response.data.data.references;
           for (const index in references) {
             if (references[index].project_id in this.projectOptions) {
-              continue;  
+              continue;
             }
             this.$set(this.projectOptions, references[index].project_id, references[index]);
           }
@@ -220,7 +218,7 @@ export default {
           var patients = response.data.data.patients;
           for (const index in patients) {
             if (patients[index].id in this.patientMap) {
-              continue;  
+              continue;
             }
             this.$set(this.patientMap, patients[index].id, patients[index]);
           }
@@ -374,4 +372,4 @@ export default {
     }
   }
 }
-</style>
+</style>

src/xt_pages/qcd/treatmentControlAnalysis/components/CheckPersonal.vue

@@ -49,7 +49,6 @@
         align="right"
         format="yyyy-MM-dd"
         value-format="yyyy-MM-dd"
-        :picker-options="pickerOptions"
       ></el-date-picker>
     </div>
     <el-container>

src/xt_pages/qcd/workAnalysis/doctor.vue

@@ -42,7 +42,6 @@
             :editable="false"
             style="width: 150px;"
             type="date"
-            :picker-options="pickerOptions"
             placeholder="选择日期时间"
             align="right"
             format="yyyy-MM-dd"
@@ -54,7 +53,6 @@
             prefix-icon="el-icon-date"
             @change="changeEndTime"
             :editable="false"
-            :picker-options="pickerOptions"
             style="width: 150px;"
             type="date"
             placeholder="选择日期时间"

src/xt_pages/qcd/workAnalysis/nurse.vue

@@ -42,7 +42,6 @@
             :editable="false"
             style="width: 150px;"
             type="date"
-            :picker-options="pickerOptions"
             placeholder="选择日期时间"
             align="right"
             format="yyyy-MM-dd"
@@ -54,7 +53,6 @@
             prefix-icon="el-icon-date"
             @change="changeEndTime"
             :editable="false"
-            :picker-options="pickerOptions"
             style="width: 150px;"
             type="date"
             placeholder="选择日期时间"