From 55df4c695b21c0ac52ed640c0dd5969f507be9a4 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 03 一月 2023 10:45:30 +0800
Subject: [PATCH] 1.3

---
 public/config/config.js     |   73 ++++++-----------
 public/LfSKyline/index.html |  140 ++++++++++++++++++-----------------
 2 files changed, 99 insertions(+), 114 deletions(-)

diff --git a/public/LfSKyline/index.html b/public/LfSKyline/index.html
index 2a144ec..79c27b0 100644
--- a/public/LfSKyline/index.html
+++ b/public/LfSKyline/index.html
@@ -2,20 +2,21 @@
 <html lang="en">
 
 <head>
-    <title>澶ф暟鎹閬撳眬</title>
-    <meta http-equiv="Expires" content="0" />
-    <meta http-equiv="Cache" content="no-cache" />
-    <meta http-equiv="Pragma" content="no-cache" />
-    <meta http-equiv="Cache-control" content="no-cache" />
-    <link href="imgs/favicon.ico" rel="icon" type="image/x-icon" />
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-    <!-- <link href="./layui-v2.6.8/css/layui.css"> -->
-    <script src="./js/jquery.1.12.4.js"></script>
-    <script src="./layui-v2.6.8/layui.js"></script>
-    <script>
+  <title>澶ф暟鎹閬撳眬</title>
+  <meta http-equiv="Expires" content="0" />
+  <meta http-equiv="Cache" content="no-cache" />
+  <meta http-equiv="Pragma" content="no-cache" />
+  <meta http-equiv="Cache-control" content="no-cache" />
+  <link href="imgs/favicon.ico" rel="icon" type="image/x-icon" />
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+  <!-- <link href="./layui-v2.6.8/css/layui.css"> -->
+  <script src="./js/jquery.1.12.4.js"></script>
+  <script src="./layui-v2.6.8/layui.js"></script>
+  <script src="../config/config.js"></script>
+  <script>
         window.app = {
-            fly: "http://192.168.20.39/LFData/fly/lfgd_sg2.fly",
+            fly: LFData + "/fly/lfgd_sg2.fly",
             mainUrl: location.href.substring(0, location.href.lastIndexOf("/") + 1)
 
         }
@@ -23,69 +24,72 @@
         document.writeln("<link href='./css/index.css?" + new Date().getTime() + "' rel='stylesheet' \/>");
         document.writeln("<script src='./js/detect.js?" + new Date().getTime() + "'><\/script>");
         document.writeln("<script src='./js/index.js?" + new Date().getTime() + "'><\/script>");
+
+        $("#aDownload").attr("href", LFData + "/soft/TEv7.4.zip");
     </script>
 </head>
 
 <body>
