bug修改

src/api/common/common.js

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

src/xt_pages/qcd/officesControlAnalysis/project.vue

@@ -9,14 +9,14 @@
         <el-tab-pane label="按项目分组" name="second"></el-tab-pane>
       </el-tabs>
       <div class="cell clearfix">
-        <el-select v-model="lapseto" placeholder="请选择" style="width:120px;margin-right:10px" @change="changeOptions">
+        <!-- <el-select v-model="lapseto" placeholder="请选择" style="width:120px;margin-right:10px" @change="changeOptions">
           <el-option
             v-for="item in options"
             :key="item.value"
             :label="item.label"
             :value="item.value"
           ></el-option>
-        </el-select>
+        </el-select> -->
         <el-select v-model="type" placeholder="请选择" @change="chooseType" style="margin-right:10px">
           <el-option
             v-for="item in options1"

src/xt_pages/qcd/officesControlAnalysis/time.vue

@@ -9,14 +9,14 @@
         <el-tab-pane label="按项目分组" name="second"></el-tab-pane>
       </el-tabs>
       <div class="cell clearfix">
-        <el-select v-model="lapseto" placeholder="请选择" style="width:120px;margin-right:10px" @change="changeLapseto">
+        <!-- <el-select v-model="lapseto" placeholder="请选择" style="width:120px;margin-right:10px" @change="changeLapseto">
           <el-option
             v-for="item in options"
             :key="item.value"
             :label="item.label"
             :value="item.value"
           ></el-option>
-        </el-select>
+        </el-select> -->
         <el-select v-model="type" placeholder="请选择" @change="chooseType" style="margin-right:10px">
           <el-option
             v-for="item in options1"

src/xt_pages/qcd/patientComplianceDetails.vue

@@ -107,13 +107,16 @@
                 </div>
               </div>
             </div>
-            <div class="tableTitle">指标趋势</div>
+            <div class="tableTitle">指标趋势
+              <span style="font-weight:normal">&nbsp;&nbsp;（当前患者: {{patient_name}}）</span>
+            </div>
             <div class="cell clearfix">
               <p class="point"></p>
               <p class="pointTitle">{{itemName}}</p>
             </div>
             <div>
-              <line-chart :options="chart"></line-chart>
+              <line-chart :options="chart" v-if="rangetype == 1"></line-chart>
+               <line-chart1 :options="char2" v-if="rangetype == 2"></line-chart1>
             </div>
           </div>
         </el-container>
@@ -127,16 +130,20 @@ const moment = require('moment')
 import echarts from "echarts";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import LineChart from "../qcd/components/LineChart";
