Browse Source

bug修改

XMLWAN 4 years ago
parent
commit
49d18b715f

+ 1 - 0
src/api/common/common.js View File

443
 }
443
 }
444
 
444
 
445
 export function GetQualityControl(params) {
445
 export function GetQualityControl(params) {
446
+  console.log('params', params)
446
   return request({
447
   return request({
447
     url: '/com/api/getqualitycontrol',
448
     url: '/com/api/getqualitycontrol',
448
     method: 'Get',
449
     method: 'Get',

+ 14 - 0
src/xt_pages/qcd/basicInformationAnalysis.vue View File

577
       },
577
       },
578
     //统计透析年龄
578
     //统计透析年龄
579
     getTotalDialysisCount(timeStar,timeEnd){
579
     getTotalDialysisCount(timeStar,timeEnd){
580
+      //  const endDate = moment(new Date()).format('YYYY-MM-DD')
581
+      //  console.log("结束时间",endDate)
582
+      //  var end = Date.parse(endDate)/1000
583
+      //  console.log("end",end)
584
+      //  const startDate = moment().subtract('month', 144).format('YYYY-MM-DD')
585
+      //  var twStart = Date.parse(startDate)/1000
586
+      //  console.log("12年前",twStart)
587
+      // const start = moment().subtract('month', 432).format('YYYY-MM-DD')
588
+      // console.log("start",start)
589
+      //  var sixStart = Date.parse(start)/1000
590
+      //  console.log("36年前",sixStart)
591
+      //  const sevnstart = moment().subtract('month', 720).format('YYYY-MM-DD')
592
+      //  var sevenStart = Date.parse(sevnstart)/1000
593
+      //  console.log("60年前",sevenStart)
580
       getTotalDialysisCount(timeStar,timeEnd).then(response=>{
594
       getTotalDialysisCount(timeStar,timeEnd).then(response=>{
581
          if(response.data.state == 1){
595
          if(response.data.state == 1){
582
            var dataage =  response.data.data.dataage
596
            var dataage =  response.data.data.dataage

+ 13 - 16
src/xt_pages/qcd/patientComplianceDetails.vue View File

245
       //一月
245
       //一月
246
       if(month == 0){
246
       if(month == 0){
247
         const startDate = moment().subtract('month', 0).format('YYYY-MM') + '-01'
247
         const startDate = moment().subtract('month', 0).format('YYYY-MM') + '-01'
248
-        console.log("开始时间",startDate)
249
         const endDate = moment(new Date()).format('YYYY-MM-DD')
248
         const endDate = moment(new Date()).format('YYYY-MM-DD')
250
-        console.log("结束时间",endDate)
251
         var now = new Date()
249
         var now = new Date()
252
         var nowMonth = now.getMonth(); //当前月
250
         var nowMonth = now.getMonth(); //当前月
253
         var nowYear = now.getFullYear(); //当前年
251
         var nowYear = now.getFullYear(); //当前年
256
         this.startime=Date.parse(monthStartDate)/1000;//s
254
         this.startime=Date.parse(monthStartDate)/1000;//s
257
 
255
 
258
         //本月的结束时间
256
         //本月的结束时间
259
-        var monthEndDate = new Date(nowYear, nowMonth+1, 0);
257
+        var monthEndDate = moment().endOf('month').format('YYYY-MM-DD HH:mm:ss');
260
         this.endtime =Date.parse(monthEndDate)/1000-1;//s
258
         this.endtime =Date.parse(monthEndDate)/1000-1;//s
261
         this.getlist()
259
         this.getlist()
262
       }
260
       }
264
       //近三月
262
       //近三月
265
       if(month == 1){
263
       if(month == 1){
266
         const startDate = moment().subtract('month', 3).format('YYYY-MM-DD')
264
         const startDate = moment().subtract('month', 3).format('YYYY-MM-DD')
267
-        console.log("三月前",startDate)
265
+    
268
         this.startime = Date.parse(startDate)/1000
266
         this.startime = Date.parse(startDate)/1000
269
-        console.log("开始时间搓",this.startime)
267
+       
270
         const endDate = moment(new Date()).format('YYYY-MM-DD')
268
         const endDate = moment(new Date()).format('YYYY-MM-DD')
271
-        console.log("结束时间",endDate)
269
+      
272
         this.endtime = Date.parse(endDate)/1000
270
         this.endtime = Date.parse(endDate)/1000
273
-        console.log("日期时间搓",this.endtime)
271
+    
274
         this.getlist()
272
         this.getlist()
275
       }
273
       }
276
-      console.log("month",month)
274
+    
277
 
275
 
278
        //近半年
276
        //近半年
279
       if(month == 2){
277
       if(month == 2){
280
         const startDate = moment().subtract('month', 6).format('YYYY-MM-DD')
278
         const startDate = moment().subtract('month', 6).format('YYYY-MM-DD')
281
-        console.log("6月前",startDate)
279
+        
282
         this.startime = Date.parse(startDate)/1000
280
         this.startime = Date.parse(startDate)/1000
283
         const endDate = moment(new Date()).format('YYYY-MM-DD')
281
         const endDate = moment(new Date()).format('YYYY-MM-DD')
284
         this.endtime = Date.parse(endDate)/1000
282
         this.endtime = Date.parse(endDate)/1000
381
         //本月的开始时间
379
         //本月的开始时间
382
         var monthStartDate = new Date(nowYear, nowMonth, 1);
380
         var monthStartDate = new Date(nowYear, nowMonth, 1);
383
         this.startime=Date.parse(monthStartDate)/1000;//s
381
         this.startime=Date.parse(monthStartDate)/1000;//s
384
-
382
+        console.log("本月开始时间",this.startime)
385
         //本月的结束时间
383
         //本月的结束时间
386
-        var monthEndDate = new Date(nowYear, nowMonth+1, 0);
387
-        this.endtime =Date.parse(monthEndDate)/1000-1;//s
388
-
384
+         var monthEndDate = moment().endOf('month').format('YYYY-MM-DD HH:mm:ss');
385
+         this.endtime =Date.parse(monthEndDate)/1000-1;//s
386
+         console.log("本月结束时间",)
389
 
387
 
390
 
388
 
391
           const params = {
389
           const params = {
394
             endtime:this.endtime,
392
             endtime:this.endtime,
395
             itemid:this.item_id,
393
             itemid:this.item_id,
396
           }
394
           }
397
-        console.log("params",params)
398
        GetQualityControl(params).then(response=>{
395
        GetQualityControl(params).then(response=>{
399
           if(response.data.state == 1){
396
           if(response.data.state == 1){
400
             var list = response.data.data.list
397
             var list = response.data.data.list
401
-            console.log("list",list)
398
+          
402
             for(let i=0;i<list.length;i++){
399
             for(let i=0;i<list.length;i++){
403
               this.modesData.xAxis.push(this.getTime(list[i].inspect_date));
400
               this.modesData.xAxis.push(this.getTime(list[i].inspect_date));
404
                this.modesData.series.push(list[i].inspect_value)
401
                this.modesData.series.push(list[i].inspect_value)
405
             }
402
             }
406
             this.chart.series[0].data = this.modesData.series
403
             this.chart.series[0].data = this.modesData.series
407
             this.chart.xAxis.data = this.modesData.xAxis
404
             this.chart.xAxis.data = this.modesData.xAxis
408
-            console.log(2222,this.modesData)
405
+       
409
           }
406
           }
410
 
407
 
411
        })
408
        })

+ 30 - 5
src/xt_pages/qcd/statisticalConfiguration.vue View File

74
                 </el-option>
74
                 </el-option>
75
             </el-select>
75
             </el-select>
76
           </el-form-item>
76
           </el-form-item>
77
-          <el-form-item label="质控范围" :label-width="formLabelWidth" required prop="large_range">
77
+
78
+          <!-- <el-form-item label="质控范围" :label-width="formLabelWidth" required prop="large_range">
78
             <el-input style="width:200px" v-model="form.min_range"></el-input>&nbsp;
79
             <el-input style="width:200px" v-model="form.min_range"></el-input>&nbsp;
79
             -
80
             -
80
             <el-input style="width:200px" v-model="form.large_range"></el-input>
81
             <el-input style="width:200px" v-model="form.large_range"></el-input>
81
-          </el-form-item>
82
+          </el-form-item> -->
83
+          <div style="display:flex;">
84
+            <el-form-item label="质控范围" :label-width="formLabelWidth" required prop="min_range">
85
+                <el-input style="width:200px" v-model="form.min_range"></el-input>
86
+            </el-form-item>
87
+            <span style="margin-top:10px">-</span>
88
+            <el-form-item class='newFormItem' :label-width="formLabelWidth" required prop="large_range">
89
+                <el-input style="width:200px" v-model="form.large_range"></el-input>
90
+            </el-form-item>
91
+          </div>
82
           <el-form-item label="排序" :label-width="formLabelWidth">
92
           <el-form-item label="排序" :label-width="formLabelWidth">
83
             <el-input style="width:200px" v-model="form.sort"></el-input>
93
             <el-input style="width:200px" v-model="form.sort"></el-input>
84
           </el-form-item>
94
           </el-form-item>
115
                 </el-option>
125
                 </el-option>
116
             </el-select>
126
             </el-select>
117
           </el-form-item>
127
           </el-form-item>
118
-          <el-form-item label="质控范围" :label-width="formLabelWidth" required prop="large_range">
128
+          <!-- <el-form-item label="质控范围" :label-width="formLabelWidth" required prop="large_range">
119
             <el-input style="width:200px" v-model="editform.min_range"></el-input>&nbsp;
129
             <el-input style="width:200px" v-model="editform.min_range"></el-input>&nbsp;
120
             -
130
             -
121
             <el-input style="width:200px" v-model="editform.large_range"></el-input>
131
             <el-input style="width:200px" v-model="editform.large_range"></el-input>
122
-          </el-form-item>
132
+          </el-form-item> -->
133
+           <div style="display:flex;">
134
+            <el-form-item label="质控范围" :label-width="formLabelWidth" required prop="min_range">
135
+                <el-input style="width:200px" v-model="editform.min_range"></el-input>
136
+            </el-form-item>
137
+            <span style="margin-top:10px">-</span>
138
+            <el-form-item class='newFormItem' :label-width="formLabelWidth" required prop="large_range">
139
+                <el-input style="width:200px" v-model="editform.large_range"></el-input>
140
+            </el-form-item>
141
+          </div>
123
           <el-form-item label="排序" :label-width="formLabelWidth">
142
           <el-form-item label="排序" :label-width="formLabelWidth">
124
             <el-input style="width:200px" v-model="editform.sort"></el-input>
143
             <el-input style="width:200px" v-model="editform.sort"></el-input>
125
           </el-form-item>
144
           </el-form-item>
176
       rules: {
195
       rules: {
177
         inspectionMajor: [{ required: true, message: "检查大项不能为空" }],
196
         inspectionMajor: [{ required: true, message: "检查大项不能为空" }],
178
         inspectionMinor: [{ required: true, message: "检查小项不能为空" }],
197
         inspectionMinor: [{ required: true, message: "检查小项不能为空" }],
179
-        large_range:[{required:true,message:"质控范围不能为空"}]
198
+        large_range:[{required:true,message:"质控范围不能为空"}],
199
+        min_range:[{required:true,message:"质控范围不能为空"}]
180
       },
200
       },
181
       page:1,
201
       page:1,
182
       limit:10,
202
       limit:10,
395
     text-align: center;
415
     text-align: center;
396
   }
416
   }
397
 }
417
 }
418
+.newFormItem{
419
+  .el-form-item__content{
420
+    margin-left:0 !important;
421
+  }
422
+}
398
 </style>
423
 </style>
399
 
424
 
400
  <style rel="stylesheet/scss" lang="scss" scoped>
425
  <style rel="stylesheet/scss" lang="scss" scoped>