From 0010f94a1b8b117437d8f93cc90ac8d6c4701b0e Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 02 四月 2024 15:21:47 +0800
Subject: [PATCH] 1
---
Terra.YaoGan.Web/Terra.YaoGan.Web/index.html | 2 +-
Terra.YaoGan.Web/Terra.YaoGan.Web/config/RootCatlog.js | 8 ++++----
Terra.YaoGan.Web/Terra.YaoGan.Web/js/Gis/Gis.js | 2 ++
Terra.YaoGan.Web/Terra.YaoGan.Web/Terra.YaoGan.Web.csproj | 3 ++-
Terra.YaoGan.Web/Terra.YaoGan.Web/fly/127.fly | 0
5 files changed, 9 insertions(+), 6 deletions(-)
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 b9be253..f7f4f93 100644
--- a/Terra.YaoGan.Web/Terra.YaoGan.Web/Terra.YaoGan.Web.csproj
+++ b/Terra.YaoGan.Web/Terra.YaoGan.Web/Terra.YaoGan.Web.csproj
@@ -1229,6 +1229,7 @@
<Content Include="html\layuiupdate\font\iconfont.ttf" />
<Content Include="html\layuiupdate\font\iconfont.woff" />
<Content Include="Ashx\DataQL.ashx" />
+ <Content Include="fly\127.fly" />
<None Include="packages.config" />
<Content Include="src\config\Handle.json" />
<Content Include="src\config\Industry.json" />
@@ -1301,7 +1302,7 @@
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>50193</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
- <IISUrl>https://localhost:44302/</IISUrl>
+ <IISUrl>http://localhost:50193/</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>
diff --git a/Terra.YaoGan.Web/Terra.YaoGan.Web/config/RootCatlog.js b/Terra.YaoGan.Web/Terra.YaoGan.Web/config/RootCatlog.js
index d769965..874f6d5 100644
--- a/Terra.YaoGan.Web/Terra.YaoGan.Web/config/RootCatlog.js
+++ b/Terra.YaoGan.Web/Terra.YaoGan.Web/config/RootCatlog.js
@@ -1,11 +1,11 @@
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 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 FlyPath = SkylineGlobleUrl +"/SG/projects/init.434250";
//鑾峰彇鍦板潃
var url = window.location.href.substring(0, window.location.href.lastIndexOf('/') + 1);
diff --git a/Terra.YaoGan.Web/Terra.YaoGan.Web/fly/127.fly b/Terra.YaoGan.Web/Terra.YaoGan.Web/fly/127.fly
new file mode 100644
index 0000000..c8f84b5
--- /dev/null
+++ b/Terra.YaoGan.Web/Terra.YaoGan.Web/fly/127.fly
Binary files differ
diff --git a/Terra.YaoGan.Web/Terra.YaoGan.Web/index.html b/Terra.YaoGan.Web/Terra.YaoGan.Web/index.html
index 5830655..d90445b 100644
--- a/Terra.YaoGan.Web/Terra.YaoGan.Web/index.html
+++ b/Terra.YaoGan.Web/Terra.YaoGan.Web/index.html
@@ -148,7 +148,7 @@
<span>閮藉叞鐩戠骞冲彴</span>
</li>
- <li>
+ <li>
<p class="evenment_anylise"></p>
<span>鐢熸�佺姸鍐靛垎鏋�</span>
</li>
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 691de45..eaad900 100644
--- a/Terra.YaoGan.Web/Terra.YaoGan.Web/js/Gis/Gis.js
+++ b/Terra.YaoGan.Web/Terra.YaoGan.Web/js/Gis/Gis.js
@@ -125,12 +125,14 @@
TE = document.createElement("object");
TE.id = "TBAX";
TE.classid = "clsid:B23DDF84-B652-4E34-9E57-77B8731199FE";
+ //TE.classid = "CLSID:3a4f9196-65a8-11d5-85c1-0001023952c1";
TE.style.width = "100%";
TE.style.height = "100%";
TE.style.marginLeft = "-1920px";
}
document.body.appendChild(TE);
sgworld = TBAX.createSgworld();
+ //sgworld = TE.CreateInstance("TerraExplorerX.SGWorld71");
//宸︿晶鑿滃崟
lMenu = {
top: "160",
--
Gitblit v1.9.3