Browse Source

新增文章推送

zyz 6 years ago
parent
commit
5af505cc91

+ 13 - 0
api/jbsc-api.js

@ -55,6 +55,19 @@
		searchDenizen: function(data){
			return httpRequest.post('doctor/patient_label_info/patient_search_all_exitdoc',{data:data})
		},
//		获取文章列表
		getCategoryList:function(data){
        	return httpRequest.articleGet('third/jkEdu/Article/getCategoryList', {data:data})
	   	},
	   	queryArticlePcList:function(data){
	        return httpRequest.articleGet('doctor/jkEdu/article/PC/queryArticlePcList',  {data:data})
	    },
	    pushArticleList:function(data){
	        return httpRequest.articleGet('doctor/jkEdu/article/PC/pushArticleList', {data:data})
	    },
	    doctorSendArticleToPatients:function(data) {
        return httpRequest.articlePost('doctor/jkEdu/article/doctorSendArticleToPatients', {data:data})
    	}
		
    }

+ 109 - 0
app/article/css/article.css

@ -0,0 +1,109 @@
*{box-sizing: content-box;}
li{list-style: none;}
p{margin: 0;}
.c-f12{font-size: 12px;}
.c-h80 {height: 80%;}
.pt60 {padding-top: 60px;}
.w40 {width: 32px; height: 21px; text-indent: 0.5em;display: block;line-height: 1;padding: 0;}
.lh24 {
    height: 24px;
    line-height: 24px;
}
.lh34 {
    height: 34px;
    line-height: 33px;
}
.lh30 {
    height: 30px;
    line-height: 30px;
}
.b-r-5500 {border-radius: 5px 5px 0 0;}
.b-r-3 {border-radius: 3px;}
.bgc-f5f5fa {background-color: #f5f5fa;}
.select-tit li {
    width: 100px;
    text-align: center;
}
.select-tit li.active {
    line-height: 34px;
    background-color: #fff;
    color: #12b7f5;
}
.set-article-content {
    overflow-y: scroll;
    height: calc(100% - 10px)
}
.set-article-content:hover::-webkit-scrollbar-thumb {
    background-color: #dcdce1;
    border-radius: 5px;
}
.list-tit {
    display: inline-block;
    width: 110px;
    height: 28px;
    padding: 0 5px;
    border: 1px solid #e1e1e1;
}
.set-bg {
    background: url("../images/tiaozhuan_xia_icon.png") no-repeat 105px center;
}
.pull-list {
    position: absolute;
    top: 30px;
    right: 0;
    width: 120px;
    background: #fff;
    z-index: 9;
}
.pull-list li {
    padding: 0 5px;
}
.pull-list li:hover {
    background-color: #e1e1e1;
}
.w80 {width: 80px;}
.w150 {width: 150px;}
.c-f666 {color: #666}
.c-f999 {color: #999;}
.bgc-12b7f5 {background-color: #12b7f5;}
.article-list{list-style: none;padding: 0;font-size: 12px;margin: 0;}
.article-list li {
    height: 40px;
    line-height: 40px;
}
.text-ellipsis {
    overflow: hidden;
    white-space: nowrap;
    text-overflow: ellipsis;
}
.c-w35 {width: calc(35% - 3px)}
.c-w35-10 {width: calc(35% - 13px); padding: 0 5px;}
.c-w30 {width: 30%}
.c-w30-10 {width: calc(30% - 10px); padding: 0 5px;}
.c-w13 {width: 13%}
.c-w22 {width: 22%}
.c-w22-10 {width: calc(22% - 10px); padding: 0 5px;}
.c-12b7f5{color: #12b7f5;}
.operate:hover {text-decoration: underline;}
.operate:active {color: red;}
.page-btn {
	text-align: center;
    height: 24px;
    width: 24px;
    padding: 0;
    background: #fff;
    color: #ccc;
}
.sure-btn {
    height: 26px;
    width: 36px;
    border-radius: 0;
    border: 0;
    padding: 0;
    line-height: 26px;
    text-align: center;
}
.btn-active {
    background-color: #12b7f5;
    color: #fff;
}

+ 288 - 0
app/article/html/article.html

@ -0,0 +1,288 @@
<!DOCTYPE html>
<html>
	<head>
		<meta charset="UTF-8">
		<title></title>
		<!--<link rel="stylesheet" type="text/css" href="../../../css/bootstrap.min.css" />-->
		<link rel="stylesheet" type="text/css" href="../../../css/cross.css" />
		<link rel="stylesheet" type="text/css" href="../../../css/cross.ui.css" />
		<link rel="stylesheet" type="text/css" href="../../../css/style.min.css" />
		<link rel="stylesheet" type="text/css" href="../css/article.css"/>
	</head>
	<body>
		<div id="app">
			<div class="sel-tap sel-article">
	           	<div class="p10 pt60 c-h80">
			        <ul class="select-tit c-border-b clearfix h34 lh34">
			            <li v-for="(tit, index) in selectArr" :key="index" class="fl mr10 c-border-r c-border-l c-border-t b-r-5500 bgc-f5f5fa c-666 cur-pit" :class="{'active': index == judgeIndex}" @click="selectTit(index)">{{tit}}</li>
			        </ul>
			        <div class="set-article-content plr10" id="setCon">
			            <div class="set-search ptb20 lh30 clearfix">
			            	<div class="c-position-r fl mb0">
			                    一级分类:<span class="list-tit set-bg cur-pit c-999" @click="judgeLevel(1)">{{levelTit1}}</span>
			                    <ul class="pull-list c-border-l c-border-r c-border-b" v-if="isShowLevel1">
			                        <li class="cur-pit c-999" v-for="(level1, index) in levelArr1" :key="index" @click="selectLi(1, level1)">{{level1.categoryname}}</li>
			                    </ul>
			                </div>
			                <div class="c-position-r fl mb0">
			                   	 二级分类:<span class="list-tit set-bg cur-pit c-999" @click="judgeLevel(2)">{{levelTit2}}</span>
			                    <ul class="pull-list c-border-l c-border-r c-border-b" v-if="isShowLevel2">
			                        <li class="cur-pit c-999" v-for="(level2, index) in levelArr2" :key="index" @click="selectLi(2, level2)">{{level2.categoryname}}</li>
			                    </ul>
			                </div>
			                <div class="fl mb0">
			                    <input class="list-tit w150" type="text" placeholder="输入文字标题" v-model="articleTitle">
			                </div>
			                <div class="fl mb0">
			                    <span class="list-tit w80 b-r-3 c-t-center c-fff bgc-12b7f5 cur-pit btn" @click="search()">搜索</span>
			                </div>
			            </div>
			            <ul class="article-list c-border">
			                <li class="bgc-f5f5fa c-f999 clearfix">
			                    <span class="fl c-w35 c-border-r c-t-center">文章标题</span>
			                    <span class="fl c-w22 c-border-r c-t-center">分类</span>
			                    <span class="fl c-w30 c-border-r c-t-center">来源</span>
			                    <span class="fl c-w13 c-t-center">操作</span>
			                </li>
			                <li class="c-border-t c-f666 clearfix" v-for="(list, index) in articleList" :key="index">
			                    <p class="fl c-w35-10 plr5 c-border-r text-ellipsis">{{list.articletitle || list.attachedTitle}}</p>
			                    <p class="fl c-w22-10 c-border-r text-ellipsis">{{list.firstlevelcategoryname || list.level1TypeName ? list.firstlevelcategoryname || list.level1TypeName : ''}}<span v-if="(list.firstlevelcategoryname || list.level1TypeName) && (list.secondlevelcategoryname || list.level1TypeName)">、</span>{{list.secondlevelcategoryname || list.level2TypeName ? list.secondlevelcategoryname || list.level2TypeName : ''}}</p>
			                    <span class="fl c-w30-10 c-border-r text-ellipsis">{{list.articlesource || list.articleSource}}</span>
			                    <p class="fl c-w13 c-t-center c-12b7f5">
			                        <span class="cur-pit operate" v-if="judgeIndex == 2 || list.isauthentication == 1" @click="send(list)">发送</span>
			                        <span class="c-999" v-if="judgeIndex != 2 && list.isauthentication == 0">未认证</span>
			                        <span class="c-999" v-if="judgeIndex != 2 && list.isauthentication == 2">认证未通过</span>
			                    </p>
			                </li>
			            </ul>
			            <div class="mt20 lh24 pr30 txt-center clearfix" v-show="articleList.length">
			                <div class="fr ml10 clearfix">
			                    <span class="fl c-border w40 m0">
			                        <input class="fl w40 c-f999" v-model="editPage" />
			                    </span>
			                    <span class="fr bgc-12b7f5 c-fff c-f12 btn sure-btn" @click="setPage(editPage)">跳转</span>
			                </div>
			                <span class="fr btn page-btn ml10" @click="setPage(page + 2)" v-if="page == 1 && (page + 2) <= allPage">{{page + 2}}</span>
			                <span class="fr btn page-btn ml10" @click="setPage(page + 1)" v-if="(page + 1) <= allPage">{{page + 1}}</span>
			                <span class="fr btn page-btn ml10 btn-active">{{page}}</span>
			                <span class="fr btn page-btn ml10"  @click="setPage(page - 1)" v-if="page != 1">{{page - 1}}</span>
			                <span class="fr btn page-btn ml10"  @click="setPage(page - 2)" v-if="page > 2 && page == allPage">{{page - 2}}</span>
			                <span class="fr">当前第{{page}}页,共{{allPage}}页,{{allRecords}}条数据</span>
			            </div>
			            <p class="pt60 c-t-center c-999 c-f24" v-show="!articleList.length">无数据</p>
			        </div>
			    </div>
	        </div>
		</div>
        <script src="../../../js/vue.js" type="text/javascript" charset="utf-8"></script>
	    <script src="../../../js/jquery-2.2.4.js"></script>
	     <script src="../../../js/es6-promise.js" type="text/javascript" charset="utf-8"></script>
	    <script src="../../../js/util.js" type="text/javascript" charset="utf-8"></script>
	    <script src="../../../api/http-request.js" type="text/javascript" charset="utf-8"></script>
	    <script type="text/javascript" src="../../../api/jbsc-api.js" ></script>
		<!--<script src="../../../plugins/layer/layer.min.js"></script>-->
        <script type="text/javascript">
	    	var httpData=GetRequest();
        	var loginDoctor = JSON.parse(window.localStorage.getItem('wlyyAgent')),
//      	currentUserRole = window.localStorage.getItem('userRose'),
		     currentUserRole = loginDoctor.currentUserRole.code,
//			     currentUserRoleLevel = loginDoctor.currentUserRole.level,
		    // roleType = Number(loginDoctor.currentUserRole.isManage) ? 2 : 1
		    currentUserRole = loginDoctor.hospital,
		    currentUserRoleLevel = 4,
		    roleType = 1
	    	new Vue({
				el: "#app",
			    data:{
		            selectArr: ['文章库', '我的文章', '已推送文章'],
		            judgeIndex: 0,
		            levelArr1: [],
		            levelTit1: '请选择',
		            isShowLevel1: false,
		            levelArr2: [],
		            levelTit2: '请选择',
		            isShowLevel2: false,
		            selectObj: {
		                firstLevelCategoryId: null, // 文章一级分类
		                secondLevelCategoryId: null, // 文章二级分类
		                insertTimeStart: null, // 新增文章开始时间
		                insertTimeEnd: null, // 新增文章结束时间
		                articlelevel: null, // 文章级别
		                articleTitle: null, // 文章标题关键字
		                currentUserRole: currentUserRole, // 当前登录的角色
		                currentUserRoleLevel: currentUserRoleLevel, // 当前登录的角色级别
		                isAuthentication: 1, // 是否认证
		                isMyArticle: false, // 是否过滤我的文章(默认)
		                iDisplayStart: 0, // 当前页
		                iDisplayLength: 10, // pagesize
		                sEcho: 1, // 插件自带
		                roleType: roleType, // 1、普通医生,2、管理员
		                patient: httpData['code'] // 居民CODE
		            },
		            pushObj: {
		                firstLevelCategoryId: null, // 文章一级分类
		                secondLevelCategoryId: null, // 文章二级分类
		                sendTimeStart: null, // 发送开始时间
		                sendTimeEnd: null, // 发送结束时间
		                articleTitle: null, // 文章标题关键字
		                currentRoleCode: currentUserRole, // 当前登录的角色
		                currentRoleLevel: currentUserRoleLevel, // 当前登录的角色级别
		                isMyArticle: null, // 是否过滤我的文章(默认)
		                iDisplayStart: 0, // 当前页
		                iDisplayLength: 10, // pagesize
		                sendType: roleType // 1、普通医生,2、管理员
		            },
		            firstLevelCategoryId: null, // 选择文章一级分类
		            secondLevelCategoryId: null, // 选择文章二级分类
		            articleTitle: null, // 输入文章标题关键字
		            articleList: [],
		            editPage: null,
		            page: 1,
		            allPage: null,
		            allRecords: null
			    },
				 mounted: function(){
			        var  vm = this
			        this.getJkEduArticleLevel(1)
			        this.getJkEduArticleLevel(2)
			        this.queryArticlePcList(vm.selectObj)
			    },
			    methods: {
			       	getJkEduArticleLevel:function(num, firstlevelId) {
			       		var vm=this;
			            var data={
			            	categoryLevel: num,
				            firstlevelId: firstlevelId || null,
				            secondLevelId: null
			            }
			           	jbscAPI.getCategoryList(num, firstlevelId).then(function(res){
				            if (res.status == 200) {
				                if (num == 1) {
				                    vm.levelArr1 = res.data
				                    console.log(vm.levelArr1)
				                } else {
				                    vm.levelArr2 = res.data
				                }
				            }
			           	})
			             
			        },
			        queryArticlePcList:function(obj) {
			        	var vm=this;
			            jbscAPI.queryArticlePcList(obj).then(function(res){
				            if (res.status === 200) {
				                vm.articleList = res.data.aaData
				                vm.allRecords = res.data.iTotalRecords
				                vm.allPage = Math.ceil(res.data.iTotalRecords / 10)
				            }
			            })
			               
			        },
			        pushArticleList:function(obj) {
			        	var vm=this;
			            jbscAPI.pushArticleList(obj).then(function(){
				            if (res.status === 200) {
				                vm.articleList = res.data.aaData
				                vm.allRecords = res.data.iTotalRecords
				                vm.allPage = Math.ceil(res.data.iTotalRecords / 10)
				            }
			            })
			                
			        },
			        selectTit:function(index) {
			            this.judgeIndex = index
			            // 数据初始化
			            document.getElementById('setCon').scrollTop = 0
			            this.page = 1
			            this.selectObj.iDisplayStart = 0
			            this.firstLevelCategoryId = null
			            this.secondLevelCategoryId = null
			            this.articleTitle = null
			            this.levelTit1 = '请选择'
			            this.levelTit2 = '请选择'
			            if (index === 0) {
			                this.selectObj.isAuthentication = 1
			                this.selectObj.isMyArticle = false
			            } else if (index === 1) {
			                this.selectObj.isAuthentication = null
			                this.selectObj.isMyArticle = true
			            }
			            this.search()
			        },
			        judgeLevel:function(num) {
			            if (num === 1) {
			                this.isShowLevel1 = !this.isShowLevel1
			            } else {
			                this.isShowLevel2 = !this.isShowLevel2
			            }
			        },
			        selectLi:function(num, data) {
			            if (num === 1) {
			                this.isShowLevel1 = false
			                this.levelTit1 = data.categoryname
			                this.firstLevelCategoryId = data.categoryid
			                this.levelTit2 = '请选择'
			                this.secondLevelCategoryId = null
			                this.getJkEduArticleLevel(2, data.categoryid)
			            } else {
			                this.isShowLevel2 = false
			                this.levelTit2 = data.categoryname
			                this.secondLevelCategoryId = data.categoryid
			            }
			        },
			        search:function() {
			            let vm = this
			            if (this.judgeIndex === 2) {
			                this.pushObj.firstLevelCategoryId = this.firstLevelCategoryId
			                this.pushObj.secondLevelCategoryId = this.secondLevelCategoryId
			                this.pushObj.articleTitle = this.articleTitle
			                this.pushArticleList(vm.pushObj)
			            } else {
			                this.selectObj.firstLevelCategoryId = this.firstLevelCategoryId
			                this.selectObj.secondLevelCategoryId = this.secondLevelCategoryId
			                this.selectObj.articleTitle = this.articleTitle
			                this.queryArticlePcList(vm.selectObj)
			            }
			        },
			        setPage: function(key) {
			            let vm = this
			            if (+key && +key > 0 && +key <= this.allPage) {
			                this.page = +key
			                if (this.judgeIndex === 2) {
			                    this.pushObj.iDisplayStart = (this.page - 1) * 10
			                    this.pushArticleList(vm.pushObj)
			                } else {
			                    this.selectObj.iDisplayStart = (this.page - 1) * 10
			                    this.queryArticlePcList(vm.selectObj)
			                }
			            } else {
			               console.log('无效的页数跳转!')
			            }
			        },
			        send:function(data) {
			            let sendData = {
			                articleId: data.articleid || data.articleId,
			                patient: httpData['code'],
			                leaveWords: '',
			                currentUserRole: currentUserRole,
			                currentUserRoleLevel: currentUserRoleLevel,
			                sendType: roleType
			            }
			            this.doctorSendArticleToPatients(sendData)
			        },
			        doctorSendArticleToPatients:function(obj) {
			        	var vm=this
			            jbscAPI.doctorSendArticleToPatients(obj).then(function(res){
				            if (res.status === 10000) {
				                console.log('发送成功')
				            } else {
				                this.$loading.close()
				                common.xhrStatus.call(this, res)
				            }
			            })   
			        }
			    }
    })
        </script>
	</body>
</html>

BIN
app/article/images/tiaozhuan_xia_icon.png


+ 29 - 2
app/home/html/index.html

@ -11,9 +11,36 @@
        <meta name="description" content="">
        <link rel="shortcut icon" href="../../../favicon.ico">
        <link rel="stylesheet" type="text/css" href="../../../css/cross.css"/>
       <style type="text/css">
       		*{margin: 0;padding: 0;}
       		.flex-box{
			  display: -webkit-box;
			  display: -ms-flexbox;
			  display: flex;
			  -webkit-box-pack: center;
			      -ms-flex-pack: center;
			          justify-content: center;
			  -webkit-box-align: center;
			      -ms-flex-align: center;
			          align-items: center;
			}
			.flex-box-item{
			  -webkit-box-flex: 1;
			      -ms-flex: 1;
			          flex: 1;
			}
       </style>
    </head>
    <frameset cols="300, *" frameborder="NO" border="0" framespacing="0">
    <body>
    	<div class="flex-box" style="align-items: stretch;">
    		<iframe style="width: 300px;height: calc(100vh);" frameborder='0' src="menu.html" noresize="noresize" id="tab"></iframe>
       	 	<iframe class="flex-box-item" src="href:aboutblank;" frameborder='0' name="view_frame" id="main" class="p10" noresize="noresize"></iframe>
    	</div>
    </body>
    <!--<frameset cols="300, *" frameborder="NO" border="0" framespacing="0">
        <frame src="menu.html" noresize="noresize" id="tab">
        <frame src="href:aboutblank;" name="view_frame" id="main" class="p10" noresize="noresize">
    </frameset>
    </frameset>-->
     <script type="text/javascript" src="../../../js/jquery-2.2.4.js"></script>
     <script src="../../../plugins/layer/layer.min.js"></script>
</html>

+ 2 - 0
app/jbsc/css/filter_type.css

@ -6,6 +6,8 @@
.filter-list-list.active{color: #12B7F5;background-color: #f5f5f5;}
.pl20{padding-left: 20px;}
.btn.disabled{pointer-events: none;}
.select-list{background: #fff;text-align: center;width: 280px;list-style: none;padding: 0;}
.select-list>li{height: 40px;line-height: 40px;cursor: pointer;overflow: hidden;color: #333;font-size: 14px;border-bottom: 1px solid #ccc;}
.go-back{color: #12B7F5!important;}

+ 1 - 0
app/jbsc/css/statistics.css

@ -8,6 +8,7 @@
	display: table;
	clear: both
}
.btn.disabled{pointer-events: none;}
.w3-col {
	float: left;
	width: 100%

+ 1 - 1
app/jbsc/html/advice.html

@ -86,7 +86,7 @@
								  closeBtn:1,
								  shift: 5,
								  shadeClose: false, //点击遮罩关闭层
								  content: 'view_screening_results.html?resultCode='+vm.resultCode
								  content: '../../jbsc/html/view_screening_results.html?resultCode='+vm.resultCode
								});
								var index = top.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
								vm.parentIframe && top.layer.close(vm.parentIframe); //再执行关闭

+ 19 - 3
app/jbsc/html/filter_result.html

@ -20,11 +20,11 @@
				<div class="m20 mb0" style="line-height: 1;">
					<div class="flex-box mb20">
						<div class="flex-box-item">类型:<span v-text="userInfo.template_title"></span></div>
						<div class="flex-box-item">人员:王转转全科医生</div>
						<div class="flex-box-item">人员:<span v-text="doctorInfo.name"></span></div>
					</div>
					<div class="flex-box">
						<div class="flex-box-item">对象:<span v-text="userInfo.patient_name+'('+(userInfo.sex==1?'男':'女')+userInfo.age+'岁)'"></span></div>
						<div class="flex-box-item">体征记录:<span v-if="!noTiZhong"><span v-text="tizhongRecord.recordDate+tizhongRecord.recordType"></span>&nbsp;&nbsp;身高<span v-text="tizhongRecord.value2+tizhongRecord.value1"></span></span><span v-else>暂无记录</span></div>
						<div class="flex-box-item">体征记录:<span v-if="!noTiZhong"><span v-text="tizhongRecord.recordDate+tizhongRecord.recordType"></span>&nbsp;&nbsp;身高<span v-text="tizhongRecord.value2+tizhongRecord.value1"></span></span><span v-else>暂无体征</span></div>
					</div>
				</div>
				<div class="single-choice-question">
@ -91,6 +91,7 @@
		<script src="../../../js/underscore.js" type="text/javascript" charset="utf-8"></script>
		<script type="text/javascript">
			var httpData=GetRequest();
			var wlyyAgentForDoc=JSON.parse(window.localStorage.getItem('wlyyAgentForDoc'));
			new Vue({
				el: "#app",
				data: {
@ -99,13 +100,28 @@
					result:[],//结果
					tizhongRecord:[],
					noTiZhong:true,
					doctorInfo:{code:wlyyAgentForDoc.uid},
					resultCode:httpData['code'],
					screeningType:httpData['filter_type']
				},
				mounted: function(){
					this.getScreenResultDetail()
					this.getDoctorInfo()
				},
				methods: {
					getDoctorInfo:function(){
						var vm=this;
						var data={
							code:vm.doctorInfo.code
						}
						jbscAPI.doctorBaseinfo(data).then(function(res){
							if(res.status==200){
								vm.doctorInfo=res.data
							}else{
								top.layer.msg(res.msg, {icon: 5});
							}
						})
					},
					getScreenResultDetail:function(){
						var vm=this;
						var loadding = top.layer.load(0, {shade: false}); //0代表加载的风格,支持0-2
@ -156,7 +172,7 @@
						  closeBtn:1,
						  shift: 5,
						  shadeClose: false, //点击遮罩关闭层
						  content: 'advice.html?parentIframe='+index+'&resultCode='+vm.resultCode+'&filter_code='+vm.screeningType
						  content: '../../jbsc/html/advice.html?parentIframe='+index+'&resultCode='+vm.resultCode+'&filter_code='+vm.screeningType
						});
					},
				},

+ 1 - 1
app/jbsc/html/filter_type.html

@ -237,7 +237,7 @@
						  closeBtn:1,
						  shift: 5,
						  shadeClose: false, //点击遮罩关闭层
						  content: 'questionnaire.html?fliter_code='+vm.screeningType.code+'&fliter_title='+vm.screeningType.title+'&resident_code='+vm.screeningResidents.code+'&resident_name='+vm.screeningResidents.name
						  content: '../../jbsc/html/questionnaire.html?fliter_code='+vm.screeningType.code+'&fliter_title='+vm.screeningType.title+'&resident_code='+vm.screeningResidents.code+'&resident_name='+vm.screeningResidents.name
						});
						var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
						parent.layer.close(index); //再执行关闭

+ 4 - 4
app/jbsc/html/questionnaire.html

@ -233,8 +233,8 @@
								  maxmin: true,
								  closeBtn:1,
								  shift: 5,
								  shadeClose: true, //点击遮罩关闭层
								  content: 'filter_result.html?code='+res.data+'&filter_type='+vm.screeningType
								  shadeClose: false, //点击遮罩关闭层
								  content: '../../jbsc/html/filter_result.html?code='+res.data+'&filter_type='+vm.screeningType
								});
								var index = top.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
								top.layer.close(index); //再执行关闭
@ -257,7 +257,7 @@
							top.layer.msg(content, {icon: 5});
							return ;
						}
						var content='filter_type.html';
						var content='../../jbsc/html/filter_type.html';
						if(number===1){//选择居民
							content+='?goDenizen=1';
						}
@ -273,7 +273,7 @@
						  maxmin: false,
						  closeBtn:0,
						  shift: 5,
						  shadeClose: false, //点击遮罩关闭层
						  shadeClose: true, //点击遮罩关闭层
						  content: content
						});
					}

