diff --git a/frontend/src/components/MapModal/components/BasicInfo.vue b/frontend/src/components/MapModal/components/BasicInfo.vue index 70a185dd..363ca155 100644 --- a/frontend/src/components/MapModal/components/BasicInfo.vue +++ b/frontend/src/components/MapModal/components/BasicInfo.vue @@ -266,6 +266,10 @@ const columnsConfig = ref([ type: 'EQ_7', columns: EQPointColumns7 }, + { + type: 'EQ', + columns: EQPointColumns7 + }, { type: 'WE', columns: wePointColumns @@ -365,9 +369,10 @@ const getData = async () => { item => item.type == (modelStore.params.sttp == 'EQ' - ? modelStore.params.anchoPointState + ? modelStore.params.sttp : modelStore.params.sttp) ).columns; + // debugger columns.forEach(item => { if (item.visible) { diff --git a/frontend/src/modules/liuyu/ai/spdzwaijc/AISPTK.vue b/frontend/src/modules/liuyu/ai/spdzwaijc/AISPTK.vue index ab353c35..306ae0fe 100644 --- a/frontend/src/modules/liuyu/ai/spdzwaijc/AISPTK.vue +++ b/frontend/src/modules/liuyu/ai/spdzwaijc/AISPTK.vue @@ -1707,6 +1707,7 @@ onBeforeUnmount(() => { align-items: center; justify-content: center; height: 100%; + background:#fff; } } diff --git a/frontend/src/modules/liuyu/ai/spdzwaijc/components/VideoDetails.vue b/frontend/src/modules/liuyu/ai/spdzwaijc/components/VideoDetails.vue index 75a95abf..c9f21f1e 100644 --- a/frontend/src/modules/liuyu/ai/spdzwaijc/components/VideoDetails.vue +++ b/frontend/src/modules/liuyu/ai/spdzwaijc/components/VideoDetails.vue @@ -314,4 +314,7 @@ onMounted(() => { height: 100%; } } +:deep(.media-empty){ + background:#fff !important; +} diff --git a/frontend/src/modules/monthlyAvgWaterTemCompareHistory/index.vue b/frontend/src/modules/monthlyAvgWaterTemCompareHistory/index.vue index fc37d643..1d2c566b 100644 --- a/frontend/src/modules/monthlyAvgWaterTemCompareHistory/index.vue +++ b/frontend/src/modules/monthlyAvgWaterTemCompareHistory/index.vue @@ -196,9 +196,7 @@ const getSelectConfig = async () => { return indexA - indexB; }) select.value.options = filterSelectOptions(dataMapNameArr) - if (baseid.value === 'all') { - select.value.value = 'SJLY176' - } else if (filterSelectOptions(dataMapNameArr)[0]?.children) { + if (filterSelectOptions(dataMapNameArr)[0]?.children) { select.value.value = filterSelectOptions(dataMapNameArr)[0]?.children[0]?.value } else if (filterSelectOptions(dataMapNameArr)[0]?.value) { select.value.value = filterSelectOptions(dataMapNameArr)[0]?.value diff --git a/frontend/src/modules/shuidianhuangjingjieruMod/TwoLayer/HuanJingSJJRQK.vue b/frontend/src/modules/shuidianhuangjingjieruMod/TwoLayer/HuanJingSJJRQK.vue index fcf61feb..44eb39da 100644 --- a/frontend/src/modules/shuidianhuangjingjieruMod/TwoLayer/HuanJingSJJRQK.vue +++ b/frontend/src/modules/shuidianhuangjingjieruMod/TwoLayer/HuanJingSJJRQK.vue @@ -368,7 +368,7 @@ const chartSetting = computed(() => { title: [ { text: String(total || 0), - left: '28%', + left: '30%', top: '43%', textStyle: { fontSize: 24, fontWeight: 'bold', color: '#333' } }, diff --git a/frontend/src/modules/shuidianhuangjingjieruMod/TwoLayer/ShuiDianKaiFQKTwoLayer.vue b/frontend/src/modules/shuidianhuangjingjieruMod/TwoLayer/ShuiDianKaiFQKTwoLayer.vue index c19013f5..153e36bd 100644 --- a/frontend/src/modules/shuidianhuangjingjieruMod/TwoLayer/ShuiDianKaiFQKTwoLayer.vue +++ b/frontend/src/modules/shuidianhuangjingjieruMod/TwoLayer/ShuiDianKaiFQKTwoLayer.vue @@ -230,47 +230,23 @@ async function fetchPieData(params: any): Promise { let list = resData.flatMap((item: any) => { let arr: PieDataItem[] = []; - const itmeData = - qid.value === 'all' || qid.value === 'other' - ? item?.items - : item?.items[0]?.items; + const itmeData = item?.items; itmeData?.map((outItem: any) => { - const level5Data = - qid.value === 'all' || qid.value === 'other' - ? outItem?.items?.[0]?.items?.[0]?.items?.[0] - : outItem?.items?.[0]?.items?.[0]; + const level5Data = outItem?.items?.[0]?.items?.[0]?.items?.[0]; - const name = - qid.value === 'all' - ? outItem?.items?.[0]?.key - : qid.value === 'other' - ? outItem?.items?.[0]?.key - : outItem?.key || outItem?.HBRVCDNAME; + const name = outItem?.items?.[0]?.key; if (name) { arr.push({ - key: - qid.value === 'all' - ? outItem?.key - : qid.value === 'other' - ? outItem?.key - : outItem?.HBRVCD || outItem?.key, + key: outItem?.key, dataDimensionRecursive: 'true', name: name, unit: '', value: - qid.value === 'all' && useTtpwrFilter + useTtpwrFilter ? level5Data?.SUM_TTPWR && +transUnit(level5Data?.SUM_TTPWR) - : qid.value === 'all' && !useTtpwrFilter - ? level5Data?.COUNT_BLDSTTCCODE - : qid.value === 'other' && useTtpwrFilter - ? level5Data?.SUM_TTPWR && +transUnit(level5Data?.SUM_TTPWR) - : qid.value === 'other' && !useTtpwrFilter - ? level5Data?.COUNT_BLDSTTCCODE - : (level5Data?.SUM_TTPWR && - +transUnit(level5Data?.SUM_TTPWR)) || - level5Data?.COUNT_BLDSTTCCODE + : level5Data?.COUNT_BLDSTTCCODE }); } }); diff --git a/frontend/src/modules/yunXingGaoJIng/Aisbdbyx/AISBTK.vue b/frontend/src/modules/yunXingGaoJIng/Aisbdbyx/AISBTK.vue index 5e9ae3d7..86dac576 100644 --- a/frontend/src/modules/yunXingGaoJIng/Aisbdbyx/AISBTK.vue +++ b/frontend/src/modules/yunXingGaoJIng/Aisbdbyx/AISBTK.vue @@ -2041,6 +2041,7 @@ onBeforeUnmount(() => { align-items: center; justify-content: center; height: 100%; + background:#fff; } } diff --git a/frontend/src/modules/yunXingGaoJIng/Aisbdbyx/components/VideoPlayer.vue b/frontend/src/modules/yunXingGaoJIng/Aisbdbyx/components/VideoPlayer.vue index 708cc412..1279546b 100644 --- a/frontend/src/modules/yunXingGaoJIng/Aisbdbyx/components/VideoPlayer.vue +++ b/frontend/src/modules/yunXingGaoJIng/Aisbdbyx/components/VideoPlayer.vue @@ -215,4 +215,7 @@ const handlePageChange = (page: number, pageSize: number) => { } } /* 样式继承自父组件 */ +:deep(.media-empty){ + background:#fff !important; +} diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss index e6118041..d09926ac 100644 --- a/frontend/src/styles/index.scss +++ b/frontend/src/styles/index.scss @@ -118,3 +118,8 @@ svg { .ant-select-tree-node-selected { background-color: #bae7ff !important; } +.ant-empty{ + p{ + text-indent: 0em !important; + } +} diff --git a/frontend/src/utils/request.ts b/frontend/src/utils/request.ts index 0f9323c2..b3da9e99 100644 --- a/frontend/src/utils/request.ts +++ b/frontend/src/utils/request.ts @@ -34,7 +34,7 @@ service.interceptors.request.use( config.headers._sysid = '10EC2E0B-AEA9-4757-83A2-201BA1BC54E9'; config.headers.authorization = - 'bearer 863782c5-5e51-49c6-95fd-13e6f25b9bf2'; + 'bearer f2438154-ca4c-4acb-8e56-739534932ebb'; config.baseURL = '/'; } else { const user = useUserStoreHook(); diff --git a/frontend/src/views/home/shuiDianKaiFaZhuangKuang.vue b/frontend/src/views/home/shuiDianKaiFaZhuangKuang.vue index 0bd6849b..e83bcb42 100644 --- a/frontend/src/views/home/shuiDianKaiFaZhuangKuang.vue +++ b/frontend/src/views/home/shuiDianKaiFaZhuangKuang.vue @@ -5,136 +5,8 @@ import RightDrawer from '@/components/RightDrawer/index.vue'; import jidiInfoMod from '@/modules/jidiInfoMod/index.vue'; import shuidianhuangjingjieruMod from '@/modules/shuidianhuangjingjieruMod/index.vue'; import { useModelStore } from '@/store/modules/model'; - -const modelStore = useModelStore(); -// import { getQgcStaticData } from "@/api/ecoFlow"; onMounted(() => { - // const params = { - // filter: { - // logic: "and", - // filters: [ - // { field: "dtin", operator: "eq", dataType: "string", value: "1" }, - // { field: "type", operator: "eq", dataType: "string", value: "hour" }, - // { field: "tm", operator: "gte", dataType: "date", value: "2026-03-02 00:00:00" }, - // { field: "tm", operator: "lte", dataType: "date", value: "2026-04-02 23:59:59" }, - // ], - // }, - // }; - // getQgcStaticData(params).then((res) => { - // console.log(res); - // }); }); - -const showMapModal = () => { - modelStore.modalVisible = true; - modelStore.params.sttp = 'ENG'; - modelStore.title = '三峡 '; - modelStore.isBasicEdit = true; -}; -const showMapModal1 = () => { - modelStore.modalVisible = true; - modelStore.params.sttp = 'WT'; - modelStore.title = '水温 '; - modelStore.isBasicEdit = true; -}; -const showMapModal2 = () => { - modelStore.modalVisible = true; - modelStore.params.sttp = 'WQFB'; - modelStore.title = '水质 '; - modelStore.isBasicEdit = true; -}; -const showMapModal3 = () => { - modelStore.modalVisible = true; - modelStore.params.sttp = 'FH'; - modelStore.title = '栖息地 '; - modelStore.isBasicEdit = true; -}; // -const showMapModal4 = () => { - modelStore.modalVisible = true; - modelStore.params.sttp = 'fh_zq_point'; - modelStore.title = '栖息地流量 '; - modelStore.isBasicEdit = true; -}; -const showMapModal5 = () => { - modelStore.modalVisible = true; - modelStore.params.sttp = 'fp_point'; - modelStore.title = '过鱼设施 '; - modelStore.isBasicEdit = true; -}; -const showMapModal6 = () => { - modelStore.modalVisible = true; - modelStore.params.sttp = 'FB'; - modelStore.title = '鱼类增殖站 '; - modelStore.isBasicEdit = true; -}; -// -const showMapModal7 = () => { - modelStore.modalVisible = true; - modelStore.params.sttp = 'VA'; - modelStore.title = '动物救助站 '; - modelStore.isBasicEdit = true; -}; -const showMapModal8 = () => { - modelStore.modalVisible = true; - modelStore.params.sttp = 'VP'; - modelStore.title = '珍稀植物园 '; - modelStore.isBasicEdit = true; -}; -const showMapModal9 = () => { - modelStore.modalVisible = true; - modelStore.params.sttp = 'WE'; - modelStore.title = '水生生态调查断面 '; - modelStore.isBasicEdit = true; -}; -const showMapModal10 = () => { - modelStore.modalVisible = true; - modelStore.params.sttp = 'WVA'; - modelStore.title = '野生动物监测 '; - modelStore.isBasicEdit = true; -}; -const showMapModal11 = () => { - modelStore.modalVisible = true; - modelStore.params.sttp = 'VD_FBFM'; - modelStore.title = 'AI视频监控站 '; - modelStore.isBasicEdit = true; -}; -const showMapModal12 = () => { - modelStore.modalVisible = true; - modelStore.params.sttp = 'eng_alarm_point'; - modelStore.title = '水电站告警情况 '; - modelStore.isBasicEdit = true; -}; -const showMapModal13 = () => { - modelStore.modalVisible = true; - modelStore.params.sttp = 'FPRD'; - modelStore.title = '鱼类调查装置 '; - modelStore.isBasicEdit = true; -}; -const showMapModal14 = () => { - modelStore.modalVisible = true; - modelStore.params.sttp = 'DW_2'; - modelStore.title = '低温水减缓设施-叠梁门 '; - modelStore.isBasicEdit = true; -}; -const showMapModal15 = () => { - modelStore.modalVisible = true; - modelStore.params.sttp = 'DW_5'; - modelStore.title = '前置挡墙 '; - modelStore.isBasicEdit = true; -}; -const showMapModal16 = () => { - modelStore.modalVisible = true; - modelStore.params.sttp = 'DW_6'; - modelStore.title = '隔水幕墙 '; - modelStore.isBasicEdit = true; -}; -const showMapModal17 = () => { - modelStore.modalVisible = true; - modelStore.params.sttp = 'DW_1'; - modelStore.title = '夹岩双层取水 '; - modelStore.isBasicEdit = true; -}; -//DW_5