-    <div id="download" style="display: none;">
-        <p>
-          <b style="font-size: 24px;">涓夌淮杞欢瀹夎浣跨敤璇存槑锛�</b>
-        </p>
-        <p>
-          璇存槑1锛氬鏋滄偍鏃犳硶姝g‘鍦扮湅鍒颁笁缁村湴鍥撅紝璇蜂笅杞�  <a href="http://192.168.20.39/LFData/soft/TEv7.4.zip" class="a">TE v7.4.zip</a> 瀹夎鍖呫��
-        </p>
-        <p>
-          璇存槑2锛氬畨瑁呮椂锛岃鍔″繀鍏抽棴娴忚鍣ㄥ悗鍐嶅畨瑁咃紒
-        </p>
-        <p>
-          璇存槑3锛氬綋鍓嶄粎鏀寔鍚湁 IE鏍稿績 鐨勬祻瑙堝櫒锛屽 IE銆�360銆丒dge 娴忚鍣ㄣ��
-        </p>
-        <p>
-          璇存槑4锛氫娇鐢� 360 娴忚鍣ㄦ椂锛岃鍒囨崲鑷冲吋瀹规ā寮忋��
-        </p>
-        <p>
-          璇存槑5锛氫娇鐢� Edge 娴忚鍣ㄦ椂锛岀偣鍑诲彸涓婅鐨� 鈥�...鈥� 閫夋嫨 鈥滆缃�濓紱<br />
-          <span style="visibility: hidden;">璇存槑5锛�</span>鍦ㄥ乏渚ф悳绱㈤噷闈㈣緭鍏ワ細Internet锛�<br />
-          <span style="visibility: hidden;">璇存槑5锛�</span>鐐瑰嚮 鈥淚nternet Explorer 妯″紡锛圛E 妯″紡锛夋寜閽�濓紝灏嗗紑鍏冲垏鎹㈣嚦钃濊壊锛�<br />
-          <span style="visibility: hidden;">璇存槑5锛�</span>閫夋嫨鈥滆 Internet Explorer 鍦� Microsoft Edge 涓墦寮�缃戠珯鈥濓紝鍒囨崲鑷� 鈥滃缁堬紙鎺ㄨ崘锛夆�濓紱<br />
-          <span style="visibility: hidden;">璇存槑5锛�</span>閫夋嫨鈥滃厑璁� Internet Explorer 妯″紡涓嬮噸鏂板姞杞界綉绔欙紙IE妯″紡锛夆�濓紝鍒囨崲鑷� 鈥滃厑璁糕�濄��<br />
-          <span style="visibility: hidden;">璇存槑5锛�</span><img src="./imgs/Edge璁剧疆.png" style="width: 630px; height: 480px;" title="Edge璁剧疆" alt="Edge璁剧疆" />
-        </p>
+  <div id="download" style="display: none;">
+    <p>
+      <b style="font-size: 24px;">涓夌淮杞欢瀹夎浣跨敤璇存槑锛�</b>
+    </p>
+    <p>
+      璇存槑1锛氬鏋滄偍鏃犳硶姝g‘鍦扮湅鍒颁笁缁村湴鍥撅紝璇蜂笅杞�
+      <a id="aDownload" href="http://192.168.20.39/LFData/soft/TEv7.4.zip" class="a">TE v7.4.zip</a> 瀹夎鍖呫��
+    </p>
+    <p>
+      璇存槑2锛氬畨瑁呮椂锛岃鍔″繀鍏抽棴娴忚鍣ㄥ悗鍐嶅畨瑁咃紒
+    </p>
+    <p>
+      璇存槑3锛氬綋鍓嶄粎鏀寔鍚湁 IE鏍稿績 鐨勬祻瑙堝櫒锛屽 IE銆�360銆丒dge 娴忚鍣ㄣ��
+    </p>
+    <p>
+      璇存槑4锛氫娇鐢� 360 娴忚鍣ㄦ椂锛岃鍒囨崲鑷冲吋瀹规ā寮忋��
+    </p>
+    <p>
+      璇存槑5锛氫娇鐢� Edge 娴忚鍣ㄦ椂锛岀偣鍑诲彸涓婅鐨� 鈥�...鈥� 閫夋嫨 鈥滆缃�濓紱<br />
+      <span style="visibility: hidden;">璇存槑5锛�</span>鍦ㄥ乏渚ф悳绱㈤噷闈㈣緭鍏ワ細Internet锛�<br />
+      <span style="visibility: hidden;">璇存槑5锛�</span>鐐瑰嚮 鈥淚nternet Explorer 妯″紡锛圛E 妯″紡锛夋寜閽�濓紝灏嗗紑鍏冲垏鎹㈣嚦钃濊壊锛�<br />
+      <span style="visibility: hidden;">璇存槑5锛�</span>閫夋嫨鈥滆 Internet Explorer 鍦� Microsoft Edge 涓墦寮�缃戠珯鈥濓紝鍒囨崲鑷� 鈥滃缁堬紙鎺ㄨ崘锛夆�濓紱<br />
+      <span style="visibility: hidden;">璇存槑5锛�</span>閫夋嫨鈥滃厑璁� Internet Explorer 妯″紡涓嬮噸鏂板姞杞界綉绔欙紙IE妯″紡锛夆�濓紝鍒囨崲鑷� 鈥滃厑璁糕�濄��<br />
+      <span style="visibility: hidden;">璇存槑5锛�</span><img src="./imgs/Edge璁剧疆.png" style="width: 630px; height: 480px;" title="Edge璁剧疆" alt="Edge璁剧疆" />
+    </p>
+  </div>
+  <div id="mapView" class="mapView">
+    <div class="top">
+      <div class="top_left">
+        <div class="Logo">
+          <img class="logoImg" src="imgs/LOGO.png" alt="" />
+        </div>
       </div>
