修改表格高度
parent
a123c85634
commit
7acf1bf3c3
@ -0,0 +1,43 @@
|
||||
package com.emr.util;
|
||||
|
||||
|
||||
import org.springframework.web.context.request.RequestContextHolder;
|
||||
import org.springframework.web.context.request.ServletRequestAttributes;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpSession;
|
||||
|
||||
/**
|
||||
* 关于作用域的操作
|
||||
* @Author: ljx
|
||||
* @Date: 2019/4/23 18:24
|
||||
* @Version 1.0
|
||||
*/
|
||||
public class ActionScopeUtils {
|
||||
|
||||
public static HttpSession getSession(HttpServletRequest request){
|
||||
return request.getSession();
|
||||
}
|
||||
|
||||
public static HttpServletRequest getRequest(){
|
||||
return ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
|
||||
}
|
||||
|
||||
public static void setSessionAttribute(String key,Object value,int expireTime){
|
||||
getSession(getRequest()).setAttribute(key,value);
|
||||
getSession(getRequest()).setMaxInactiveInterval(expireTime);
|
||||
}
|
||||
|
||||
public static Object getSessionAttribute(String key){
|
||||
return getSession(getRequest()).getAttribute(key);
|
||||
}
|
||||
|
||||
public static void setRequestAttribute(String key,Object value){
|
||||
getRequest().setAttribute(key,value);
|
||||
}
|
||||
|
||||
public static Object getRequestAttribute(String key){
|
||||
return getRequest().getAttribute(key);
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,86 @@
|
||||
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
|
||||
<link rel="stylesheet" href="${path}/static/naranja/css/naranja.min.css"/>
|
||||
<script type="text/javascript" src="${path}/static/naranja/js/naranja.js"></script>
|
||||
<script type="text/javascript" src="${path}/static/naranja/sockjs.js"></script>
|
||||
<script>
|
||||
var powerUrlHead = $("#POWER_JSP").val();
|
||||
/************************通知操作************************************/
|
||||
$(function(){
|
||||
getNoticeCount();
|
||||
})
|
||||
//赋值未通知数量
|
||||
function getNoticeCount(){
|
||||
var roleId = $("#roleId").val();
|
||||
var userId = '';
|
||||
if(roleId != 0){
|
||||
userId = $("#userId").val();
|
||||
}
|
||||
//赋值未通知数量
|
||||
$.ajax({
|
||||
type:'get',
|
||||
url:powerUrlHead+'/font/notice/getUnReadCount?userId='+userId,
|
||||
dataType:'json',
|
||||
sync:false,
|
||||
success:function(data){
|
||||
if(data.code == 100){
|
||||
$("#noticeCount").text(data.extend.unReadCount);
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
//每隔1分钟轮询一次未通知数量
|
||||
setInterval(function () {
|
||||
getNoticeCount();
|
||||
}, 60*1000);
|
||||
//跳转到通知
|
||||
function noticeManage1(noticeId){
|
||||
//noticeId = 'emr_record'为跳转病案管理系统的病案未审批页面
|
||||
var url = '';
|
||||
if(noticeId == 'emr_medical_record'){
|
||||
var approveUrl = $("#approveUrl").val();
|
||||
url = path+approveUrl+"?flag=1";
|
||||
parent.$("#iFrame1").prop("src",url);
|
||||
}else{
|
||||
url = powerUrlHead+"/gatewayPage?noticeId="+noticeId;
|
||||
window.location.href = url;
|
||||
}
|
||||
}
|
||||
|
||||
/*******************************webSocket***********************************/
|
||||
var userId = $("#userId").val();
|
||||
var webSocketUrl = $("#webSocketUrl").val();
|
||||
var strSplit = $("#strSplit").val();
|
||||
var ws = new WebSocket("ws://"+webSocketUrl);
|
||||
ws.onopen = function(){
|
||||
ws.send("emr_medical_record_"+userId);
|
||||
console.log("连接...")
|
||||
}
|
||||
|
||||
//处理服务器发送来的数据
|
||||
ws.onmessage = function(e){
|
||||
var msg = e.data.split(strSplit);
|
||||
narn('warn',msg[0],msg[1],msg[2]);
|
||||
}
|
||||
|
||||
ws.onclose = function(){
|
||||
console.log("连接关闭");
|
||||
}
|
||||
|
||||
ws.onerror = function(){
|
||||
console.log('连接失败');
|
||||
}
|
||||
|
||||
function narn (type,title,text,noticeId) {
|
||||
naranja()[type]({
|
||||
title: title,
|
||||
text: text,
|
||||
timeout: 1000*60,
|
||||
buttons: [{
|
||||
text: '查看详情',
|
||||
click: function (e) {
|
||||
noticeManage1(noticeId)
|
||||
}
|
||||
}]
|
||||
})
|
||||
}
|
||||
</script>
|
||||
@ -1,5 +0,0 @@
|
||||
<html>
|
||||
<body>
|
||||
<h2>Hello World!</h2>
|
||||
</body>
|
||||
</html>
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -0,0 +1,25 @@
|
||||
body, html { font-size: 100%; padding: 0; margin: 0;}
|
||||
|
||||
/* Reset */
|
||||
*,
|
||||
*:after,
|
||||
*:before {
|
||||
-webkit-box-sizing: border-box;
|
||||
-moz-box-sizing: border-box;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
/* Clearfix hack by Nicolas Gallagher: http://nicolasgallagher.com/micro-clearfix-hack/ */
|
||||
.clearfix:before,
|
||||
.clearfix:after {
|
||||
content: " ";
|
||||
display: table;
|
||||
}
|
||||
|
||||
.clearfix:after {
|
||||
clear: both;
|
||||
}
|
||||
|
||||
body{
|
||||
font-family: "Microsoft YaHei","Segoe UI", "Lucida Grande", Helvetica, Arial,sans-serif;
|
||||
}
|
||||
@ -0,0 +1,213 @@
|
||||
.naranja-notification {
|
||||
height: 0;
|
||||
box-sizing: content-box;
|
||||
padding: 10px 0;
|
||||
transition: padding .7s cubic-bezier(0, .5, 0, 1), height .7s
|
||||
cubic-bezier(0, .5, 0, 1)
|
||||
}
|
||||
|
||||
.naranja-notification * {
|
||||
box-sizing: border-box
|
||||
}
|
||||
|
||||
.naranja-notification .narj-log {
|
||||
background-color: #F9F9F9
|
||||
}
|
||||
|
||||
.naranja-notification .narj-log button {
|
||||
border: 1px solid #D2D2D2;
|
||||
background-color: white
|
||||
}
|
||||
|
||||
.naranja-notification .narj-log button:first-of-type {
|
||||
color: #0099E5
|
||||
}
|
||||
|
||||
.naranja-notification .narj-success {
|
||||
background-color: #B8F4BC
|
||||
}
|
||||
|
||||
.naranja-notification .narj-success button {
|
||||
border: 1px solid #6ED69A;
|
||||
background-color: #B8F4BC;
|
||||
opacity: .9;
|
||||
color: #11B674
|
||||
}
|
||||
|
||||
.naranja-notification .narj-success button:first-of-type {
|
||||
opacity: 1
|
||||
}
|
||||
|
||||
.naranja-notification .narj-warn {
|
||||
background-color: #FFDD85
|
||||
}
|
||||
|
||||
.naranja-notification .narj-warn button {
|
||||
border: 1px solid #F5CE69;
|
||||
background-color: #FFDD85;
|
||||
opacity: .9;
|
||||
color: #D9993F
|
||||
}
|
||||
|
||||
.naranja-notification .narj-warn button:first-of-type {
|
||||
opacity: 1
|
||||
}
|
||||
|
||||
.naranja-notification .narj-error {
|
||||
background-color: #ED9286
|
||||
}
|
||||
|
||||
.naranja-notification .narj-error button {
|
||||
border: 1px solid #ED8476;
|
||||
background-color: #ED9286;
|
||||
opacity: .9;
|
||||
color: #C24343
|
||||
}
|
||||
|
||||
.naranja-notification .narj-error button:first-of-type {
|
||||
opacity: 1
|
||||
}
|
||||
|
||||
.naranja-notification .naranja-body-notification {
|
||||
animation: .4s fadeUpIn 1 cubic-bezier(0, .5, 0, 1);
|
||||
position: relative;
|
||||
display: flex;
|
||||
width: 310px;
|
||||
border-radius: 4px;
|
||||
padding: 7px;
|
||||
box-shadow: 0 5px 10px rgba(0, 0, 0, 0.16);
|
||||
margin-bottom: 7px;
|
||||
margin-top: 12px;
|
||||
opacity: 1;
|
||||
transition: opacity .15s ease, marginTop .3s ease, marginBottom .3s ease,
|
||||
padding .3s ease
|
||||
}
|
||||
|
||||
.naranja-notification .naranja-body-notification:hover .naranja-close-icon
|
||||
{
|
||||
opacity: .7
|
||||
}
|
||||
|
||||
.naranja-notification .naranja-body-notification:hover .naranja-close-icon:hover
|
||||
{
|
||||
opacity: 1
|
||||
}
|
||||
|
||||
.naranja-notification .naranja-body-notification>div {
|
||||
display: inline-flex;
|
||||
justify-content: center;
|
||||
align-items: center
|
||||
}
|
||||
|
||||
.naranja-notification .naranja-body-notification .naranja-text-and-title
|
||||
{
|
||||
padding-left: 15px;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
align-items: flex-start
|
||||
}
|
||||
|
||||
.naranja-notification .naranja-body-notification .naranja-text-and-title>p
|
||||
{
|
||||
margin: 5px;
|
||||
font-family: 'Open Sans'
|
||||
}
|
||||
|
||||
.naranja-notification .naranja-body-notification .naranja-text-and-title>div
|
||||
{
|
||||
width: 100%
|
||||
}
|
||||
|
||||
.naranja-notification .naranja-body-notification .naranja-text-and-title>div button
|
||||
{
|
||||
float: right;
|
||||
margin-left: 6px;
|
||||
margin-top: 10px;
|
||||
margin-bottom: 2px;
|
||||
-webkit-appearance: none;
|
||||
-moz-appearance: none;
|
||||
-ms-appearance: none;
|
||||
-o-appearance: none;
|
||||
border-radius: 3px;
|
||||
padding: 2px 11px;
|
||||
font-size: 14px;
|
||||
text-align: center;
|
||||
outline: none;
|
||||
border-width: 1px;
|
||||
box-shadow: 0 2px 4px -2px rgba(0, 0, 0, 0.2);
|
||||
cursor: pointer
|
||||
}
|
||||
|
||||
.naranja-notification .naranja-body-notification .naranja-text-and-title>div button:active
|
||||
{
|
||||
opacity: .7
|
||||
}
|
||||
|
||||
.naranja-notification .naranja-body-notification .naranja-title {
|
||||
font-size: 20px;
|
||||
opacity: 1
|
||||
}
|
||||
|
||||
.naranja-notification .naranja-body-notification .naranja-parragraph {
|
||||
font-size: 14px;
|
||||
opacity: .6;
|
||||
padding-right: 30px;
|
||||
line-height: 1.4em
|
||||
}
|
||||
|
||||
.naranja-close-icon {
|
||||
position: absolute;
|
||||
right: 7px;
|
||||
top: 7px;
|
||||
opacity: 0;
|
||||
cursor: pointer;
|
||||
transition: opacity .25s ease
|
||||
}
|
||||
|
||||
@
|
||||
keyframes fadeUpIn {
|
||||
from {opacity: .2;
|
||||
box-shadow: 0 0 0 rgba(0, 0, 0, 0.5);
|
||||
transform: scale(.95)
|
||||
}
|
||||
|
||||
75%{
|
||||
opacity
|
||||
:
|
||||
1
|
||||
}
|
||||
to {
|
||||
opacity: 1;
|
||||
box-shadow: 0 5px 10px rgba(0, 0, 0, 0.16);
|
||||
transform: scale(1)
|
||||
}
|
||||
|
||||
}
|
||||
.naranja-notification-box {
|
||||
z-index:999;
|
||||
box-sizing: content-box;
|
||||
display: flex;
|
||||
flex-direction: column-reverse;
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
right: 0;
|
||||
width: 315px;
|
||||
height: auto;
|
||||
max-height: 100vh;
|
||||
overflow: auto;
|
||||
padding: 8px;
|
||||
padding-top: 20px
|
||||
}
|
||||
|
||||
.naranja-notification-box .naranja-notification-advice {
|
||||
position: fixed;
|
||||
right: 138px;
|
||||
top: -39px;
|
||||
transform: translateY(0);
|
||||
cursor: pointer;
|
||||
transition: transform .3s ease
|
||||
}
|
||||
|
||||
.naranja-notification-box .naranja-notification-advice.active {
|
||||
transform: translateY(60px)
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue