Merge branch 'master' of http://192.168.1.220:10080/EHR/app-big-data

page/bigData/css/home.css

@@ -573,4 +573,15 @@ h4 {
	#main .div-bottom {
		bottom: 18px;
	}
}
#full{
	position:absolute;
	display: block;
	right: 23px;
	top: 27px;
	width: 36px;
	height: 60px;
	/* background-color: #f00; */
	z-index: 999;
	cursor:pointer
}

page/bigData/css/insurance.css

@@ -1,6 +1,6 @@
#app{
    width: 1920px;
    height: 1080px;
    width: 1920px!important;
    height: 1080px!important;
    background-size: 100% 100%;
    background-image: url(../images/insurance-bg.png);
}
@@ -378,10 +378,11 @@
}
#full{
	position:absolute;
	display: block;
	right: 23px;
	top: 27px;
	width: 36px;
	height: 36px;
	height: 60px;
	/* background-color: #f00; */
	z-index: 999;
	cursor:pointer

page/bigData/css/medical.css

@@ -473,4 +473,15 @@ td img {
	.div-body>.middle{
		margin: 0 0.15625rem;
	}
}
#full{
	position:absolute;
	display: block;
	right: 23px;
	top: 27px;
	width: 36px;
	height: 60px;
	/* background-color: #f00; */
	z-index: 999;
	cursor:pointer
}

page/bigData/html/home.html

@@ -100,6 +100,7 @@
				</div>
			</div>
			<div class="div-bottom"></div>
			<img src="../images/full-q.png" alt="" id="full">
		</div>
		<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=1W9gqPiqc7C9TDliPP8S9Rj9"></script>
		<script type="text/javascript" src="http://api.map.baidu.com/library/TextIconOverlay/1.2/src/TextIconOverlay_min.js"></script>

page/bigData/html/insurance.html

@@ -199,9 +199,7 @@
                    </table>
                </div>
        </div>
        <div id="full">
            
        </div>
        <img src="../images/full-q.png" alt="" id="full">
    </div>
    <script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=1W9gqPiqc7C9TDliPP8S9Rj9"></script>
    <script type="text/javascript" src="http://api.map.baidu.com/library/TextIconOverlay/1.2/src/TextIconOverlay_min.js"></script>

page/bigData/html/medical.html

@@ -334,6 +334,7 @@
				</div>
			</div>
			<div class="div-bottom"></div>
			<img src="../images/full-q.png" alt="" id="full">
		</div>
		<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=1W9gqPiqc7C9TDliPP8S9Rj9"></script>
		<script type="text/javascript" src="http://api.map.baidu.com/library/TextIconOverlay/1.2/src/TextIconOverlay_min.js"></script>

page/bigData/js/home.js

@@ -237,4 +237,27 @@ function toThousands(str) {
		str = newStr + (str + "00").substr((str + "00").indexOf("."), 3);
	}
	return str;
}
document.getElementById("full").onclick = function (event) {
	var app = document.getElementById('main');
	console.log()
	if($("#full").attr('src') == "../images/full-q.png"){
		$("#full").attr('src',"../images/full-s.png")
	}else{
		$("#full").attr('src',"../images/full-q.png")
	}
	FullScreen(app);
}
function FullScreen(el) {
	var isFullscreen = document.fullScreen || document.mozFullScreen || document.webkitIsFullScreen;
	if (!isFullscreen) { //进入全屏,多重短路表达式
		(el.requestFullscreen && el.requestFullscreen()) ||
		(el.mozRequestFullScreen && el.mozRequestFullScreen()) ||
		(el.webkitRequestFullscreen && el.webkitRequestFullscreen()) || (el.msRequestFullscreen && el.msRequestFullscreen());
	} else { //退出全屏,三目运算符
		document.exitFullscreen ? document.exitFullscreen() :
			document.mozCancelFullScreen ? document.mozCancelFullScreen() :
			document.webkitExitFullscreen ? document.webkitExitFullscreen() : '';
	}
}

page/bigData/js/insurance.js

