Skip to content

D
diseaseControlManage
Commit 1981dfee by lihu541
Options

页面数据请求参数修改

parent 66242b3e
Showing with 206 additions and 336 deletions
src/components/userJoin/screenTwoPag1.vue
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
<p>{{areaname}}</p> <p>{{areaname}}</p>
</div> </div>
<div class="area"> <div class="area">
<el-button size="mini" type="primary" @click="CityGetBack()" v-if="BeginCode">返回</el-button> <el-button size="mini" type="primary" @click="CityGetBack()" v-if="isShowBack">返回</el-button>
<el-button size="mini" @click="changeReplay()" type="primary">重置</el-button> <el-button size="mini" @click="resetPage()" type="primary">重置</el-button>
<el-date-picker v-model="cxsj" type="month" @change="dataSearch" align="left" size='mini' format="yyyy-MM" <el-date-picker v-model="cxsj" type="month" @change="dataSearch" align="left" size='mini' format="yyyy-MM"
value-format="yyyy-MM" :placeholder="sel"></el-date-picker> value-format="yyyy-MM" :placeholder="sel"></el-date-picker>
<div class="name"><i class="el-icon-s-custom el-icon--left"></i>{{userinfo.userName}} 截止：{{cxsj}}</div> <div class="name"><i class="el-icon-s-custom el-icon--left"></i>{{userinfo.userName}} 截止：{{cxsj}}</div>
...@@ -32,8 +32,8 @@ ...@@ -32,8 +32,8 @@
<div class="cmtline"> <div class="cmtline">
<p><span>{{(gglrs/10000).toFixed(1)}}万</span>年内已管理人数</p> <p><span>{{(gglrs/10000).toFixed(1)}}万</span>年内已管理人数</p>
<p><span>{{(ggfrs/10000).toFixed(1)}}万</span>规范管理人数</p> <p><span>{{(ggfrs/10000).toFixed(1)}}万</span>规范管理人数</p>
<p><span>{{(gxjdata.ZXZ)}}/{{(gxjdata.TBZ)}}个</span>新建数(累计/本周)</p> <p><span>{{(gxjdata.ZXZ)}}/{{(gxjdata.ZZZ)}}个</span>新建数(累计/本周)</p>
<p><span>{{(agsfdata.ZXZ)}}/{{(agsfdata.TBZ)}}个</span>失访数(累计/本周) </p> <p><span>{{(agsfdata.ZXZ)}}/{{(agsfdata.ZZZ)}}个</span>失访数(累计/本周) </p>
</div> </div>
</div> </div>
...@@ -51,8 +51,8 @@ ...@@ -51,8 +51,8 @@
<div class="cmtline"> <div class="cmtline">
<p><span>{{(qglrs/10000).toFixed(1)}}万</span>年内已管理人数</p> <p><span>{{(qglrs/10000).toFixed(1)}}万</span>年内已管理人数</p>
<p><span>{{(qgfrs/10000).toFixed(1)}}万</span>规范管理人数</p> <p><span>{{(qgfrs/10000).toFixed(1)}}万</span>规范管理人数</p>
<p><span>{{(qxjdata.ZXZ)}}/{{(qxjdata.TBZ)}}个</span>新建数(累计/本周)</p> <p><span>{{(qxjdata.ZXZ)}}/{{(qxjdata.ZZZ)}}个</span>新建数(累计/本周)</p>
<p><span>{{(qsfdata.ZXZ)}}/{{(qsfdata.TBZ)}}个</span>失访数(累计/本周)</p> <p><span>{{(qsfdata.ZXZ)}}/{{(qsfdata.ZZZ)}}个</span>失访数(累计/本周)</p>
</div> </div>
</div> </div>
<div class="card1-mod" v-show="DieaNo == 3"> <div class="card1-mod" v-show="DieaNo == 3">
...@@ -521,13 +521,17 @@ ...@@ -521,13 +521,17 @@
name: '签约人群', name: '签约人群',
type: 'bar', type: 'bar',
stack: '总量', stack: '总量',
label: { // label:{
normal: { // normal:{
show: false, // show: true,
fontSize: 10, // fontSize : 10,
offset: [45, 0] // position:'insideLeft',
} // formatter:function (param) {
}, // var num = param.value+'千人/'+ param.value +'千人';
// return num;
// }
// }
// },
barWidth: 10, barWidth: 10,
data: this.agedatayq data: this.agedatayq
} }
...@@ -723,7 +727,7 @@ ...@@ -723,7 +727,7 @@
) )
} }
}, },
data: this.gxyseriesA, data: [],
barWidth: null, barWidth: null,
}, },
{ {
...@@ -754,7 +758,7 @@ ...@@ -754,7 +758,7 @@
) )
} }
}, },
data: this.gxyseriesB, data: [],
stack: "1" stack: "1"
}, },
{ {
...@@ -790,7 +794,7 @@ ...@@ -790,7 +794,7 @@
} }
}, },
itemStyle: {}, itemStyle: {},
data: this.gxyseriesE, data: [],
}, },
{ {
name: '签·规范管理率/去年', name: '签·规范管理率/去年',
...@@ -810,7 +814,7 @@ ...@@ -810,7 +814,7 @@
} }
}, },
z: 12, z: 12,
data: this.gxyseriesF, data: [],
}, },
{ {
name: '管·随访完成比/去年', name: '管·随访完成比/去年',
...@@ -825,7 +829,7 @@ ...@@ -825,7 +829,7 @@
} }
}, },
itemStyle: {}, itemStyle: {},
data: this.gxyseriesG, data: [],
}, },
{ {
name: '签·随访完成比/去年', name: '签·随访完成比/去年',
...@@ -845,11 +849,11 @@ ...@@ -845,11 +849,11 @@
} }
}, },
z: 12, z: 12,
data: this.gxyseriesH, data: [],
}, },
] ]
}, },
themeidnow: 13, themeidnow: 15,
themeID: 9, // 慢病在管ID themeID: 9, // 慢病在管ID
themeID2: 15, // 慢病高血压 themeID2: 15, // 慢病高血压
themeID3: 21, // 慢病管理 糖尿病 themeID3: 21, // 慢病管理 糖尿病
...@@ -899,23 +903,20 @@ ...@@ -899,23 +903,20 @@
zqlvdata: [], zqlvdata: [],
gflvdata: [], gflvdata: [],
chdata: [], chdata: [],
BarType: "XZQH",
BarSelect: 1, BarSelect: 1,
dieaName: '血压', dieaName: '血压',
rightlist1: '规范管理率', rightlist1: '规范管理率',
rightlist2: '随访率', rightlist2: '随访率',
rightlist3: '随访比', rightlist3: '随访比',
BeginCode: false,
PlaceYLGM: '', PlaceYLGM: '',
areaclick: true, areaclick: true,
BackCLick: true, BackCLick: true,
SheQuCode: 1, SheQuCode: 1,
lastStatus: {}, lastStatus: {},
PlaceCode: '',
closeareaclick: true,
showtabnum:0, showtabnum:0,
pagedisname:'高血压', pagedisname:'高血压',
isShowBack: false,
userinfo:{}, userinfo:{},
userRole:'', userRole:'',
cxsj:'', cxsj:'',
...@@ -931,39 +932,30 @@ ...@@ -931,39 +932,30 @@
}, },
CityGetBack() { CityGetBack() {
if (this.SheQuCode == 2) { if (this.pageLevel === 'qj') {
// 使用 this.SheQuCode 的值来判断现在处于的区镇状态
// 此时 处于第一次点击下的状态 this.pageLevel = 'sj'
this._xzqh = ''
this._group = 'XZQH'
this.isShowBack = false
this.areaname = ''
this.commun = "各区" this.commun = "各区"
this.thname = "各区" this.thname = "各区"
this.communhidden = true this.communhidden = true
this.PlaceCode = ''
this.BarType = 'XZQH'
this.BackCLick = false
this.areaclick = true
this.closeareaclick = true
this.areaname = ''
setTimeout(() => {
this.BeginCode = false
}, 800)
console.log("现在处于一级状态");
} }
else if (this.pageLevel === 'sq') {
if (this.SheQuCode == 3) { this.pageLevel = 'qj'
// 使用 this.SheQuCode 的值来判断现在处于的区镇状态 this._group = 'YLJGDM'
// 此时 处于第二次点击下的状态 this._yljgdm = ''
console.log("现在处于二级状态");
this.communhidden = true
this.PlaceCode = this.lastStatus.PlaceCode
this.BarType = this.lastStatus.BarType
this.BeginCode = this.lastStatus.BeginCode
this.BackCLick = this.lastStatus.BackCLick
this.areaclick = true
this.SheQuCode = 2
this.tablename = "社区" this.tablename = "社区"
this.thname = "医院" this.thname = "医院"
if(this.userRole === 'area'){
this.isShowBack = false
}
} }
this.homeinit() this.homeinit()
this.reApplyCharts() this.reApplyCharts()
this.bottominit() this.bottominit()
...@@ -993,103 +985,76 @@ ...@@ -993,103 +985,76 @@
} }
} }
}, },
changeReplay() { resetPage() {
this.cxsj = sessionStorage.getItem("ywsj")
this.userinfo = JSON.parse(sessionStorage.getItem("userinfo"))
this.userRole = sessionStorage.getItem("userRole")
if ('city' === this.userRole) {//市角色
this._xzqh = ""
this._group = "XZQH"
this.pageLevel = 'sj'
this.themeID = 7
this.BarType = 'XZQH'
this.communhidden = true this.communhidden = true
this.PlaceCode = ''
this.BackCLick = false this.BackCLick = false
this.areaclick = true this.areaclick = true
this.closeareaclick = true
this.BeginCode = false
this.areaname = '' this.areaname = ''
this.tablename = "各区" this.tablename = "各区"
this.thname = "各区" this.thname = "各区"
this.DieaNo = 1 this.DieaNo = 1
this.bingNo = 1 this.bingNo = 1
this.BarSelect = 1 this.BarSelect = 1
if ('city' === this.userRole) {//市角色
this.PlaceCode = ""
this._group = "XZQH"
this.pageLevel = 'sj'
this.homeinit()
this.reApplyCharts()
this.bottominit()
} else if ('area' === this.userRole) {//区角色 } else if ('area' === this.userRole) {//区角色
this._yljgdm = '' this._yljgdm = ''
this._group = "YLJGDM" this._group = 'YLJGDM'
this.pageLevel = 'qj' this.pageLevel = 'qj'
this.commun = "社区" this.commun = "社区"
console.log("此处是第一次点击");
console.log("diann"); this._xzqh = sessionStorage.getItem("organizcode")
this.areaname = sessionStorage.getItem("organizcodeName")
this.PlaceCode = sessionStorage.getItem("organizcode")
this.BackCLick = false this.BackCLick = false
this.BarType = 'YLJGDM'
this.BeginCode = false
this.areaclick = false this.areaclick = false
this.lastStatus.PlaceCode = this.PlaceCode
this.lastStatus.BackCLick = this.BackCLick
this.lastStatus.BarType = this.BarType
this.lastStatus.BeginCode = this.BeginCode
this.lastStatus.areaclick = this.areaclick
this.homeinit()
this.reApplyCharts()
this.bottominit()
this.SheQuCode = 2
this.tablename = '社区' this.tablename = '社区'
this.thname = '医院' this.thname = '医院'
} else if ('hospital' === this.userRole) {//社区角色 } else if ('hospital' === this.userRole) {//社区角色
this.PlaceCode = sessionStorage.getItem("porgcode") this._xzqh = sessionStorage.getItem("porgcode")
this._yljgdm = sessionStorage.getItem("organizcode") this._yljgdm = sessionStorage.getItem("organizcode")
this._group = "YWSJ" this._group = "YWSJ"
this.pageLevel = 'sq' this.pageLevel = 'sq'
this.closeareaclick = false
// this.PlaceCode = yldm
this.areaname = sessionStorage.getItem("organizcodeName") this.areaname = sessionStorage.getItem("organizcodeName")
this.BeginCode = false
this.communhidden = false this.communhidden = false
this.BarType = 'YWSJ'
this.homeinit()
this.reApplyCharts()
this.bottominit()
this.SheQuCode = 3
this.tablename = '时间' this.tablename = '时间'
this.thname = '月份' this.thname = '月份'
} }
this.homeinit()
this.reApplyCharts()
this.bottominit()
}, },
groupChange(num) { groupChange(num) {
this.groupNo = num this.groupNo = num
if (num == 1) { if (num == 1) {
this.BarType = 'XZQH' this._group = 'XZQH'
this.tablename = "各区" this.tablename = "各区"
this.thname = "各区" this.thname = "各区"
} else { } else {
this.BarType = 'YWSJ' this._group = 'YWSJ'
this.tablename = "时间" this.tablename = "时间"
this.thname = "月份" this.thname = "月份"
} }
// 切换区后 执行方法渲染数据 // 切换区后 执行方法渲染数据
this.bottominit() this.bottominit()
}, },
dataSearch(value) { dataSearch(cxsj) {
sessionStorage.setItem("ywsj", value) sessionStorage.setItem("ywsj", cxsj)
this.DieaChange(this.DieaNo)
this.homeinit() this.homeinit()
this.reApplyCharts() this.reApplyCharts()
this.bottominit() this.bottominit()
// this.DieaChange(this.DieaNo)
}, },
bingChange(num) { bingChange(num) {
...@@ -1204,19 +1169,15 @@ ...@@ -1204,19 +1169,15 @@
let _this = this let _this = this
setTimeout(function(){_this.zhongliu()},500) setTimeout(function(){_this.zhongliu()},500)
} }
// if(1){
// _this.option3.yAxis[0].data = this.agedatax
// _this.option3.series[0].data = this.agedatayg
// _this.option3.series[1].data = this.agedatayq
// _this.$echarts.init(document.getElementById("rightupbar2")).setOption(this.option3, true)
// }
}, },
homeinit() { homeinit() {
this.agedatax = [] this.agedatax = []
this.agedatayg = [] this.agedatayg = []
this.agedatayq = [] this.agedatayq = []
let _this = this let _this = this
let wd = [{ let wd = [
{
"name": "YWSJ", "name": "YWSJ",
"startTime": '', "startTime": '',
"endTime": this.cxsj, "endTime": this.cxsj,
...@@ -1224,14 +1185,18 @@ ...@@ -1224,14 +1185,18 @@
"compare": "between" "compare": "between"
}, { }, {
"name": "XZQH", "name": "XZQH",
"value": this.PlaceCode, "value": this._xzqh,
"type": "1" "type": "1"
}] }, {
"name": "YLJGDM",
"value": this._yljgdm,
"type": "1"
}
]
let param = { let param = {
"themeId": _this.themeID, "themeId": _this.themeID,
"wd": JSON.stringify(wd), "wd": JSON.stringify(wd),
// "group": this.BarType }
} //zbcode : zbcode
commonMethod(param).then(res => { commonMethod(param).then(res => {
...@@ -1252,19 +1217,21 @@ ...@@ -1252,19 +1217,21 @@
"compare": "between", "compare": "between",
}, { }, {
"name": "XZQH", "name": "XZQH",
"value": this.PlaceCode, "value": this._xzqh,
"type": "1" "type": "1"
},{ },{
"name": "QYBZ", "name": "QYBZ",
"value": "1", "value": "1",
"type": "1", "type": "1",
}, {
"name": "YLJGDM",
"value": this._yljgdm,
"type": "1"
}] }]
let paramq = { let paramq = {
"themeId": _this.themeID, "themeId": _this.themeID,
"wd": JSON.stringify(wdq), "wd": JSON.stringify(wdq),
// "group": this.BarType, }
} //zbcode : zbcode
commonMethod(paramq).then(res => { commonMethod(paramq).then(res => {
...@@ -1287,13 +1254,16 @@ ...@@ -1287,13 +1254,16 @@
"type": "1", "type": "1",
}, { }, {
"name": "XZQH", "name": "XZQH",
"value": this.PlaceCode, "value": this._xzqh,
"type": "1"
}, {
"name": "YLJGDM",
"value": this._yljgdm,
"type": "1" "type": "1"
}] }]
let paramxj = { let paramxj = {
"themeId": _this.themeID, "themeId": _this.themeID,
"wd": JSON.stringify(wdxj), "wd": JSON.stringify(wdxj),
// "group": this.BarType,
} }
commonMethod(paramxj).then(res => { commonMethod(paramxj).then(res => {
...@@ -1320,13 +1290,16 @@ ...@@ -1320,13 +1290,16 @@
"type": "1", "type": "1",
}, { }, {
"name": "XZQH", "name": "XZQH",
"value": this.PlaceCode, "value": this._xzqh,
"type": "1"
}, {
"name": "YLJGDM",
"value": this._yljgdm,
"type": "1" "type": "1"
}] }]
let paramxjq = { let paramxjq = {
"themeId": _this.themeID, "themeId": _this.themeID,
"wd": JSON.stringify(wdxjq), "wd": JSON.stringify(wdxjq),
// "group": this.BarType,
} }
commonMethod(paramxjq).then(res => { commonMethod(paramxjq).then(res => {
...@@ -1348,13 +1321,16 @@ ...@@ -1348,13 +1321,16 @@
"type": "1", "type": "1",
}, { }, {
"name": "XZQH", "name": "XZQH",
"value": this.PlaceCode, "value": this._xzqh,
"type": "1"
}, {
"name": "YLJGDM",
"value": this._yljgdm,
"type": "1" "type": "1"
}] }]
let paramsf = { let paramsf = {
"themeId": _this.themeID, "themeId": _this.themeID,
"wd": JSON.stringify(wdsf), "wd": JSON.stringify(wdsf),
// "group": this.BarType,
} }
commonMethod(paramsf).then(res => { commonMethod(paramsf).then(res => {
...@@ -1387,13 +1363,16 @@ ...@@ -1387,13 +1363,16 @@
"type": "1", "type": "1",
}, { }, {
"name": "XZQH", "name": "XZQH",
"value": this.PlaceCode, "value": this._xzqh,
"type": "1"
}, {
"name": "YLJGDM",
"value": this._yljgdm,
"type": "1" "type": "1"
}] }]
let paramsfq = { let paramsfq = {
"themeId": _this.themeID, "themeId": _this.themeID,
"wd": JSON.stringify(wdsfq), "wd": JSON.stringify(wdsfq),
// "group": this.BarType
} }
commonMethod(paramsfq).then(res => { commonMethod(paramsfq).then(res => {
...@@ -1413,13 +1392,16 @@ ...@@ -1413,13 +1392,16 @@
"compare": "between", "compare": "between",
}, { }, {
"name": "XZQH", "name": "XZQH",
"value": this.PlaceCode, "value": this._xzqh,
"type": "1"
}, {
"name": "YLJGDM",
"value": this._yljgdm,
"type": "1" "type": "1"
}] }]
let param2 = { let param2 = {
"themeId": _this.themeID2, "themeId": _this.themeID2,
"wd": JSON.stringify(wd2), "wd": JSON.stringify(wd2),
// "group": this.BarType
} }
commonMethod(param2).then(res => { commonMethod(param2).then(res => {
...@@ -1450,24 +1432,27 @@ ...@@ -1450,24 +1432,27 @@
"type": "1", "type": "1",
}, { }, {
"name": "XZQH", "name": "XZQH",
"value": this.PlaceCode, "value": this._xzqh,
"type": "1"
}, {
"name": "YLJGDM",
"value": this._yljgdm,
"type": "1" "type": "1"
}] }]
let param2q = { let param2q = {
"themeId": _this.themeID2, "themeId": _this.themeID2,
"wd": JSON.stringify(wd2q), "wd": JSON.stringify(wd2q),
// "group": this.BarType
} }
commonMethod(param2q).then(res => { commonMethod(param2q).then(res => {
_this.qgxydata = res.data.content[0].zbxx _this.qgxydata = res.data.content[0].zbxx
_this.qgxydata.forEach((item, index) => { _this.qgxydata.forEach((item, index) => {
if (item.ZBID == 1051 && this.areaname != '') { if (item.ZBID == 1048) {
_this.qglrs = item.ZXZ _this.qglrs = item.ZXZ
} }
if (item.ZBID == 1054 && this.areaname != '') { if (item.ZBID == 1054) {
_this.qgfrs = item.ZXZ _this.qgfrs = item.ZXZ
} }
}) })
...@@ -1484,13 +1469,16 @@ ...@@ -1484,13 +1469,16 @@
"compare": "between", "compare": "between",
}, { }, {
"name": "XZQH", "name": "XZQH",
"value": this.PlaceCode, "value": this._xzqh,
"type": "1"
}, {
"name": "YLJGDM",
"value": this._yljgdm,
"type": "1" "type": "1"
}] }]
let paramtnbg = { let paramtnbg = {
"themeId": _this.themeID3, "themeId": _this.themeID3,
"wd": JSON.stringify(wdtnbg), "wd": JSON.stringify(wdtnbg),
// "group": this.BarType
} }
commonMethod(paramtnbg).then(res => { commonMethod(paramtnbg).then(res => {
...@@ -1511,13 +1499,16 @@ ...@@ -1511,13 +1499,16 @@
"type": "1", "type": "1",
}, { }, {
"name": "XZQH", "name": "XZQH",
"value": this.PlaceCode, "value": this._xzqh,
"type": "1"
}, {
"name": "YLJGDM",
"value": this._yljgdm,
"type": "1" "type": "1"
}] }]
let paramtnbq = { let paramtnbq = {
"themeId": _this.themeID3, "themeId": _this.themeID3,
"wd": JSON.stringify(wdtnbq), "wd": JSON.stringify(wdtnbq),
// "group": this.BarType
} }
commonMethod(paramtnbq).then(res => { commonMethod(paramtnbq).then(res => {
...@@ -1539,13 +1530,16 @@ ...@@ -1539,13 +1530,16 @@
"type": "1", "type": "1",
}, { }, {
"name": "XZQH", "name": "XZQH",
"value": this.PlaceCode, "value": this._xzqh,
"type": "1"
}, {
"name": "YLJGDM",
"value": this._yljgdm,
"type": "1" "type": "1"
}] }]
let paramxb = { let paramxb = {
"themeId": _this.themeID, "themeId": _this.themeID,
"wd": JSON.stringify(wdxb), "wd": JSON.stringify(wdxb),
// "group": this.BarType
} }
commonMethod(paramxb).then(res => { commonMethod(paramxb).then(res => {
...@@ -1567,13 +1561,16 @@ ...@@ -1567,13 +1561,16 @@
"type": "1", "type": "1",
}, { }, {
"name": "XZQH", "name": "XZQH",
"value": this.PlaceCode, "value": this._xzqh,
"type": "1"
}, {
"name": "YLJGDM",
"value": this._yljgdm,
"type": "1" "type": "1"
}] }]
let paramxb1 = { let paramxb1 = {
"themeId": _this.themeID, "themeId": _this.themeID,
"wd": JSON.stringify(wdxb1), "wd": JSON.stringify(wdxb1),
// "group": this.BarType
} }
commonMethod(paramxb1).then(res => { commonMethod(paramxb1).then(res => {
...@@ -1599,13 +1596,16 @@ ...@@ -1599,13 +1596,16 @@
"type": "1", "type": "1",
}, { }, {
"name": "XZQH", "name": "XZQH",
"value": this.PlaceCode, "value": this._xzqh,
"type": "1"
}, {
"name": "YLJGDM",
"value": this._yljgdm,
"type": "1" "type": "1"
}] }]
let paramxbq = { let paramxbq = {
"themeId": _this.themeID, "themeId": _this.themeID,
"wd": JSON.stringify(wdxbq), "wd": JSON.stringify(wdxbq),
// "group": this.BarType
} }
commonMethod(paramxbq).then(res => { commonMethod(paramxbq).then(res => {
...@@ -1631,13 +1631,16 @@ ...@@ -1631,13 +1631,16 @@
"type": "1", "type": "1",
}, { }, {
"name": "XZQH", "name": "XZQH",
"value": this.PlaceCode, "value": this._xzqh,
"type": "1"
}, {
"name": "YLJGDM",
"value": this._yljgdm,
"type": "1" "type": "1"
}] }]
let paramxbq1 = { let paramxbq1 = {
"themeId": _this.themeID, "themeId": _this.themeID,
"wd": JSON.stringify(wdxbq1), "wd": JSON.stringify(wdxbq1),
// "group": this.BarType
} }
commonMethod(paramxbq1).then(res => { commonMethod(paramxbq1).then(res => {
...@@ -1656,7 +1659,11 @@ ...@@ -1656,7 +1659,11 @@
"compare": "between", "compare": "between",
}, { }, {
"name": "XZQH", "name": "XZQH",
"value": this.PlaceCode, "value": this._xzqh,
"type": "1"
}, {
"name": "YLJGDM",
"value": this._yljgdm,
"type": "1" "type": "1"
}] }]
let paramnl = { let paramnl = {
...@@ -1668,13 +1675,6 @@ ...@@ -1668,13 +1675,6 @@
commonMethod(paramnl).then(res => { commonMethod(paramnl).then(res => {
_this.agegl = res.data.content _this.agegl = res.data.content
_this.agegl.forEach((item, index) => {
item.NL ? _this.agedatax.push(item.NL) : ''
})
}).catch(err => {
console.log("--年龄报错--");
})
let wdnl2 = [{ let wdnl2 = [{
"name": "YWSJ", "name": "YWSJ",
...@@ -1688,7 +1688,11 @@ ...@@ -1688,7 +1688,11 @@
"type": "1", "type": "1",
}, { }, {
"name": "XZQH", "name": "XZQH",
"value": this.PlaceCode, "value": this._xzqh,
"type": "1"
}, {
"name": "YLJGDM",
"value": this._yljgdm,
"type": "1" "type": "1"
}] }]
let paramnl2 = { let paramnl2 = {
...@@ -1705,12 +1709,10 @@ ...@@ -1705,12 +1709,10 @@
}) })
_this.agegl.forEach((item, index) => { _this.agegl.forEach((item, index) => {
_this.agedatayg.push(item.zbxx[0].ZXZ) _this.agedatayg.push(item.zbxx[0].ZXZ)
_this.agedatax.push(item.NL)
}) })
let temp1 = [], let temp1 = [], temp2 = [],temp3 = [], Temp = []
temp2 = [],
temp3 = [],
Temp = []
for (var i = 0; i < this.agedatax.length; i++) { for (var i = 0; i < this.agedatax.length; i++) {
let agestructObj = { let agestructObj = {
...@@ -1718,12 +1720,16 @@ ...@@ -1718,12 +1720,16 @@
g_age: 'v', g_age: 'v',
q_age: 'v' q_age: 'v'
} }
if(this.agedatax[i]){
agestructObj.age = this.agedatax[i] agestructObj.age = this.agedatax[i]
agestructObj.g_age = this.agedatayg[i] agestructObj.g_age = this.agedatayg[i]
agestructObj.q_age = this.agedatayq[i] agestructObj.q_age = this.agedatayq[i]
Temp.push(agestructObj) Temp.push(agestructObj)
} }
}
Temp.sort((prev, next) => { Temp.sort((prev, next) => {
return parseInt(next.age.slice(0, 2)) - parseInt(prev.age.slice(0, 2)) return parseInt(next.age.slice(0, 2)) - parseInt(prev.age.slice(0, 2))
}) })
...@@ -1732,15 +1738,11 @@ ...@@ -1732,15 +1738,11 @@
temp2.push(item.g_age) temp2.push(item.g_age)
temp3.push(item.q_age) temp3.push(item.q_age)
}) })
// _this.option3.yAxis[0].data = _this.agedatax
// _this.option3.series[0].data = this.agedatayg
// _this.option3.series[1].data = this.agedatayq
this.option3.yAxis[0].data = temp1 this.option3.yAxis[0].data = temp1
this.option3.series[0].data = temp2 this.option3.series[0].data = temp2
this.option3.series[1].data = temp3 this.option3.series[1].data = temp3
// setTimeout(function(){
// _this.$echarts.init(document.getElementById("rightupbar2")).setOption(this.option3, true)
const obj2 = setInterval(() => { const obj2 = setInterval(() => {
const dom = document.getElementById("rightupbar2") const dom = document.getElementById("rightupbar2")
if (dom) { if (dom) {
...@@ -1751,7 +1753,10 @@ ...@@ -1751,7 +1753,10 @@
clearInterval(obj2) clearInterval(obj2)
} }
}, 400) }, 400)
// },500) }).catch(err => {
console.log("--年龄报错--");
})
}).catch(err => { }).catch(err => {
console.log("--年龄报错--"); console.log("--年龄报错--");
}) })
...@@ -1770,7 +1775,11 @@ ...@@ -1770,7 +1775,11 @@
"compare": "between", "compare": "between",
}, { }, {
"name": "XZQH", "name": "XZQH",
"value": this.PlaceCode, "value": this._xzqh,
"type": "1"
}, {
"name": "YLJGDM",
"value": this._yljgdm,
"type": "1" "type": "1"
}] }]
let param = { let param = {
...@@ -1820,132 +1829,44 @@ ...@@ -1820,132 +1829,44 @@
console.log("--慢病管理肿瘤报错--"); console.log("--慢病管理肿瘤报错--");
}) })
}, },
changecity(code, name, yldm) { changecity(code, name) {
if (this.areaclick && this.closeareaclick) { if (this.pageLevel === 'sj') {
this.commun = "社区"
console.log("此处是第一次点击");
this.areaname = name
this.PlaceCode = code
this.BackCLick = true
this.BarType = 'YLJGDM'
this.BeginCode = 1
this.areaclick = false
this.lastStatus.PlaceCode = this.PlaceCode
this.lastStatus.BackCLick = this.BackCLick
this.lastStatus.BarType = this.BarType
this.lastStatus.BeginCode = this.BeginCode
this.lastStatus.areaclick = this.areaclick
this.homeinit() console.log("此处是第一次点击");
this.reApplyCharts() this.pageLevel = 'qj'
this.bottominit() this._group = 'YLJGDM'
this.SheQuCode = 2 this._xzqh = code
this.commun = "社区"
this.tablename = '社区' this.tablename = '社区'
this.thname = '医院' this.thname = '医院'
return false this.areaname = name
} this.isShowBack = true
}else if (this.pageLevel === 'qj') {
if (this.SheQuCode == 2) { this.pageLevel = 'sq'
this._group = 'YWSJ'
this._yljgdm = code
this.closeareaclick = false
// this.PlaceCode = yldm
this.areaname = name this.areaname = name
this.isShowBack = true
this.communhidden = false this.communhidden = false
this.BarType = 'YWSJ'
this.homeinit()
this.reApplyCharts()
this.bottominit()
this.SheQuCode = 3
this.tablename = '时间' this.tablename = '时间'
this.thname = '月份' this.thname = '月份'
}else if (this.pageLevel === 'sq') {
return false return false
} }
this.homeinit()
this.reApplyCharts()
this.bottominit()
}, },
bottominit() { bottominit() {
let _this = this let _this = this
let wd, param,wdq, paramq let wd, param,wdq, paramq
if (this.areaclick && this.closeareaclick) {
wd = [{
"name": "YWSJ",
"type": "2",
"startTime": '',
"endTime": this.cxsj,
"compare": "between",
}]
param = {
"themeId": this.themeidnow,
"wd": JSON.stringify(wd),
"group": this.BarType,
},
wdq = [{
"name": "YWSJ",
"type": "2",
"startTime": '',
"endTime": this.cxsj,
"compare": "between",
},{
"name":"QYBZ",
"value":"1",
"type":"1",
}]
paramq = {
"themeId": this.themeidnow,
"wd": JSON.stringify(wd),
"group": this.BarType,
}
console.log("this.BarType :" + this.BarType);
} else if (this.SheQuCode == 2) {
console.log('第一次点击：展示三级镇');
wd = [{
"name": "YWSJ",
"type": "2",
"startTime": '',
"endTime": this.cxsj,
"compare": "between",
},
{
"name": "XZQH",
"value": this.PlaceCode,
"type": "1",
}
]
param = {
"themeId": this.themeidnow,
"wd": JSON.stringify(wd),
"group": this.BarType,
}
wdq = [{
"name": "YWSJ",
"type": "2",
"startTime": '',
"endTime": this.cxsj,
"compare": "between",
},
{
"name": "XZQH",
"value": this.PlaceCode,
"type": "1",
},
{
"name":"QYBZ",
"value":"1",
"type":"1",
}
]
paramq = {
"themeId": this.themeidnow,
"wd": JSON.stringify(wd),
"group": this.BarType,
}
console.log("this.BarType :" + this.BarType);
} else if (this.SheQuCode = 3) {
console.log('第二次点击：展示区镇 时间数据');
console.log("this.BarType :" + this.BarType);
this.closeareaclick = true
wd = [{ wd = [{
"name": "YWSJ", "name": "YWSJ",
"startTime": '', "startTime": '',
...@@ -1954,13 +1875,17 @@ ...@@ -1954,13 +1875,17 @@
"type": "2", "type": "2",
}, { }, {
"name": "XZQH", "name": "XZQH",
"value": this.PlaceCode, "value": this._xzqh,
"type": "1", "type": "1",
}, {
"name": "YLJGDM",
"value": this._yljgdm,
"type": "1"
}] }]
param = { param = {
"themeId": this.themeidnow, "themeId": this.themeidnow,
"wd": JSON.stringify(wd), "wd": JSON.stringify(wd),
"group": this.BarType, "group": this._group,
} }
wdq = [{ wdq = [{
"name": "YWSJ", "name": "YWSJ",
...@@ -1970,18 +1895,21 @@ ...@@ -1970,18 +1895,21 @@
"type": "2", "type": "2",
}, { }, {
"name": "XZQH", "name": "XZQH",
"value": this.PlaceCode, "value": this._xzqh,
"type": "1", "type": "1",
},{ },{
"name":"QYBZ", "name":"QYBZ",
"value":"1", "value":"1",
"type":"1", "type":"1",
}, {
"name": "YLJGDM",
"value": this._yljgdm,
"type": "1"
}] }]
paramq = { paramq = {
"themeId": this.themeidnow, "themeId": this.themeidnow,
"wd": JSON.stringify(wd), "wd": JSON.stringify(wd),
// "group": this.BarType, "group": this._group
}
} }
commonMethod(param).then(res => { commonMethod(param).then(res => {
...@@ -2026,14 +1954,14 @@ ...@@ -2026,14 +1954,14 @@
} else { } else {
if (item.XZQH_TEXT) { if (item.XZQH_TEXT) {
obj.name = item.XZQH_TEXT obj.name = item.XZQH_TEXT
obj.code = item.XZQH
} else if (item.YLJGDM_EX2) { } else if (item.YLJGDM_EX2) {
obj.name = item.YLJGDM_EX2 obj.name = item.YLJGDM_EX2
obj.code = item.YLJGDM
} else { } else {
obj.name = '数据缺失' obj.name = '数据缺失'
} }
} }
obj.code = item.XZQH
obj.YLDM = item.YLJGDM
let NameTemp let NameTemp
if (_this.groupNo == 1) { if (_this.groupNo == 1) {
...@@ -2045,8 +1973,9 @@ ...@@ -2045,8 +1973,9 @@
_this.data_x.push(NameTemp) _this.data_x.push(NameTemp)
} }
if (!this.PlaceCode) { if (!this._xzqh) {
item.zbxx.forEach((item2, index2) => { item.zbxx.forEach((item2, index2) => {
//qwer
if (item2.ZBID == '1058' || item2.ZBID == '1050') { if (item2.ZBID == '1058' || item2.ZBID == '1050') {
_this.gxyseriesA.push(parseFloat(item2.ZXZ / 10000)) _this.gxyseriesA.push(parseFloat(item2.ZXZ / 10000))
...@@ -2075,7 +2004,7 @@ ...@@ -2075,7 +2004,7 @@
_this.tableAll.push(obj) _this.tableAll.push(obj)
} else { } else {
// if (this.PlaceCode == item.YLJGDM) { // if (this._xzqh == item.YLJGDM) {
item.zbxx.forEach((item2, index2) => { item.zbxx.forEach((item2, index2) => {
if (item2.ZBID == '1058' || item2.ZBID == '1050') { if (item2.ZBID == '1058' || item2.ZBID == '1050') {
...@@ -2395,66 +2324,7 @@ ...@@ -2395,66 +2324,7 @@
} }
}, },
mounted() { mounted() {
this.cxsj = sessionStorage.getItem("ywsj") this.resetPage()
this.userinfo = JSON.parse(sessionStorage.getItem("userinfo"))
this.userRole = sessionStorage.getItem("userRole")
if ('city' === this.userRole) {//市角色
this.PlaceCode = ""
this._group = "XZQH"
this.pageLevel = 'sj'
this.homeinit()
this.reApplyCharts()
this.bottominit()
} else if ('area' === this.userRole) {//区角色
this._yljgdm = ''
this._group = "YLJGDM"
this.pageLevel = 'qj'
this.commun = "社区"
console.log("此处是第一次点击");
console.log("diann");
this.areaname = sessionStorage.getItem("organizcodeName")
this.PlaceCode = sessionStorage.getItem("organizcode")
this.BackCLick = false
this.BarType = 'YLJGDM'
this.BeginCode = false
this.areaclick = false
this.lastStatus.PlaceCode = this.PlaceCode
this.lastStatus.BackCLick = this.BackCLick
this.lastStatus.BarType = this.BarType
this.lastStatus.BeginCode = this.BeginCode
this.lastStatus.areaclick = this.areaclick
this.homeinit()
this.reApplyCharts()
this.bottominit()
this.SheQuCode = 2
this.tablename = '社区'
this.thname = '医院'
} else if ('hospital' === this.userRole) {//社区角色
this.PlaceCode = sessionStorage.getItem("porgcode")
this._yljgdm = sessionStorage.getItem("organizcode")
this._group = "YWSJ"
this.pageLevel = 'sq'
this.closeareaclick = false
// this.PlaceCode = yldm
this.areaname = sessionStorage.getItem("organizcodeName")
this.BeginCode = false
this.communhidden = false
this.BarType = 'YWSJ'
this.homeinit()
this.reApplyCharts()
this.bottominit()
this.SheQuCode = 3
this.tablename = '时间'
this.thname = '月份'
}
sessionStorage.setItem("ScreenPage", 1) sessionStorage.setItem("ScreenPage", 1)
}, },
components: {} components: {}
......
src/components/userJoin/screenTwoPag4.vue
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<p>{{areaname}}</p> <p>{{areaname}}</p>
</div> </div>
<div class="area"> <div class="area">
<el-button size="mini" type="primary" @click="CityGetBack()" v-if="this.isShowBack">返回</el-button> <el-button size="mini" type="primary" @click="CityGetBack()" v-if="isShowBack">返回</el-button>
<el-button size="mini" @click="changeReplay()" type="primary">重置</el-button> <el-button size="mini" @click="changeReplay()" type="primary">重置</el-button>
<el-date-picker v-model="cxsj" type="month" @change="dataSearch" align="left" size='mini' format="yyyy-MM" <el-date-picker v-model="cxsj" type="month" @change="dataSearch" align="left" size='mini' format="yyyy-MM"
value-format="yyyy-MM" :placeholder="sel"></el-date-picker> value-format="yyyy-MM" :placeholder="sel"></el-date-picker>
......
src/components/userJoin/screenTwoPag5.vue
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<p>{{areaname}}</p> <p>{{areaname}}</p>
</div> </div>
<div class="area"> <div class="area">
<el-button size="mini" type="primary" @click="CityGetBack()" v-if="this.isShowBack">返回</el-button> <el-button size="mini" type="primary" @click="CityGetBack()" v-if="isShowBack">返回</el-button>
<el-button size="mini" @click="changeReplay()" type="primary">重置</el-button> <el-button size="mini" @click="changeReplay()" type="primary">重置</el-button>
<el-date-picker v-model="cxsj" type="month" @change="dataSearch" align="left" size='mini' format="yyyy-MM" <el-date-picker v-model="cxsj" type="month" @change="dataSearch" align="left" size='mini' format="yyyy-MM"
value-format="yyyy-MM" :placeholder="sel"></el-date-picker> value-format="yyyy-MM" :placeholder="sel"></el-date-picker>
......
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