优化系统

watero-rst-web/pom.xml

@@ -25,6 +25,12 @@
             <version>1.0.0</version>
         </dependency>
 
+        <dependency>
+            <groupId>net.sf.json-lib</groupId>
+            <artifactId>json-lib</artifactId>
+            <version>2.4</version>
+        </dependency>
+
         <!-- shiro -->
         <dependency>
             <groupId>org.apache.shiro</groupId>

watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/detect_detail.ftl

@@ -6,17 +6,18 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
     <meta http-equiv="Cache-Control" content="no-siteapp" />
-<#include "/base/add_base.ftl">
+    <#include "/base/add_base.ftl">
     <link href="${path}/common/lib/jquery.ui/jquery-ui.css" rel="stylesheet" type="text/css"/>
     <link href="${path}/common/lib/webuploader/0.1.5/webuploader.css" rel="stylesheet" type="text/css"/>
     <link href="${path}/common/lib/icheck/icheck.css" rel="stylesheet" type="text/css"/>
+    <!-- 新增需求引入js、css -->
+    <link href="${path}/common/lib/bootstrap/bootstrap.min.css" rel="stylesheet" />
     <style>
         .tit{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
         .tit:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
         .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;color: #50a2ea;}
         .tit-2:after{content: '';position: absolute;left: 0;top: 50%;height: 6px;width: 6px;border-radius: 6px;margin-top: -3px; background-color: #32a3d8;}
         #province select{margin-right:10px; width:100px;height: 31px;-webkit-appearance:none !important;appearance:none;background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;padding-left:3px;padding-right: 25px;}
-
         #suggest, #suggest2 {width:200px}
         .gray {color:gray}
         .ac_results {background:#fff;border:1px solid #7f9db9;position: absolute;z-index: 10000;display: none}
@@ -67,7 +68,7 @@
 </nav>
 
 
-<article class="cl pd-20">
+<article class="cl pd-20" style="padding-top: 0px;">
     <form action="" method="post" class="form form-horizontal" id="form-article-add">
         <div class="row cl">
             <label class="form-label col-3">
@@ -76,7 +77,7 @@
             <div class="formControls col-9">
             </div>
         </div>
-        <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
+        <table class="table table-bordered table-bg table-hover table-sort" style="margin-top: 10px;">
             <thead>
             <tr>
                 <th width="10">维修编号：</th>
@@ -183,7 +184,7 @@
             <div class="formControls col-10 col-sm-10">
             </div>
         </div>
-        <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
+        <table class="table table-bordered table-bg table-hover table-sort" style="margin-top: 10px;">
             <thead>
             <tr>
                 <th width="10">客诉编号：</th>
@@ -242,7 +243,7 @@
             <div class="formControls col-10 col-sm-10">
             </div>
         </div>
-        <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
+        <table class="table table-bordered table-bg table-hover table-sort" style="margin-top: 10px;">
             <thead>
             <tr>
                 <th width="10">业务员：</th>
@@ -277,7 +278,7 @@
             <div class="formControls col-10 col-sm-10">
             </div>
         </div>
-        <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
+        <table class="table table-bordered table-bg table-hover table-sort" style="margin-top: 10px;">
             <thead>
             <tr>
                 <th width="10">是否可翻新：</th>
@@ -355,7 +356,7 @@
                                     <li class="b-close" id="configDetele1">
                                         <input type="hidden" value="${detectPhenomenon.itemConfigId!''}" name="configli1">
                                         ${detectPhenomenon.itemDetectContent!''}
-                                        <span class="my-close" onclick="deleteli(this)"></span>
+                                        <span style="display: none" class="my-close" onclick="deleteli(this)"></span>
                                     </li>
                                     </#list>
                                 </#if>
@@ -471,7 +472,7 @@
             <div class="formControls col-10 col-sm-10">
             </div>
         </div>
-        <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
+        <table class="table table-bordered table-bg table-hover table-sort" style="margin-top: 10px;">
             <thead>
             <tr>
                 <th width="10">维修配件：</th>
@@ -510,7 +511,7 @@
             </div>
         </div>
     <#--<label class="form-label col-2 col-sm-2">购买产品信息：</label>-->
-        <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
+        <table class="table table-bordered table-bg table-hover table-sort" style="margin-top: 10px;">
             <tr class="text-c">
                 <th>是否通过</th>
                 <th>QC备注</th>
@@ -538,7 +539,7 @@
             </div>
         </div>
     <#--<label class="form-label col-2 col-sm-2">购买产品信息：</label>-->
-        <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
+        <table class="table table-bordered table-bg table-hover table-sort" style="margin-top: 10px;">
             <tr class="text-c">
                 <th>处理结果</th>
                 <th>处理备注</th>
@@ -573,7 +574,7 @@
             </div>
         </div>
     <#--<label class="form-label col-2 col-sm-2">购买产品信息：</label>-->
-        <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
+        <table class="table table-bordered table-bg table-hover table-sort" style="margin-top: 10px;">
             <tr class="text-c">
                 <th>订单编号</th>
                 <th>物流信息</th>
@@ -588,13 +589,13 @@
                                     <#if salesOrder.salesShippingStatus == 0>
                                     未发货
                                 <#elseif salesOrder.salesShippingStatus == 1>
-                            已打单
+                                    已打单
                                 <#elseif salesOrder.salesShippingStatus == 3>
-                            备货中
+                                    备货中
                                 <#elseif salesOrder.salesShippingStatus == 4>
-                            收货
+                                    收货
                                 <#elseif salesOrder.salesShippingStatus == 11>
-                            已通知配货
+                                    已通知配货
                                 </#if>
                                 </td>
                                 <td>${salesOrder.salesSalesTime?string("yyyy/MM/dd HH:mm:ss")}</td>

watero-rst-web/src/main/webapp/common/js/index/index.js

@@ -12,9 +12,9 @@ function myselfinfo() {
             '<p>&nbsp;&nbsp;我的性别:<b>' + (result.returnMsg.admin.adminSex == 1 ? "男" : "女") + '</b></p>' +
             '<p>&nbsp;&nbsp;我的电话:<b>' + result.returnMsg.admin.adminTel + '</b></p>' +
             '<p>&nbsp;&nbsp;登录账户:<b>' + result.returnMsg.admin.adminAccount + '</b></p>' +
-            '<p>&nbsp;&nbsp;我的邮箱:<b>' + result.returnMsg.admin.adminMail + '</b></p>' +
+            '<p>&nbsp;&nbsp;我的邮箱:<b>' + result.returnMsg.admin.adminMail + '</b></p>' /*+
             '<p>&nbsp;&nbsp;销售数量:<b>' + result.returnMsg.admin.adminSaleNum + '</b></p>' +
-            '<p>&nbsp;&nbsp;创建日期:<b>' + formatDate(new Date(result.returnMsg.admin.adminCreateTime), "yyyy-MM-dd") + '</b></p>'
+            '<p>&nbsp;&nbsp;创建日期:<b>' + formatDate(new Date(result.returnMsg.admin.adminCreateTime), "yyyy-MM-dd") + '</b></p>'*/
         });
     });
 }