-    <div id="mapView" class="mapView">
-        <div class="top">
-            <div class="top_left">
-                <div class="Logo">
-                    <img class="logoImg" src="imgs/LOGO.png" alt="" />
-                </div>
-            </div>
-            <div class="top_right">
-                <div class="menu" onclick="Index.showMenu(1)">
-                    <img src="imgs/鍙戝竷.png" alt="" />
-                    <span>鍦烘櫙鎻愬彇</span>
-                </div>
-                <div class="menu" onclick="Index.showMenu(2)">
-                    <img src="imgs/鍥惧眰 35.png" alt="" />
-                    <span>鍦烘櫙鍙戝竷</span>
-                </div>
-                <div class="menu" onclick="Index.showMenu(3)">
-                    <img src="imgs/妞渾 7 鎷疯礉 4.png" alt="" />
-                    <span>涓夌淮婕旂ず</span>
-                </div>
-            </div>
+      <div class="top_right">
+        <div class="menu" onclick="Index.showMenu(1)">
+          <img src="imgs/鍙戝竷.png" alt="" />
+          <span>鍦烘櫙鎻愬彇</span>
         </div>
-        <div class="content">
-            <div id="rightCont" class="left_content">
-                <fieldset class="fieldset">
-                    <legend>鏁版嵁鐩綍</legend>
-                    <div id="layers"></div>
-                </fieldset>
-            </div>
-            <div class="right_content">
-                <object id="TEWinEx" classid="CLSID:3a4f9196-65a8-11d5-85c1-0001023952c1"></object>
-            </div>
+        <div class="menu" onclick="Index.showMenu(2)">
+          <img src="imgs/鍥惧眰 35.png" alt="" />
+          <span>鍦烘櫙鍙戝竷</span>
         </div>
+        <div class="menu" onclick="Index.showMenu(3)">
+          <img src="imgs/妞渾 7 鎷疯礉 4.png" alt="" />
+          <span>涓夌淮婕旂ず</span>
+        </div>
+      </div>
     </div>
+    <div class="content">
+      <div id="rightCont" class="left_content">
+        <fieldset class="fieldset">
+          <legend>鏁版嵁鐩綍</legend>
+          <div id="layers"></div>
+        </fieldset>
+      </div>
+      <div class="right_content">
+        <object id="TEWinEx" classid="CLSID:3a4f9196-65a8-11d5-85c1-0001023952c1"></object>
+      </div>
+    </div>
+  </div>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/public/config/config.js b/public/config/config.js
index 3d5e300..f6bf5a8 100644
--- a/public/config/config.js
+++ b/public/config/config.js
@@ -1,69 +1,50 @@
 var ipConfig = '192.168.20.39';
-const BASE_URL = 'http://' + ipConfig + ':12316/server';
+
+var LFData = "http://" + ipConfig + "/LFData";
+
+var BASE_URL = 'http://' + ipConfig + ':12316/server';
+
 //webSocket 鏈嶅姟鍦板潃
 var socketUrl = 'ws://' + ipConfig + ':12316/server/ws/select';
+
 //鏁版嵁搴撶洃鎺у湴鍧�
 var sql_Url = 'http://' + ipConfig + ':8081/admin/druid/sql.html';
+
 //璺緞鍒嗘瀽鍦板潃
 var wnsUrl = 'http://' + ipConfig + ':9055/gisserver/wnsserver/beijingdaohang_wns';
+
 //gisserver
 var gisServerUrl = 'http://' + ipConfig + ':9055/gisserver';
+
 //geoServerUrl
 var geoserver = 'http://' + ipConfig + ':8088';
 var geoServerURl = geoserver + '/geoserver/LF/wms';
-var geoserverWFS =
-  geoserver +
-  '/geoserver/LF/ows?service=WFS&version=1.0.0&request=GetFeature&typeName=LF%3Abs_project&maxFeatures=50&outputFormat=application%2Fjson&cql_filter=projname=';
-var geoserverWFSLine =
-  geoserver +
-  '/geoserver/LF/ows?service=WFS&version=1.0.0&request=GetFeature&typeName=LF%3Am_pipeline&maxFeatures=50&outputFormat=application%2Fjson&cql_filter=projname=';
+var geoserverWFS = geoserver + '/geoserver/LF/ows?service=WFS&version=1.0.0&request=GetFeature&typeName=LF%3Abs_project&maxFeatures=50&outputFormat=application%2Fjson&cql_filter=projname=';
+var geoserverWFSLine = geoserver + '/geoserver/LF/ows?service=WFS&version=1.0.0&request=GetFeature&typeName=LF%3Am_pipeline&maxFeatures=50&outputFormat=application%2Fjson&cql_filter=projname=';
+
 //妯″瀷鍔犺浇鍦板潃
 var modelUrl = 'http://' + ipConfig + '/LFData/tileset/SN/tileset.json';
