From 9f9ae3e0253f2d657b6b337d62d269394d04ee09 Mon Sep 17 00:00:00 2001
From: surprise <15810472099@163.com>
Date: 星期五, 17 十一月 2023 14:29:08 +0800
Subject: [PATCH] 版本更新
---
src/views/plotting/plottingInquire.vue | 2 +-
public/config/config.js | 4 ++--
src/components/BarGraphAxisLine.vue | 1 +
src/assets/js/Map/temporaryTools.js | 5 +++--
src/views/layer/layerManage.vue | 7 ++++++-
5 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/public/config/config.js b/public/config/config.js
index 2559267..6fa968a 100644
--- a/public/config/config.js
+++ b/public/config/config.js
@@ -3,8 +3,8 @@
//鏄惁涓虹敓浜х幆澧�
const webUrl = location.href.indexOf("/web") > -1 ? "/web" : "";
-// var webHost = isWeb ? "103.85.165.99" + ":28888" : '192.168.20.106' + ":9000";
-var webHost = isWeb ? "103.85.165.99" + ":28888" : '192.168.20.83' + ":8888";
+var webHost = isWeb ? "103.85.165.99" + ":28888" : '106.120.22.35' + ":28888";
+// var webHost = isWeb ? "103.85.165.99" + ":28888" : '192.168.20.83' + ":8888";
// var webHost = isWeb ? "103.85.165.99" + ":28888" : '100.10.1.169' + ":8088";
// WebSocket 鏈嶅姟鍦板潃
var socketUrl = 'ws://' + webHost + '/MoonServer/ws/select';
diff --git a/src/assets/js/Map/temporaryTools.js b/src/assets/js/Map/temporaryTools.js
index 9cd6c93..007dc31 100644
--- a/src/assets/js/Map/temporaryTools.js
+++ b/src/assets/js/Map/temporaryTools.js
@@ -12,9 +12,10 @@
},
removeTemporaryLayerAll() {
var entities = window.Viewer.entities._entities._array;
- for (var i in entities) {
+ for (var i = 0; i < entities.length; i++) {
if (entities[i]._shpType && entities[i]._shpType == "temporaryLayer") {
window.Viewer.entities.remove(entities[i])
+ i--;
}
}
},
@@ -431,7 +432,7 @@
layerType: '鍩烘湰鐐�',
heightReference: res.point.disableDepthTestDistance != null ? false : true,
size: res.point.pixelSize._value,
-
+
}
},
diff --git a/src/components/BarGraphAxisLine.vue b/src/components/BarGraphAxisLine.vue
index 7341965..669447e 100644
--- a/src/components/BarGraphAxisLine.vue
+++ b/src/components/BarGraphAxisLine.vue
@@ -198,6 +198,7 @@
yAxis: {
type: "value",
+
},
series: seriesData.value,
});
diff --git a/src/views/layer/layerManage.vue b/src/views/layer/layerManage.vue
index 87ecbe6..dfbe13c 100644
--- a/src/views/layer/layerManage.vue
+++ b/src/views/layer/layerManage.vue
@@ -46,6 +46,8 @@
@click.native="clickdTemporary(2, data)">鍒犻櫎</el-dropdown-item>
<el-dropdown-item v-if="data.shpType == 'temporaryLayer'"
@click.native="clickdTemporary(3, data)">瀹氫綅</el-dropdown-item>
+ <el-dropdown-item v-if="data.shpType == 'temporaryLayer'"
+ @click.native="clickdTemporary(4, data)">涓嬭浇鎴恠hp</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
@@ -187,6 +189,8 @@
return ElMessage(data.cnName + "鍥惧眰娌℃湁鍕鹃��,鏃犳硶杩涜瀹氫綅");
}
temporaryTool.locationTemporaryLayer(data);
+ } else if (res == 4) {
+debugger
}
};
//閫夋嫨鍥惧眰
@@ -483,8 +487,9 @@
}
}
}
+
treeData.value.unshift({
- cnName: "涓存椂鍥惧眰",
+ cnName: "鑷畾涔夊浘灞�",
level: 1,
pid: 0,
isLayer: 0,
diff --git a/src/views/plotting/plottingInquire.vue b/src/views/plotting/plottingInquire.vue
index a81f59a..8dad568 100644
--- a/src/views/plotting/plottingInquire.vue
+++ b/src/views/plotting/plottingInquire.vue
@@ -154,7 +154,7 @@
<div class="table_tr" v-for="(e, i) in resultList" :key="i">
<div class="table_td">{{ i + 1 }}</div>
<div class="table_td">
- <span>{{ e.layerName }}</span>
+ <span>{{ e.layerName }}锛堢背锛�</span>
<span>{{ e.avg }}</span>
</div>
</div>
--
Gitblit v1.9.3