watero-rst-web/src/main/webapp/common/static/welcome/resource/wnl.js

@@ -509,7 +509,11 @@ function calendar(y,m) {
             tmp1=Number(RegExp.$2);
             tmp2=Number(RegExp.$3);
             if(tmp1<5)
-               this[((this.firstWeek>tmp2)?7:0) + 7*(tmp1-1) + tmp2 - this.firstWeek].solarFestival += RegExp.$5 + ' ';
+               try {
+                   this[((this.firstWeek>tmp2)?7:0) + 7*(tmp1-1) + tmp2 - this.firstWeek].solarFestival += RegExp.$5 + ' ';
+               } catch(e) {
+
+               }
             else {
                tmp1 -= 5;
                tmp3 = (this.firstWeek+this.length-1)%7; //当月最后一天星期?
@@ -610,7 +614,7 @@ worktime.y2013.workRestStr = 'd0101 d0102 d0103 d0105 d0106 d0209 d0210 d0211 d0
 //
 
 $.ajax({
-	url: "http://static.etouch.cn/apis/holiday-in-law.jsonp",
+	url: "https://static.etouch.cn/apis/holiday-in-law.jsonp",
 	dataType: "jsonp",
 	jsonp: "aaa"
 });

watero-rst-web/src/main/webapp/common/static/welcome/resource/zhwnl.js

@@ -10,7 +10,7 @@
 var firstcity="深圳";
 var regcity=/[^\u4E00-\u9FA5]/g ;
 $(document).ready(function(){
-	 $("#weather").css("background","url(img/onloading.gif) no-repeat center");
+	//$("#weather").css("background","url(img/onloading.gif) no-repeat center");
 	changeStyle();
 	$(window).resize(function(){
 	  changeStyle();  
@@ -136,7 +136,7 @@ function setLeftHeight(){
 }
 
 function loadJsonp(w_city){
-    $.ajax({
+    /*$.ajax({
         type: "get",
         async: false,
         url: "http://wthrcdn.etouch.cn/weather_mini?city="+w_city+"&callback=flightHandler",
@@ -277,8 +277,9 @@ function loadJsonp(w_city){
 		        	day.find("li:eq(3)").text(d.forecast[i].type);
 		        	day.find("#today_tem").text(d.wendu).append("<span class='juhao'>&#186;</span>");
 		        	day.find("li:eq(4)").text(lower[i]+"~"+higher[i]);
-		        	day.find("li:eq(5)").find("span:eq(0)").text(d.forecast[i].fengxiang); 
-		        	day.find("li:eq(5)").find("span:eq(1)").text(d.forecast[i].fengli);
+		        	day.find("li:eq(5)").find("span:eq(0)").text(d.forecast[i].fengxiang);
+		        	let temp = d.forecast[i].fengli;
+		        	day.find("li:eq(5)").find("span:eq(1)").text(temp.substring(9, temp.length-3));
 	        	}
 	        	$("#warning").text(tips);
         	}else{
@@ -290,6 +291,6 @@ function loadJsonp(w_city){
             emptyAll();
             $("#weather").css("background","url(img/wrong.png) no-repeat center");
         }
-    });
+    });*/
 };
 

watero-rst-web/src/main/webapp/common/static/welcome/welcome.html

@@ -150,10 +150,10 @@
 				</div>
 				<div class="Infobottom">
 					<div class="top" id="city">
-						<span class="city">南京</span> <span class="change" style="display:none;">[切换]</span> <span class="airquality">99良好</span> <span class="air">空气质量:&nbsp;</span>
+						<span class="city">深圳</span> <span class="change" style="display:none;">[切换]</span> <span class="airquality">99良好</span> <span class="air">空气质量:&nbsp;</span>
 					</div>
 					<div class="clear"></div>
-					<div class="mid" id="weather" style="background: none;">
+					<div class="mid" id="weather" style="background: white;">
 						<div class="m_left">
 							<ul class="one_day" id="day0">
 								<li>12日星期四</li>
@@ -199,8 +199,8 @@
 	<script type="text/javascript" src="./resource/index.js"></script>
 	<script type="text/javascript" src="./resource/jquery.artDialog.source.js"></script>
 	<script type="text/javascript" src="./resource/city.js"></script>
-	<script src="http://yun.rili.cn/wnl/js/zhwnl.js"></script>
+	<script type="text/javascript" src="./resource/zhwnl.js"></script>
 	<script type="text/javascript">
-		loadJsonp("深圳");
+		//loadJsonp("深圳");
 	</script>
 </body></html>