From e517b550408f6cd7de9a84fcbc0edb1ef33361da Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 02 四月 2024 16:35:30 +0800
Subject: [PATCH] 1
---
Terra.YaoGan.Web/Terra.YaoGan.Web/config/RootCatlog.js | 15 ++++++++++-----
Terra.YaoGan.Web/Terra.YaoGan.Web/html/tool.html | 2 +-
Terra.YaoGan.Web/Terra.YaoGan.Web/html/tooljs/menu.js | 5 ++---
Terra.YaoGan.Web/Terra.YaoGan.Web/js/Gis/Gis.js | 3 +--
Terra.YaoGan.Web/Terra.YaoGan.Web/Terra.YaoGan.Web.csproj | 1 +
Terra.YaoGan.Web/Terra.YaoGan.Web/Gis.html | 13 +++++++++----
Terra.YaoGan.Web/Terra.YaoGan.Web/fly/127.fly | 0
Terra.YaoGan.Web/Terra.YaoGan.Web/fly/128.fly | 0
Terra.YaoGan.Web/Terra.YaoGan.Web/html/menu.html | 3 ++-
9 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/Terra.YaoGan.Web/Terra.YaoGan.Web/Gis.html b/Terra.YaoGan.Web/Terra.YaoGan.Web/Gis.html
index 8f3e515..382777f 100644
--- a/Terra.YaoGan.Web/Terra.YaoGan.Web/Gis.html
+++ b/Terra.YaoGan.Web/Terra.YaoGan.Web/Gis.html
@@ -1,10 +1,15 @@
锘�<!DOCTYPE html>
<html>
<head>
- <meta charset="utf-8" />
- <meta name="renderer" content="webkit">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <title>Gis.html</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" />
+
<script type="text/javascript" src="Commonjs/jquery-1.8.2.min.js"></script>
<script src="./config/RootCatlog.js"></script>
<script src="./Commonjs/GetParm.js"></script>
diff --git a/Terra.YaoGan.Web/Terra.YaoGan.Web/Terra.YaoGan.Web.csproj b/Terra.YaoGan.Web/Terra.YaoGan.Web/Terra.YaoGan.Web.csproj
index f7f4f93..0bd2a64 100644
--- a/Terra.YaoGan.Web/Terra.YaoGan.Web/Terra.YaoGan.Web.csproj
+++ b/Terra.YaoGan.Web/Terra.YaoGan.Web/Terra.YaoGan.Web.csproj
@@ -1230,6 +1230,7 @@
<Content Include="html\layuiupdate\font\iconfont.woff" />
<Content Include="Ashx\DataQL.ashx" />
<Content Include="fly\127.fly" />
+ <Content Include="fly\128.fly" />
<None Include="packages.config" />
<Content Include="src\config\Handle.json" />
<Content Include="src\config\Industry.json" />
diff --git a/Terra.YaoGan.Web/Terra.YaoGan.Web/config/RootCatlog.js b/Terra.YaoGan.Web/Terra.YaoGan.Web/config/RootCatlog.js
index 874f6d5..6ecb8ac 100644
--- a/Terra.YaoGan.Web/Terra.YaoGan.Web/config/RootCatlog.js
+++ b/Terra.YaoGan.Web/Terra.YaoGan.Web/config/RootCatlog.js
@@ -1,10 +1,12 @@
-var SkylineGlobleUrl = "http://118.213.95.34";
-var SkylineFly = "http://118.213.95.33:8090";
+var SkylineGlobleUrl = "http://118.213.95.34";
+var SkylineFly = "http://118.213.95.33:8090";
var GisServer = "http://118.213.95.33:8092/gisserver/rest/services/";
var mainUrl = location.href.substring(0, location.href.lastIndexOf("/") + 1);
+
//var FlyPath = SkylineGlobleUrl + "/SG/projects/init.434250";
var FlyPath = mainUrl + "fly/127.fly";
+var sqFly = mainUrl + "../fly/128.fly";
//鑾峰彇鍦板潃
var url = window.location.href.substring(0, window.location.href.lastIndexOf('/') + 1);
@@ -43,17 +45,20 @@
var RootCatlogExBase = {
"name": "鍩虹鏁版嵁",
"Type": "base",
- "Fly": SkylineFly +"/fly/鍩虹鏁版嵁.FLY"
+ //"Fly": SkylineFly +"/fly/鍩虹鏁版嵁.FLY"
+ "Fly": FlyPath
};
var RootCatlogExBasezhuanti = {
"name": "涓撻鏁版嵁",
"Type": "zhuanti",
- "Fly": SkylineFly + "/fly/涓撻鏁版嵁1024.FLY"
+ //"Fly": SkylineFly + "/fly/涓撻鏁版嵁1024.FLY"
+ "Fly": FlyPath
};
var RootCatlogExYingYong = {
"name": "搴旂敤鏁版嵁",
"Type": "yyong",
- "Fly": SkylineFly + "/fly/搴旂敤鏁版嵁.FLY"
+ //"Fly": SkylineFly + "/fly/搴旂敤鏁版嵁.FLY"
+ "Fly": FlyPath
};
//鍒濆浣嶇疆
diff --git a/Terra.YaoGan.Web/Terra.YaoGan.Web/fly/127.fly b/Terra.YaoGan.Web/Terra.YaoGan.Web/fly/127.fly
index c8f84b5..108114d 100644
--- a/Terra.YaoGan.Web/Terra.YaoGan.Web/fly/127.fly
+++ b/Terra.YaoGan.Web/Terra.YaoGan.Web/fly/127.fly
Binary files differ
diff --git a/Terra.YaoGan.Web/Terra.YaoGan.Web/fly/128.fly b/Terra.YaoGan.Web/Terra.YaoGan.Web/fly/128.fly
new file mode 100644
index 0000000..108114d
--- /dev/null
+++ b/Terra.YaoGan.Web/Terra.YaoGan.Web/fly/128.fly
Binary files differ
diff --git a/Terra.YaoGan.Web/Terra.YaoGan.Web/html/menu.html b/Terra.YaoGan.Web/Terra.YaoGan.Web/html/menu.html
index 6f86f8e..19f9eb0 100644
--- a/Terra.YaoGan.Web/Terra.YaoGan.Web/html/menu.html
+++ b/Terra.YaoGan.Web/Terra.YaoGan.Web/html/menu.html
@@ -6,7 +6,8 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link rel="stylesheet" href="css/tool.css" />
- <script type="text/javascript" src="../Commonjs/jquery-1.8.2.min.js"></script>
+ <script src="../config/RootCatlog.js"></script>
+ <script src="../Commonjs/jquery-1.8.2.min.js"></script>
<title></title>
<meta charset="utf-8" />
</head>
diff --git a/Terra.YaoGan.Web/Terra.YaoGan.Web/html/tool.html b/Terra.YaoGan.Web/Terra.YaoGan.Web/html/tool.html
index fe30856..f2a2bab 100644
--- a/Terra.YaoGan.Web/Terra.YaoGan.Web/html/tool.html
+++ b/Terra.YaoGan.Web/Terra.YaoGan.Web/html/tool.html
@@ -15,7 +15,7 @@
<tr>
<td class="td" title="缂栬緫"><img src="img/缂栬緫.png" class="imgx" data-img="bj" /></td>
<td class="td" title="鏌ヨ"><img src="img/鏌ヨ.png" class="imgx" data-img="cx" /></td>
- <td class="td" title="姘村钩娴嬮噺"><img src="img/姘村钩娴嬮噺.png" class="imgx" data-img="spcl" /></td>
+ <!--<td class="td" title="姘村钩娴嬮噺"><img src="img/姘村钩娴嬮噺.png" class="imgx" data-img="spcl" /></td>-->
<td class="td" title="鍨傜洿娴嬮噺"><img src="img/鍨傜洿娴嬮噺.png" class="imgx" data-img="czcl" /></td>
<td class="td" title="绌洪棿娴嬮噺"><img src="img/绌洪棿娴嬮噺.png" class="imgx" data-img="kjcl" /></td>
<td class="td" title="姘村钩闈㈢Н"><img src="img/姘村钩闈㈢Н.png" class="imgx" data-img="spmj" /></td>
diff --git a/Terra.YaoGan.Web/Terra.YaoGan.Web/html/tooljs/menu.js b/Terra.YaoGan.Web/Terra.YaoGan.Web/html/tooljs/menu.js
index 3bec38c..6e4824b 100644
--- a/Terra.YaoGan.Web/Terra.YaoGan.Web/html/tooljs/menu.js
+++ b/Terra.YaoGan.Web/Terra.YaoGan.Web/html/tooljs/menu.js
@@ -98,7 +98,6 @@
case "hzyzhuit":
hz(1012, 22);
break;
-
// case "coorsys":
// coorsys();
// break;
@@ -154,9 +153,9 @@
var dd = true
function sqdb() {
-
globe = window.external.createMultScreen();
- globe.Open("http://118.213.95.34/SG/projects/init.434250");
+ //globe.Open("http://118.213.95.34/SG/projects/init.434250");
+ globe.open(sqFly);
var mode = window.external.setShowMode(7);
if (mode) {
sgworld.Application.Multiple3DWindows.SetAsLeader();
diff --git a/Terra.YaoGan.Web/Terra.YaoGan.Web/js/Gis/Gis.js b/Terra.YaoGan.Web/Terra.YaoGan.Web/js/Gis/Gis.js
index eaad900..fd3324a 100644
--- a/Terra.YaoGan.Web/Terra.YaoGan.Web/js/Gis/Gis.js
+++ b/Terra.YaoGan.Web/Terra.YaoGan.Web/js/Gis/Gis.js
@@ -11,7 +11,6 @@
'horizontal': 'center'
};
-
//澶撮儴鎸夐挳
var tMenu = {
"panels": [{
@@ -145,7 +144,7 @@
TBAX.setLMenu(JSON.stringify(lMenu));
TBAX.setFullBtn2(JSON.stringify(tMenu));
sgworld.AttachEvent("OnLoadFinished", OnloadFished);
- }, 200);
+ }, 2000);
});
//鍔犺浇瀹屾垚浜嬩欢
--
Gitblit v1.9.3