调整项目的页面功能

watero-rst-web/src/main/resources/log4j.properties

@@ -37,7 +37,7 @@ log4j.appender.ACT.layout.ConversionPattern= %d{hh:mm:ss,SSS} [%t] %-5p %c %x -
 log4j.appender.ACT.Threshold=INFO
 log4j.appender.ACT.File=D:/log/rst/act.log
 # apache日志级别
-log4j.logger.org.apache=INFO
+log4j.logger.org.apache=DEBUG
 # 工作流日志级别
 log4j.logger.org.activiti=INFO
 # 整个项目代码的日志级别

watero-rst-web/src/main/webapp/WEB-INF/views/home/pc_index.ftl

@@ -83,10 +83,10 @@
 <section class="Hui-article-box">
     <div id="Hui-tabNav" class="Hui-tabNav hidden-xs">
         <div class="Hui-tabNav-wp">
-            <ul id="min_title_list" class="acrossTab cl">
-                <li class="active">
-                    <span title="我的桌面" data-href="welcome.html">我的桌面</span>
-                    <em></em></li>
+            <ul id="min_title_list" class="acrossTab cl" style="width: 100%">
+                <li class="active" style="padding-right: 15px;padding-left: 15px;">
+                    <span title="我的桌面" data-href="welcome.html">我的桌面</span><em></em>
+                </li>
             </ul>
         </div>
         <div class="Hui-tabNav-more btn-group"><a id="js-tabNav-prev" class="btn radius btn-default size-S" href="javascript:;"><i class="Hui-iconfont">&#xe6d4;</i></a><a id="js-tabNav-next" class="btn radius btn-default size-S" href="javascript:;"><i class="Hui-iconfont">&#xe6d7;</i></a></div>
@@ -101,10 +101,10 @@
     <div id="selectTodo" class="menu_dropdown bk_2" style="display:none">
         <div>
             <div>订单</div>
-            <a onclick="toOrserList('${path}/admin/salesOrder/list_order_page?salesStatus=0',1,'')"  ><span>（</span><span id="toBeConfirmedOrder" style="color: #f00">0</span><span>）待确认订单数量</span></a><br>
-            <a onclick="toOrserList('${path}/admin/salesOrder/list_order_page?salesShippingStatus=0',1,'')"  ><span>（</span><span id="toBeAnnounced" style="color: #f00">0</span><span>）待通知配货数量</span></a><br>
-            <a onclick="toOrserList('${path}/admin/salesOrder/list_order_page?salesShippingStatus=11',1,'')"  ><span>（</span><span id="toBeDelivered" style="color: #f00">0</span><span>）待发货数量</span></a><br>
-            <a onclick="toOrserList('${path}/admin/salesOrder/list_order_page?1=1',1,'today')"  ><span>（</span><span id="allToDayOrder" style="color: #f00">0</span><span>）今日订单总数</span></a><br>
+            <a onclick="toOrserList('${path}/admin/salesOrder/list_order_page?salesStatus=0',1,'',this)"  ><span>（</span><span id="toBeConfirmedOrder" style="color: #f00">0</span><span>）待确认订单数量</span></a><br>
+            <a onclick="toOrserList('${path}/admin/salesOrder/list_order_page?salesShippingStatus=0',1,'',this)"  ><span>（</span><span id="toBeAnnounced" style="color: #f00">0</span><span>）待通知配货数量</span></a><br>
+            <a onclick="toOrserList('${path}/admin/salesOrder/list_order_page?salesShippingStatus=11',1,'',this)"  ><span>（</span><span id="toBeDelivered" style="color: #f00">0</span><span>）待发货数量</span></a><br>
+            <a onclick="toOrserList('${path}/admin/salesOrder/list_order_page?1=1',1,'today',this)"  ><span>（</span><span id="allToDayOrder" style="color: #f00">0</span><span>）今日订单总数</span></a><br>
 
             <#--<div>客诉</div>-->
             <#--<a onclick="toOrserList('${path}/admin/customer/select_customer_list?customerIsSolve=2&isFirst=1',2,'')"  ><span>（</span><span id="notSolvedCustomer" style="color: #f00">0</span><span>）未解决客诉数量</span></a><br>-->
@@ -125,32 +125,6 @@
 <script type="text/javascript" src="${path}/common/js/index/index.js"></script>
 <script type="text/javascript" src="${path}/common/lib/layer/2.4/layer.js"></script>
 <script>
-    $.ajax({
-        "type" : "post",
-        "url" : "${path}/admin/customer/selectNumberBacklog",
-        /*"url" : "/admin/order/selectTodo",*/
-        "dataType" : "json",
-        async:false,
-        "success" : function(data) {
-            if(data.status){
-                $("#toBeConfirmedOrder").html(data.data.toBeConfirmedOrder);
-                $("#toBeAnnounced").html(data.data.toBeAnnounced);
-                $("#toBeDelivered").html(data.data.toBeDelivered);
-                $("#allToDayOrder").html(data.data.allToDayOrder);
-
-//                $("#notSolvedCustomer").html(data.data.notSolvedCustomer);
-//                $("#amountReceivedCustomer").html(data.data.amountReceivedCustomer);
-//                $("#noEntryCustomer").html(data.data.noEntryCustomer);
-//                $("#notSendCustomer").html(data.data.notSendCustomer);
-                if(data.data.adminDept == 3){
-                    toDoShow();
-                }
-            }
-        },
-        "error":function(data){
-            alert("操作失败，请联系管理员！");
-        }
-    });
     function toDoShow(){
         //页面层
         layer.open({
@@ -162,46 +136,42 @@
             shade: 0
         });
     }
