+
+
+
+
+
-
-
-
-
+
+
+
@@ -31,6 +38,9 @@ import videojs from 'video.js';
import 'video.js/dist/video-js.css';
const baseUrl = import.meta.env.VITE_APP_ATTACHMENT_URL;
+// 错误提示显示状态
+const showError = ref(false);
+
// 注册 HLS 支持（video.js 8.x 内置了 HLS 支持）
interface VideoData {
@@ -89,6 +99,11 @@ const initPlayer = () => {
player.dispose();
player = null;
}
+
+ // 重试计数器（用于限制重试次数）
+ let retryCount = 0;
+ const maxRetries = 5;
+
try {
// 创建 video 元素
const videoElement = document.createElement('video');
@@ -195,36 +210,55 @@ const initPlayer = () => {
const error = player.error();
console.error('播放器错误:', error);
- // 保持最后一帧画面，不显示错误提示
- // 在后台静默重试
- let retryCount = 0;
- const maxRetries = 10;
+ // 检查是否已达到最大重试次数
+ if (retryCount >= maxRetries) {
+ console.warn(`已达到最大重试次数(${maxRetries}次)，停止重试`);
+ // 显示自定义错误提示层
+ showError.value = true;
+ return;
+ }
- const attemptReload = () => {
- if (retryCount < maxRetries && player && videoUrl.value) {
- retryCount++;
- setTimeout(() => {
- try {
- player.src({
- src: videoUrl.value,
- type: videoType // 指定视频类型
- });
- player.load();
- player.play();
- } catch (e) {
- if (retryCount < maxRetries) {
- attemptReload();
+ // 增加重试计数
+ retryCount++;
+ console.log(`视频加载失败，正在进行第 ${retryCount}/${maxRetries} 次重试...`);
+
+ // 立即显示自定义错误提示层
+ showError.value = true;
+
+ // 延迟后重试
+ setTimeout(() => {
+ try {
+ if (player && videoUrl.value) {
+ // 隐藏错误提示层（重试时）
+ showError.value = false;
+ player.src({
+ src: videoUrl.value,
+ type: videoType
+ });
+ player.load();
+ player.play();
+ }
+ } catch (e) {
+ console.error('重试加载视频失败:', e);
+ // 如果重试失败且未达到最大次数，继续重试
+ if (retryCount < maxRetries) {
+ setTimeout(() => {
+ if (player) {
+ player.error(); // 触发下一次错误处理
}
- }
- }, 3000);
+ }, 100);
+ }
}
- };
-
- attemptReload();
+ }, 3000);
});
// 监听加载完成
- player.on('loadeddata', () => {});
+ player.on('loadeddata', () => {
+ // 加载成功时重置重试计数器
+ retryCount = 0;
+ // 隐藏错误提示
+ showError.value = false;
+ });
// 监听播放状态
player.on('play', () => {});
@@ -339,6 +373,40 @@ onUnmounted(() => {
}
}
+ .custom-error-overlay {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ background-color: rgba(0, 0, 0);
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ z-index: 10;
+
+ .error-content {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+
+ .error-icon {
+ font-size: 48px;
+ margin-bottom: 12px;
+ opacity: 0.5;
+ color: #999;
+ }
+
+ .error-text {
+ font-size: 14px;
+ color: #fff;
+ text-align: center;
+ margin-top: 12px;
+ }
+ }
+ }
+
.video-empty {
width: 100%;
height: 100%;
diff --git a/frontend/src/views/shuiZhiJianCe/shuiHuanJingZhiLiangZhuangKuang.vue b/frontend/src/views/shuiZhiJianCe/shuiHuanJingZhiLiangZhuangKuang.vue
index 33661117..00b92a16 100644
--- a/frontend/src/views/shuiZhiJianCe/shuiHuanJingZhiLiangZhuangKuang.vue
+++ b/frontend/src/views/shuiZhiJianCe/shuiHuanJingZhiLiangZhuangKuang.vue
@@ -12,7 +12,7 @@ watch(
() => JidiSelectEventStore.selectedItem,
(newVal) => {
console.log(newVal);
- // debugger
+ //
wbsCode.value = newVal.wbsCode;
},
{ deep: true, immediate: true }
-
- ![]()
-
-
+ {{ item.text }}
-
+
+
-
+
-
+
+
-
-
+
+ ![]()
+
+
+ {{ item.text }}
-
-
+
+
+
+
- {{ currentDescription }}
+
+
\ No newline at end of file
+
diff --git a/frontend/src/modules/fishSurvey/FishVideo/index.vue b/frontend/src/modules/fishSurvey/FishVideo/index.vue
index 324687dd..7c4a9546 100644
--- a/frontend/src/modules/fishSurvey/FishVideo/index.vue
+++ b/frontend/src/modules/fishSurvey/FishVideo/index.vue
@@ -1,76 +1,144 @@
-
-
+
+
\ No newline at end of file
+
diff --git a/frontend/src/modules/fishSurvey/SurveyQingKuang/DeviceTableModal.vue b/frontend/src/modules/fishSurvey/SurveyQingKuang/DeviceTableModal.vue
new file mode 100644
index 00000000..68e8558b
--- /dev/null
+++ b/frontend/src/modules/fishSurvey/SurveyQingKuang/DeviceTableModal.vue
@@ -0,0 +1,407 @@
+
+
+
+
+
+
+
+
+
-
+
+
+ {{ currentDescription }}
-
+
+
+
+
-
-
-
+
+
+
+
+
+
+ ![]()
+
+ {{ item.name }}
+
+ {{ item.total }}
+ {{ item.unit }}
+
+
-
-
-
-
+
+
+
-
+
diff --git a/frontend/src/views/shiPinJianKong/components/LiveVideoBox.vue b/frontend/src/views/shiPinJianKong/components/LiveVideoBox.vue
index a038dcf4..269ba916 100644
--- a/frontend/src/views/shiPinJianKong/components/LiveVideoBox.vue
+++ b/frontend/src/views/shiPinJianKong/components/LiveVideoBox.vue
@@ -14,6 +14,13 @@
-
- ![]()
-
-
+ {{ item.text }}
-
+
+
-
+
-
+
+
-
-
+
+ ![]()
+
+
+ {{ item.text }}
-
-
+
+
+
+
- {{ currentDescription }}
+
+
\ No newline at end of file
+
diff --git a/frontend/src/modules/guoyusheshijiansheqingkuang/ModalPage/index.vue b/frontend/src/modules/guoyusheshijiansheqingkuang/ModalPage/index.vue
index 3806a835..aec41654 100644
--- a/frontend/src/modules/guoyusheshijiansheqingkuang/ModalPage/index.vue
+++ b/frontend/src/modules/guoyusheshijiansheqingkuang/ModalPage/index.vue
@@ -308,7 +308,7 @@ const buildFilter = () => {
// 处理排序变化
const handleSortChange = (info: { field: string; order: string | null }) => {
- // debugger
+ //
if (info.field && info.order) {
sortState.value = info;
} else {
@@ -356,6 +356,8 @@ const handleViewDetail = (record: any, type: string) => {
modelStore.params.sttp = lastValue
modelStore.title = record.stnm;
modelStore.params.stcd = record.stcd;
+ modelStore.params.bldsttCcode = record.bldsttCcode;
+ //
}
// console.log('【查看详情】', record)
};
diff --git a/frontend/src/modules/qixidiliuliangbianhua/index.vue b/frontend/src/modules/qixidiliuliangbianhua/index.vue
index cb30c56f..8fff3e8e 100644
--- a/frontend/src/modules/qixidiliuliangbianhua/index.vue
+++ b/frontend/src/modules/qixidiliuliangbianhua/index.vue
@@ -609,13 +609,13 @@ const getselsectData = async () => {
value: item.stcd
};
});
- // debugger
+ //
};
const convertDateRange = (dateRange: string[]) => {
if (!dateRange || dateRange.length !== 2) {
return null;
}
- // debugger
+ //
const [startStr, endStr] = dateRange;
diff --git a/frontend/src/modules/qixidishuiwenbianhua/index.vue b/frontend/src/modules/qixidishuiwenbianhua/index.vue
index 42cb222a..08100bb2 100644
--- a/frontend/src/modules/qixidishuiwenbianhua/index.vue
+++ b/frontend/src/modules/qixidishuiwenbianhua/index.vue
@@ -514,7 +514,7 @@ const convertDateRange = (dateRange: string[]) => {
if (!dateRange || dateRange.length !== 2) {
return null;
}
- // debugger
+ //
const [startStr, endStr] = dateRange;
@@ -634,7 +634,7 @@ const getselsectData = async () => {
value: item.stcd
};
});
- // debugger
+ //
};
////
watch(
diff --git a/frontend/src/modules/shengTaiLiuLiangXieFangSheShiMod/xianZhiYanChenBianHua/index.vue b/frontend/src/modules/shengTaiLiuLiangXieFangSheShiMod/xianZhiYanChenBianHua/index.vue
index b1e98f89..2de69007 100644
--- a/frontend/src/modules/shengTaiLiuLiangXieFangSheShiMod/xianZhiYanChenBianHua/index.vue
+++ b/frontend/src/modules/shengTaiLiuLiangXieFangSheShiMod/xianZhiYanChenBianHua/index.vue
@@ -170,7 +170,7 @@ const chartRef = ref();
// 处理图表点击事件
const handleChartClick = (params: any) => {
- // debugger
+ //
console.log('点击数据点:', params);
const { name, value, data } = params;
modelStore.modalVisible = true;
diff --git a/frontend/src/modules/shengTaiLiuLiangXieFangSheShiMod/xieFangFenBu/index.vue b/frontend/src/modules/shengTaiLiuLiangXieFangSheShiMod/xieFangFenBu/index.vue
index 7245ee49..30ae4cb3 100644
--- a/frontend/src/modules/shengTaiLiuLiangXieFangSheShiMod/xieFangFenBu/index.vue
+++ b/frontend/src/modules/shengTaiLiuLiangXieFangSheShiMod/xieFangFenBu/index.vue
@@ -404,7 +404,7 @@ const fetchData = async () => {
});
data.value = processedData;
- // debugger
+ //
// 提取唯一的基地名称作为 X 轴数据
echartsXData.value = [
...new Set(processedData.map(item => item.basename))
diff --git a/frontend/src/modules/shengtaidabiaoMod/TwoLayer/ShengTaiLiuLiangDaBQKTwoLayer.vue b/frontend/src/modules/shengtaidabiaoMod/TwoLayer/ShengTaiLiuLiangDaBQKTwoLayer.vue
index a7921bb2..1791ddf0 100644
--- a/frontend/src/modules/shengtaidabiaoMod/TwoLayer/ShengTaiLiuLiangDaBQKTwoLayer.vue
+++ b/frontend/src/modules/shengtaidabiaoMod/TwoLayer/ShengTaiLiuLiangDaBQKTwoLayer.vue
@@ -37,6 +37,7 @@
:allow-clear="false"
format="YYYY-MM-DD"
style="width: 260px"
+ :presets="DateSetting.RangeButton.days1"
/>
@@ -103,7 +104,7 @@ import { useJidiSelectEventStore } from '@/store/modules/jidiSelectEvent';
import { dayGetKendoListCust, hourGetKendoListCust } from '@/api/stll';
import BasicTable from '@/components/BasicTable/index.vue';
import { useModelStore } from '@/store/modules/model';
-
+import { DateSetting } from '@/utils/enumeration';
const modelStore = useModelStore();
const props = defineProps<{
options?: any[];
diff --git a/frontend/src/modules/shengtaidabiaoMod/index.vue b/frontend/src/modules/shengtaidabiaoMod/index.vue
index 7cdf61dc..5c9c4353 100644
--- a/frontend/src/modules/shengtaidabiaoMod/index.vue
+++ b/frontend/src/modules/shengtaidabiaoMod/index.vue
@@ -244,7 +244,7 @@ const getData = async () => {
// 根据API响应结构规范处理数据
if (res.data && res.data.list) {
const apiList = res.data.list;
- // debugger
+ //
// 只使用前两条数据（type: 1 和 type: 2）
if (apiList && apiList.length > 0) {
dataArr.value = apiList.slice(0, 2).map((item: any) => ({
@@ -311,7 +311,7 @@ const getcont = async () => {
if (list) {
titleData.value = list
}
- // debugger
+ //
};
// 页面加载时执行的逻辑
onMounted(() => {
diff --git a/frontend/src/modules/shengtaidabiaoTwoMod/index.vue b/frontend/src/modules/shengtaidabiaoTwoMod/index.vue
index f384b4f0..dd15352e 100644
--- a/frontend/src/modules/shengtaidabiaoTwoMod/index.vue
+++ b/frontend/src/modules/shengtaidabiaoTwoMod/index.vue
@@ -307,7 +307,7 @@ const initChart = () => {
const handleChartClick = (params: any) => {
const categoryName = params.name;
const currentIndex = params.dataIndex;
- // debugger
+ //
// 设置弹框标题
detailModalTitle.value =
@@ -318,7 +318,7 @@ const handleChartClick = (params: any) => {
// 获取当前点击项的详细数据
const baseId = mode.value === 'top' ? chartData.value.baseIds[currentIndex] : undefined;
const qecPerformance = mode.value === 'left' ? chartData.value.qecPerformances[currentIndex] : undefined;
- // debugger
+ //
const currentItem = {
baseId: baseId,
@@ -505,7 +505,7 @@ const getcont = async () => {
if (list) {
titleData.value = list;
}
- // debugger
+ //
};
// 页面加载时执行的逻辑
onMounted(() => {
diff --git a/frontend/src/modules/shuiWenNianNeiFenBu/index.vue b/frontend/src/modules/shuiWenNianNeiFenBu/index.vue
index 42ec49b6..adec0042 100644
--- a/frontend/src/modules/shuiWenNianNeiFenBu/index.vue
+++ b/frontend/src/modules/shuiWenNianNeiFenBu/index.vue
@@ -224,6 +224,7 @@ const getselectData = async () => {
// 合并结果并设置选项
select.value.options = [...dataMapNameArr, ...otherArr];
+ //
// if (baseid.value == 'all') {
// select.value.value = '008640202300001021'
@@ -536,23 +537,23 @@ onBeforeUnmount(() => {
//监听子组件的数据变化
const handlePanelChange1 = (data: any, type: string) => {
console.log('当前所有控件状态:', data);
- if (type == 'click') {
+ // 当选择器或日期变化时，重新加载图表数据
+ if (data.moreSelect || data.datetime) {
+ select.value.value = data.moreSelect;
+ datetimePicker.value.value = data.datetime;
+ //
+ getshuiwenList();
+ }
+ if (data?.selectedNodeExtra?.lttd && data?.selectedNodeExtra?.lgtd) {
const mapClass = MapClass.getInstance();
mapClass.flyTopanto(
[
Number(data.selectedNodeExtra.lgtd),
Number(data.selectedNodeExtra.lttd)
],
- 15
+ 15
);
}
- // 当选择器或日期变化时，重新加载图表数据
- if (data.moreSelect || data.datetime) {
- select.value.value = data.moreSelect;
- datetimePicker.value.value = data.datetime;
- // debugger
- getshuiwenList();
- }
};
const baseid = ref('');
watch(
diff --git a/frontend/src/modules/shuizhijiancegongzuoQK/index.vue b/frontend/src/modules/shuizhijiancegongzuoQK/index.vue
index 6732ea46..d655156f 100644
--- a/frontend/src/modules/shuizhijiancegongzuoQK/index.vue
+++ b/frontend/src/modules/shuizhijiancegongzuoQK/index.vue
@@ -208,7 +208,7 @@ const getDataList = async () => {
}
// const params = [data1, data2]
const res1 = await msstbprptGetKendoList(data1);
- // debugger
+ //
let finalData = facilities.value.map((item) => ({ ...item, count: 0 }))
if (res1.data) {
const { data } = res1
@@ -220,7 +220,7 @@ const getDataList = async () => {
})
}
console.log(finalData)
- // debugger/
+ // /
const res2 = await msstbprptGetKendoList(data2);
if (res2.data) {
const responseData = res2?.data?.data
@@ -231,7 +231,7 @@ const getDataList = async () => {
}
facilities.value = finalData
console.log(finalData)
- // debugger
+ //
} catch (error) {
console.error('获取数据失败:', error);
} finally {
diff --git a/frontend/src/modules/stllyanchengChangeMod/index.vue b/frontend/src/modules/stllyanchengChangeMod/index.vue
index a8882c91..905d6795 100644
--- a/frontend/src/modules/stllyanchengChangeMod/index.vue
+++ b/frontend/src/modules/stllyanchengChangeMod/index.vue
@@ -166,7 +166,7 @@ const getSelect = async () => {
}
if (data && data.length > 0) {
- // debugger;
+ // ;
select.value.value = data[0].wbsCode;
selectData.value = data[0].wbsCode; // 同步选中第一个
select.value.options = data.map(item => ({
diff --git a/frontend/src/store/modules/model.ts b/frontend/src/store/modules/model.ts
index 58cc6681..38fe7274 100644
--- a/frontend/src/store/modules/model.ts
+++ b/frontend/src/store/modules/model.ts
@@ -34,6 +34,7 @@ export const useModelStore = defineStore('model', () => {
sttpMap?: string; // 新增：站点类型映射
dtinType?: string;
bldstt: string;
+ bldsttCcode: string;
}>({
sttp: 'eng',
stcd: '',
@@ -45,7 +46,8 @@ export const useModelStore = defineStore('model', () => {
sttpCode: '',
sttpMap: '',
dtinType: '',
- bldstt: ''
+ bldstt: '',
+ bldsttCcode:''
});
const filter = ref({
stllgzlx: '', // 生态流量 - 规则类型
diff --git a/frontend/src/views/fish-survey/fishSurveyZhuanZhi.vue b/frontend/src/views/fish-survey/fishSurveyZhuanZhi.vue
index 527d7a48..040cfe26 100644
--- a/frontend/src/views/fish-survey/fishSurveyZhuanZhi.vue
+++ b/frontend/src/views/fish-survey/fishSurveyZhuanZhi.vue
@@ -1,9 +1,73 @@
@@ -12,12 +76,40 @@ import FishVideo from '@/modules/fishSurvey/FishVideo/index.vue'
+ {{ currentDescription }}
-
+
+
+
+
-
-
+
+
+
+