解决部分bug

app/jbsc/component/canvas-progress.js

@@ -80,7 +80,7 @@ Vue.component('canvas-progress', {
		
	},watch:{
		progress:function(nval,oval){
			this.speed=oval;
			nval!==0 && (this.speed=oval);
			this.drawMain(this.canvas, nval, "#12b7f5", "#bec8d2");
		}
	}

app/jbsc/html/advice.html

@@ -88,8 +88,8 @@
								  shadeClose: false, //点击遮罩关闭层
								  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); //再执行关闭
								var index = top.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
								top.layer.close(index); //再执行关闭
							}else{
								top.layer.msg(res.msg, {icon: 5});

app/jbsc/html/filter_type.html

@@ -231,7 +231,8 @@
							parent.question.screeningType=vm.screeningType.code
							parent.question.screeningTitle=vm.screeningType.title
							parent.question.getQuestion();
							parent.question.selectArr=[]
							parent.question.selectArr=[];
							parent.question.progress=0;
							var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
							parent.layer.close(index); //再执行关闭
						}
@@ -270,6 +271,10 @@
			    	},
			    	selectDenizen:function(item){
			    		var vm=this;
			    		if(vm.screeningResidents==item){
			    			vm.screeningResidents=[]
			    			return
			    		}
			    		vm.screeningResidents=item
			    	}
				},

app/jbsc/html/questionnaire.html

@@ -27,7 +27,7 @@
								<div class="daan-list" v-if="qst.question.questionType!=2">
									<lable class="label-block" v-for="opt in qst.option" @click="selectItem(qst.question,opt)">
										<span class="pull-right" v-text="(opt.score || 0)+'分'"></span>
										<input :type="qst.questionType==1?'checked':'radio'" :name="'ques'+index+(qst.questionType==1?'[]':'')" value="1" /><i></i><span v-text="opt.content"></span>									
										<input :type="qst.questionType==1?'checked':'radio'" :name="'ques'+index+screeningType+(qst.questionType==1?'[]':'')" value="1" /><i></i><span v-text="opt.content"></span>									
									</lable>	
								</div>
								<div class="daan-list" v-else>
@@ -284,6 +284,10 @@
						  content: content
						});
					}
				},watch:{
					screeningType:function(){
						$('.daan-list input').attr('checked',false)
					}
				}
			})
		</script>

app/jbsc/html/view_screening_results.html

@@ -97,7 +97,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.value1+'kg'"></span>&nbsp;&nbsp;身高<span v-text="tizhongRecord.value1+'cm'"></span></span><span v-else>暂无体征</span></div>
					<div class="flex-box-item">体征记录：<span v-if="!noTiZhong"><span v-text="tizhongRecord.value1+'kg'"></span>&nbsp;&nbsp;身高<span v-text="tizhongRecord.value2+'cm'"></span></span><span v-else>暂无体征</span></div>
				</div>
				<div class="flex-box">
					<div class="flex-box-item">处理情况：<span>健康跟踪</span></div>
@@ -242,7 +242,7 @@
						  closeBtn:1,
						  shift: 5,
						  shadeClose: false, //点击遮罩关闭层
						  content: '../../jbsc/html/advice.html?parentIframe='+index+'&resultCode='+vm.resultCode+'&filter_code='+vm.screeningType
						  content: '../../jbsc/html/advice.html?parentIframe='+index+'&resultCode='+vm.resultCode+'&filter_code='+vm.userInfo.template_code
						});
				  	},
					getScreenResultDetail:function(){