+ 1 - 1
app/jbsc/html/statistics.html

@ -241,7 +241,7 @@
		</div>
		<script type="text/javascript" src="../../../js/vue.js"></script>
		<script type="text/javascript" src="../../../js/jquery-2.2.4.js"></script>
		<script src="../../../plugins/layer/layer.min.js"></script>
	<!--	<script src="../../../plugins/layer/layer.min.js"></script>-->
		<script src="../../../js/util.js"></script>
		<script src="../../../api/http-request.js"></script>
		<script src="../../../js/underscore.js"></script>

+ 5 - 5
app/jbsc/html/view_screening_results.html

@ -93,7 +93,7 @@
				</div>
				<div class="flex-box mb20">
					<div class="flex-box-item">筛查对象:<span v-text="userInfo.patient_name+'('+(userInfo.sex==1?'男':'女')+userInfo.age+'岁)'"></span></div>
					<div class="flex-box-item">体征记录:<span v-if="!noTiZhong"><span v-text="tizhongRecord.recordDate+tizhongRecord.recordType"></span>&nbsp;&nbsp;身高<span v-text="tizhongRecord.value2+tizhongRecord.value1"></span></span><span v-else>暂无记录</span></div>
					<div class="flex-box-item">体征记录:<span v-if="!noTiZhong"><span v-text="tizhongRecord.recordDate+tizhongRecord.recordType"></span>&nbsp;&nbsp;身高<span v-text="tizhongRecord.value2+tizhongRecord.value1"></span></span><span v-else>暂无体征</span></div>
				</div>
				<div class="flex-box">
					<div class="flex-box-item">处理情况:<span>健康跟踪</span></div>
