Commit 1f406f4d by pcc

慢病管理--首诊测压

parent c16fe8ed
...@@ -19,9 +19,9 @@ ...@@ -19,9 +19,9 @@
<div class="card1-mod" v-show="DieaNo==1"> <div class="card1-mod" v-show="DieaNo==1">
<h2>管·首诊测压人数(实/同)</h2> <h2>管·首诊测压人数(实/同)</h2>
<div class="cmtitle"> <div class="cmtitle">
<span>{{(parseFloat(topgdata.ZXZ?topgdata.ZXZ:0)/10000).toFixed(1)}}</span> <span>{{formatnum(topgdata.ZXZ)}}</span>
<span class="span1">/</span> <span class="span1">/</span>
<span>{{(parseFloat(topgdata.TBZ?topgdata.TBZ:0)/10000).toFixed(1)}}</span> <span>{{formatnum(topgdata.TBZ)}}</span>
<span class="tag-blue"></span> <span class="tag-blue"></span>
<span class="span2">{{topgdata.TBL?topgdata.TBL:0}}</span> <span class="span2">{{topgdata.TBL?topgdata.TBL:0}}</span>
<span class="el-icon-bottom">&nbsp;</span> <span class="el-icon-bottom">&nbsp;</span>
...@@ -33,9 +33,9 @@ ...@@ -33,9 +33,9 @@
<div class="card1-mod" v-show="DieaNo==1"> <div class="card1-mod" v-show="DieaNo==1">
<h2>签·首诊测压人数(实/同)</h2> <h2>签·首诊测压人数(实/同)</h2>
<div class="cmtitle"> <div class="cmtitle">
<span>{{(parseFloat(topqdata.ZXZ?topqdata.ZXZ:0)/10000).toFixed(1)}}</span> <span>{{formatnum(topqdata.ZXZ)}}</span>
<span class="span1">/</span> <span class="span1">/</span>
<span>{{(parseFloat(topqdata.TBZ?topqdata.TBZ:0)/10000).toFixed(1)}}</span> <span>{{formatnum(topqdata.TBZ)}}</span>
<span class="tag-blue"></span> <span class="tag-blue"></span>
<span class="span2">{{topqdata.TBL?topqdata.TBL:0}}</span> <span class="span2">{{topqdata.TBL?topqdata.TBL:0}}</span>
<span class="el-icon-bottom">&nbsp;</span> <span class="el-icon-bottom">&nbsp;</span>
...@@ -92,34 +92,34 @@ ...@@ -92,34 +92,34 @@
<td width="40%">同比·%</td> <td width="40%">同比·%</td>
</tr> </tr>
<tr> <tr>
<td width="60%"><span>{{(parseFloat(topgycrdata.ZXZ?topgycrdata.ZXZ:0)/10000).toFixed(1)}} / <td width="60%"><span>{{formatnum(topgycrdata.ZXZ)}} /
{{(parseFloat(topgycrdata.TBZ?topgycrdata.TBZ:0)/10000).toFixed(1)}}</span></td> {{formatnum(topgycrdata.ZZZ)}}</span></td>
<td width="40%">{{Math.abs(parseFloat(topgycrdata.TBL?topgycrdata.TBL:0))}} <td width="40%">{{Math.abs(parseFloat(topgycrdata.TBL?topgycrdata.TBL:0))}}
<i v-if="topgycrdata.TBL>0" class="el-icon-top color2"></i> <i v-if="topgycrdata.TBL>0" class="el-icon-top color2"></i>
<i v-else class="el-icon-bottom color1"></i> <i v-else class="el-icon-bottom color1"></i>
</td> </td>
</tr> </tr>
<tr> <tr>
<td width="60%"><span class="span01">{{(parseFloat(topgycrgxydata.ZXZ?topgycrgxydata.ZXZ:0)/10000).toFixed(1)}} <td width="60%"><span class="span01">{{formatnum(topgycrgxydata.ZXZ)}}
/ /
{{(parseFloat(topgycrgxydata.TBZ?topgycrgxydata.TBZ:0)/10000).toFixed(1)}}</span></td> {{formatnum(topgycrgxydata.ZZZ)}}</span></td>
<td width="40%">{{Math.abs(parseFloat(topgycrgxydata.TBL?topgycrgxydata.TBL:0))}} <td width="40%">{{Math.abs(parseFloat(topgycrgxydata.TBL?topgycrgxydata.TBL:0))}}
<i v-if="topgycrgxydata.TBL>0" class="el-icon-top color2"></i> <i v-if="topgycrgxydata.TBL>0" class="el-icon-top color2"></i>
<i v-else class="el-icon-bottom color1"></i> <i v-else class="el-icon-bottom color1"></i>
</td> </td>
</tr> </tr>
<tr> <tr>
<td width="60%"><span class="span02">{{(parseFloat(topqycrdata.ZXZ?topqycrdata.ZXZ:0)/10000).toFixed(1)}} / <td width="60%"><span class="span02">{{formatnum(topqycrdata.ZXZ)}} /
{{(parseFloat(topqycrdata.TBZ?topqycrdata.TBZ:0)/10000).toFixed(1)}}</span></td> {{formatnum(topqycrdata.ZZZ)}}</span></td>
<td width="40%">{{Math.abs(parseFloat(topqycrdata.TBL?topqycrdata.TBL:0))}} <td width="40%">{{Math.abs(parseFloat(topqycrdata.TBL?topqycrdata.TBL:0))}}
<i v-if="topqycrdata.TBL>0" class="el-icon-top color2"></i> <i v-if="topqycrdata.TBL>0" class="el-icon-top color2"></i>
<i v-else class="el-icon-bottom color1"></i> <i v-else class="el-icon-bottom color1"></i>
</td> </td>
</tr> </tr>
<tr> <tr>
<td width="60%"><span class="span03">{{(parseFloat(topqycrgxydata.ZXZ?topqycrgxydata.ZXZ:0)/10000).toFixed(1)}} <td width="60%"><span class="span03">{{formatnum(topqycrgxydata.ZXZ)}}
/ /
{{(parseFloat(topqycrgxydata.TBZ?topqycrgxydata.TBZ:0)/10000).toFixed(1)}}</span></td> {{formatnum(topqycrgxydata.ZZZ)}}</span></td>
<td width="40%">{{Math.abs(parseFloat(topqycrgxydata.TBL?topqycrgxydata.TBL:0))}} <td width="40%">{{Math.abs(parseFloat(topqycrgxydata.TBL?topqycrgxydata.TBL:0))}}
<i v-if="topqycrgxydata.TBL>0" class="el-icon-top color2"></i> <i v-if="topqycrgxydata.TBL>0" class="el-icon-top color2"></i>
<i v-else class="el-icon-bottom color1"></i> <i v-else class="el-icon-bottom color1"></i>
...@@ -228,6 +228,9 @@ ...@@ -228,6 +228,9 @@
otherMethod otherMethod
} from '@/api/home.js' } from '@/api/home.js'
import {
getActiveNum,
} from '@/utils/common.js'
export default { export default {
name: 'screenpage4', name: 'screenpage4',
data() { data() {
...@@ -526,7 +529,7 @@ ...@@ -526,7 +529,7 @@
fontSize: 10 fontSize: 10
}, },
left: 30, left: 30,
width: 380, width: 500,
top: '0', top: '0',
itemHeight: 10, itemHeight: 10,
itemWidth: 14, itemWidth: 14,
...@@ -537,7 +540,7 @@ ...@@ -537,7 +540,7 @@
selectedMode: true selectedMode: true
}, },
grid: { grid: {
top: 80, top: 70,
bottom: 45, bottom: 45,
left: 50 left: 50
}, },
...@@ -552,7 +555,7 @@ ...@@ -552,7 +555,7 @@
}, },
axisLabel: { axisLabel: {
interval: 0, interval: 0,
rotate: 60, rotate: 45,
textStyle: { textStyle: {
fontSize: 10, fontSize: 10,
color: function(value, index) { color: function(value, index) {
...@@ -654,6 +657,19 @@ ...@@ -654,6 +657,19 @@
pageChage(page) { pageChage(page) {
this.$emit('screenTwoPagefunc', page) this.$emit('screenTwoPagefunc', page)
}, },
formatnum(val){
if(val>10000){
return (val/10000).toFixed(1)+'万'
}else{
return val? val : 0
}
},formatnum2(val){
if(val>10000){
return (val/10000).toFixed(1)
}else{
return val? val : 0
}
},
CityGetBack() { CityGetBack() {
if (this.pageLevel === 'qj') { if (this.pageLevel === 'qj') {
...@@ -669,6 +685,7 @@ ...@@ -669,6 +685,7 @@
}else if (this.pageLevel === 'sq') { }else if (this.pageLevel === 'sq') {
// 此时 处于第二次点击下的状态 // 此时 处于第二次点击下的状态
this._yljgdm = ''
this._group = 'YLJGDM' this._group = 'YLJGDM'
this.pageLevel = 'qj' this.pageLevel = 'qj'
this.aename = '社区' this.aename = '社区'
...@@ -688,7 +705,6 @@ ...@@ -688,7 +705,6 @@
this.showTab = true this.showTab = true
} }
this.homebot() this.homebot()
} else { } else {
this.showTab = false this.showTab = false
this._group = "YWSJ" this._group = "YWSJ"
...@@ -700,7 +716,6 @@ ...@@ -700,7 +716,6 @@
if (num == 1) { if (num == 1) {
this.showtime = true this.showtime = true
} else { } else {
this.showtime = false this.showtime = false
} }
this.homebot() this.homebot()
...@@ -711,18 +726,20 @@ ...@@ -711,18 +726,20 @@
}); });
}, },
changeReplay() { changeReplay() {
this.areaname = ''
this.cxsj = sessionStorage.getItem("ywsj") this.cxsj = sessionStorage.getItem("ywsj")
this.userinfo = JSON.parse(sessionStorage.getItem("userinfo")) this.userinfo = JSON.parse(sessionStorage.getItem("userinfo"))
this.userRole = sessionStorage.getItem("userRole") this.userRole = sessionStorage.getItem("userRole")
if ('city' === this.userRole) {//市角色 if ('city' === this.userRole) {//市角色
this._xzqh = "" this._xzqh = ""
this._yljgdm = ""
this._group = "XZQH" this._group = "XZQH"
this.pageLevel = 'sj' this.pageLevel = 'sj'
} else if ('area' === this.userRole) {//区角色 } else if ('area' === this.userRole) {//区角色
this._xzqh = sessionStorage.getItem("organizcode") this._xzqh = sessionStorage.getItem("organizcode")
this._yljgdm = ""
this._group = "YLJGDM" this._group = "YLJGDM"
this.pageLevel = 'qj' this.pageLevel = 'qj'
// 点击区 -- 展示城镇信息 // 点击区 -- 展示城镇信息
...@@ -824,6 +841,10 @@ ...@@ -824,6 +841,10 @@
"name": "XZQH", "name": "XZQH",
"value": this._xzqh, "value": this._xzqh,
"type": "1" "type": "1"
},{
"name": "YLJGDM",
"value": this._yljgdm,
"type": "1"
}] }]
//var zbcode="MBZFX_016";单独读取 //var zbcode="MBZFX_016";单独读取
let param = { let param = {
...@@ -907,6 +928,10 @@ ...@@ -907,6 +928,10 @@
"name": "XZQH", "name": "XZQH",
"value": this._xzqh, "value": this._xzqh,
"type": "1" "type": "1"
},{
"name": "YLJGDM",
"value": this._yljgdm,
"type": "1"
} }
] ]
//var zbcode="MBZFX_016";单独读取 //var zbcode="MBZFX_016";单独读取
...@@ -917,7 +942,6 @@ ...@@ -917,7 +942,6 @@
} }
commonMethod(param2).then(res => { commonMethod(param2).then(res => {
if(res.data.content.length>0){ if(res.data.content.length>0){
res.data.zbdic.forEach((item, index) => { res.data.zbdic.forEach((item, index) => {
//首诊测压人数 //首诊测压人数
...@@ -987,6 +1011,16 @@ ...@@ -987,6 +1011,16 @@
}, },
homebot() { homebot() {
let _this = this let _this = this
_this.dataY01 = []
_this.dataY02 = []
_this.dataY03 = []
_this.dataY04 = []
_this.dataY05 = []
_this.dataY06 = []
_this.dataY07 = []
_this.dataY08 = []
_this.data_x = []
_this.tableAll = []
/******************下半部分**管*******************/ /******************下半部分**管*******************/
let wd3 = [{ let wd3 = [{
"name": "YWSJ", "name": "YWSJ",
...@@ -1011,7 +1045,6 @@ ...@@ -1011,7 +1045,6 @@
"wd": JSON.stringify(wd3), "wd": JSON.stringify(wd3),
"group": this._group "group": this._group
} }
commonMethod(param3).then(res => { commonMethod(param3).then(res => {
// 用于在下文 对管数据进行赋值 可搜索 tableg // 用于在下文 对管数据进行赋值 可搜索 tableg
this.tableg = res.data.content this.tableg = res.data.content
...@@ -1050,20 +1083,9 @@ ...@@ -1050,20 +1083,9 @@
"group": this._group "group": this._group
} }
_this.dataY01 = []
_this.dataY02 = []
_this.dataY03 = []
_this.dataY04 = []
_this.dataY05 = []
_this.dataY06 = []
_this.dataY07 = []
_this.dataY08 = []
_this.data_x = []
_this.tableAll = []
commonMethod(param4).then(res => { commonMethod(param4).then(res => {
// console.log('早发现---底部签') // console.log('早发现---底部签')
this.tableq = res.data.content this.tableq = res.data.content
if (this._group == 'YWSJ') { if (this._group == 'YWSJ') {
this.tableq.sort(function(prev, next) { this.tableq.sort(function(prev, next) {
return parseInt(prev.YWSJ.substring(5, 7)) - parseInt(next.YWSJ.substring(5, 7)) return parseInt(prev.YWSJ.substring(5, 7)) - parseInt(next.YWSJ.substring(5, 7))
...@@ -1087,57 +1109,91 @@ ...@@ -1087,57 +1109,91 @@
obj.name = obj.name ? obj.name.replace('社区', '') : '返回空' obj.name = obj.name ? obj.name.replace('社区', '') : '返回空'
} }
//obj.name = item.XZQH_TEXT ? item.XZQH_TEXT : item.YWSJ.substring(6, 7) + '月' //obj.name = item.XZQH_TEXT ? item.XZQH_TEXT : item.YWSJ.substring(6, 7) + '月'
obj.code = item.XZQH obj.code = item.XZQH? item.XZQH : item.YLJGDM
//绘制顶部图标x轴 //绘制顶部图标x轴
if (this._group != 'YWSJ') { if (this._group != 'YWSJ') {
// _this.data_x.push(obj.name) // _this.data_x.push(obj.name)
} }
_this.data_x.push(obj.name) _this.data_x.push(obj.name)
item.zbxx.forEach((item2, index2) => { item.zbxx.forEach((item2, index2) => {
// if (item2.ZBID == '1022') {
// this.dataY01.push(this.tableg[index].zbxx[index2].ZXZ ? this.tableg[index].zbxx[index2].ZXZ : 0)
// this.dataY02.push(this.tableg[index].zbxx[index2].TBZ ? this.tableg[index].zbxx[index2].TBZ : 0)
//
// this.dataY03.push(item2.ZXZ ? parseFloat(item2.ZXZ).toFixed(1) : 0)
// this.dataY04.push(item2.PZL ? parseFloat(item2.PZL).toFixed(1) : 0)
// }
//
// if (item2.ZBID == '1017') {
// //这里的管不对
// obj.tag1 = this.tableg[index].zbxx[index2].ZXZ ? parseFloat(this.tableg[index].zbxx[index2].ZXZ).toFixed(1) : 0
// obj.tag2 = this.tableg[index].zbxx[index2].PZL ? parseFloat(this.tableg[index].zbxx[index2].PZL).toFixed(1) : 0
//
// //签
// obj.tag3 = item2.ZXZ ? parseFloat(item2.ZXZ).toFixed(1) : 0
// obj.tag4 = item2.PZL ? parseFloat(item2.PZL).toFixed(1) : 0
// this.dataY05.push(this.tableg[index].zbxx[index2].ZXZ ? parseFloat(this.tableg[index].zbxx[index2].ZXZ).toFixed(1) : 0)
// this.dataY06.push(item2.TBZ ? parseFloat(item2.TBZ).toFixed(1) : 0)
//
// //签
// this.dataY07.push(item2.ZXZ ? parseFloat(item2.ZXZ).toFixed(1) : 0)
// this.dataY08.push(item2.TBZ ? parseFloat(item2.TBZ).toFixed(1) : 0)
// }
//20200612新增判断
if (_this.DieaNo == 1) {
if (_this.bingNo == 1) {
/*柱状图*/
if (item2.ZBID == '1016') { if (item2.ZBID == '1016') {
this.dataY01.push(this.tableg[index].zbxx[index2].ZXZ ? this.tableg[index].zbxx[index2].ZXZ : 0) this.dataY01.push((parseFloat(this.tableg[index].zbxx[index2].ZXZ?this.tableg[index].zbxx[index2].ZXZ:0)/10000).toFixed(1))
this.dataY02.push(this.tableg[index].zbxx[index2].TBZ ? this.tableg[index].zbxx[index2].TBZ : 0) this.dataY02.push((parseFloat(item2.ZXZ?item2.ZXZ:0)/10000).toFixed(1))
this.dataY03.push(item2.ZXZ ? parseFloat(item2.ZXZ).toFixed(1) : 0) /*去年*/
this.dataY04.push(item2.PZL ? parseFloat(item2.PZL).toFixed(1) : 0) this.dataY03.push((parseFloat(this.tableg[index].zbxx[index2].TBZ?this.tableg[index].zbxx[index2].TBZ:0)/10000).toFixed(1))
this.dataY04.push((parseFloat(item2.TBZ?item2.TBZ:0)/10000).toFixed(1))
} }
/*折线图*/
if (item2.ZBID == '1017') { if (item2.ZBID == '1017') {
//这里的管不对 this.dataY05.push(this.tableg[index].zbxx[index2].ZXZ ? this.tableg[index].zbxx[index2].ZXZ : 0)
obj.tag1 = this.tableg[index].zbxx[index2].ZXZ ? parseFloat(this.tableg[index].zbxx[index2].ZXZ).toFixed(1) : 0 this.dataY07.push(item2.ZXZ ? item2.ZXZ : 0)
obj.tag2 = this.tableg[index].zbxx[index2].PZL ? parseFloat(this.tableg[index].zbxx[index2].PZL).toFixed(1) : 0 /*去年*/
this.dataY06.push(this.tableg[index].zbxx[index2].TBZ ? this.tableg[index].zbxx[index2].TBZ : 0)
//签 this.dataY08.push(item2.TBZ ? item2.TBZ :0)
obj.tag3 = item2.ZXZ ? parseFloat(item2.ZXZ).toFixed(1) : 0
obj.tag4 = item2.PZL ? parseFloat(item2.PZL).toFixed(1) : 0
this.dataY05.push(this.tableg[index].zbxx[index2].ZXZ ? parseFloat(this.tableg[index].zbxx[index2].ZXZ).toFixed(1) : 0)
this.dataY06.push(item2.TBZ ? parseFloat(item2.TBZ).toFixed(1) : 0)
//签 /*右侧列表数据*/
this.dataY07.push(item2.ZXZ ? parseFloat(item2.ZXZ).toFixed(1) : 0) obj.tag1 = this.tableg[index].zbxx[index2].ZXZ ? getActiveNum(this.tableg[index].zbxx[index2].ZXZ) : 0;
this.dataY08.push(item2.TBZ ? parseFloat(item2.TBZ).toFixed(1) : 0) obj.tag2 = this.tableg[index].zbxx[index2].PZL ? getActiveNum(this.tableg[index].zbxx[index2].PZL) : 0;
}
//20200612新增判断 obj.tag3 = item2.ZXZ ? getActiveNum(item2.ZXZ) : 0;
if (_this.DieaNo == 1) { obj.tag4 = this.tableg[index].zbxx[index2].PZL ? getActiveNum(this.tableg[index].zbxx[index2].PZL) : 0;
if (_this.bingNo == 1) {
if (item2.ZBID == '1111') {
this.dataY01.push(this.tableg[index].zbxx[index2].ZXZ ? this.tableg[index].zbxx[index2].ZXZ : 0)
this.dataY02.push(this.tableg[index].zbxx[index2].PZL ? this.tableg[index].zbxx[index2].PZL : 0)
}
if (item2.ZBID == '1110') {
this.dataY03.push(item2.ZXZ ? parseFloat(item2.ZXZ).toFixed(1) : 0)
this.dataY04.push(item2.PZL ? parseFloat(item2.PZL).toFixed(1) : 0)
} }
} else { } else {
if (item2.ZBID == '1111') { /*柱状图*/
this.dataY01.push(this.tableg[index].zbxx[index2].ZXZ ? this.tableg[index].zbxx[index2].ZXZ : 0) if (item2.ZBID == '1022') {
this.dataY02.push(this.tableg[index].zbxx[index2].PZL ? this.tableg[index].zbxx[index2].PZL : 0)
this.dataY01.push(this.tableg[index].zbxx[index2].ZXZ?this.tableg[index].zbxx[index2].ZXZ:0)
this.dataY02.push(item2.ZXZ?item2.ZXZ:0)
/*去年*/
this.dataY03.push(this.tableg[index].zbxx[index2].TBZ?this.tableg[index].zbxx[index2].TBZ:0)
this.dataY04.push(item2.TBZ?item2.TBZ:0)
} }
if (item2.ZBID == '1110') {
this.dataY03.push(item2.ZXZ ? parseFloat(item2.ZXZ).toFixed(1) : 0) /*折线图*/
this.dataY04.push(item2.PZL ? parseFloat(item2.PZL).toFixed(1) : 0) if (item2.ZBID == '1021') {
this.dataY05.push(this.tableg[index].zbxx[index2].ZXZ ? this.tableg[index].zbxx[index2].ZXZ : 0)
this.dataY07.push(item2.ZXZ ? item2.ZXZ : 0)
/*去年*/
this.dataY06.push(this.tableg[index].zbxx[index2].TBZ ? this.tableg[index].zbxx[index2].TBZ : 0)
this.dataY08.push(item2.TBZ ? item2.TBZ :0)
/*右侧列表数据*/
obj.tag1 = this.tableg[index].zbxx[index2].ZXZ ? getActiveNum(this.tableg[index].zbxx[index2].ZXZ) : 0;
obj.tag2 = this.tableg[index].zbxx[index2].PZL ? getActiveNum(this.tableg[index].zbxx[index2].PZL) : 0;
obj.tag3 = item2.ZXZ ? getActiveNum(item2.ZXZ) : 0;
obj.tag4 = this.tableg[index].zbxx[index2].PZL ? getActiveNum(this.tableg[index].zbxx[index2].PZL) : 0;
} }
} }
} else if (_this.DieaNo == 2) { } else if (_this.DieaNo == 2) {
...@@ -1151,7 +1207,9 @@ ...@@ -1151,7 +1207,9 @@
} }
} }
}) })
_this.tableAll.push(obj) _this.tableAll.push(obj)
console.log(_this.tableAll)
}) })
//默认进来首诊测压 //默认进来首诊测压
...@@ -1165,11 +1223,11 @@ ...@@ -1165,11 +1223,11 @@
0, 0, 0, 1, 0, 0, 0, 1,
[{ [{
offset: 0, offset: 0,
color: '#115D5D' color: '#2A5B78'
}, },
{ {
offset: 0.5, offset: 0.5,
color: '#115D5D' color: '#2A5B78'
}, },
{ {
offset: 0.5, offset: 0.5,
...@@ -1183,7 +1241,7 @@ ...@@ -1183,7 +1241,7 @@
) )
} }
}, },
data: this.dataY01, data: null,
barWidth: null barWidth: null
}, },
{ {
...@@ -1195,6 +1253,18 @@ ...@@ -1195,6 +1253,18 @@
color: '#4093E9' color: '#4093E9'
} }
}, },
data: this.dataY01,
stack: "1"
},
{
name: '管理/签约人群首诊测压人数',
type: 'bar',
barWidth: 8,
itemStyle: {
normal: {
color: '#2A5B78'
}
},
data: this.dataY02, data: this.dataY02,
stack: "1" stack: "1"
}, },
...@@ -1226,7 +1296,7 @@ ...@@ -1226,7 +1296,7 @@
) )
} }
}, },
data: this.dataY03, data: null,
barWidth: null barWidth: null
}, },
{ {
...@@ -1238,6 +1308,17 @@ ...@@ -1238,6 +1308,17 @@
color: '#00BEBE' color: '#00BEBE'
} }
}, },
data: this.dataY03,
stack: "2"
},{
name: '去年管理/签约人群首诊测压人数',
type: 'bar',
barWidth: 8,
itemStyle: {
normal: {
color: '#115D5D'
}
},
data: this.dataY04, data: this.dataY04,
stack: "2" stack: "2"
}, },
...@@ -1277,7 +1358,7 @@ ...@@ -1277,7 +1358,7 @@
) )
} }
}, },
data: this.dataY05 data: null
}, },
{ {
name: '管·首诊测压血压异常率/去年', name: '管·首诊测压血压异常率/去年',
...@@ -1296,6 +1377,25 @@ ...@@ -1296,6 +1377,25 @@
color: '#00D1DA' color: '#00D1DA'
} }
}, },
z: 11,
data: this.dataY05
},{
name: '管·首诊测压血压异常率/去年',
type: 'line',
smooth: false,
yAxisIndex: 1,
symbol: 'circle',
symbolSize: 6,
lineStyle: {
normal: {
width: 2
}
},
itemStyle: {
normal: {
color: '#666'
}
},
z: 12, z: 12,
data: this.dataY06 data: this.dataY06
}, },
...@@ -1335,7 +1435,7 @@ ...@@ -1335,7 +1435,7 @@
) )
} }
}, },
data: this.dataY07 data: null
}, },
{ {
name: '签·首诊测压血压异常率/去年', name: '签·首诊测压血压异常率/去年',
...@@ -1354,7 +1454,26 @@ ...@@ -1354,7 +1454,26 @@
color: '#FFC24D' color: '#FFC24D'
} }
}, },
z: 12, z: 13,
data: this.dataY07
},{
name: '签·首诊测压血压异常率/去年',
type: 'line',
smooth: false,
yAxisIndex: 1,
symbol: 'circle',
symbolSize: 6,
lineStyle: {
normal: {
width: 2
}
},
itemStyle: {
normal: {
color: '#666'
}
},
z: 14,
data: this.dataY08 data: this.dataY08
} }
] ]
...@@ -1370,11 +1489,11 @@ ...@@ -1370,11 +1489,11 @@
0, 0, 0, 1, 0, 0, 0, 1,
[{ [{
offset: 0, offset: 0,
color: '#115D5D' color: '#2A5B78'
}, },
{ {
offset: 0.5, offset: 0.5,
color: '#115D5D' color: '#2A5B78'
}, },
{ {
offset: 0.5, offset: 0.5,
...@@ -1575,11 +1694,11 @@ ...@@ -1575,11 +1694,11 @@
0, 0, 0, 1, 0, 0, 0, 1,
[{ [{
offset: 0, offset: 0,
color: '#115D5D' color: '#2A5B78'
}, },
{ {
offset: 0.5, offset: 0.5,
color: '#115D5D' color: '#2A5B78'
}, },
{ {
offset: 0.5, offset: 0.5,
...@@ -1593,7 +1712,7 @@ ...@@ -1593,7 +1712,7 @@
) )
} }
}, },
data: this.dataY01, data: null,
barWidth: null, barWidth: null,
}, },
{ {
...@@ -1605,6 +1724,17 @@ ...@@ -1605,6 +1724,17 @@
color: '#4093E9' color: '#4093E9'
} }
}, },
data: this.dataY01,
stack: "1"
},{
name: '管理/签约人群首诊测压诊断人数',
type: 'bar',
barWidth: 8,
itemStyle: {
normal: {
color: '#2A5B78'
}
},
data: this.dataY02, data: this.dataY02,
stack: "1" stack: "1"
}, },
...@@ -1636,7 +1766,7 @@ ...@@ -1636,7 +1766,7 @@
) )
} }
}, },
data: this.dataY03, data: null,
barWidth: null, barWidth: null,
}, },
{ {
...@@ -1648,6 +1778,17 @@ ...@@ -1648,6 +1778,17 @@
color: '#00BEBE' color: '#00BEBE'
} }
}, },
data: this.dataY03,
stack: "2"
},{
name: '去年管理/签约人群首诊测压诊断人数',
type: 'bar',
barWidth: 8,
itemStyle: {
normal: {
color: '#115D5D'
}
},
data: this.dataY04, data: this.dataY04,
stack: "2" stack: "2"
}, },
...@@ -1687,7 +1828,7 @@ ...@@ -1687,7 +1828,7 @@
) )
} }
}, },
data: this.dataY05, data: null
}, },
{ {
name: '管·首诊测压血压异常者诊断率/去年', name: '管·首诊测压血压异常者诊断率/去年',
...@@ -1706,6 +1847,25 @@ ...@@ -1706,6 +1847,25 @@
color: '#00D1DA' color: '#00D1DA'
} }
}, },
z: 11,
data: this.dataY05,
},{
name: '管·首诊测压血压异常者诊断率/去年',
type: 'line',
smooth: false,
yAxisIndex: 1,
symbol: 'circle',
symbolSize: 6,
lineStyle: {
normal: {
width: 2
}
},
itemStyle: {
normal: {
color: '#666'
}
},
z: 12, z: 12,
data: this.dataY06, data: this.dataY06,
}, },
...@@ -1764,7 +1924,27 @@ ...@@ -1764,7 +1924,27 @@
color: '#FFC24D' color: '#FFC24D'
} }
}, },
z: 12, z: 13,
data: this.dataY07
},
{
name: '签·首诊测压血糖异常者诊断率/去年',
type: 'line',
smooth: false,
yAxisIndex: 1,
symbol: 'circle',
symbolSize: 6,
lineStyle: {
normal: {
width: 2
}
},
itemStyle: {
normal: {
color: '#666'
}
},
z: 14,
data: this.dataY08 data: this.dataY08
} }
] ]
...@@ -1863,4 +2043,7 @@ ...@@ -1863,4 +2043,7 @@
.area >>> .el-input__icon.el-icon-date{display:none} .area >>> .el-input__icon.el-icon-date{display:none}
.area >>> .el-input__icon{display:none} .area >>> .el-input__icon{display:none}
.uplib{ width:100%;overflow: hidden; position:absolute; top:56px; right:0; left:0; background:rgba(51, 51, 51, 0.9); padding:10px} .uplib{ width:100%;overflow: hidden; position:absolute; top:56px; right:0; left:0; background:rgba(51, 51, 51, 0.9); padding:10px}
.card3main{
padding-top :32px
}
</style> </style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment