diff --git a/PC/InterFace.Dash/public/config.js b/PC/InterFace.Dash/public/config.js index 6d83859..379690e 100644 --- a/PC/InterFace.Dash/public/config.js +++ b/PC/InterFace.Dash/public/config.js @@ -2,8 +2,6 @@ window.SITE_CONFIG['base'] = 'http://dev.ccwin-in.com:60068' // window.SITE_CONFIG['base'] = 'http://192.168.0.180:60068' window.SITE_CONFIG['businessApi'] = 'http://dev.ccwin-in.com:10097' -window.SITE_CONFIG['columnsApiNames'] = '/api/abp/application-localization' -// window.SITE_CONFIG['columnsApiNames'] = '/api/abp/application-configuration' window.SITE_CONFIG['columnsApiNamesZh'] = 'Z' window.SITE_CONFIG['isAutoLogin'] = true window.SITE_CONFIG['isSinglePage'] = false diff --git a/PC/InterFace.Dash/src/App.vue b/PC/InterFace.Dash/src/App.vue index 336d582..8547b75 100644 --- a/PC/InterFace.Dash/src/App.vue +++ b/PC/InterFace.Dash/src/App.vue @@ -10,7 +10,6 @@ export default { } localStorage.setItem('base',window.SITE_CONFIG['base']) localStorage.setItem('businessApi',window.SITE_CONFIG['businessApi']) -localStorage.setItem('columnsApiNames',window.SITE_CONFIG['columnsApiNames']) localStorage.setItem('columnsApiNamesZh',window.SITE_CONFIG['columnsApiNamesZh']) localStorage.setItem('isAutoLogin',window.SITE_CONFIG['isAutoLogin']) localStorage.setItem('isSinglePage',window.SITE_CONFIG['isSinglePage']) diff --git a/PC/InterFace.Dash/src/api/wms-interface.js b/PC/InterFace.Dash/src/api/wms-interface.js index a7b6ee8..35e863e 100644 --- a/PC/InterFace.Dash/src/api/wms-interface.js +++ b/PC/InterFace.Dash/src/api/wms-interface.js @@ -1,13 +1,12 @@ // 接口监控看板相关api import request from '@/utils/request' let base_api = localStorage.getItem('base') -let colum_url = localStorage.getItem('columnsApiNames') -// 获取表头数据 +// 获取表头zh转义数据 export function getInterfaceBoard() { return request({ method:'get', - url: base_api + colum_url, + url: base_api + '/api/abp/application-localization', params:{ CultureName:localStorage.getItem('browserLanguage'), OnlyDynamics:false @@ -25,20 +24,11 @@ export function getDefinitionMenu(IncludeTypes) { }) } -// 获取枚举数据 -export async function getApiEnumList() { +// 获取枚举数据/dto列类型等所有配置 +export async function getApiDefinition() { return request({ method:'get', url: base_api + '/api/abp/api-definition', params:{IncludeTypes:true} }) } - -// 获取dto列数据 -export async function getDtoColumnType(api) { - if(!api)return - return request({ - method:'post', - url: base_api + '/api/'+ api +'/get-dto-column-type', - }) -} \ No newline at end of file diff --git a/PC/InterFace.Dash/src/components/filterForDetailPage/index.vue b/PC/InterFace.Dash/src/components/filterForDetailPage/index.vue index 4cbc7e9..db61bae 100644 --- a/PC/InterFace.Dash/src/components/filterForDetailPage/index.vue +++ b/PC/InterFace.Dash/src/components/filterForDetailPage/index.vue @@ -16,12 +16,13 @@ > { - // 表头处理 - if(allData[0]){ + getPageListForDetail(this.PageListParams,this.URLOption_detailList) + .then(res=>{ + // 表头处理 let _parentName = this.URLOption_detailList.substr(0,this.URLOption_detailList.indexOf('/')) - let _Columns = this.initApiColumnsForDto(allData[0],allData[1].items[0],_parentName) + let _Columns = this.initApiColumnsForDto(res.items[0],_parentName) this.listColumns = this.initTableColumns(_Columns) - } - // 页面数据处理 - if(allData[1]){ - this.Loading.tableLoading = false - this.tableData = [] - allData[1].items.forEach(item=>{ - item.deleteTipVisible = false - this.tableData.push(item) - }) + // 页面数据处理 + if(res){ + this.Loading.tableLoading = false + this.tableData = [] + res.items.forEach(item=>{ + item.deleteTipVisible = false + this.tableData.push(item) + }) + this.totalCount = res.totalCount + } this.pagingCallback(callback) - this.totalCount = allData[1].totalCount - } - this.pagingCallback(callback) - }).catch(()=>{ - this.Loading.tableLoading = false - this.$message.error("数据获取失败") - }) + }) + .catch(err=>{ + this.Loading.tableLoading = false + this.$message.error("数据获取失败") + }) }, // 查看主表信息 showParentHandleForDetail(data){ @@ -318,15 +318,15 @@ methods: { \ No newline at end of file diff --git a/PC/InterFace.Dash/src/components/tablePagination/index.vue b/PC/InterFace.Dash/src/components/tablePagination/index.vue index 7aa12d8..c0238bc 100644 --- a/PC/InterFace.Dash/src/components/tablePagination/index.vue +++ b/PC/InterFace.Dash/src/components/tablePagination/index.vue @@ -36,6 +36,7 @@ :visible="rowDropVisible" @closeRowDrop="closeRowDrop" :source="rowSource" + :innerMaxHeight="rowMaxHeight" >
@@ -90,6 +91,10 @@ export default { rowDrop }, props: { + rowMaxHeight:{ + type:String, + default:'calc(90vh - 280px)' + }, // 筛选高度 searchOverallCoverHeight:{ type: String, diff --git a/PC/InterFace.Dash/src/components/umyTable/index.vue b/PC/InterFace.Dash/src/components/umyTable/index.vue index fa03c13..048ffc0 100644 --- a/PC/InterFace.Dash/src/components/umyTable/index.vue +++ b/PC/InterFace.Dash/src/components/umyTable/index.vue @@ -86,7 +86,7 @@