Merge remote-tracking branch 'origin/master'

src/main/webapp/WEB-INF/jsp/skhs/skhsJgzs.jsp

@@ -285,10 +285,7 @@
 <script type="text/javascript" src="/js/zntjNum.js"></script>
 <script>
     $(function() {// 初始化内容
-        var qybj = ${qybj}*100;
-        var qyArea = qybj*qybj*3.14;
-        qyArea = qyArea.toFixed(2);
-        var qyAreaStr = qyArea + "平方公里";
+        var qyAreaStr = ${qyArea} + "平方公里";
         $("#qyArea").html(qyAreaStr);
     });
     var sfzhUser = "${sfzh}";