Commit 67fe399c by huqc

Merge remote-tracking branch 'origin/master'

parents ab692a1f 7a7e702a
...@@ -167,3 +167,14 @@ ...@@ -167,3 +167,14 @@
.color2{color: #FF7277;} .color2{color: #FF7277;}
.color3{ color: #15C436;} .color3{ color: #15C436;}
#color4{} #color4{}
.flex{
/*flex 布局*/
display: flex;
/*实现垂直居中*/
align-items: center;
/*实现水平居中*/
justify-content: center;
text-align: justify;
}
...@@ -417,6 +417,18 @@ ...@@ -417,6 +417,18 @@
this.sweetBar = [] this.sweetBar = []
res.data.content.forEach(item => { res.data.content.forEach(item => {
if (item.YWSJ) {
} else {
if (item.XZQH_TEXT) {
} else if (item.YLJGDM_EX2) {
} else {
return false
}
}
let obj = { let obj = {
place: '', place: '',
value: 0 value: 0
...@@ -762,7 +774,6 @@ ...@@ -762,7 +774,6 @@
this.threeCode = 2 this.threeCode = 2
this.cityArea = 2 this.cityArea = 2
//点击得到 "区分级" //点击得到 "区分级"
this._group = 'YLJGDM' this._group = 'YLJGDM'
this.themeID = 45 this.themeID = 45
...@@ -771,7 +782,6 @@ ...@@ -771,7 +782,6 @@
} else if (this.pageLevel === 'sq') { } else if (this.pageLevel === 'sq') {
this.threeCode = 3 this.threeCode = 3
this.cityArea = 3 this.cityArea = 3
this._group = 'YWSJ' this._group = 'YWSJ'
this.themeID = 44 this.themeID = 44
......
...@@ -5,13 +5,29 @@ ...@@ -5,13 +5,29 @@
<p class="lgtitle">上海市疾病预防控制管理服务云平台</p> <p class="lgtitle">上海市疾病预防控制管理服务云平台</p>
<el-input v-model="loginID" placeholder="账 号" clearable></el-input> <el-input v-model="loginID" placeholder="账 号" clearable></el-input>
<el-input v-model="loginPas" placeholder="密 码" show-password></el-input> <el-input v-model="loginPas" placeholder="密 码" show-password></el-input>
<el-input v-model="MACIP" value="MAC:35:38:33:33:31:30" :disabled="true"> </el-input> <el-input v-model="MACIP" value="MAC:35:38:33:33:31:30" :disabled="true"></el-input>
<!--验证码-->
<div class="flex" style="vertical-align:center;text-align: center;">
<el-input
v-model="captcha_code"
placeholder="验证码"
prefix-icon="lj-icon-yanzhengma"
autocomplete="off"
autocapitalize="off"
spellcheck="false"
maxlength="8"
style="width: 130px;display: inline-block;margin: 0px 12px 0px 0px;"
></el-input>
<img src="" ref="code" @click="changeCode" height="40">
</div>
<div class="PassAbout"> <div class="PassAbout">
<div class="MemoryPass"> <div class="MemoryPass">
<el-checkbox v-model="checked">记住密码</el-checkbox> <el-checkbox v-model="checked">记住密码</el-checkbox>
</div> </div>
<div class="ChangePass"> <div class="ChangePass">
<router-link to="/UserRepass">修改密码</router-link> <i class="el-icon-warning-outline"></i> <router-link to="/UserRepass">修改密码</router-link>
<i class="el-icon-warning-outline"></i>
</div> </div>
</div> </div>
<el-button type="primary" @click="Login()">登录</el-button> <el-button type="primary" @click="Login()">登录</el-button>
...@@ -20,35 +36,38 @@ ...@@ -20,35 +36,38 @@
</template> </template>
<script> <script>
import {login} from '@/api/userlogin.js' import {login, getCode} from '@/api/userlogin.js'
export default { export default {
data() { data() {
return { return {
loginID: '', loginID: '',
loginPas: '', loginPas: '',
errormsg:'', errormsg: '',
MACIP:'MAC:35:38:33:33:31:30', MACIP: 'MAC:35:38:33:33:31:30',
checked: false, checked: false,
value2:'' captcha_key: "",
captcha_code: "",
value2: ''
} }
}, },
methods:{ methods: {
Login(){ Login() {
if(!this.loginID){ if (!this.loginID) {
this.$message.error('用户名不可为空'); this.$message.error('用户名不可为空');
return false return false
} }
if(!this.loginPas){ if (!this.loginPas) {
this.$message.error('用户密码不可为空'); this.$message.error('用户密码不可为空');
return false return false
} }
let _this = this let _this = this
// 用户登录 // 用户登录
//login(this.loginID, this.$md5(this.loginPas)).then( res=>{ login(this.loginID, this.$md5(this.loginPas)).then(res => {
login(this.loginID,this.loginPas).then( res=>{ // login(this.loginID,this.loginPas).then( res=>{
console.log(res) console.log(res)
if(res.code==1){ if (res.code == 1) {
sessionStorage.setItem('token', res.data.token); sessionStorage.setItem('token', res.data.token);
sessionStorage.setItem('userinfo', JSON.stringify(res.data.userInfo)); sessionStorage.setItem('userinfo', JSON.stringify(res.data.userInfo));
sessionStorage.setItem('ywsj', res.data.userInfo.jzrq); sessionStorage.setItem('ywsj', res.data.userInfo.jzrq);
...@@ -57,21 +76,21 @@ ...@@ -57,21 +76,21 @@
sessionStorage.setItem('organizcode', res.data.userInfo.organizcode); sessionStorage.setItem('organizcode', res.data.userInfo.organizcode);
sessionStorage.setItem('organizcodeName', res.data.userInfo.jgjc); sessionStorage.setItem('organizcodeName', res.data.userInfo.jgjc);
if('hcms.shizhang' === res.data.userInfo.roles[0]){//市角色 if ('hcms.shizhang' === res.data.userInfo.roles[0]) {//市角色
sessionStorage.setItem('userRole', "city"); sessionStorage.setItem('userRole', "city");
}else if('hcms.App_Qu' === res.data.userInfo.roles[0]){//区角色 } else if ('hcms.App_Qu' === res.data.userInfo.roles[0]) {//区角色
sessionStorage.setItem('userRole', "area"); sessionStorage.setItem('userRole', "area");
}else if('hcms.APP_SQYZ' === res.data.userInfo.roles[0]){//社区角色 } else if ('hcms.APP_SQYZ' === res.data.userInfo.roles[0]) {//社区角色
sessionStorage.setItem('userRole', "hospital"); sessionStorage.setItem('userRole', "hospital");
} }
this.$router.push({path: './Index'}); this.$router.push({path: './Index'});
}else{ } else {
_this.$message.error(res.msg); _this.$message.error(res.msg);
} }
if(res.msg == "操作成功"){ if (res.msg == "操作成功") {
//单选框被选中时,将 local 存储 //单选框被选中时,将 local 存储
if(this.checked){ if (this.checked) {
// local 存储 用户登录返回的所有数据(不包含密码) // local 存储 用户登录返回的所有数据(不包含密码)
// local 存储 用户密码 // local 存储 用户密码
sessionStorage.setItem('userID', this.loginID); sessionStorage.setItem('userID', this.loginID);
...@@ -80,17 +99,30 @@ ...@@ -80,17 +99,30 @@
} }
// 登陆成功, 路由跳转 // 登陆成功, 路由跳转
this.$router.push({path: './Index'}); this.$router.push({path: './Index'});
}else{ } else {
let errormsg = res.msg let errormsg = res.msg
_this.$message.error(`${errormsg}`); _this.$message.error(`${errormsg}`);
} }
}).catch( err=>{ }).catch(err => {
console.log("登录报错!"); console.log("登录报错!");
}) })
},
//更换验证码
changeCode() {
this.$refs.code.setAttribute(
"src", 'http://shiro.easyweb.vip/assets/captcha' + '?t=' + (new Date).getTime()
);
} }
}, },
mounted() { mounted() {
if(sessionStorage.getItem('userID') && sessionStorage.getItem('userPas')){ this.$refs.code.setAttribute(
"src", 'http://shiro.easyweb.vip/assets/captcha'
);
if (sessionStorage.getItem('userID') && sessionStorage.getItem('userPas')) {
// 若 local 存在即自动跳转 // 若 local 存在即自动跳转
// 获取密码与账户 // 获取密码与账户
...@@ -111,7 +143,7 @@ ...@@ -111,7 +143,7 @@
// this.$message.error(`${errormsg}`); // this.$message.error(`${errormsg}`);
// } // }
// }) // })
}else{ } else {
// console.log(localUserID); // console.log(localUserID);
// console.log(localUserPas); // console.log(localUserPas);
// this.$message.error(`暂无local或local被清除,请手动登录!`); // this.$message.error(`暂无local或local被清除,请手动登录!`);
...@@ -124,25 +156,31 @@ ...@@ -124,25 +156,31 @@
.userlogdom >>> ::-webkit-input-placeholder .userlogdom >>> ::-webkit-input-placeholder
color: #777; color: #777;
font-size: 14px; font-size: 14px;
.userlogdom >>> .el-input .userlogdom >>> .el-input
width 250px width 250px
display block display block
margin 10px auto margin 10px auto
.userlogdom >>> .el-checkbox__label .userlogdom >>> .el-checkbox__label
color #fff color #fff
.userlogdom >>> .el-button .userlogdom >>> .el-button
width 250px width 250px
height 40px height 40px
display block display block
margin 15px auto 0 margin 15px auto 0
.usercontainer .usercontainer
width 100% width 100%
height 600px height 600px
overflow hidden overflow hidden
.userlogdom .userlogdom
width 600px width 600px
height 500px height 500px
margin 90px auto 0 margin 90px auto 0
.lgtitle .lgtitle
width 100% width 100%
text-align center text-align center
...@@ -153,18 +191,23 @@ ...@@ -153,18 +191,23 @@
font-size 28px font-size 28px
color #54daf8 color #54daf8
text-shadow 0 2px 2px #000 text-shadow 0 2px 2px #000
.PassAbout .PassAbout
width 250px width 250px
height 30px height 30px
margin 0 auto margin 0 auto
.MemoryPass .MemoryPass
float left float left
.ChangePass .ChangePass
float right float right
color #FFF color #FFF
a a
color #FFF color #FFF
text-decoration none text-decoration none
&:hover &:hover
cursor pointer cursor pointer
color #FFF color #FFF
......
...@@ -21,9 +21,9 @@ ...@@ -21,9 +21,9 @@
<div class="card1-mod" v-show="mbType !== 'zl'"> <div class="card1-mod" v-show="mbType !== 'zl'">
<h2>管·在管人数(实/同)</h2> <h2>管·在管人数(实/同)</h2>
<div class="cmtitle"> <div class="cmtitle">
<span>{{(gtopdata.ZXZ/10000).toFixed(1)}}</span> <span>{{getActiveNum((gxbdata1.ZXZ*1 + gxbdata0.ZXZ*1)/10000)}}</span>
<span class="span1">/</span> <span class="span1">/</span>
<span>{{(gtopdata.TBZ/10000).toFixed(1)}}</span> <span>{{getActiveNum((gxbdata1.TBZ*1 + gxbdata0.TBZ*1)/10000)}}</span>
<span class="span2"></span> <span class="span2"></span>
<span class="tag-blue"></span> <span class="tag-blue"></span>
<span class="span2">{{gtopdata.TBL}}</span> <span class="span2">{{gtopdata.TBL}}</span>
...@@ -40,17 +40,17 @@ ...@@ -40,17 +40,17 @@
<div class="card1-mod" v-show="mbType !== 'zl'"> <div class="card1-mod" v-show="mbType !== 'zl'">
<h2>签·在管人数(实/同)</h2> <h2>签·在管人数(实/同)</h2>
<div class="cmtitle"> <div class="cmtitle">
<span>{{(qtopdata.ZXZ/10000).toFixed(1)}}</span> <span>{{getActiveNum((qxbdata1.ZXZ*1 + qxbdata0.ZXZ*1)/10000)}}</span>
<span class="span1">/</span> <span class="span1">/</span>
<span>{{(qtopdata.TBZ/10000).toFixed(1)}}</span> <span>{{getActiveNum((qxbdata1.TBZ*1 + qxbdata0.TBZ*1)/10000)}}</span>
<span class="span2"></span> <span class="span2"></span>
<span class="tag-blue"></span> <span class="tag-blue"></span>
<span class="span2">{{qtopdata.TBL}}</span> <span class="span2">{{qtopdata.TBL}}</span>
<span class="el-icon-bottom">&nbsp;</span> <span class="el-icon-bottom">&nbsp;</span>
</div> </div>
<div class="cmtline"> <div class="cmtline">
<p><span>{{(qglrs/10000).toFixed(1)}}</span>年内已管理人数</p> <p><span>{{getActiveNum(qglrs/10000)}}</span>年内已管理人数</p>
<p><span>{{(qgfrs/10000).toFixed(1)}}</span>规范管理人数</p> <p><span>{{getActiveNum(qgfrs/10000)}}</span>规范管理人数</p>
<p><span>{{(qxjdata.ZXZ)}}/{{(qxjdata.ZZZ)}}</span>新建数(累计/本周)</p> <p><span>{{(qxjdata.ZXZ)}}/{{(qxjdata.ZZZ)}}</span>新建数(累计/本周)</p>
<p><span>{{(qsfdata.ZXZ)}}/{{(qsfdata.ZZZ)}}</span>失访数(累计/本周)</p> <p><span>{{(qsfdata.ZXZ)}}/{{(qsfdata.ZZZ)}}</span>失访数(累计/本周)</p>
</div> </div>
...@@ -58,9 +58,9 @@ ...@@ -58,9 +58,9 @@
<div class="card1-mod" v-show="mbType === 'zl'"> <div class="card1-mod" v-show="mbType === 'zl'">
<h2>初访完成数(实/同)</h2> <h2>初访完成数(实/同)</h2>
<div class="cmtitle"> <div class="cmtitle">
<span>{{parseFloat(wcdata.ZXZ / 10000).toFixed(1)}}</span> <span>{{getActiveNum(wcdata.ZXZ / 10000)}}</span>
<span class="span1">/</span> <span class="span1">/</span>
<span>{{parseFloat(wcdata.TBZ / 10000).toFixed(1)}}</span> <span>{{getActiveNum(wcdata.TBZ / 10000)}}</span>
<span class="span2"></span> <span class="span2"></span>
<span class="tag-blue"></span> <span class="tag-blue"></span>
<span class="span2">{{wcdata.TBL}}</span> <span class="span2">{{wcdata.TBL}}</span>
...@@ -89,15 +89,15 @@ ...@@ -89,15 +89,15 @@
</tr> </tr>
<tr> <tr>
<td width="20%"><i class="el-icon-user-solid color1"></i></td> <td width="20%"><i class="el-icon-user-solid color1"></i></td>
<td width="50%"><span :style="widthChange(gxbdata1.ZXZ,gxbdata0.ZXZ,1)">{{(gxbdata1.ZXZ/10000).toFixed(1)}}</span> <td width="50%"><span :style="widthChange(gxbdata1.ZXZ,gxbdata0.ZXZ,1)">{{getActiveNum(gxbdata1.ZXZ/10000)}}</span>
</td> </td>
<td width="30%">{{parseFloat(gxbdata1.TBL).toFixed(1)}} <i class="el-icon-bottom color3"></i></td> <td width="30%">{{getActiveNum(gxbdata1.TBL)}} <i class="el-icon-bottom color3"></i></td>
</tr> </tr>
<tr> <tr>
<td width="20%"><i class="el-icon-s-check color2"></i></td> <td width="20%"><i class="el-icon-s-check color2"></i></td>
<td width="50%"><span :style="widthChange(gxbdata1.ZXZ,gxbdata0.ZXZ,2)" class="nv">{{(gxbdata0.ZXZ/10000).toFixed(1)}}</span> <td width="50%"><span :style="widthChange(gxbdata1.ZXZ,gxbdata0.ZXZ,2)" class="nv">{{getActiveNum(gxbdata0.ZXZ/10000)}}</span>
</td> </td>
<td width="30%">{{parseFloat(gxbdata0.TBL).toFixed(1)}} <i class="el-icon-bottom color3"></i></td> <td width="30%">{{getActiveNum(gxbdata0.TBL)}} <i class="el-icon-bottom color3"></i></td>
</tr> </tr>
<tr> <tr>
<td width="20%">&nbsp;</td> <td width="20%">&nbsp;</td>
...@@ -106,24 +106,24 @@ ...@@ -106,24 +106,24 @@
</tr> </tr>
<tr> <tr>
<td width="20%"><i class="el-icon-user-solid color1"></i></td> <td width="20%"><i class="el-icon-user-solid color1"></i></td>
<td width="50%"><span :style="widthChange(qxbdata1.ZXZ,qxbdata0.ZXZ,1)">{{(qxbdata1.ZXZ/10000).toFixed(1)}}</span> <td width="50%"><span :style="widthChange(qxbdata1.ZXZ,qxbdata0.ZXZ,1)">{{getActiveNum(qxbdata1.ZXZ/10000)}}</span>
</td> </td>
<td width="30%">{{parseFloat(qxbdata1.TBL).toFixed(1)}} <i class="el-icon-bottom color3"></i></td> <td width="30%">{{getActiveNum(qxbdata1.TBL)}} <i class="el-icon-bottom color3"></i></td>
</tr> </tr>
<tr> <tr>
<td width="20%"><i class="el-icon-s-check color2"></i></td> <td width="20%"><i class="el-icon-s-check color2"></i></td>
<td width="50%"><span :style="widthChange(qxbdata1.ZXZ,qxbdata0.ZXZ,2)" class="nv">{{(qxbdata0.ZXZ/10000).toFixed(1)}}</span> <td width="50%"><span :style="widthChange(qxbdata1.ZXZ,qxbdata0.ZXZ,2)" class="nv">{{getActiveNum(qxbdata0.ZXZ/10000)}}</span>
</td> </td>
<td width="30%">{{parseFloat(qxbdata0.TBL).toFixed(1)}} <i class="el-icon-bottom color3"></i></td> <td width="30%">{{getActiveNum(qxbdata0.TBL)}} <i class="el-icon-bottom color3"></i></td>
</tr> </tr>
</table> </table>
</div> </div>
<div class="page-left-top1" v-show="mbType === 'zl'"> <div class="page-left-top1" v-show="mbType === 'zl'">
<div id="chartsright"></div> <div id="chartsright"></div>
<div id="chartstxt"> <div id="chartstxt">
<p>初访完成比:{{parseFloat(wclv).toFixed(1)}}%</p> <p>初访完成比:{{getActiveNum(wclv)}}%</p>
<p>知情同意随访比:{{parseFloat(zqlv).toFixed(1)}}%</p> <p>知情同意随访比:{{getActiveNum(zqlv)}}%</p>
<p>规范管理率:{{parseFloat(gflv).toFixed(1)}}%</p> <p>规范管理率:{{getActiveNum(gflv)}}%</p>
</div> </div>
</div> </div>
</div> </div>
...@@ -140,23 +140,23 @@ ...@@ -140,23 +140,23 @@
</tr> </tr>
<tr> <tr>
<td width="30%">完成初访</td> <td width="30%">完成初访</td>
<td width="45%"><span class="span11">{{parseFloat(wcdata.ZXZ / 10000).toFixed(1)}} / <td width="45%"><span class="span11">{{getActiveNum(wcdata.ZXZ / 10000)}} /
{{parseFloat(wcdata.TBZ / 10000).toFixed(1)}}</span></td> {{getActiveNum(wcdata.TBZ / 10000)}}</span></td>
<td width="25%%">{{wclvdata.TBL?parseFloat(wclvdata.TBL).toFixed(1):0}} <i class="el-icon-bottom color3">&nbsp;</i> <td width="25%%">{{wclvdata.TBL?getActiveNum(wclvdata.TBL):0}} <i class="el-icon-bottom color3">&nbsp;</i>
</td> </td>
</tr> </tr>
<tr> <tr>
<td width="30%">知情同意</td> <td width="30%">知情同意</td>
<td width="45%"><span class="span22">{{parseFloat(zqsdata.ZXZ / 10000).toFixed(1)}} / <td width="45%"><span class="span22">{{getActiveNum(zqsdata.ZXZ / 10000)}} /
{{parseFloat(zqsdata.TBZ / 10000).toFixed(1)}}</span></td> {{getActiveNum(zqsdata.TBZ / 10000)}}</span></td>
<td width="25%">{{zqsdata.TBL?parseFloat(zqsdata.TBL).toFixed(1):0}} <i class="el-icon-bottom color3">&nbsp;</i> <td width="25%">{{zqsdata.TBL?getActiveNum(zqsdata.TBL):0}} <i class="el-icon-bottom color3">&nbsp;</i>
</td> </td>
</tr> </tr>
<tr> <tr>
<td width="30%">随访存活</td> <td width="30%">随访存活</td>
<td width="45%"><span class="span33">{{chdata.ZXZ?parseFloat(chdata.ZXZ / 10000).toFixed(1):0}} / <td width="45%"><span class="span33">{{chdata.ZXZ?getActiveNum(chdata.ZXZ / 10000):0}} /
{{chdata.TBZ?parseFloat(chdata.TBZ / 10000).toFixed(1):0}}</span></td> {{chdata.TBZ?getActiveNum(chdata.TBZ / 10000):0}}</span></td>
<td width="25%">{{chdata.TBL?parseFloat(chdata.TBL).toFixed(1):0}} <i <td width="25%">{{chdata.TBL?getActiveNum(chdata.TBL):0}} <i
class="el-icon-bottom color3">&nbsp;</i></td> class="el-icon-bottom color3">&nbsp;</i></td>
</tr> </tr>
</table> </table>
...@@ -2074,8 +2074,10 @@ ...@@ -2074,8 +2074,10 @@
}) })
}, },
toNextOrg(code, name) { toNextOrg(code, name) {
if(this._group === 'YWSJ'){
return false
}
if (this.pageLevel === 'sj') { if (this.pageLevel === 'sj') {
console.log("此处是第一次点击"); console.log("此处是第一次点击");
this.pageLevel = 'qj' this.pageLevel = 'qj'
this._group = 'YLJGDM' this._group = 'YLJGDM'
...@@ -2228,8 +2230,8 @@ ...@@ -2228,8 +2230,8 @@
_this.data_code.push(obj.code) _this.data_code.push(obj.code)
}else{ }else{
let NameTemp let NameTemp
NameTemp = item.YWSJ.substring(6, 7) + '月' ? NameTemp = item.YWSJ.substring(5, 7) + '月' ?
item.YWSJ.substring(6, 7) + '月' : item.YLJGDM_EX2.substring(6, 7) + '月' item.YWSJ.substring(5, 7) + '月' : item.YLJGDM_EX2.substring(5, 7) + '月'
_this.data_x.push(NameTemp) _this.data_x.push(NameTemp)
} }
item.zbxx.forEach((item2, index) => { item.zbxx.forEach((item2, index) => {
...@@ -2307,10 +2309,10 @@ ...@@ -2307,10 +2309,10 @@
let b = getActiveNum(_this.gxyseriesB_g[index] - _this.gxyseriesB_q[index]) let b = getActiveNum(_this.gxyseriesB_g[index] - _this.gxyseriesB_q[index])
obj.name = _this.data_x[index] obj.name = _this.data_x[index]
obj.code = _this.data_code[index] obj.code = _this.data_code[index]
obj.tag1 = getActiveNum(_this.gxyseriesE[index]) obj.tag1 = getActiveNum(_this.gxyseriesC[index])
obj.tag2 = getActiveNum(_this.gxyseriesF[index]) obj.tag2 = getActiveNum(_this.gxyseriesD[index])
obj.tag3 = getActiveNum(_this.gxyseriesC[index]) obj.tag3 = getActiveNum(_this.gxyseriesE[index])
obj.tag4 = getActiveNum(_this.gxyseriesD[index]) obj.tag4 = getActiveNum(_this.gxyseriesF[index])
obj.tag5 = getActiveNum(_this.gxyseriesG[index]) obj.tag5 = getActiveNum(_this.gxyseriesG[index])
obj.tag6 = getActiveNum(_this.gxyseriesH[index]) obj.tag6 = getActiveNum(_this.gxyseriesH[index])
_this.tableAll.push(obj) _this.tableAll.push(obj)
...@@ -2752,6 +2754,9 @@ ...@@ -2752,6 +2754,9 @@
} }
}, 200) }, 200)
},
getActiveNum(str){
return getActiveNum(str)
} }
}, },
mounted() { mounted() {
......
...@@ -839,6 +839,9 @@ ...@@ -839,6 +839,9 @@
this.change_age(1) this.change_age(1)
}, },
changecity(code, name) { changecity(code, name) {
if(this._group === 'YWSJ'){
return false
}
if (this.pageLevel === 'sj') { if (this.pageLevel === 'sj') {
// 点击区 -- 展示城镇信息 // 点击区 -- 展示城镇信息
this.pageLevel = 'qj' this.pageLevel = 'qj'
...@@ -1324,6 +1327,7 @@ ...@@ -1324,6 +1327,7 @@
let obj = {} let obj = {}
if (item.YWSJ) { if (item.YWSJ) {
obj.name = parseInt(item.YWSJ.substring(6, 7)) obj.name = parseInt(item.YWSJ.substring(6, 7))
dataX=['一季度','二季度','三季度','四季度']
} else { } else {
if (item.XZQH_TEXT) { if (item.XZQH_TEXT) {
obj.name = item.XZQH_TEXT obj.name = item.XZQH_TEXT
...@@ -1535,7 +1539,144 @@ ...@@ -1535,7 +1539,144 @@
}) })
this.topListData = [] this.topListData = []
if(this._group === 'YWSJ'){
if(bar1_g.length === 12){
bar1_g = [bar1_g[2],bar1_g[5],bar1_g[8],bar1_g[11]]
bar1_q = [bar1_q[2],bar1_q[5],bar1_q[8],bar1_q[11]]
bar1_g_qn = [bar1_g_qn[2],bar1_g_qn[5],bar1_g_qn[8],bar1_g_qn[11]]
bar1_q_qn = [bar1_q_qn[2],bar1_q_qn[5],bar1_q_qn[8],bar1_q_qn[11]]
line1 = [line1[2],line1[5],line1[8],line1[11]]
line2 = [line2[2],line2[5],line2[8],line2[11]]
line3 = [line3[2],line3[5],line3[8],line3[11]]
line4 = [line4[2],line4[5],line4[8],line4[11]]
line5 = [line5[2],line5[5],line5[8],line5[11]]
line6 = [line6[2],line6[5],line6[8],line6[11]]
}else if(bar1_g.length === 11){
bar1_g = [bar1_g[2],bar1_g[5],bar1_g[8],bar1_g[10]]
bar1_q = [bar1_q[2],bar1_q[5],bar1_q[8],bar1_q[10]]
bar1_g_qn = [bar1_g_qn[2],bar1_g_qn[5],bar1_g_qn[8],bar1_g_qn[10]]
bar1_q_qn = [bar1_q_qn[2],bar1_q_qn[5],bar1_q_qn[8],bar1_q_qn[10]]
line1 = [line1[2],line1[5],line1[8],line1[10]]
line2 = [line2[2],line2[5],line2[8],line2[10]]
line3 = [line3[2],line3[5],line3[8],line3[10]]
line4 = [line4[2],line4[5],line4[8],line4[10]]
line5 = [line5[2],line5[5],line5[8],line5[10]]
line6 = [line6[2],line6[5],line6[8],line6[10]]
}else if(bar1_g.length === 10){
bar1_g = [bar1_g[2],bar1_g[5],bar1_g[8],bar1_g[9]]
bar1_q = [bar1_q[2],bar1_q[5],bar1_q[8],bar1_q[11]]
bar1_g_qn = [bar1_g_qn[2],bar1_g_qn[5],bar1_g_qn[8],bar1_g_qn[9]]
bar1_q_qn = [bar1_q_qn[2],bar1_q_qn[5],bar1_q_qn[8],bar1_q_qn[9]]
line1 = [line1[2],line1[5],line1[8],line1[9]]
line2 = [line2[2],line2[5],line2[8],line2[9]]
line3 = [line3[2],line3[5],line3[8],line3[9]]
line4 = [line4[2],line4[5],line4[8],line4[9]]
line5 = [line5[2],line5[5],line5[8],line5[9]]
line6 = [line6[2],line6[5],line6[8],line6[9]]
}else if(bar1_g.length === 9){
bar1_g = [bar1_g[2],bar1_g[5],bar1_g[8],0]
bar1_q = [bar1_q[2],bar1_q[5],bar1_q[8],0]
bar1_g_qn = [bar1_g_qn[2],bar1_g_qn[5],bar1_g_qn[8],0]
bar1_q_qn = [bar1_q_qn[2],bar1_q_qn[5],bar1_q_qn[8],0]
line1 = [line1[2],line1[5],line1[8],0]
line2 = [line2[2],line2[5],line2[8],0]
line3 = [line3[2],line3[5],line3[8],0]
line4 = [line4[2],line4[5],line4[8],0]
line5 = [line5[2],line5[5],line5[8],0]
line6 = [line6[2],line6[5],line6[8],0]
}else if(bar1_g.length === 8){
bar1_g = [bar1_g[2],bar1_g[5],bar1_g[7],0]
bar1_q = [bar1_q[2],bar1_q[5],bar1_q[7],0]
bar1_g_qn = [bar1_g_qn[2],bar1_g_qn[5],bar1_g_qn[7],0]
bar1_q_qn = [bar1_q_qn[2],bar1_q_qn[5],bar1_q_qn[7],0]
line1 = [line1[2],line1[5],line1[7],0]
line2 = [line2[2],line2[5],line2[7],0]
line3 = [line3[2],line3[5],line3[7],0]
line4 = [line4[2],line4[5],line4[7],0]
line5 = [line5[2],line5[5],line5[7],0]
line6 = [line6[2],line6[5],line6[7],0]
}else if(bar1_g.length === 7){
bar1_g = [bar1_g[2],bar1_g[5],bar1_g[6],0]
bar1_q = [bar1_q[2],bar1_q[5],bar1_q[6],0]
bar1_g_qn = [bar1_g_qn[2],bar1_g_qn[5],bar1_g_qn[6],0]
bar1_q_qn = [bar1_q_qn[2],bar1_q_qn[5],bar1_q_qn[6],0]
line1 = [line1[2],line1[5],line1[6],0]
line2 = [line2[2],line2[5],line2[6],0]
line3 = [line3[2],line3[5],line3[6],0]
line4 = [line4[2],line4[5],line4[6],0]
line5 = [line5[2],line5[5],line5[6],0]
line6 = [line6[2],line6[5],line6[6],0]
}else if(bar1_g.length === 6){
bar1_g = [bar1_g[2],bar1_g[5],0,0]
bar1_q = [bar1_q[2],bar1_q[5],0,0]
bar1_g_qn = [bar1_g_qn[2],bar1_g_qn[5],0,0]
bar1_q_qn = [bar1_q_qn[2],bar1_q_qn[5],0,0]
line1 = [line1[2],line1[5],0,0]
line2 = [line2[2],line2[5],0,0]
line3 = [line3[2],line3[5],0,0]
line4 = [line4[2],line4[5],0,0]
line5 = [line5[2],line5[5],0,0]
line6 = [line6[2],line6[5],0,0]
}else if(bar1_g.length === 5){
bar1_g = [bar1_g[2],bar1_g[4],0,0]
bar1_q = [bar1_q[2],bar1_q[4],0,0]
bar1_g_qn = [bar1_g_qn[2],bar1_g_qn[4],0,0]
bar1_q_qn = [bar1_q_qn[2],bar1_q_qn[4],0,0]
line1 = [line1[2],line1[4],0,0]
line2 = [line2[2],line2[4],0,0]
line3 = [line3[2],line3[4],0,0]
line4 = [line4[2],line4[4],0,0]
line5 = [line5[2],line5[4],0,0]
line6 = [line6[2],line6[4],0,0]
}else if(bar1_g.length === 4){
bar1_g = [bar1_g[2],bar1_g[3],0,0]
bar1_q = [bar1_q[2],bar1_q[5],0,0]
bar1_g_qn = [bar1_g_qn[2],bar1_g_qn[3],0,0]
bar1_q_qn = [bar1_q_qn[2],bar1_q_qn[3],0,0]
line1 = [line1[2],line1[3],0,0]
line2 = [line2[2],line2[3],0,0]
line3 = [line3[2],line3[3],0,0]
line4 = [line4[2],line4[3],0,0]
line5 = [line5[2],line5[3],0,0]
line6 = [line6[2],line6[3],0,0]
}else if(bar1_g.length === 3){
bar1_g = [bar1_g[2],0,0,0]
bar1_q = [bar1_q[2],0,0,0]
bar1_g_qn = [bar1_g_qn[2],0,0,0]
bar1_q_qn = [bar1_q_qn[2],0,0,0]
line1 = [line1[2],0,0,0]
line2 = [line2[2],0,0,0]
line3 = [line3[2],0,0,0]
line4 = [line4[2],0,0,0]
line5 = [line5[2],0,0,0]
line6 = [line6[2],0,0,0]
}else if(bar1_g.length === 2){
bar1_g = [bar1_g[1],0,0,0]
bar1_q = [bar1_q[1],0,0,0]
bar1_g_qn = [bar1_g_qn[1],0,0,0]
bar1_q_qn = [bar1_q_qn[1],0,0,0]
line1 = [line1[1],0,0,0]
line2 = [line2[1],0,0,0]
line3 = [line3[1],0,0,0]
line4 = [line4[1],0,0,0]
line5 = [line5[1],0,0,0]
line6 = [line6[1],0,0,0]
}else if(bar1_g.length === 1){
bar1_g = [bar1_g[0],0,0,0]
bar1_q = [bar1_q[0],0,0,0]
bar1_g_qn = [bar1_g_qn[0],0,0,0]
bar1_q_qn = [bar1_q_qn[0],0,0,0]
line1 = [line1[0],0,0,0]
line2 = [line2[0],0,0,0]
line3 = [line3[0],0,0,0]
line4 = [line4[0],0,0,0]
line5 = [line5[0],0,0,0]
line6 = [line6[0],0,0,0]
}
}
bar1_g.forEach((item, index) => { bar1_g.forEach((item, index) => {
let obj = {} let obj = {}
let a = getActiveNum(bar1_g[index] - bar1_q[index]) let a = getActiveNum(bar1_g[index] - bar1_q[index])
let b = getActiveNum(bar1_g_qn[index] - bar1_q_qn[index]) let b = getActiveNum(bar1_g_qn[index] - bar1_q_qn[index])
...@@ -1551,14 +1692,14 @@ ...@@ -1551,14 +1692,14 @@
this.topListData.push(obj) this.topListData.push(obj)
let tooltip = {} let tooltip = {}
tooltip.num1 = bar1_g[index] tooltip.num1 = getActiveNum(bar1_g[index])
tooltip.num2 = bar1_q[index] tooltip.num2 = getActiveNum(bar1_q[index])
tooltip.num3 = bar1_g_qn[index] tooltip.num3 = getActiveNum(bar1_g_qn[index])
tooltip.num4 = bar1_q_qn[index] tooltip.num4 = getActiveNum(bar1_q_qn[index])
tooltip.num5 = line1[index] tooltip.num5 = getActiveNum(line1[index])
tooltip.num6 = line1_qn[index] tooltip.num6 = getActiveNum(line1_qn[index])
tooltip.num7 = line2[index] tooltip.num7 = getActiveNum(line2[index])
tooltip.num8 = line2_qn[index] tooltip.num8 = getActiveNum(line2_qn[index])
bar1_q[index] = Object.assign({value:bar1_q[index]}, tooltip) bar1_q[index] = Object.assign({value:bar1_q[index]}, tooltip)
bar1[index] = Object.assign({value:a}, tooltip) bar1[index] = Object.assign({value:a}, tooltip)
...@@ -1566,15 +1707,18 @@ ...@@ -1566,15 +1707,18 @@
bar1_g_qn[index] = Object.assign({value:b}, tooltip) bar1_g_qn[index] = Object.assign({value:b}, tooltip)
}) })
let legendMy = [] let legendMy = []
if (this.mbType === 'gxy') { if (this.mbType === 'gxy') {
// 高血压板块 // 高血压板块
if (this.groupType === 'org' && this.rqType === 'glrq') { if (this.rqType === 'glrq') {
legendMy = ['管理/签约人群自动上传血压合格人数', '去年管理/签约人群自动上传血压合格人数', '管·自动上传血压控制率/去年', '签·自动上传血压控制率/去年', legendMy = ['管理/签约人群自动上传血压合格人数', '去年管理/签约人群自动上传血压合格人数', '管·自动上传血压控制率/去年', '签·自动上传血压控制率/去年',
'管·报告血压控制率/去年', '签·报告血压控制率/去年', '管·BMI异常比/去年', '签·BMI异常比/去年' '管·报告血压控制率/去年', '签·报告血压控制率/去年', '管·BMI异常比/去年', '签·BMI异常比/去年'
] ]
this.option2.legend.data = legendMy this.option2.legend.data = legendMy
if(this.groupType === 'org'){
this.option2.xAxis[0].data = dataX this.option2.xAxis[0].data = dataX
this.option2.series[1].data = bar1_q this.option2.series[1].data = bar1_q
...@@ -1588,14 +1732,28 @@ ...@@ -1588,14 +1732,28 @@
this.option2.series[9].data = line4 this.option2.series[9].data = line4
this.option2.series[10].data = line5 this.option2.series[10].data = line5
this.option2.series[11].data = line6 this.option2.series[11].data = line6
}else{
this.option2.xAxis[0].data = ['一季度','二季度','三季度','四季度']
this.option2.series[1].data = bar1_q
this.option2.series[2].data = bar1
this.option2.series[4].data = bar1_q_qn
this.option2.series[5].data = bar1_g_qn
} else { this.option2.series[6].data = line1
this.option2.series[7].data = line2
this.option2.series[8].data = line3
this.option2.series[9].data = line4
this.option2.series[10].data = line5
this.option2.series[11].data = line6
}
} else if (this.rqType === 'gfgl') {
legendMy = ['管理/签约人群自动上传血压合格人数', '去年管理/签约人群自动上传血压合格人数', '管·自动上传血压控制率/去年', '签·自动上传血压控制率/去年', legendMy = ['管理/签约人群自动上传血压合格人数', '去年管理/签约人群自动上传血压合格人数', '管·自动上传血压控制率/去年', '签·自动上传血压控制率/去年',
'管·报告血压控制率/去年', '签·报告血压控制率/去年' '管·报告血压控制率/去年', '签·报告血压控制率/去年'
] ]
this.option2.legend.data = legendMy this.option2.legend.data = legendMy
if(this.groupType === 'org'){
this.option2.xAxis[0].data = dataX this.option2.xAxis[0].data = dataX
this.option2.series[1].data = bar1_q this.option2.series[1].data = bar1_q
...@@ -1609,6 +1767,21 @@ ...@@ -1609,6 +1767,21 @@
this.option2.series[9].data = line4 this.option2.series[9].data = line4
this.option2.series[10].data = [] this.option2.series[10].data = []
this.option2.series[11].data = [] this.option2.series[11].data = []
}else{
this.option2.xAxis[0].data = ['一季度','二季度','三季度','四季度']
this.option2.series[1].data = bar1_q
this.option2.series[2].data = bar1_g
this.option2.series[4].data = bar1_q_qn
this.option2.series[5].data = bar1_g_qn
this.option2.series[6].data = line1
this.option2.series[7].data = line2
this.option2.series[8].data = line3
this.option2.series[9].data = line4
this.option2.series[10].data = []
this.option2.series[11].data = []
}
} }
......
...@@ -355,52 +355,7 @@ ...@@ -355,52 +355,7 @@
} }
} }
}, },
data: [{ data: []
value: 0,
name: '一级',
itemStyle: {
normal: {
color: '#FEF7AA',
},
}
},
{
value: 0,
name: '二级',
itemStyle: {
normal: {
color: '#00C6A7',
},
}
},
{
value: 0,
name: '三级',
itemStyle: {
normal: {
color: '#49A6F6',
},
}
},
{
value: 0,
name: '',
itemStyle: {
normal: {
color: 'rgba(0,0,0,0)',
label: {
show: false
},
labelLine: {
show: false
}
},
emphasis: {
color: 'rgba(0,0,0,0)'
}
}
},
]
}, },
{ {
name: '非信息化', name: '非信息化',
...@@ -519,48 +474,7 @@ ...@@ -519,48 +474,7 @@
} }
} }
}, },
data: [{ data: []
value: this.orgone,
name: '一级',
itemStyle: {
normal: {
color: '#FEF7AA',
},
}
}, {
value: this.orgtwo,
name: '二级',
itemStyle: {
normal: {
color: '#00C6A7',
},
}
}, {
value: this.orgthr,
name: '三级',
itemStyle: {
normal: {
color: '#49A6F6',
},
}
}, {
value: this.orgtotale * 0.5,
name: '',
itemStyle: {
normal: {
color: 'rgba(0,0,0,0)',
label: {
show: false
},
labelLine: {
show: false
}
},
emphasis: {
color: 'rgba(0,0,0,0)'
}
}
}]
}, },
{ {
name: '非信息化', name: '非信息化',
...@@ -589,48 +503,7 @@ ...@@ -589,48 +503,7 @@
} }
} }
}, },
data: [{ data: []
value: this.norgone,
name: '一级',
itemStyle: {
normal: {
color: '#FEF7AA'
}
}
}, {
value: this.norgtwo,
name: '二级',
itemStyle: {
normal: {
color: '#00C6A7'
}
}
}, {
value: this.norgthr,
name: '三级',
itemStyle: {
normal: {
color: '#49A6F6'
}
}
}, {
value: this.norgtotale * 0.5,
name: '',
itemStyle: {
normal: {
color: 'rgba(0,0,0,0)',
label: {
show: false
},
labelLine: {
show: false
}
},
emphasis: {
color: 'rgba(0,0,0,0)'
}
}
}]
} }
] ]
}, },
...@@ -887,7 +760,7 @@ ...@@ -887,7 +760,7 @@
this.topType = 'kzqk' this.topType = 'kzqk'
this.djNo = '' this.djNo = ''
_this.homeinit() _this.homeinit()
this.homebot() _this.homebot()
}, },
bingChange(type) { bingChange(type) {
this.topType = type this.topType = type
...@@ -1252,6 +1125,14 @@ ...@@ -1252,6 +1125,14 @@
} }
}}, tooltip1) }}, tooltip1)
_this.$echarts.init(document.getElementById("pag5-right2")).setOption(_this.option4, true) _this.$echarts.init(document.getElementById("pag5-right2")).setOption(_this.option4, true)
}else {
_this.msgopendata = 0
_this.msgclosedata = 0
_this.orgopendata = 0
_this.orgclosedata = 0
_this.msgbfb = 0
_this.orgbfb = 0
} }
}).catch(err => { }).catch(err => {
......
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