lincaoju.git - Gitblit

13693261870

2024-04-02 e517b550408f6cd7de9a84fcbc0edb1ef33361da

已添加1个文件

已修改8个文件

	Terra.YaoGan.Web/Terra.YaoGan.Web/Gis.html	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Terra.YaoGan.Web/Terra.YaoGan.Web/Terra.YaoGan.Web.csproj	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Terra.YaoGan.Web/Terra.YaoGan.Web/config/RootCatlog.js	15 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Terra.YaoGan.Web/Terra.YaoGan.Web/fly/127.fly	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Terra.YaoGan.Web/Terra.YaoGan.Web/fly/128.fly	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Terra.YaoGan.Web/Terra.YaoGan.Web/html/menu.html	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Terra.YaoGan.Web/Terra.YaoGan.Web/html/tool.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Terra.YaoGan.Web/Terra.YaoGan.Web/html/tooljs/menu.js	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Terra.YaoGan.Web/Terra.YaoGan.Web/js/Gis/Gis.js	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 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>

 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" />

 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
};

//初始位置

 Terra.YaoGan.Web/Terra.YaoGan.Web/fly/127.fly

Binary files differ

 Terra.YaoGan.Web/Terra.YaoGan.Web/fly/128.fly

Binary files differ

 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>

 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>

 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();

 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);
});

//加载完成事件

			@@ -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>

			@@ -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" />

			@@ -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
			};

			//初始位置

			@@ -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>

			@@ -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>

			@@ -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();

			@@ -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);
			});

			//加载完成事件