diff --git a/frontend/src/api/mapModal/index.ts b/frontend/src/api/mapModal/index.ts index a81af3cb..cf193cee 100644 --- a/frontend/src/api/mapModal/index.ts +++ b/frontend/src/api/mapModal/index.ts @@ -35,7 +35,7 @@ export function postIdUrl(data: any) { // 查询站点建设状态 export function getBuildState(data: any) { return request({ - url: '/overview/vmsstbprpt/GetKendoList', + url: '/wt/base/vmsstbprpt/GetKendoList', method: 'post', data: { filter: data.filter, @@ -321,6 +321,13 @@ export function getAIYXSB(data: any) { params: data }); } +export function enggetStInfoByStcd(data: any) { + return request({ + url: '/eng/base/msstbprpt/getStInfoByStcd', + method: 'get', + params: data + }); +} // ai运行识别 视频/表格 export function getAIComList(data: any) { return request({ diff --git a/frontend/src/components/MapModal/components/AIYXSB/index.vue b/frontend/src/components/MapModal/components/AIYXSB/index.vue index 921b2525..81d8f5c4 100644 --- a/frontend/src/components/MapModal/components/AIYXSB/index.vue +++ b/frontend/src/components/MapModal/components/AIYXSB/index.vue @@ -236,7 +236,7 @@ import { import BasicTable from '@/components/BasicTable/index.vue'; import LiveVideoBox from '@/views/shiPinJianKong/components/LiveVideoBox.vue'; import { - getAIYXSB, + enggetStInfoByStcd, getAIComList, postIdUrl, getAIComCalendar @@ -269,7 +269,8 @@ const yyccg = [ dataIndex: 'tm', visible: true, ellipsis: true, - fixed: '' + fixed: '', + sort: true } ]; @@ -298,7 +299,8 @@ const dlmcolumns = [ dataType: 'date', visible: true, ellipsis: true, - fixed: 'left' + fixed: 'left', + sort: true }, { key: 'aiVal', @@ -307,6 +309,7 @@ const dlmcolumns = [ visible: true, ellipsis: true, fixed: 'left', + sort: true, render: (res: any) => res == 'open' ? '开启' : res == 'close' ? '关闭' : '-' } @@ -335,7 +338,8 @@ const Gysyx = [ dataIndex: 'tm', visible: true, ellipsis: true, - fixed: '' + fixed: '', + sort: true } ]; @@ -362,7 +366,8 @@ const Syjyx = [ dataIndex: 'tm', visible: true, ellipsis: true, - fixed: '' + fixed: '', + sort: true } ]; @@ -389,7 +394,8 @@ const ZWyyh = [ dataIndex: 'tm', visible: true, ellipsis: true, - fixed: '' + fixed: '', + sort: true } ]; @@ -416,7 +422,8 @@ const Ycyd = [ dataIndex: 'tm', visible: true, ellipsis: true, - fixed: '' + fixed: '', + sort: true } ]; @@ -473,7 +480,7 @@ const getStcdList = async () => { tableRef.value.loading = true; } try { - const res: any = await getAIYXSB({ stcd: modelStore.params.stcd }); + const res: any = await enggetStInfoByStcd({ stcd: modelStore.params.stcd }); stcdList.value = (res?.data?.relList || []).filter((item: any) => validTypes.includes(item.sttpCode) ); diff --git a/frontend/src/components/MapModal/components/NormalOperationData/proliferationColumns.ts b/frontend/src/components/MapModal/components/NormalOperationData/proliferationColumns.ts index 33a9fc67..b0f03844 100644 --- a/frontend/src/components/MapModal/components/NormalOperationData/proliferationColumns.ts +++ b/frontend/src/components/MapModal/components/NormalOperationData/proliferationColumns.ts @@ -455,7 +455,8 @@ export const qinYuSiWanJiLu = [ chartColor: '', elementCode: '', disabledDate: true, - multiLink: false + multiLink: false, + sort: true }, { dataIndexRaw: '', @@ -481,7 +482,8 @@ export const qinYuSiWanJiLu = [ chartColor: '', elementCode: '', disabledDate: true, - multiLink: false + multiLink: false, + sort: true }, { dataIndexRaw: '', @@ -507,7 +509,8 @@ export const qinYuSiWanJiLu = [ chartColor: '', elementCode: '', disabledDate: true, - multiLink: false + multiLink: false, + sort: true }, { dataIndexRaw: '', @@ -727,7 +730,8 @@ export const qinYuPeiYuFangShi = [ chartColor: '', elementCode: '', disabledDate: true, - multiLink: false + multiLink: false, + sort: true }, { dataIndexRaw: '', @@ -753,7 +757,8 @@ export const qinYuPeiYuFangShi = [ chartColor: '', elementCode: '', disabledDate: true, - multiLink: false + multiLink: false, + sort: true } ], visible: true, @@ -882,7 +887,8 @@ export const qinYuPeiYuShuiWen = [ disabledDate: true, multiLink: false, dataType: 'date', - dataFormat: 'yyyy-MM-DD' + dataFormat: 'yyyy-MM-DD', + sort: true }, { dataIndexRaw: '', @@ -946,7 +952,8 @@ export const qinYuPeiYuShuiWen = [ chartColor: '', elementCode: '', disabledDate: true, - multiLink: false + multiLink: false, + sort: true }, { dataIndexRaw: '', @@ -972,7 +979,8 @@ export const qinYuPeiYuShuiWen = [ chartColor: '', elementCode: '', disabledDate: true, - multiLink: false + multiLink: false, + sort: true }, { dataIndexRaw: '', @@ -998,7 +1006,8 @@ export const qinYuPeiYuShuiWen = [ chartColor: '', elementCode: '', disabledDate: true, - multiLink: false + multiLink: false, + sort: true } ], visible: true, @@ -1019,7 +1028,7 @@ export const qinYuPeiYuShuiWen = [ chartColor: '', elementCode: '', disabledDate: true, - multiLink: false + multiLink: false, } ], visible: true, @@ -1123,7 +1132,8 @@ export const qinYuPeiYuShuiZi = [ disabledDate: true, multiLink: false, dataType: 'date', - dataFormat: 'yyyy-MM-DD' + dataFormat: 'yyyy-MM-DD', + sort: true }, { dataIndexRaw: '', @@ -1214,7 +1224,8 @@ export const qinYuPeiYuShuiZi = [ elementCode: '', disabledDate: true, multiLink: false, - width: 150 + width: 150, + sort: true } ], visible: true, @@ -1268,7 +1279,8 @@ export const qinYuPeiYuShuiZi = [ elementCode: '', disabledDate: true, multiLink: false, - width: 150 + width: 150, + sort: true } ], visible: true, @@ -1322,7 +1334,8 @@ export const qinYuPeiYuShuiZi = [ elementCode: '', disabledDate: true, multiLink: false, - width: 180 + width: 180, + sort: true } ], visible: true, @@ -1375,7 +1388,8 @@ export const qinYuPeiYuShuiZi = [ chartColor: '', elementCode: '', disabledDate: true, - multiLink: false + multiLink: false, + sort: true } ], visible: true, @@ -1396,7 +1410,7 @@ export const qinYuPeiYuShuiZi = [ chartColor: '', elementCode: '', disabledDate: true, - multiLink: false + multiLink: false, } ], visible: true, @@ -1552,7 +1566,8 @@ export const qinYuPeiYuTouWei = [ disabledDate: true, multiLink: false, dataType: 'date', - dataFormat: 'yyyy-MM-DD' + dataFormat: 'yyyy-MM-DD', + sort: true }, { dataIndexRaw: '', @@ -1604,7 +1619,8 @@ export const qinYuPeiYuTouWei = [ chartColor: '', elementCode: '', disabledDate: true, - multiLink: false + multiLink: false, + sort: true }, { dataIndexRaw: '', @@ -1630,7 +1646,8 @@ export const qinYuPeiYuTouWei = [ chartColor: '', elementCode: '', disabledDate: true, - multiLink: false + multiLink: false, + sort: true }, { dataIndexRaw: '', @@ -1663,7 +1680,8 @@ export const qinYuPeiYuTouWei = [ elementCode: '', disabledDate: true, multiLink: false, - width: 120 + width: 120, + sort: true } ], visible: true, @@ -1737,7 +1755,8 @@ export const qinYuPeiYuTouWei = [ chartColor: '', elementCode: '', disabledDate: true, - multiLink: false + multiLink: false, + sort: true }, { dataIndexRaw: '', @@ -2034,7 +2053,8 @@ export const taoTaiQinYu = [ chartColor: '', elementCode: '', disabledDate: true, - multiLink: false + multiLink: false, + sort: true }, { dataIndexRaw: '', @@ -2060,7 +2080,8 @@ export const taoTaiQinYu = [ chartColor: '', elementCode: '', disabledDate: true, - multiLink: false + multiLink: false, + sort: true }, { dataIndexRaw: '', @@ -2087,7 +2108,8 @@ export const taoTaiQinYu = [ disabledDate: true, multiLink: false, dataType: 'date', - dataFormat: 'yyyy-MM-DD' + dataFormat: 'yyyy-MM-DD', + sort: true }, { dataIndexRaw: '', @@ -2275,7 +2297,8 @@ export const yuLeiRenGo = [ disabledDate: true, multiLink: false, dataType: 'date', - dataFormat: 'yyyy-MM-DD' + dataFormat: 'yyyy-MM-DD', + sort: true }, { dataIndexRaw: '', @@ -2301,12 +2324,13 @@ export const yuLeiRenGo = [ chartColor: '', elementCode: '', disabledDate: true, - multiLink: false + multiLink: false, + sort: true }, { dataIndexRaw: '', key: 'fpitocintypeName', - title: '催产剂种类', + title: '催产剂种类', dataIndex: 'fpitocintypeName', children: [], visible: true, @@ -2327,7 +2351,8 @@ export const yuLeiRenGo = [ chartColor: '', elementCode: '', disabledDate: true, - multiLink: false + multiLink: false, + sort: true }, { dataIndexRaw: '', @@ -2405,7 +2430,8 @@ export const yuLeiRenGo = [ chartColor: '', elementCode: '', disabledDate: true, - multiLink: false + multiLink: false, + sort: true }, { dataIndexRaw: '', @@ -2432,33 +2458,61 @@ export const yuLeiRenGo = [ elementCode: '', disabledDate: true, multiLink: false - }, - { - dataIndexRaw: '', - key: 'dox', - title: '溶解氧(mg/L)', - dataIndex: 'dox', - children: [], - visible: true, - fixed: '', - ellipsis: true, - wrap: false, - dictType: '', - dictCode: '', - dictDatas: {}, - fromType: '', - dataFormat: '', - selectMode: '', - unit: '', - remark: '', - rules: '', - ruleTips: '', - setting: {}, - chartColor: '', - elementCode: '', - disabledDate: true, - multiLink: false - }, + }, + { + dataIndexRaw: '', + key: 'wartem', + title: '水温(℃)', + dataIndex: 'wartem', + children: [], + visible: true, + fixed: '', + ellipsis: true, + wrap: false, + dictType: '', + dictCode: '', + dictDatas: {}, + fromType: '', + dataFormat: '', + selectMode: '', + unit: '', + remark: '', + rules: '', + ruleTips: '', + setting: {}, + chartColor: '', + elementCode: '', + disabledDate: true, + multiLink: false, + sort: true + }, + { + dataIndexRaw: '', + key: 'dox', + title: '溶解氧(mg/L)', + dataIndex: 'dox', + children: [], + visible: true, + fixed: '', + ellipsis: true, + wrap: false, + dictType: '', + dictCode: '', + dictDatas: {}, + fromType: '', + dataFormat: '', + selectMode: '', + unit: '', + remark: '', + rules: '', + ruleTips: '', + setting: {}, + chartColor: '', + elementCode: '', + disabledDate: true, + multiLink: false, + sort: true + }, { dataIndexRaw: '', key: 'recorderName', @@ -2592,7 +2646,8 @@ export const yuLeiShouJin = [ chartColor: '', elementCode: '', disabledDate: true, - multiLink: false + multiLink: false, + sort: true }, { dataIndexRaw: '', @@ -2644,7 +2699,8 @@ export const yuLeiShouJin = [ chartColor: '', elementCode: '', disabledDate: true, - multiLink: false + multiLink: false, + sort: true }, { dataIndexRaw: '', @@ -2722,11 +2778,12 @@ export const yuLeiShouJin = [ chartColor: '', elementCode: '', disabledDate: true, - multiLink: false - }, - { - dataIndexRaw: '', - key: 'outrate', + multiLink: false, + sort: true + }, + { + dataIndexRaw: '', + key: 'outrate', title: '出苗率(%)', dataIndex: 'outrate', children: [], @@ -2748,7 +2805,8 @@ export const yuLeiShouJin = [ chartColor: '', elementCode: '', disabledDate: true, - multiLink: false + multiLink: false, + sort: true }, { dataIndexRaw: '', @@ -2831,7 +2889,8 @@ export const yuleifuhua = [ chartColor: '', elementCode: '', disabledDate: true, - multiLink: false + multiLink: false, + sort: true }, { dataIndexRaw: '', @@ -2868,28 +2927,29 @@ export const yuleifuhua = [ { dataIndexRaw: '', key: 'wartem', - title: '20~30℃', - dataIndex: 'wartem', - children: [], - visible: true, - fixed: '', - ellipsis: true, - wrap: false, - dictType: '', - dictCode: '', - dictDatas: {}, - fromType: '', - dataFormat: '', - selectMode: '', - unit: '', - remark: '', - rules: '', - ruleTips: '', - setting: {}, - chartColor: '', - elementCode: '', - disabledDate: true, - multiLink: false + title: '20~30℃', + dataIndex: 'wartem', + children: [], + visible: true, + fixed: '', + ellipsis: true, + wrap: false, + dictType: '', + dictCode: '', + dictDatas: {}, + fromType: '', + dataFormat: '', + selectMode: '', + unit: '', + remark: '', + rules: '', + ruleTips: '', + setting: {}, + chartColor: '', + elementCode: '', + disabledDate: true, + multiLink: false, + sort: true } ], visible: true, @@ -2942,7 +3002,8 @@ export const yuleifuhua = [ chartColor: '', elementCode: '', disabledDate: true, - multiLink: false + multiLink: false, + sort: true } ], visible: true, @@ -2995,7 +3056,8 @@ export const yuleifuhua = [ chartColor: '', elementCode: '', disabledDate: true, - multiLink: false + multiLink: false, + sort: true } ], visible: true, @@ -3048,7 +3110,8 @@ export const yuleifuhua = [ chartColor: '', elementCode: '', disabledDate: true, - multiLink: false + multiLink: false, + sort: true } ], visible: true, @@ -3122,7 +3185,8 @@ export const yuleifuhua = [ chartColor: '', elementCode: '', disabledDate: true, - multiLink: false + multiLink: false, + sort: true }, { dataIndexRaw: '', @@ -3341,7 +3405,8 @@ export const miaoZhongPeiYu = [ chartColor: '', elementCode: '', disabledDate: true, - multiLink: false + multiLink: false, + sort: true } ], visible: true, @@ -3448,7 +3513,8 @@ export const miaoZhongPeiYu = [ chartColor: '', elementCode: '', disabledDate: true, - multiLink: false + multiLink: false, + sort: true } ], visible: true, @@ -3556,33 +3622,34 @@ export const miaoZhongPeiYu = [ elementCode: '', disabledDate: true, multiLink: false, - width: 180 - } - ], - visible: true, - fixed: '', - ellipsis: true, - wrap: false, - dictType: '', - dictCode: '', - dictDatas: {}, - fromType: '', - dataFormat: '', - selectMode: '', - unit: '', - remark: '', - rules: '', - ruleTips: '', - setting: {}, - chartColor: '', - elementCode: '', - disabledDate: true, - multiLink: false - }, - { - dataIndexRaw: '', - key: '', - title: 'pH', + width: 180, + sort: true + } + ], + visible: true, + fixed: '', + ellipsis: true, + wrap: false, + dictType: '', + dictCode: '', + dictDatas: {}, + fromType: '', + dataFormat: '', + selectMode: '', + unit: '', + remark: '', + rules: '', + ruleTips: '', + setting: {}, + chartColor: '', + elementCode: '', + disabledDate: true, + multiLink: false + }, + { + dataIndexRaw: '', + key: '', + title: 'pH', dataIndex: '', children: [ { @@ -3609,7 +3676,8 @@ export const miaoZhongPeiYu = [ chartColor: '', elementCode: '', disabledDate: true, - multiLink: false + multiLink: false, + sort: true } ], visible: true, @@ -3683,7 +3751,8 @@ export const miaoZhongPeiYu = [ elementCode: '', disabledDate: true, multiLink: false, - notExport: true + notExport: true, + sort: true } ]; //苗种培育记录 @@ -3765,7 +3834,7 @@ export const miaoZhongJiLu = [ chartColor: '', elementCode: '', disabledDate: true, - multiLink: false + multiLink: false, }, { dataIndexRaw: '', @@ -3791,7 +3860,8 @@ export const miaoZhongJiLu = [ chartColor: '', elementCode: '', disabledDate: true, - multiLink: false + multiLink: false, + sort: true }, { dataIndexRaw: '', @@ -3825,7 +3895,8 @@ export const miaoZhongJiLu = [ elementCode: '', disabledDate: true, multiLink: false, - width: 80 + width: 80, + sort: true }, { dataIndexRaw: '', @@ -3852,7 +3923,8 @@ export const miaoZhongJiLu = [ elementCode: '', disabledDate: true, multiLink: false, - width: 80 + width: 80, + sort: true } ], visible: true, @@ -3899,7 +3971,7 @@ export const miaoZhongJiLu = [ chartColor: '', elementCode: '', disabledDate: true, - multiLink: false + multiLink: false, }, { dataIndexRaw: '', @@ -3925,7 +3997,8 @@ export const miaoZhongJiLu = [ chartColor: '', elementCode: '', disabledDate: true, - multiLink: false + multiLink: false, + sort: true }, { dataIndexRaw: '', @@ -3958,7 +4031,8 @@ export const miaoZhongJiLu = [ elementCode: '', disabledDate: true, multiLink: false, - width: 120 + width: 120, + sort: true } ], visible: true, @@ -4141,7 +4215,7 @@ export const yuBingFangZhi = [ chartColor: '', elementCode: '', disabledDate: true, - multiLink: false + multiLink: false, }, { dataIndexRaw: '', @@ -4167,7 +4241,8 @@ export const yuBingFangZhi = [ chartColor: '', elementCode: '', disabledDate: true, - multiLink: false + multiLink: false, + sort: true }, { dataIndexRaw: '', @@ -4271,7 +4346,8 @@ export const yuBingFangZhi = [ chartColor: '', elementCode: '', disabledDate: true, - multiLink: false + multiLink: false, + sort: true }, { dataIndexRaw: '', diff --git a/frontend/src/components/MapModal/index.vue b/frontend/src/components/MapModal/index.vue index 416e0f6f..e48a6dd7 100644 --- a/frontend/src/components/MapModal/index.vue +++ b/frontend/src/components/MapModal/index.vue @@ -482,11 +482,11 @@ const setQGCTabList = async (_tabs: any, stcd: string) => { }); const buid = res?.data?.data[0]?.bldsttCcode; - // debugger + const zj = ['基础信息', '实时视频', '全景影像', '查看报告']; const wj = ['基础信息', '查看报告']; - if (res?.data?.length > 0) { + if (res?.data?.data?.length > 0) { const zJTabData = tabs?.filter((item: any) => zj.includes(item.name)); const wJTabData = tabs?.filter((item: any) => wj.includes(item.name)); tabs = buid == 1 ? zJTabData : buid == 0 ? wJTabData : tabs;