-
-
-    function toOrserList(url,type,type2){
+    function toOrserList(url,type,type2, obj){
         var titleText = "";
-        if(type == 1){
+        if (type === 1) {
             titleText = "订单列表"
-        }else if(type == 2){
+        } else {
             titleText = "客诉列表";
         }
-
-        //去除其它选项选中样式
-        $("#min_title_list li").removeClass("active");
-        //判断是否已存在订单列表选项卡
-        /*alert($("#min_title_list li span").text());*/
-        var bolean = true;
-        $(function() {
-            $("#min_title_list li").each(function() {
-                if(($(this).find("span").text()) == titleText){
-                    $(this).addClass("active");
-                    bolean = false;
-                }
-            })
-
-        });
-        if(bolean){
-            //新增一个选项卡标题
-            $("#min_title_list").append('<li id="orderTitleId" class="active"><span data-href="/admin/order/selectShopOrder">'+ titleText +'</span><i></i><em></em></li>')
-            //获取前面ul个数计算新增的选项卡位置
-            var left = $("#min_title_list>li").length*133;//获取前面ul位置长度
-            $("#min_title_list").css("width",left+"px");
-        }
-        //隐藏其它选项卡内容
-        $("#iframe_box .show_iframe").css("display","none");
-        //新增选项卡内容
-        $("#iframe_box").append('<div class="show_iframe">' +
-                '<div style="display: none" class="loading"></div><iframe id="indexframe" scrolling="yes" frameborder="0" src="'+url+'"></iframe></div>');
+        $(obj).attr("data-href", url).attr("data-title", titleText);
+        Hui_admin_tab(obj);
     }
     $(document).on('click', ' .Hui-aside .menu_dropdown dd li', function() {
         $(this).addClass("active").siblings().removeClass("active");
     });
+    $(function() {
 
+        $.ajax({
+            "type" : "post",
+            "url" : "${path}/admin/customer/selectNumberBacklog",
+            /*"url" : "/admin/order/selectTodo",*/
+            "dataType" : "json",
+            async:false,
+            "success" : function(data) {
+                if(data.status){
+                    $("#toBeConfirmedOrder").html(data.data.toBeConfirmedOrder);
+                    $("#toBeAnnounced").html(data.data.toBeAnnounced);
+                    $("#toBeDelivered").html(data.data.toBeDelivered);
+                    $("#allToDayOrder").html(data.data.allToDayOrder);
+                    if(data.data.adminDept === 3){
+                        toDoShow();
+                    }
+                }toDoShow();
+            },
+            "error":function(data){
+                alert("操作失败，请联系管理员！");
+            }
+        });
+    });
 </script>
 </html>

watero-rst-web/src/main/webapp/WEB-INF/web.xml

@@ -28,16 +28,6 @@
     <listener-class>com.iamberry.common.web.ApplicationInitListener</listener-class>
   </listener>
 
-  <!-- Shiro配置 -->
-  <filter>
-    <filter-name>shiroFilter</filter-name>
-    <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
-  </filter>
-  <filter-mapping>
-    <filter-name>shiroFilter</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
-
   <!--SpringMVC配置-->
   <servlet>
     <servlet-name>springDispatcherServlet</servlet-name>
@@ -53,6 +43,16 @@
     <url-pattern>/</url-pattern>
   </servlet-mapping>
 
+  <!-- Shiro配置 -->
+  <filter>
+    <filter-name>shiroFilter</filter-name>
+    <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
+  </filter>
+  <filter-mapping>
+    <filter-name>shiroFilter</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+
   <!-- 配置默认访问SpringMVC -->
   <servlet-mapping>
     <servlet-name>springDispatcherServlet</servlet-name>

watero-rst-web/src/main/webapp/common/static/h-ui.admin/js/H-ui.admin.js

@@ -48,7 +48,10 @@ function getskincookie(){
 		$("#skin").attr("href",hrefRes);
 	}
 }
-/*菜单导航*/
+/**
+ * 菜单导航
+ * @return {boolean}
+ */
 function Hui_admin_tab(obj){
 	var bStop = false,
 		bStopIndex = 0,
@@ -58,20 +61,22 @@ function Hui_admin_tab(obj){
 		show_navLi = topWindow.find("#min_title_list li"),
 		iframe_box = topWindow.find("#iframe_box");
 	//console.log(topWindow);
-	if(!href||href==""){
+	if(!href||href===""){
 		alert("data-href不存在，v2.5版本之前用_href属性，升级后请改为data-href属性");
 		return false;
 	}if(!title){
 		alert("v2.5版本之后使用data-title属性");
 		return false;
 	}
-	if(title==""){
+	if(title===""){
 		alert("data-title属性不能为空");
 		return false;
 	}
 	show_navLi.each(function() {
-		if($(this).find('span').attr("data-href")==href){
-			bStop=true;
+        var temp = href.split("?")[0];
+        var targ = $(this).find('span').attr("data-href").split("?")[0];
+        if(targ===temp){
+			bStop = true;
 			bStopIndex=show_navLi.index($(this));
 			return false;
 		}
@@ -79,8 +84,7 @@ function Hui_admin_tab(obj){
 	if(!bStop){
 		creatIframe(href,title);
 		min_titleList();
-	}
-	else{
+	} else{
 		show_navLi.removeClass("active").eq(bStopIndex).addClass("active");			
 		iframe_box.find(".show_iframe").hide().eq(bStopIndex).show().find("iframe").attr("src",href);
 	}