Skip to content

J
jfV5portal
Commit e58a9dda by 罗绍泽
Options

Merge remote-tracking branch 'origin/develop' into develop 

# Conflicts:
#	WebContent/WEB-INF/conf/gaowj/bl/business-apps.xml
parents f45e4933 1742061b
Showing with 3060 additions and 357 deletions
WebContent/WEB-INF/conf/gaowj/bl/applicationContext-business.xml
......@@ -30,25 +30,41 @@
<!-- 配置初始化大小、最小、最大 -->
<property name="initialSize" value="1" />
<property name="minIdle" value="1" />
<property name="maxActive" value="20" />
<property name="maxActive" value="500" />
<!-- 配置获取连接等待超时的时间 -->
<property name="maxWait" value="60000" />
<!-- 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 -->
<property name="timeBetweenEvictionRunsMillis" value="60000" />
<property name="timeBetweenEvictionRunsMillis" value="60000" />
<!-- 配置一个连接在池中最小生存的时间，单位是毫秒 -->
<property name="minEvictableIdleTimeMillis" value="300000" />
<!-- 超过时间限制是否回收,对于建立时间超过removeAbandonedTimeout的连接强制关闭 -->
<property name="removeAbandoned" value="true" />
<!-- 超过时间限制多长,单位秒 -->
<property name="removeAbandonedTimeout" value="60" />
<!-- 配置一个连接在池中最小生存的时间,单位是毫秒:1分钟 -->
<property name="minEvictableIdleTimeMillis" value="60000" />
<!-- 配置一个连接在池中最长生存的时间,单位是毫秒:5分钟 -->
<property name="maxEvictableIdleTimeMillis" value="300000" />
<!-- 用来检测连接是否有效的sql,要求是一个查询语句 -->
<property name="validationQuery" value="SELECT 'x'" />
<property name="testWhileIdle" value="true" />
<property name="testOnBorrow" value="false" />
<property name="testOnReturn" value="false" />
<!-- 申请连接的时候检测 -->
<property name="testWhileIdle" value="true" />
<!-- 申请连接时执行validationQuery检测连接是否有效,配置为true会降低性能 -->
<property name="testOnBorrow" value="false" />
<!-- 归还连接时执行validationQuery检测连接是否有效,配置为true会降低性能 -->
<property name="testOnReturn" value="false" />
<!-- 连接池中的minIdle数量以内的连接,空闲时间超过minEvictableIdleTimeMillis,则会执行keepAlive操作 -->
<property name="keepAlive" value="true" />
<!-- 打开PSCache，并且指定每个连接上PSCache的大小 -->
<property name="poolPreparedStatements" value="true" />
<property name="maxPoolPreparedStatementPerConnectionSize" value="20" />
<!-- 是否缓存preparedStatement,也就是PSCache。PSCache对支持游标的数据库性能提升巨大,比如说oracle。在mysql下建议关闭 -->
<property name="poolPreparedStatements" value="false" />
<!-- 要启用PSCache,必须配置大于0,当大于0时,poolPreparedStatements自动触发修改为true -->
<property name="maxPoolPreparedStatementPerConnectionSize" value="0" />
<!-- 配置监控统计拦截的filters，去掉后监控界面sql无法统计 -->
<property name="filters" value="stat" />
......@@ -65,25 +81,41 @@
<!-- 配置初始化大小、最小、最大 -->
<property name="initialSize" value="1" />
<property name="minIdle" value="1" />
<property name="maxActive" value="20" />
<property name="maxActive" value="500" />
<!-- 配置获取连接等待超时的时间 -->
<property name="maxWait" value="60000" />
<!-- 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 -->
<property name="timeBetweenEvictionRunsMillis" value="60000" />
<property name="timeBetweenEvictionRunsMillis" value="60000" />
<!-- 超过时间限制是否回收,对于建立时间超过removeAbandonedTimeout的连接强制关闭 -->
<property name="removeAbandoned" value="true" />
<!-- 超过时间限制多长,单位秒 -->
<property name="removeAbandonedTimeout" value="60" />
<!-- 配置一个连接在池中最小生存的时间，单位是毫秒 -->
<property name="minEvictableIdleTimeMillis" value="300000" />
<!-- 配置一个连接在池中最小生存的时间,单位是毫秒:1分钟 -->
<property name="minEvictableIdleTimeMillis" value="60000" />
<!-- 配置一个连接在池中最长生存的时间,单位是毫秒:5分钟 -->
<property name="maxEvictableIdleTimeMillis" value="300000" />
<!-- 用来检测连接是否有效的sql,要求是一个查询语句 -->
<property name="validationQuery" value="SELECT 'x'" />
<property name="testWhileIdle" value="true" />
<property name="testOnBorrow" value="false" />
<property name="testOnReturn" value="false" />
<!-- 申请连接的时候检测 -->
<property name="testWhileIdle" value="true" />
<!-- 申请连接时执行validationQuery检测连接是否有效,配置为true会降低性能 -->
<property name="testOnBorrow" value="false" />
<!-- 归还连接时执行validationQuery检测连接是否有效,配置为true会降低性能 -->
<property name="testOnReturn" value="false" />
<!-- 打开PSCache，并且指定每个连接上PSCache的大小 -->
<property name="poolPreparedStatements" value="true" />
<property name="maxPoolPreparedStatementPerConnectionSize" value="20" />
<!-- 连接池中的minIdle数量以内的连接,空闲时间超过minEvictableIdleTimeMillis,则会执行keepAlive操作 -->
<property name="keepAlive" value="true" />
<!-- 是否缓存preparedStatement,也就是PSCache。PSCache对支持游标的数据库性能提升巨大,比如说oracle。在mysql下建议关闭 -->
<property name="poolPreparedStatements" value="false" />
<!-- 要启用PSCache,必须配置大于0,当大于0时,poolPreparedStatements自动触发修改为true -->
<property name="maxPoolPreparedStatementPerConnectionSize" value="0" />
<!-- 配置监控统计拦截的filters，去掉后监控界面sql无法统计 -->
<property name="filters" value="stat" />
......@@ -100,25 +132,41 @@
<!-- 配置初始化大小、最小、最大 -->
<property name="initialSize" value="1" />
<property name="minIdle" value="1" />
<property name="maxActive" value="20" />
<property name="maxActive" value="500" />
<!-- 配置获取连接等待超时的时间 -->
<property name="maxWait" value="60000" />
<!-- 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 -->
<property name="timeBetweenEvictionRunsMillis" value="60000" />
<property name="timeBetweenEvictionRunsMillis" value="60000" />
<!-- 超过时间限制是否回收,对于建立时间超过removeAbandonedTimeout的连接强制关闭 -->
<property name="removeAbandoned" value="true" />
<!-- 配置一个连接在池中最小生存的时间，单位是毫秒 -->
<property name="minEvictableIdleTimeMillis" value="300000" />
<!-- 超过时间限制多长,单位秒 -->
<property name="removeAbandonedTimeout" value="60" />
<!-- 配置一个连接在池中最小生存的时间,单位是毫秒:1分钟 -->
<property name="minEvictableIdleTimeMillis" value="60000" />
<!-- 配置一个连接在池中最长生存的时间,单位是毫秒:5分钟 -->
<property name="maxEvictableIdleTimeMillis" value="300000" />
<!-- 用来检测连接是否有效的sql,要求是一个查询语句 -->
<property name="validationQuery" value="SELECT 'x'" />
<property name="testWhileIdle" value="true" />
<property name="testOnBorrow" value="false" />
<property name="testOnReturn" value="false" />
<!-- 申请连接的时候检测 -->
<property name="testWhileIdle" value="true" />
<!-- 申请连接时执行validationQuery检测连接是否有效,配置为true会降低性能 -->
<property name="testOnBorrow" value="false" />
<!-- 归还连接时执行validationQuery检测连接是否有效,配置为true会降低性能 -->
<property name="testOnReturn" value="false" />
<!-- 连接池中的minIdle数量以内的连接,空闲时间超过minEvictableIdleTimeMillis,则会执行keepAlive操作 -->
<property name="keepAlive" value="true" />
<!-- 打开PSCache，并且指定每个连接上PSCache的大小 -->
<property name="poolPreparedStatements" value="true" />
<property name="maxPoolPreparedStatementPerConnectionSize" value="20" />
<!-- 是否缓存preparedStatement,也就是PSCache。PSCache对支持游标的数据库性能提升巨大,比如说oracle。在mysql下建议关闭 -->
<property name="poolPreparedStatements" value="false" />
<!-- 要启用PSCache,必须配置大于0,当大于0时,poolPreparedStatements自动触发修改为true -->
<property name="maxPoolPreparedStatementPerConnectionSize" value="0" />
<!-- 配置监控统计拦截的filters，去掉后监控界面sql无法统计 -->
<property name="filters" value="stat" />
......
WebContent/WEB-INF/conf/gaowj/bl/business-apps.xml
......@@ -22,6 +22,7 @@
<value>classpath:com/jw/app/business/userchoice/userchoiceDAO.xml</value>
<value>classpath:com/jw/app/business/calendar/calendarDAO.xml</value>
<value>classpath:com/jw/app/business/portal/role/appsRoleDAO.xml</value>
<value>classpath:com/jw/app/business/vote/voteDAO.xml</value>
</list>
</property>
</bean>
......@@ -80,6 +81,10 @@
<property name="mapperInterface" value="com.jw.app.business.portal.role.appsRoleDAO"/>
<property name="sqlSessionFactory" ref="sqlSessionFactory-apps"/>
</bean>
<bean id="voteDAO" class="org.mybatis.spring.mapper.MapperFactoryBean">
<property name="mapperInterface" value="com.jw.app.business.vote.voteDAO"/>
<property name="sqlSessionFactory" ref="sqlSessionFactory-apps"/>
</bean>
<!-- BusinessInterFace -->
<bean id="PortletBusiness"
class="com.jw.app.business.portlet.PortletBusinessImpl">
......@@ -126,6 +131,11 @@
class="com.jw.app.business.calendar.CalendarBusinessImpl">
<property name="calendarDAO" ref="calendarDAO"/>
</bean>
<bean id="VoteBusiness"
class="com.jw.app.business.vote.VoteBusinessImpl">
<property name="voteDAO" ref="voteDAO"/>
</bean>
<!-- DAO -->
<bean id="portletDAO" class="org.mybatis.spring.mapper.MapperFactoryBean">
......
WebContent/custom/js/layout4.js
......@@ -33,7 +33,7 @@ function init_index_nav(){
text.attr('href',data[i].REMARK);
//如果是当前页的页面时则添加一个样式
var hrefArray=location.href;
if(text[0].href==hrefArray){
if(text[0].href==hrefArray||hrefArray==text[0].href+'Detail'){
text.addClass('layout_center_navClick');
}
container.append(text);
......@@ -68,4 +68,76 @@ function IEVersion() {
}else{
return -1;//不是ie浏览器
}
}
/**
* 文件下载
* @returns {Boolean}
*/
function fileDownloadURL(uploadnew,uploadpath,uploadold,uuid,downloadURL){
if(downloadURL == '' || downloadURL == null || downloadURL == 'undefined'){
fileDownload(uploadnew,uploadpath,uploadold,uuid);
}else{
var form=$("<form>");//定义一个form表单
form.attr("style","display:none");
form.attr("target","");
form.attr("method","post");
form.attr("action",downloadURL);
var input1=$("<input>");
input1.attr("type","hidden");
input1.attr("name","uploadnew");
input1.attr("value",uploadnew);
var input2=$("<input>");
input2.attr("type","hidden");
input2.attr("name","uploadpath");
input2.attr("value",uploadpath);
var input3=$("<input>");
input3.attr("type","hidden");
input3.attr("name","uploadold");
input3.attr("value",uploadold);
var input4=$("<input>");
input4.attr("type","hidden");
input4.attr("name","uuid");
input4.attr("value",uuid);
$("#disk_upload").append(form);
form.append(input1);
form.append(input2);
form.append(input3);
form.append(input4);
form.submit();//表单提交
}
}
/**
* 文件下载
* @returns {Boolean}
*/
function fileDownload(uploadnew,uploadpath,uploadold,uuid){
var form=$("<form>");//定义一个form表单
form.attr("style","display:none");
form.attr("target","");
form.attr("method","post");
form.attr("action","uploadFileAct_download");
var input1=$("<input>");
input1.attr("type","hidden");
input1.attr("name","uploadnew");
input1.attr("value",uploadnew);
var input2=$("<input>");
input2.attr("type","hidden");
input2.attr("name","uploadpath");
input2.attr("value",uploadpath);
var input3=$("<input>");
input3.attr("type","hidden");
input3.attr("name","uploadold");
input3.attr("value",uploadold);
var input4=$("<input>");
input4.attr("type","hidden");
input4.attr("name","uuid");
input4.attr("value",uuid);
$("#disk_upload").append(form);
form.append(input1);
form.append(input2);
form.append(input3);
form.append(input4);
form.submit();//表单提交
}
\ No newline at end of file
WebContent/gaowj/header-simple-1.0.jsp
......@@ -3,7 +3,7 @@
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="fn" uri="/WEB-INF/tld/functions.tld" %>
<%@ taglib uri="/struts-tags" prefix="s" %>
<%@ page language="java" import="java.util.Map,java.util.Date,java.text.SimpleDateFormat" pageEncoding="utf-8"%>
<%@ page language="java" import="java.util.Map" pageEncoding="utf-8"%>
<c:set var="ctx" value="${pageContext.request.contextPath}"/>
<%
String localPath = request.getContextPath();
......@@ -20,9 +20,9 @@
String emdepart = (String)sessionUser.get("EMDEPART");//用户单位ID
String emdepartname = (String)sessionUser.get("EMDEPARTNAME");//用户单位名称
String emname = (String)sessionUser.get("EMNAME");//用户姓名
Date beforetime = (Date)sessionUser.get("BEFORETIME");//上次登录时间
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String beforetime_s = formatter.format(beforetime);
String beforetime = (String)sessionUser.get("BEFORETIME");//上次登录时间
String beforetime_s = beforetime;
String loginip = (String)sessionUser.get("LOGINIP");//登录IP
//
%>
......
WebContent/jfcas04/css/common.css
......@@ -996,6 +996,7 @@ a{
text-align: center;
padding-top:22px;
cursor: pointer;
padding-bottom: 25px;
}
.disk_content_header>div:first-child span{
margin:0 15px 0 5px;
......@@ -1162,6 +1163,35 @@ a{
font-size:16px;
margin-right:-1px;
}
.disk_move_search{
margin: 10px 5px 3px;
}
.disk_move_search>input{
outline:none;
border:1px solid #f2f2f2;
border-radius: 4px;
height: 30px;
line-height: 28px;
padding-left:6px;
color:#bbb;
width:70%;
}
.disk_move_search>span{
border:1px solid #f2f2f2;
height: 30px;
line-height: 28px;
color:#333;
display: inline-block;
width:25%;
margin-left:5%;
vertical-align: bottom;
text-align:center;
cursor: pointer;
border-radius: 4px;
}
.disk_move_search>span:hover{
background: #f3f3f3;
}
.disk_move_btn{
height:40px;
line-height:40px;
......@@ -1386,7 +1416,7 @@ a{
color:#333;
border-top: 1px solid #f3f0f0;
}
.disk_rubbishBtn,.disk_shareCodeBtn{
.disk_rubbishBtn,.disk_shareCodeBtn,.disk_enjoyBtn{
display: none;
}
.disk_createShare{
......@@ -1661,9 +1691,250 @@ a{
text-decoration: underline;
color:#3b8cff;
}
/***************成功的提示样式**********/
.layout_success_message{
position: fixed;
top:233px;
right:0;
width: 500px;
display:none;
}
.layout_success_message>button+span{
font-weight: bold;
font-size: 18px;
margin-right:5px;
line-height:21px;
}
/**********************办事大厅的样式************/
.office_bg{
background: url(../../custom/images/office_bg.png);
height:355px;
background-size: cover;
}
.office_bg_content{
font-size:0px;
margin:50px 0 0;
text-align: center;
padding:0 5%;
}
.office_bg_content>div{
padding:0 25px;
}
.office_bg_content>div>div{
background: rgba(0,0,0,0.5);
height:215px;
max-width: 248px;
margin: auto;
border-radius:15px;
cursor: pointer;
}
.office_bg_content>div>div:hover{
background:#2474a9;
}
.office_bg_content img{
margin:25px 0 30px;
}
.office_bg_content_click{
background:#2474a9 !important;
}
.office_bg_content>div>div>div{
font-size:20px;
color:white;
}
.office_module{
padding: 0 5%;
margin:auto;
margin-top:-42px;
}
.office_module_title{
background:white;
height:42px;
border-top:3px solid #2474a9;
border-bottom:1px solid #ccc;
line-height: 38px;
color:#333;
padding:0;
}
.office_module_title>img{
margin:0 3px 0 10px;
vertical-align: sub;
}
.office_module_title>img+span{
font-weight:bold;
}
.office_module_title>a{
float:right;
margin-right:30px;
color:#06B8D6;
}
.office_module_title>a:hover{
text-decoration: underline !important;
}
.office_module_title>div{
float: right;
margin-right:30px;
width: 214px;
height:26px;
border:1px solid #ccc;
border-radius: 13px;
line-height:24px;
margin-top:6px;
}
.office_module_title>div>input{
height:24px;
line-height:24px;
border:0;
width:178px;
outline:none;
margin-left:10px;
}
.office_module_title>div>img{
padding:5px;
vertical-align: bottom;
cursor:pointer;
}
.office_apply{
padding:0;
height:302px;
}
.office_apply_content{
padding:30px 15px 0;
box-shadow:0px 1px 3px #ccc;
font-size:0px;
}
.office_apply_content>div{
display:inline-block;
width:11.11%;
padding:0 15px;
margin-bottom:30px;
}
.office_apply_content>div>div{
padding: 15% 10px;
width:100%;
color:white;
font-size:14px;
border-radius:5px;
text-align: center;
display: table;
max-width:106px;
margin:auto;
cursor: pointer;
}
.office_apply_content>div>div>div{
height:60px;
display: table-cell;
vertical-align: middle;
line-height: 20px;
}
.office_examine{
padding:0;
}
.office_examine_tilte{
margin-left:17px;
cursor: pointer;
}
.office_examine_tilte:hover{
color:#06B8D6;
text-decoration: underline;
}
/*******************修改办事大厅的table的样式*************/
.office_table .table{
border-bottom:0px;
font-size: 14px;
}
.office_examine .table>tbody>tr>td,.office_table .table>tbody>tr>th,.office_table .table>tfoot>tr>td,.office_table .table>tfoot>tr>th,.office_table .table>thead>tr>td,.office_table .table>thead>tr>th{
border-top:0px;
}
.office_table .fixed-table-container tbody td{
border-left:0px;
}
.office_table .fixed-table-container{
border:0px;
}
.office_table thead{
display:none !important;
}
.office_table .fixed-table-body{
height: 360px;
box-shadow: inset 0px -1px 1px #ccc;
}
/**************办事大厅的详情**************************/
.officeDetail_bg{
background: url(../../custom/images/officeDetail_bg.png);
height:150px;
background-size: cover;
}
.officeDetail_content{
padding:0 5%;
}
.officeDetail_content_title{
height:65px;
border-bottom:1px solid #bbb;
text-align: center;
padding:0 20px;
}
.officeDetail_content_title>span{
font-size: 24px;
color:#333;
line-height:65px;
}
.officeDetail_content_title>span+div{
float:left;
color:#08B9D5;
margin-top:30px;
cursor: pointer;
}
.officeDetail_content_title>span+div>img{
margin-right:5px;
vertical-align: sub;
}
.officeDetail_content_title>span+div+div{
float:right;
margin-top:30px;
color:#999;
}
.officeDetail_content_title>span+div+div>span:first-child{
color:red;
margin-right:3px;
vertical-align: sub;
}
.officeDetail_content_div{
padding:0;
}
.officeDetail_flow{
background: #f3f3f3;
height:10px;
position: relative;
}
.officeDetail_flow_toggole{
width:54px;
height:25px;
line-height:25px;
color:#bbb;
float:right;
border-radius:3px 3px 0 0;
background: #f3f3f3;
text-align: center;
right:5%;
margin-top: -25px;
cursor: pointer;
font-size:12px;
position: absolute;
z-index: 2;
}
.officeDetail_flow_toggole:hover{
background: #e5e5e5 !important;
}
.officeDetail_flow_toggole>img{
margin-right:5px;
margin-top: -2px;
}
.officeDetail_flow_content{
height:0;
overflow: auto;
line-height: 14px;
padding:0;
}
......
WebContent/jfcas04/disk.jsp
......@@ -7,6 +7,10 @@
<jsp:include page="header.jsp"></jsp:include>
<script type="text/javascript" src="${pageContext.request.contextPath}/jwapp/pages/portlet/js/jwAppPortletModule.js" charset="utf-8"></script>
<script type="text/javascript" src="${pageContext.request.contextPath}/jwapp/pages/storepersonal/js/storePersonalModule.js" charset="utf-8"></script>
<script type="text/javascript" src="${pageContext.request.contextPath}/jwapp/pages/store/js/storeModule.js" charset="utf-8"></script>
<script type="text/javascript" src="${pageContext.request.contextPath}/jwapp/pages/storeshare/js/storeShareModule.js" charset="utf-8"></script>
<script type="text/javascript" src="${pageContext.request.contextPath}/jwapp/pages/user/js/jwAppUserModule.js" charset="utf-8"></script>
<script type="text/javascript" src="${pageContext.request.contextPath}/jwapp/pages/storepartook/js/storePartookModule.js" charset="utf-8"></script>
<script src="${ctx}/jfcas04/js/disk.js"></script>
</head>
<body>
......@@ -16,13 +20,13 @@
<!-- 内容部分 -->
<div class="disk_container container-fluid">
<div class="row disk_search">
<div class="col-md-3">
<div class="col-md-3" onclick="location.href='disk'"><img src="${ctx}/custom/images/disk_home.png" wdith="14" height="14" /><span>|</span></div>
<div class="col-md-3" id="disk_backFolder_prev" onclick="disk_backFolder_prev(this)"><img src="${ctx}/custom/images/disk_last.png" wdith="14" height="14" /><span>|</span></div>
<div class="col-md-3" id="disk_backFolder_next" onclick="disk_backFolder_next(this)"><img src="${ctx}/custom/images/disk_next.png" wdith="14" height="14" /><span>|</span></div>
<div id="disk_rubbish" class="col-md-3" onclick="disk_rubbish()"><img src="${ctx}/custom/images/disk_circle.png" wdith="14" height="14" /></div>
<div class="col-md-2">
<div class="col-md-6" onclick="location.href='disk'"><img src="${ctx}/custom/images/disk_home.png" wdith="14" height="14" /><span>|</span></div>
<%-- <div class="col-md-3" id="disk_backFolder_prev" onclick="disk_backFolder_prev(this)"><img src="${ctx}/custom/images/disk_last.png" wdith="14" height="14" /><span>|</span></div>
<div class="col-md-3" id="disk_backFolder_next" onclick="disk_backFolder_next(this)"><img src="${ctx}/custom/images/disk_next.png" wdith="14" height="14" /><span>|</span></div> --%>
<div id="disk_rubbish" class="col-md-6" onclick="disk_rubbish()"><img src="${ctx}/custom/images/disk_circle.png" wdith="14" height="14" /></div>
</div>
<div class="col-md-6">
<div class="col-md-7">
<div class="disk_search_center">
<a href="disk"><span class="glyphicon glyphicon-folder-close"></span><span>我的网盘</span><span class="glyphicon glyphicon-triangle-right"></span></a>
<!-- <a onclick="disk_backFolder(this)"><span class="glyphicon glyphicon-folder-close"></span><span>我的网盘</span><span class="glyphicon glyphicon-triangle-right"></span></a> -->
......@@ -50,6 +54,7 @@
<a class="disk_rubbishBtn disk_document_default" href="javascript:disk_reductionFolder()"><img src="/jfV5portal/custom/images/disk_return.png" width="16" height="16"><span>还原文件</span></a>
<a class="disk_rubbishBtn disk_document_default" href="javascript:disk_thoroughDeleteFolder()"><img src="/jfV5portal/custom/images/disk_thoroughDelete.png" width="16" height="16"><span>彻底删除</span></a>
<a class="disk_shareCodeBtn disk_document_default" href="javascript:disk_cancelShareCode()"><img src="/jfV5portal/custom/images/disk_cancelShare.png" width="14" height="14"><span>取消分享</span></a>
<a class="disk_enjoyBtn disk_document_default" href="javascript:disk_cancelEnjoy()"><img src="/jfV5portal/custom/images/disk_cancelShare.png" width="14" height="14"><span>取消共享</span></a>
</div>
<div class="col-md-1"><span onclick="disk_content_toggle(this)" class="disk_content_toggleBtn glyphicon glyphicon-th-large" title="切换到列表模式"></span></div>
</div>
......@@ -163,6 +168,7 @@
<li onclick="disk_downFolder(this)" class="disk_menu_clickBtn">下载</li>
<li onclick="disk_moveFolder(this)" class="disk_menu_clickBtn">移动到</li>
<li onclick="disk_enjoyFolder(this)" class="disk_menu_clickBtn">共享</li>
<li onclick="disk_cancelEnjoy(this)" class="disk_menu_clickBtn" style="display:none;">取消共享</li>
</ul>
</div>
......@@ -225,6 +231,14 @@
</div>
</div>--%>
<div id="disk_upload" style="display:none;"></div>
<!-- 操作之后的提示 -->
<div class="alert alert-success alert-dismissible layout_success_message" role="alert">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<span>Success!</span><span>成功提示!</span>
</div>
<!-- 尾部 -->
<jsp:include page="/footer.jsp"></jsp:include>
</body>
......
WebContent/jfcas04/header.jsp
......@@ -13,8 +13,6 @@
<link rel="stylesheet" type="text/css" href="${ctx}/lib/plug/fancyBox-2.1.5/source/jquery.fancybox.css" media="screen">
<!-- ztree的css -->
<link rel="stylesheet" href="${ctx}/lib/plug/zTree/css/zTreeStyle/zTreeStyle.css" type="text/css">
<!-- jquery ui的css -->
<!-- <link rel="stylesheet" href="lib/plug/jqueryUi/jquery-ui-1.12.1.custom/jquery-ui.css" type="text/css"> -->
<link rel="stylesheet" href="${ctx}/lib/plug/jqueryUi/jquery-ui-1.10.4/themes/base/jquery-ui.css">
<!-- xcConfirm的css -->
<link rel="stylesheet" href="${ctx}/lib/plug/xcConfirm/css/xcConfirm.css">
......@@ -23,12 +21,9 @@
<!-- fullcalendar(日历)的css -->
<link href='${ctx}/lib/plug/fullcalendar/fullcalendar.min.css' rel='stylesheet' />
<link href='${ctx}/lib/plug/fullcalendar/fullcalendar.print.min.css' rel='stylesheet' media='print' />
<!-- easyui的css -->
<%-- <link rel="stylesheet" href="${ctx}/lib/plug/jquery-easyui-1.5.3/themes/default/easyui.css" type="text/css"></link> --%>
<link rel="stylesheet" href="${ctx}/lib/plug/jquery-easyui-1.5.3/themes/icon.css" type="text/css"></link>
<script type="text/javascript" src="${ctx}/lib/js/jquery-1.11.1.min.js"></script>
<!-- <script src="lib/js/jquery-1.11.1.min.js"></script> -->
<!-- fancyBox的js -->
<script type="text/javascript" src="${ctx}/lib/plug/fancyBox-2.1.5/source/jquery.fancybox.js"></script>
......@@ -62,9 +57,6 @@
<script type="text/javascript" src="${ctx}/lib/plug/jqueryColour/spectrum.js"></script>
<!-- mydate97的js -->
<script src='${ctx}/lib/plug/My97DatePicker/WdatePicker.js'></script>
<!-- easyui的js -->
<%-- <script type="text/javascript" src="${ctx}/lib/plug/jquery-easyui-1.5.3/jquery.easyui.min.js"></script>
<script type="text/javascript" src="${ctx}/lib/plug/jquery-easyui-1.5.3/locale/easyui-lang-zh_CN.js"></script> --%>
<!-- 调用api时的js -->
<script type="text/javascript" src="${ctx}/jwapp/common/js/lang_json.js"></script>
<!-- bootstrap的js -->
......
WebContent/jfcas04/js/disk.js
......@@ -159,7 +159,7 @@ function disk_addFolder(handler){
//列表的添加文件
function disk_addFolder_list(){
var date = $.jfbrother.dateToStr('yyyy-MM-dd');
var list_data = {UUID:'',UPDATE_TIME:date,FILE_NAME:'新建文件夹',fileImg:'disk_module5_close.png',FILE_TYPE:'folder',FILE_SIZE:0};
var list_data = {UUID:'',UPDATE_TIME:date,FILE_NAME:'新建文件夹',fileImg:'disk_module5_close.png',FILE_TYPE:'folder',FILE_SIZE:0,apiIndex:'0'};
//跳到第一页
//$('#disk_content_list').bootstrapTable('selectPage', 1); //Jump to the first page
......@@ -191,7 +191,7 @@ function disk_addFolder_list(){
//缩略图的添加文件夹
function disk_addFolder_lump(){
var lump_data = {FILE_NAME:'新建文件夹',fileImg:'disk_module5_close.png',FILE_TYPE:'folder',FILE_SIZE:'0'};
var lump_data = {FILE_NAME:'新建文件夹',fileImg:'disk_module5_close.png',FILE_TYPE:'folder',FILE_SIZE:'0',apiIndex:'0'};
var $disk_content_lump = $('.disk_content_lump');
var $create_container = $('<div></div>').addClass('col-md-2');
$disk_content_lump.append($create_container);
......@@ -227,7 +227,7 @@ function disk_click_div_edit(handler){
var lump_data = $(handler).parent().data('lump_data');
if($(handler).parent().hasClass('disk_content_lump_click')){
//如果是公司文件或者是共享文件时,则不做编辑操作,直接是双击点击去的效果
if(lump_data.FILE_TYPE=='folder_company'||lump_data.FILE_TYPE=='folder_share'){
if(lump_data.apiIndex=='1'||lump_data.apiIndex=='2'){
disk_lump_dbClick($(handler).parent());
}
else{
......@@ -255,6 +255,7 @@ function disk_input_blur(handler){
disk_find_folder($(handler),input_val);
var count = $(handler).data('count');
count==0?input_val=input_val:input_val=input_val+'('+ count +')';
//给input和div赋值
$(handler).prev().show().text(input_val);
$(handler).val(input_val)
//如果值存在那就表示是修改操作,否则是添加操作
......@@ -266,8 +267,7 @@ function disk_input_blur(handler){
FIELD_UUID:lump_data.UUID,
FIELD_FILE_NAME:input_val,
FIELD_FATHER_ID:lump_data.FATHER_ID,
FIELD_ISFILE:lump_data.ISFILE,
FIELD_OLD_FILE_NAME:lump_data.FILE_NAME
FIELD_ISFILE:lump_data.ISFILE
});
}
else{
......@@ -284,7 +284,7 @@ function disk_input_blur(handler){
}
var uuid = $.jfbrother.uuid();
var date = $.jfbrother.dateToStr('yyyy-MM-dd');
var list_lump_data = {UUID:uuid,FILE_NAME:input_val,FILE_TYPE:'folder',FILE_SIZE:0,UPDATE_TIME:date,FATHER_ID:parentId,FIELD_ISFILE:'0'};
var list_lump_data = {apiIndex:'0',UUID:uuid,FILE_NAME:input_val,FILE_TYPE:'folder',FILE_SIZE:0,UPDATE_TIME:date,FATHER_ID:parentId,FIELD_ISFILE:'0'};
var insert_result = storePersonalModule.storePersonalActAction.insertStorePersonal({
FIELD_UUID:uuid,
FIELD_MODULE_ID : '3',
......@@ -361,6 +361,7 @@ function disk_lump_click(handler){
function disk_lump_dbClick(handler){
//文件的数据
var lump_data = $(handler).data('lump_data');
//console.log(lump_data)
//重新渲染块状
disk_dbClick_custom($(handler).find('input'),lump_data,function(infos){
//先清空容器
......@@ -371,24 +372,63 @@ function disk_lump_dbClick(handler){
}
}
//没文件时的显示
else{
var $disk_content_lump = $('.disk_content_lump');
var $no_file_content = $('<div></div>').addClass('disk_content_lump_noFile');
var $no_file_img = $('<img src='+ctx+'/custom/images/disk_lump_noFile.png width="131" height="116" />');
var $no_file_text = $('<p></p>').text('超大空间等你来填满,快来上传吧~');
var $no_file_btn = $('<p><span onclick="disk_uploadFolder()">上传文件</span></p>');
$disk_content_lump.append($no_file_content);
$no_file_content.append($no_file_img).append($no_file_text).append($no_file_btn);
else{
//初始化没文件的显示
init_disk_lump_noFile(lump_data);
}
});
//如果是公司文件时,则隐藏所有的按钮
if(lump_data.FILE_TYPE=='folder_company'){
$('.disk_content_header>div:first-child>a').hide();
//显示下载按钮
$('.disk_content_header>div:first-child>a').eq(1).show();
}
else if(lump_data.FILE_TYPE=='folder_share'){
//显示取消共享的按钮
$('.disk_content_header>div:first-child>a').hide();
$('.disk_enjoyBtn').show();
}
}
//初始化块状没文件的显示
function init_disk_lump_noFile(lump_data){
var $disk_content_lump = $('.disk_content_lump');
var $no_file_content = $('<div></div>').addClass('disk_content_lump_noFile');
var $no_file_img = $('<img src='+ctx+'/custom/images/disk_lump_noFile.png width="131" height="116" />');
var $no_file_text;
var $no_file_btn;
//如果是回收站处理没文件时
if($('#disk_rubbish').data('rubbish')){
$no_file_text = $('<p></p>').text('暂无删除数据~');
}
//如果是分享码处理没文件时
if(lump_data){
//如果是公司文件时
if(lump_data.apiIndex=='1'){
$no_file_text = $('<p></p>').text('暂无数据~');
}
//如果是共享文件时
else if(lump_data.apiIndex=='2'){
$no_file_text = $('<p></p>').text('暂无共享数据~');
}
//如果为普通文件时
else{
$no_file_text = $('<p></p>').text('超大空间等你来填满,快来上传吧~');
$no_file_btn = $('<p><span onclick="disk_uploadFolder()">上传文件</span></p>');
}
}
$disk_content_lump.append($no_file_content);
$no_file_content.append($no_file_img).append($no_file_text).append($no_file_btn);
};
//把自身的uuid当做parentId来查找下面的子目录,不穿则表示查找跟节点,获得的可以是回收站可以是正常文件delete_flag 1为回收站的文件,0是正常文件
function init_disk_infos(delete_flag,lump_data){
var infos;
//如果没传入值,表示是查找根目录
if(!lump_data){
infos = storePersonalModule.storePersonalDataAction.list_storePersonalnofile().rowSet;
infos = storePersonalModule.storePersonalDataAction.listAll_storePersonalnofile().rowSet;
var results = [];
//把重复的parentId!=A的过滤掉,以及带有删除标识的判断下
for( var i = 0 ; i < infos.length ; i ++){
......@@ -403,38 +443,94 @@ function init_disk_infos(delete_flag,lump_data){
}
}
}
//做个一个标识,来标识是要调用哪个api
for(var i = 0 ; i < results.length;i++ ){
results[i].apiIndex = '0';
}
if(delete_flag=='0'){
//把公司文件和共享文件写死
var default_infos = [
{UUID:'A',FILE_NAME:'公司文件',UPDATE_TIME:'',FILE_TYPE:'folder_company',FILE_SIZE:0},
{UUID:'B',FILE_NAME:'共享文件',UPDATE_TIME:'',FILE_TYPE:'folder_share',FILE_SIZE:0},
{UUID:'B',FILE_NAME:'公司文件',UPDATE_TIME:'',FILE_TYPE:'folder_company',FILE_SIZE:0,apiIndex:'1',ISFILE:'0'},
{UUID:'C',FILE_NAME:'共享文件',UPDATE_TIME:'',FILE_TYPE:'folder_share',FILE_SIZE:0,apiIndex:'2',ISFILE:'0'},
];
results = default_infos.concat(results);
}
return results;
}
if(lump_data.FILE_TYPE=="folder_company"){
//如果是公司文件时
console.log(lump_data)
if(lump_data.apiIndex=='1'){
//如果uuid==B的时候为根节点
if(lump_data.UUID=='B'){
infos = storeModule.storeDataAction.list_storenofile().rowSet;
}
//否则为其子节点
else{
infos = storeModule.storeDataAction.list_storenofile({
FIELD_FATHER_ID:lump_data.UUID
}).rowSet;
}
//做个一个标识,来标识是要调用哪个api
for(var i = 0 ; i < infos.length;i++ ){
infos[i].apiIndex = '1';
}
}
else if(lump_data.FILE_TYPE=="folder_share"){
else if(lump_data.apiIndex=='2'){
//如果是共享文件时
alert(2)
//如果uuid==C的时候为根节点
if(lump_data.UUID=='C'){
infos = [];
var storeShare_list = storeShareModule.storeShareDataAction.list().rowSet;
//先获得共享的数据,再根据FILE_UUID去查找普通文件信息
for(var i = 0 ; i < storeShare_list.length;i++ ){
var v_query = {} ;
v_query.FIELD_UUID=storeShare_list[i].FILE_UUID;
var result_storeShare_list = storePersonalModule.storePersonalDataAction.listAll_storePersonalnofile(v_query).rowSet;
//把共享中的FILE_UUID,CREATE_NAME,CREATOR_ID,SHARE_ID,SHARE_NAME,SHARE_TIME保留下来
result_storeShare_list[0].FILE_UUID = storeShare_list[i].UUID;
result_storeShare_list[0].CREATE_NAME = storeShare_list[i].CREATE_NAME;
result_storeShare_list[0].CREATOR_ID = storeShare_list[i].CREATOR_ID;
result_storeShare_list[0].SHARE_ID = storeShare_list[i].SHARE_ID;
result_storeShare_list[0].SHARE_NAME = storeShare_list[i].SHARE_NAME;
result_storeShare_list[0].SHARE_TIME = storeShare_list[i].SHARE_TIME;
infos.push(result_storeShare_list[0]);
}
}
else{
infos = storePersonalModule.storePersonalDataAction.listAll_storePersonalnofile({
FIELD_FATHER_ID:lump_data.UUID
}).rowSet;
//遍历下给每个数据加上共享信息
for(var i = 0;i<infos.length;i++){
//用索引i来区别下,不然会出现同一个FILE_UUID
infos[i].FILE_UUID=lump_data.FILE_UUID + i ;
infos[i].CREATE_NAME=lump_data.CREATE_NAME;
infos[i].CREATOR_ID=lump_data.CREATOR_ID;
infos[i].SHARE_ID=lump_data.SHARE_ID;
infos[i].SHARE_NAME=lump_data.SHARE_NAME;
infos[i].SHARE_TIME=lump_data.SHARE_TIME;
}
}
//做个一个标识,来标识是要调用哪个api
for(var i = 0 ; i < infos.length;i++ ){
infos[i].apiIndex = '2';
}
}
else{
//如果是普通文件时
infos = storePersonalModule.storePersonalDataAction.list_storePersonalnofile({
infos = storePersonalModule.storePersonalDataAction.listAll_storePersonalnofile({
FIELD_FATHER_ID:lump_data.UUID
}).rowSet;
//把删除后的文件去掉
for( var i = 0 ; i < infos.length ; i ++){
if(infos[i].DELETE_FLAG!=delete_flag){
infos.splice(i,1);
//做个一个标识,来标识是要调用哪个api
infos[i].apiIndex = '0';
}
}
}
return infos;
}
......@@ -443,6 +539,7 @@ function init_disk_contextmenu(){
$('.disk_content_lump,.disk_content_list').bind('contextmenu',function(e){
var $disk_menu;
var lump_data;
if($('#disk_rubbish').data('rubbish')){
$disk_menu = $('#disk_rubbish_menu');
}
......@@ -465,19 +562,22 @@ function init_disk_contextmenu(){
if($(e.target).hasClass('fixed-table-body')){
//去掉之前选中的列
//$('#disk_content_list').bootstrapTable('uncheckAll');
$disk_menu.find('.disk_menu_noClickBtn').removeClass('disk_menu_noClick');
$disk_menu.find('.disk_menu_clickBtn').addClass('disk_menu_noClick');
var a_length = $('.disk_search_center>a').eq(1).length;
if(a_length!=0){
lump_data = $('.disk_search_center>a').eq(1).data('lump_data');
}
}
//点击文件夹
else if($(e.target).parents('tbody').length==1){
//点击列表没有数据时则返回
if($(e.target).parents('tbody').find('.no-records-found').length==1){
return false;
}
//去掉之前选中的列
$('#disk_content_list').bootstrapTable('uncheckAll');
$('#disk_content_list').bootstrapTable('uncheckAll');
//选中当前的列
$('#disk_content_list').bootstrapTable('check',$(e.target).parents('tr').data('index'));
var lump_data = $(e.target).parents('tr').find('.disk_content_list_fileName>div').eq(1).data('lump_data');
//菜单的显示
init_disk_menu_toggle($disk_menu,lump_data);
lump_data = $(e.target).parents('tr').find('.disk_content_list_fileName>div').eq(1).data('lump_data');
}
//点击了分页和table的头部
else if($(e.target).parents('thead').length==1||$(e.target).hasClass('fixed-table-pagination')||$(e.target).parents('.fixed-table-pagination').length==1){
......@@ -487,21 +587,24 @@ function init_disk_contextmenu(){
//如果是缩略图的模式时
else{
//右键时,切换是否可以点击的按钮
if($(e.target).hasClass('disk_content_lump')){
$disk_menu.find('.disk_menu_noClickBtn').removeClass('disk_menu_noClick');
$disk_menu.find('.disk_menu_clickBtn').addClass('disk_menu_noClick');
if($(e.target).hasClass('disk_content_lump')||$(e.target).hasClass('col-md-2')){
var a_length = $('.disk_search_center>a').eq(1).length;
if(a_length!=0){
lump_data = $('.disk_search_center>a').eq(1).data('lump_data');
}
}
else{
//先去掉之前选中的
$(e.target).parents('.disk_content_lump').find('.disk_content_lump_click').removeClass('disk_content_lump_click');
//然后给自己加个样式
$(e.target).parents('.col-md-2').children('div').addClass('disk_content_lump_click');
var lump_data = $(e.target).parents('.col-md-2').children('div').data('lump_data');
//菜单的显示
init_disk_menu_toggle($disk_menu,lump_data);
lump_data = $(e.target).parents('.col-md-2').children('div').data('lump_data');
}
}
//菜单的显示
init_disk_menu_toggle($disk_menu,lump_data);
//显示菜单
$disk_menu.show();
......@@ -538,19 +641,66 @@ function init_disk_contextmenu(){
//菜单的切换显示
function init_disk_menu_toggle(disk_menu,lump_data){
var $disk_menu = disk_menu;
$disk_menu.find('.disk_menu_noClickBtn').addClass('disk_menu_noClick');
$disk_menu.find('.disk_menu_clickBtn').removeClass('disk_menu_noClick');
//如果是公司文件和共享文件时,则不显示重命名,分享,删除,移动到,共享
if(lump_data.FILE_TYPE=='folder_company'||lump_data.FILE_TYPE=='folder_share'){
if(!lump_data){
$disk_menu.find('.disk_menu_noClickBtn').removeClass('disk_menu_noClick');
$disk_menu.find('.disk_menu_clickBtn').addClass('disk_menu_noClick');
return;
}
else{
$disk_menu.find('.disk_menu_noClickBtn').addClass('disk_menu_noClick');
$disk_menu.find('.disk_menu_clickBtn').removeClass('disk_menu_noClick');
}
//如果是在首页点击了公司文件或共享文件则不显示重命名,分享,删除,移动到,共享,下载
if(($('.disk_search_center>a').eq(0).next().length==0&&lump_data.FILE_TYPE=='folder_company')||($('.disk_search_center>a').eq(0).next().length==0&&lump_data.FILE_TYPE=='folder_share')){
$disk_menu.find('.disk_menu_clickBtn').addClass('disk_menu_noClick');
$disk_menu.find('li').eq(2).removeClass('disk_menu_noClick');
return;
}
//普通文件的空白位置
if(lump_data.apiIndex=='0'&&lump_data.FATHER_ID=='A'&&$('.disk_search_center>a').eq(0).next().length!=0){
$disk_menu.find('.disk_menu_noClickBtn').removeClass('disk_menu_noClick');
$disk_menu.find('.disk_menu_clickBtn').addClass('disk_menu_noClick');
}
//如果点击了公司文件的空白位置
if(lump_data.UUID=='B'){
$disk_menu.find('li').addClass('disk_menu_noClick');
}
//如果点击了共享文件的空白位置
if(lump_data.UUID=='C'&&lump_data.apiIndex=='2'){
$disk_menu.find('li').addClass('disk_menu_noClick');
$disk_menu.find('li:last').hide();
}
else if(lump_data.apiIndex=='2'){
$disk_menu.find('li').eq(3).addClass('disk_menu_noClick');
$disk_menu.find('li').eq(4).addClass('disk_menu_noClick');
$disk_menu.find('li').eq(5).addClass('disk_menu_noClick');
$disk_menu.find('li').eq(6).addClass('disk_menu_noClick');
$disk_menu.find('li').eq(7).addClass('disk_menu_noClick');
$disk_menu.find('li').eq(8).addClass('disk_menu_noClick');
//根目录显示取消共享的操作,子目录不显示
if($('.disk_search_center>a').eq(1).next().length==0){
$disk_menu.find('li:last').show();
$disk_menu.find('li:last').removeClass('disk_menu_noClick');
}
else{
$disk_menu.find('li:last').hide();
}
}
//如果是公司文件
if(lump_data.apiIndex=='1'){
$disk_menu.find('li').eq(3).addClass('disk_menu_noClick');
$disk_menu.find('li').eq(4).addClass('disk_menu_noClick');
$disk_menu.find('li').eq(5).addClass('disk_menu_noClick');
$disk_menu.find('li').eq(7).addClass('disk_menu_noClick');
$disk_menu.find('li').eq(8).addClass('disk_menu_noClick');
}
//如果是文件时,则不显示打开文件夹的按钮
//如果是文件时,则不显示打开文件夹的按钮,并且不能显示下载按钮
if(lump_data.ISFILE=='1'){
$disk_menu.find('li').eq(2).addClass('disk_menu_noClick');
$disk_menu.find('li').eq(6).removeClass('disk_menu_noClick');
}
else{
$disk_menu.find('li').eq(6).addClass('disk_menu_noClick');
}
}
......@@ -582,17 +732,25 @@ function disk_content_toggle(handler){
else{
infos = init_disk_infos('0',lump_data);
}
//绑定一个data来区别切换的状态toggleList==true为切换到了list
if(!$(handler).data('toggleList')){
//列表形式
$(handler).data('toggleList',true);
$(handler).attr('title','切换到缩略图模式');
$(handler).removeClass('glyphicon-th-large').addClass('glyphicon-th-list');
if($('#disk_rubbish').data('rubbish')){
init_disk_rubbish_list(infos);
//如果是共享文件的列表显示时
if(lump_data&&lump_data.apiIndex=='2'){
init_disk_enjoy_list(infos);
}
else{
init_disk_list(infos);
if($('#disk_rubbish').data('rubbish')){
init_disk_rubbish_list(infos);
}
else{
init_disk_list(infos);
}
}
}
else{
......@@ -602,14 +760,141 @@ function disk_content_toggle(handler){
$(handler).removeClass('glyphicon-th-list').addClass('glyphicon-th-large');
//先清空容器
$('.disk_content_lump').html('');
//渲染块状
for(var i = 0 ; i<infos.length;i++){
init_disk_createLump(infos[i]);
if(infos.length==0){
//无数据时块状的填充
init_disk_lump_noFile(lump_data);
}
else{
//渲染块状
for(var i = 0 ; i<infos.length;i++){
init_disk_createLump(infos[i]);
}
}
}
$('.disk_content_lump,.disk_content_list').toggle();
}
//初始化共享文件的列表
function init_disk_enjoy_list(infos){
for(var i=0;i<infos.length;i++){
init_disk_select_fileImg(infos[i]);
}
$('#disk_content_list').bootstrapTable('destroy').bootstrapTable({
/* showColumns:true,
showToggle:true,
showRefresh:true,
search:true, */
/* url: "bootstrap-table/data/data1.json", // 获取表格数据的url */
data:infos,
cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
/* striped: true, //表格显示条纹，默认为false */
pagination: false, // 在表格底部显示分页组件，默认false
pageList: [5,10,15,20], // 设置页面可以显示的数据条数
pageSize: 10, // 页面数据条数
pageNumber: 1, // 首页页码,
uniqueId:'FILE_UUID',
//clickToSelect:true,//True to select checkbox or radiobox when the column is clicked.
queryParams:function(params){
var temp = { //这里的键的名字和控制器的变量名必须一直，这边改动，控制器也需要改成一样的
// limit: params.limit, //页面大小
offset: params.offset, //页码
pageSize:this.pageSize,
pageNumber:this.pageNumber
/* projectId: $("#projectId").val(),
requirement_Id:$("#requirement_Id").val(),
length: 6 */
};
return temp;
},
columns: [
{
checkbox: true, // 显示一个勾选框
align: 'center', // 居中显示
valign: 'middle'
},{
field: 'FILE_NAME',
title: '文件名称',
align: 'left',
valign: 'middle',
width:400,
formatter: function (value, row, index) {
if(row.fileImg){
return '<div class="row disk_content_list_fileName"><div class="col-md-2"><img src="'+ctx+'/custom/images/'+ row.fileImg +'" height="44" ></div><div class="col-md-10" data-lump_data=\''+JSON.stringify(row)+'\'><div>'+ value +'</div><input type="text" value=\''+ value +'\' class="form-control" onblur="disk_input_blur(this)" /></div></div>';
}
else{
return '<div class="row disk_content_list_fileName"><div class="col-md-2"><img src="'+ctx+'/photo/photo.jsp?ls_photo='+row.FILE_SAVE_PATH+row.FILE_SVAE_NAME+'" height="44" ></div><div class="col-md-10" data-lump_data=\''+JSON.stringify(row)+'\'><div>'+ value +'</div><input type="text" value=\''+ value +'\' class="form-control" onblur="disk_input_blur(this)" /></div></div>';
}
}
}, {
field: 'SHARE_TIME',
title: '共享时间',
align: 'center',
valign: 'middle',
order:'asc',
sortable:'true'
}, {
field: 'FILE_TYPE',
title: '类型',
align: 'center',
valign: 'middle'
},{
field: 'FILE_SIZE',
title: '大小',
align: 'center',
valign: 'middle',
formatter: function (value, row, index) {
return $.jfbrother.fileSizeToStr(row.FILE_SIZE);
}
},{
field: 'SHARE_NAME',
title: '共享目标人',
align: 'center',
valign: 'middle'
},{
field: 'CREATE_NAME',
title: '创建人',
align: 'center',
valign: 'middle'
}
],
//选中时隐藏菜单
onCheck:function(row){
$('#disk_menu').hide();
},
//当用户点击某一列的时候触发
onClickCell:function(field, value, row, $element){
if(field=='FILE_NAME'){
//编辑,把td传入
disk_editFolder_list($element);
}
},
//当用户双击某一行的时候触发
onDblClickRow:function(row, $element){
//根据file_uuid重新渲染列表
disk_list_dbClick(row,$element);
},
//当用户单击某一行的时候触发
onClickRow:function(row, $element){
//选中这行
//在根据file_uuid来获得对象
$('#disk_content_list tr').each(function(index,element){
if($(element).data('uniqueid')==row.FILE_UUID){
var index = $(element).data('index');
//如果正处于编辑状态那就选中,否则就反着选
if($(element).find('.disk_content_list_fileName input').css('display')!='none'||!$(element).find('input[type="checkbox"]').prop('checked')){
$('#disk_content_list').bootstrapTable('check',index);
}
else{
$('#disk_content_list').bootstrapTable('uncheck',index);
}
}
})
}
//
})
}
//初始化文件的列表
function init_disk_list(infos){
for(var i=0;i<infos.length;i++){
......@@ -739,7 +1024,7 @@ function init_disk_rubbish_list(infos){
pageList: [5,10,15,20], // 设置页面可以显示的数据条数
pageSize: 10, // 页面数据条数
pageNumber: 1, // 首页页码,
uniqueId:'id',
uniqueId:'UUID',
clickToSelect:true,//True to select checkbox or radiobox when the column is clicked.
queryParams:function(params){
var temp = { //这里的键的名字和控制器的变量名必须一直，这边改动，控制器也需要改成一样的
......@@ -759,28 +1044,33 @@ function init_disk_rubbish_list(infos){
align: 'center', // 居中显示
valign: 'middle'
},{
field: 'fileName',
field: 'FILE_NAME',
title: '文件名称',
align: 'left',
valign: 'middle',
width:400,
formatter: function (value, row, index) {
return '<div class="row disk_content_list_fileName"><div class="col-md-2"><img src="'+ctx+'/custom/images/'+ row.fileImg +'" height="44" ></div><div class="col-md-10"><div style="color:#666;cursor:text;">'+ value +'</div><input type="text" value='+ value +' class="form-control" onblur="disk_input_blur(this)" /></div></div>';
formatter: function (value, row, index) {
if(row.fileImg){
return '<div class="row disk_content_list_fileName"><div class="col-md-2"><img src="'+ctx+'/custom/images/'+ row.fileImg +'" height="44" ></div><div class="col-md-10" data-lump_data=\''+JSON.stringify(row)+'\'><div>'+ value +'</div><input type="text" value=\''+ value +'\' class="form-control" onblur="disk_input_blur(this)" /></div></div>';
}
else{
return '<div class="row disk_content_list_fileName"><div class="col-md-2"><img src="'+ctx+'/photo/photo.jsp?ls_photo='+row.FILE_SAVE_PATH+row.FILE_SVAE_NAME+'" height="44" ></div><div class="col-md-10" data-lump_data=\''+JSON.stringify(row)+'\'><div>'+ value +'</div><input type="text" value=\''+ value +'\' class="form-control" onblur="disk_input_blur(this)" /></div></div>';
}
}
}, {
field: 'lastTime',
field: 'UPDATE_TIME',
title: '删除时间',
align: 'center',
valign: 'middle',
order:'asc',
sortable:'true'
}, {
field: 'fileType',
field: 'FILE_TYPE',
title: '类型',
align: 'center',
valign: 'middle'
},{
field: 'fileSize',
field: 'FILE_SIZE',
title: '大小',
align: 'center',
valign: 'middle'
......@@ -824,7 +1114,7 @@ function disk_editFolder(handler){
function disk_editFolder_list(handler){
var lump_data = $(handler).find('div').eq(2).data('lump_data');
//如果是公司文件或者是共享文件则不能编辑
if(lump_data.FILE_TYPE=='folder_share'||lump_data.FILE_TYPE=='folder_company'){
if(lump_data.apiIndex=='1'||lump_data.apiIndex=='2'){
return;
}
var $input = $(handler).find('input');
......@@ -837,8 +1127,25 @@ function disk_editFolder_list(handler){
//双击列表时
function disk_list_dbClick(row,handler){
disk_dbClick_custom($(handler).find('.disk_content_list_fileName input'),row,function(infos){
init_disk_list(infos);
//如果是共享文件,那就显示共享的列表
if(row.apiIndex=='2'){
init_disk_enjoy_list(infos);
}
else{
init_disk_list(infos);
}
});
//如果是公司文件时
if(row.FILE_TYPE=='folder_company'){
$('.disk_content_header>div:first-child>a').hide();
//显示下载按钮
$('.disk_content_header>div:first-child>a').eq(1).show();
}
else if(row.FILE_TYPE=='folder_share'){
//显示取消共享的按钮
$('.disk_content_header>div:first-child>a').hide();
$('.disk_enjoyBtn').show();
}
}
//块状以及列表的双击点击事件的提取,返回一个数组,callback回调
......@@ -875,9 +1182,17 @@ function disk_enterFolder(handler){
if($('.disk_content_toggleBtn').data('toggleList')){
//如果是列表时
var list_rows = $('#disk_content_list').bootstrapTable('getSelections');
//在根据uuid来获得对象
var uuid;
//如果是共享文件,并且是共享文件的子目录,则根据file_uuid来获得对象
if(list_rows[0].apiIndex=='2'&&$('.disk_search_center>a').eq(0).next().length!=0){
uuid = list_rows[0].FILE_UUID;
}
//否则就用uuid来获得对象
else{
uuid = list_rows[0].UUID;
}
$('#disk_content_list tr').each(function(index,element){
if($(element).data('uniqueid')==list_rows[0].UUID){
if($(element).data('uniqueid')==uuid){
disk_list_dbClick(list_rows[0],$(element));
return false;
}
......@@ -901,18 +1216,23 @@ function disk_backFolder(handler){
var lump_data = $(handler).data('lump_data');
//获得数据列表
var lump_infos = init_disk_infos('0',lump_data);
//重新渲染数据
if($('.disk_content_toggleBtn').data('toggleList')){
//如果是列表时
//重新渲染列表
init_disk_list(lump_infos);
//如果是共享文件,那就显示共享的列表
if(lump_data.apiIndex=='2'){
init_disk_enjoy_list(lump_infos);
}
else{
init_disk_list(lump_infos);
}
}
else{
//如果是块状时
//根据一个json数据去渲染块状
//渲染块状
//先清空容器
//先清空容器
$('.disk_content_lump').html('');
for(var i = 0 ; i<lump_infos.length;i++){
init_disk_createLump(lump_infos[i]);
......@@ -961,14 +1281,15 @@ function disk_moveFolder(handler){
}
}
console.log(rows_data)
//console.log(rows_data)
var strVar = "";
strVar += "<div style=\"width:268px;padding:0px;border-radius:5px;overflow:hidden;\">\n";
strVar += " <div class=\"disk_move_title\"><span>移动文件<\/span><span onclick=\"$.fancybox.close()\" class=\"glyphicon glyphicon-remove\"><\/span><\/div>\n";
strVar += " <div class=\"disk_move_search\"><input placeholder=\"搜索文件夹\" type=\"text\" ><span onclick=\"alert('搜索')\">搜索</span><\/div>\n";
strVar += " <div id=\"disk_move_tree\" style=\"height:220px;overflow:auto;\" class=\"ztree disk_move_tree\"><\/div>\n";
strVar += " <div class=\"disk_move_btn\">\n";
strVar += " <span onclick=\"disk_moveFolder_save()\">确定<\/span><span onclick=\"$.fancybox.close()\">取消<\/span>\n";
strVar += " <span>确定<\/span><span onclick=\"$.fancybox.close()\">取消<\/span>\n";
strVar += " <\/div>\n";
strVar += "<\/div>\n";
......@@ -986,49 +1307,111 @@ function disk_moveFolder(handler){
}
});
//绑定确定按钮的操作
$('.disk_move_btn>span').eq(0).bind('click',function(){
disk_moveFolder_save(rows_data);
})
//初始化文件目录
init_disk_move_tree(rows_data);
}
//文件移动的保存
function disk_moveFolder_save(){
function disk_moveFolder_save(lump_data_list){
var treeObj = $.fn.zTree.getZTreeObj("disk_move_tree");
//获取选中的树数据
var nodes = treeObj.getSelectedNodes();
console.log(nodes)
$.fancybox.close();
//重新渲染显示的内容
if(nodes.length!=0){
for(var i = 0;i<lump_data_list.length;i++){
var result = storePersonalModule.storePersonalActAction.updateStorePersonal({
FIELD_UUID:lump_data_list[i].UUID,
FIELD_FATHER_ID:nodes[0].UUID
});
}
//获得目录的最后一个数据
var nav_lump_data = $('.disk_search_center>a:last').data('lump_data');
var infos = init_disk_infos('0',nav_lump_data);
//重新渲染显示的内容
if($('.disk_content_toggleBtn').data('toggleList')){
init_disk_list(infos);
}
else{
//先清空容器
$('.disk_content_lump').html('');
if(infos.length==0){
//无数据时块状的填充
init_disk_lump_noFile(nav_lump_data);
}
else{
//渲染块状
for(var i = 0 ; i<infos.length;i++){
init_disk_createLump(infos[i]);
}
}
}
}
$.fancybox.close();
}
//选择共享人之后的保存
function disk_enjoyUser_save(){
//选择共享人之后的保存,做了多选文件的共享(暂时只能单文件)
function disk_enjoyUser_save(lump_data){
var treeObj = $.fn.zTree.getZTreeObj("disk_enjoyUser_tree");
var nodes = treeObj.getSelectedNodes();
console.log(nodes)
var query = {};
var uuids = '';
var userIds = '';
for(var i = 0 ; i< lump_data.length;i++){
uuids = uuids + lump_data[i].UUID+',';
}
for(var i = 0 ; i< nodes.length;i++){
userIds = userIds + nodes[i].USER_ID+',';
}
uuids = uuids.substring(0, uuids.length-1);
userIds = userIds.substring(0, userIds.length-1);
query.FIELD_CODE = uuids;
query.FIELD_USER_ID = userIds;
var result = storePersonalModule.storePersonalActAction.shareStorePersonal(query);
$.fancybox.close();
//重新渲染显示的内容
}
//取消共享操作
function disk_cancelEnjoy(handler){
//如果是子目录中的共享,则做个提示操作
if($('.disk_search_center>a').eq(1).next().length!=0){
var txt = '只能取消共享根目录!!!';
var option = {
title: '取消共享提示',
btn:parseInt("0001",2)
}
window.wxc.xcConfirm(txt, window.wxc.xcConfirm.typeEnum.error,option);
return;
}
disk_confirm(handler,'取消共享',function(list_rows,uuids){
//数据库的取消共享信息
var result = disk_cancelEnjoy_sql(uuids);
});
}
//取消共享的数据库操作
function disk_cancelEnjoy_sql(uuids){
var query = {};
query.FIELD_CODE=uuids;
//先软删除
var result1 = storeShareModule.storeShareActAction.deleteStoreShare(query);
//再真正的删除
var result2 = storeShareModule.storeShareActAction.deleteTrueStoreShare(query);
}
//初始化文件时移动的目录
function init_disk_move_tree(rows_data){
var ztreeData = [
{pid:'0',id:'A',name:"公司文件",fileType:'folder_company'},
{pid:'A',id:'A1',name:'我的文件夹1',fileType:'folder'},
{pid:'A',id:'A2',name:'我的文件夹2',fileType:'folder'},
{pid:'A',id:'A3',name:'我的文件夹3',fileType:'folder'},
{pid:'A',id:'A4',name:'我的文件夹4',fileType:'folder'},
{pid:'A4',id:'A5',name:'我的文件夹5',fileType:'folder'},
{pid:'A5',id:'A6',name:'我的文件夹5',fileType:'folder'},
{pid:'A6',id:'A7',name:'我的文件夹5',fileType:'folder'},
{pid:'0',id:'B',name:'共享文件',fileType:'folder_share'},
{pid:'B',id:'B4',name:'我的文件夹5',fileType:'folder'},
{pid:'B',id:'B4',name:'我的文件夹6',fileType:'folder'}
];
var ztreeData = storePersonalModule.storePersonalDataAction.listTreeEasyui().rowSet;
//处理下返回来的数据
ztreeData = disk_custom_moveTree_data(rows_data,ztreeData);
for(var i =0;i<ztreeData.length;i++){
init_disk_select_fileImg(ztreeData[i]);
}
......@@ -1048,9 +1431,12 @@ function init_disk_move_tree(rows_data){
data : {
simpleData : {
enable : true,
idKey : "id",
pIdKey : "pid",
rootPId : 0
idKey : "UUID",
pIdKey : "FATHER_ID",
rootPId : 'A'
},
key:{
name:'FILE_NAME'
}
},
view : {
......@@ -1080,27 +1466,68 @@ function init_disk_move_tree(rows_data){
}
//处理下返回来的数据
function disk_custom_moveTree_data(lump_data_list,ztreeData){
var new_data = [];
//初步过滤掉已经软删除的文件夹,并且修改了根节点的显示文字和图标
for(var i = 0 ; i<ztreeData.length;i++){
//修改根节点
if(ztreeData[i].UUID=='A'){
ztreeData[i].icon = 'custom/images/disk_module5_close.png';
ztreeData[i].FILE_NAME = '根目录';
}
//多个被选中时
var flag = true;
for(var j = 0 ; j < lump_data_list.length;j++){
//把删除的文件夹过滤掉,把自身也过滤掉
if((ztreeData[i].DELETE_FLAG&&ztreeData[i].DELETE_FLAG=='1')||ztreeData[i].UUID==lump_data_list[j].UUID){
flag = false ;
break;
}
}
if(flag){
new_data.push(ztreeData[i]);
}
}
//根据点击的uuid去做递归过滤掉其子目录
for(var k = 0 ; k < lump_data_list.length;k++){
disk_custom_moveTree_data_filter(lump_data_list[k].UUID,new_data);
}
return new_data;
}
//移动文件时的递归过滤数据
function disk_custom_moveTree_data_filter(uuid,ztreeData){
for(var i = 0 ; i < ztreeData.length;i++){
if(ztreeData[i].FATHER_ID&&ztreeData[i].FATHER_ID==uuid){
var new_uuid = ztreeData[i].UUID;
ztreeData.splice(i,1);
disk_custom_moveTree_data_filter(new_uuid,ztreeData);
}
}
}
//初始化共享人的树
function init_disk_enjoyUser_tree(rows_data){
var ztreeData = [
{pid:'0',id:'A',name:'技术部',icon:'custom/images/disk_enjoy_users.png'},
{pid:'A',id:'A1',name:'联系人1',icon:'custom/images/disk_enjoy_user.png'},
{pid:'A',id:'A2',name:'联系人2',icon:'custom/images/disk_enjoy_user.png'},
{pid:'A',id:'A3',name:'联系人3',icon:'custom/images/disk_enjoy_user.png'},
{pid:'A',id:'A4',name:'联系人4',icon:'custom/images/disk_enjoy_user.png'},
{pid:'A',id:'A5',name:'联系人5',icon:'custom/images/disk_enjoy_user.png'},
{pid:'A',id:'A6',name:'联系人6',icon:'custom/images/disk_enjoy_user.png'},
{pid:'A',id:'A7',name:'联系人7',icon:'custom/images/disk_enjoy_user.png'},
{pid:'A',id:'A8',name:'联系人8',icon:'custom/images/disk_enjoy_user.png'},
{pid:'A',id:'A9',name:'联系人9',icon:'custom/images/disk_enjoy_user.png'},
{pid:'A',id:'A10',name:'联系人10',icon:'custom/images/disk_enjoy_user.png'},
{pid:'A',id:'A11',name:'联系人11',icon:'custom/images/disk_enjoy_user.png'},
{pid:'A',id:'A12',name:'联系人12',icon:'custom/images/disk_enjoy_user.png'}
];
/*for(var i =0;i<ztreeData.length;i++){
init_disk_select_fileImg(ztreeData[i]);
}*/
function init_disk_enjoyUser_tree(rows_data){
/*var result = jwAppUserModel.jwAppsUserDataAction.listALLUserUnit();*/
var ztreeData;
$.ajax({
url:'userchoiceData_listUser',
type:'post',
async:false,
success:function(data){
ztreeData = data.rowSet;
}
})
for(var i = 0 ;i<ztreeData.length;i++){
ztreeData[i].icon = 'custom/images/disk_enjoy_users.png';
//所有都显示文件夹的样子
//ztreeData[i].isParent=true;
}
console.log(ztreeData)
//还要做一步过滤
//1.把自身及以下文件过滤掉
......@@ -1122,9 +1549,12 @@ function init_disk_enjoyUser_tree(rows_data){
data : {
simpleData : {
enable : true,
idKey : "id",
pIdKey : "pid",
idKey : "USER_ID",
pIdKey : "PARENT_ID",
rootPId : 0
},
key: {
name: "USER_NAME"
}
},
view : {
......@@ -1228,11 +1658,11 @@ function disk_downFolder(handler){
var list_rows;
if($('.disk_content_toggleBtn').data('toggleList')){
//如果是列表时
var list_rows = $('#disk_content_list').bootstrapTable('getSelections');
list_rows = $('#disk_content_list').bootstrapTable('getSelections');
}
else{
//如果是块状时
var list_rows = $('.disk_content_lump').find('.disk_content_lump_click');
list_rows = $('.disk_content_lump').find('.disk_content_lump_click');
}
if(list_rows.length==0){
......@@ -1248,20 +1678,72 @@ function disk_downFolder(handler){
var option2 = {
title: "下载提示",
onOk: function(){
var lump_data_obj ;
if($(list_rows).data('lump_data')){
lump_data_obj = $(list_rows).data('lump_data');
}
else{
lump_data_obj = list_rows[0];
}
//下载文件
var uploadnew = lump_data_obj.FILE_SVAE_NAME;
var uploadpath = lump_data_obj.FILE_SAVE_PATH;
var uploadold = lump_data_obj.FILE_NAME;
var uuid = lump_data_obj.UUID;
if(uploadpath == null || uploadpath == ""){
var txt4 = "没有文件可以下载!!!";
var option4 = {
title: "下载提示",
btn:parseInt("0001",2)
}
window.wxc.xcConfirm(txt4, window.wxc.xcConfirm.typeEnum.confirm,option4);
return;
}
fileDownloadURL(uploadnew,uploadpath,uploadold,uuid,'storePersonalAct_download');
//end
/*//获得选中的数据
var rows_data = [];
for(var i=0;i<list_rows.length;i++ ){
var lump_data_obj ;
if($(list_rows[i]).data('lump_data')){
//获得块状的数据
rows_data.push($(list_rows[i]).data('lump_data'));
lump_data_obj = $(list_rows[i]).data('lump_data')
}
else{
//获得列表的数据
rows_data.push(list_rows[i]);
lump_data_obj = list_rows[i];
}
if(lump_data_obj.ISFILE=='0'){
var txt3 = "存在无法下载的文件夹!!!";
var option3 = {
title: "下载提示",
btn:parseInt("0001",2)
}
window.wxc.xcConfirm(txt3, window.wxc.xcConfirm.typeEnum.error,option3);
return;
}
rows_data.push(lump_data_obj);
//下载文件
var uploadnew = lump_data_obj.FILE_SVAE_NAME;
var uploadpath = lump_data_obj.FILE_SAVE_PATH;
var uploadold = lump_data_obj.FILE_NAME;
var uuid = lump_data_obj.UUID;
if(uploadpath == null || uploadpath == ""){
var txt4 = "没有文件可以下载!!!";
var option4 = {
title: "下载提示",
btn:parseInt("0001",2)
}
window.wxc.xcConfirm(txt4, window.wxc.xcConfirm.typeEnum.confirm,option4);
return;
}
}*/
//下载文件
$('<a href="https://codeload.github.com/douban/douban-client/legacy.zip/master" download="proposed_file_name">Download</a>')[0].click();
fileDownloadURL(uploadnew,uploadpath,uploadold,uuid,'storePersonalAct_download');
//end
}*/
}
}
window.wxc.xcConfirm(txt2, window.wxc.xcConfirm.typeEnum.warning,option2);
......@@ -1521,12 +2003,8 @@ function disk_rubbish(){
$('.disk_content_lump').html('');
//渲染块状
if(infos.length==0){
var $disk_content_lump = $('.disk_content_lump');
var $no_file_content = $('<div></div>').addClass('disk_content_lump_noFile');
var $no_file_img = $('<img src='+ctx+'/custom/images/disk_lump_noFile.png width="131" height="116" />');
var $no_file_text = $('<p></p>').text('暂无删除的记录~');
$disk_content_lump.append($no_file_content);
$no_file_content.append($no_file_img).append($no_file_text);
//为文件时的显示
init_disk_lump_noFile();
}
for(var i = 0 ; i<infos.length;i++){
init_disk_createLump(infos[i]);
......@@ -1573,14 +2051,15 @@ function disk_confirm(handler,txt,sqlCallback,customCallback){
return;
}
var list_rows ;
if($('.disk_content_toggleBtn').data('toggleList')){
//如果是普通列表或者是分享码的列表时
if($('.disk_content_toggleBtn').data('toggleList')||$('#disk_shareCode').data('shareCode')){
list_rows = $('#disk_content_list').bootstrapTable('getSelections');
}
else{
list_rows = $('.disk_content_lump').find('.disk_content_lump_click');
}
if(list_rows.length==0){
var txt1 = '请选择要'+txt+'的文件!!!';
var txt1 = '请选择要'+txt+'的文件或文件夹!!!';
var option1 = {
title: txt+'提示',
btn:parseInt("0001",2)
......@@ -1588,7 +2067,7 @@ function disk_confirm(handler,txt,sqlCallback,customCallback){
window.wxc.xcConfirm(txt1, window.wxc.xcConfirm.typeEnum.confirm,option1);
return;
}
var txt3 = '是否要'+txt+'选中的文件!!!';
var txt3 = '是否要'+txt+'选中的文件或文件夹!!!';
var option3 = {
title: txt+'提示',
onOk: function(){
......@@ -1606,7 +2085,7 @@ function disk_confirm(handler,txt,sqlCallback,customCallback){
//存在公司文件或者是共享文件则退出
if(list_row_obj.FILE_TYPE=='folder_company'||list_row_obj.FILE_TYPE=='folder_share'){
var txt2 = '存在无法'+txt+'的文件!!!';
var txt2 = '存在无法'+txt+'的文件夹!!!';
var option2 = {
title: txt+'提示',
btn:parseInt("0001",2)
......@@ -1617,13 +2096,13 @@ function disk_confirm(handler,txt,sqlCallback,customCallback){
//存在下级目录或文件,已共享文件,已分享文件时则退出
var error_txt = '';
if(list_row_obj.FILENUMBER>0){
error_txt = '存在下级文件或目录,无法删除!';
if(list_row_obj.apiIndex=='0'&&list_row_obj.FILENUMBER>0){
error_txt = '存在下级文件或目录或回收站里存在下级文件或目录,无法删除!';
}
if(list_row_obj.GXCOUNT>0){
if(list_row_obj.apiIndex=='0'&&list_row_obj.GXCOUNT>0){
error_txt = '存在已共享文件或目录,无法删除!';
}
if(list_row_obj.FXCOUNT>0){
if(list_row_obj.apiIndex=='0'&&list_row_obj.FXCOUNT>0){
error_txt = '存在已分享文件或目录,无法删除!';
}
if(error_txt!=''){
......@@ -1636,7 +2115,13 @@ function disk_confirm(handler,txt,sqlCallback,customCallback){
return;
}
uuids = uuids + list_row_obj.UUID + ',';
//如果是共享文件时,则FILE_UUID是真正的UUID
if(list_row_obj.apiIndex=='2'){
uuids = uuids + list_row_obj.FILE_UUID + ',';
}
else{
uuids = uuids + list_row_obj.UUID + ',';
}
lump_datas.push(list_row_obj);
}
uuids = uuids.substring(0, uuids.length-1);
......@@ -1649,14 +2134,26 @@ function disk_confirm(handler,txt,sqlCallback,customCallback){
else{
//删除页面的
for(var i = 0 ; i < list_rows.length ; i ++){
if($('.disk_content_toggleBtn').data('toggleList')){
//根据uuid来删除行
$('#disk_content_list').bootstrapTable('removeByUniqueId',list_rows[i].UUID);
//如果是普通列表或者是分享码的列表时
if($('.disk_content_toggleBtn').data('toggleList')||$('#disk_shareCode').data('shareCode')){
//如果是共享文件那就根据file_uuid来删除行
if(list_rows[i].apiIndex=='2'){
$('#disk_content_list').bootstrapTable('removeByUniqueId',list_rows[i].FILE_UUID);
}
//否则根据uuid来删除行
else{
$('#disk_content_list').bootstrapTable('removeByUniqueId',list_rows[i].UUID);
}
}
else{
$(list_rows[i]).parent().remove();
}
}
var last_lump_data = $('.disk_search_center>a:last').data('lump_data');
if($('.disk_content_lump>div').length==0){
//如果没文件时的显示
init_disk_lump_noFile(last_lump_data);
}
}
}
}
......@@ -1889,14 +2386,13 @@ function disk_enjoyFolder(handler){
}
}
console.log(rows_data)
var strVar = "";
strVar += "<div style=\"width:268px;padding:0px;border-radius:5px;overflow:hidden;\">\n";
strVar += " <div class=\"disk_move_title\"><span>选择要共享的人<\/span><span onclick=\"$.fancybox.close()\" class=\"glyphicon glyphicon-remove\"><\/span><\/div>\n";
strVar += " <div class=\"disk_move_search\"><input placeholder=\"搜索人员\" type=\"text\" ><span onclick=\"alert('搜索')\">搜索</span><\/div>\n";
strVar += " <div id=\"disk_enjoyUser_tree\" style=\"height:220px;overflow:auto;\" class=\"ztree disk_move_tree\"><\/div>\n";
strVar += " <div class=\"disk_move_btn\">\n";
strVar += " <span onclick=\"disk_enjoyUser_save()\">确定<\/span><span onclick=\"$.fancybox.close()\">取消<\/span>\n";
strVar += " <span>确定<\/span><span onclick=\"$.fancybox.close()\">取消<\/span>\n";
strVar += " <\/div>\n";
strVar += "<\/div>\n";
......@@ -1914,6 +2410,10 @@ function disk_enjoyFolder(handler){
}
});
$('.disk_move_btn>span').eq(0).bind('click',function(){
disk_enjoyUser_save(rows_data);
})
//初始化文件目录
init_disk_enjoyUser_tree(rows_data);
}
......@@ -1926,14 +2426,26 @@ function disk_shareCode(){
//隐藏切换视图的功能
$('.disk_content_toggleBtn').hide();
//模拟几条垃圾数据
var infos = [
{id:'uuid1',fileName:'分享文件1',shareTime:'2018-06-18 12:10',fileType:'rar',fileSize:'1MB',shareCode:'UkN5',shareLink:'http://localhost:8080/jfV5portal/share',activeTime:'永久有效'},
{id:'uuid2',fileName:'分享文件2',shareTime:'2018-06-18 12:10',fileType:'word',fileSize:'2MB',shareCode:'5238',shareLink:'http://localhost:8080/jfV5portal/share',activeTime:'7天后'},
{id:'uuid3',fileName:'分享文件3',shareTime:'2018-06-18 12:10',fileType:'excel',fileSize:'5MB',shareCode:'fsdf',shareLink:'http://localhost:8080/jfV5portal/share',activeTime:'1天后'},
{id:'uuid4',fileName:'分享文件4',shareTime:'2018-06-18 12:10',fileType:'rar',fileSize:'3MB',shareCode:'sd12',shareLink:'http://localhost:8080/jfV5portal/share',activeTime:'永久有效'},
{id:'uuid5',fileName:'分享文件5',shareTime:'2018-06-18 12:10',fileType:'rar',fileSize:'1MB',shareCode:'tret',shareLink:'http://localhost:8080/jfV5portal/share',activeTime:'永久有效'}
]
var infos = storePartookModule.storePartookDataAction.listAll().rowSet;
//定义一个过滤后的数组
var result_infos = [];
//先获得分享的数据,再根据FILE_UUID去查找普通文件信息
for(var i = 0 ; i < infos.length;i++ ){
if(infos[i].DELETE_FLAG=='1'){
//过滤掉软删除的数据
continue;
}
var v_query = {} ;
v_query.FIELD_UUID = infos[i].FILE_UUID;
var result_list = storePersonalModule.storePersonalDataAction.listAll_storePersonalnofile(v_query).rowSet;
//把普通文件FILE_SAVE_PATH,FILE_SVAE_NAME,FILE_TYPE保留下来
infos[i].FILE_SAVE_PATH = result_list[0].FILE_SAVE_PATH;
infos[i].FILE_SVAE_NAME = result_list[0].FILE_SVAE_NAME;
infos[i].FILE_TYPE = result_list[0].FILE_TYPE;
//初始化文件的图片
init_disk_select_fileImg(infos[i]);
result_infos.push(infos[i]);
}
//显示取消分享的按钮
$('.disk_content_header>div:first-child>a').hide();
......@@ -1944,42 +2456,30 @@ function disk_shareCode(){
$('.disk_content_lump').hide();
//渲染列表
init_disk_shareCode_list(infos);
init_disk_shareCode_list(result_infos);
}
//取消分享
function disk_cancelShareCode(handler){
var list_rows = $('#disk_content_list').bootstrapTable('getSelections');
if(list_rows.length==0){
var txt3 = "请选择要取消分享的文件!!!";
var option3 = {
title: "取消分享提示",
btn:parseInt("0001",2)
}
window.wxc.xcConfirm(txt3, window.wxc.xcConfirm.typeEnum.confirm,option3);
}
else{
var txt4 = "是否要取消分享选中的文件!!!";
var option4 = {
title: "取消分享提示",
onOk: function(){
for(var i = 0; i<list_rows.length;i++){
//根据id来删除行
$('#disk_content_list').bootstrapTable('removeByUniqueId',list_rows[i].id);
//然后做取消分享操作
}
}
}
window.wxc.xcConfirm(txt4, window.wxc.xcConfirm.typeEnum.warning,option4);
}
disk_confirm(handler,'取消分享',function(list_rows,uuids){
//数据库的取消分享信息
var result = disk_cancelShareCode_sql(uuids);
});
}
//取消分享的数据库操作
function disk_cancelShareCode_sql(uuids){
var query = {};
query.FIELD_CODE = uuids;
//先软删除
var result1 = storePartookModule.storePartookActAction.deleteStorePartook(query);
//再真正的删除
var result2 = storePartookModule.storePartookActAction.deleteTrueStorePartook(query);
}
//初始化我的分享码的列表
function init_disk_shareCode_list(infos){
for(var i=0;i<infos.length;i++){
init_disk_select_fileImg(infos[i]);
}
console.log(infos)
$('#disk_content_list').bootstrapTable('destroy').bootstrapTable({
/* showColumns:true,
showToggle:true,
......@@ -1993,7 +2493,7 @@ function init_disk_shareCode_list(infos){
pageList: [5,10,15,20], // 设置页面可以显示的数据条数
pageSize: 10, // 页面数据条数
pageNumber: 1, // 首页页码,
uniqueId:'id',
uniqueId:'UUID',
clickToSelect:true,//True to select checkbox or radiobox when the column is clicked.
queryParams:function(params){
var temp = { //这里的键的名字和控制器的变量名必须一直，这边改动，控制器也需要改成一样的
......@@ -2013,44 +2513,44 @@ function init_disk_shareCode_list(infos){
align: 'center', // 居中显示
valign: 'middle'
},{
field: 'fileName',
field: 'FILE_NAME',
title: '文件名称',
align: 'left',
valign: 'middle',
width:400,
width: '400',
formatter: function (value, row, index) {
return '<div class="row disk_content_list_fileName"><div class="col-md-2"><img src="'+ctx+'/custom/images/'+ row.fileImg +'" height="44" ></div><div class="col-md-10"><div style="color:#666;cursor:text;">'+ value +'</div><input type="text" value='+ value +' class="form-control" onblur="disk_input_blur(this)" /></div></div>';
if(row.fileImg){
return '<div class="row disk_content_list_fileName"><div class="col-md-2"><img src="'+ctx+'/custom/images/'+ row.fileImg +'" height="44" ></div><div class="col-md-10" data-lump_data=\''+JSON.stringify(row)+'\'><div>'+ value +'</div><input type="text" value=\''+ value +'\' class="form-control"/></div></div>';
}
else{
return '<div class="row disk_content_list_fileName"><div class="col-md-2"><img src="'+ctx+'/photo/photo.jsp?ls_photo='+row.FILE_SAVE_PATH+row.FILE_SVAE_NAME+'" height="44" ></div><div class="col-md-10" data-lump_data=\''+JSON.stringify(row)+'\'><div>'+ value +'</div><input type="text" value=\''+ value +'\' class="form-control"/></div></div>';
}
}
}, {
field: 'shareTime',
field: 'CREATE_TIME',
title: '分享时间',
align: 'center',
valign: 'middle',
order:'asc',
sortable:'true'
}, {
field: 'fileType',
title: '类型',
align: 'center',
valign: 'middle'
},{
field: 'fileSize',
title: '大小',
align: 'center',
valign: 'middle'
},{
field: 'shareCode',
title: '分享码',
field: 'PARTOOK_PASS',
title: '分享密码',
align: 'center',
valign: 'middle'
},{
field: 'shareLink',
title: '分享链接',
align: 'center',
valign: 'middle'
valign: 'middle',
formatter: function (value, row, index) {
var old_href = location.href;
var new_href = old_href.substring(0, old_href.lastIndexOf('/'));
return new_href + '/share/' + row.PARTOOK_CODE;
}
},{
field: 'activeTime',
title: '有效时间',
field: 'PARTOOK_TIME',
title: '分享截止时间',
align: 'center',
valign: 'middle'
}
......@@ -2062,12 +2562,3 @@ function init_disk_shareCode_list(infos){
})
}
//返回一级目录
function disk_backFolder_prev(handler){
}
//前进一个目录
function disk_backFolder_next(hanlder){
}
WebContent/jfcas04/js/office.js 0 → 100644
$(function(){
//去掉尾部的一个div
$('.index_footer').next().remove();
//初始化申请的块状
init_office_apply_lump();
//渲染审批列表
init_office_examine_list();
//渲染进度查询列表
init_office_progress_list();
//渲染历史查询列表
init_office_history_list();
//初始化.office_module的距离来达到满屏显示
init_office_module_bottom();
//模块的切换
init_office_change_moddle();
})
//初始化.office_module的距离来达到满屏显示
function init_office_module_bottom(){
var office_module_height;
$('.office_module').each(function(index,element){
$(element).css('margin-bottom','0');
if($(element).css('display')!='none'){
office_module_height = $(element).outerHeight(true);
}
})
var height = $(window).height() - $('.indedx_header').outerHeight(true) - $('.indedx_header_logo').outerHeight(true) - $('.index_center').outerHeight(true) - $('.office_bg').outerHeight(true) - $('.index_footer').outerHeight(true) - office_module_height;
if(height>0){
$('.office_module').css('margin-bottom',height);
}
}
//模块的切换
function init_office_change_moddle(){
$('.office_bg_content>div>div').on('click',function(){
var index = $('.office_bg_content>div>div').index($(this));
$('.office_module').hide();
$('.office_module').eq(index).show();
//取消之前的选中效果,给点击的添加效果
$('.office_bg_content_click').removeClass('office_bg_content_click');
$(this).addClass('office_bg_content_click');
init_office_module_bottom();
})
}
//初始化申请的块状
function init_office_apply_lump(){
//自定义一个颜色数组
var color_list = ['#ff8264','#44df9e','#f585ad','#aa96f6','#fea144','#5cc4e0'];
var infos = [
{apply_name:'报工申请'},
{apply_name:'请假申请'},
{apply_name:'报销申请'},
{apply_name:'补假申请'},
{apply_name:'合同申请'},
{apply_name:'办公软件开通申请'},
{apply_name:'办公用品领用申请'},
{apply_name:'公司用车申请'},
{apply_name:'公租房申请'},
{apply_name:'产品入库申请'},
{apply_name:'产品出库申请'},
{apply_name:'领料申请'},
{apply_name:'项目申请'},
{apply_name:'会议室申请'},
{apply_name:'经费申请'},
{apply_name:'出差申请'},
{apply_name:'采购申请'},
{apply_name:'外出申请'},
]
//块状的容器
var $content = $('.office_apply_content');
for(var i = 0 ; i < infos.length ; i ++){
var $create_container = $('<div></div>');
var $create_content = $('<div></div>');
$create_content.bind('click',function(){
location.href='officeDetail';
})
var $create_div = $('<div></div>');
//添加一个颜色背景
$create_content.css('background',color_list[i%6]);
//鼠标移动上去时,给一个相对应的颜色
//
//直接用i会存在闭包的问题,所有要用一个自执行函数来获取i
(function(i){
$create_content.hover(function(){
$(this).css('box-shadow',' 0 0 5px '+color_list[i%6]+'');
},function(){
$(this).css('box-shadow','none');
})
})(i);
/*$create_content.data('index',i);*/
/*$create_content.hover(function(){
$(this).css('box-shadow',' 0 0 5px '+color_list[$(this).data('index')%6]+'');
},function(){
$(this).css('box-shadow','none');
})*/
//赋值
$create_div.text(infos[i].apply_name);
$create_content.append($create_div);
$create_container.append($create_content);
$content.append($create_container);
}
}
//渲染审批列表
function init_office_examine_list(){
//state 0 为未通过 , 1 为待审批 2 为审批中 3 为 已通过
var infos = [
{examine_name:'李惠利',examine_time:'2018/08/15 08:23',examine_state:'3',examine_title:'8月17去趟水上乐园!!!'},
{examine_name:'李惠利',examine_time:'2018/08/15 08:23',examine_state:'0',examine_title:'8月17去趟水上乐园!!!'},
{examine_name:'李惠利',examine_time:'2018/08/15 08:23',examine_state:'0',examine_title:'8月17去趟水上乐园!!!'},
{examine_name:'李惠利',examine_time:'2018/08/15 08:23',examine_state:'0',examine_title:'8月17去趟水上乐园!!!'},
{examine_name:'李惠利',examine_time:'2018/08/15 08:23',examine_state:'0',examine_title:'8月17去趟水上乐园!!!'},
{examine_name:'李惠利',examine_time:'2018/08/15 08:23',examine_state:'1',examine_title:'8月17去趟水上乐园!!!'},
{examine_name:'李惠利',examine_time:'2018/08/15 08:23',examine_state:'1',examine_title:'8月17去趟水上乐园!!!'},
{examine_name:'李惠利',examine_time:'2018/08/15 08:23',examine_state:'2',examine_title:'8月17去趟水上乐园!!!'},
{examine_name:'李惠利',examine_time:'2018/08/15 08:23',examine_state:'2',examine_title:'8月17去趟水上乐园!!!'},
{examine_name:'李惠利',examine_time:'2018/08/15 08:23',examine_state:'2',examine_title:'8月17去趟水上乐园!!!'},
{examine_name:'李惠利',examine_time:'2018/08/15 08:23',examine_state:'0',examine_title:'8月17去趟水上乐园!!!'},
{examine_name:'李惠利',examine_time:'2018/08/15 08:23',examine_state:'1',examine_title:'8月17去趟水上乐园!!!'},
{examine_name:'李惠利',examine_time:'2018/08/15 08:23',examine_state:'2',examine_title:'8月17去趟水上乐园!!!'},
];
$('#office_examine').bootstrapTable('destroy').bootstrapTable({
/* showColumns:true,
showToggle:true,
showRefresh:true,
search:true, */
/* url: "bootstrap-table/data/data1.json", // 获取表格数据的url */
data:infos,
cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
/* striped: true, //表格显示条纹，默认为false */
pagination: true, // 在表格底部显示分页组件，默认false
pageList: [5,10,15,20], // 设置页面可以显示的数据条数
pageSize: 10, // 页面数据条数
pageNumber: 1, // 首页页码,
uniqueId:'UUID',
//clickToSelect:true,//True to select checkbox or radiobox when the column is clicked.
queryParams:function(params){
var temp = { //这里的键的名字和控制器的变量名必须一直，这边改动，控制器也需要改成一样的
// limit: params.limit, //页面大小
offset: params.offset, //页码
pageSize:this.pageSize,
pageNumber:this.pageNumber
/* projectId: $("#projectId").val(),
requirement_Id:$("#requirement_Id").val(),
length: 6 */
};
return temp;
},
columns: [
/*{
checkbox: true, // 显示一个勾选框
align: 'center', // 居中显示
valign: 'middle'
}, */
{
field: 'examine_title',
title: '申请原因',
align: 'left',
valign: 'middle',
width: '70%',
formatter: function (value, row, index) {
return '<div class="office_examine_tilte">'+ value +'</div>';
}
}, {
field: 'examine_state',
title: '申请状态',
align: 'center',
valign: 'middle',
formatter: function (value, row, index) {
if(value=='0'){
return '<span style="color:#ff801f">未通过</span>';
}
else if(value=='1'){
return '<span style="color:#999">待审核</span>';
}
else if(value=='2'){
return '<span style="color:#08b9d5">审核中</span>';
}
else{
return '<span style="color:#08d55a">已通过</span>';
}
}
},{
field: 'examine_time',
title: '申请时间',
align: 'center',
valign: 'middle',
formatter: function (value, row, index) {
return '<span style="color:#bbb">'+ value +'</span>';
}
},{
field: 'examine_name',
title: '申请人',
align: 'center',
valign: 'middle'
}
]
})
}
//渲染进度查询列表
function init_office_progress_list(){
var infos = [
{progress_time:'2018/08/15 08:23',progress_title:'进度记录8月17去趟水上乐园!!!'},
{progress_time:'2018/08/15 08:23',progress_title:'进度记录8月17去趟水上乐园!!!'},
{progress_time:'2018/08/15 08:23',progress_title:'进度记录8月17去趟水上乐园!!!'},
{progress_time:'2018/08/15 08:23',progress_title:'进度记录8月17去趟水上乐园!!!'},
{progress_time:'2018/08/15 08:23',progress_title:'进度记录8月17去趟水上乐园!!!'},
{progress_time:'2018/08/15 08:23',progress_title:'进度记录8月17去趟水上乐园!!!'},
{progress_time:'2018/08/15 08:23',progress_title:'进度记录8月17去趟水上乐园!!!'},
{progress_time:'2018/08/15 08:23',progress_title:'进度记录8月17去趟水上乐园!!!'},
{progress_time:'2018/08/15 08:23',progress_title:'进度记录8月17去趟水上乐园!!!'},
{progress_time:'2018/08/15 08:23',progress_title:'进度记录8月17去趟水上乐园!!!'},
{progress_time:'2018/08/15 08:23',progress_title:'进度记录8月17去趟水上乐园!!!'},
{progress_time:'2018/08/15 08:23',progress_title:'进度记录8月17去趟水上乐园!!!'}
];
$('#office_progress').bootstrapTable('destroy').bootstrapTable({
/* showColumns:true,
showToggle:true,
showRefresh:true,
search:true, */
/* url: "bootstrap-table/data/data1.json", // 获取表格数据的url */
data:infos,
cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
/* striped: true, //表格显示条纹，默认为false */
pagination: true, // 在表格底部显示分页组件，默认false
pageList: [5,10,15,20], // 设置页面可以显示的数据条数
pageSize: 10, // 页面数据条数
pageNumber: 1, // 首页页码,
uniqueId:'UUID',
//clickToSelect:true,//True to select checkbox or radiobox when the column is clicked.
queryParams:function(params){
var temp = { //这里的键的名字和控制器的变量名必须一直，这边改动，控制器也需要改成一样的
// limit: params.limit, //页面大小
offset: params.offset, //页码
pageSize:this.pageSize,
pageNumber:this.pageNumber
/* projectId: $("#projectId").val(),
requirement_Id:$("#requirement_Id").val(),
length: 6 */
};
return temp;
},
columns: [
/*{
checkbox: true, // 显示一个勾选框
align: 'center', // 居中显示
valign: 'middle'
}, */
{
field: 'progress_title',
title: '进度标题',
align: 'left',
valign: 'middle',
width: '82%',
formatter: function (value, row, index) {
return '<div class="office_examine_tilte">'+ value +'</div>';
}
}, {
field: 'progress_time',
title: '进度时间',
align: 'right',
valign: 'middle',
width: '18%',
formatter: function (value, row, index) {
return '<span style="color:#bbb;margin-right:23px;">'+ value +'</span>';
}
}
]
})
}
//渲染历史查询列表
function init_office_history_list(){
var infos = [
{history_time:'2018/08/15 08:23',history_title:'历史记录8月17去了趟水上乐园!!!'},
{history_time:'2018/08/15 08:23',history_title:'历史记录8月17去了趟水上乐园!!!'},
{history_time:'2018/08/15 08:23',history_title:'历史记录8月17去了趟水上乐园!!!'},
{history_time:'2018/08/15 08:23',history_title:'历史记录8月17去了趟水上乐园!!!'},
{history_time:'2018/08/15 08:23',history_title:'历史记录8月17去了趟水上乐园!!!'},
{history_time:'2018/08/15 08:23',history_title:'历史记录8月17去了趟水上乐园!!!'},
{history_time:'2018/08/15 08:23',history_title:'历史记录8月17去了趟水上乐园!!!'},
{history_time:'2018/08/15 08:23',history_title:'历史记录8月17去了趟水上乐园!!!'},
{history_time:'2018/08/15 08:23',history_title:'历史记录8月17去了趟水上乐园!!!'},
{history_time:'2018/08/15 08:23',history_title:'历史记录8月17去了趟水上乐园!!!'},
{history_time:'2018/08/15 08:23',history_title:'历史记录8月17去了趟水上乐园!!!'},
{history_time:'2018/08/15 08:23',history_title:'历史记录8月17去了趟水上乐园!!!'}
];
$('#office_history').bootstrapTable('destroy').bootstrapTable({
/* showColumns:true,
showToggle:true,
showRefresh:true,
search:true, */
/* url: "bootstrap-table/data/data1.json", // 获取表格数据的url */
data:infos,
cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
/* striped: true, //表格显示条纹，默认为false */
pagination: true, // 在表格底部显示分页组件，默认false
pageList: [5,10,15,20], // 设置页面可以显示的数据条数
pageSize: 10, // 页面数据条数
pageNumber: 1, // 首页页码,
uniqueId:'UUID',
//clickToSelect:true,//True to select checkbox or radiobox when the column is clicked.
queryParams:function(params){
var temp = { //这里的键的名字和控制器的变量名必须一直，这边改动，控制器也需要改成一样的
// limit: params.limit, //页面大小
offset: params.offset, //页码
pageSize:this.pageSize,
pageNumber:this.pageNumber
/* projectId: $("#projectId").val(),
requirement_Id:$("#requirement_Id").val(),
length: 6 */
};
return temp;
},
columns: [
/*{
checkbox: true, // 显示一个勾选框
align: 'center', // 居中显示
valign: 'middle'
}, */
{
field: 'history_title',
title: '进度标题',
align: 'left',
valign: 'middle',
width: '82%',
formatter: function (value, row, index) {
return '<div class="office_examine_tilte">'+ value +'</div>';
}
}, {
field: 'history_time',
title: '进度时间',
align: 'right',
valign: 'middle',
width: '18%',
formatter: function (value, row, index) {
return '<span style="color:#bbb;margin-right:23px;">'+ value +'</span>';
}
}
]
})
}
\ No newline at end of file
WebContent/jfcas04/js/officeDetail.js 0 → 100644
$(function(){
//去掉尾部的一个div
$('.index_footer').next().remove();
//初始化容器的最小高度
init_officeDetail_container_minHeight();
})
//初始化容器的最小高度
function init_officeDetail_container_minHeight(){
var height = $(window).height() - $('.indedx_header').outerHeight(true) - $('.indedx_header_logo').outerHeight(true) - $('.index_center').outerHeight(true) - $('.officeDetail_bg').outerHeight(true) - $('.index_footer').outerHeight(true) - 10;
if(height>0){
$('.officeDetail_content').css('min-height',height);
}
}
//切换流程图的显示
function officeDetail_changeFlow(handler){
var really_height = $('.officeDetail_content').css('min-height');
if(!$('.officeDetail_content').data('minHeight')){
$('.officeDetail_content').data('minHeight',really_height);
}
else{
really_height = $('.officeDetail_content').data('minHeight');
}
really_height = really_height.replace(/px/,'');
var title_height = $('.officeDetail_content_title').outerHeight(true);
var min_height = document.body.clientHeight - $('.indedx_header').outerHeight(true) - $('.indedx_header_logo').outerHeight(true) - $('.index_center').outerHeight(true) - $('.officeDetail_bg').outerHeight(true) - $('.index_footer').outerHeight(true) - title_height ;
if($(handler).data('change')!='1'){
$(handler).data('change','1');
//去掉申请内容
$('.officeDetail_content').css('overflow','hidden');
$('.officeDetail_content').animate({'height':title_height,'min-height':'0'});
//显示流程图的内容
$('.officeDetail_flow').css('height','auto');
//从高度为10开始执行动画
$('.officeDetail_flow_content').height(10).animate({'height':min_height});
//改变点击按钮位置
$('.officeDetail_flow_toggole').css({'margin-top':'0','background':'white','border-radius':'0 0 3px 3px '});
$('.officeDetail_flow_toggole').find('img').attr('src','custom/images/officeDetail_down.png');
$('.officeDetail_flow_toggole').find('span').text('收起');
}
else{
$(handler).data('change','0');
//显示申请的内容
$('.officeDetail_content').animate({'min-height':really_height},function(){
$(this).css('height','auto');
});
//去掉流程图的内容
$('.officeDetail_flow').animate({'height':'10'});
$('.officeDetail_flow_content').animate({'height':'0'});
//改变点击按钮位置
$('.officeDetail_flow_toggole').css({'margin-top':'-25px','background':'#f3f3f3','border-radius':'3px 3px 0 0 '});
$('.officeDetail_flow_toggole').find('img').attr('src','custom/images/officeDetail_up.png');
$('.officeDetail_flow_toggole').find('span').text('展开');
}
}
\ No newline at end of file
WebContent/jfcas04/office.jsp 0 → 100644
<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<c:set var="ctx" value="${pageContext.request.contextPath}"/>
<html>
<head>
<title>办事大厅</title>
<jsp:include page="header.jsp"></jsp:include>
<script type="text/javascript" src="${pageContext.request.contextPath}/jwapp/pages/portlet/js/jwAppPortletModule.js" charset="utf-8"></script>
<script src="${ctx}/jfcas04/js/office.js"></script>
</head>
<body>
<!-- 头部 -->
<jsp:include page="/nav4.jsp"></jsp:include>
<!-- 内容部分 -->
<div class="container-fluid">
<!--背景图-->
<div class="row office_bg">
<div class="office_bg_content col-md-12">
<div class="col-md-3">
<div class="office_bg_content_click">
<img src="${ctx}/custom/images/office_apply.png" width="100" height="100"/>
<div>我要申请</div>
</div>
</div>
<div class="col-md-3">
<div class="">
<img src="${ctx}/custom/images/office_examine.png" width="100" height="100"/>
<div>我要审批</div>
</div>
</div>
<div class="col-md-3">
<div class="">
<img src="${ctx}/custom/images/office_progress.png" width="100" height="100"/>
<div>进度查询</div>
</div>
</div>
<div class="col-md-3">
<div class="">
<img src="${ctx}/custom/images/office_history.png" width="100" height="100"/>
<div>历史查询</div>
</div>
</div>
</div>
</div>
<!-- 申请模块 -->
<div class="office_module row">
<div class="office_module_title col-md-12">
<img src="${ctx}/custom/images/office_title.png" height="16" width="16" />
<span>我要申请</span>
</div>
<div class="office_apply col-md-12">
<div class="office_apply_content">
<!-- <div><div><div>报工申请</div></div></div>
<div><div><div>报工申请报工申请</div></div></div>
<div><div><div>报工申请</div></div></div>
<div><div><div>报工申请报工申请</div></div></div>
<div><div><div>报工申请</div></div></div>
<div><div><div>报工申请报工申请</div></div></div>
<div><div><div>报工申请</div></div></div>
<div><div><div>报工申请报工申请</div></div></div>
<div><div><div>报工申请</div></div></div>
<div><div><div>报工申请报工申请</div></div></div>
<div><div><div>报工申请</div></div></div>
<div><div><div>报工申请报工申请</div></div></div> -->
</div>
</div>
</div>
<!-- 审批模块 -->
<div class="office_module row" style="display:none">
<div class="office_module_title col-md-12">
<img src="${ctx}/custom/images/office_title.png" height="16" width="16" />
<span>我要审批</span>
<a href="#">只显示待审批申请</a>
</div>
<div class="col-md-12 office_examine office_table">
<table id="office_examine"></table>
</div>
</div>
<!-- 进度查询模块 -->
<div class="office_module row" style="display:none">
<div class="office_module_title col-md-12">
<img src="${ctx}/custom/images/office_title.png" height="16" width="16" />
<span>进度查询</span>
<div>
<input type="text" /><img src="${ctx}/custom/images/office_search.png" width="24" height="24" />
</div>
</div>
<div class="col-md-12 office_examine office_table">
<table id="office_progress"></table>
</div>
</div>
<!-- 历史查询模块 -->
<div class="office_module row" style="display:none">
<div class="office_module_title col-md-12">
<img src="${ctx}/custom/images/office_title.png" height="16" width="16" />
<span>历史查询</span>
<div>
<input type="text" /><img src="${ctx}/custom/images/office_search.png" width="24" height="24" />
</div>
</div>
<div class="col-md-12 office_examine office_table">
<table id="office_history"></table>
</div>
</div>
<!--主容器结尾-->
</div>
<!-- 尾部 -->
<jsp:include page="/footer.jsp"></jsp:include>
</body>
</html>
WebContent/jfcas04/officeDetail.jsp 0 → 100644
<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<c:set var="ctx" value="${pageContext.request.contextPath}"/>
<html>
<head>
<title>办事大厅的详情信息</title>
<jsp:include page="header.jsp"></jsp:include>
<script type="text/javascript" src="${pageContext.request.contextPath}/jwapp/pages/portlet/js/jwAppPortletModule.js" charset="utf-8"></script>
<script src="${ctx}/jfcas04/js/officeDetail.js"></script>
</head>
<body>
<!-- 头部 -->
<jsp:include page="/nav4.jsp"></jsp:include>
<!-- 内容部分 -->
<div class="container-fluid">
<!-- 背景图 -->
<div class="row officeDetail_bg"></div>
<!-- 详情 -->
<div class="row officeDetail_content">
<div class="officeDetail_content_title col-md-12">
<span>请假申请</span>
<div onclick="location.href='office'"><img src="${ctx}/custom/images/officeDetail_back.png" width="16" height="16" /><span>返回</span></div>
<div><span>*</span><span>必填</span></div>
</div>
<div class="officeDetail_content_div col-md-12">
<div>申请内容</div>
<div>申请内容</div>
<div>申请内容</div>
<div>申请内容</div>
<div>申请内容</div>
<div>申请内容</div>
<div>申请内容</div>
<div>申请内容</div>
<!-- <div style="height:500px;background:red;">申请内容</div> -->
</div>
</div>
<!-- 流程图 -->
<div class="row officeDetail_flow">
<div class="officeDetail_flow_toggole" onClick="officeDetail_changeFlow(this)"><img src="${ctx}/custom/images/officeDetail_up.png" width="7" height="4" /><span>展开</span></div>
<div class="col-md-12 officeDetail_flow_content" >
<div>流程图</div>
<div>流程图</div>
<div>流程图</div>
<div>流程图</div>
<div>流程图</div>
<div>流程图</div>
<div>流程图</div>
<div>流程图</div>
<!-- <div style="height:500px;background:red;">流程图</div> -->
</div>
</div>
<!--主容器结尾-->
</div>
<!-- 尾部 -->
<jsp:include page="/footer.jsp"></jsp:include>
</body>
</html>
WebContent/jwapp/pages/vote/js/voteModule.js 0 → 100644
//此乃本模块与后台交互的方法接口部分
var voteModule = function(format) {
this.module = "";
this.action = "";
this.format = format;
};
//定义数据交互
voteModule.prototype = BusinessObject;
//插入附件数据
voteModule.prototype.insertVote = function(){};
//修改附件数据
voteModule.prototype.updateVote = function(){};
//删除附件数据
voteModule.prototype.deleteVote = function(){};
//附件数据_分页
voteModule.prototype.list = function(){};
//附件所有数据
voteModule.prototype.listAll = function(){};
//创建一个数据操作对象，然后再后续使用
voteModule.voteActAction = new voteModule("json").delegate("voteAct");
//创建一个数据获取对象，然后再后续使用
voteModule.voteDataAction = new voteModule("json").delegate("voteData");
//说明： 1、所有方法里统一传递josn格式的参数，用于后台交互，如data.listTables(param) ，如没有参数则传'{}'，如data.listTables({})
// 2、前后台数据获取传输协议 如：json[{'0':{pageCount':'2','pageNo':'1','pageSize':'20','rowSet':'[{0},{1}....]'}}]
// 3、前后台增删改的返回状态 如：json[{'0':{'rowSet':{'NAME':'-1','VALUE':'保存失败'}}}]
WebContent/jwapp/pages/vote/js/voteTab.js 0 → 100644
/**
* 序号：1
* 功能：定义分页(EasyUI)
* 参数：
* 说明：
* 作者：朱天成
* 时间：2018-08-07
* 单位：宁波金网
* 备注：无需更改
**/
var ls_width = $(window).width();
var ls_height = $(window).height();
var local_page=1;
var rows=20;
var listPageSize = [10,20,50,100,500,1000];
var queryData = eval("({'page':'"+local_page+"','rows':'"+rows+"'})");
var tab_n = 0;
//重置分页参数
function resetQueryData(){
queryData = "";
queryData = eval("({'page':'"+local_page+"','rows':'"+rows+"'})");
}
//定义附件关联模块ID(1:一般业务,2:测试信息,3:审批业务,999:其它数据 )
var ls_module_id='2';
//定义当前模块业务类型(YBYW:一般业务,SPGL:审批业务)
var ls_ywlx = 'YBYW';
/****/
/**
* 序号：2
* 功能：构建下拉框内容
* 参数：
* 说明：方便新增、修改页面里的下拉选项加载数据
* 作者：朱天成
* 时间：2018-08-07
* 单位：杰夫兄弟智慧科技有限公司
* 备注：需更改
**/
/****/
/**
* 序号：3
* 功能：构建主页面列表
* 参数：
* 说明：
* 作者：朱天成
* 时间：2018-08-07
* 单位：杰夫兄弟智慧科技有限公司
* 备注：需更改
**/
//定义grid列表
var ls_title="投票管理功能&nbsp;&nbsp;<font color='#993300'></font>";
var is_column = [ [
{field : 'CONTENT',title : '主题内容',width : 150,align : 'center'},
{field : 'START_TIME',title : '开始时间',width : 150,align : 'center'},
{field : 'END_TIME',title : '结束时间',width : 150,align : 'center'},
{field : 'CREATE_ID',title : '创建人',width : 80,align : 'center'},
{field : 'CREATE_TIME',title : '创建时间',width : 150,align : 'center'},
{field : 'UPDATE_ID',title : '修改人',width : 80,align : 'center'},
{field : 'UPDATE_TIME',title : '修改时间',width : 150,align : 'center'},
] ];
//列表加载完成回调
function dataOnLoadSuccess(){
}
//设置颜色和每行高度
function rowstyler(index,row){
}
//展示列表
datagrid("list",ls_title,gaowj.WEB_APP_NAME + "/voteData_list",queryData,is_column,60,80);
/****/
/**
* 序号：4
* 功能：设置主页面操作列菜单
* 参数：
* 说明：
* 作者：朱天成
* 时间：2018-08-07
* 单位：杰夫兄弟智慧科技有限公司
* 备注：需更改
**/
//操用列显示更多(一般情况下无需更改)
function formatMenu(value, data,index) {
var returnData="";
return returnData
+ "<span class=\"icon-ext-moremenu\" style=\"padding-left:20px;*width:20px;\"></span>"
+ "<span data-p1="+index+" class=\"easyui-tooltip\" style=\"color:blue;cursor:pointer;\">更多</span>";
}
//上浮横向菜单集里的具体菜单项(需更改)
function getOptionMenu(data,index){
var returnData= "<span class=\"icon-edit\" style=\"padding-left:20px;*width:20px;\"></span> <a href=\"javascript:void(0);\" onclick=\"editRow('"
+ index + "')\">编辑</a> | <span class=\"icon-clear\" style=\"padding-left:20px;*width:20px;\"></span><a href=\"javascript:void(0);\" onclick=\"deleteRow('"
+ index + "')\">删除</a> | <span class=\"icon-ext-file\" style=\"padding-left:20px;*width:20px;\"></span><a href=\"javascript:void(0);\" onclick=\"uploadcommonRow('"
+ index + "')\">附件</a>";
return returnData;
}
//返回菜单集的菜单个数(需更改)
function getOptionMenuCount(){
var is_menu_count = 3;
return is_menu_count;
}
/****/
/**
* 序号：5
* 功能：新增修改弹出
* 参数：
* 说明：
* 作者：朱天成
* 时间：2018-08-07
* 单位：杰夫兄弟智慧科技有限公司
* 备注：需更改
**/
//加载增加子页面
function addRow(){
var is_row={OPETYPE:'insert'};
openEditRow("voteView_voteTabDetail",is_row,"新增",true,0.65,0.95,0,0);
}
//加载增加子页面成功后的回调
function addUrlOnloadCallback(is_row){
}
//保存
function insertData(is_entity){
// is_entity.FIELD_CREATE_TIME = strToDateObj(is_entity.FIELD_CREATE_TIME);
// is_entity.FIELD_RECEIVE_DATE = strToDateObj(is_entity.FIELD_RECEIVE_DATE);
var v_result = voteModule.voteActAction.insertVote(is_entity);
$('#list').datagrid('reload');
return v_result;
}
//加载修改子页面
function editRow(index) {
$('#list').datagrid('selectRow',index);
var is_row = $('#list').datagrid('getSelections');
$('#list').datagrid('clearSelections');
is_row[0].OPETYPE = 'update';
openEditRow("voteView_voteTabDetail",is_row[0],"编辑",true,0.65,0.95,0,0);
}
//加载修改子页面成功后的回调
function updateUrlOnloadCallback(is_row){
}
//保存
function updateData(is_entity){
// is_entity.FIELD_CREATE_TIME = strToDateObj(is_entity.FIELD_CREATE_TIME);
// is_entity.FIELD_RECEIVE_DATE = strToDateObj(is_entity.FIELD_RECEIVE_DATE);
v_result = voteModule.mvoteActAction.updateVote(is_entity);
$('#list').datagrid('reload');
return v_result;
}
/****/
/**
* 序号：6
* 功能：单个删除
* 参数：
* 说明：
* 作者：朱天成
* 时间：2018-08-07
* 单位：杰夫兄弟智慧科技有限公司
* 备注：需更改
**/
function deleteRow(index){
$('#list').datagrid('selectRow',index);
var is_row = $('#list').datagrid('getSelections');
$('#list').datagrid('clearSelections');
var code = is_row[0].UUID;
$.messager.confirm('提示', '确定删除?', function(r) {
if (r) {
var v_query = {};
v_query.FIELD_CODE = code;
var v_result = voteModule.voteActAction.deleteVote(v_query);
$.messager.alert('提示',v_result.VALUE);
$('#list').datagrid('reload');
}
});
}
/****/
/**
* 序号：7
* 功能：批量删除
* 参数：
* 说明：
* 作者：朱天成
* 时间：2018-08-07
* 单位：杰夫兄弟智慧科技有限公司
* 备注：需更改
**/
function deleteBatchRow(){
var code="";
var rows = $('#list').datagrid('getSelections');
for(var i=0; i<rows.length; i++){
code = code + rows[i].UUID+",";
}
if(rows == null || rows == ""){
$.messager.alert('提示',"请选择需删除的记录!",'info');
return;
}
if(code.length>0){
code = code.substring(0,code.length - 1);
}
$.messager.confirm('提示', '确定删除?', function(r) {
if (r) {
var v_query = {};
v_query.FIELD_CODE = code;
var v_result = voteModule.voteActAction.deleteVote(v_query);
$.messager.alert('提示',v_result.VALUE);
$('#list').datagrid('reload');
}
});
}
/****/
/**
* 序号：8
* 功能：刷新
* 参数：
* 说明：
* 作者：朱天成
* 时间：2018-08-07
* 单位：杰夫兄弟智慧科技有限公司
* 备注：需更改
**/
function refreshRow(){
$('#list').datagrid('load',{});
$("#voteTab_searchForm")[0].reset();
}
/****/
/**
* 序号：9
* 功能：查询
* 参数：
* 说明：
* 作者：朱天成
* 时间：2018-08-07
* 单位：杰夫兄弟智慧科技有限公司
* 备注：需更改
**/
function searchRow(){
var v_query = $("#voteTab_searchForm").getFormVal();
$('#list').datagrid('load',v_query);
}
/****/
/**
* 序号：10
* 功能：高级查询弹出
* 参数：
* 说明：
* 作者：朱天成
* 时间：2018-08-07
* 单位：杰夫兄弟智慧科技有限公司
* 备注：需更改
**/
//加载高级查询子页面
function advsearchRow(){
var is_row={OPETYPE:'ww'};
openAdvsearchRow("voteView_voteAdvsearch",is_row,"高级查询",true,0.65,0.95,0,0);
}
//加载高级查询子页面成功后的回调
function addAdvsearchCallback(is_row){
}
//高级查询
function advsearchData(is_entity){
// is_entity.FIELD_START_TIME = strToDateObj(is_entity.FIELD_START_TIME);
// is_entity.FIELD_END_TIME = strToDateObj(is_entity.FIELD_END_TIME);
// is_entity.FIELD_START_SCHOOLTIME = strToDateObj(is_entity.FIELD_START_SCHOOLTIME);
// is_entity.FIELD_END_SCHOOLTIME = strToDateObj(is_entity.FIELD_END_SCHOOLTIME);
$('#list').datagrid('load',is_entity);
}
/****/
/**
* 序号：11
* 功能：处理接口附件
* 参数：
* 说明：
* 作者：朱天成
* 时间：2018-08-07
* 单位：杰夫兄弟智慧科技有限公司
* 备注：需更改
**/
function uploadcommonRow(index){
$('#list').datagrid('selectRow',index);
var is_row = $('#list').datagrid('getSelections');
$('#list').datagrid('clearSelections');
var code = is_row[0].UUID;
var is_row={MAINDATA_ID:code,MODULE_ID:ls_module_id};
var editUrl = "uploadFileCommonView_uploadfileCommonTab?FIELD_MODULE_ID="+ls_module_id+"&FIELD_MAINDATA_ID="+code;
openViewIframRow("uploadcommon",editUrl,is_row,"毕业证附件",true,0.65,0.95,0,0);
}
/****/
/**
* 序号：12
* 功能：批量处理接口附件
* 参数：
* 说明：
* 作者：朱天成
* 时间：2018-08-07
* 单位：杰夫兄弟智慧科技有限公司
* 备注：需更改
**/
function uploadcommonBatchRow(){
var code="";
var rows = $('#list').datagrid('getSelections');
for(var i=0; i<rows.length; i++){
code = code + rows[i].UUID+",";
}
if(rows == null || rows == ""){
$.messager.alert('提示',"请选择记录!",'info');
return;
}
if(code.length>0){
code = code.substring(0,code.length - 1);
}
var is_row={MAINDATA_ID:code,MODULE_ID:ls_module_id};
var editUrl = "uploadFileCommonView_uploadfileCommonTab?FIELD_MODULE_ID="+ls_module_id+"&FIELD_MAINDATA_ID="+code;
openViewIframRow("uploadcommon",editUrl,is_row,"批量毕业证附件",true,0.65,0.95,0,0);
}
/****/
\ No newline at end of file
WebContent/jwapp/pages/vote/voteAdvsearch.jsp 0 → 100644
<%@page contentType="text/html; charset=UTF-8"%>
<form id="inputForm" method="post" style="width: 100%;">
<input type="hidden" name="FIELD_OPETYPE" id="OPETYPE" value="${is_row.OPETYPE}"/>
<input type="hidden" name="FIELD_UUID" id="UUID" value="${is_row.UUID}"/>
<table align="center" border="0" cellpadding="0" cellspacing="0" class="tableStyle" style="margin: 10px 15px; width: 95%; line-height: 30px;">
<tr>
<td style="width: 15%;" class="tableStyleLable">
<span>会议内容:</span>
</td>
<td style="width: 85%">
<input class="easyui-textbox" id="adv_CONTENT" name="FIELD_CONTENT" style="width:365px" />
</td>
</tr>
<tr>
<td style="width: 20%;" class="tableStyleLable">
<span>
投票开始时间从:
</span>
</td>
<td style="width: 80%">
<input class="easyui-datetimebox" id="adv_START_START_TIME" name="FIELD_START_START_TIME"/>
<span>到</span>
<input id="adv_END_START_TIME" name="FIELD_END_START_TIME" type="text" class="easyui-datetimebox">
</td>
</tr>
<tr>
<td style="width: 20%;" class="tableStyleLable">
<span>
投票结束时间从:
</span>
</td>
<td style="width: 80%">
<input class="easyui-datetimebox" id="adv_START_END_TIME" name="FIELD_START_END_TIME"/>
<span>到</span>
<input id="adv_END_END_TIME" name="FIELD_END_END_TIME" type="text" class="easyui-datetimebox">
</td>
</tr>
</table>
</form>
\ No newline at end of file
WebContent/jwapp/pages/vote/voteTab.jsp 0 → 100644
<%@page contentType="text/html; charset=UTF-8"%>
<%@ include file="/gaowj/header-simple-1.0.jsp"%>
<div id="voteTab">
<link rel="stylesheet" type="text/css" href="${ctx}/jwapp/common/css/content_body.css" charset="utf-8"></link>
<link rel="stylesheet" type="text/css" href="${ctx}/jwapp/common/css/content_table.css" charset="utf-8"></link>
<link rel="stylesheet" type="text/css" href="${ctx}/jwapp/common/css/content_input.css" charset="utf-8"></link>
</div>
<table id="list" style="width: 100%; height: 100%;"></table>
<div id="tb">
<form id="voteTab_searchForm" style="float:left">
主题名称: <input class="easyui-textbox" id="FIELD_CONTENT" name="FIELD_CONTENT" style="width:200px"/>&nbsp;&nbsp;
</form>
<a href="#" class="easyui-linkbutton" data-options="iconCls:'icon-search',plain:true" onclick="javascript:searchRow()">主题查询</a>
<a href="#" class="easyui-linkbutton" data-options="iconCls:'icon-ext-advsearch',plain:true" onclick="javascript:advsearchRow()">高级查询</a>
<a href="#" class="easyui-linkbutton" data-options="iconCls:'icon-reload',plain:true" onclick="javascript:refreshRow()">刷新</a>
<a href="#" class="easyui-linkbutton" data-options="iconCls:'icon-add',plain:true" onclick="javascript:addRow()">新增主题</a>
<a href="#" class="easyui-linkbutton" data-options="iconCls:'icon-clear',plain:true" onclick="javascript:deleteBatchRow()">删除主题</a>
<a href="#" class="easyui-linkbutton" data-options="iconCls:'icon-ext-file',plain:true" onclick="javascript:uploadcommonBatchRow()">附件上传</a>
</div>
<div id="detail" style="overflow:auto;"></div>
<div id="advsearch" style="overflow:auto;"></div>
<div id="uploadcommon" style="overflow:auto;"></div>
<script type="text/javascript" src="${ctx}/jwapp/pages/standard/js/jwStandardModule.js" charset="utf-8"></script>
<script type="text/javascript" src="${ctx}/jwapp/pages/vote/js/voteModule.js" charset="utf-8"></script>
<script type="text/javascript" src="${ctx}/jwapp/pages/vote/js/voteTab.js" charset="utf-8"></script>
WebContent/jwapp/pages/vote/voteTabDetail.jsp 0 → 100644
<%@page contentType="text/html; charset=UTF-8"%>
<form id="inputForm" method="post" style="width: 100%;">
<input type="hidden" name="FIELD_OPETYPE" id="OPETYPE" value="${is_row.OPETYPE}"/>
<input type="hidden" name="FIELD_UUID" id="UUID" value="${is_row.UUID}"/>
<table align="center" border="0" cellpadding="0" cellspacing="0" class="tableStyle" style="margin: 10px 15px; width: 95%; line-height: 30px;">
<tr>
<td style="width: 15%;" class="tableStyleLable">
<span>主题内容:</span>
</td>
<td style="width: 85%">
<input class="easyui-textbox" id="CONTENT" name="FIELD_CONTENT" style="width:400px" required=true value="${is_row.CONTENT}"/>
</td>
</tr>
<tr>
<td class="tableStyleLable">
<span>投票开始时间:</span>
</td>
<td>
<input class="easyui-datetimebox" id="START_TIME" name="FIELD_START_TIME" style="width:400px" value="${is_row.START_TIME}"/>
</td>
</tr>
<tr>
<td class="tableStyleLable">
<span>投票结束时间:</span>
</td>
<td>
<input class="easyui-datetimebox" id="END_TIME" name="FIELD_END_TIME" style="width:400px" value="${is_row.END_TIME}"/>
</td>
</tr>
</table>
</form>
\ No newline at end of file
WebContent/lib/plug/xcConfirm/css/xcConfirm.css
......@@ -26,7 +26,7 @@
/* .xcConfirm .popBox .txtBox{margin: 40px 100px; height: 100px; overflow: hidden;} */
.xcConfirm .popBox .txtBox{
margin: 30px 100px;
height: 57px;
height: 61px;
overflow: hidden;
margin-top: 40px;
}
......
WebContent/nav4.jsp
<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib uri="/struts-tags" prefix="s" %>
<c:set var="ctx" value="${pageContext.request.contextPath}"/>
<div class="indedx_header">
<div onclick="location.href='interim'">
......@@ -9,10 +10,10 @@
<a href="javascript:void(0)" class="index_header_showMessage">
<img src="${ctx}/custom/images/index4_loginmessage.png" width="12" height="12" />登录信息
<ul>
<li><span>登录账号</span><span>test001</span></li>
<li><span>姓名</span><span>小周</span></li>
<li><span>登录时间</span><span>2018.02.22 12:24:38</span></li>
<li><span>上次时间</span><span>2017.02.22 12:24:38</span></li>
<li><span>登录账号</span><span><s:property value="#session.userInfo['EMID']"/></span></li>
<li><span>姓名</span><span><s:property value="#session.userInfo['EMNAME']"/></span></li>
<li><span>登录IP</span><span><s:property value="#session.userInfo['LOGINIP']"/></span></li>
<li><span>上次时间</span><span><s:property value="#session.userInfo['BEFORETIME']"/></span></li>
</ul>
</a><span>|</span>
<a href="#">
......
src/struts-ext.xml
......@@ -75,11 +75,21 @@
method="share">
<result name="share">/jfcas04/share.jsp</result>
</action>
<!-- 分享 -->
<!-- 分享详情 -->
<action name="shareDetail" class="com.jw.app.portlet.action.viewAction"
method="shareDetail">
<result name="shareDetail">/jfcas04/shareDetail.jsp</result>
</action>
<!-- 办事大厅 -->
<action name="office" class="com.jw.app.portlet.action.viewAction"
method="office">
<result name="office">/jfcas04/office.jsp</result>
</action>
<!-- 办事大厅的详情页 -->
<action name="officeDetail" class="com.jw.app.portlet.action.viewAction"
method="officeDetail">
<result name="officeDetail">/jfcas04/officeDetail.jsp</result>
</action>
<action name="userchoiceData_*" class="com.jw.app.userchoice.action.dataAction" method="{1}">
<result name="json" type="json">
......@@ -106,6 +116,23 @@
method="{1}">
<result name="{1}">/jwapp/pages/calendar/{1}.jsp</result>
</action>
<!-- 投票主题 -->
<action name="voteAct_*" class="com.jw.app.vote.action.actAction"
method="{1}">
<result name="json" type="json">
<param name="root">jsonObject</param>
</result>
</action>
<action name="voteData_*" class="com.jw.app.vote.action.dataAction"
method="{1}">
<result name="json" type="json">
<param name="root">jsonObject</param>
</result>
</action>
<action name="voteView_*" class="com.jw.app.vote.action.viewAction"
method="{1}">
<result name="{1}">/jwapp/pages/vote/{1}.jsp</result>
</action>
</package>
<package name="src_jwapp_store" extends="gaowj">
<action name="storeAct_*" class="com.jw.app.store.action.actAction"
......
src_jwapp/com/jw/app/business/VoteBusiness.java 0 → 100644
package com.jw.app.business;
import java.util.List;
import java.util.Map;
import org.springframework.stereotype.Service;
import com.gaowj.business.exception.BusinessException;
import com.gaowj.business.util.Page;
@Service
public interface VoteBusiness {
/**
* 插入
* @param entity
* @throws BusinessException
*/
void insert_vote(Map<String,Object> entity) throws BusinessException ;
/**
* 更新
* @param entity
* @throws BusinessException
*/
void update_vote(Map<String,Object> entity) throws BusinessException ;
/**
* 删除记录
* @param entity
* @throws BusinessException
*/
void delete_vote(List<String> list)throws BusinessException;
/**
* 分页获取记录
* @param entity
* @throws BusinessException
*/
Page<Map<String, Object>> list_vote(int pageNo, int pageSize, Map<String, Object> query)throws BusinessException ;
/**
* 获取所有记录
* @param entity
* @throws BusinessException
*/
List<Map<String,Object>> list_vote(Map<String, Object> query) throws BusinessException ;
/**
* 获取所有记录数
* @param entity
* @throws BusinessException
*/
int listCount_vote(Map<String, Object> query) throws BusinessException ;
}
src_jwapp/com/jw/app/business/vote/VoteBusinessImpl.java 0 → 100644
package com.jw.app.business.vote;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.apache.commons.lang.StringUtils;
import org.apache.ibatis.session.RowBounds;
import com.jw.app.business.VoteBusiness;
import com.gaowj.business.exception.BusinessException;
import com.gaowj.business.util.Page;
import com.gaowj.business.util.SessionUtil;
import com.gaowj.standard.utils.CacheKit;
public class VoteBusinessImpl implements VoteBusiness {
private voteDAO voteDAO;
public voteDAO getvoteDAO() {
return voteDAO;
}
public void setvoteDAO(voteDAO voteDAO) {
this.voteDAO = voteDAO;
}
@Override
public void insert_vote(Map<String, Object> entity) throws BusinessException {
if(entity.get("UUID")==null){
entity.put("UUID", java.util.UUID.randomUUID().toString());
}
if(entity.get("CREATE_ID")==null){
entity.put("CREATE_ID", SessionUtil.getCode() );
}
if(entity.get("CREATE_TIME")==null){
entity.put("CREATE_TIME", new Date());
}
if(entity.get("UPDATE_ID")==null){
entity.put("UPDATE_ID", SessionUtil.getEmname());
}
if(entity.get("UPDATE_TIME")==null){
entity.put("UPDATE_TIME", new Date());
}
// if(entity.get("SAVEDAYS")==null){
// String ls_savedays = PropUtil.getValue("set_savedays", "quartz_service", "14");
// entity.put("SAVEDAYS", Integer.parseInt(ls_savedays));
// }
//动态传值插入
List<String> infoListKey = new ArrayList<String>();
List<Object> infoList = new ArrayList<Object>();
if(entity.keySet()!=null){
Set<String> key = entity.keySet();
// 将map集合中的key和value 取出来分别放到list集合里
for (String str : key) {
infoList.add(entity.get(str));
infoListKey.add(str);
}
entity.put("infoListKey", infoListKey);
entity.put("infoList", infoList);
// 插入
voteDAO.insert_vote(entity);
}
}
@Override
public void update_vote(Map<String, Object> entity) throws BusinessException {
//动态传值修改
List<Map<String, Object>> updateList = new ArrayList<Map<String, Object>>();
if(entity.keySet()!=null){
Set<String> key = entity.keySet();
// 将map集合中的key和value 取出来分别放到list集合里
for (String str : key) {
Map<String, Object> updateMap = new HashMap<String, Object>();
if (StringUtils.equalsIgnoreCase("UUID",str)) continue;
updateMap.put("key", str);
updateMap.put("value", entity.get(str));
updateList.add(updateMap);
}
entity.put("info", updateList);
//
voteDAO.update_vote(entity);
}
}
@Override
public void delete_vote(List<String> list) throws BusinessException {
voteDAO.delete_vote(list);
}
@Override
public Page<Map<String, Object>> list_vote(int pageNo, int pageSize,Map<String, Object> query) throws BusinessException {
//计算起始记录
int pageStart = (pageNo - 1) * pageSize;
//获取列表
List<Map<String, Object>> items = voteDAO.list_vote(new RowBounds(pageStart, pageSize), query);
//获取列表个数
int count = listCount_vote(query);
//创建分页对象
Page<Map<String, Object>> page = new Page<Map<String, Object>>();
page.setStart(pageStart);
page.setLimit(pageSize);
page.setCount(count);
page.setItems(items);
return page;
}
@Override
public List<Map<String, Object>> list_vote(Map<String, Object> query) throws BusinessException {
List<Map<String, Object>> list_data = CacheKit.get("ehcache10", "vote"+query);
if(list_data==null || list_data.size()==0){
list_data=voteDAO.list_vote(query);
CacheKit.put("ehcache10", "vote"+query, list_data);
}
return list_data;
}
@Override
public int listCount_vote(Map<String, Object> query) throws BusinessException {
return voteDAO.listCount_vote(query);
}
}
src_jwapp/com/jw/app/business/vote/voteDAO.java 0 → 100644
package com.jw.app.business.vote;
import java.util.List;
import java.util.Map;
import org.apache.ibatis.session.RowBounds;
import com.gaowj.business.exception.BusinessException;
public interface voteDAO {
void insert_vote(Map<String,Object> entity) throws BusinessException ;
void update_vote(Map<String,Object> entity) throws BusinessException ;
void delete_vote(List<String> list) throws BusinessException;
List<Map<String,Object>> list_vote(RowBounds rowbounds, Map<String, Object> query) throws BusinessException ;
List<Map<String,Object>> list_vote(Map<String,Object> query) throws BusinessException ;
int listCount_vote(Map<String, Object> query) throws BusinessException ;
}
src_jwapp/com/jw/app/business/vote/voteDAO.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jw.app.business.vote.voteDAO">
<insert id="insert_vote" parameterType="map">
insert into VOTE_MANAGER(
<trim prefix="" suffixOverrides=",">
<foreach collection="infoListKey" item="key">
${key},
</foreach>
</trim>
<![CDATA[ ) values( ]]>
<trim prefix="" suffixOverrides=",">
<foreach collection="infoList" item="value">
#{value},
</foreach>
</trim>
<![CDATA[ ) ]]>
</insert>
<update id="update_vote" parameterType="map">
<![CDATA[
update VOTE_MANAGER set
]]>
<trim prefix="" suffixOverrides=",">
<foreach collection="info" item="info">
${info.key} = #{info.value} ,
</foreach>
</trim>
<where>
<if test="UUID != null and UUID != ''">
and UUID = #{UUID}
</if>
</where>
</update>
<delete id="delete_vote" parameterType="list">
<![CDATA[
delete from VOTE_MANAGER where UUID IN
]]>
<foreach collection="list" item="UUID" open="(" separator=","
close=")">
#{UUID}
</foreach>
</delete>
<select id="list_vote" parameterType="map" resultType="upperCaseKeyMap">
<![CDATA[
select f.*
from VOTE_MANAGER f where 1=1
]]>
<if test="UUID != null and UUID != ''">
and f.UUID = #{UUID}
</if>
<if test="CONTENT != null and CONTENT != ''">
and f.CONTENT like concat('%',#{CONTENT},'%')
</if>
<if test="START_TIME != null and START_TIME != ''">
and f.START_TIME = #{START_TIME}
</if>
<if test="END_TIME != null and END_TIME != ''">
and f.END_TIME = #{END_TIME}
</if>
<if test="CREATE_ID != null and CREATE_ID != ''">
and f.CREATE_ID like concat('%',#{CREATE_ID},'%')
</if>
<if test="START_TIME != null and START_TIME != ''">
and f.CREATE_TIME &gt;= #{START_TIME}
</if>
<if test="END_TIME != null and END_TIME != ''">
and f.CREATE_TIME &lt;= #{END_TIME}
</if>
<if test="UPDATE_ID != null and UPDATE_ID != ''">
and f.UPDATE_ID = #{UPDATE_ID}
</if>
<if test="UPDATE_TIME != null and UPDATE_TIME != ''">
and f.UPDATE_TIME = #{UPDATE_TIME}
</if>
order by f.CREATE_TIME DESC
</select>
<select id="listCount_vote" parameterType="map" resultType="int">
<![CDATA[
select count(*) c from VOTE_MANAGER f where 1=1
]]>
<if test="UUID != null and UUID != ''">
and f.UUID = #{UUID}
</if>
<if test="CONTENT != null and CONTENT != ''">
and f.CONTENT like concat('%',#{CONTENT},'%')
</if>
<if test="START_TIME != null and START_TIME != ''">
and f.START_TIME = #{START_TIME}
</if>
<if test="END_TIME != null and END_TIME != ''">
and f.END_TIME = #{END_TIME}
</if>
<if test="CREATE_ID != null and CREATE_ID != ''">
and f.CREATE_ID like concat('%',#{CREATE_ID},'%')
</if>
<if test="START_TIME != null and START_TIME != ''">
and f.CREATE_TIME &gt;= #{START_TIME}
</if>
<if test="END_TIME != null and END_TIME != ''">
and f.CREATE_TIME &lt;= #{END_TIME}
</if>
<if test="UPDATE_ID != null and UPDATE_ID != ''">
and f.UPDATE_ID = #{UPDATE_ID}
</if>
<if test="UPDATE_TIME != null and UPDATE_TIME != ''">
and f.UPDATE_TIME = #{UPDATE_TIME}
</if>
</select>
</mapper>
\ No newline at end of file
src_jwapp/com/jw/app/portlet/action/viewAction.java
......@@ -53,4 +53,12 @@ public class viewAction extends BasicAction {
return "shareDetail";
}
public String office() throws BusinessException {
return "office";
}
public String officeDetail() throws BusinessException {
return "officeDetail";
}
}
src_jwapp/com/jw/app/store/action/actAction.java
......@@ -6,6 +6,7 @@ import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.sql.Blob;
import java.sql.SQLException;
import java.text.SimpleDateFormat;
......@@ -447,20 +448,28 @@ public class actAction extends BasicAction {
String uuid = request.getParameter("uuid");
String uploadnew=request.getParameter("uploadnew");
String uploadpath=request.getParameter("uploadpath");
String downloadFilenameEncode1 = PropUtil.getValue("downloadFilenameEncode1", "quartz_service", "gbk");
String downloadFilenameEncode2 = PropUtil.getValue("downloadFilenameEncode2", "quartz_service", "iso8859-1");
super.setEncoding1(downloadFilenameEncode1);
super.setEncoding2(downloadFilenameEncode2);
// String downloadFilenameEncode1 = PropUtil.getValue("downloadFilenameEncode1", "quartz_service", "gbk");
// String downloadFilenameEncode2 = PropUtil.getValue("downloadFilenameEncode2", "quartz_service", "iso8859-1");
// super.setEncoding1(downloadFilenameEncode1);
// super.setEncoding2(downloadFilenameEncode2);
response.setCharacterEncoding("utf-8");
if(new File(uploadpath+File.separator+uploadnew).exists()==false){
db2fileStore(uuid,uploadpath,uploadnew,false);
ret_download = super.download();
}else{
ret_download = super.download();
}
String filename1 = RequestUtils.getString(request, "uploadold");
try {
filename1 = new String(filename1.getBytes("ISO-8859-1"),"UTF-8");
} catch (UnsupportedEncodingException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
// 操作日志
SystemOpeBusiness sysbusiness = BusinessManager.getBusiness(SystemOpeBusiness.class);
sysbusiness.insert_logBusiness("download", "用户["+SessionUtil.getEmname()+"]下载网盘公司文件："+ uploadpath+File.separator+uploadnew,
"下载文件",uploadpath+File.separator+uploadnew, request.getParameter("uploadold"),"store");
"下载文件",uploadpath+File.separator+uploadnew,filename1,"store");
//
return ret_download;
}
......
src_jwapp/com/jw/app/store/action/personal/actAction.java
......@@ -6,6 +6,7 @@ import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.sql.Blob;
import java.sql.SQLException;
import java.text.SimpleDateFormat;
......@@ -72,27 +73,27 @@ public class actAction extends BasicAction {
//去除不要更新的字段
entity.remove("OPETYPE");
//处理目录/文件重名的问题,处理是直接在文件和目录后加数字
Map<String,Object> v_congfu_query = new HashMap<String,Object>();
v_congfu_query.put("FATHER_ID", entity.get("FATHER_ID"));
v_congfu_query.put("CREATOR_ID", entity.get("CREATOR_ID"));
String isfile_1 = (String) entity.get("ISFILE");
if(StringUtils.equals(isfile_1, "1")){
String fname = (String) entity.get("FILE_NAME");
fname = fname.substring(0,fname.lastIndexOf("."));
v_congfu_query.put("FILE_NAME",fname);
}else{
v_congfu_query.put("FILE_NAME", entity.get("FILE_NAME"));
}
int ret_count = business.listCount_storePersonal(v_congfu_query);
if(ret_count>0){
String fname = (String) entity.get("FILE_NAME");
if(StringUtils.equals(isfile_1, "1")){
fname = fname.substring(0,fname.lastIndexOf("."))+"("+ret_count+")."+fname.substring(fname.lastIndexOf(".")+1);
}else{
fname = fname + "("+ret_count+")";
}
entity.put("FILE_NAME",fname);
}
// Map<String,Object> v_congfu_query = new HashMap<String,Object>();
// v_congfu_query.put("FATHER_ID", entity.get("FATHER_ID"));
// v_congfu_query.put("CREATOR_ID", entity.get("CREATOR_ID"));
// String isfile_1 = (String) entity.get("ISFILE");
// if(StringUtils.equals(isfile_1, "1")){
// String fname = (String) entity.get("FILE_NAME");
// fname = fname.substring(0,fname.lastIndexOf("."));
// v_congfu_query.put("FILE_NAME",fname);
// }else{
// v_congfu_query.put("FILE_NAME", entity.get("FILE_NAME"));
// }
// int ret_count = business.listCount_storePersonal(v_congfu_query);
// if(ret_count>0){
// String fname = (String) entity.get("FILE_NAME");
// if(StringUtils.equals(isfile_1, "1")){
// fname = fname.substring(0,fname.lastIndexOf("."))+"("+ret_count+")."+fname.substring(fname.lastIndexOf(".")+1);
// }else{
// fname = fname + "("+ret_count+")";
// }
// entity.put("FILE_NAME",fname);
// }
//处理超限问题
StoreUserBusiness business_storeuser = BusinessManager.getBusiness(StoreUserBusiness.class);
Map<String,Object> storeuserQuery = new HashMap<String,Object>();
......@@ -227,7 +228,7 @@ public class actAction extends BasicAction {
}
}
//
jsonObject.putAll(Status.getStatusSuccessMessage("保存成功"));
jsonObject.putAll(Status.getStatusSuccessMessage("保存成功,"+entity.get("FILE_NAME")));
}
} catch (Exception e) {
jsonObject.putAll(Status.getStatusErrorMessage("保存失败"));
......@@ -246,33 +247,33 @@ public class actAction extends BasicAction {
StorePersonalBusiness business = BusinessManager.getBusiness(StorePersonalBusiness.class);
Map<String, Object> entity = RequestUtils.getUpdateFieldMap(request,RequestUtils.UPDATEDATAFIELDPREFIX);
String father_path = request.getParameter("FATHER_PATH");
String old_file_name = request.getParameter("OLD_FILE_NAME");
// String old_file_name = request.getParameter("OLD_FILE_NAME");
try {
String is_fname = (String) entity.get("FILE_NAME");
if(!StringUtils.equals(is_fname, old_file_name)){
//处理目录/文件重名的问题,处理是直接在文件和目录后加数字
Map<String,Object> v_congfu_query = new HashMap<String,Object>();
v_congfu_query.put("FATHER_ID", entity.get("FATHER_ID"));
v_congfu_query.put("CREATOR_ID", entity.get("CREATOR_ID"));
String isfile_1 = (String) entity.get("ISFILE");
if(StringUtils.equals(isfile_1, "1")){
String fname = (String) entity.get("FILE_NAME");
fname = fname.substring(0,fname.lastIndexOf("."));
v_congfu_query.put("FILE_NAME",fname);
}else{
v_congfu_query.put("FILE_NAME", entity.get("FILE_NAME"));
}
int ret_count = business.listCount_storePersonal(v_congfu_query);
if(ret_count>0){
String fname = (String) entity.get("FILE_NAME");
if(StringUtils.equals(isfile_1, "1")){
fname = fname.substring(0,fname.lastIndexOf("."))+"("+ret_count+")."+fname.substring(fname.lastIndexOf(".")+1);
}else{
fname = fname + "("+ret_count+")";
}
entity.put("FILE_NAME",fname);
}
}
// String is_fname = (String) entity.get("FILE_NAME");
// if(!StringUtils.equals(is_fname, old_file_name)){
// //处理目录/文件重名的问题,处理是直接在文件和目录后加数字
// Map<String,Object> v_congfu_query = new HashMap<String,Object>();
// v_congfu_query.put("FATHER_ID", entity.get("FATHER_ID"));
// v_congfu_query.put("CREATOR_ID", entity.get("CREATOR_ID"));
// String isfile_1 = (String) entity.get("ISFILE");
// if(StringUtils.equals(isfile_1, "1")){
// String fname = (String) entity.get("FILE_NAME");
// fname = fname.substring(0,fname.lastIndexOf("."));
// v_congfu_query.put("FILE_NAME",fname);
// }else{
// v_congfu_query.put("FILE_NAME", entity.get("FILE_NAME"));
// }
// int ret_count = business.listCount_storePersonal(v_congfu_query);
// if(ret_count>0){
// String fname = (String) entity.get("FILE_NAME");
// if(StringUtils.equals(isfile_1, "1")){
// fname = fname.substring(0,fname.lastIndexOf("."))+"("+ret_count+")."+fname.substring(fname.lastIndexOf(".")+1);
// }else{
// fname = fname + "("+ret_count+")";
// }
// entity.put("FILE_NAME",fname);
// }
// }
//去除不要更新的字段
entity.remove("OPETYPE");
boolean is_save2db = Boolean.parseBoolean(PropUtil.getValue("uploadfile_savetodb", "quartz_service", "true"));
......@@ -372,7 +373,7 @@ public class actAction extends BasicAction {
}
}
//
jsonObject.putAll(Status.getStatusSuccessMessage("修改成功"));
jsonObject.putAll(Status.getStatusSuccessMessage("修改成功,"+entity.get("FILE_NAME")));
} catch (Exception e) {
jsonObject.putAll(Status.getStatusErrorMessage("修改失败"));
e.printStackTrace();
......@@ -634,20 +635,29 @@ public class actAction extends BasicAction {
String uuid = request.getParameter("uuid");
String uploadnew=request.getParameter("uploadnew");
String uploadpath=request.getParameter("uploadpath");
String downloadFilenameEncode1 = PropUtil.getValue("downloadFilenameEncode1", "quartz_service", "gbk");
String downloadFilenameEncode2 = PropUtil.getValue("downloadFilenameEncode2", "quartz_service", "iso8859-1");
super.setEncoding1(downloadFilenameEncode1);
super.setEncoding2(downloadFilenameEncode2);
// String downloadFilenameEncode1 = PropUtil.getValue("downloadFilenameEncode1", "quartz_service", "gbk");
// String downloadFilenameEncode2 = PropUtil.getValue("downloadFilenameEncode2", "quartz_service", "iso8859-1");
// super.setEncoding1(downloadFilenameEncode1);
// super.setEncoding2(downloadFilenameEncode2);
response.setCharacterEncoding("utf-8");
if(new File(uploadpath+File.separator+uploadnew).exists()==false){
db2fileStore(uuid,uploadpath,uploadnew,false);
ret_download = super.download();
}else{
ret_download = super.download();
}
String filename1 = RequestUtils.getString(request, "uploadold");
try {
filename1 = new String(filename1.getBytes("ISO-8859-1"),"UTF-8");
} catch (UnsupportedEncodingException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
// 操作日志
SystemOpeBusiness sysbusiness = BusinessManager.getBusiness(SystemOpeBusiness.class);
sysbusiness.insert_logBusiness("download", "用户["+SessionUtil.getEmname()+"]下载网盘公司文件："+ uploadpath+File.separator+uploadnew,
"下载文件",uploadpath+File.separator+uploadnew, request.getParameter("uploadold"),"storePersonal");
"下载文件",uploadpath+File.separator+uploadnew,filename1,"storePersonal");
//
return ret_download;
}
......
src_jwapp/com/jw/app/vote/action/actAction.java 0 → 100644
package com.jw.app.vote.action;
import java.util.List;
import java.util.Map;
import net.sf.json.JSONObject;
import com.jw.app.business.VoteBusiness;
import com.gaowj.business.SystemOpeBusiness;
import com.gaowj.business.action.BasicAction;
import com.gaowj.business.comp.BusinessManager;
import com.gaowj.business.exception.BusinessException;
import com.gaowj.business.util.QueryParamUtil;
import com.gaowj.business.util.RequestUtils;
import com.gaowj.business.util.Status;
import com.gaowj.standard.utils.CacheKit;
public class actAction extends BasicAction {
/**
*
*/
private static final long serialVersionUID = -2591076090760872233L;
private JSONObject jsonObject = new JSONObject();
public JSONObject getJsonObject() {
return jsonObject;
}
public void setJsonObject(JSONObject jsonObject) {
this.jsonObject = jsonObject;
}
/**
* 插入
* @param entity
* @throws BusinessException
*/
public String insertVote() throws BusinessException {
VoteBusiness business = BusinessManager.getBusiness(VoteBusiness.class);
Map<String, Object> entity = RequestUtils.getUpdateFieldMap(request,RequestUtils.UPDATEDATAFIELDPREFIX);
jsonObject = new JSONObject();
try {
entity = QueryParamUtil.StringToDate(entity);
//去除不要更新的字段
entity.remove("OPETYPE");
//新增
business.insert_vote(entity);
// 操作日志
//sysbusiness.insert_logBusiness(具体方法，操作内容，操作描述，操作记录ID，操作记录中文描述，分类)
SystemOpeBusiness sysbusiness = BusinessManager.getBusiness(SystemOpeBusiness.class);
sysbusiness.insert_logBusiness("insertVote", "" + entity,
"增加学生测试数据", (String) entity.get("UUID"), (String) entity.get("NAME"), "votedemo1");
//
//更新缓存
CacheKit.update("ehcache11", "com_jw_app_vote_dataAction_listAll", business.list_vote(null));
//
jsonObject.putAll(Status.getStatusSuccessMessage("保存成功"));
} catch (Exception e) {
jsonObject.putAll(Status.getStatusErrorMessage("保存失败"));
e.printStackTrace();
}
return "json";
}
/**
* 更新
* @param entity
* @throws BusinessException
*/
public String updateVote() throws BusinessException {
VoteBusiness business = BusinessManager.getBusiness(VoteBusiness.class);
Map<String, Object> entity = RequestUtils.getUpdateFieldMap(request,RequestUtils.UPDATEDATAFIELDPREFIX);
try {
//去除不要更新的字段
entity.remove("OPETYPE");
//修改
entity = QueryParamUtil.StringToDate(entity);
business.update_vote(entity);
// 操作日志
SystemOpeBusiness sysbusiness = BusinessManager.getBusiness(SystemOpeBusiness.class);
sysbusiness.insert_logBusiness("updateVote", "" + entity,
"修改测试数据",(String) entity.get("UUID"), (String) entity.get("NAME"),"votedemo1");
//
jsonObject.putAll(Status.getStatusSuccessMessage("修改成功"));
} catch (Exception e) {
jsonObject.putAll(Status.getStatusErrorMessage("修改失败"));
e.printStackTrace();
}
return "json";
}
/**
* 在软删除基础上删除记录
* @param entity
* @throws BusinessException
*/
public String deleteVote() throws BusinessException {
VoteBusiness business = BusinessManager.getBusiness(VoteBusiness.class);
Map<String, Object> entity = RequestUtils.getUpdateFieldMap(request,RequestUtils.UPDATEDATAFIELDPREFIX);
String deletekey = (String) entity.get("CODE");
List<String> ListKey = QueryParamUtil.StringToList(deletekey);
try {
business.delete_vote(ListKey);
// 操作日志
SystemOpeBusiness sysbusiness = BusinessManager.getBusiness(SystemOpeBusiness.class);
sysbusiness.insert_logBusiness("deleteVote", "" + ListKey,
"删除测试数据", deletekey, "多个流水号","votedemo1");
//
jsonObject.putAll(Status.getStatusSuccessMessage("删除成功"));
} catch (Exception e) {
jsonObject.putAll(Status.getStatusErrorMessage("删除失败"));
e.printStackTrace();
}
return "json";
}
}
src_jwapp/com/jw/app/vote/action/dataAction.java 0 → 100644
package com.jw.app.vote.action;
import java.sql.SQLException;
import java.text.ParseException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import net.sf.json.JSONObject;
import com.jw.app.business.VoteBusiness;
import com.gaowj.business.action.BasicAction;
import com.gaowj.business.comp.BusinessManager;
import com.gaowj.business.exception.BusinessException;
import com.gaowj.business.util.Page;
import com.gaowj.business.util.PropUtil;
import com.gaowj.business.util.QueryParamUtil;
import com.gaowj.business.util.RequestUtils;
import com.gaowj.business.util.SessionUtil;
import com.gaowj.business.util.TestMd5;
import com.gaowj.standard.utils.CacheKit;
public class dataAction extends BasicAction{
/**
*
*/
private static final long serialVersionUID = 1829141492939513911L;
private JSONObject jsonObject = new JSONObject();
private int rows = 20;// 每页显示的记录数
private int page = 1;// 当前第几页
public JSONObject getJsonObject() {
return jsonObject;
}
public void setJsonObject(JSONObject jsonObject) {
this.jsonObject = jsonObject;
}
public int getRows() {
return rows;
}
public void setRows(int rows) {
this.rows = rows;
}
public int getPage() {
return page;
}
public void setPage(int page) {
this.page = page;
}
/**
* 分页获取记录
* @param entity
* @throws BusinessException
*/
public String list() throws BusinessException {
VoteBusiness business = BusinessManager.getBusiness(VoteBusiness.class);
Map<String, Object> query = RequestUtils.getUpdateFieldMap(request,RequestUtils.UPDATEDATAFIELDPREFIX);
try {
query = QueryParamUtil.StringToDate(query);
Page<Map<String, Object>> pageRows = business.list_vote(pageNo,pageSize, query);
setPageCount((pageRows.getCount() - 1) / pageSize + 1);
Map<String, Object> data = new HashMap<String, Object>();
data.put("rowSet", QueryParamUtil.DateTimeToString(pageRows.getItems()));
data.put("pageNo", pageNo);
data.put("pageSize", pageSize);
data.put("pageCount", pageCount);
data.put("rows", data.get("rowSet"));
data.put("total", pageRows.getCount());
jsonObject = new JSONObject();
jsonObject.putAll(data);
} catch (SQLException e) {
// TODO Auto-generated catch block
e.printStackTrace();
} catch (ParseException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
return "json";
}
/**
* 获取所有记录
* @param entity
* @throws BusinessException
*/
public String listAll() throws BusinessException {
VoteBusiness business = BusinessManager.getBusiness(VoteBusiness.class);
try {
//表示获取前台表单提交的所有"FIELD_"开始的键值数据，例如FIELD_NAME,FIELD_CODE....
Map<String, Object> query = RequestUtils.getUpdateFieldMap(request,RequestUtils.UPDATEDATAFIELDPREFIX);
//把前端传进来的字符型时间数据例 如DATE_2018-09-09转换成DATE型的时间数据。
//主要和前端is_entity.FIELD_CREATE_TIME = strToDateObj(is_entity.FIELD_CREATE_TIME)配对使用。
//前端提交前strToDateObj方法会把时间处理成DATE_2018-09-09再提交
query = QueryParamUtil.StringToDate(query);
//session工具
String code = SessionUtil.getCode();//当前用户ID
String emid = SessionUtil.getEmid();//当前用户帐号
String emname = SessionUtil.getEmname();//当前用户名称
String emdepart = SessionUtil.getEmdepart();//当前用户部门id
String emdepartname = SessionUtil.getEmdepartname();//当前用户部门名称
String emsex = SessionUtil.getEmsex();//当前用户性别
String loginip = SessionUtil.getLoginip();//当前用户登录IP
String clientip = SessionUtil.getClientIp();//获取客户端IP
String quanxian = SessionUtil.getQuanxian();//获取当前用户使用模块清单
String sessionid = SessionUtil.getSessionid();//获取当前用户sessionID
String currenttimme = SessionUtil.getCurrenttime();//当前用户本次登录时间
String beforetime = SessionUtil.getBeforetime();//当前用户上次登录时间
//配置文件工具
//表示获取src目录下quartz_service.properties文件中主键是login_main_url的值
String tt = PropUtil.getValue("login_main_url", "quartz_service", "");
//缓存使用
//查看src下ehcache.xml缓存配置文件。(ehcache1-ehcache10表示有10个缓存对象，分别只能缓存1-10分钟，最后有个ehcache11可以持久缓存)
List<Map<String, Object>> listData = null;
TestMd5 md5 = new TestMd5();
String queryMD5 = "";
try {
queryMD5 = md5.MD5(query.toString());
} catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
listData = CacheKit.get("ehcache11", "com_jw_app_vote_dataAction_listAll_"+queryMD5);
if(listData == null){
listData = business.list_vote(query);
CacheKit.put("ehcache11", "com_jw_app_vote_dataAction_listAll_"+queryMD5,listData);
}
int listDataCount = listData.size();
Map<String, Object> data = new HashMap<String, Object>();
data.put("rowSet", QueryParamUtil.DateToString(listData));
data.put("pageNo", 1);
data.put("pageSize", listDataCount);
data.put("pageCount", listDataCount);
data.put("rows", data.get("rowSet"));
data.put("total", listDataCount);
jsonObject = new JSONObject();
jsonObject.putAll(data);
} catch (SQLException e) {
// TODO Auto-generated catch block
e.printStackTrace();
} catch (ParseException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
return "json";
}
}
src_jwapp/com/jw/app/vote/action/viewAction.java 0 → 100644
package com.jw.app.vote.action;
import java.util.Map;
import com.gaowj.business.action.BasicAction;
import com.gaowj.business.exception.BusinessException;
import com.gaowj.business.util.RequestUtils;
public class viewAction extends BasicAction {
/**
*
*/
private static final long serialVersionUID = -6259964352154128000L;
public String voteTab() throws BusinessException{
return "voteTab";
}
public String voteTabDetail() throws BusinessException{
Map<String,Object> query = RequestUtils.getUpdateFieldMapUtf8(request, RequestUtils.UPDATEDATAFIELDPREFIX);
request.setAttribute("is_row", query);
return "voteTabDetail";
}
public String voteAdvsearch() throws BusinessException{
Map<String,Object> query = RequestUtils.getUpdateFieldMapUtf8(request, RequestUtils.UPDATEDATAFIELDPREFIX);
request.setAttribute("is_row", query);
return "voteAdvsearch";
}
}
src_system/com/gaowj/system/login/CasAction.java
package com.gaowj.system.login;
import java.io.IOException;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.jasig.cas.client.authentication.AttributePrincipal;
......@@ -36,29 +38,36 @@ public class CasAction extends BasicAction {
Map<String,Object> query = new HashMap<String,Object>();
query.put("EMID", username);
Map<String,Object> userInfoI = systemOpeBusiness.listLoginUserInfo(query).get(0);
Map<String,Object> sessionUser = new HashMap<String,Object>();
String u_all_m = systemOpeBusiness.getUserAllModule(userInfoI.get("CODE").toString());
sessionUser.put("CODE",userInfoI.get("CODE"));
sessionUser.put("EMID",userInfoI.get("EMID"));
sessionUser.put("EMSEX",userInfoI.get("EMSEX"));
sessionUser.put("EMDEPARTNAME",userInfoI.get("EMDEPARTNAME"));
sessionUser.put("EMDEPART",userInfoI.get("EMDEPART"));
sessionUser.put("EMNAME",userInfoI.get("EMNAME"));
sessionUser.put("BEFORETIME",userInfoI.get("BEFORETIME"));
sessionUser.put("SESSIONID", request.getSession().getId());
sessionUser.put("CURRENTTIME", jt.now_datetime());
sessionUser.put("LOGINIP", request.getRemoteAddr());
sessionUser.put("SERVERIP", request.getLocalAddr());
sessionUser.put("QUANXIAN",u_all_m);
request.getSession().setAttribute("userInfo", sessionUser);
//增加登陆日志
Map<String,Object> log = new HashMap<String,Object>();
log.put("CODE", sessionUser.get("CODE"));log.put("EMNAME", sessionUser.get("EMNAME"));log.put("EMIP", sessionUser.get("LOGINIP"));
log.put("OPENAME", "登陆");log.put("OPETIME", jt.String3date((String)sessionUser.get("CURRENTTIME")));log.put("TYPE", userInfoI.get("TYPE"));
log.put("OPETYPE", "B/S登陆");
systemOpeBusiness.insert_log(log);
Map<String,Object> userInfoI = null;
List<Map<String,Object>> listUser = systemOpeBusiness.listLoginUserInfo(query);
if(listUser.size()>0){
userInfoI = systemOpeBusiness.listLoginUserInfo(query).get(0);
Map<String,Object> sessionUser = new HashMap<String,Object>();
String u_all_m = systemOpeBusiness.getUserAllModule(userInfoI.get("CODE").toString());
sessionUser.put("CODE",userInfoI.get("CODE"));
sessionUser.put("EMID",userInfoI.get("EMID"));
sessionUser.put("EMSEX",userInfoI.get("EMSEX"));
sessionUser.put("EMDEPARTNAME",userInfoI.get("EMDEPARTNAME"));
sessionUser.put("EMDEPART",userInfoI.get("EMDEPART"));
sessionUser.put("EMNAME",userInfoI.get("EMNAME"));
sessionUser.put("BEFORETIME",userInfoI.get("BEFORETIME"));
sessionUser.put("BEFORETIME", jt.date3string((Date)userInfoI.get("BEFORETIME")));
sessionUser.put("SESSIONID", request.getSession().getId());
sessionUser.put("CURRENTTIME", jt.now_datetime());
sessionUser.put("LOGINIP", request.getRemoteAddr());
sessionUser.put("SERVERIP", request.getLocalAddr());
sessionUser.put("QUANXIAN",u_all_m);
sessionUser.put("SESSIONUSER", request.getSession());
request.getSession().setAttribute("userInfo", sessionUser);
//增加登陆日志
Map<String,Object> log = new HashMap<String,Object>();
log.put("CODE", sessionUser.get("CODE"));log.put("EMNAME", sessionUser.get("EMNAME"));log.put("EMIP", sessionUser.get("LOGINIP"));
log.put("OPENAME", "登陆");log.put("OPETIME", jt.String3date((String)sessionUser.get("CURRENTTIME")));log.put("TYPE", userInfoI.get("TYPE"));
log.put("OPETYPE", "B/S登陆");
systemOpeBusiness.insert_log(log);
}
}
String strRedirecturl = request.getParameter("redirectUrl");
String toUrl = "";
......
src_system/com/gaowj/system/login/LogoutAction.java
......@@ -4,8 +4,13 @@ package com.gaowj.system.login;
//import java.util.Map;
import java.io.IOException;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import com.gaowj.business.SystemOpeBusiness;
import com.gaowj.business.action.BasicAction;
import com.gaowj.business.comp.BusinessManager;
import com.gaowj.business.exception.BusinessException;
//import com.gaowj.business.listener.myHttpSessionAttributeListener;
import com.gaowj.business.util.SessionUtil;
......@@ -19,10 +24,14 @@ public class LogoutAction extends BasicAction {
private static final long serialVersionUID = -6074460857486096013L;
public String execute() throws BusinessException {
// request.getSession().removeAttribute("userInfo");
// List<Map<String,Object>> user = myHttpSessionAttributeListener.getSessionUser(request);
// System.out.println("在线用户");
// System.out.println(user);
//增加登陆日志
SystemOpeBusiness systemOpeBusiness = BusinessManager.getBusiness(SystemOpeBusiness.class);
Map<String,Object> log = new HashMap<String,Object>();
log.put("CODE", SessionUtil.getEmid());log.put("EMNAME",SessionUtil.getEmname());log.put("EMIP",SessionUtil.getClientIp());
log.put("OPENAME", "退出");log.put("OPETIME", new Date());log.put("TYPE",SessionUtil.getSessionUser().get("TYPE"));
log.put("OPETYPE", "B/S退出");
systemOpeBusiness.insert_log(log);
SessionUtil.removeSession(request);
request.getSession().invalidate();
try {
......
src_system/com/gaowj/uploadfile/actAction.java
......@@ -6,6 +6,7 @@ import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.sql.SQLException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
......@@ -345,20 +346,30 @@ public class actAction extends BasicAction {
String uuid = request.getParameter("uuid");
String uploadnew=request.getParameter("uploadnew");
String uploadpath=request.getParameter("uploadpath");
String downloadFilenameEncode1 = PropUtil.getValue("downloadFilenameEncode1", "quartz_service", "gbk");
String downloadFilenameEncode2 = PropUtil.getValue("downloadFilenameEncode2", "quartz_service", "iso8859-1");
super.setEncoding1(downloadFilenameEncode1);
super.setEncoding2(downloadFilenameEncode2);
// String downloadFilenameEncode1 = PropUtil.getValue("downloadFilenameEncode1", "quartz_service", "gbk");
// String downloadFilenameEncode2 = PropUtil.getValue("downloadFilenameEncode2", "quartz_service", "iso8859-1");
// super.setEncoding1(downloadFilenameEncode1);
// super.setEncoding2(downloadFilenameEncode2);
response.setCharacterEncoding("utf-8");
if(new File(uploadpath+"/"+uploadnew).exists()==false){
db2file(uuid,uploadpath,uploadnew,false);
ret_download = super.download();
}else{
ret_download = super.download();
}
String filename1 = RequestUtils.getString(request, "uploadold");
try {
filename1 = new String(filename1.getBytes("ISO-8859-1"),"UTF-8");
} catch (UnsupportedEncodingException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
// 操作日志
SystemOpeBusiness sysbusiness = BusinessManager.getBusiness(SystemOpeBusiness.class);
sysbusiness.insert_logBusiness("uploadFile", "用户["+SessionUtil.getEmname()+"]下载文件："+ uploadpath+"/"+uploadnew,
"下载文件",uploadpath+"/"+uploadnew, request.getParameter("uploadold"),"uploadfile");
"下载文件",uploadpath+"/"+uploadnew,filename1,"uploadfile");
//
return ret_download;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment