Merge branch 'master' of http://120.78.165.83:8123/git/nazw

nngkxxdp/src/main/java/com/example/nngkxxdp/hlw/HlwHttpUtil.java

@@ -85,7 +85,8 @@ public class HlwHttpUtil {
             return getArticleList(page, limit, operTime, timeoutCount + 1);
         }
 
-        log.info("获取到文章列表：{}", result);
+//        log.info("获取到文章列表：{}", result);
+        log.info("获取到文章列表成功");
         if (Blank.isEmpty(result)) {
             return getArticleList(page, limit, operTime, timeoutCount + 1);
         }

nngkxxdp/src/main/resources/static/district/correct.html

@@ -30,13 +30,16 @@
                         <tr>
                             <td width="85" align="right" valign="top">名称：</td>
                             <td>
-                                <input id="newname" type="text" class="jcinp" value="" readonly="readonly">
+                                <input id="newname" type="text" class="jcinp jninp" value="" readonly="readonly">
                             </td>
                         </tr>
                         <tr>
                             <td align="right" valign="top">地址：</td>
                             <td>
-                                <input id="newAddres" type="text" class="jcinp" maxlength="6000" value="" readonly="readonly">
+                                <input id="newAddres" type="text" class="jcinp" maxlength="6000" value=""
+                                    onkeyup="value=value.replace(/[^0-9A-z\u4e00-\u9fa5\-\(\)\（\）]/g,'')" 
+                                    onpaste="value=value.replace(/[^0-9A-z\u4e00-\u9fa5\-\(\)\（\）]/g,'')" 
+                                    oninput = "value=value.replace(/[^0-9A-z\u4e00-\u9fa5\-\(\)\（\）]/g,'')">
                                 <br>
                                 <span class="font12 col6">您可在右侧地图上拖动图标，对该机构的位置进行标注。</span>
                                 <!-- <br> -->
@@ -46,13 +49,19 @@
                         <tr>
                             <td width="85" align="right" valign="top">电话：</td>
                             <td>
-                                <input id="newtel" type="text" class="jcinp" placeholder="" value="" readonly="readonly">
+                                <input id="newtel" type="text" class="jcinp" placeholder="" value=""
+                                onkeyup="value=value.replace(/[^0-9A-z\u4e00-\u9fa5\-\(\)\（\）]/g,'')" 
+                                onpaste="value=value.replace(/[^0-9A-z\u4e00-\u9fa5\-\(\)\（\）]/g,'')" 
+                                oninput = "value=value.replace(/[^0-9A-z\u4e00-\u9fa5\-\(\)\（\）]/g,'')">
                             </td>
                         </tr>
                         <tr>
                             <td width="85" align="right" valign="top">办公时间：</td>
                             <td>
-                                <input id="newtime" type="text" class="jcinp" placeholder="" value="" readonly="readonly">
+                                <input id="newtime" type="text" class="jcinp" placeholder="" value=""
+                                onkeyup="value=value.replace(/[^0-9A-z\u4e00-\u9fa5\-\(\)\（\）]/g,'')" 
+                                onpaste="value=value.replace(/[^0-9A-z\u4e00-\u9fa5\-\(\)\（\）]/g,'')" 
+                                oninput = "value=value.replace(/[^0-9A-z\u4e00-\u9fa5\-\(\)\（\）]/g,'')">
                             </td>
                         </tr>
                         <!-- <tr>
@@ -80,7 +89,7 @@
         </div>
     </div>
     <div class="foot"></div>
-    <script type="text/javascript" src="../page/js/constans.js"></script>
+<!--    <script type="text/javascript" src="../page/js/constans.js"></script>-->
 	<script type="text/javascript" src="//api.map.baidu.com/api?v=2.0&ak=4L6UzXBVZxG1jWopGBxRdq5kdW3L36Du"></script>
     <script type="text/javascript" src="//api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"></script>
     <script type="text/javascript" src="//api.map.baidu.com/library/DistanceTool/1.2/src/DistanceTool_min.js"></script>

nngkxxdp/src/main/resources/static/district/css/correct.css

@@ -91,7 +91,11 @@ body {
     border-top: 1px solid #b1b1b1;
     border-left: 1px solid #b1b1b1;
     width: 380px;
+}
+.jninp{
     cursor: default;
+    background-color: #eaeaee;
+    color: #c3c3c3;
 }
 .col6 {
     color: #666;

nngkxxdp/src/main/resources/static/district/js/correct.js

@@ -297,13 +297,13 @@ $(function(){
 			}
 			$.ajax({
 				url: PATH + '/mapdata/saveErrorLog',
-				// url: "http://192.168.0.69:7777/mapdata/saveErrorLog",
+				// url: "http://192.168.1.253:7777/mapdata/saveErrorLog",
 				type: 'Post',
 				data: obj,
 				async: false,
 				success: function (res) {
 					if(res) {
-						layer.msg('提交成功');
+						alert('提交成功')
 						window.history.back();
 					}
 				},