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/treatmentControlAnalysis/components/CheckPersonal.vue

@@ -36,7 +36,6 @@
         align="right"
         format="yyyy-MM-dd"
         value-format="yyyy-MM-dd"
-        :picker-options="pickerOptions"
       ></el-date-picker>
       <span class>-</span>
       <el-date-picker
@@ -56,8 +55,8 @@
     <el-container>
       <div style="width:160px">
         <div class="tableTitle">患者列表</div>
-        <el-table :data="patientsData" border style="width: 100%;" 
-          height="500" :row-style="{ color: '#303133' }" 
+        <el-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
            ref="singleTable"
@@ -209,7 +208,7 @@ export default {
           let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear()-1)).getTime() - 24 * 3600 * 1000;
           return time.getTime() > Date.now() || time.getTime() < threeMonths;;
         }
-      }, 
+      },
       modesData: {
         xAxis: [],
         series: []
@@ -260,11 +259,11 @@ export default {
       getInspectionTotalCount(this.listQuery.start_time,this.listQuery.end_time,this.patient_id).then(response=>{
         if(response.data.state === 1){
           var Inspection = response.data.data.Inspection
-    
+
           this.tableData = Inspection
-        
+
           var counts = response.data.data.counts
-        
+
           var arr = []
           for(let i=0;i<Inspection.length;i++){
             for(let j=0;j<counts.length;j++){
@@ -273,9 +272,9 @@ export default {
               }
             }
           }
-        
+
           // var arrtwo =  this.arrayDate(counts,this.normData)
-          
+
           var hash = {};
           var i = 0;
           var res = [];
@@ -288,11 +287,11 @@ export default {
                 Sort:item.Sort,
             })
           });
-          
+
           res.map(item => {
             item.Count = eval(item.Count.join('+'))
           })
-          
+
           let arr1 = []
           this.tableData.map(it => {
             arr1.push(it.project_name)
@@ -313,7 +312,7 @@ export default {
             let day = parseInt(time / (1000 * 60 * 60 * 24))
             this.obj.push(Math.round(day / this.tableData[key].inspection_frequency))
           }
-          
+
           this.chart.series[0].data = this.modesData.series
           this.chart.xAxis.data = this.modesData.xAxis
           this.getArrLength(this.chart.xAxis.data)
@@ -339,8 +338,8 @@ export default {
             }
           }
           // console.log('arr',arr)
-         
-          
+
+
           var hash = {};
           var i = 0;
           var res = [];
@@ -353,11 +352,11 @@ export default {
                 Sort:item.Sort,
             })
           });
-          
+
           res.map(item => {
             item.Count = eval(item.Count.join('+'))
           })
-          
+
           let arr1 = []
           this.tableData.map(it => {
             arr1.push(it.project_name)
@@ -378,7 +377,7 @@ export default {
             let day = parseInt(time / (1000 * 60 * 60 * 24))
             this.obj.push(Math.round(day / this.tableData[key].inspection_frequency))
           }
-          
+
           this.chart.series[0].data = this.modesData.series
           this.chart.xAxis.data = this.modesData.xAxis
           this.getArrLength(this.chart.xAxis.data)
@@ -389,7 +388,7 @@ export default {
           //        }
           //     }
           //   }
-            
+
           //  let time = new Date(this.listQuery.end_time) - new Date(this.listQuery.start_time)
           //  let day = parseInt(time / (1000 * 60 * 60 * 24))
           //  console.log("tabledata",this.tableData)
@@ -419,7 +418,7 @@ export default {
            var PatientsInfo = response.data.data.PatientsInfo
           //  console.log("patientsInfo",PatientsInfo)
            var arr = []
-        
+
           for(let i=0;i<this.tableData.length;i++){
             for(let j=0;j<PatientsInfo.length;j++){
               if(this.tableData[i].inspection_major == PatientsInfo[j].ProjectId){
@@ -428,8 +427,8 @@ export default {
             }
           }
           // console.log('arr',arr)
-         
-          
+
+
           var hash = {};
           var i = 0;
           var res = [];
@@ -442,11 +441,11 @@ export default {
                 Sort:item.Sort,
             })
           });
-          
+
           res.map(item => {
             item.Count = eval(item.Count.join('+'))
           })
-          
+
           let arr1 = []
           this.tableData.map(it => {
             arr1.push(it.project_name)
@@ -467,7 +466,7 @@ export default {
             let day = parseInt(time / (1000 * 60 * 60 * 24))
             this.obj.push(Math.round(day / this.tableData[key].inspection_frequency))
           }
-          
+
           this.chart.series[0].data = this.modesData.series
           this.chart.xAxis.data = this.modesData.xAxis
           this.getArrLength(this.chart.xAxis.data)
@@ -552,7 +551,7 @@ export default {
 
     //获取该机构下的所有患者
     this.getCurrentOrgPatients()
-   
+
   }
 };
 </script>

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

@@ -28,7 +28,6 @@
         align="right"
         format="yyyy-MM-dd"
         value-format="yyyy-MM-dd"
-        :picker-options="pickerOptions"
       ></el-date-picker>
       <span class>-</span>
       <el-date-picker
@@ -42,7 +41,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/treatmentControlAnalysis/components/TimePersonal.vue

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