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

component/common/nodata.js

@@ -2,8 +2,8 @@
	
	Vue.component('nodata', {
        template: '	<div class="nodata flex_coloumn f_xy_c" style="margin-top:100px">\
                            <img style="width:50%;max-width:200px" src="../../../page/bigDataOut/images/nodeData.png">\
                            <div style="font-size:16px;color:#909090;margin-top:10px">暂无数据</div>\
                            <img style="width:50%;max-width:150px;margin-bottom: 10px;" src="../../../page/bigDataOut/images/nodeData.png">\
                            <div style="font-size:16px;color:#909090;margin-top:10px">找不到您查询的内容</div>\
                    </div>',
		props: ["arr",'needShow'], //可以传数组 可以传显隐
		data: function() {

js/api/http-request.js

@@ -1,5 +1,5 @@
(function(exports) {
	var publish_version = false;
	var publish_version = true;
	var server;
	var getServer;
	var agentName = "useragent"
@@ -60,9 +60,10 @@
					},
					error: function(res) {
						debugger
				     	top.toastr.error("网络错误无法请求")
						
				     	
						reject(res)
						top.toastr.error("网络错误无法请求")
					},
					success: function(res) {
						if(isNeedLogin) {

page/bigDataOut/component/resultList.js

@@ -74,7 +74,11 @@
                    GlobalEventBus.$emit('setLoading');
                    vm.data=res.detailModelList;
                    vm.total=res.totalCount;
                    if(vm.currentPage = 1){
                        
                        GlobalEventBus.$emit('getSearchData',{data:vm.data})
                    }
                   
                }).catch(function(err){
                    GlobalEventBus.$emit('setLoading');

page/bigDataOut/html/search.html

@@ -27,7 +27,7 @@
        </div>
        
      
        <div class="flex f_x_e">
        <div class="flex f_x_e" v-show="showBtn">
                <el-radio-group v-model="type" style="margin-right:24px;margin-bottom: 10px" size="medium">
                        <el-radio-button label="全部"></el-radio-button>
                        <el-radio-button label="门诊"></el-radio-button>

page/bigDataOut/js/search.js

@@ -8,7 +8,8 @@ new Vue({
			type:'全部', 
			allEventInit:false,  //判断是否需要重新加载数据
			outpatientInit:false,
			hospitalizationInit:false
			hospitalizationInit:false,
			showBtn:true
		}
	},
	computed: {
@@ -20,8 +21,16 @@ new Vue({
		this.searchKey =(GetRequest().search && decodeURIComponent(GetRequest().search)) || ''
	
			this.initData(this.searchKey);
			var vm=this;
	
			GlobalEventBus.$on('getSearchData',function(val){
					if(val.data && val.data.length>0){
							vm.showBtn =true
					}
					else{
						vm.showBtn =false
					}
			})
	},
	methods: {
		getHot:function(){
@@ -63,6 +72,9 @@ new Vue({
			this.searchKey=value
			this.initData(value);
		},
		reseviceData:function(val){
			debugger
		}
	},
	watch: {