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

page/bigDataOut/component/resultList.js

@@ -2,8 +2,8 @@
    Vue.component('resultlist', {
        template: '<div >\
                        <div v-if="data && data.length>0">\
                        <div  v-for="item in data" style="margin-bottom:15px">\
                            <div class="result_list flex f_wrap" @click="go(item)">\
                        <div  v-for="item in data" style="margin-bottom:15px" @click="go(item)">\
                            <div class="result_list flex f_wrap" >\
                                <div class="flex"><span class="des">就诊日期</span>：<span class="result">{{forMatterDate(item.event_date)}}</span></div>\
                                <div class="flex"><span class="des">就诊类型</span>：<span class="result">{{(item.event_type==0 && \'门诊\') || (item.event_type==1 && \'住院\')}}</span></div>\
                                <div class="flex"><span class="des text_s ">性别</span>：<span class="result">{{(item.patient_sex==1 && \'男\') || (item.patient_sex==2 && \'女\') || "" }}</span></div>\

page/bigDataOut/css/flex.css

@@ -54,6 +54,21 @@
}
body {
    -moz-user-select: -moz-none;
    -khtml-user-select: none;
    -webkit-user-select: none;
 
    /*
      Introduced in IE 10.
      See http://ie.microsoft.com/testdrive/HTML5/msUserSelect/
    */
    -ms-user-select: none;
    user-select: none;
}
/* 文本两端对齐 */
.text_s{  
    text-align:justify;