소스 검색

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

XMLWAN 4 년 전
부모
커밋
a8a90e6955

+ 3 - 3
src/xt_pages/qcd/basicInformationAnalysis.vue 파일 보기

@@ -6,7 +6,7 @@
6 6
     <div class="app-container">
7 7
       <div class="cell clearfix">
8 8
         <label class="title">
9
-          <span class="name">转归状态</span> :
9
+          <span class="name">日期查询</span> :
10 10
         </label>
11 11
         <div class="time">
12 12
           <ul class>
@@ -300,7 +300,7 @@ export default {
300 300
       stateType: 0,
301 301
       month: [
302 302
         { value: 0, label: "本月", state: 0 },
303
-        { value: 1, label: "近三月", state: 1 },
303
+        { value: 1, label: "近三月", state: 1 },
304 304
         { value: 2, label: "近半年", state: 2 },
305 305
         { value: 3, label: "近一年", state: 3 }
306 306
         // { value:4,label:"自定义",state:4}
@@ -651,7 +651,7 @@ export default {
651 651
   flex-wrap: wrap;
652 652
   .infoOne {
653 653
     margin-right: 30px;
654
-    margin-top: 30px;
654
+    margin-top: 20px;
655 655
     .titleBox {
656 656
       display: flex;
657 657
       align-items: center;

+ 7 - 2
src/xt_pages/qcd/checkStatistical.vue 파일 보기

@@ -3,7 +3,7 @@
3 3
     <div class="position">
4 4
       <bread-crumb :crumbs="crumbs"></bread-crumb>
5 5
     </div>
6
-    <div class="app-container">
6
+    <div class="app-container checkStatistical">
7 7
       <el-tabs v-model="tabActiveName" @tab-click="handleTabClick" style="margin-bottom:10px">
8 8
         <el-tab-pane label="质控达标统计配置" name="control"></el-tab-pane>
9 9
         <el-tab-pane label="检验检查统计配置" name="query"></el-tab-pane>
@@ -14,7 +14,7 @@
14 14
         </el-col>
15 15
       </el-row>
16 16
       <div class="configTable">
17
-        <el-table :data="checkList" border style="width: 100%">
17
+        <el-table :data="checkList" border style="width: 100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
18 18
           <el-table-column prop="date" label="检验检查项">
19 19
               <template slot-scope="scope">{{ scope.row.project_name }}</template>
20 20
           </el-table-column>
@@ -300,6 +300,11 @@ export default {
300 300
     text-align: center;
301 301
   }
302 302
 }
303
+.checkStatistical{
304
+  .el-tabs{
305
+    margin-bottom: 0 !important;
306
+  }
307
+}
303 308
 </style>
304 309
 
305 310
  <style rel="stylesheet/scss" lang="scss" scoped>

+ 10 - 1
src/xt_pages/qcd/indicatorControlAnalysis/analysis.vue 파일 보기

@@ -55,7 +55,7 @@ export default {
55 55
       ],
56 56
       way: [
57 57
         { value: 0, label: "科室", state: 0 },
58
-        { value: 1, label: "个人", state: 1 }
58
+        { value: 1, label: "患者", state: 1 }
59 59
       ],
60 60
       wayType: 0
61 61
     };
@@ -67,3 +67,12 @@ export default {
67 67
   }
68 68
 };
69 69
 </script>
70
+
71
+<style lang="scss">
72
+.page_analysis{
73
+  .el-tabs{
74
+    margin-bottom:0 !important;
75
+  }
76
+}
77
+
78
+</style>

+ 2 - 2
src/xt_pages/qcd/indicatorControlAnalysis/bloodPressure.vue 파일 보기

@@ -522,8 +522,8 @@
522 522
         this.query.patient_id = val.id
523 523
         this.query.page = 1
524 524
         this.patient_name =val.name
525
-        this.GetDialysisBloodPressureChartData(this.query)
526
-        this.GetDialysisBloodPressureTableData(this.query)
525
+        // this.GetDialysisBloodPressureChartData(this.query)
526
+        // this.GetDialysisBloodPressureTableData(this.query)
527 527
         for (let i = 0;i < this.patientsData.length; i++){
528 528
           if (this.patientsData[i].id == val.id){
529 529
             this.$refs.table.setCurrentRow(this.patientsData[i])

+ 2 - 2
src/xt_pages/qcd/indicatorControlAnalysis/bloodPressureDetails.vue 파일 보기

@@ -384,8 +384,8 @@ export default {
384 384
     }, handleSelect(val) {
385 385
       this.query.patient_id = val.id
386 386
       this.query.page = 1
387
-      this.GetDialysisPatientBloodPressureChartData(this.query)
388
-      this.GetDialysisBloodPressureTableData(this.query)
387
+      // this.GetDialysisPatientBloodPressureChartData(this.query)
388
+      // this.GetDialysisBloodPressureTableData(this.query)
389 389
 
390 390
       for (let i = 0;i < this.patientsData.length; i++){
391 391
         if (this.patientsData[i].id == val.id){

+ 15 - 15
src/xt_pages/qcd/indicatorControlAnalysis/components/office.vue 파일 보기

@@ -1,7 +1,7 @@
1 1
 <template>
2 2
   <div class="page_office">
3 3
     <div class="cell clearfix">
4
-      <el-select v-model="query.project_id" placeholder="请选择" style="width:120px;margin-right:20px"
4
+      <el-select v-model="query.project_id" placeholder="请选择" style="width:120px;margin-right:10px"
5 5
                  @change="changeProject">
6 6
         <el-option
7 7
           v-for="item in project_columns"
@@ -14,7 +14,7 @@
14 14
       <el-select
15 15
         v-model="query.item_id"
16 16
         placeholder="请选择"
17
-        style="width:120px;margin-right:20px"
17
+        style="width:120px;margin-right:10px"
18 18
         @change="changeItem"
19 19
       >
20 20
         <el-option
@@ -25,7 +25,7 @@
25 25
         ></el-option>
26 26
       </el-select>
27 27
 
28
-      <el-select v-model="query.range_value" placeholder="请选择" style="width:120px;margin-right:20px"
28
+      <el-select v-model="query.range_value" placeholder="请选择" style="width:120px;margin-right:10px"
29 29
                  @change="changeRangeValue">
30 30
         <el-option
31 31
           v-for="item in range_value_columns"
@@ -108,18 +108,18 @@
108 108
 
109 109
       </el-table>
110 110
 
111
-      <!--<el-pagination-->
112
-        <!--align="right"-->
113
-        <!--@size-change="handleSizeChange"-->
114
-        <!--@current-change="handleCurrentChange"-->
115
-        <!--:current-page="query.page"-->
116
-        <!--:page-sizes="[10, 20, 50, 100]"-->
117
-        <!--:page-size="10"-->
118
-        <!--background-->
119
-        <!--style="margin-top:20px;"-->
120
-        <!--layout="total, sizes, prev, pager, next, jumper"-->
121
-        <!--:total="total"-->
122
-      <!--&gt;</el-pagination>-->
111
+      <el-pagination
112
+        align="right"
113
+        @size-change="handleSizeChange"
114
+        @current-change="handleCurrentChange"
115
+        :current-page="query.page"
116
+        :page-sizes="[10, 20, 50, 100]"
117
+        :page-size="10"
118
+        background
119
+        style="margin-top:20px;"
120
+        layout="total, sizes, prev, pager, next, jumper"
121
+        :total="total"
122
+      ></el-pagination>
123 123
     </div>
124 124
   </div>
125 125
 </template>

+ 2 - 2
src/xt_pages/qcd/indicatorControlAnalysis/monitor.vue 파일 보기

@@ -550,8 +550,8 @@
550 550
         this.query.patient_id = val.id
551 551
         this.query.page = 1
552 552
         this.patient_name = val.name
553
-        this.GetDialysisWatchTableData(this.query)
554
-        this.GetDialysisWatchChartData(this.query)
553
+        // this.GetDialysisWatchTableData(this.query)
554
+        // this.GetDialysisWatchChartData(this.query)
555 555
         for (let i = 0;i < this.patientsData.length; i++){
556 556
           if (this.patientsData[i].id == val.id){
557 557
             this.$refs.table.setCurrentRow(this.patientsData[i])

+ 181 - 8
src/xt_pages/qcd/indicatorControlAnalysis/patientInspectionDetail.vue 파일 보기

@@ -104,7 +104,10 @@
104 104
           <div class="tableTitle">统计图</div>
105 105
           <div>
106 106
             <!--<line-chart :options="options2"></line-chart>-->
107
-            <line-chart :options="options2"></line-chart>
107
+            <line-chart v-if="this.$route.query.range_type == 1" :options="options"></line-chart>
108
+            <line-chart v-if="this.$route.query.range_type == 2" :options="options2"></line-chart>
109
+
110
+
108 111
 
109 112
           </div>
110 113
         </div>
@@ -247,6 +250,171 @@
247 250
             }
248 251
           ]
249 252
         },
253
+        options: {
254
+          title: {
255
+            text: "ECharts 入门示例"
256
+          },
257
+          tooltip: {},
258
+          legend: {
259
+            data: [""],
260
+            left: 0
261
+          },
262
+          xAxis: {
263
+            data: [],
264
+            axisLabel: {
265
+              interval: 0,
266
+              formatter: function(value) {
267
+                var ret = ""; //拼接加\n返回的类目项
268
+                var maxLength = 4; //每项显示文字个数
269
+                var valLength = value.length; //X轴类目项的文字个数
270
+                var rowN = Math.ceil(valLength / maxLength); //类目项需要换行的行数
271
+                if (rowN > 1) {
272
+                  //如果类目项的文字大于3,
273
+                  for (var i = 0; i < rowN; i++) {
274
+                    var temp = ""; //每次截取的字符串
275
+                    var start = i * maxLength; //开始截取的位置
276
+                    var end = start + maxLength; //结束截取的位置
277
+                    //这里也可以加一个是否是最后一行的判断,但是不加也没有影响,那就不加吧
278
+                    temp = value.substring(start, end) + "\n";
279
+                    ret += temp; //凭借最终的字符串
280
+                  }
281
+                  return ret;
282
+                } else {
283
+                  return value;
284
+                }
285
+              },
286
+            }
287
+          },
288
+          yAxis: {
289
+            axisLabel: {
290
+              formatter: "{value} %"
291
+            },
292
+            show: false
293
+          },
294
+          series: [
295
+            {
296
+              name: "",
297
+              type: "line",
298
+              data: [],
299
+              barWidth: 30,
300
+              label: {
301
+                normal: {
302
+                  show: true,
303
+                  position: "top",
304
+                  formatter: "{c}"
305
+                }
306
+              },
307
+              //配置样式
308
+              itemStyle: {
309
+                //通常情况下:
310
+
311
+                //每个柱子的颜色即为colorList数组里的每一项,如果柱子数目多于colorList的长度,则柱子颜色循环使用该数组
312
+                normal: {
313
+                  color: function (params) {
314
+                    //我这边就两个柱子,大体就两个柱子颜色渐变,所以数组只有两个值,多个颜色就多个值
315
+                    var colorList = [
316
+                      ["#A9E0F3", "#9FBDFC"],
317
+
318
+                      ["#FFD7C0", "#FF9994"]
319
+                    ];
320
+
321
+                    var index = params.dataIndex;
322
+                    if (params.dataIndex >= colorList.length) {
323
+                      index = params.dataIndex % colorList.length;
324
+                    }
325
+
326
+                    return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
327
+                      {offset: 0, color: colorList[index][0]},
328
+                      // { offset: 0.5, color: colorList[index][1] },
329
+                      {offset: 1, color: colorList[index][1]}
330
+                    ]);
331
+                  },
332
+                  lineStyle: {
333
+                    color: '#5B98FF' //改变折线颜色
334
+                  },
335
+                  barBorderRadius: [5, 5, 0, 0] //柱状角成椭圆形
336
+                },
337
+
338
+                //鼠标悬停时:
339
+                emphasis: {
340
+                  shadowBlur: 10,
341
+                  shadowOffsetX: 0,
342
+                  shadowColor: "rgba(0, 0, 0, 0.5)"
343
+                }
344
+              }
345
+            },
346
+            {
347
+              name: "",
348
+              type: "line",
349
+              data: [],
350
+              barWidth: 30,
351
+              label: {
352
+                normal: {
353
+                  show: true,
354
+                  position: "top",
355
+                  formatter: "{c}"
356
+                }
357
+              },
358
+              //配置样式
359
+              itemStyle: {
360
+                //通常情况下:
361
+
362
+                //每个柱子的颜色即为colorList数组里的每一项,如果柱子数目多于colorList的长度,则柱子颜色循环使用该数组
363
+                normal: {
364
+                  color: function (params) {
365
+                    //我这边就两个柱子,大体就两个柱子颜色渐变,所以数组只有两个值,多个颜色就多个值
366
+                    var colorList = [
367
+                      ["#A9E0F3", "#9FBDFC"],
368
+
369
+                      ["#FFD7C0", "#FF9994"]
370
+                    ];
371
+
372
+                    var index = params.dataIndex;
373
+                    if (params.dataIndex >= colorList.length) {
374
+                      index = params.dataIndex % colorList.length;
375
+                    }
376
+
377
+                    return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
378
+                      {offset: 0, color: colorList[index][0]},
379
+                      // { offset: 0.5, color: colorList[index][1] },
380
+                      {offset: 1, color: colorList[index][1]}
381
+                    ]);
382
+                  },
383
+                  lineStyle: {
384
+                    color: '#f56c6c' //改变折线颜色
385
+                  },
386
+                  barBorderRadius: [5, 5, 0, 0] //柱状角成椭圆形
387
+                },
388
+
389
+                //鼠标悬停时:
390
+                emphasis: {
391
+                  shadowBlur: 10,
392
+                  shadowOffsetX: 0,
393
+                  shadowColor: "rgba(0, 0, 0, 0.5)"
394
+                }
395
+              }
396
+            }
397
+
398
+          ],
399
+          dataZoom: [
400
+            {
401
+              //Y轴固定,让内容滚动
402
+              type: "slider",
403
+              show: false,
404
+              xAxisIndex: [0],
405
+              start: 1,
406
+              end: 20, //设置X轴刻度之间的间隔(根据数据量来调整)
407
+              zoomLock: true //锁定区域禁止缩放(鼠标滚动会缩放,所以禁止)
408
+            },
409
+            {
410
+              type: "inside",
411
+              xAxisIndex: [0],
412
+              start: 1,
413
+              end: 20,
414
+              zoomLock: true //锁定区域禁止缩放
415
+            }
416
+          ],
417
+        },
250 418
         query: {
251 419
           patient_id: this.$route.query.patient_id,
252 420
           start_time: '',
@@ -292,7 +460,7 @@
292 460
       handleSelect(val) {
293 461
         this.query.patient_id = val.id
294 462
         this.patient_name = val.name
295
-        this.GetPatientInspectionIndexChart(this.query)
463
+        // this.GetPatientInspectionIndexChart(this.query)
296 464
         for (let i = 0; i < this.patientsData.length; i++) {
297 465
           if (this.patientsData[i].id == val.id) {
298 466
             this.$refs.table.setCurrentRow(this.patientsData[i])
@@ -415,6 +583,9 @@
415 583
         }
416 584
       },
417 585
       GetPatientInspectionIndexChart(params) {
586
+        this.options.xAxis.data = []
587
+        this.options.series[0].data = []
588
+
418 589
         this.options2.xAxis.data = []
419 590
         this.options2.series[0].data = []
420 591
         GetPatientInspectionIndexChart(params)
@@ -426,17 +597,19 @@
426 597
               let otherData = []
427 598
 
428 599
               for (let i = 0; i < resp.data.data.length; i++) {
429
-                this.options2.xAxis.data.push(resp.data.data[i].date)
430
-
431
-                if (this.query.range_type == 1) {
432
-                  this.options2.series[0].data.push(resp.data.data[i].value)
433
-                } else {
434
-                  this.options2.series[0].data.push('1')
600
+                if (this.$route.query.range_type == 1) {
601
+                  this.options.xAxis.data.push(resp.data.data[i].date)
602
+                  this.options.series[0].data.push(resp.data.data[i].value)
603
+                }else{
604
+                  this.options2.series[0].data.push("1")
605
+                  this.options2.xAxis.data.push(resp.data.data[i].date)
435 606
                   tempData.push(resp.data.data[i].value)
436 607
                   otherData.push(resp.data.data[i].value)
437 608
                 }
438 609
               }
439 610
 
611
+              console.log(this.options.series[0].data)
612
+
440 613
               //获取无法确定选项的颜色
441 614
               if (this.query.range_type == 2) {
442 615
                 //去重复

+ 4 - 4
src/xt_pages/qcd/indicatorControlAnalysis/process.vue 파일 보기

@@ -609,7 +609,7 @@
609 609
       },
610 610
       getModeName(mode_id) {
611 611
         return this.$store.getters.treatment_mode[mode_id] != undefined ? this.$store.getters.treatment_mode[mode_id].name : ''
612
-      }, 
612
+      },
613 613
       GetDialysisProcessIndexTableData(params) {
614 614
         this.loading = true
615 615
         GetDialysisProcessIndexTableData(params)
@@ -671,8 +671,8 @@
671 671
         this.query.page = 1
672 672
         this.patient_name = val.name
673 673
 
674
-        this.GetDialysisProcessIndexChartData(this.query)
675
-        this.GetDialysisProcessIndexTableData(this.query)
674
+        // this.GetDialysisProcessIndexChartData(this.query)
675
+        // this.GetDialysisProcessIndexTableData(this.query)
676 676
 
677 677
         for (let i = 0;i < this.patientsData.length; i++){
678 678
           if (this.patientsData[i].id == val.id){
@@ -739,7 +739,7 @@
739 739
             this.bar.dataZoom[0].end = dataZoom_end
740 740
           }
741 741
         }
742
-        
742
+
743 743
       }
744 744
     }, created() {
745 745
       var date = new Date()

+ 10 - 7
src/xt_pages/qcd/indicatorControlAnalysis/weight.vue 파일 보기

@@ -414,9 +414,9 @@
414 414
       handleChange(val){
415 415
         this.query.patient_id = val.id
416 416
         this.query.page = 1
417
-        this.GetDialysisWeightTableData(this.query)
418
-        this.GetDialysisWeightChartData(this.query)
419 417
         this.patient_name = val.name
418
+        this.GetDialysisWeightTableData(this.query)
419
+        // this.GetDialysisWeightChartData(this.query)
420 420
       },
421 421
       handleSizeChange(limit) {
422 422
         this.query.limit = limit;
@@ -509,14 +509,17 @@
509 509
           })
510 510
       },
511 511
       GetDialysisWeightChartData(params) {
512
-        this.bar.xAxis.data = []
513
-        this.bar.series[0].data = []
514
-        this.percent = []
515 512
 
513
+        // this.bar.xAxis.data = []
514
+        // this.bar.series[0].data = []
515
+        // this.percent = []
516 516
         GetDialysisWeightChartData(params)
517 517
           .then(rs => {
518 518
             var resp = rs.data
519 519
             if (resp.state == 1) {
520
+              this.bar.xAxis.data = []
521
+              this.bar.series[0].data = []
522
+              this.percent = []
520 523
               for (let i = 0; i < resp.data.data.length; i++) {
521 524
                 this.bar.xAxis.data.push(resp.data.data[i].name)
522 525
                 this.bar.series[0].data.push(resp.data.data[i].total)
@@ -533,8 +536,8 @@
533 536
       handleSelect(val) {
534 537
         this.query.patient_id = val.id
535 538
         this.query.page = 1
536
-        this.GetDialysisWeightChartData(this.query)
537
-        this.GetDialysisWeightTableData(this.query)
539
+        // this.GetDialysisWeightChartData(this.query)
540
+        // this.GetDialysisWeightTableData(this.query)
538 541
         for (let i = 0;i < this.patientsData.length; i++){
539 542
           if (this.patientsData[i].id == val.id){
540 543
             this.patient_name = this.patientsData[i].name

+ 2 - 2
src/xt_pages/qcd/indicatorControlAnalysis/weightDetails.vue 파일 보기

@@ -391,8 +391,8 @@ export default {
391 391
       this.query.patient_id = val.id
392 392
       this.query.page = 1
393 393
       this.patient_name = val.name
394
-      this.GetDialysisPatientWeightChartData(this.query)
395
-      this.GetDialysisWeightTableData(this.query)
394
+      // this.GetDialysisPatientWeightChartData(this.query)
395
+      // this.GetDialysisWeightTableData(this.query)
396 396
       for (let i = 0;i < this.patientsData.length; i++){
397 397
         if (this.patientsData[i].id == val.id){
398 398
           this.$refs.table.setCurrentRow(this.patientsData[i])

+ 16 - 11
src/xt_pages/qcd/officesControlAnalysis/project.vue 파일 보기

@@ -9,7 +9,7 @@
9 9
         <el-tab-pane label="按项目分组" name="second"></el-tab-pane>
10 10
       </el-tabs>
11 11
       <div class="cell clearfix">
12
-        <el-select v-model="lapseto" placeholder="请选择" style="width:120px;margin-right:20px" @change="changeOptions">
12
+        <el-select v-model="lapseto" placeholder="请选择" style="width:120px;margin-right:10px" @change="changeOptions">
13 13
           <el-option
14 14
             v-for="item in options"
15 15
             :key="item.value"
@@ -17,7 +17,7 @@
17 17
             :value="item.value"
18 18
           ></el-option>
19 19
         </el-select>
20
-        <el-select v-model="type" placeholder="请选择" @change="chooseType" style="margin-right:20px">
20
+        <el-select v-model="type" placeholder="请选择" @change="chooseType" style="margin-right:10px">
21 21
           <el-option
22 22
             v-for="item in options1"
23 23
             :key="item.value"
@@ -25,7 +25,7 @@
25 25
             :value="item.value"
26 26
           ></el-option>
27 27
         </el-select>
28
-        <el-select v-model="mode_type" placeholder="请选择" style="width:120px;margin-right:20px" @change="handleModeType">
28
+        <el-select v-model="mode_type" placeholder="请选择" style="width:120px;margin-right:0px" @change="handleModeType">
29 29
           <el-option
30 30
             v-for="item in normdata"
31 31
             :key="item.inspection_minor"
@@ -38,6 +38,10 @@
38 38
       <div class="cell clearfix">
39 39
         <p class="chartTitle">统计图</p>
40 40
       </div>
41
+      <div class="cell clearfix">
42
+        <p class="point"></p>
43
+        <p class="pointTitle">达标率</p>
44
+      </div>
41 45
       <div>
42 46
         <line-chart :options="chart"></line-chart>
43 47
       </div>
@@ -111,14 +115,14 @@ export default {
111 115
       mode_type:"",
112 116
       range_type:"",
113 117
       chart: {
114
-        title: {
115
-          text: "ECharts 入门示例"
116
-        },
118
+        // title: {
119
+        //   text: "ECharts 入门示例"
120
+        // },
117 121
         tooltip: {},
118
-        legend: {
119
-          data: ["次数"],
120
-          left: 0
121
-        },
122
+        // legend: {
123
+        //   data: ["次数"],
124
+        //   left: 0
125
+        // },
122 126
         xAxis: {
123 127
           data: ["1", "2", "3", "4", "5", "6", "7", "8", "9"]
124 128
         },
@@ -190,7 +194,7 @@ export default {
190 194
               emphasis: {
191 195
                 shadowBlur: 10,
192 196
                 shadowOffsetX: 0,
193
-                shadowColor: "rgba(0, 0, 0, 0.5)"
197
+                shadowColor: "rgba(0, 0, 0, 0.2)"
194 198
               }
195 199
             }
196 200
           }
@@ -764,5 +768,6 @@ export default {
764 768
 }
765 769
 .newDisplay {
766 770
   flex-wrap: wrap;
771
+  padding-left: 20px;
767 772
 }
768 773
 </style>

+ 16 - 11
src/xt_pages/qcd/officesControlAnalysis/time.vue 파일 보기

@@ -9,7 +9,7 @@
9 9
         <el-tab-pane label="按项目分组" name="second"></el-tab-pane>
10 10
       </el-tabs>
11 11
       <div class="cell clearfix">
12
-        <el-select v-model="lapseto" placeholder="请选择" style="width:120px;margin-right:20px" @change="changeLapseto">
12
+        <el-select v-model="lapseto" placeholder="请选择" style="width:120px;margin-right:10px" @change="changeLapseto">
13 13
           <el-option
14 14
             v-for="item in options"
15 15
             :key="item.value"
@@ -17,7 +17,7 @@
17 17
             :value="item.value"
18 18
           ></el-option>
19 19
         </el-select>
20
-        <el-select v-model="type" placeholder="请选择" @change="chooseType" style="margin-right:20px">
20
+        <el-select v-model="type" placeholder="请选择" @change="chooseType" style="margin-right:10px">
21 21
           <el-option
22 22
             v-for="item in options1"
23 23
             :key="item.value"
@@ -83,6 +83,10 @@
83 83
       <div class="cell clearfix">
84 84
         <p class="chartTitle">统计图</p>
85 85
       </div>
86
+      <div class="cell clearfix">
87
+        <p class="point"></p>
88
+        <p class="pointTitle">达标率</p>
89
+      </div>
86 90
       <div>
87 91
         <line-chart :options="chart"></line-chart>
88 92
       </div>
@@ -196,14 +200,14 @@ export default {
196 200
       ],
197 201
       monthType: 0,
198 202
       chart: {
199
-        title: {
200
-          text: "ECharts 入门示例"
201
-        },
203
+        // title: {
204
+        //   text: "ECharts 入门示例"
205
+        // },
202 206
         tooltip: {},
203
-        legend: {
204
-          data: ["次数"],
205
-          left: 0
206
-        },
207
+        // legend: {
208
+        //   data: ["达标率"],
209
+        //   left: 0
210
+        // },
207 211
         xAxis: {
208 212
           data: []
209 213
         },
@@ -215,7 +219,7 @@ export default {
215 219
         },
216 220
         series: [
217 221
           {
218
-            name: "次数",
222
+            name: "达标率",
219 223
             type: "bar",
220 224
             data: [],
221 225
             barWidth: 30,
@@ -265,7 +269,7 @@ export default {
265 269
               emphasis: {
266 270
                 shadowBlur: 10,
267 271
                 shadowOffsetX: 0,
268
-                shadowColor: "rgba(0, 0, 0, 0.5)"
272
+                shadowColor: "rgba(0, 0, 0, 0.2)"
269 273
               }
270 274
             }
271 275
           }
@@ -721,5 +725,6 @@ export default {
721 725
 }
722 726
 .newDisplay {
723 727
   flex-wrap: wrap;
728
+  padding-left: 20px;
724 729
 }
725 730
 </style>

+ 54 - 10
src/xt_pages/qcd/patientComplianceDetails.vue 파일 보기

@@ -11,15 +11,34 @@
11 11
           </el-form>
12 12
         </div>
13 13
         <el-container>
14
-          <div style="width:150px">
14
+          <div style="width:160px">
15
+            <el-form :inline="true" :model="listQuery">
16
+              <el-form-item label>
17
+                <el-autocomplete
18
+                  class="checkSearch"
19
+                  popper-class="my-autocomplete"
20
+                  v-model.trim="listQuery.search"
21
+                  :fetch-suggestions="querySearchAsync"
22
+                  :trigger-on-focus="false"
23
+                  placeholder="病人透析号/姓名"
24
+                  @select="handleSelect"
25
+                >
26
+                  <i class="el-icon-search el-input__icon" slot="suffix"></i>
27
+                  <template slot-scope="{ item }">
28
+                    <div class="name">{{ item.name }}</div>
29
+                  </template>
30
+                </el-autocomplete>
31
+
32
+              </el-form-item>
33
+            </el-form>
15 34
             <div class="tableTitle">患者列表</div>
16
-            <el-table :data="patientsData" border style="width: 100%;" height="500"  highlight-current-row @current-change="handleChange">
17
-              <el-table-column prop="name" label="透析号" width="80">
35
+            <el-table :data="patientsData" border style="width: 100%;" height="500"  highlight-current-row @current-change="handleChange" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
36
+              <el-table-column prop="name" label="透析号" width="70">
18 37
                  <template slot-scope="scope">
19 38
                     {{scope.row.dialysis_no}}
20 39
                  </template>
21 40
               </el-table-column>
22
-              <el-table-column prop="date" label="透析号" width="70">
41
+              <el-table-column prop="date" label="姓名" width="90">
23 42
                  <template slot-scope="scope">
24 43
                     {{scope.row.name }}
25 44
                  </template>
@@ -89,6 +108,10 @@
89 108
               </div>
90 109
             </div>
91 110
             <div class="tableTitle">指标趋势</div>
111
+            <div class="cell clearfix">
112
+              <p class="point"></p>
113
+              <p class="pointTitle">达标率</p>
114
+            </div>
92 115
             <div>
93 116
               <line-chart :options="chart"></line-chart>
94 117
             </div>
@@ -131,7 +154,7 @@ export default {
131 154
       item_id:0,
132 155
       month: [
133 156
         { value: 0, label: "本月", state: 0 },
134
-        { value: 1, label: "近三月", state: 1 },
157
+        { value: 1, label: "近三月", state: 1 },
135 158
         { value: 2, label: "近半年", state: 2 },
136 159
         { value: 3, label: "近一年", state: 3 }
137 160
       ],
@@ -147,17 +170,17 @@ export default {
147 170
       },
148 171
       patientid:0,
149 172
       monthType: 0,
150
-      arr: ["钙", "磷", "钙萨达撒所多", "磷", "钙", "磷", "钙", "磷"],
173
+      arr: [],
151 174
       quality: 0,
152 175
       chart: {
153 176
         title: {
154 177
           text: "ECharts 入门示例"
155 178
         },
156 179
         tooltip: {},
157
-        legend: {
158
-          data: ["次数"],
159
-          left: 0
160
-        },
180
+        // legend: {
181
+        //   data: ["次数"],
182
+        //   left: 0
183
+        // },
161 184
         xAxis: {
162 185
           data: []
163 186
         },
@@ -212,6 +235,9 @@ export default {
212 235
                     { offset: 1, color: colorList[index][1] }
213 236
                   ]);
214 237
                 },
238
+                lineStyle:{ 
239
+                  color:'#409eff' //改变折线颜色
240
+                }, 
215 241
                 barBorderRadius: [5, 5, 0, 0] //柱状角成椭圆形
216 242
               },
217 243
 
@@ -468,6 +494,20 @@ export default {
468 494
 </script>
469 495
 
470 496
 <style lang="scss" scoped>
497
+.point {
498
+  width: 13px;
499
+  height: 13px;
500
+  background: linear-gradient(
501
+    0deg,
502
+    rgba(169, 224, 243, 1),
503
+    rgba(159, 189, 252, 1)
504
+  );
505
+  border-radius: 7px;
506
+  margin-right: 8px;
507
+}
508
+.pointTitle {
509
+  font-size: 13px;
510
+}
471 511
 .containerRight {
472 512
   padding-left: 10px;
473 513
 }
@@ -482,6 +522,7 @@ export default {
482 522
   display: flex;
483 523
   flex-wrap: nowrap;
484 524
   min-width: 1800px;
525
+  padding-bottom: 10px;
485 526
   .qualityOne {
486 527
     width: 4.5rem;
487 528
     height: 4.5rem;
@@ -543,5 +584,8 @@ export default {
543 584
   ::-webkit-scrollbar{
544 585
     height: 15px !important;
545 586
   }
587
+  .el-form--inline .el-form-item{
588
+    margin-right:0;
589
+  }
546 590
 }
547 591
 </style>

+ 35 - 12
src/xt_pages/qcd/patientControlAnalysis.vue 파일 보기

@@ -14,7 +14,7 @@
14 14
                 v-model.trim="listQuery.search"
15 15
                 :fetch-suggestions="querySearchAsync"
16 16
                 :trigger-on-focus="false"
17
-                placeholder="输入病人透析号/姓名"
17
+                placeholder="病人透析号/姓名"
18 18
                 @select="handleSelect"
19 19
               >
20 20
                 <i class="el-icon-search el-input__icon" slot="suffix"></i>
@@ -67,6 +67,10 @@
67 67
         <div class="cell clearfix">
68 68
           <p class="chartTitle">统计图</p>
69 69
         </div>
70
+        <div class="cell clearfix">
71
+          <p class="point"></p>
72
+          <p class="pointTitle">指标正常范围值</p>
73
+        </div>
70 74
         <div>
71 75
           <line-chart :options="chart"></line-chart>
72 76
         </div>
@@ -110,7 +114,7 @@
110 114
         </el-table-column>
111 115
             <el-table-column fixed="right" label="操作" width="100">
112 116
               <template slot-scope="scope">
113
-                <el-button @click="handleClick(scope.row.patient_id,scope.row.inspect_date)" type="text" size="small">查看</el-button>
117
+                <el-button @click="handleClick(scope.row.patient_id,scope.row.inspect_date)" style="font-size:14px;" type="text" size="small">查看</el-button>
114 118
               </template>
115 119
             </el-table-column>
116 120
           </el-table>
@@ -184,16 +188,16 @@ export default {
184 188
         series: []
185 189
       },
186 190
       chart: {
187
-        title: {
188
-          text: "ECharts 入门示例"
189
-        },
191
+        // title: {
192
+        //   text: "ECharts 入门示例"
193
+        // },
190 194
         tooltip: {},
191
-        legend: {
192
-          data: ["次数"],
193
-          left: 0
194
-        },
195
+        // legend: {
196
+        //   data: ["次数"],
197
+        //   left: 0
198
+        // },
195 199
         xAxis: {
196
-          data: ["达标", "未达标"]
200
+          data: []
197 201
         },
198 202
         yAxis: {
199 203
           axisLabel: {
@@ -205,7 +209,7 @@ export default {
205 209
           {
206 210
             name: "次数",
207 211
             type: "bar",
208
-            data: ["78.57", "50"],
212
+            data: [],
209 213
             barWidth: 30,
210 214
             label: {
211 215
               normal: {
@@ -256,7 +260,7 @@ export default {
256 260
               emphasis: {
257 261
                 shadowBlur: 10,
258 262
                 shadowOffsetX: 0,
259
-                shadowColor: "rgba(0, 0, 0, 0.5)"
263
+                shadowColor: "rgba(0, 0, 0, 0.2)"
260 264
               }
261 265
             }
262 266
           }
@@ -817,6 +821,25 @@ export default {
817 821
   .pointTitle {
818 822
     font-size: 13px;
819 823
   }
824
+  .chartTitle {
825
+    font-size: 16px;
826
+    font-weight: bold;
827
+    color: #000000;
828
+  }
829
+  .point {
830
+    width: 13px;
831
+    height: 13px;
832
+    background: linear-gradient(
833
+      0deg,
834
+      rgba(169, 224, 243, 1),
835
+      rgba(159, 189, 252, 1)
836
+    );
837
+    border-radius: 7px;
838
+    margin-right: 8px;
839
+  }
840
+  .pointTitle {
841
+    font-size: 13px;
842
+  }
820 843
 }
821 844
 
822 845
 </style>

+ 7 - 2
src/xt_pages/qcd/statisticalConfiguration.vue 파일 보기

@@ -3,7 +3,7 @@
3 3
     <div class="position">
4 4
       <bread-crumb :crumbs="crumbs"></bread-crumb>
5 5
     </div>
6
-    <div class="app-container">
6
+    <div class="app-container statisticalConfig">
7 7
       <el-tabs v-model="tabActiveName" @tab-click="handleTabClick" style="margin-bottom:10px">
8 8
         <el-tab-pane label="质控达标统计配置" name="control"></el-tab-pane>
9 9
         <el-tab-pane label="检验检查统计配置" name="query"></el-tab-pane>
@@ -14,7 +14,7 @@
14 14
         </el-col>
15 15
       </el-row>
16 16
       <div class="configTable">
17
-        <el-table :data="configuraData" border style="width: 100%">
17
+        <el-table :data="configuraData" border style="width: 100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
18 18
           <el-table-column prop="date" label="检验检查大项" width="180">
19 19
               <template slot-scope="scope">{{ scope.row.project_name }}</template>
20 20
           </el-table-column>
@@ -507,6 +507,11 @@ export default {
507 507
     margin-left:0 !important;
508 508
   }
509 509
 }
510
+.statisticalConfig{
511
+  .el-tabs{
512
+    margin-bottom: 0 !important;
513
+  }
514
+}
510 515
 </style>
511 516
 
512 517
  <style rel="stylesheet/scss" lang="scss" scoped>

+ 5 - 4
src/xt_pages/qcd/treatmentControlAnalysis/components/CheckAll.vue 파일 보기

@@ -13,6 +13,7 @@
13 13
              :trigger-on-focus="false"
14 14
              placeholder="输入病人透析号/姓名"
15 15
              @select="handleSelect"
16
+             style="width:160px;"
16 17
               >
17 18
              <i class="el-icon-search el-input__icon" slot="suffix"></i>
18 19
                <template slot-scope="{ item }">
@@ -21,7 +22,7 @@
21 22
           </el-autocomplete>
22 23
         </el-form-item>
23 24
       </el-form>
24
-      <label class="title">
25
+      <label class="title" style="text-align:left;">
25 26
         <span class="name">日期查询</span> :
26 27
       </label>
27 28
       <el-date-picker
@@ -51,16 +52,16 @@
51 52
       ></el-date-picker>
52 53
     </div>
53 54
     <el-container>
54
-      <div style="width:150px">
55
+      <div style="width:160px">
55 56
         <div class="tableTitle">患者列表</div>
56 57
         <el-table :data="patientsData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }"
57 58
         :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
58 59
          highlight-current-row
59 60
          @current-change="handleChange">
60
-           <el-table-column prop="dialysis_no" label="透析号" width="80">
61
+           <el-table-column prop="dialysis_no" label="透析号" width="70">
61 62
             <template slot-scope="scope">{{scope.row.dialysis_no}}</template>
62 63
           </el-table-column>
63
-          <el-table-column prop="name" label="姓名" width="80">
64
+          <el-table-column prop="name" label="姓名" width="90">
64 65
             <template slot-scope="scope">{{ scope.row.name }}</template>
65 66
           </el-table-column>
66 67
         </el-table>

+ 5 - 4
src/xt_pages/qcd/treatmentControlAnalysis/components/CheckPersonal.vue 파일 보기

@@ -13,6 +13,7 @@
13 13
              :trigger-on-focus="false"
14 14
              placeholder="输入病人透析号/姓名"
15 15
              @select="handleSelect"
16
+              style="width:160px"
16 17
               >
17 18
              <i class="el-icon-search el-input__icon" slot="suffix"></i>
18 19
                <template slot-scope="{ item }">
@@ -21,7 +22,7 @@
21 22
           </el-autocomplete>
22 23
         </el-form-item>
23 24
       </el-form>
24
-      <label class="title">
25
+      <label class="title" style="text-align:left;">
25 26
         <span class="name">日期查询</span> :
26 27
       </label>
27 28
       <el-date-picker
@@ -53,7 +54,7 @@
53 54
       ></el-date-picker>
54 55
     </div>
55 56
     <el-container>
56
-      <div style="width:150px">
57
+      <div style="width:160px">
57 58
         <div class="tableTitle">患者列表</div>
58 59
         <el-table :data="patientsData" border style="width: 100%;" 
59 60
           height="500" :row-style="{ color: '#303133' }" 
@@ -62,10 +63,10 @@
62 63
            ref="singleTable"
63 64
           @current-change="handleChange"
64 65
           >
65
-           <el-table-column prop="dialysis_no" label="透析号" width="80">
66
+           <el-table-column prop="dialysis_no" label="透析号" width="70">
66 67
             <template slot-scope="scope">{{scope.row.dialysis_no}}</template>
67 68
           </el-table-column>
68
-          <el-table-column prop="name" label="姓名" width="80">
69
+          <el-table-column prop="name" label="姓名" width="90">
69 70
             <template slot-scope="scope">{{ scope.row.name }}</template>
70 71
           </el-table-column>
71 72
         </el-table>

+ 27 - 9
src/xt_pages/qcd/treatmentControlAnalysis/components/TimeAll.vue 파일 보기

@@ -46,6 +46,10 @@
46 46
       ></el-date-picker>
47 47
     </div>
48 48
     <div class="tableTitle">统计图</div>
49
+    <div class="cell clearfix" style="margin:0;">
50
+        <p class="point"></p>
51
+        <p class="pointTitle">次</p>
52
+      </div>
49 53
     <div>
50 54
       <line-chart :options="chart"></line-chart>
51 55
     </div>
@@ -124,10 +128,10 @@ export default {
124 128
       ],
125 129
       chart: {
126 130
         tooltip: {},
127
-        legend: {
128
-          data: ["次"],
129
-          left: 0
130
-        },
131
+        // legend: {
132
+        //   data: ["次"],
133
+        //   left: 0
134
+        // },
131 135
         xAxis: {
132 136
           data: []
133 137
         },
@@ -185,11 +189,11 @@ export default {
185 189
               },
186 190
 
187 191
               //鼠标悬停时:
188
-              // emphasis: {
189
-              //   shadowBlur: 10,
190
-              //   shadowOffsetX: 0,
191
-              //   shadowColor: "rgba(0, 0, 0, 0.5)"
192
-              // }
192
+              emphasis: {
193
+                shadowBlur: 10,
194
+                shadowOffsetX: 0,
195
+                shadowColor: "rgba(0, 0, 0, 0.2)"
196
+              }
193 197
             }
194 198
           }
195 199
         ]
@@ -405,6 +409,20 @@ export default {
405 409
   font-weight: bold;
406 410
   margin-bottom: 10px;
407 411
 }
412
+.point {
413
+  width: 13px;
414
+  height: 13px;
415
+  background: linear-gradient(
416
+    0deg,
417
+    rgba(169, 224, 243, 1),
418
+    rgba(159, 189, 252, 1)
419
+  );
420
+  border-radius: 7px;
421
+  margin-right: 8px;
422
+}
423
+.pointTitle {
424
+  font-size: 13px;
425
+}
408 426
 </style>
409 427
 
410 428
 <style lang="scss">

+ 6 - 5
src/xt_pages/qcd/treatmentControlAnalysis/components/TimePersonal.vue 파일 보기

@@ -11,8 +11,9 @@
11 11
              v-model.trim="listQuery.search"
12 12
              :fetch-suggestions="querySearchAsync"
13 13
              :trigger-on-focus="false"
14
-             placeholder="输入病人透析号/姓名"
14
+             placeholder="病人透析号/姓名"
15 15
              @select="handleSelect"
16
+              style="width:160px;"
16 17
               >
17 18
              <i class="el-icon-search el-input__icon" slot="suffix"></i>
18 19
                <template slot-scope="{ item }">
@@ -21,7 +22,7 @@
21 22
           </el-autocomplete>
22 23
         </el-form-item>
23 24
       </el-form>
24
-      <label class="title">
25
+      <label class="title" style="text-align:left;">
25 26
         <span class="name">日期查询</span> :
26 27
       </label>
27 28
       <el-date-picker
@@ -53,16 +54,16 @@
53 54
       ></el-date-picker>
54 55
     </div>
55 56
     <el-container>
56
-      <div style="width:150px">
57
+      <div style="width:160px">
57 58
         <div class="tableTitle">患者列表</div>
58 59
         <el-table :data="patientsData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }"
59 60
          :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
60 61
           highlight-current-row
61 62
           @current-change="handleChange">
62
-          <el-table-column prop="dialysis_no" label="透析号" width="80">
63
+          <el-table-column prop="dialysis_no" label="透析号" width="70">
63 64
             <template slot-scope="scope">{{scope.row.dialysis_no}}</template>
64 65
           </el-table-column>
65
-          <el-table-column prop="name" label="姓名" width="80">
66
+          <el-table-column prop="name" label="姓名" width="90">
66 67
             <template slot-scope="scope">{{ scope.row.name }}</template>
67 68
           </el-table-column>
68 69
         </el-table>