diff --git a/frontend/src/api/stll/index.ts b/frontend/src/api/stll/index.ts index 57db7457..4eaf0cd0 100644 --- a/frontend/src/api/stll/index.ts +++ b/frontend/src/api/stll/index.ts @@ -2,7 +2,7 @@ import request from '@/utils/request'; //生态流量达标情况 export function qgcetQgcStaticData(data: any) { return request({ - url: '/api/wmp-eng-server/eng/eq/interval/qgc/getQgcStaticData', + url: '/eq/interval/qgc/getQgcStaticData', method: 'post', data }); @@ -10,7 +10,7 @@ export function qgcetQgcStaticData(data: any) { //tabs 日 export function dayGetKendoListCust(data: any) { return request({ - url: '/api/wmp-eng-server/eng/eq/interval/qgc/day/GetKendoListCust', + url: '/eq/interval/qgc/day/GetKendoListCust', method: 'post', data }); @@ -18,7 +18,7 @@ export function dayGetKendoListCust(data: any) { //tabs 小时 export function hourGetKendoListCust(queryParams: any) { return request({ - url: '/api/wmp-eng-server/eng/eq/interval/qgc/hour/GetKendoListCust', + url: '/eq/interval/qgc/hour/GetKendoListCust', method: 'post', data: queryParams }); @@ -26,7 +26,7 @@ export function hourGetKendoListCust(queryParams: any) { //接入过生态流量数据的电站 export function evnmAutoMonitorGetKendoListCust(queryParams: any) { return request({ - url: '/api/dec-lygk-base-server/base/evnmAutoMonitor/GetKendoListCust', + url: '/eq/evnmAutoMonitor/GetKendoListCust', method: 'post', data: queryParams }); @@ -34,15 +34,63 @@ export function evnmAutoMonitorGetKendoListCust(queryParams: any) { //获取电站 export function vmsstbprptGetKendoList(queryParams: any) { return request({ - url: '/api/dec-lygk-base-server/base/vmsstbprpt/GetKendoList', + url: '/eq/vmsstbprpt/GetKendoList', method: 'post', data: queryParams }); } -//生态流量达标情况 /api/wmp-eng-server/eng/eq/qecRateCount +//生态流量达标情况 export function eqqecRateCount(queryParams: any) { return request({ - url: '/api/wmp-eng-server/eng/eq/qecRateCount', + url: '/eq/qecRateCount', + method: 'post', + data: queryParams + }); +} +// 获取生态流量达标率按基地 +export function intervalGetKendoListCust(queryParams: any) { + return request({ + url: '/eq/interval/GetKendoListCust', + method: 'post', + data: queryParams + }); +} +// 获取生态流量达标率按性能 +export function eqGetKendoListCust(queryParams: any) { + return request({ + url: '/api/wmp-eng-server/eng/to/eq/GetKendoListCust', + method: 'post', + data: queryParams + }); +} +//生态流量沿程变化 +export function qgcHourVGetKendoListCust(queryParams: any) { + return request({ + url: '/eq/engalong/statistics/qgcHourV/GetKendoListCust', + method: 'post', + data: queryParams + }); +} +//根据流域获取电站 +export function wbsbGetKendoList(queryParams: any) { + return request({ + url: '/eq/wbsb/GetKendoList', + method: 'post', + data: queryParams + }); +} +//生态流量泄放方式 +export function msstbprptGetKendoList(queryParams: any) { + return request({ + url: '/eq/msstbprpt/GetKendoList', + method: 'post', + data: queryParams + }); +} +//根据流域获取电站 +export function qgcgetEngLimit(queryParams: any) { + return request({ + url: '/api/wmp-eng-server/eng/engalong/statistics/qgc/getEngLimit', method: 'post', data: queryParams }); diff --git a/frontend/src/components/MapModal/column.config.ts b/frontend/src/components/MapModal/column.config.ts index de95b033..e4e1b39d 100644 --- a/frontend/src/components/MapModal/column.config.ts +++ b/frontend/src/components/MapModal/column.config.ts @@ -994,22 +994,22 @@ const wtPointColumns: Array = [ type: 'select', url: '' }, - { - name: '经度(°)', - filed: 'lgtd', - visible: true, - type: 'number', - toFixed: 6, - url: '' - }, - { - name: '纬度(°)', - filed: 'lttd', - visible: true, - type: 'number', - toFixed: 6, - url: '' - }, + // { + // name: '经度(°)', + // filed: 'lgtd', + // visible: true, + // type: 'number', + // toFixed: 6, + // url: '' + // }, + // { + // name: '纬度(°)', + // filed: 'lttd', + // visible: true, + // type: 'number', + // toFixed: 6, + // url: '' + // }, { name: '建成日期', filed: 'jcdt', @@ -1070,22 +1070,22 @@ const FhWpPointColumns: Array = [ type: 'select', url: '' }, - { - name: '经度(°)', - filed: 'lgtd', - visible: true, - type: 'number', - toFixed: 6, - url: '' - }, - { - name: '纬度(°)', - filed: 'lttd', - visible: true, - type: 'number', - toFixed: 6, - url: '' - }, + // { + // name: '经度(°)', + // filed: 'lgtd', + // visible: true, + // type: 'number', + // toFixed: 6, + // url: '' + // }, + // { + // name: '纬度(°)', + // filed: 'lttd', + // visible: true, + // type: 'number', + // toFixed: 6, + // url: '' + // }, { name: '建成日期', filed: 'jcdt', @@ -1259,22 +1259,22 @@ const FhZQPointColumns: Array = [ type: 'select', url: '' }, - { - name: '经度(°)', - filed: 'lgtd', - visible: true, - type: 'number', - toFixed: 6, - url: '' - }, - { - name: '纬度(°)', - filed: 'lttd', - visible: true, - type: 'number', - toFixed: 6, - url: '' - }, + // { + // name: '经度(°)', + // filed: 'lgtd', + // visible: true, + // type: 'number', + // toFixed: 6, + // url: '' + // }, + // { + // name: '纬度(°)', + // filed: 'lttd', + // visible: true, + // type: 'number', + // toFixed: 6, + // url: '' + // }, { name: '建成日期', filed: 'jcdt', @@ -1328,22 +1328,22 @@ const FPPointColumns: Array = [ type: 'select', url: '' }, - { - name: '经度(°)', - filed: 'lgtd', - visible: true, - type: 'number', - toFixed: 6, - url: '' - }, - { - name: '纬度(°)', - filed: 'lttd', - visible: true, - type: 'number', - toFixed: 6, - url: '' - }, + // { + // name: '经度(°)', + // filed: 'lgtd', + // visible: true, + // type: 'number', + // toFixed: 6, + // url: '' + // }, + // { + // name: '纬度(°)', + // filed: 'lttd', + // visible: true, + // type: 'number', + // toFixed: 6, + // url: '' + // }, { name: '开工日期', @@ -1507,22 +1507,22 @@ const FPPointColumns1: Array = [ type: 'select', url: '' }, - { - name: '经度(°)', - filed: 'lgtd', - visible: true, - type: 'number', - toFixed: 6, - url: '' - }, - { - name: '纬度(°)', - filed: 'lttd', - visible: true, - type: 'number', - toFixed: 6, - url: '' - }, + // { + // name: '经度(°)', + // filed: 'lgtd', + // visible: true, + // type: 'number', + // toFixed: 6, + // url: '' + // }, + // { + // name: '纬度(°)', + // filed: 'lttd', + // visible: true, + // type: 'number', + // toFixed: 6, + // url: '' + // }, { name: '开工日期', @@ -1766,22 +1766,22 @@ const FPPointColumns2: Array = [ type: 'select', url: '' }, - { - name: '经度(°)', - filed: 'lgtd', - visible: true, - type: 'number', - toFixed: 6, - url: '' - }, - { - name: '纬度(°)', - filed: 'lttd', - visible: true, - type: 'number', - toFixed: 6, - url: '' - }, + // { + // name: '经度(°)', + // filed: 'lgtd', + // visible: true, + // type: 'number', + // toFixed: 6, + // url: '' + // }, + // { + // name: '纬度(°)', + // filed: 'lttd', + // visible: true, + // type: 'number', + // toFixed: 6, + // url: '' + // }, { name: '开工日期', @@ -1971,22 +1971,22 @@ const FPPointColumns4: Array = [ type: 'select', url: '' }, - { - name: '经度(°)', - filed: 'lgtd', - visible: true, - type: 'number', - toFixed: 6, - url: '' - }, - { - name: '纬度(°)', - filed: 'lttd', - visible: true, - type: 'number', - toFixed: 6, - url: '' - }, + // { + // name: '经度(°)', + // filed: 'lgtd', + // visible: true, + // type: 'number', + // toFixed: 6, + // url: '' + // }, + // { + // name: '纬度(°)', + // filed: 'lttd', + // visible: true, + // type: 'number', + // toFixed: 6, + // url: '' + // }, { name: '开工日期', @@ -2190,22 +2190,22 @@ const FPPointColumns5: Array = [ type: 'select', url: '' }, - { - name: '经度(°)', - filed: 'lgtd', - visible: true, - type: 'number', - toFixed: 6, - url: '' - }, - { - name: '纬度(°)', - filed: 'lttd', - visible: true, - type: 'number', - toFixed: 6, - url: '' - }, + // { + // name: '经度(°)', + // filed: 'lgtd', + // visible: true, + // type: 'number', + // toFixed: 6, + // url: '' + // }, + // { + // name: '纬度(°)', + // filed: 'lttd', + // visible: true, + // type: 'number', + // toFixed: 6, + // url: '' + // }, { name: '开工日期', @@ -2254,22 +2254,22 @@ const FBPointColumns: Array = [ type: 'select', url: '' }, - { - name: '经度(°)', - filed: 'lgtd', - visible: true, - type: 'number', - toFixed: 6, - url: '' - }, - { - name: '纬度(°)', - filed: 'lttd', - visible: true, - type: 'number', - toFixed: 6, - url: '' - }, + // { + // name: '经度(°)', + // filed: 'lgtd', + // visible: true, + // type: 'number', + // toFixed: 6, + // url: '' + // }, + // { + // name: '纬度(°)', + // filed: 'lttd', + // visible: true, + // type: 'number', + // toFixed: 6, + // url: '' + // }, { name: '开工日期', @@ -2420,22 +2420,22 @@ const VaPointColumns: Array = [ type: 'select', url: '' }, - { - name: '经度(°)', - filed: 'lgtd', - visible: true, - type: 'number', - toFixed: 6, - url: '' - }, - { - name: '纬度(°)', - filed: 'lttd', - visible: true, - type: 'number', - toFixed: 6, - url: '' - }, + // { + // name: '经度(°)', + // filed: 'lgtd', + // visible: true, + // type: 'number', + // toFixed: 6, + // url: '' + // }, + // { + // name: '纬度(°)', + // filed: 'lttd', + // visible: true, + // type: 'number', + // toFixed: 6, + // url: '' + // }, { name: '开工日期', @@ -2551,22 +2551,22 @@ const VPPointColumns: Array = [ format: 'YYYY-MM-DD', url: '' }, - { - name: '经度(°)', - filed: 'lgtd', - visible: true, - type: 'number', - toFixed: 6, - url: '' - }, - { - name: '纬度(°)', - filed: 'lttd', - visible: true, - type: 'number', - toFixed: 6, - url: '' - }, + // { + // name: '经度(°)', + // filed: 'lgtd', + // visible: true, + // type: 'number', + // toFixed: 6, + // url: '' + // }, + // { + // name: '纬度(°)', + // filed: 'lttd', + // visible: true, + // type: 'number', + // toFixed: 6, + // url: '' + // }, { name: '建成日期', filed: 'jcdt', @@ -2644,22 +2644,22 @@ const wePointColumns: Array = [ type: 'select', url: '' }, - { - name: '经度(°)', - filed: 'lgtd', - visible: true, - type: 'number', - toFixed: 6, - url: '' - }, - { - name: '纬度(°)', - filed: 'lttd', - visible: true, - type: 'number', - toFixed: 6, - url: '' - }, + // { + // name: '经度(°)', + // filed: 'lgtd', + // visible: true, + // type: 'number', + // toFixed: 6, + // url: '' + // }, + // { + // name: '纬度(°)', + // filed: 'lttd', + // visible: true, + // type: 'number', + // toFixed: 6, + // url: '' + // }, { name: '', filed: '', @@ -2684,22 +2684,22 @@ const waPointColumns: Array = [ type: 'select', url: '' }, - { - name: '经度(°)', - filed: 'lgtd', - visible: true, - type: 'number', - toFixed: 6, - url: '' - }, - { - name: '纬度(°)', - filed: 'lttd', - visible: true, - type: 'number', - toFixed: 6, - url: '' - }, + // { + // name: '经度(°)', + // filed: 'lgtd', + // visible: true, + // type: 'number', + // toFixed: 6, + // url: '' + // }, + // { + // name: '纬度(°)', + // filed: 'lttd', + // visible: true, + // type: 'number', + // toFixed: 6, + // url: '' + // }, { name: '监测方式', filed: 'mwayName', @@ -2759,22 +2759,22 @@ const StinfoAiVidoPointColumns: Array = [ type: 'select', url: '' }, - { - name: '经度(°)', - filed: 'lgtd', - visible: true, - type: 'number', - toFixed: 6, - url: '' - }, - { - name: '纬度(°)', - filed: 'lttd', - visible: true, - type: 'number', - toFixed: 6, - url: '' - }, + // { + // name: '经度(°)', + // filed: 'lgtd', + // visible: true, + // type: 'number', + // toFixed: 6, + // url: '' + // }, + // { + // name: '纬度(°)', + // filed: 'lttd', + // visible: true, + // type: 'number', + // toFixed: 6, + // url: '' + // }, { name: '监控点地址', filed: 'stlc', @@ -2822,22 +2822,22 @@ const DwPointColumns: Array = [ type: 'select', url: '' }, - { - name: '经度(°)', - filed: 'lgtd', - visible: true, - type: 'number', - toFixed: 6, - url: '' - }, - { - name: '纬度(°)', - filed: 'lttd', - visible: true, - type: 'number', - toFixed: 6, - url: '' - }, + // { + // name: '经度(°)', + // filed: 'lgtd', + // visible: true, + // type: 'number', + // toFixed: 6, + // url: '' + // }, + // { + // name: '纬度(°)', + // filed: 'lttd', + // visible: true, + // type: 'number', + // toFixed: 6, + // url: '' + // }, { name: '所属电站', filed: 'ennm', @@ -3006,22 +3006,22 @@ const DwFivePointColumns: Array = [ type: 'select', url: '' }, - { - name: '经度(°)', - filed: 'lgtd', - visible: true, - type: 'number', - toFixed: 6, - url: '' - }, - { - name: '纬度(°)', - filed: 'lttd', - visible: true, - type: 'number', - toFixed: 6, - url: '' - }, + // { + // name: '经度(°)', + // filed: 'lgtd', + // visible: true, + // type: 'number', + // toFixed: 6, + // url: '' + // }, + // { + // name: '纬度(°)', + // filed: 'lttd', + // visible: true, + // type: 'number', + // toFixed: 6, + // url: '' + // }, { name: '所属电站', filed: 'ennm', @@ -3176,22 +3176,22 @@ const DwSixPointColumns: Array = [ type: 'select', url: '' }, - { - name: '经度(°)', - filed: 'lgtd', - visible: true, - type: 'number', - toFixed: 6, - url: '' - }, - { - name: '纬度(°)', - filed: 'lttd', - visible: true, - type: 'number', - toFixed: 6, - url: '' - }, + // { + // name: '经度(°)', + // filed: 'lgtd', + // visible: true, + // type: 'number', + // toFixed: 6, + // url: '' + // }, + // { + // name: '纬度(°)', + // filed: 'lttd', + // visible: true, + // type: 'number', + // toFixed: 6, + // url: '' + // }, { name: '所属电站', filed: 'ennm', @@ -3325,22 +3325,22 @@ const DwOnePointColumns: Array = [ type: 'select', url: '' }, - { - name: '经度(°)', - filed: 'lgtd', - visible: true, - type: 'number', - toFixed: 6, - url: '' - }, - { - name: '纬度(°)', - filed: 'lttd', - visible: true, - type: 'number', - toFixed: 6, - url: '' - }, + // { + // name: '经度(°)', + // filed: 'lgtd', + // visible: true, + // type: 'number', + // toFixed: 6, + // url: '' + // }, + // { + // name: '纬度(°)', + // filed: 'lttd', + // visible: true, + // type: 'number', + // toFixed: 6, + // url: '' + // }, { name: '所属电站', filed: 'ennm', @@ -3486,22 +3486,22 @@ const EQPointColumns2: Array = [ type: 'select', url: '' }, - { - name: '经度(°)', - filed: 'lgtd', - visible: true, - type: 'number', - toFixed: 6, - url: '' - }, - { - name: '纬度(°)', - filed: 'lttd', - visible: true, - type: 'number', - toFixed: 6, - url: '' - }, + // { + // name: '经度(°)', + // filed: 'lgtd', + // visible: true, + // type: 'number', + // toFixed: 6, + // url: '' + // }, + // { + // name: '纬度(°)', + // filed: 'lttd', + // visible: true, + // type: 'number', + // toFixed: 6, + // url: '' + // }, { name: '所属电站', filed: 'ennm', @@ -3619,22 +3619,22 @@ const EQPointColumns5: Array = [ type: 'select', url: '' }, - { - name: '经度(°)', - filed: 'lgtd', - visible: true, - type: 'number', - toFixed: 6, - url: '' - }, - { - name: '纬度(°)', - filed: 'lttd', - visible: true, - type: 'number', - toFixed: 6, - url: '' - }, + // { + // name: '经度(°)', + // filed: 'lgtd', + // visible: true, + // type: 'number', + // toFixed: 6, + // url: '' + // }, + // { + // name: '纬度(°)', + // filed: 'lttd', + // visible: true, + // type: 'number', + // toFixed: 6, + // url: '' + // }, { name: '所属电站', filed: 'ennm', @@ -3723,22 +3723,22 @@ const EQPointColumns3: Array = [ type: 'select', url: '' }, - { - name: '经度(°)', - filed: 'lgtd', - visible: true, - type: 'number', - toFixed: 6, - url: '' - }, - { - name: '纬度(°)', - filed: 'lttd', - visible: true, - type: 'number', - toFixed: 6, - url: '' - }, + // { + // name: '经度(°)', + // filed: 'lgtd', + // visible: true, + // type: 'number', + // toFixed: 6, + // url: '' + // }, + // { + // name: '纬度(°)', + // filed: 'lttd', + // visible: true, + // type: 'number', + // toFixed: 6, + // url: '' + // }, { name: '所属电站', filed: 'ennm', @@ -3857,22 +3857,22 @@ const EQPointColumns4: Array = [ type: 'select', url: '' }, - { - name: '经度(°)', - filed: 'lgtd', - visible: true, - type: 'number', - toFixed: 6, - url: '' - }, - { - name: '纬度(°)', - filed: 'lttd', - visible: true, - type: 'number', - toFixed: 6, - url: '' - }, + // { + // name: '经度(°)', + // filed: 'lgtd', + // visible: true, + // type: 'number', + // toFixed: 6, + // url: '' + // }, + // { + // name: '纬度(°)', + // filed: 'lttd', + // visible: true, + // type: 'number', + // toFixed: 6, + // url: '' + // }, { name: '所属电站', filed: 'ennm', @@ -3990,22 +3990,22 @@ const EQPointColumns1: Array = [ type: 'select', url: '' }, - { - name: '经度(°)', - filed: 'lgtd', - visible: true, - type: 'number', - toFixed: 6, - url: '' - }, - { - name: '纬度(°)', - filed: 'lttd', - visible: true, - type: 'number', - toFixed: 6, - url: '' - }, + // { + // name: '经度(°)', + // filed: 'lgtd', + // visible: true, + // type: 'number', + // toFixed: 6, + // url: '' + // }, + // { + // name: '纬度(°)', + // filed: 'lttd', + // visible: true, + // type: 'number', + // toFixed: 6, + // url: '' + // }, { name: '所属电站', filed: 'ennm', @@ -4123,22 +4123,22 @@ const EQPointColumns7: Array = [ type: 'select', url: '' }, - { - name: '经度(°)', - filed: 'lgtd', - visible: true, - type: 'number', - toFixed: 6, - url: '' - }, - { - name: '纬度(°)', - filed: 'lttd', - visible: true, - type: 'number', - toFixed: 6, - url: '' - }, + // { + // name: '经度(°)', + // filed: 'lgtd', + // visible: true, + // type: 'number', + // toFixed: 6, + // url: '' + // }, + // { + // name: '纬度(°)', + // filed: 'lttd', + // visible: true, + // type: 'number', + // toFixed: 6, + // url: '' + // }, { name: '所属电站', filed: 'ennm', diff --git a/frontend/src/components/SidePanelItem/index.vue b/frontend/src/components/SidePanelItem/index.vue index c75111ff..df4bbf5a 100644 --- a/frontend/src/components/SidePanelItem/index.vue +++ b/frontend/src/components/SidePanelItem/index.vue @@ -683,9 +683,11 @@ const handleFocus = () => { // Handle focus }; -const filterOption = (input: string, option?: { value: string }) => { +const filterOption = (input: string, option?: { label: string; value: string }) => { if (!option) return false; - return option.value.toLowerCase().includes(input.toLowerCase()); + const label = option.label?.toLowerCase() || ''; + const value = option.value?.toLowerCase() || ''; + return label.includes(input.toLowerCase()) || value.includes(input.toLowerCase()); }; // 文字提示容器 @@ -725,6 +727,16 @@ const emitAllValues = () => { selectedNodeExtra: selectedNodeExtra.value }; + // 处理单个时间选择器 + if (datetimeValue.value) { + // 使用传入的 format,如果没有则根据 picker 类型设置默认格式 + const format = + props.datetimePicker.format || + getDefaultFormat(props.datetimePicker.picker); + payload.datetime = datetimeValue.value.format(format); + } else { + payload.datetime = null; + } // 处理单个时间选择器 if (datetimeValue.value) { // 使用传入的 format,如果没有则根据 picker 类型设置默认格式 diff --git a/frontend/src/modules/EnvironmentalQuality/TwoLayers/EnvironmentalQualityTwoLayers.vue b/frontend/src/modules/EnvironmentalQuality/TwoLayers/EnvironmentalQualityTwoLayers.vue index b9d6fa3b..ac7acf40 100644 --- a/frontend/src/modules/EnvironmentalQuality/TwoLayers/EnvironmentalQualityTwoLayers.vue +++ b/frontend/src/modules/EnvironmentalQuality/TwoLayers/EnvironmentalQualityTwoLayers.vue @@ -88,7 +88,7 @@ - \ No newline at end of file +.chart-wrapper { + width: 100%; + height: 100%; + + &.has-data { + min-height: 0; + } +} + diff --git a/frontend/src/modules/shengTaiLiuLiangXieFangSheShiMod/xieFangFangShi/TwoLayer/STLLXFFS.vue b/frontend/src/modules/shengTaiLiuLiangXieFangSheShiMod/xieFangFangShi/TwoLayer/STLLXFFS.vue new file mode 100644 index 00000000..9abedb9a --- /dev/null +++ b/frontend/src/modules/shengTaiLiuLiangXieFangSheShiMod/xieFangFangShi/TwoLayer/STLLXFFS.vue @@ -0,0 +1,879 @@ + + + + diff --git a/frontend/src/modules/shengTaiLiuLiangXieFangSheShiMod/xieFangFangShi/index.vue b/frontend/src/modules/shengTaiLiuLiangXieFangSheShiMod/xieFangFangShi/index.vue index a2585f76..27e29986 100644 --- a/frontend/src/modules/shengTaiLiuLiangXieFangSheShiMod/xieFangFangShi/index.vue +++ b/frontend/src/modules/shengTaiLiuLiangXieFangSheShiMod/xieFangFangShi/index.vue @@ -1,194 +1,365 @@ \ No newline at end of file + diff --git a/frontend/src/modules/shengTaiLiuLiangXieFangSheShiMod/xieFangFenBu/TwoLayer/FenBuQingKuangTwoLayer.vue b/frontend/src/modules/shengTaiLiuLiangXieFangSheShiMod/xieFangFenBu/TwoLayer/FenBuQingKuangTwoLayer.vue new file mode 100644 index 00000000..c9f95601 --- /dev/null +++ b/frontend/src/modules/shengTaiLiuLiangXieFangSheShiMod/xieFangFenBu/TwoLayer/FenBuQingKuangTwoLayer.vue @@ -0,0 +1,737 @@ + + + + + diff --git a/frontend/src/modules/shengTaiLiuLiangXieFangSheShiMod/xieFangFenBu/index.vue b/frontend/src/modules/shengTaiLiuLiangXieFangSheShiMod/xieFangFenBu/index.vue index 159d1a7b..7245ee49 100644 --- a/frontend/src/modules/shengTaiLiuLiangXieFangSheShiMod/xieFangFenBu/index.vue +++ b/frontend/src/modules/shengTaiLiuLiangXieFangSheShiMod/xieFangFenBu/index.vue @@ -1,386 +1,479 @@ - \ No newline at end of file + diff --git a/frontend/src/modules/shengtaidabiaoMod/TwoLayer/ModalYkzhbzdjcgz.vue b/frontend/src/modules/shengtaidabiaoMod/TwoLayer/ModalYkzhbzdjcgz.vue index 63cea5e1..d186ce8d 100644 --- a/frontend/src/modules/shengtaidabiaoMod/TwoLayer/ModalYkzhbzdjcgz.vue +++ b/frontend/src/modules/shengtaidabiaoMod/TwoLayer/ModalYkzhbzdjcgz.vue @@ -295,7 +295,7 @@ const handleChange = async () => { select: ['stcd', 'stnm'] }; let res = await vmsstbprptGetKendoList(params); - if (res?.data?.success && res?.data?.data) { + if ( res?.data?.data) { let data = res.data.data; stcdOptions.value = data.map((item: any) => ({ value: item.stcd, diff --git a/frontend/src/modules/shengtaidabiaoMod/TwoLayer/ShengTaiLiuLiangDaBQKTwoLayer.vue b/frontend/src/modules/shengtaidabiaoMod/TwoLayer/ShengTaiLiuLiangDaBQKTwoLayer.vue index 8f87e523..a7921bb2 100644 --- a/frontend/src/modules/shengtaidabiaoMod/TwoLayer/ShengTaiLiuLiangDaBQKTwoLayer.vue +++ b/frontend/src/modules/shengtaidabiaoMod/TwoLayer/ShengTaiLiuLiangDaBQKTwoLayer.vue @@ -36,7 +36,7 @@ v-model:value="dateRange" :allow-clear="false" format="YYYY-MM-DD" - style="width: 360px" + style="width: 260px" /> @@ -70,11 +70,11 @@ /> -
+
{ align-items: center; } } - .table { + .table1 { width: 65%; height: 482px; } diff --git a/frontend/src/modules/shengtaidabiaoTwoMod/TwoLayer/STLLXFFS.vue b/frontend/src/modules/shengtaidabiaoTwoMod/TwoLayer/STLLXFFS.vue new file mode 100644 index 00000000..5f319618 --- /dev/null +++ b/frontend/src/modules/shengtaidabiaoTwoMod/TwoLayer/STLLXFFS.vue @@ -0,0 +1,812 @@ + + + + diff --git a/frontend/src/modules/shengtaidabiaoTwoMod/index.vue b/frontend/src/modules/shengtaidabiaoTwoMod/index.vue index 6477b27e..f384b4f0 100644 --- a/frontend/src/modules/shengtaidabiaoTwoMod/index.vue +++ b/frontend/src/modules/shengtaidabiaoTwoMod/index.vue @@ -7,7 +7,9 @@ --> + + diff --git a/frontend/src/utils/request.ts b/frontend/src/utils/request.ts index 2a802794..324c2374 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 3c424544-50d5-4787-9453-97bc18e44427'; + 'bearer 0952e56d-8a77-4c43-abe4-a44367a22d73'; config.baseURL = '/'; } else { const user = useUserStoreHook(); diff --git a/frontend/src/views/shengTaiLiuLiang/shengTaiLiuLiangManZuQingKuang.vue b/frontend/src/views/shengTaiLiuLiang/shengTaiLiuLiangManZuQingKuang.vue index e0b2b023..6fba0d80 100644 --- a/frontend/src/views/shengTaiLiuLiang/shengTaiLiuLiangManZuQingKuang.vue +++ b/frontend/src/views/shengTaiLiuLiang/shengTaiLiuLiangManZuQingKuang.vue @@ -1,21 +1,36 @@ - + diff --git a/frontend/src/views/shengTaiLiuLiang/shengTaiLiuLiangXieFangSheShi.vue b/frontend/src/views/shengTaiLiuLiang/shengTaiLiuLiangXieFangSheShi.vue index 2293fac9..5b924ab6 100644 --- a/frontend/src/views/shengTaiLiuLiang/shengTaiLiuLiangXieFangSheShi.vue +++ b/frontend/src/views/shengTaiLiuLiang/shengTaiLiuLiangXieFangSheShi.vue @@ -1,22 +1,37 @@ - +