From 6c882b9487a8f0c1b55d768c0e58f3ba87b21bf4 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 20 五月 2024 13:34:02 +0800
Subject: [PATCH] 12
---
Terra.YaoGan.Web/Terra.YaoGan.Web/index.html | 3 ++-
Terra.YaoGan.Web/Terra.YaoGan.Web/config/RootCatlog.js | 17 ++++++++++++++++-
.gitignore | 2 ++
Terra.YaoGan.Web/Terra.YaoGan.Web/Img/logo.png | 0
Terra.YaoGan.Web/Terra.YaoGan.Web/chart/L1.html | 2 +-
Terra.YaoGan.Web/Terra.YaoGan.Web/chart/R1.html | 2 +-
6 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/.gitignore b/.gitignore
index 364db25..cd3463e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -205,3 +205,5 @@
/Terra.YaoGan.Web/Terra.YaoGan.Web/fly/妞嶈瑕嗙洊搴�
/Terra.YaoGan.Web/Terra.YaoGan.Web/fly/2m
/Terra.YaoGan.Web/Terra.YaoGan.Web/fly/add0425
+/Terra.YaoGan.Web/Terra.YaoGan.Web/fly/*.3dml
+/Terra.YaoGan.Web/Terra.YaoGan.Web/fly
diff --git a/Terra.YaoGan.Web/Terra.YaoGan.Web/Img/logo.png b/Terra.YaoGan.Web/Terra.YaoGan.Web/Img/logo.png
index d62a9e2..e7d8bb9 100644
--- a/Terra.YaoGan.Web/Terra.YaoGan.Web/Img/logo.png
+++ b/Terra.YaoGan.Web/Terra.YaoGan.Web/Img/logo.png
Binary files differ
diff --git a/Terra.YaoGan.Web/Terra.YaoGan.Web/chart/L1.html b/Terra.YaoGan.Web/Terra.YaoGan.Web/chart/L1.html
index 61f94e3..705bb6b 100644
--- a/Terra.YaoGan.Web/Terra.YaoGan.Web/chart/L1.html
+++ b/Terra.YaoGan.Web/Terra.YaoGan.Web/chart/L1.html
@@ -266,7 +266,7 @@
<body>
<div id="main">
<div style="height: 35px; width: 100%; float: left; line-height: 35px; border-left: solid 5px #2186C8; background-color: #023852; padding-left: 10px; box-sizing: border-box; border-bottom: dashed 1px #2186C8;">
- <span style="font-size: 20px; color: white; font-weight:600;">鎵庨瞾鐗规棗</span>
+ <span style="font-size: 20px; color: white; font-weight:600;">鍓嶅痉闂ㄨ嫃鏈ㄦ矙鍖栬崏鍦�</span>
</div>
<div style="height: 110px; width: 100%; float: left; background-color: #023852; padding-left: 10px; box-sizing: border-box;">
<div style=" float: left; box-sizing: border-box; padding: 20px 0 0 50px;">
diff --git a/Terra.YaoGan.Web/Terra.YaoGan.Web/chart/R1.html b/Terra.YaoGan.Web/Terra.YaoGan.Web/chart/R1.html
index 5707eb4..7cab693 100644
--- a/Terra.YaoGan.Web/Terra.YaoGan.Web/chart/R1.html
+++ b/Terra.YaoGan.Web/Terra.YaoGan.Web/chart/R1.html
@@ -281,7 +281,7 @@
<body>
<div id="main">
<div style="height: 35px; width: 100%; float: left; line-height: 35px; border-left: solid 5px #2186C8; background-color: #023852; padding-left: 10px; box-sizing: border-box; border-bottom: dashed 1px #2186C8;">
- <span style="font-size: 20px; color: white; font-weight:600;">鍖楀疂鍔涚殝鍥惧槑鏌�</span>
+ <span style="font-size: 20px; color: white; font-weight:600;">鍖楀疂鍔涚殝鍥惧槑鏌ョ洂娓嶅寲鑽夊師淇鍖�</span>
</div>
<div style="height: 110px; width: 100%; float: left; background-color: #023852; padding-left: 10px; box-sizing: border-box;">
diff --git a/Terra.YaoGan.Web/Terra.YaoGan.Web/config/RootCatlog.js b/Terra.YaoGan.Web/Terra.YaoGan.Web/config/RootCatlog.js
index 7dbe024..3a06279 100644
--- a/Terra.YaoGan.Web/Terra.YaoGan.Web/config/RootCatlog.js
+++ b/Terra.YaoGan.Web/Terra.YaoGan.Web/config/RootCatlog.js
@@ -5,12 +5,27 @@
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 = mainUrl + "fly/129.fly";
var sqFly = mainUrl + "../fly/128.fly";
var FlyPath = "E:\\terrait\\lincaoju\\Terra.YaoGan.Web\\Terra.YaoGan.Web\\fly\\129.fly";
var sqFly = "E:\\terrait\\lincaoju\\Terra.YaoGan.Web\\Terra.YaoGan.Web\\fly\\128.fly";
+function t1() {
+ TBAX.closeDialog("t2");
+ TBAX.createPmDialogDock('t1', mainUrl + "chart/L1.html", 530, 850, 100, 20, -1, -1);
+}
+
+function t2() {
+ TBAX.closeDialog("t1");
+ TBAX.createPmDialogDock('t2', mainUrl + "chart/R1.html", 530, 850, 100, 20, -1, -1);
+}
+
+function t3() {
+ TBAX.closeDialog("t1");
+ TBAX.closeDialog("t2");
+}
+
//鑾峰彇鍦板潃
var url = window.location.href.substring(0, window.location.href.lastIndexOf('/') + 1);
diff --git a/Terra.YaoGan.Web/Terra.YaoGan.Web/index.html b/Terra.YaoGan.Web/Terra.YaoGan.Web/index.html
index a0345ce..2e6c458 100644
--- a/Terra.YaoGan.Web/Terra.YaoGan.Web/index.html
+++ b/Terra.YaoGan.Web/Terra.YaoGan.Web/index.html
@@ -161,7 +161,8 @@
<footer>
<!--<span>鑷劧璧勬簮闈掓捣鍗槦搴旂敤鎶�鏈钩鍙板湴鍥惧紩鎿嶡2019</span>-->
- <span>鍩轰簬瀹炴櫙涓夌淮鐨勬灄涓氭櫤鑳芥劅鐭ョ郴缁烜2024</span>
+ <!--<span>鍩轰簬瀹炴櫙涓夌淮鐨勬灄涓氭櫤鑳芥劅鐭ョ郴缁烜2024</span>-->
+ <span>鍩轰簬瀹炴櫙涓夌淮鐨勬櫤鎱ф灄鑽夌敓鎬佺洃娴嬬郴缁烜2024</span>
</footer>
--
Gitblit v1.9.3