Merge remote-tracking branch 'origin/master'

src/main/webapp/gdwssjz.jsp

@@ -8,6 +8,7 @@
     <script type="text/javascript" charset="utf8" src="static/easyui-window/js/jquery.easyui.min.js"></script>
     <script type="text/javascript" src="static/easyui-window/js/easyui-lang-zh_CN.js"></script>
     <script type="text/javascript" src="static/layer/layer.js"></script>
+    <script type="text/javascript" src="static/js/ajax.js"></script>
     <style>
         .dw-span{float: right;margin-right:15px;height:24px;line-height: 24px;font-size: 12px;}
         .btn_cx {position: relative;top: 2px;margin-left:5px;cursor: pointer;  padding: 3px 17px;  border: 1px solid #245580;  background-color: #337ab7;  color: #fff;  background-image: linear-gradient(to bottom,#337ab7 0,#265a88 100%);  background-repeat: repeat-x;  text-shadow: 0 -1px 0 rgba(0,0,0,.2);  box-shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.075);  border-radius: 4px;  font-weight: normal;  font-size: 12px; }

src/main/webapp/macx.jsp

@@ -46,6 +46,7 @@
     <script type="text/javascript" src="static/layer/layer.js"></script>
     <script type="text/javascript" src="static/rasc/js/ychy.js"></script>
     <script type="text/javascript" src="static/rasc/js/tipbar.js"></script>
+    <script type="text/javascript" src="static/js/ajax.js"></script>
     <!--水印-->
     <script src="static/js/watermark.js"></script>
     <style>

src/main/webapp/rycx.jsp

@@ -44,6 +44,7 @@
     <script type="text/javascript" src="static/rasc/js/navCategory_zj.js"></script>
     <script type="text/javascript" src="static/layer/layer.js"></script>
     <script type="text/javascript" src="static/rasc/js/ychy.js"></script>
+    <script type="text/javascript" src="static/js/ajax.js"></script>
     <!--水印-->
     <script src="static/js/watermark.js"></script>
     <style>

src/main/webapp/serach.jsp

@@ -76,6 +76,8 @@
 <script src="static/js/util.js"></script>
 <!--引入模板文件-->
 <script type="text/javascript" src="static/js/templet.js"></script>
+
+<script type="text/javascript" src="static/js/ajax.js"></script>
 </body>
 </html>
 <script type="text/javascript">

src/main/webapp/superserach.jsp

@@ -227,6 +227,7 @@
 
 
     </div>
+
     <div class="right_box ssmz_right">
         <h4>当前资源常住人口信息 <span class="red">3</span> 条结果</h4>
 
@@ -360,6 +361,8 @@
 <script type="text/javascript" src="static/js/fsfzfenye.js"></script>
 <!--引入分页js-->
 <script type="text/javascript" src="static/layer/layer.js"></script>
+
+<script type="text/javascript" src="static/js/ajax.js"></script>
 </body>
 </html>
 

src/main/webapp/szrycx.jsp

@@ -48,6 +48,7 @@
     <script type="text/javascript" src="static/rasc/js/navCategory_zj.js"></script>
     <script type="text/javascript" src="static/layer/layer.js"></script>
     <script type="text/javascript" src="static/rasc/js/ychy.js"></script>
+    <script type="text/javascript" src="static/js/ajax.js"></script>
     <!--水印-->
     <script src="static/js/watermark.js"></script>
     <style>

src/main/webapp/szrycxcx.jsp

@@ -48,6 +48,7 @@
 	<script type="text/javascript" src="static/rasc/js/navCategory_zj.js"></script>
 	<script type="text/javascript" src="static/layer/layer.js"></script>
 	<script type="text/javascript" src="static/rasc/js/ychy.js"></script>
+	<script type="text/javascript" src="static/js/ajax.js"></script>
 	<!--水印-->
 	<script src="static/js/watermark.js"></script>
 	<style>

src/main/webapp/wzmstcx.jsp

@@ -48,6 +48,7 @@
 	<script type="text/javascript" src="static/rasc/js/navCategory_zj.js"></script>
 	<script type="text/javascript" src="static/layer/layer.js"></script>
 	<script type="text/javascript" src="static/rasc/js/ychy.js"></script>
+	<script type="text/javascript" src="static/js/ajax.js"></script>
 	<!--水印-->
 	<script src="static/js/watermark.js"></script>
 	<style>

src/main/webapp/wzmstcxcx.jsp

@@ -48,6 +48,7 @@
 	<script type="text/javascript" src="static/rasc/js/navCategory_zj.js"></script>
 	<script type="text/javascript" src="static/layer/layer.js"></script>
 	<script type="text/javascript" src="static/rasc/js/ychy.js"></script>
+	<script type="text/javascript" src="static/js/ajax.js"></script>
 	<!--水印-->
 	<script src="static/js/watermark.js"></script>
 	<style>