浏览代码

Merge branch 'master' of http://192.168.1.220:10080/raolu/PC-application

# Conflicts:
#	app/jbsc/js/statistics.js
zyz 6 年之前
父节点
当前提交
9024c01bb7
共有 1 个文件被更改,包括 13 次插入0 次删除
  1. 13 0
      app/jbsc/js/statistics.js

+ 13 - 0
app/jbsc/js/statistics.js

@ -164,12 +164,25 @@ new Vue({
		},
		//健康教育
		jkjy: function(data) {
<<<<<<< HEAD
//				"code": 
//			sessionStorage.setItem("jbsc-jkwzreceiver", JSON.stringify(receiver))
			top.layer.open({
				type: 2,
				//				  offset: ['100px'], //右下角弹出
				area: ['768px', '520px'],
=======
			var receiver = {
				"code": data.patientCode,
				name: data.patientName
			}
			sessionStorage.setItem("jbsc-jkwzreceiver", JSON.stringify(receiver))
			sessionStorage.setItem("jbsc-jkroler", 1)
			layer.open({
				type: 2,
				//				  offset: ['100px'], //右下角弹出
				area: ['80%', '648px'],
>>>>>>> c484ced2a0b52e419981ad98ff8b2da0a0c5463e
				shade: 0.5,
				title: '健康教育',
				fixed: true, //不固定