+import LineChart1 from '../qcd/components/LineChart1'
 import { uParseTime } from "@/utils/tools";
  import { PostSearch} from '@/api/patient'
 import { getCurrentOrgPatients,GetQualityControl,getNormData,getPatientComplianceDetail } from "@/api/common/common"
 export default {
   components: {
     LineChart,
-    BreadCrumb
+    BreadCrumb,
+    LineChart1
   },
   data() {
     return {
+     patient_name:"",
+     rangetype:1,
      itemName:"",
      isTrue:0,
       crumbs: [
@@ -174,6 +181,126 @@ export default {
       monthType: 0,
       arr: [],
       quality: 0,
+      char2: {
+          title: {
+            text: 'ECharts 入门示例'
+          },
+          tooltip: {},
+          legend: {
+            data: ['次数'],
+            left: 0
+          },
+          xAxis: {
+            data: [],
+            axisLine: {
+              lineStyle: {
+                color: '#FF0000',
+                width: 8 //这里是为了突出显示加上的
+              }
+            },
+            axisLabel: {
+              interval: 0,
+              formatter: function(value) {
+                var ret = '' //拼接加\n返回的类目项
+                var maxLength = 8 //每项显示文字个数
+                var valLength = value.length //X轴类目项的文字个数
+                var rowN = Math.ceil(valLength / maxLength) //类目项需要换行的行数
+                if (rowN > 1) {
+                  //如果类目项的文字大于3,
+                  for (var i = 0; i < rowN; i++) {
+                    var temp = '' //每次截取的字符串
+                    var start = i * maxLength //开始截取的位置
+                    var end = start + maxLength //结束截取的位置
+                    //这里也可以加一个是否是最后一行的判断，但是不加也没有影响，那就不加吧
+                    temp = value.substring(start, end) + '\n'
+                    ret += temp //凭借最终的字符串
+                  }
+                  return ret
+                } else {
+                  return value
+                }
+              }
+            }
+          },
+          yAxis: {
+            axisLabel: {
+              formatter: '{value} %'
+            },
+            show: false,
+            axisLine: {
+              lineStyle: {
+                color: '#00FF00',
+                width: 8 //这里是为了突出显示加上的
+              }
+            }
+          },
+          series: [
+            {
+              name: '',
+              type: 'line',
+              data: [],
+              symbol: 'circle',//折线点设置为实心点
+              symbolSize: 15,   //折线点的大小
+              barWidth: 30,
+              label: {
+                normal: {
+                  show: true,
+                  position: "top",
+                  formatter: (params) => {
+                      let str = ''
+                      str = this.otherData[params.dataIndex]
+                      return str
+
+                  }
+                }
+              },
+              //配置样式
+              itemStyle: {
+                //通常情况下：
+
+                //每个柱子的颜色即为colorList数组里的每一项，如果柱子数目多于colorList的长度，则柱子颜色循环使用该数组
+                normal: {
+                  color: (params) => {
+                    //我这边就两个柱子，大体就两个柱子颜色渐变，所以数组只有两个值，多个颜色就多个值
+                    var colorList = [
+                      ['#409EFF','#409EFF'],
+                      ['#f56c6c','#f56c6c']
+                      ];
+                    if(params.seriesName == this.otherData[params.dataIndex]){
+                      var index = 0 
+                    }else {
+                      var index = 1
+                    }
+                   
+
+                    // var index = params.dataIndex;
+                    // if (params.dataIndex >= colorList.length) {
+                    //   index = params.dataIndex % colorList.length;
+                    // }
+
+                    return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                      {offset: 0, color: colorList[index][0]},
+                      // { offset: 0.5, color: colorList[index][1] },
+                      {offset: 1, color: colorList[index][1]}
+                    ]);
+                  },
+                  lineStyle: {
+                    width:2,
+                    color: "#cccccc"//折线的颜色
+                  },
+                  barBorderRadius: [5, 5, 0, 0] //柱状角成椭圆形
+                },
+
+                //鼠标悬停时：
+                emphasis: {
+                  shadowBlur: 10,
+                  shadowOffsetX: 0,
+                  shadowColor: 'rgba(0, 0, 0, 0.2)'
+                }
+              }
+            }
+          ]
+        },
       chart: {
         title: {
           text: "ECharts 入门示例"
@@ -255,6 +382,7 @@ export default {
       },
       inspect_date:0,
       monthActive:0,
+      otherData:[]
     };
   },
   methods: {
@@ -383,6 +511,7 @@ export default {
     },
     handleChange(val){
      this.patientid = val.id
+     this.patient_name = val.name
       this.getlistDetail()
     },
    getCurrentOrgPatients(){
@@ -392,6 +521,7 @@ export default {
             for(let i=0;i<patients.length;i++){
                if(this.patientid == patients[i].id){
                   this.$refs.singleTable.setCurrentRow(patients[i])
+                  this.patient_name = patients[i].name
                }
             }
             this.patientsData = patients
@@ -413,6 +543,8 @@ export default {
     getlist(){
         this.modesData.series = []
         this.modesData.xAxis = []
+        this.char2.xAxis.data = []
+        this.char2.series[0].data = []
         const startDate = moment().subtract('month', 0).format('YYYY-MM') + '-01'
         const endDate = moment(new Date()).format('YYYY-MM-DD')
         var now = new Date()
@@ -435,7 +567,7 @@ export default {
        GetQualityControl(params).then(response=>{
           if(response.data.state == 1){
             var list = response.data.data.list
-            console.log("list",list)
+            console.log("list是什么",list)
             for(let i=0;i<list.length;i++){
               if(parseInt(list[i].inspect_value)>= parseInt(list[i].range_min) && parseInt(list[i].inspect_value)<= parseInt(list[i].range_max)){
                     this.isTrue = 1  
@@ -443,9 +575,20 @@ export default {
                if(parseInt(list[i].inspect_value)< parseInt(list[i].range_min) || parseInt(list[i].inspect_value) > parseInt(list[i].range_max)){
                     this.isTrue =0
                }
-              this.modesData.xAxis.push(this.getTime(list[i].inspect_date));
-               this.modesData.series.push(list[i].inspect_value)
-            
+               
+              if(list[i].range_type == 1){
+                    this.rangetype = 1
+                    this.modesData.xAxis.push(this.getTime(list[i].inspect_date));
+                    this.modesData.series.push(list[i].inspect_value)
+                }
+
+                if(list[i].range_type == 2){
+                   this.rangetype = 2
+                   this.otherData.push(list[i].inspect_value)
+                   this.char2.series[0].data.push("1")
+                  this.char2.xAxis.data.push(this.getTime(list[i].inspect_date))
+                  this.char2.series[0].name = list[i].range_value
+                }
             }
             this.chart.series[0].data = this.modesData.series
             this.chart.xAxis.data = this.modesData.xAxis
@@ -458,6 +601,8 @@ export default {
     getlistDetail(){
        this.modesData.series = []
         this.modesData.xAxis = []
+        this.char2.xAxis.data = []
+        this.char2.series[0].data = []
         const startDate = moment().subtract('month', 0).format('YYYY-MM') + '-01'
         const endDate = moment(new Date()).format('YYYY-MM-DD')
 
@@ -490,8 +635,21 @@ export default {
                 if(parseInt(list[i].inspect_value)< parseInt(list[i].range_min) || parseInt(list[i].inspect_value) > parseInt(list[i].range_max)){
                       this.isTrue =0
                 }
-                this.modesData.xAxis.push(this.getTime(list[i].inspect_date));
-                this.modesData.series.push(list[i].inspect_value)
+
+                if(list[i].range_type == 1){
+                    this.rangetype = 1
+                    this.modesData.xAxis.push(this.getTime(list[i].inspect_date));
+                    this.modesData.series.push(list[i].inspect_value)
+                }
+
+                if(list[i].range_type == 2){
+                   this.rangetype = 2
+                   this.otherData.push(list[i].inspect_value)
+                   this.char2.series[0].data.push("1")
+                  this.char2.xAxis.data.push(this.getTime(list[i].inspect_date))
+                  this.char2.series[0].name = list[i].range_value
+                }
+              
             
             }
               this.chart.series[0].data = this.modesData.series
@@ -519,6 +677,11 @@ export default {
         console.log("val",val)
         this.listQuery.search = val.name
         this.patientid = val.id
+        for(let i=0;i<this.patientsData.length;i++){
+          if(val.id == this.patientsData[i].id){
+            this.$refs.singleTable.setCurrentRow(this.patientsData[i])
+          }
+         }
         this.getlistDetail()
       },
   },

src/xt_pages/qcd/patientControlAnalysis.vue

@@ -25,14 +25,14 @@
 
             </el-form-item>
           </el-form>
-          <el-select v-model="lapstor" placeholder="请选择" style="margin-right:20px;width:100px">
+          <!-- <el-select v-model="lapstor" placeholder="请选择" style="margin-right:20px;width:100px">
             <el-option
               v-for="item in options"
               :key="item.value"
               :label="item.label"
               :value="item.value"
             ></el-option>
-          </el-select>
+          </el-select> -->
           <label class="title">
             <span class="name">日期查询</span> :
           </label>
@@ -257,11 +257,11 @@ export default {
               },
 
               //鼠标悬停时：
-              emphasis: {
-                shadowBlur: 10,
-                shadowOffsetX: 0,
-                shadowColor: "rgba(0, 0, 0, 0.2)"
-              }
+              // emphasis: {
+              //   shadowBlur: 10,
+              //   shadowOffsetX: 0,
+              //   shadowColor: "rgba(0, 0, 0, 0.2)"
+              // }
             }
           }
         ]
@@ -649,7 +649,7 @@ export default {
        getCartogramlist(this.lapstor,this.listQuery.start_time,this.listQuery.end_time,this.limit,this.page).then(response=>{
            if(response.data.state == 1){
               var cartogramlist =  response.data.data.cartogramlist
-              // console.log("cartogramlist",cartogramlist)
+               console.log("cartogramlist",cartogramlist)
               var totaltwo =  response.data.data.total
               // console.log("totaltwo",totaltwo)
               var infectiouscontrol =  response.data.data.infectiouscontrol
@@ -667,14 +667,6 @@ export default {
                    }
                 }
               }
-            //  console.log("cart",cart)
-
-              //  for(let i=0;i<cartogramlist.length;i++){
-              //     if(cartogramlist[i].inspect_value != ''){
-              //       cart.push(cartogramlist[i])
-              //     }
-              //  }
-              // console.log("cart",cart)
                let dataInfo = {}
                 cart.forEach((item, index) => {
                   let { patient_id } = item

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

@@ -1,7 +1,7 @@
 <template>
   <div class="page_timeAll">
     <div class="cell clearfix">
-      <el-select
+      <!-- <el-select
         v-model="listQuery.value"
         placeholder="请选择"
         style="width:120px;margin-right:20px"
@@ -13,7 +13,7 @@
           :label="item.label"
           :value="item.value"
         ></el-option>
-      </el-select>
+      </el-select> -->
       <label class="title">
         <span class="name">日期查询</span> :
       </label>