@ -141,15 +141,15 @@
				</div>
				
			</div>
			<div class="calculation-score">
			<div class="calculation-score" v-if="result.doctorOtherAdvice || result.doctorAdvice">
				<p class="f16 mb10">家庭医生的建议</p>
				<div class="advice-content">
					<div class="option-advice">
					<div class="option-advice" v-if="result.doctorAdvice">
						<ul class="advice-list">
							<li v-for="advice in result.doctorAdvice" v-text="advice.advice"></li>
						</ul>
					</div>
					<div class="other-advice">
					<div class="other-advice" v-if="result.doctorOtherAdvice">
						<span class="orange-text">补充建议:</span><span v-text="result.doctorOtherAdvice || '无'"></span>
					</div>
				</div>
@ -158,7 +158,7 @@
			<div class="clear-bottom" v-if="!isView || userInfo.is_again">
				<div class="btn-group-bottom flex-box">
					<button class="btn btn-success" @click="jkjy">健康教育</button>
					<button class="btn bgc-12b7f5" v-if="userInfo.is_again" @click="reScreening">再次筛查</button>
					<button class="btn bgc-12b7f5" v-if="userInfo.is_again&&(result.doctorOtherAdvice || result.doctorAdvice)" @click="reScreening">再次筛查</button>
					<button class="btn bgc-02cfb9" @click="referral">转诊</button>			
				</div>
			</div>