+
 //DEM
-var demLayer = 'http://' + ipConfig + '/LFData/dem'
+var demLayer = 'http://' + ipConfig + '/LFData/dem';
+
 //缁煎悎灞曠ず
 window.sceneConfig = {
   // sdk璁稿彲
   licenseServer: 'http://' + ipConfig + '/LFServer',
   // 鏈嶅姟鍦板潃
   baseURL: 'http://183.162.245.49:8888/',
+  //
   positionBtn: [],
 };
-var gaoDeBaseUrl = [
-  {
-    url: 'http://webrd02.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}',
-    label: '楂樺痉鐭㈤噺',
-  },
-  {
-    url: 'https://webst02.is.autonavi.com/appmaptile?style=6&x={x}&y={y}&z={z}',
-    label: '楂樺痉褰卞儚',
-  },
-  {
-    url: 'http://webst02.is.autonavi.com/appmaptile?x={x}&y={y}&z={z}&lang=zh_cn&size=1&scale=1&style=8',
-    label: '楂樺痉褰卞儚鏍囨敞',
-  },
-];
-// //鍖呬簩鍦板潃
-// var packageUrl = "http://10.7.0.186:88";
-// var packageUrll = packageUrl + '/dataxdi';
-// var packageUrl2 = packageUrl + '/resm';
-// var packageTwo = {
-//   //鍏ュ簱璐ㄦ锛�
-//   url1: packageUrll + '/#/schema/list?tags=鍏ュ簱璐ㄦ&embed=true&token=43117d00-b8e4-4406-9707-131109723a5a',
-//   //鎴愭灉璐ㄦ
-//   url2: packageUrll + '/#/schema/list?tags=鎴愭灉璐ㄦ&embed=true&token=43117d00-b8e4-4406-9707-131109723a5a',
-//   //浠诲姟鐘舵��
-//   url3: packageUrll + '/#/task/list?embed=true&token=43117d00-b8e4-4406-9707-131109723a5a',
-//   //鏍煎紡杞崲
-//   url4: packageUrll + '/#/schema/list?tags=鏁版嵁浜ゆ崲&embed=true&token=43117d00-b8e4-4406-9707-131109723a5a',
-//   //鍧愭爣杞崲
-//   url5: packageUrll + '/#/schema/list?tags=鍧愭爣杞崲&embed=true&token=43117d00-b8e4-4406-9707-131109723a5a',
-//   //鏁版嵁鍒嗗彂
-//   url6: packageUrll + '/#/schema/list?tags=鏁版嵁鍒嗗彂&embed=true&token=43117d00-b8e4-4406-9707-131109723a5a',
-//   //鏁版嵁娌荤悊
-//   url7: packageUrll + '/#/schema/list?tags=鏁版嵁娌荤悊&embed=true&token=43117d00-b8e4-4406-9707-131109723a5a',
-//   //鎴戠殑璧勬簮
-//   url8: packageUrl2 + '/#/resourceManage?embed=true&token=43117d00-b8e4-4406-9707-131109723a5a',
-//   //璧勬簮瀹℃牳
-//   url9: packageUrl2 + '/resm/#/resapproval?embed=true&token=43117d00-b8e4-4406-9707-131109723a5a',
-// }
\ No newline at end of file
+
+var gaoDeBaseUrl = [{
+  url: 'http://webrd02.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}',
+  label: '楂樺痉鐭㈤噺',
+}, {
+  url: 'https://webst02.is.autonavi.com/appmaptile?style=6&x={x}&y={y}&z={z}',
+  label: '楂樺痉褰卞儚',
+}, {
+  url: 'http://webst02.is.autonavi.com/appmaptile?x={x}&y={y}&z={z}&lang=zh_cn&size=1&scale=1&style=8',
+  label: '楂樺痉褰卞儚鏍囨敞'
+}];

--
Gitblit v1.9.3