From 2a1161b2ffd3397d656d287574d51b960fc6f1b9 Mon Sep 17 00:00:00 2001 From: hejunjie Date: Fri, 7 Mar 2025 16:27:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E5=9B=BE?= =?UTF-8?q?=E4=BE=8B=E5=92=8C=E8=A7=86=E9=A2=91=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/mapCommon/index.js | 4 + src/assets/image/videoNull.png | Bin 0 -> 1565 bytes src/utils/mapUtils/index.js | 1 + .../waterSetting/runScene/layerTree/index.js | 2 + .../components/ProjectDetail.vue | 9 +- .../components/VideoAnalysis.vue | 106 ++++++++++++++++++ src/views/reservoir/safeOperation/index.vue | 41 ++++--- vue.config.js | 16 +-- 8 files changed, 156 insertions(+), 23 deletions(-) create mode 100644 src/assets/image/videoNull.png create mode 100644 src/views/reservoir/safeOperation/components/VideoAnalysis.vue 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 0000000000000000000000000000000000000000..bd27b6e4d5bf24ac9be3f16a5f5add566688a5c8 GIT binary patch literal 1565 zcmb7EdpOez82)W%Zj+>)Tsjh)Xf{&IWfd};A!b(MREn}Gg~JfXWh`kcOR<{DVO@B6%ee9!ZK&-1a#B%&5{I}`u_Eq6CO zMT!2(c2ieX&M23C6-ofnDMTDl-eWkU6c9Sj{g}G464irQ0HD(8j(0v5mph+#CTiGi zOGm3w!`5}zQGMSM-8|zJh^9Gf8B*yj>d_E+r_hQoN|4Rp_*_zvfwpGz_QV@fZf2$!Q?s=c^nOaF9Uo_%&`+RTt>xJF>?Y zP@>wKqyef;wnoZPB(@>;=bkk)(Yr_UcRjZyg{Vt=N9EA;&;+}bzZZfWA4b&|GV z;N^VB2hEzMw>%eP%)_zb^~`>0MOA_I;`J?O*O`OT-H*6BI+g`Q{O8B7lfmipBZF!u zd~@Pyi3<+>c0}oAEXQ;>R?YmkZu``W9U7-Fr1ATa;K2;oQ(A7D%_OAU;D1?hMArGb z1|BR9m9rYM5str0bt;*ggp7j6mMi3n_*+FYYD!i*M<*{6Y&gd17WdK(?U?^rJcL8` z7m$Q^PJ2CJD&Qhd@V7t3oxpIu+!+~TAuyCD74=={RWzY!;TVOTN&8a@)H%%WyDDpP z#ortl0qiTQ*c-NMMuvu)K+)`C%QStkdbX*-)u5GN{)bU$uIVcltDKw_{kX6e_vkM5 zZADgc$l_S5b`0DHnP4uWl$3Iz_g2NUcxE1H zSfC@>9kHkD(C{y?kMiCEI#*t&W#>>lFtN6=E9EFHUq`Y7!>C@HyUHee#DLOfTg>^5 zYin!I>tI;lA)d~uV)$Wvh&81ur(rO(Hv9`G&S(1`(Z=dBrzld`x2hVLa(48jURyVv zK*|b!#QpnS>G`I%#nI;KkxI?+y*9dSZJwDbZ>S$+0WMQB(ZiT`tq&LXJ$$%M>nF>(1JvZdrgmAdYqbe^CU5NGRb%H}2g;G8loqk)GJ zqwV%%a#ziFp|#KjJCEv~iibV_bQ@Dct_@t2nFRHHRBx{D=X;e`{$k>d;lhL&tXOfWz+=RqU2)~e$`%kR^a{*V$XbdP-^;rN2AJ^E_MlUW%(U(-4unc=S@ zns)HLQ0-I(3e)>}mYnS+XrHuqG~+WW|M^7N{TOxWc$;G8cD_96byb=7l+C=k|Iy?o@{0i3*u+Vz3~&5k9;wrc(8#2e9Kj;_Yg5E3WE-R6XiFokv+k?SWHzXnn0X^cnjSXb5r>BvTpo#_w ze4f-7T{qjP6{KIM3`W5SlXO*;U0lyX92%%;?W&sd>)(U`R(4{CZx%jaj|?eaJm5|s K;mdJ>%zpvMq2wq4 literal 0 HcmV?d00001 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 7af31aa..8576163 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/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, From 75eb213368fdd2d81098e7382506ee0681711416 Mon Sep 17 00:00:00 2001 From: hejunjie Date: Fri, 7 Mar 2025 17:04:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=B0=B4=E9=97=B8?= =?UTF-8?q?=E6=A6=82=E5=86=B5=E7=BB=9F=E8=AE=A1=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sluice/runManage/enginerring/overviewStatistics/index.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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] : '',