From 17e688e8ef9962c711a1f012d43fab35dda9d4d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E5=87=AF?= <2448379534@qq.com> Date: Thu, 28 May 2026 08:36:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E6=8E=A5=E5=8F=A3=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/api/sw/index.ts | 36 +- .../MapModal/components/BasicInfo.vue | 11 +- .../components/WaterTemperatureContrast.vue | 29 +- .../carouselIntroduce/ArtsDetail.vue | 41 +- .../src/modules/churukushuiwenMod/index.vue | 2 - ...eixingzuchengjijieruqingkuangTwoLayers.vue | 78 +- frontend/src/modules/jidiInfoMod/index.vue | 1 - .../TwoLayers/monthlyAverageMaxModal.vue | 1044 +++++++++++++++++ .../index.vue | 76 +- .../monthlyAverage.vue | 8 +- .../modules/sheshileixingjieshao/index.vue | 361 ++++-- .../TwoLayers/yaerAverage.vue | 15 +- .../src/modules/shuiWenNianNeiFenBu/index.vue | 25 +- .../shuiwenjiancegongzuoEJ.vue | 10 +- .../yanchengshuiwenChangeMod/index.vue | 2 - 15 files changed, 1506 insertions(+), 233 deletions(-) create mode 100644 frontend/src/modules/monthlyAvgWaterTemCompareHistory/TwoLayers/monthlyAverageMaxModal.vue diff --git a/frontend/src/api/sw/index.ts b/frontend/src/api/sw/index.ts index 85d80a2..5f0ce5b 100644 --- a/frontend/src/api/sw/index.ts +++ b/frontend/src/api/sw/index.ts @@ -1,7 +1,7 @@ import request from '@/utils/request'; export function getKendoListCust(data: any) { return request({ - url: '/api/wmp-env-server/sw/alongList/qgc/GetKendoListCust', + url: '/wt/alongList/qgc/GetKendoListCust', method: 'post', data }); @@ -9,7 +9,7 @@ export function getKendoListCust(data: any) { //获取水温下拉框 export function wbsbGetKendoList(data: any) { return request({ - url: '/api/dec-lygk-base-server/base/wbsb/GetKendoList', + url: '/wt/wbsb/GetKendoList', method: 'post', data }); @@ -21,7 +21,7 @@ export function wbsbGetKendoList(data: any) { */ export function getChuiXiangShuiWenTreeStcd(data: any) { return request({ - url: '/api/wmp-env-server/base/sdrvwts/default/treeStcd', + url: '/wt/sdrvwts/default/treeStcd', method: 'post', data, }); @@ -34,7 +34,7 @@ export function getChuiXiangShuiWenTreeStcd(data: any) { */ export function getCxswList(data: any) { return request({ - url: '/api/wmp-env-server/sw/dzCxList/GetKendoListCust', + url: '/wt/dzCxList/GetKendoListCust', method: 'post', data }); @@ -42,7 +42,7 @@ export function getCxswList(data: any) { //获取出入库水温下拉选则树 export function getVmsstbprpt(data: any) { return request({ - url: '/api/dec-lygk-base-server/base/vmsstbprpt/GetKendoList', + url: '/wt/vmsstbprpt/GetKendoList', method: 'post', data }); @@ -51,7 +51,7 @@ export function getVmsstbprpt(data: any) { // export function inOutOneGetKendoListCust(data: any) { return request({ - url: '/api/wmp-env-server/sw/inOutOne/GetKendoListCust', + url: '/wt/inOutOne/GetKendoListCust', method: 'post', data }); @@ -59,7 +59,7 @@ export function inOutOneGetKendoListCust(data: any) { //水温监测工作开展情况 export function baseEvnmAutoMonitorGetKendoListCust(data: any) { return request({ - url: '/api/dec-lygk-base-server/base/evnmAutoMonitor/GetKendoListCust', + url: '/wt/evnmAutoMonitor/GetKendoListCust', method: 'post', data }); @@ -67,7 +67,7 @@ export function baseEvnmAutoMonitorGetKendoListCust(data: any) { ////水温监测工作开展情况弹框 export function vmsstbprptGetKendoList(data: any) { return request({ - url: '/api/dec-lygk-base-server/base/vmsstbprpt/GetKendoList', + url: '/wt/vmsstbprpt/GetKendoList', method: 'post', data }); @@ -75,7 +75,7 @@ export function vmsstbprptGetKendoList(data: any) { //出入库水温打开弹框api/wmp-env-server/sw/inOutOne/details export function inOutOneDetails(data: any) { return request({ - url: '/api/wmp-env-server/sw/inOutOne/details', + url: '/wt/inOutOne/details', method: 'post', data }); @@ -83,7 +83,7 @@ export function inOutOneDetails(data: any) { //鱼类适宜性分析 - select export function infoGetKendoListCust(data: any) { return request({ - url: '/api/wmp-env-server/sw/wtrv/fish/info/GetKendoListCust', + url: '/wt/wtrv/fish/info/GetKendoListCust', method: 'post', data }); @@ -91,7 +91,7 @@ export function infoGetKendoListCust(data: any) { //鱼类适宜性分析-图表和table export function fishGetKendoListCust(data: any) { return request({ - url: '/api/wmp-env-server/sw/wtrv/fish/GetKendoListCust', + url: '/wt/wtrv/fish/GetKendoListCust', method: 'post', data }); @@ -99,7 +99,7 @@ export function fishGetKendoListCust(data: any) { //月平均水温历史对比 export function avgMonGetKendoListCust(data: any) { return request({ - url: '/api/wmp-env-server/sw/monthList/avgMon/GetKendoListCust', + url: '/wt/monthList/avgMon/GetKendoListCust', method: 'post', data }); @@ -107,7 +107,7 @@ export function avgMonGetKendoListCust(data: any) { //水温年内分布 export function yearListGetKendoListCust(data: any) { return request({ - url: '/api/wmp-env-server/sw/yearList/GetKendoListCust', + url: '/wt/yearList/GetKendoListCust', method: 'post', data }); @@ -115,7 +115,7 @@ export function yearListGetKendoListCust(data: any) { //设施类型介绍 export function sttpbGetKendoList(data: any) { return request({ - url: '/api/dec-lygk-base-server/base/sttpb/GetKendoList', + url: '/wt/sttpb/GetKendoList', method: 'post', data }); @@ -123,7 +123,7 @@ export function sttpbGetKendoList(data: any) { //设施类型及接入情况 export function dwInfoGetKendoListCust(data: any) { return request({ - url: '/api/dec-lygk-base-server/base/dwInfo/GetKendoListCust', + url: '/wt/dwInfo/GetKendoListCust', method: 'post', data }); @@ -131,7 +131,7 @@ export function dwInfoGetKendoListCust(data: any) { //月均水温对比，图表，表格 /api/wmp-env-server/sw/monthDetail/Det/GetKendoListCust export function DetGetKendoListCust(data: any) { return request({ - url: '/api/wmp-env-server/sw/monthDetail/Det/GetKendoListCust', + url: '/wt/monthDetail/Det/GetKendoListCust', method: 'post', data }); @@ -139,7 +139,7 @@ export function DetGetKendoListCust(data: any) { //水温年内分布 export function yearDetailGetKendoListCust(data: any) { return request({ - url: '/api/wmp-env-server/sw/yearDetail/GetKendoListCust', + url: '/wt/yearDetail/GetKendoListCust', method: 'post', data }); @@ -147,7 +147,7 @@ export function yearDetailGetKendoListCust(data: any) { //获取建设状态 export function dictgetRemoteDictValue(data: any) { return request({ - url: '/api/dec-modules-usm-springcloud-starter/usm/v1/dict/getRemoteDictValue', + url: '/wt/usm/v1/dict/getRemoteDictValue', method: 'get', params: data }); diff --git a/frontend/src/components/MapModal/components/BasicInfo.vue b/frontend/src/components/MapModal/components/BasicInfo.vue index 1ac4afc..0bd2b68 100644 --- a/frontend/src/components/MapModal/components/BasicInfo.vue +++ b/frontend/src/components/MapModal/components/BasicInfo.vue @@ -42,7 +42,7 @@ -
+
@@ -184,7 +184,7 @@ const getData = async () => { if (res.success) { let data = res.data data2.value = data - // debugger + let columns = []; columns = columnsConfig.value.find((item) => item.type == modelStore.params.sttp) .columns; @@ -252,7 +252,7 @@ const getData = async () => { } else { isLogo.value = false } - // debugger + } } @@ -277,7 +277,10 @@ onMounted(() => { overflow-y: auto; display: flex; justify-content: space-between; - + .img_box_one{ + width: 40%; + // height: 80%; + } .img_box { // width: 20%; padding: 12px; diff --git a/frontend/src/components/MapModal/components/WaterTemperatureContrast.vue b/frontend/src/components/MapModal/components/WaterTemperatureContrast.vue index 62a838e..6837ef9 100644 --- a/frontend/src/components/MapModal/components/WaterTemperatureContrast.vue +++ b/frontend/src/components/MapModal/components/WaterTemperatureContrast.vue @@ -24,7 +24,16 @@
+ :search-params="{}" :transform-data="customTransform"> + + +
@@ -65,14 +74,7 @@ const columns = [ title: '同期对比', dataIndex: 'contrast', width: 120, - customRender: ({ record }: any) => { - if (record.wt && record.beforeWt) { - const diff = (record.wt - record.beforeWt).toFixed(2); - const diffNum = record.wt - record.beforeWt; - return (diffNum > 0) ? `+${diff}` : diff; - } - return '-'; - } + slots: { customRender: 'contrast' } }, { title: '适宜产卵鱼', @@ -146,7 +148,8 @@ const getSelectOption = async () => { pretemp: item.pretemp, } }) - selectValue.value = data.map(item => item.id) + // 根据数据长度智能选择ID：2个及以上取前2个，少于2个取第1个 + selectValue.value = data.length >= 2 ? data.slice(0, 2).map(item => item.id) : (data.length > 0 ? [data[0].id] : []) } //echarts 数据获取 const getEchartsData = async () => { @@ -240,9 +243,9 @@ const processChartData = (rawData: any[]) => { // 过滤掉 wt 或 beforeWt 为 null 的记录 const filtered = rawData.filter(item => - item.wt !== null && item.wt !== undefined && - item.beforeWt !== null && item.beforeWt !== undefined + item.wt !== null && item.wt !== undefined ); + // && item.beforeWt !== null && item.beforeWt !== undefined // 按 dt 升序排序 return filtered.sort((a, b) => @@ -430,7 +433,7 @@ const getChartOption = computed(() => { show: false }, axisLabel: { - interval: Math.ceil(xAxisData.length / 7), + interval: xAxisData.length > 7 ? Math.floor((xAxisData.length - 1) / 7) : 0, fontSize: 12, rotate: 0, margin: 10 diff --git a/frontend/src/components/carouselIntroduce/ArtsDetail.vue b/frontend/src/components/carouselIntroduce/ArtsDetail.vue index d10aba4..33a75e2 100644 --- a/frontend/src/components/carouselIntroduce/ArtsDetail.vue +++ b/frontend/src/components/carouselIntroduce/ArtsDetail.vue @@ -8,7 +8,8 @@
- + +
@@ -24,12 +25,14 @@
- +
- +
@@ -47,14 +50,15 @@ const props = defineProps<{ dataSource: Array<{ title: string; description: string; - image: string; + url: string; }>; + index:any }>(); interface MediaItem { title: string; description: string; - image: string; + url: string; } const originalMediaData = ref([]); @@ -66,11 +70,21 @@ const initOriginalData = () => { originalMediaData.value = props.dataSource.map(item => ({ title: item.title, description: item.description, - image: item.image + url: item.url })); } }; +// 根据 index prop 设置当前索引 +const setCurrentIndexFromProps = () => { + if (props.index !== undefined && props.index !== null && originalMediaData.value.length > 0) { + const validIndex = Math.max(0, Math.min(props.index, originalMediaData.value.length - 1)); + currentIndex.value = validIndex; + } else { + currentIndex.value = 0; + } +}; + // 计算轨道样式 - 完全按照 React 版本的逻辑 const trackStyle = computed(() => { return { @@ -104,16 +118,21 @@ const currentDescription = computed(() => { // 页面加载时执行 onMounted(() => { + console.log('ArtsDetail mounted - props.index:', props.index, 'props.dataSource.length:', props.dataSource?.length); initOriginalData(); + setCurrentIndexFromProps(); + console.log('After setCurrentIndexFromProps - currentIndex.value:', currentIndex.value); }); -// 监听 dataSource 变化 +// 只监听 dataSource 变化，不监听 index 变化 watch( () => props.dataSource, (newData) => { if (newData && newData.length > 0) { - currentIndex.value = 0; + // 数据更新时重新初始化 initOriginalData(); + // 重置索引为 0 或根据当前 props.index 设置 + setCurrentIndexFromProps(); } }, { deep: true } @@ -255,14 +274,14 @@ watch( color: #6c8cf7; transition: all 0.3s; - &:hover:not([disabled]) { + &:hover:not(.disabled) { color: #4a6fd4; transform: scale(1.1); } - &[disabled] { + &.disabled { color: #d9d9d9; - cursor: not-allowed; + cursor: not-allowed !important; } } } diff --git a/frontend/src/modules/churukushuiwenMod/index.vue b/frontend/src/modules/churukushuiwenMod/index.vue index 89e1535..27ac8e3 100644 --- a/frontend/src/modules/churukushuiwenMod/index.vue +++ b/frontend/src/modules/churukushuiwenMod/index.vue @@ -644,8 +644,6 @@ const handleModalClose = () => { * @param data - 包含moreSelect(下拉框值)和datetime(日期范围)的对象 */ const handlePanelChange1 = (data: any) => { - // console.log('当前所有控件状态:', data); - // debugger // TODO: 后续可扩展联动逻辑 if (data.moreSelect) { paramsOne.value.value = data.moreSelect; diff --git a/frontend/src/modules/diwenshuijianhuansheshileixingzuchengjijieruqingkuang/TwoLayers/diwenshuijianhuansheshileixingzuchengjijieruqingkuangTwoLayers.vue b/frontend/src/modules/diwenshuijianhuansheshileixingzuchengjijieruqingkuang/TwoLayers/diwenshuijianhuansheshileixingzuchengjijieruqingkuangTwoLayers.vue index 8ee5f4a..4b2648e 100644 --- a/frontend/src/modules/diwenshuijianhuansheshileixingzuchengjijieruqingkuang/TwoLayers/diwenshuijianhuansheshileixingzuchengjijieruqingkuangTwoLayers.vue +++ b/frontend/src/modules/diwenshuijianhuansheshileixingzuchengjijieruqingkuang/TwoLayers/diwenshuijianhuansheshileixingzuchengjijieruqingkuangTwoLayers.vue @@ -34,7 +34,7 @@ - 查询 + 查询 @@ -73,6 +73,7 @@ import { message } from 'ant-design-vue' import BasicTable from '@/components/BasicTable/index.vue' // import { useJidiSelectEventStore } from '@/store/modules/jidiSelectEvent' import { dictgetRemoteDictValue, dwInfoGetKendoListCust, vmsstbprptGetKendoList } from '@/api/sw' +import { getDictItemsByCode } from "@/api/dict"; import { useModelStore } from "@/store/modules/model"; const modelStore = useModelStore(); @@ -166,7 +167,20 @@ const columns = [ title: '接入日期', dataIndex: 'dtinTm', key: 'dtinTm', - width: 120 + width: 120, + customRender: ({ record }: any) => { + const date = record.dtinTm + if (!date) return '-' + // 如果已经是 YYYY-MM-DD 格式，直接返回 + if (typeof date === 'string' && /^\d{4}-\d{2}-\d{2}$/.test(date)) { + return date + } + // 如果是完整时间戳，截取日期部分 + if (typeof date === 'string' && date.includes(' ')) { + return date.split(' ')[0] + } + return date + } }, { title: '建设状态', @@ -178,13 +192,39 @@ const columns = [ title: '开工日期', dataIndex: 'ststdt', key: 'ststdt', - width: 120 + width: 120, + customRender: ({ record }: any) => { + const date = record.ststdt + if (!date) return '-' + // 如果已经是 YYYY-MM-DD 格式，直接返回 + if (typeof date === 'string' && /^\d{4}-\d{2}-\d{2}$/.test(date)) { + return date + } + // 如果是完整时间戳，截取日期部分 + if (typeof date === 'string' && date.includes(' ')) { + return date.split(' ')[0] + } + return date + } }, { title: '建成日期', dataIndex: 'jcdt', key: 'jcdt', - width: 120 + width: 120, + customRender: ({ record }: any) => { + const date = record.jcdt + if (!date) return '-' + // 如果已经是 YYYY-MM-DD 格式，直接返回 + if (typeof date === 'string' && /^\d{4}-\d{2}-\d{2}$/.test(date)) { + return date + } + // 如果是完整时间戳，截取日期部分 + if (typeof date === 'string' && date.includes(' ')) { + return date.split(' ')[0] + } + return date + } }, { title: '所在河段', @@ -283,12 +323,13 @@ const fetchBuildStateList = async () => { try { buildStateLoading.value = true // TODO: 调用API获取建设状态字典数据 - const res = await dictgetRemoteDictValue({ dictCode: 'BLDSTT3T' }) + //getDictItemsByCode({ dictCode: "caoType" }) + const res = await getDictItemsByCode({ dictCode: 'BLDSTT3T' }) buildStateList.value = res.data.map((item: any) => ({ - label: item.dictMeaning, - value: item.dictValue + label: item.dictName, + value: item.itemCode })) - buildStateList.value.push({ label: '全部', value: '' }) + buildStateList.value.unshift({ label: '全部', value: '' }) // 临时模拟数据（实际使用时删除） // buildStateList.value = [ // { label: '全部', value: '' }, @@ -306,8 +347,8 @@ const fetchBuildStateList = async () => { // 基地变化处理 const handleBaseChange = async () => { formState.stnm = '' - await fetchFacilityStats() - handleSearch() + // await fetchFacilityStats() + // handleSearch() } // Tab切换处理 @@ -318,10 +359,13 @@ const handleTabChange = (key: string) => { handleSearch() }) } - +const handleSearchOne = async () => { + await fetchFacilityStats() + handleSearch() +} // 搜索处理 const handleSearch = () => { - + const filters: any[] = [ activeTab.value != '9' ? { "field": "sttpCode", @@ -339,7 +383,7 @@ const handleSearch = () => { "field": "baseId", "operator": "eq", "dataType": "string", - "value": "01" + "value": formState.dataDimensionVal } : null, formState.hydrodtin ? { "field": "dtin", @@ -429,8 +473,8 @@ const handleViewDetail = (record: any, type: string) => { watch( () => [formState.dataDimensionVal, formState.hydrodtin, formState.bldstt], async () => { - await fetchFacilityStats() - handleSearch() + // await fetchFacilityStats() + // handleSearch() } ) @@ -442,8 +486,8 @@ watch( // 只有当新的dwtp与当前activeTab不同时才更新 if (newDwtp !== activeTab.value) { activeTab.value = newDwtp - await fetchFacilityStats() - handleSearch() + await fetchFacilityStats() + handleSearch() } }, { immediate: false } // 不立即执行，因为初始化时已经设置过了 diff --git a/frontend/src/modules/jidiInfoMod/index.vue b/frontend/src/modules/jidiInfoMod/index.vue index 351181b..f247b84 100644 --- a/frontend/src/modules/jidiInfoMod/index.vue +++ b/frontend/src/modules/jidiInfoMod/index.vue @@ -38,7 +38,6 @@ const initText = () => { getBaseWbsb(params).then((res) => { console.log(res); title_text.value = res.data.data[0].introduce; - // debugger }); }; const title_text = ref(""); diff --git a/frontend/src/modules/monthlyAvgWaterTemCompareHistory/TwoLayers/monthlyAverageMaxModal.vue b/frontend/src/modules/monthlyAvgWaterTemCompareHistory/TwoLayers/monthlyAverageMaxModal.vue new file mode 100644 index 0000000..2f47132 --- /dev/null +++ b/frontend/src/modules/monthlyAvgWaterTemCompareHistory/TwoLayers/monthlyAverageMaxModal.vue @@ -0,0 +1,1044 @@ + + + + + diff --git a/frontend/src/modules/monthlyAvgWaterTemCompareHistory/index.vue b/frontend/src/modules/monthlyAvgWaterTemCompareHistory/index.vue index b91641f..feaae28 100644 --- a/frontend/src/modules/monthlyAvgWaterTemCompareHistory/index.vue +++ b/frontend/src/modules/monthlyAvgWaterTemCompareHistory/index.vue @@ -4,6 +4,9 @@ @update-values="handlePanelChange1">
+
+ 图表放大展示 +
@@ -11,24 +14,19 @@ - - + +
- +
+ + + + + \ No newline at end of file diff --git a/frontend/src/modules/shuiWenNianNeiFenBu/TwoLayers/yaerAverage.vue b/frontend/src/modules/shuiWenNianNeiFenBu/TwoLayers/yaerAverage.vue index 3416ac8..2ffe00b 100644 --- a/frontend/src/modules/shuiWenNianNeiFenBu/TwoLayers/yaerAverage.vue +++ b/frontend/src/modules/shuiWenNianNeiFenBu/TwoLayers/yaerAverage.vue @@ -299,14 +299,15 @@ watch( formState.tm = newTm ? dayjs(newTm) : null formState.dataDimensionVal = newDataDimensionVal || '' formState.stcd = String(newStcd || '') - + // 如果基地发生变化，需要重新获取断面列表 if (newDataDimensionVal !== oldDataDimensionVal && newDataDimensionVal) { await fetchDmData() + // 请求数据 + handleSearch() } - - // 请求数据 - handleSearch() + + } }, { deep: true } @@ -370,10 +371,12 @@ defineExpose({ } } } -.text_hocer{ + +.text_hocer { color: #2f6b98; } -.text_hocer:hover{ + +.text_hocer:hover { color: #40a9ff; } diff --git a/frontend/src/modules/shuiWenNianNeiFenBu/index.vue b/frontend/src/modules/shuiWenNianNeiFenBu/index.vue index 34d4bea..b8e28cf 100644 --- a/frontend/src/modules/shuiWenNianNeiFenBu/index.vue +++ b/frontend/src/modules/shuiWenNianNeiFenBu/index.vue @@ -152,7 +152,7 @@ const getColorByCodeAndType = (_code: string[], _typeKey: string[]) => { // 处理图表数据点点击事件 const handleChartClick = (params: any) => { - if (!params || !params.dataIndex) return + if (!params || !String(params.dataIndex)) return // 获取点击的数据点索引 const dataIndex = params.dataIndex @@ -214,7 +214,7 @@ const getselectData = async () => { let data = res?.data?.date || res?.data || [] // 设置默认选中值（第一个站点的 stcd） if (res.data) { - select.value.value = data?.data[0]?.stcd + select.value.value = data?.data[0]?.stcd } else { select.value.value = '' } @@ -269,7 +269,6 @@ const getselectData = async () => { select.value.options = [...dataMapNameArr, ...otherArr] - // debugger // if (baseid.value == 'all') { // select.value.value = '008640202300001021' // } @@ -286,7 +285,11 @@ const getselectData = async () => { //水温年内分布 const getshuiwenList = async () => { if (loading.value) return; // 防止重复请求 - + if (!select.value.value) { + showemit.value = false + waterTempData.value = [] + return; + } loading.value = true; const params = { @@ -387,7 +390,8 @@ const getChartOption = () => { params.forEach((item: any) => { result += `
`; result += ``; - result += `${item.seriesName} ${item.value}${unit}`; + const displayValue = item.value !== null && item.value !== undefined ? item.value : '-'; + result += `${item.seriesName} ${displayValue}${unit}`; result += `
`; }); return result; @@ -556,11 +560,10 @@ const handleResize = () => { onMounted(() => { // 初始化图表 initChart() - // 加载初始数据 - if (select.value.value) { - getshuiwenList() - } + // if (select.value.value) { + // getshuiwenList() + // } }) onBeforeUnmount(() => { @@ -576,7 +579,9 @@ const handlePanelChange1 = (data) => { // 当选择器或日期变化时，重新加载图表数据 if (data.moreSelect || data.datetime) { - select.value.value = data.moreSelect + select.value.value = data.moreSelect + datetimePicker.value.value = data.datetime + // debugger getshuiwenList() } } diff --git a/frontend/src/modules/shuiwenjiancegongzuokaizhangqingkuang/shuiwenjiancegongzuoEJ.vue b/frontend/src/modules/shuiwenjiancegongzuokaizhangqingkuang/shuiwenjiancegongzuoEJ.vue index 9d94fb5..852e415 100644 --- a/frontend/src/modules/shuiwenjiancegongzuokaizhangqingkuang/shuiwenjiancegongzuoEJ.vue +++ b/frontend/src/modules/shuiwenjiancegongzuokaizhangqingkuang/shuiwenjiancegongzuoEJ.vue @@ -51,7 +51,7 @@ @@ -79,6 +79,7 @@ const pagination = ref({ current: 1, pageSize: 20, total: 0, + size: 'small', showSizeChanger: true, showQuickJumper: true, showTotal: (total: number) => `共 ${total} 条`, @@ -322,7 +323,6 @@ const fetchData = async () => { // 数据处理 let total = res.data.total let records = res?.data?.data || res?.data - // debugger // if (Array.isArray(res?.data?.data)) { // records = res.data.data // total = res.data.data.length @@ -539,10 +539,12 @@ onMounted(() => { overflow: hidden; } } -.text_hocer{ + +.text_hocer { color: #2f6b98; } -.text_hocer:hover{ + +.text_hocer:hover { color: #40a9ff; } diff --git a/frontend/src/modules/yanchengshuiwenChangeMod/index.vue b/frontend/src/modules/yanchengshuiwenChangeMod/index.vue index 25972d3..484415a 100644 --- a/frontend/src/modules/yanchengshuiwenChangeMod/index.vue +++ b/frontend/src/modules/yanchengshuiwenChangeMod/index.vue @@ -410,7 +410,6 @@ const init = async () => { //获取选择器配置参数 const getSelectConfig = async () => { loading.value = true; - try { let obj: any = {} if (baseid.value === 'all') { @@ -473,7 +472,6 @@ const getSelectConfig = async () => { } return { label: item.wbsName, value: item.wbsCode, baseId: objId, baseName: jiDiListMap[objId] } }) - // debugger let dataMapNameArr: any = [] Object.keys(dataMapNameMap).forEach((item: any) => {