+ 19 - 21
app/jbsc/js/statistics.js

@ -1,27 +1,26 @@
function showSuccessMessage(msg) {
	layer.msg(msg, {
	top.layer.msg(msg, {
		icon: 1
	})
}
function showErrorMessage(msg) {
	layer.msg(msg, {
	top.layer.msg(msg, {
		icon: 5
	})
}
function showWarningMessage(msg) {
	layer.msg(msg, {
	top.layer.msg(msg, {
		icon: 2
	})
}
function showInfoMessage(msg) {
	layer.msg(msg, {
	top.layer.msg(msg, {
		icon: 6
	})
}
new Vue({
	el: '#app',
	data: {
@ -165,15 +164,12 @@ new Vue({
		},
		//健康教育
		jkjy: function(data) {
			var receiver = {
				"code": data.patientCode,
				name: data.patientName
			}
			sessionStorage.setItem("jbsc-jkwzreceiver", JSON.stringify(receiver))
			layer.open({
//				"code": 
//			sessionStorage.setItem("jbsc-jkwzreceiver", JSON.stringify(receiver))
			top.layer.open({
				type: 2,
				//				  offset: ['100px'], //右下角弹出
				area: ['820px', '648px'],
				area: ['768px', '520px'],
				shade: 0.5,
				title: '健康教育',
				fixed: true, //不固定
@ -181,12 +177,12 @@ new Vue({
				closeBtn: 1,
				shift: 5,
				shadeClose: false, //点击遮罩关闭层
				content: "../../../../health-education/login.html?origin=jbsc"
				content: "../../article/html/article.html?code="+data.patientCode
			});
			//		location.href="../../../../health-education/login.html?origin=jbsc"
		},
		view: function(data) {
			layer.open({
			top.layer.open({
				type: 2,
				//				  offset: ['100px'], //右下角弹出
				area: ['568px', '100%'],
@ -197,7 +193,7 @@ new Vue({
				closeBtn: 1,
				shift: 5,
				shadeClose: false, //点击遮罩关闭层
				content: 'view_screening_results.html?isView=true&resultCode=' + data.code
				content: '../../jbsc/html/view_screening_results.html?isView=true&resultCode=' + data.code
			});
		},
		//筛查
@ -207,7 +203,7 @@ new Vue({
				//再次筛查数+1
				vm.Statics.againCount++
					var vm = this
				layer.open({
				top.layer.open({
					type: 2,
					area: ['820px', '648px'],
					shade: 0.5,
@ -218,11 +214,11 @@ new Vue({
					closeBtn: 1,
					shift: 5,
					shadeClose: false, //点击遮罩关闭层
					content: 'questionnaire.html?fliter_code=' + data.templateCode + '&fliter_title=' + data.templateTitle + '&resident_code=' + data.patientCode + '&resident_name=' + data.patientName
					content: '../../jbsc/html/questionnaire.html?fliter_code=' + data.templateCode + '&fliter_title=' + data.templateTitle + '&resident_code=' + data.patientCode + '&resident_name=' + data.patientName
				});
				return;
			}
			layer.open({
			top.layer.open({
				type: 2,
				offset: 'rb', //右下角弹出
				id: "filter_type",
@ -234,14 +230,15 @@ new Vue({
				closeBtn: 0,
				shift: 5,
				shadeClose: true, //点击遮罩关闭层
				content: 'filter_type.html'
				content: '../../jbsc/html/filter_type.html'
			});
		},
		//健康跟踪
		jkgz: function(data) {
			var vm = this
			console.log(top.layer)
			//跳转到筛查结果页面
			layer.open({
			var index=top.layer.open({
				type: 2,
				area: ['500px', '550px'],
				shade: 0.5,
@ -251,8 +248,9 @@ new Vue({
				closeBtn: 1,
				shift: 5,
				shadeClose: false, //点击遮罩关闭层
				content: 'advice.html?resultCode=' + data.code + '&filter_code=' + data.templateCode
				content: '../../jbsc/html/advice.html?resultCode=' + data.code + '&filter_code=' + data.templateCode
			});
			console.log(index)
		}
	}
})