代码整理

WebContent/WEB-INF/conf/gaowj/bl/business-apps.xml

@@ -210,6 +210,7 @@
 		class="com.jw.app.business.todo.TodoBusinessImpl">
 		<property name="todoDAO" ref="todoDAO"/>
 	</bean>
+	
 	<bean id="MeetingBusiness"
 		class="com.jw.app.business.meeting.MeetingBusinessImpl">
 		<property name="meetingDAO" ref="meetingDAO"/>

WebContent/gaowj/header-simple-1.0.jsp

@@ -71,6 +71,9 @@
 <link rel="stylesheet" type="text/css" href="<%=commonPath%>/ria/jquery/jquery-easyui-1.4.1/themes/icon.css" charset="utf-8"></link>
 <link rel="stylesheet" type="text/css" href="<%=commonPath%>/ria/jquery/zTree_v3/css/zTreeStyle/zTreeStyle.css" charset="utf-8"></link>
 <link rel="stylesheet" type="text/css" href="<%=localPath%>/jwapp/common/css/choice_user/common.css" charset="utf-8"></link>
+<link rel="stylesheet" href="${ctx}/custom/plug/webupload/css/webuploader.css" type="text/css"></link>
+<script src="${ctx}/custom/plug/webupload/js/webuploader.js"></script>
+<script src="${ctx}/custom/plug/webupload/js/webuploaderExtend.js"></script>
 
 <script type="text/javascript">	
 // 	$.ajaxSetup ({

WebContent/gaowj/ria/jquery/jquery-easyui-1.4.1/themes/icon.css

@@ -372,4 +372,10 @@
 }
 .icon-ext-49_33 {
 	background:url('../../../../images/icons/(49,33).png') no-repeat left center;
+}
+.icon-ext-27_47 {
+	background:url('../../../../images/icons/(27,47).png') no-repeat left center;
+}
+.icon-ext-39_39 {
+	background:url('../../../../images/icons/(39,39).png') no-repeat left center;
 }
\ No newline at end of file

src/struts-ext.xml

@@ -135,24 +135,28 @@
 		<action name="voteView_*" class="com.jw.app.vote.action.viewAction" method="{1}">
 			<result name="{1}">/jwapp/pages/vote/{1}.jsp</result>
 		</action>
-		<!-- 代办管理 -->
-		<action name="todoAct_*" class="com.jw.app.todo.action.actAction" method="{1}">
+		
+		<!-- 会议管理 -->
+		<action name="meetingAct_*" class="com.jw.app.meeting.action.actAction" method="{1}">
 			<result name="json" type="json">
 				<param name="root">jsonObject</param>
 			</result>
 		</action>
-		<!-- 会议管理 -->
-		<action name="meetingAct_*" class="com.jw.app.meeting.action.actAction" method="{1}">
+		<action name="meetingData_*" class="com.jw.app.meeting.action.dataAction" method="{1}">
 			<result name="json" type="json">
 				<param name="root">jsonObject</param>
 			</result>
 		</action>
-		<action name="todoData_*" class="com.jw.app.todo.action.dataAction" method="{1}">
+		<action name="meetingView_*" class="com.jw.app.meeting.action.viewAction" method="{1}">
+			<result name="{1}">/jwapp/pages/meeting/{1}.jsp</result>
+		</action>
+		<!-- 代办管理 -->
+		<action name="todoAct_*" class="com.jw.app.todo.action.actAction" method="{1}">
 			<result name="json" type="json">
 				<param name="root">jsonObject</param>
 			</result>
 		</action>
-		<action name="meetingData_*" class="com.jw.app.meeting.action.dataAction" method="{1}">
+		<action name="todoData_*" class="com.jw.app.todo.action.dataAction" method="{1}">
 			<result name="json" type="json">
 				<param name="root">jsonObject</param>
 			</result>
@@ -206,9 +210,6 @@
 		<action name="friendlinkView_*" class="com.jw.app.friendlink.action.viewAction" method="{1}">
 			<result name="{1}">/jwapp/pages/friendlink/{1}.jsp</result>
 		</action>
-		<action name="meetingView_*" class="com.jw.app.meeting.action.viewAction" method="{1}">
-			<result name="{1}">/jwapp/pages/meeting/{1}.jsp</result>
-		</action>
 		<!-- 日志管理 -->
 		<action name="logAct_*" class="com.jw.app.log.action.actAction"
 			method="{1}">