@@ -107,11 +107,17 @@ new Vue({
				// debugger
				// console.log(datas[1])
				vm.middleData1 = toThousands(datas[1].obj.VIEW_22_0004[0].HC_22_1001/10000);
				vm.middleData2 = ((datas[1].obj.VIEW_22_0004[0].HC_22_1001-datas[1].obj.VIEW_22_0004[0].HC_22_1006)/datas[1].obj.VIEW_22_0004[0].HC_22_1006*100).toFixed(2);
				if(vm.middleData2 == NaN){
				vm.middleData3 = toThousands(datas[1].obj.VIEW_22_0004[0].HC_22_1006/10000);
				debugger
				if(vm.middleData3 != "0"){
					vm.middleData2 = ((datas[1].obj.VIEW_22_0004[0].HC_22_1001-datas[1].obj.VIEW_22_0004[0].HC_22_1006)/datas[1].obj.VIEW_22_0004[0].HC_22_1006*100).toFixed(2);
				}else{
					vm.middleData2 = 0
				}
				console.log(vm.middleData2)
				if(vm.middleData2 == 'NaN'){
					vm.middleData2 = 0;
				}
				vm.middleData3 = toThousands(datas[1].obj.VIEW_22_0004[0].HC_22_1006/10000);
				var chart2 = datas[2].obj.viewInfos[0].options[0].option;
				// vm.leftData1 = datas[1];
				var chart3 = datas[3].obj.viewInfos[0].options[0].option;
@@ -354,7 +360,13 @@ function toThousands(num) {
	return (num || 0).toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,') + str;
}
document.getElementById("full").onclick = function (event) {
	var app = document.getElementById('app')
	var app = document.getElementById('app');
	console.log()
	if($("#full").attr('src') == "../images/full-q.png"){
		$("#full").attr('src',"../images/full-s.png")
	}else{
		$("#full").attr('src',"../images/full-q.png")
	}
	FullScreen(app);
}
function FullScreen(el) {

page/bigData/js/medical.js

@@ -329,4 +329,27 @@ function toThousands(str) {
		str = newStr + (str + "00").substr((str + "00").indexOf("."), 3);
	}
	return str;
}
document.getElementById("full").onclick = function (event) {
	var app = document.getElementById('app');
	console.log()
	if($("#full").attr('src') == "../images/full-q.png"){
		$("#full").attr('src',"../images/full-s.png")
	}else{
		$("#full").attr('src',"../images/full-q.png")
	}
	FullScreen(app);
}
function FullScreen(el) {
	var isFullscreen = document.fullScreen || document.mozFullScreen || document.webkitIsFullScreen;
	if (!isFullscreen) { //进入全屏,多重短路表达式
		(el.requestFullscreen && el.requestFullscreen()) ||
		(el.mozRequestFullScreen && el.mozRequestFullScreen()) ||
		(el.webkitRequestFullscreen && el.webkitRequestFullscreen()) || (el.msRequestFullscreen && el.msRequestFullscreen());
	} else { //退出全屏,三目运算符
		document.exitFullscreen ? document.exitFullscreen() :
			document.mozCancelFullScreen ? document.mozCancelFullScreen() :
			document.webkitExitFullscreen ? document.webkitExitFullscreen() : '';
	}
}

page/bigDataOut/component/resultList.js

@@ -15,9 +15,10 @@
                            </div>\
                            <div v-if="item.hl" class="zhaiyao" v-html="item.hl"></div>\
                        </div>\
                        <div class="block flex f_xy_c">\
                        <div class="block flex f_y_c f_x_e">\
                                <el-pagination\
                                @size-change="handleSizeChange"\
                                background\
                                @current-change="handleCurrentChange"\
                                :current-page="currentPage"\
                                :page-sizes="pageSizeArr"\

page/bigDataOut/css/flex.css

@@ -67,7 +67,9 @@ body {
    user-select: none;
}
body{
    background: #ffffff
}
/* 文本两端对齐 */
.text_s{  

page/bigDataOut/css/home.css

@@ -1,3 +1,6 @@
body{
    background: #ffffff
}
.search_box {
   padding-top: 100px;

page/bigDataOut/css/search.css

@@ -25,7 +25,7 @@
 
 .result_list{
     padding: 23px  37px 21px 19px;
     padding: 23px  37px 6px 19px;
     border: solid 1px #e7e7e7;
     font-size: 16px;
     margin: 0 24px 0 30px;
@@ -59,6 +59,7 @@
    border: solid 1px #e7e7e7;
    border-top: none;
    font-size: 16px;
    word-break: break-all;
 }
 .el-pagination{
     font-size: 16px;