bug修改

src/api/common/common.js

@@ -443,6 +443,7 @@ export function getPatientContorlAnalysis(params) {
 }
 
 export function GetQualityControl(params) {
+  console.log('params', params)
   return request({
     url: '/com/api/getqualitycontrol',
     method: 'Get',

src/xt_pages/qcd/basicInformationAnalysis.vue

@@ -577,6 +577,20 @@ export default {
       },
     //统计透析年龄
     getTotalDialysisCount(timeStar,timeEnd){
+      //  const endDate = moment(new Date()).format('YYYY-MM-DD')
+      //  console.log("结束时间",endDate)
+      //  var end = Date.parse(endDate)/1000
+      //  console.log("end",end)
+      //  const startDate = moment().subtract('month', 144).format('YYYY-MM-DD')
+      //  var twStart = Date.parse(startDate)/1000
+      //  console.log("12年前",twStart)
+      // const start = moment().subtract('month', 432).format('YYYY-MM-DD')
+      // console.log("start",start)
+      //  var sixStart = Date.parse(start)/1000
+      //  console.log("36年前",sixStart)
+      //  const sevnstart = moment().subtract('month', 720).format('YYYY-MM-DD')
+      //  var sevenStart = Date.parse(sevnstart)/1000
+      //  console.log("60年前",sevenStart)
       getTotalDialysisCount(timeStar,timeEnd).then(response=>{
          if(response.data.state == 1){
            var dataage =  response.data.data.dataage

src/xt_pages/qcd/patientComplianceDetails.vue

@@ -245,9 +245,7 @@ export default {
       //一月
       if(month == 0){
         const startDate = moment().subtract('month', 0).format('YYYY-MM') + '-01'
-        console.log("开始时间",startDate)
         const endDate = moment(new Date()).format('YYYY-MM-DD')
-        console.log("结束时间",endDate)
         var now = new Date()
         var nowMonth = now.getMonth(); //当前月
         var nowYear = now.getFullYear(); //当前年
@@ -256,7 +254,7 @@ export default {
         this.startime=Date.parse(monthStartDate)/1000;//s
 
         //本月的结束时间
-        var monthEndDate = new Date(nowYear, nowMonth+1, 0);
+        var monthEndDate = moment().endOf('month').format('YYYY-MM-DD HH:mm:ss');
         this.endtime =Date.parse(monthEndDate)/1000-1;//s
         this.getlist()
       }
@@ -264,21 +262,21 @@ export default {
       //近三月
       if(month == 1){
         const startDate = moment().subtract('month', 3).format('YYYY-MM-DD')
-        console.log("三月前",startDate)
+    
         this.startime = Date.parse(startDate)/1000
-        console.log("开始时间搓",this.startime)
+       
         const endDate = moment(new Date()).format('YYYY-MM-DD')
-        console.log("结束时间",endDate)
+      
         this.endtime = Date.parse(endDate)/1000
-        console.log("日期时间搓",this.endtime)
+    
         this.getlist()
       }
-      console.log("month",month)
+    
 
        //近半年
       if(month == 2){
         const startDate = moment().subtract('month', 6).format('YYYY-MM-DD')
-        console.log("6月前",startDate)
+        
         this.startime = Date.parse(startDate)/1000
         const endDate = moment(new Date()).format('YYYY-MM-DD')
         this.endtime = Date.parse(endDate)/1000
@@ -381,11 +379,11 @@ export default {
         //本月的开始时间
         var monthStartDate = new Date(nowYear, nowMonth, 1);
         this.startime=Date.parse(monthStartDate)/1000;//s
-
+        console.log("本月开始时间",this.startime)
         //本月的结束时间
-        var monthEndDate = new Date(nowYear, nowMonth+1, 0);
-        this.endtime =Date.parse(monthEndDate)/1000-1;//s
-
+         var monthEndDate = moment().endOf('month').format('YYYY-MM-DD HH:mm:ss');
+         this.endtime =Date.parse(monthEndDate)/1000-1;//s
+         console.log("本月结束时间",)
 
 
           const params = {
@@ -394,18 +392,17 @@ export default {
             endtime:this.endtime,
             itemid:this.item_id,
           }
-        console.log("params",params)
        GetQualityControl(params).then(response=>{
           if(response.data.state == 1){
             var list = response.data.data.list
-            console.log("list",list)
+          
             for(let i=0;i<list.length;i++){
               this.modesData.xAxis.push(this.getTime(list[i].inspect_date));
                this.modesData.series.push(list[i].inspect_value)
             }
             this.chart.series[0].data = this.modesData.series
             this.chart.xAxis.data = this.modesData.xAxis
-            console.log(2222,this.modesData)
+       
           }
 
        })

src/xt_pages/qcd/statisticalConfiguration.vue

@@ -74,11 +74,21 @@
                 </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="质控范围" :label-width="formLabelWidth" required prop="large_range">
+
+          <!-- <el-form-item label="质控范围" :label-width="formLabelWidth" required prop="large_range">
             <el-input style="width:200px" v-model="form.min_range"></el-input>&nbsp;
             -
             <el-input style="width:200px" v-model="form.large_range"></el-input>
-          </el-form-item>
+          </el-form-item> -->
+          <div style="display:flex;">
+            <el-form-item label="质控范围" :label-width="formLabelWidth" required prop="min_range">
+                <el-input style="width:200px" v-model="form.min_range"></el-input>
+            </el-form-item>
+            <span style="margin-top:10px">-</span>
+            <el-form-item class='newFormItem' :label-width="formLabelWidth" required prop="large_range">
+                <el-input style="width:200px" v-model="form.large_range"></el-input>
+            </el-form-item>
+          </div>
           <el-form-item label="排序" :label-width="formLabelWidth">
             <el-input style="width:200px" v-model="form.sort"></el-input>
           </el-form-item>
@@ -115,11 +125,20 @@
                 </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="质控范围" :label-width="formLabelWidth" required prop="large_range">
+          <!-- <el-form-item label="质控范围" :label-width="formLabelWidth" required prop="large_range">
             <el-input style="width:200px" v-model="editform.min_range"></el-input>&nbsp;
             -
             <el-input style="width:200px" v-model="editform.large_range"></el-input>
-          </el-form-item>
+          </el-form-item> -->
+           <div style="display:flex;">
+            <el-form-item label="质控范围" :label-width="formLabelWidth" required prop="min_range">
+                <el-input style="width:200px" v-model="editform.min_range"></el-input>
+            </el-form-item>
+            <span style="margin-top:10px">-</span>
+            <el-form-item class='newFormItem' :label-width="formLabelWidth" required prop="large_range">
+                <el-input style="width:200px" v-model="editform.large_range"></el-input>
+            </el-form-item>
+          </div>
           <el-form-item label="排序" :label-width="formLabelWidth">
             <el-input style="width:200px" v-model="editform.sort"></el-input>
           </el-form-item>
@@ -176,7 +195,8 @@ export default {
       rules: {
         inspectionMajor: [{ required: true, message: "检查大项不能为空" }],
         inspectionMinor: [{ required: true, message: "检查小项不能为空" }],
-        large_range:[{required:true,message:"质控范围不能为空"}]
+        large_range:[{required:true,message:"质控范围不能为空"}],
+        min_range:[{required:true,message:"质控范围不能为空"}]
       },
       page:1,
       limit:10,
@@ -395,6 +415,11 @@ export default {
     text-align: center;
   }
 }
+.newFormItem{
+  .el-form-item__content{
+    margin-left:0 !important;
+  }
+}
 </style>
 
  <style rel="stylesheet/scss" lang="scss" scoped>