From dbb352c9d988dfac83da979023fe81a0a02f88e9 Mon Sep 17 00:00:00 2001
From: lixuliang <lixuliang_hd@126.com>
Date: 星期五, 12 四月 2024 16:34:20 +0800
Subject: [PATCH] 与数字人合并
---
src/components/map/viewer1.vue | 182 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 145 insertions(+), 37 deletions(-)
diff --git a/src/components/map/viewer1.vue b/src/components/map/viewer1.vue
index 109f06b..9686e7f 100644
--- a/src/components/map/viewer1.vue
+++ b/src/components/map/viewer1.vue
@@ -2,7 +2,7 @@
<div>
<div id="sdkContainer1" style="height: 100%"></div>
<div class="listBox" v-show="!isLand">
- <ul>
+ <ul id="viewer1_lsyx">
<li
v-for="(item, index) in arr"
:key="index"
@@ -81,7 +81,7 @@
title="浼佷笟淇℃伅"
append-to-body
width="50%"
- height="55%"
+ height="60%"
style="overflow: auto"
:visible.sync="QYbox"
:before-close="dialogClose"
@@ -89,15 +89,15 @@
<div class="el-dialog-div">
<div class="inquire">
<el-form
- size="medium"
+ size="mini"
ref="queryForm"
:model="queryForm"
:inline="true"
>
- <el-form-item label="鏌ヨ鍐呭" prop="name">
+ <el-form-item label="鏌ヨ鏉′欢" prop="name">
<el-input
v-model="queryForm.content"
- placeholder="璇疯緭鍏ユ煡璇㈠唴瀹�"
+ placeholder="璇疯緭鍏ヨ鏌ヨ鐨勪紒涓氬悕绉�"
/>
</el-form-item>
<el-form-item>
@@ -117,33 +117,32 @@
highlight-current-row
height="50"
>
- <el-table-column type="index" width="50"></el-table-column>
+ <el-table-column type="index" width="40"></el-table-column>
<el-table-column
property="浼佷笟鍚嶇О"
label="浼佷笟鍚嶇О"
+ min-width="220"
></el-table-column>
- <!-- <el-table-column
+ <el-table-column
property="浼佷笟绫诲瀷"
label="浼佷笟绫诲瀷"
+ min-width="220"
></el-table-column>
<el-table-column
property="鎴愮珛鏃堕棿"
label="鎴愮珛鏃堕棿"
+ min-width="90"
></el-table-column>
- <el-table-column
+ <!-- <el-table-column
property="鎵�灞炶涓�"
label="鎵�灞炶涓�"
- ></el-table-column>
- <el-table-column
- property="娉曚汉"
- label="娉曚汉"
- width="100"
></el-table-column> -->
- <el-table-column
+ <el-table-column property="娉曚汉" label="娉曚汉"></el-table-column>
+ <!-- <el-table-column
property="娉ㄥ唽鍦板潃"
label="娉ㄥ唽鍦板潃"
- ></el-table-column>
- <el-table-column label="鎿嶄綔" width="100">
+ ></el-table-column> -->
+ <el-table-column label="鎿嶄綔" width="60">
<template slot-scope="scope">
<el-button
@click="handleClick(scope.row)"
@@ -157,7 +156,7 @@
<div
slot="footer"
class="dialog-footer"
- style="text-align: center; margin-top: 5px"
+ style="text-align: center; margin-top: 2px"
>
<el-pagination
@size-change="handleSizeChange"
@@ -195,7 +194,7 @@
activeLi,
nLayer,
TDLayer,
- LWLayer;
+ LWLayer1;
export default {
name: "viewer1",
components: { layerTreeTwoScreenRight },
@@ -276,6 +275,7 @@
if (line1) {
sgworld1.Creator.DeleteObject(line1);
}
+ this.initLSYX();
} else {
this.destroyImageLayer();
if (!TDLayer) {
@@ -285,6 +285,13 @@
},
},
mounted() {
+ let pathName = window.location.pathname.split("/");
+ let StaticFileBaseUrl;
+ if (pathName.length != 2) {
+ StaticFileBaseUrl = `../../../${pathName[1]}/static/CimSDK/`;
+ } else {
+ StaticFileBaseUrl = `../../../static/CimSDK/`;
+ }
let size = this.detectZoom();
this.scale = (100 / size).toFixed(2);
this.offset = "-" + ((size - 100) / 2).toFixed(2) + "%";
@@ -308,8 +315,7 @@
window.sgworld1 = new SmartEarth.EarthCtrl(
"sdkContainer1",
{
- StaticFileBaseUrl: "../../static/CimSDK/",
- // StaticFileBaseUrl: "../../../SW/static/CimSDK/",
+ StaticFileBaseUrl: StaticFileBaseUrl,
},
{},
null,
@@ -327,6 +333,8 @@
);
if (this.isLand) {
this.loadTDGLLayer();
+ } else {
+ this.initLSYX();
}
var p = {
destination: sgworld.Navigate.getPosition(),
@@ -367,6 +375,11 @@
});
},
methods: {
+ initLSYX() {
+ let ul = document.getElementById("viewer1_lsyx");
+ let lis = ul.getElementsByTagName("li");
+ lis[9].click();
+ },
setImageComparison(isStart) {
this.isImage = isStart;
if (!this.isImage) {
@@ -382,9 +395,9 @@
Viewer1.imageryLayers.remove(nLayer, true);
nLayer = null;
}
- if (LWLayer) {
- Viewer1.imageryLayers.remove(LWLayer, true);
- LWLayer = null;
+ if (LWLayer1) {
+ Viewer1.imageryLayers.remove(LWLayer1);
+ LWLayer1 = undefined;
}
},
changeLeftMap(event, item, index) {
@@ -403,11 +416,15 @@
nLayer = null;
}
nLayer = this.loadBJ54ImageLayer(year);
- if (!LWLayer) {
- LWLayer = this.loadBJ54LWLayer();
+
+ if (!LWLayer1 || Viewer1.imageryLayers.indexOf(LWLayer1) < 0) {
+ if (LWLayer1) {
+ LWLayer1.destroy();
+ }
+ LWLayer1 = this.loadBJ54LWLayer1();
}
},
- loadBJ54LWLayer() {
+ loadBJ54LWLayer1() {
let url = "http://172.26.64.84/service/ImageEngine/picdis/abc";
//let url = option.url;
//let year = option.year;
@@ -475,6 +492,7 @@
brightness: 1.0,
});
Viewer1.imageryLayers.add(imageLayer, 2);
+
return imageLayer;
},
loadTDGLLayer() {
@@ -516,8 +534,6 @@
} else {
p = sgworld1.Navigate.getMousePosition(event);
}
- // alert(JSON.stringify(p))
- // console.log(p);
if (p) {
if (line) {
sgworld.Creator.DeleteObject(line);
@@ -537,7 +553,8 @@
}
axios
.get(
- "http://10.10.4.115:8022/geowinmap_xncs/ds?r=0.9158559377752831&serviceproviderid=map.vectorserviceprovider&serviceid=queryfeature&featcls=225%25E8%258C%2583%25E5%259B%25B4%25E5%2588%2586%25E5%258C%25BA%25E8%25A7%2584%25E5%2588%2592.geojson&lng=" +
+ "http://10.10.4.116:8089/cs/geowinmap_xncs/ds?r=0.9158559377752831&serviceproviderid=map.vectorserviceprovider&serviceid=queryfeature&featcls=225%25E8%258C%2583%25E5%259B%25B4%25E5%2588%2586%25E5%258C%25BA%25E8%25A7%2584%25E5%2588%2592.geojson&lng=" +
+ // "http://10.10.4.115:8022/geowinmap_xncs/ds?r=0.9158559377752831&serviceproviderid=map.vectorserviceprovider&serviceid=queryfeature&featcls=225%25E8%258C%2583%25E5%259B%25B4%25E5%2588%2586%25E5%258C%25BA%25E8%25A7%2584%25E5%2588%2592.geojson&lng=" +
p.lon +
"&lat=" +
p.lat +
@@ -585,7 +602,8 @@
if (center.lon != 0 && center.lat != 0) {
axios
.get(
- "http://10.10.4.115:8022//poisearch/guihuacon/getInfo?ydbm=" +
+ "http://10.10.4.116:8089/cs/poisearch/guihuacon/getInfo?ydbm=" +
+ // "http://10.10.4.115:8022//poisearch/guihuacon/getInfo?ydbm=" +
response.data.NO
)
.then(
@@ -1263,11 +1281,11 @@
.aboutDialog >>> .el-dialog__body {
height: 77%;
padding: 0px !important;
- padding: 15px !important;
+ padding: 10px 10px 8px !important;
}
.aboutDialog >>> .el-dialog__header {
- padding: 10px 20px;
+ padding: 10px 20px 0;
height: 25px;
line-height: 25px;
font-weight: bold;
@@ -1277,7 +1295,7 @@
.aboutDialog >>> .el-dialog__title {
color: #fff;
- font-size: 1.1rem;
+ font-size: 18px;
}
.aboutDialog >>> .el-dialog__headerbtn .el-dialog__close {
@@ -1293,11 +1311,14 @@
}
.aboutDialog >>> .el-form-item {
+ margin-top: 5px;
margin-bottom: 10px;
}
.el-form >>> .el-form-item__label {
color: #fff;
+ margin-left: 10px;
+ font-size: 16px;
}
.aboutDialog .el-dialog-div {
@@ -1313,6 +1334,7 @@
height: 80% !important;
overflow: auto;
}
+
.el-table /deep/ .el-button--text {
/* color: #fff; */
font-size: 14px;
@@ -1326,8 +1348,11 @@
width: 383px;
}
-.el-table /deep/ th {
+.el-table /deep/ th,
+.el-table /deep/ td {
background-color: transparent;
+ padding-top: 4px;
+ padding-bottom: 4px;
}
.el-table /deep/ tr {
@@ -1373,18 +1398,18 @@
.el-pagination >>> .btn-prev {
background: transparent;
color: #fff;
- font-size: 1rem;
+ font-size: 14px;
}
.el-pagination >>> .el-pager li {
line-height: 27px;
background-color: transparent;
- font-size: 1rem;
+ font-size: 14px;
}
.el-pagination >>> .el-pager li.btn-quicknext,
.el-pagination >>> .el-pager li.btn-quickprev {
- font-size: 1rem;
+ font-size: 14px;
line-height: 28px;
color: #fff;
}
@@ -1411,12 +1436,95 @@
/* 灞忓箷鍒嗚鲸鐜囨斁澶т负 125 */
@media (-webkit-min-device-pixel-ratio: 1.25) {
+ .tdInfo_close {
+ position: absolute;
+ right: 10px;
+ top: 8px;
+ border-radius: 3px;
+ width: 20px;
+ height: 20px;
+ background-color: rgba(0, 0, 0, 0.2);
+ cursor: pointer;
+ text-align: center;
+ line-height: 19px;
+ font-size: 20px;
+ }
+
+ .tdInfo .title li {
+ margin-left: 25px;
+ line-height: 25px;
+ font-size: 15px;
+ font-weight: bold;
+ background: linear-gradient(0deg, #9cd2ff 0%, #ffffff 100%);
+ -webkit-background-clip: text;
+ -webkit-text-fill-color: transparent;
+ }
+
+ .content1,
+ .content2,
+ .content3 {
+ /* width: 100%; */
+ box-sizing: border-box;
+ /* margin-left: 42px; */
+ min-width: 220px;
+ max-width: 280px;
+ margin: 0 25px;
+ display: flex;
+ padding: 10px 0;
+ }
+
+ .content1 li,
+ .content2 li,
+ .content3 li {
+ font-size: 13px;
+ }
+
+ .tdInfo a {
+ font-size: 16px;
+ }
.listBox li {
font-size: 12px;
}
+ .aboutDialog >>> .el-dialog__title {
+ color: #fff;
+ font-size: 14px;
+ }
.el-table {
font-size: 12px;
}
+ .el-table /deep/ .el-button--text {
+ font-size: 12px;
+ }
+ .el-form >>> .el-form-item__label {
+ font-size: 13px;
+ }
+ .el-pagination >>> .el-pager li {
+ font-size: 13px;
+ }
+ .el-pagination >>> .el-pagination__total,
+ .el-pagination >>> .btn-next,
+ .el-pagination >>> .btn-prev {
+ font-size: 12px;
+ }
+ .el-pagination >>> .el-pager li.btn-quicknext,
+ .el-pagination >>> .el-pager li.btn-quickprev {
+ font-size: 12px;
+ }
+
+ .inquire >>> .el-form-item--mini .el-form-item__content,
+ .inquire >>> .el-form-item--mini .el-form-item__label {
+ line-height: 24px;
+ }
+ .inquire >>> .el-input__inner {
+ height: 26px;
+ line-height: 26px;
+ }
+ .inquire >>> .el-button--mini {
+ padding: 6px 11px;
+ }
+ .inquire >>> .el-form-item {
+ margin-right: 5px;
+ }
}
.listBox li:hover {
--
Gitblit v1.9.3