diff --git a/src/api/mapCommon/index.js b/src/api/mapCommon/index.js
index acd6daa..bc93eb8 100644
--- a/src/api/mapCommon/index.js
+++ b/src/api/mapCommon/index.js
@@ -1,4 +1,5 @@
import request from '@/utils/request'
+import axios from 'axios';
// 获取场景列表
export const getSceneListData = async (data) => {
@@ -28,3 +29,6 @@ export const getLayerData = async (sceneId) => {
});
};
+export const getLayerLegend = async (url) => {
+ return axios.get(url);
+};
diff --git a/src/assets/image/videoNull.png b/src/assets/image/videoNull.png
new file mode 100644
index 0000000..bd27b6e
Binary files /dev/null and b/src/assets/image/videoNull.png differ
diff --git a/src/utils/mapUtils/index.js b/src/utils/mapUtils/index.js
index 6836f4c..67b5c05 100644
--- a/src/utils/mapUtils/index.js
+++ b/src/utils/mapUtils/index.js
@@ -211,6 +211,7 @@ export const getSelectedLayersLegend = (selectedLayersList) => {
} else {
result = await getLayerLegend(`${layer.url}/legend.json?bbox=${bbox}`);
}
+ console.log(result)
if (result.status === 200 && result.data) {
let currentLayer = [];
// if (mapName) {
diff --git a/src/views/aiSupervision/waterSetting/runScene/layerTree/index.js b/src/views/aiSupervision/waterSetting/runScene/layerTree/index.js
index 905385d..c1b26d2 100644
--- a/src/views/aiSupervision/waterSetting/runScene/layerTree/index.js
+++ b/src/views/aiSupervision/waterSetting/runScene/layerTree/index.js
@@ -219,7 +219,9 @@ export async function addLayer(layerData) {
return;
}
if (!layerType || !(action = layerActions[layerType])) return;
+ console.log(action)
const layer = await action(layerData);
+ console.log(layer)
layer && window.viewer.addLayer(layer);
if (["013000"].includes(layerType)) {
// 3d tiles
diff --git a/src/views/reservoir/safeOperation/components/ProjectDetail.vue b/src/views/reservoir/safeOperation/components/ProjectDetail.vue
index fd20884..50631af 100644
--- a/src/views/reservoir/safeOperation/components/ProjectDetail.vue
+++ b/src/views/reservoir/safeOperation/components/ProjectDetail.vue
@@ -29,6 +29,12 @@
:resCode="resCode"
>
+
+
+
@@ -38,6 +44,7 @@ import WaterRain from "./WaterRain.vue";
import EnvirQuality from "./EnvirQuality.vue";
import EngineSafe from "./EngineSafe.vue";
import MonitorWarning from "./MonitorWarning.vue";
+import VideoAnalysis from "./VideoAnalysis.vue";
import DataStatistics from "./DataStatistics.vue";
export default {
components: {
@@ -45,7 +52,7 @@ export default {
WaterRain,
EnvirQuality,
EngineSafe,
- MonitorWarning,
+ VideoAnalysis,
DataStatistics,
},
props: {
diff --git a/src/views/reservoir/safeOperation/components/VideoAnalysis.vue b/src/views/reservoir/safeOperation/components/VideoAnalysis.vue
new file mode 100644
index 0000000..4616395
--- /dev/null
+++ b/src/views/reservoir/safeOperation/components/VideoAnalysis.vue
@@ -0,0 +1,106 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
暂无内容
+
+
+
+
+
+
+
+
+
diff --git a/src/views/reservoir/safeOperation/index.vue b/src/views/reservoir/safeOperation/index.vue
index 8f21b5e..24e0203 100644
--- a/src/views/reservoir/safeOperation/index.vue
+++ b/src/views/reservoir/safeOperation/index.vue
@@ -58,21 +58,29 @@
-
-
-

-
大型
-
-
-

-
中型
-
-
-

-
小型
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ item.layerName }}
+
+
![]()
+
{{ legend.label || legend.name || legend.text }}
+
+
+
-
>>>> ", data, checked);
+ console.log("getCheckedNodes >>>>> ", this.$refs.tree.getCheckedNodes());
if (data.pid === "root" || data.layers) return;
if (checked) {
this.checkList = [...this.checkList, data.id];
+ const list = this.$refs.tree.getCheckedNodes()
+ console.log("checkList >>>>> ", this.checkList);
addLayer(data);
+ this.legendList = getSelectedLayersLegend(list)
this.layerList.push(data);
} else {
this.checkList = this.checkList.filter((v) => v != data.id);
diff --git a/src/views/sluice/runManage/enginerring/overviewStatistics/index.vue b/src/views/sluice/runManage/enginerring/overviewStatistics/index.vue
index fb4b5fa..9600e01 100644
--- a/src/views/sluice/runManage/enginerring/overviewStatistics/index.vue
+++ b/src/views/sluice/runManage/enginerring/overviewStatistics/index.vue
@@ -77,7 +77,6 @@ import {
postDfStatisticsSituation,
postDfStatisticsHiddenDanger,
} from "@/api/sluice";
-import {postYhStatisticsHiddenDanger} from "@/api/dike";
export default {
data () {
return {
@@ -122,7 +121,7 @@ export default {
methods: {
gethiddenDanger() {
const node = this.$refs.cascader.getCheckedNodes()
- postYhStatisticsHiddenDanger({
+ postDfStatisticsHiddenDanger({
adcd: this.paramsData.adcd,
districtLevelFlag: node[0] && node[0].level === 3 ? 1 : 0,
patrolStart: this.paramsData.hiddenDangerArr && this.paramsData.hiddenDangerArr.length > 1 ? this.paramsData.hiddenDangerArr[0] : '',
diff --git a/vue.config.js b/vue.config.js
index 4a4ad9f..f228b5d 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -67,6 +67,14 @@ module.exports = {
// ['^' + process.env.VUE_APP_BASE_API]: '/tianhui-admin-web'
// }
// },
+ '/iserver': {
+ target: 'http://172.16.34.41:8090',
+ // target: 'http://172.16.32.63:52111',
+ changeOrigin: true
+ // pathRewrite: {
+ // '^/iserver': ''
+ // }
+ },
["profile"]: {
target: "http://shuili.product.dev.com:30115",
changeOrigin: true,
@@ -81,14 +89,6 @@ module.exports = {
["^" + process.env.VUE_APP_BASE_API]: "/tianhui-admin-web",
},
},
- '/iserver': {
- target: 'http://172.16.34.41:8090',
- // target: 'http://172.16.32.63:52111',
- changeOrigin: true
- // pathRewrite: {
- // '^/iserver': ''
- // }
- },
"/mapserver": {
target: "http://172.16.32.63/tiles",
changeOrigin: true,