From af75ade1f36ae099d454ffa4f052b704cf7e02e1 Mon Sep 17 00:00:00 2001
From: lixuliang <lixuliang_hd@126.com>
Date: 星期五, 19 一月 2024 10:16:35 +0800
Subject: [PATCH] 最新
---
static/video/video.html | 43 +++++++------
src/utils/maptype.JS | 43 +++++++-------
config/index.js | 2
build/webpack.dev.conf.js | 11 ++-
static/SmartEarthSDK/Workers/layui/css/layui.css | 2
static/SmartEarthSDK/Workers/path/Path.html | 14 +++-
src/components/login.vue | 13 ++--
src/components/sideMenu/roamPanel/roamPanel.vue | 4
src/router/index.js | 4
9 files changed, 76 insertions(+), 60 deletions(-)
diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js
index b7b157e..4cded54 100644
--- a/build/webpack.dev.conf.js
+++ b/build/webpack.dev.conf.js
@@ -110,11 +110,16 @@
// Add FriendlyErrorsPlugin
devWebpackConfig.plugins.push(new FriendlyErrorsPlugin({
compilationSuccessInfo: {
- messages: [`Your application is running here: http://${devWebpackConfig.devServer.host}:${port}`],
+ // messages: [`Your application is running here: http://${devWebpackConfig.devServer.host}:${port}`],
+ messages: [
+ `App runing at:`,
+ `Local: http://localhost:${port}`,
+ `Network: http://${require('ip').address()}:${port}`,
+ ],
},
onErrors: config.dev.notifyOnErrors
- ? utils.createNotifierCallback()
- : undefined
+ ? utils.createNotifierCallback()
+ : undefined
}))
resolve(devWebpackConfig)
diff --git a/config/index.js b/config/index.js
index 7bc3e8e..eed2db2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -13,7 +13,7 @@
proxyTable: {},
// Various Dev Server settings
- host: 'localhost', // can be overwritten by process.env.HOST
+ host: '0.0.0.0', // can be overwritten by process.env.HOST
port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: false,
errorOverlay: true,
diff --git a/src/components/login.vue b/src/components/login.vue
index a45087e..9903b92 100644
--- a/src/components/login.vue
+++ b/src/components/login.vue
@@ -26,12 +26,13 @@
methods: {
getQueryString(name) {
- var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
- var r = window.location.search.substr(1).match(reg);
- if (r != null) {
- this.$router.push("/index");
- }
- return null;
+ this.$router.push("/index");
+ // var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
+ // var r = window.location.search.substr(1).match(reg);
+ // if (r != null) {
+ // this.$router.push("/index");
+ // }
+ // return null;
},
// 浜姙鍏嶅瘑鐧诲綍
// passJBFree() {
diff --git a/src/components/sideMenu/roamPanel/roamPanel.vue b/src/components/sideMenu/roamPanel/roamPanel.vue
index 5c5125a..6ddb505 100644
--- a/src/components/sideMenu/roamPanel/roamPanel.vue
+++ b/src/components/sideMenu/roamPanel/roamPanel.vue
@@ -103,9 +103,9 @@
};
window.PathAnimationData.winIndex = layer.open({
type: 2,
- title: "璺緞鍔ㄧ敾",
+ title: result.name,
shade: false,
- area: ["352px", "690px"],
+ area: ["100%", "210px"],
offset: "r",
skin: "other-class",
content: SmartEarthRootUrl + "Workers/path/Path.html",
diff --git a/src/router/index.js b/src/router/index.js
index 078a8f6..2d99d79 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,8 +8,8 @@
const routes = [
{
path: '/',
- // redirect: "login",
- redirect: "index",
+ redirect: "login",
+ // redirect: "index",
},
{
path: '/login',
diff --git a/src/utils/maptype.JS b/src/utils/maptype.JS
index 52132de..40a2bda 100644
--- a/src/utils/maptype.JS
+++ b/src/utils/maptype.JS
@@ -15,11 +15,10 @@
{
name: "2001",
value: new XYZ({
- // url: "http://skyzt.bda.gov.cn:443/yzAdapter/Vector/?request=1&year=2001&type=Sate&level={z}&x={x}&y={y}",
url: "https://skyzt.bda.gov.cn/yzAdapter/Vector/?request=1&year=2001&type=Sate&level={z}&x={x}&y={y}",
}),
// value: new WMTS({
- // url: "http://172.26.64.84/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
+ // url: "https://skyzt.bda.gov.cn/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
// layer: "Sate_2001",
// style: "",
// format: "image/png",
@@ -39,7 +38,7 @@
url: "https://skyzt.bda.gov.cn/yzAdapter/Vector/?request=1&year=2002&type=Sate&level={z}&x={x}&y={y}",
}),
// value: new WMTS({
- // url: "http://172.26.64.84/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
+ // url: "https://skyzt.bda.gov.cn/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
// layer: "Sate_2002",
// style: "",
// format: "image/png",
@@ -59,7 +58,7 @@
url: "https://skyzt.bda.gov.cn/yzAdapter/Vector/?request=1&year=2003&type=Sate&level={z}&x={x}&y={y}",
}),
// value: new WMTS({
- // url: "http://172.26.64.84/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
+ // url: "https://skyzt.bda.gov.cn/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
// layer: "Sate_2003",
// style: "",
// format: "image/png",
@@ -79,7 +78,7 @@
url: "https://skyzt.bda.gov.cn/yzAdapter/Vector/?request=1&year=2004&type=Sate&level={z}&x={x}&y={y}",
}),
// value: new WMTS({
- // url: "http://172.26.64.84/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
+ // url: "https://skyzt.bda.gov.cn/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
// layer: "Sate_2004",
// style: "",
// format: "image/png",
@@ -99,7 +98,7 @@
url: "https://skyzt.bda.gov.cn/yzAdapter/Vector/?request=1&year=2005&type=Sate&level={z}&x={x}&y={y}",
}),
// value: new WMTS({
- // url: "http://172.26.64.84/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
+ // url: "https://skyzt.bda.gov.cn/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
// layer: "Sate_2005",
// style: "",
// format: "image/png",
@@ -119,7 +118,7 @@
url: "https://skyzt.bda.gov.cn/yzAdapter/Vector/?request=1&year=2006&type=Sate&level={z}&x={x}&y={y}",
}),
// value: new WMTS({
- // url: "http://172.26.64.84/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
+ // url: "https://skyzt.bda.gov.cn/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
// layer: "Sate_2006",
// style: "",
// format: "image/png",
@@ -139,7 +138,7 @@
url: "https://skyzt.bda.gov.cn/yzAdapter/Vector/?request=1&year=2007&type=Sate&level={z}&x={x}&y={y}",
}),
// value: new WMTS({
- // url: "http://172.26.64.84/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
+ // url: "https://skyzt.bda.gov.cn/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
// layer: "Sate_2007",
// style: "",
// format: "image/png",
@@ -159,7 +158,7 @@
url: "https://skyzt.bda.gov.cn/yzAdapter/Vector/?request=1&year=2008&type=Sate&level={z}&x={x}&y={y}",
}),
// value: new WMTS({
- // url: "http://172.26.64.84/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
+ // url: "https://skyzt.bda.gov.cn/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
// layer: "Sate_2008",
// style: "",
// format: "image/png",
@@ -179,7 +178,7 @@
url: "https://skyzt.bda.gov.cn/yzAdapter/Vector/?request=1&year=2009&type=Sate&level={z}&x={x}&y={y}",
}),
// value: new WMTS({
- // url: "http://172.26.64.84/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
+ // url: "https://skyzt.bda.gov.cn/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
// layer: "Sate_2009",
// style: "",
// format: "image/png",
@@ -199,7 +198,7 @@
url: "https://skyzt.bda.gov.cn/yzAdapter/Vector/?request=1&year=2010&type=Sate&level={z}&x={x}&y={y}",
}),
// value: new WMTS({
- // url: "http://172.26.64.84/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
+ // url: "https://skyzt.bda.gov.cn/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
// layer: "Sate_2010",
// style: "",
// format: "image/png",
@@ -219,7 +218,7 @@
url: "https://skyzt.bda.gov.cn/yzAdapter/Vector/?request=1&year=2011&type=Sate&level={z}&x={x}&y={y}",
}),
// value: new WMTS({
- // url: "http://172.26.64.84/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
+ // url: "https://skyzt.bda.gov.cn/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
// layer: "Sate_2011",
// style: "",
// format: "image/png",
@@ -239,7 +238,7 @@
url: "https://skyzt.bda.gov.cn/yzAdapter/Vector/?request=1&year=2012&type=Sate&level={z}&x={x}&y={y}",
}),
// value: new WMTS({
- // url: "http://172.26.64.84/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
+ // url: "https://skyzt.bda.gov.cn/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
// layer: "Sate_2012",
// style: "",
// format: "image/png",
@@ -259,7 +258,7 @@
url: "https://skyzt.bda.gov.cn/yzAdapter/Vector/?request=1&year=2013&type=Sate&level={z}&x={x}&y={y}",
}),
// value: new WMTS({
- // url: "http://172.26.64.84/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
+ // url: "https://skyzt.bda.gov.cn/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
// layer: "Sate_2013",
// style: "",
// format: "image/png",
@@ -279,7 +278,7 @@
url: "https://skyzt.bda.gov.cn/yzAdapter/Vector/?request=1&year=2014&type=Sate&level={z}&x={x}&y={y}",
}),
// value: new WMTS({
- // url: "http://172.26.64.84/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
+ // url: "https://skyzt.bda.gov.cn/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
// layer: "Sate_2014",
// style: "",
// format: "image/png",
@@ -299,7 +298,7 @@
url: "https://skyzt.bda.gov.cn/yzAdapter/Vector/?request=1&year=2015&type=Sate&level={z}&x={x}&y={y}",
}),
// value: new WMTS({
- // url: "http://172.26.64.84/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
+ // url: "https://skyzt.bda.gov.cn/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
// layer: "Sate_2015",
// style: "",
// format: "image/png",
@@ -319,7 +318,7 @@
url: "https://skyzt.bda.gov.cn/yzAdapter/Vector/?request=1&year=2016&type=Sate&level={z}&x={x}&y={y}",
}),
// value: new WMTS({
- // url: "http://172.26.64.84/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
+ // url: "https://skyzt.bda.gov.cn/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
// layer: "Sate_2016",
// style: "",
// format: "image/png",
@@ -339,7 +338,7 @@
url: "https://skyzt.bda.gov.cn/yzAdapter/Vector/?request=1&year=2017&type=Sate&level={z}&x={x}&y={y}",
}),
// value: new WMTS({
- // url: "http://172.26.64.84/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
+ // url: "https://skyzt.bda.gov.cn/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
// layer: "Sate_2017",
// style: "",
// format: "image/png",
@@ -359,7 +358,7 @@
url: "https://skyzt.bda.gov.cn/yzAdapter/Vector/?request=1&year=2018&type=Sate&level={z}&x={x}&y={y}",
}),
// value: new WMTS({
- // url: "http://172.26.64.84/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
+ // url: "https://skyzt.bda.gov.cn/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
// layer: "Sate_2018",
// style: "",
// format: "image/png",
@@ -379,7 +378,7 @@
url: "https://skyzt.bda.gov.cn/yzAdapter/Vector/?request=1&year=2019&type=Sate&level={z}&x={x}&y={y}",
}),
// value: new WMTS({
- // url: "http://172.26.64.84/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
+ // url: "https://skyzt.bda.gov.cn/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
// layer: "Sate_2019",
// style: "",
// format: "image/png",
@@ -399,7 +398,7 @@
url: "https://skyzt.bda.gov.cn/yzAdapter/Vector/?request=1&year=2020&type=Sate&level={z}&x={x}&y={y}",
}),
// value: new WMTS({
- // url: "http://172.26.64.84/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
+ // url: "https://skyzt.bda.gov.cn/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
// layer: "Sate_2020",
// style: "",
// format: "image/png",
@@ -426,7 +425,7 @@
url: "https://skyzt.bda.gov.cn/yzAdapter/Vector/?request=1&year=2021&type=Sate&level={z}&x={x}&y={y}",
}),
// value: new WMTS({
- // url: "http://172.26.64.84/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
+ // url: "https://skyzt.bda.gov.cn/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
// layer: "Sate_2021",
// style: "",
// format: "image/png",
diff --git a/static/SmartEarthSDK/Workers/layui/css/layui.css b/static/SmartEarthSDK/Workers/layui/css/layui.css
index 0f9e6b1..f4e941a 100644
--- a/static/SmartEarthSDK/Workers/layui/css/layui.css
+++ b/static/SmartEarthSDK/Workers/layui/css/layui.css
@@ -2323,7 +2323,7 @@
.layui-form-select dl dd,
.layui-form-select dl dt {
padding: 0 10px;
- line-height: 36px;
+ line-height: 25px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
diff --git a/static/SmartEarthSDK/Workers/path/Path.html b/static/SmartEarthSDK/Workers/path/Path.html
index e82bbaf..5ca36d9 100644
--- a/static/SmartEarthSDK/Workers/path/Path.html
+++ b/static/SmartEarthSDK/Workers/path/Path.html
@@ -44,6 +44,9 @@
form {
/* width: 95%; */
width: 97%;
+ position: absolute;
+ bottom: 10px;
+ /* margin-top: 40px; */
}
html {
@@ -71,6 +74,7 @@
.layui-prop {
margin-left: 10px;
+ position: relative;
}
.layui-form-item .line {
@@ -103,11 +107,11 @@
.bnt-box {
text-align: center;
- height: 58px;
+ height: 48px;
}
.bnt-box button {
- margin-top: 10px;
+ margin-top: 5px;
}
.fly {
@@ -116,6 +120,9 @@
#flySpeed {
padding: 19px 0;
+ }
+ .norline{
+ display: none !important;
}
</style>
</head>
@@ -128,7 +135,7 @@
<button type="button" class="layui-btn layui-btn-normal" id="exit">閫�鍑烘极娓�</button>
</div>
<form class="layui-form" action="">
- <div class="layui-form-item">
+ <div class="layui-form-item norline">
<label class="layui-form-label">璺嚎鍚嶇О</label>
<div class="layui-input-block" id="roadName" style="line-height: 38px;">
@@ -250,6 +257,7 @@
var fly = null;
var sgworld = parent.sgworld;
var routeData = parent.PathAnimationData.flyData;
+ console.log(routeData);
var url = parent.SmartEarthRootUrl + "Workers/Model/xiaoche.gltf";
$('#start').hide();
$('#stop').show();
diff --git a/static/video/video.html b/static/video/video.html
index a2c1371..de0a0a3 100644
--- a/static/video/video.html
+++ b/static/video/video.html
@@ -75,7 +75,6 @@
url: "https://skyzt.bda.gov.cn/BEApi/getCamerasInfo?cameraIndexCode=" + code, success: function (result) {
try {
var data = JSON.parse(result);
- realplay(data.data.url);
let res;
if (data.data.url.includes("41")) {
res = data.data.url.replace("ws://10.117.5.41:559/", "wss://skyzt.bda.gov.cn:443/")
@@ -89,11 +88,11 @@
res = data.data.url.replace("ws://10.117.5.46:559/", "wss://skyzt.bda.gov.cn:443/")
} else if (data.data.url.includes("47")) {
res = data.data.url.replace("ws://10.117.5.47:559/", "wss://skyzt.bda.gov.cn:443/")
+ } else if (data.data.url.includes("206")) {
+ res = data.data.url.replace("ws://10.117.5.28:559/", "wss://skyzt.bda.gov.cn:443/")//瑙嗛鏈�鏂拌繑鍥炲湴鍧�
}
realplay(res);
- } catch (e) {
-
- }
+ } catch (e) { }
}
});
}
@@ -114,31 +113,35 @@
})
setSize()
}
- function arrangeWindow() {
- let splitNum = 1
- this.player.JS_ArrangeWindow(splitNum).then(
- () => { console.log(`arrangeWindow to ${splitNum}x${splitNum} success`) },
- e => { console.error(e) }
- )
- }
- function wholeFullScreen() {
- this.player.JS_FullScreenDisplay(true).then(
- () => { console.log(`wholeFullScreen success`) },
- e => { console.error(e) }
- )
- }
+ // function arrangeWindow() {
+ // let splitNum = 1
+ // this.player.JS_ArrangeWindow(splitNum).then(
+ // () => { console.log(`arrangeWindow to ${splitNum}x${splitNum} success`) },
+ // e => { console.error(e) }
+ // )
+ // }
+ // function wholeFullScreen() {
+ // this.player.JS_FullScreenDisplay(true).then(
+ // () => { console.log(`wholeFullScreen success`) },
+ // e => { console.error(e) }
+ // )
+ // }
/* 棰勮&瀵硅 */
function realplay(url) {
var mode = 1;
var index = player.currentWindowIndex;
var playURL = url;
player.JS_Play(playURL, { playURL, mode }, index).then(
- () => { console.log('realplay success') },
- e => { console.error(e); }
+ () => {
+ console.log('realplay success')
+ },
+ e => {
+ console.error(e);
+ }
)
}
$(function () {
- // init();
+ init();
});
</script>
</body>
--
Gitblit v1.9.3