From 3d69aca217ca66daa01a80c26570441e0b03875f Mon Sep 17 00:00:00 2001
From: lixuliang <lixuliang_hd@126.com>
Date: 星期一, 12 五月 2025 16:47:41 +0800
Subject: [PATCH] 1
---
static/html/video/demo.html | 2
src/components/menu/bottom-menu.vue | 2
src/utils/maptype.JS | 42 +++++++-------
src/components/map/history.vue | 2
src/components/map/viewer1.vue | 8 +-
src/components/right/tools/search.vue | 75 +++++++-----------------
src/components/map/viewer.vue | 8 +-
7 files changed, 55 insertions(+), 84 deletions(-)
diff --git a/src/components/map/history.vue b/src/components/map/history.vue
index 40e4d72..6d19a88 100644
--- a/src/components/map/history.vue
+++ b/src/components/map/history.vue
@@ -54,7 +54,7 @@
}
let LwSource = new Tile({
source: new WMTS({
- url: "http://172.26.64.84/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
+ url: "http://10.10.4.116:8085/yzAdapter/ImageEngine/picdis/abc",
layer: "Shiliang_Lw_2019",
style: "",
format: "image/png",
diff --git a/src/components/map/viewer.vue b/src/components/map/viewer.vue
index a392f84..fafcad8 100644
--- a/src/components/map/viewer.vue
+++ b/src/components/map/viewer.vue
@@ -354,10 +354,10 @@
}
},
loadBJ54LWLayer() {
- let url = "http://172.26.64.84/service/ImageEngine/picdis/abc";
+ let url = "http://10.10.4.116:8085/yzAdapter/ImageEngine/picdis/abc";
//let url = option.url;
//let year = option.year;
- let paramUrl = `${url}?user=jjjskfq&password=Jjjskfq@2022&layer=Shiliang_Lw_2019&style=&Service=WMTS&Request=GetTile&Version=1.0.0&Format=image%2Fpng&TileMatrix={z}&TileCol={nx}&TileRow={ny}`;
+ let paramUrl = `${url}?layer=Shiliang_Lw_2019&style=&Service=WMTS&Request=GetTile&Version=1.0.0&Format=image%2Fpng&TileMatrix={z}&TileCol={nx}&TileRow={ny}`;
let minx = (113.168199 * Math.PI) / 180.0;
let miny = (39.230551 * Math.PI) / 180.0;
let maxx = (118.562362 * Math.PI) / 180.0;
@@ -389,10 +389,10 @@
return imageLayer;
},
loadBJ54ImageLayer(year) {
- let url = "http://172.26.64.84/service/ImageEngine/picdis/abc";
+ let url = "http://10.10.4.116:8085/yzAdapter/ImageEngine/picdis/abc";
//let url = option.url;
//let year = option.year;
- let paramUrl = `${url}?user=jjjskfq&password=Jjjskfq@2022&layer=Sate_${year}&style=&Service=WMTS&Request=GetTile&Version=1.0.0&Format=image%2Fpng&TileMatrix={z}&TileCol={nx}&TileRow={ny}`;
+ let paramUrl = `${url}?layer=Sate_${year}&style=&Service=WMTS&Request=GetTile&Version=1.0.0&Format=image%2Fpng&TileMatrix={z}&TileCol={nx}&TileRow={ny}`;
let minx = (113.168199 * Math.PI) / 180.0;
let miny = (39.230551 * Math.PI) / 180.0;
let maxx = (118.562362 * Math.PI) / 180.0;
diff --git a/src/components/map/viewer1.vue b/src/components/map/viewer1.vue
index 17495bc..2ed5c71 100644
--- a/src/components/map/viewer1.vue
+++ b/src/components/map/viewer1.vue
@@ -374,10 +374,10 @@
}
},
loadBJ54LWLayer1() {
- let url = "http://172.26.64.84/service/ImageEngine/picdis/abc";
+ let url = "http://10.10.4.116:8085/yzAdapter/ImageEngine/picdis/abc";
//let url = option.url;
//let year = option.year;
- let paramUrl = `${url}?user=jjjskfq&password=Jjjskfq@2022&layer=Shiliang_Lw_2019&style=&Service=WMTS&Request=GetTile&Version=1.0.0&Format=image%2Fpng&TileMatrix={z}&TileCol={nx}&TileRow={ny}`;
+ let paramUrl = `${url}?layer=Shiliang_Lw_2019&style=&Service=WMTS&Request=GetTile&Version=1.0.0&Format=image%2Fpng&TileMatrix={z}&TileCol={nx}&TileRow={ny}`;
let minx = (113.168199 * Math.PI) / 180.0;
let miny = (39.230551 * Math.PI) / 180.0;
let maxx = (118.562362 * Math.PI) / 180.0;
@@ -409,8 +409,8 @@
return imageLayer;
},
loadBJ54ImageLayer(year) {
- let url = "http://172.26.64.84/service/ImageEngine/picdis/abc";
- let paramUrl = `${url}?user=jjjskfq&password=Jjjskfq@2022&layer=Sate_${year}&style=&Service=WMTS&Request=GetTile&Version=1.0.0&Format=image/png&TileMatrix={z}&TileCol={nx}&TileRow={ny}`;
+ let url = "http://10.10.4.116:8085/yzAdapter/ImageEngine/picdis/abc";
+ let paramUrl = `${url}?layer=Sate_${year}&style=&Service=WMTS&Request=GetTile&Version=1.0.0&Format=image/png&TileMatrix={z}&TileCol={nx}&TileRow={ny}`;
let minx = (113.168199 * Math.PI) / 180.0;
let miny = (39.230551 * Math.PI) / 180.0;
let maxx = (118.562362 * Math.PI) / 180.0;
diff --git a/src/components/menu/bottom-menu.vue b/src/components/menu/bottom-menu.vue
index 5927469..7f9fb6e 100644
--- a/src/components/menu/bottom-menu.vue
+++ b/src/components/menu/bottom-menu.vue
@@ -771,7 +771,7 @@
await $.ajax({
url:
"http://10.10.4.116:8086/getCamerasInfoHls?cameraIndexCode=" +
- item[i].cameraIndexCode,
+ item[i].,
// url: "http://10.10.4.116:8086/getCamerasInfoHls?cameraIndexCode=49ee9fed701444738112e80a4835122c",
success: function (result) {
video = sgworld.Creator.Video3D({
diff --git a/src/components/right/tools/search.vue b/src/components/right/tools/search.vue
index 9b6d2cf..5c83941 100644
--- a/src/components/right/tools/search.vue
+++ b/src/components/right/tools/search.vue
@@ -1,15 +1,8 @@
<template>
<div class="search" id="search">
<div class="searchInput">
- <el-input
- v-loading="loading"
- :disabled="loading"
- placeholder="璇疯緭鍏ュ湴鍚嶅湴鍧�"
- prefix-icon="el-icon-search"
- :clearable="clearable"
- v-model="poi_text"
- @input="changeInput"
- ></el-input>
+ <el-input v-loading="loading" :disabled="loading" placeholder="璇疯緭鍏ュ湴鍚嶅湴鍧�" prefix-icon="el-icon-search"
+ :clearable="clearable" v-model="poi_text" @input="changeInput"></el-input>
<!-- <el-autocomplete v-model="state" :fetch-suggestions="querySearchAsync" placeholder="璇疯緭鍏ュ湴鍚嶅湴鍧�"
@select="handleSelect"></el-autocomplete> -->
@@ -24,12 +17,7 @@
<div>鍏辨壘鍒皗{ total }}鏉＄粨鏋�</div>
<hr />
<div class="searchList">
- <div
- class="searchItem"
- v-for="(item, index) in poiList"
- :key="index"
- @click="flyTo(item)"
- >
+ <div class="searchItem" v-for="(item, index) in poiList" :key="index" @click="flyTo(item)">
<el-button>
<div class="itemName">
<i class="el-icon-map-location"></i>
@@ -202,7 +190,7 @@
// this.address = response.data;
// });
},
- mounted() {},
+ mounted() { },
methods: {
changeInput(e) {
this.poi_text = this.isNull(e);
@@ -279,65 +267,46 @@
this.searching = true;
axios
.all([
- // http://172.26.64.84/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022
- axios.get("http://10.10.4.116:8085/yzAdapter/Navigation", {
- params: {
- request: "bdPoi",
- query: this.poi_text,
- output: "json",
- coord: "cgcs2000",
- page_num: 0,
- page_size: 20,
- },
- }),
- axios.post("http://10.10.4.115:8022/poisearch/qgpoi/POIQuery", {
- adcode: "110115",
- address: {
- name: "",
- type: "",
- },
- adname: "澶у叴鍖�",
- cityname: "鍖椾含甯�",
- name: {
- name: this.poi_text,
- type: "",
- },
- page: 1,
- perPageCount: 20,
- pcode: "110000",
- pname: "",
- resType: "",
- }),
+ axios.get(`http://10.10.4.116:8086/gadapter/poi/text?keyword=${this.poi_text}&output=json&coord=cgcs2000`),
+ axios.get(`http://10.10.4.116:8086/cs/selectIndustrialPark?pageIndex=1&pageSize=20&yqmc=${this.poi_text}`),
])
.then((data) => {
this.searching = false;
let Allresults = [];
- // 甯傜骇骞冲彴
if (data[0].data.status == 0) {
data[0].data.results.forEach((val) => {
let obj = {
address: val.address,
adname: val.area,
cityname: val.city,
- id: val.uid,
- lat: val.location.lat,
- lng: val.location.lng,
+ id: val.id,
+ lng: Number(val.location.split(',')[0]),
+ lat: Number(val.location.split(',')[1]),
name: val.name,
pname: val.province,
+ street: val.street,
+ tag: val.tag,
};
Allresults.push(obj);
});
}
//115鎺ュ彛
if (data[1].status == 200) {
- data[1].data.data.res
+ data[1].data.data
.filter((item) => {
- return item.name.includes(this.poi_text);
+ return item.yqmc.includes(this.poi_text);
})
.forEach((val) => {
- Allresults.push(val);
+ let obj = {
+ address: val.dz,
+ lng: val.x,
+ lat: val.y,
+ name: val.yqmc,
+ };
+ Allresults.push(obj);
});
}
+ console.log(Allresults);
this.total = Allresults.length;
this.poiList = Allresults;
this.loading = false;
@@ -449,6 +418,8 @@
},
flyTo(item) {
flyPoint && Viewer.entities.remove(flyPoint);
+ console.log(item);
+
sgworld.Navigate.flyToPointsInterest({
destination: Cesium.Cartesian3.fromDegrees(
// item.LABELX,
diff --git a/src/utils/maptype.JS b/src/utils/maptype.JS
index 6b90f7b..4aee602 100644
--- a/src/utils/maptype.JS
+++ b/src/utils/maptype.JS
@@ -15,7 +15,7 @@
{
name: "2001",
value: new WMTS({
- url: "http://172.26.64.84/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
+ url: "http://10.10.4.116:8085/yzAdapter/ImageEngine/picdis/abc?",
layer: "Sate_2001",
style: "",
format: "image/png",
@@ -32,7 +32,7 @@
{
name: "2002",
value: new WMTS({
- url: "http://172.26.64.84/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
+ url: "http://10.10.4.116:8085/yzAdapter/ImageEngine/picdis/abc?",
layer: "Sate_2002",
style: "",
format: "image/png",
@@ -49,7 +49,7 @@
{
name: "2003",
value: new WMTS({
- url: "http://172.26.64.84/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
+ url: "http://10.10.4.116:8085/yzAdapter/ImageEngine/picdis/abc?",
layer: "Sate_2003",
style: "",
format: "image/png",
@@ -66,7 +66,7 @@
{
name: "2004",
value: new WMTS({
- url: "http://172.26.64.84/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
+ url: "http://10.10.4.116:8085/yzAdapter/ImageEngine/picdis/abc?",
layer: "Sate_2004",
style: "",
format: "image/png",
@@ -83,7 +83,7 @@
{
name: "2005",
value: new WMTS({
- url: "http://172.26.64.84/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
+ url: "http://10.10.4.116:8085/yzAdapter/ImageEngine/picdis/abc?",
layer: "Sate_2005",
style: "",
format: "image/png",
@@ -100,7 +100,7 @@
{
name: "2006",
value: new WMTS({
- url: "http://172.26.64.84/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
+ url: "http://10.10.4.116:8085/yzAdapter/ImageEngine/picdis/abc?",
layer: "Sate_2006",
style: "",
format: "image/png",
@@ -117,7 +117,7 @@
{
name: "2007",
value: new WMTS({
- url: "http://172.26.64.84/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
+ url: "http://10.10.4.116:8085/yzAdapter/ImageEngine/picdis/abc?",
layer: "Sate_2007",
style: "",
format: "image/png",
@@ -134,7 +134,7 @@
{
name: "2008",
value: new WMTS({
- url: "http://172.26.64.84/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
+ url: "http://10.10.4.116:8085/yzAdapter/ImageEngine/picdis/abc?",
layer: "Sate_2008",
style: "",
format: "image/png",
@@ -151,7 +151,7 @@
{
name: "2009",
value: new WMTS({
- url: "http://172.26.64.84/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
+ url: "http://10.10.4.116:8085/yzAdapter/ImageEngine/picdis/abc?",
layer: "Sate_2009",
style: "",
format: "image/png",
@@ -168,7 +168,7 @@
{
name: "2010",
value: new WMTS({
- url: "http://172.26.64.84/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
+ url: "http://10.10.4.116:8085/yzAdapter/ImageEngine/picdis/abc?",
layer: "Sate_2010",
style: "",
format: "image/png",
@@ -185,7 +185,7 @@
{
name: "2011",
value: new WMTS({
- url: "http://172.26.64.84/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
+ url: "http://10.10.4.116:8085/yzAdapter/ImageEngine/picdis/abc?",
layer: "Sate_2011",
style: "",
format: "image/png",
@@ -202,7 +202,7 @@
{
name: "2012",
value: new WMTS({
- url: "http://172.26.64.84/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
+ url: "http://10.10.4.116:8085/yzAdapter/ImageEngine/picdis/abc?",
layer: "Sate_2012",
style: "",
format: "image/png",
@@ -219,7 +219,7 @@
{
name: "2013",
value: new WMTS({
- url: "http://172.26.64.84/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
+ url: "http://10.10.4.116:8085/yzAdapter/ImageEngine/picdis/abc?",
layer: "Sate_2013",
style: "",
format: "image/png",
@@ -236,7 +236,7 @@
{
name: "2014",
value: new WMTS({
- url: "http://172.26.64.84/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
+ url: "http://10.10.4.116:8085/yzAdapter/ImageEngine/picdis/abc?",
layer: "Sate_2014",
style: "",
format: "image/png",
@@ -253,7 +253,7 @@
{
name: "2015",
value: new WMTS({
- url: "http://172.26.64.84/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
+ url: "http://10.10.4.116:8085/yzAdapter/ImageEngine/picdis/abc?",
layer: "Sate_2015",
style: "",
format: "image/png",
@@ -270,7 +270,7 @@
{
name: "2016",
value: new WMTS({
- url: "http://172.26.64.84/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
+ url: "http://10.10.4.116:8085/yzAdapter/ImageEngine/picdis/abc?",
layer: "Sate_2016",
style: "",
format: "image/png",
@@ -287,7 +287,7 @@
{
name: "2017",
value: new WMTS({
- url: "http://172.26.64.84/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
+ url: "http://10.10.4.116:8085/yzAdapter/ImageEngine/picdis/abc?",
layer: "Sate_2017",
style: "",
format: "image/png",
@@ -304,7 +304,7 @@
{
name: "2018",
value: new WMTS({
- url: "http://172.26.64.84/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
+ url: "http://10.10.4.116:8085/yzAdapter/ImageEngine/picdis/abc?",
layer: "Sate_2018",
style: "",
format: "image/png",
@@ -321,7 +321,7 @@
{
name: "2019",
value: new WMTS({
- url: "http://172.26.64.84/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
+ url: "http://10.10.4.116:8085/yzAdapter/ImageEngine/picdis/abc?",
layer: "Sate_2019",
style: "",
format: "image/png",
@@ -338,7 +338,7 @@
{
name: "2020",
value: new WMTS({
- url: "http://172.26.64.84/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
+ url: "http://10.10.4.116:8085/yzAdapter/ImageEngine/picdis/abc?",
layer: "Sate_2020",
style: "",
format: "image/png",
@@ -362,7 +362,7 @@
{
name: "2021",
value: new WMTS({
- url: "http://172.26.64.84/service/ImageEngine/picdis/abc?user=jjjskfq&password=Jjjskfq@2022",
+ url: "http://10.10.4.116:8085/yzAdapter/ImageEngine/picdis/abc?",
layer: "Sate_2021",
style: "",
format: "image/png",
diff --git a/static/html/video/demo.html b/static/html/video/demo.html
index 88b3a0a..e690d05 100644
--- a/static/html/video/demo.html
+++ b/static/html/video/demo.html
@@ -225,7 +225,7 @@
rate: ''
},
muted: true,
- volume: 50,
+ volume: 50 ,
volumeOnSvg: {
template: '<svg t="1624453273744" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1421" width="200" height="200"><path d="M597.994667 138.005333q130.005333 28.010667 213.994667 132.992t84.010667 241.002667-84.010667 241.002667-213.994667 132.992l0-88q93.994667-28.010667 153.002667-106.005333t59.008-180.010667-59.008-180.010667-153.002667-106.005333l0-88zM704 512q0 120-106.005333 172.010667l0-344q106.005333 52.010667 106.005333 172.010667zM128 384l170.005333 0 213.994667-213.994667 0 684.010667-213.994667-213.994667-170.005333 0 0-256z" p-id="1422"></path></svg>'
},
--
Gitblit v1.9.3