diff --git a/src/assets/css/content.css b/src/assets/css/content.css index 17affe02..02fda945 100644 --- a/src/assets/css/content.css +++ b/src/assets/css/content.css @@ -8,7 +8,7 @@ z-index: 1; color: #fff; pointer-events: none; - user-select: none; + /* user-select: none; */ * { pointer-events: auto; diff --git a/src/assets/css/ele.css b/src/assets/css/ele.css index 372fe0cb..7e89fe0a 100644 --- a/src/assets/css/ele.css +++ b/src/assets/css/ele.css @@ -154,7 +154,7 @@ background: red !important; } :deep(.el-popper.is-dark > :first-child) { - user-select: none !important; + /* user-select: none !important; */ } .my-loading { diff --git a/src/layout/Container/mapRightMenu.vue b/src/layout/Container/mapRightMenu.vue index 562c4485..563db0a5 100644 --- a/src/layout/Container/mapRightMenu.vue +++ b/src/layout/Container/mapRightMenu.vue @@ -7,8 +7,13 @@ import { mapRightMenuEvent } from "@/gis/ol/olRightMenu"; import { getGif } from "@/utils/axios/symn"; import { useI18n } from "vue-i18n"; import { ElMessage } from "element-plus"; +import log from '@/pages/symn/log/index.vue'; -import { getrwssGifFileData, downGifSsFile,getRwscGifFileGcrz } from "@/utils/axios/fskjk"; +import { + getrwssGifFileData, + downGifSsFile, + getRwscGifFileGcrz, +} from "@/utils/axios/fskjk"; const { t } = useI18n(); @@ -231,12 +236,12 @@ function handleIconClick(item: MapControlItem) { // 处理gif else if (item.name === "gif") { let taskId = JSON.parse(sessionStorage.getItem("ssmnDataItem")).id; - let speciesId = JSON.parse(sessionStorage.getItem("symnZxHsId"))||""; + let speciesId = JSON.parse(sessionStorage.getItem("symnZxHsId")) || ""; getGif( { taskId, genGifType: "global", - speciesId + speciesId, }, (res: any) => { gifSrc.value = window.FSXConfig.VUE_APP_SERVER_IP + res; @@ -289,7 +294,7 @@ function switchIconActive(key: string, falg: boolean) { // 查询任务所属GIF文件地址 const generateGif = () => { let taskId = JSON.parse(sessionStorage.getItem("ssmnDataItem")).id; - let speciesId = JSON.parse(sessionStorage.getItem("symnZxHsId"))||""; + let speciesId = JSON.parse(sessionStorage.getItem("symnZxHsId")) || ""; getrwssGifFileData( { taskId, @@ -308,7 +313,7 @@ const generateGif = () => { // 下载任务所属GIF文件 const downGifFile = () => { let taskId = JSON.parse(sessionStorage.getItem("ssmnDataItem")).id; - let speciesId = JSON.parse(sessionStorage.getItem("symnZxHsId"))||""; + let speciesId = JSON.parse(sessionStorage.getItem("symnZxHsId")) || ""; downGifSsFile( { taskId, @@ -333,22 +338,22 @@ const downGifFile = () => { }; // 查看日志 -const viewLogs = ()=>{ +const viewLogs = () => { viewLogsDialog.value = true; let taskId = JSON.parse(sessionStorage.getItem("ssmnDataItem")).id; - let speciesId = JSON.parse(sessionStorage.getItem("symnZxHsId"))||""; + let speciesId = JSON.parse(sessionStorage.getItem("symnZxHsId")) || ""; getRwscGifFileGcrz( { taskId, speciesId, }, (res: any) => { - console.log(res,222222222); + console.log(res, 222222222); gifRzGroupValue.value = res.result; } ); -} +}; onMounted(() => { // 判断当前是否处于全屏状态 svgList.value[0].isActive = domFullscreenStatus(); @@ -489,60 +494,44 @@ onMounted(() => { - - 生成GIF + 生成GIF + 查看日志 - 查看日志 - GIF - - - - - 类型 + GIF +
+
- - - 下载下载 - - - - - - -
-
  • {{item.createTime}}    {{item.logContent}}
    • -
  • {{item.createTime}}    {{item.logContent}}
    • -
  • {{item.createTime}}    {{item.logContent}}
    • +
    + + + + + diff --git a/src/locales/language/zh.json b/src/locales/language/zh.json index 30068c91..93b4f090 100644 --- a/src/locales/language/zh.json +++ b/src/locales/language/zh.json @@ -275,6 +275,7 @@ "ImportMonitoringData": "导入监测数据", "pinToTop": "置顶", "unpin": "取消置顶", - "executeAssociation":"执行关联" + "executeAssociation":"执行关联", + "sampleLevel":"样品级别" } diff --git a/src/pages/largeScreen1/dataAnalysis.vue b/src/pages/largeScreen1/dataAnalysis.vue index 1d207687..685ecc16 100644 --- a/src/pages/largeScreen1/dataAnalysis.vue +++ b/src/pages/largeScreen1/dataAnalysis.vue @@ -205,7 +205,7 @@ defineExpose({ z-index: 10; background: rgb(7, 39, 43); border: 1px solid #0b8c82; - user-select: none; + /* user-select: none; */ } .tab-bar span { diff --git a/src/pages/largeScreen1/stackChart.vue b/src/pages/largeScreen1/stackChart.vue index 4ffb124e..163b2110 100644 --- a/src/pages/largeScreen1/stackChart.vue +++ b/src/pages/largeScreen1/stackChart.vue @@ -231,7 +231,7 @@ defineExpose({ z-index: 10; background: rgb(7, 39, 43); border: 1px solid #0b8c82; - user-select: none; + /* user-select: none; */ } .tab-bar span { diff --git a/src/pages/sjfx/one/index.vue b/src/pages/sjfx/one/index.vue index 0abfaaea..5eaa2702 100644 --- a/src/pages/sjfx/one/index.vue +++ b/src/pages/sjfx/one/index.vue @@ -662,7 +662,7 @@ onUnmounted(() => { display: flex; justify-content: center; align-items: center; - user-select: none; + // user-select: none; } .runBtn { diff --git a/src/pages/sjfx/two/index.vue b/src/pages/sjfx/two/index.vue index 25718489..a5f5a0bf 100644 --- a/src/pages/sjfx/two/index.vue +++ b/src/pages/sjfx/two/index.vue @@ -36,7 +36,6 @@ function getStation() { value: item.stationId, }; }); - console.log(res, 'res'); }); } const barData = ref({ @@ -72,7 +71,6 @@ const rules = { function setTime(val: any[]) { form.value.startDate = val[0]; form.value.endDate = val[1]; - console.log(val); } function handleSearch() { getList(); @@ -83,9 +81,8 @@ function getList() { return; formEl.validate((valid, fields) => { if (valid) { - form.value.stationIds = [form.value.station] + form.value.stationIds = [...form.value.station] getSampleGrade(form.value, (res) => { - console.log(res, 'res'); const list = res.result?.sampleDataList; if (!list || list.length === 0) { barData.value = { @@ -106,7 +103,8 @@ function getList() { default: '#c2c2c2', }; // 1. 提取所有唯一的时间点（包含 category 为 null 的时间） - // 确保 X 轴的时间顺序是完整的 + // 确保 X 轴的时间顺序是完整的,将时间去重后按从小到大排列 + // Array.from作用，将类数组转化为数组 const allTimes = Array.from(new Set(list.map((item: { collectStop: any }) => item.collectStop))) .sort((a, b) => new Date(a) - new Date(b)); @@ -116,11 +114,15 @@ function getList() { .map((item: { category: any }) => item.category), )).sort((a, b) => a - b); - // 3. 按时间对数据进行分组 + // 3. 按时间对数据进行分组，创建新的Map const groupMap = new Map(); + // 遍历原数组list list.forEach((item: { collectStop: any }) => { + // 判断Map中是否不存在当前时间key if (!groupMap.has(item.collectStop)) + // 如果不存在就新建key，值为空数组 groupMap.set(item.collectStop, []); + // 根据key去除数组，将当前的值推入数组中 groupMap.get(item.collectStop).push(item); }); @@ -161,19 +163,16 @@ function getList() { barData.value.xAxisData = allTimes; barData.value.seriesData = seriesList; barData.value.legendData = validCategories.map(cat => `等级 ${cat}`); - console.log('处理后的数据:', barData.value); renderChart(); }); } // else { - // console.log('表单验证失败:', fields); // ElMessage.error('搜索信息未填写'); // } }); } function renderChart() { if (!barData.value || !barData.value.seriesData || barData.value.seriesData.length === 0) { - console.warn('数据异常'); return; } const option = { @@ -384,18 +383,18 @@ onMounted(async () => {
    - - - + + + - - - + + + @@ -404,13 +403,13 @@ onMounted(async () => { :value="item.value" /> - - - - --> + + + - + - + - - + + {{ t('refresh') }} - - + +
    @@ -556,7 +555,7 @@ onMounted(async () => { .chart-container { width: 100%; - height: 800px; + height: 780px; } } diff --git a/src/pages/symn/index.vue b/src/pages/symn/index.vue index e891f107..301ab836 100644 --- a/src/pages/symn/index.vue +++ b/src/pages/symn/index.vue @@ -1,20 +1,43 @@