From 06e5aa6a14519efa0bd911bf03e4541f09c2972d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Wed, 5 Jul 2023 15:57:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=9B=91=E6=8E=A7=E7=9C=8B?= =?UTF-8?q?=E6=9D=BF=E7=AC=AC=E4=BA=8C=E4=B8=AA=EF=BC=8C=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/public/version.json | 2 +- .../dataExchangeFromOut_file.vue | 88 ++++++++++--------- 2 files changed, 46 insertions(+), 44 deletions(-) diff --git a/fe/PC/public/version.json b/fe/PC/public/version.json index 3a827c0f8..34a3d0984 100644 --- a/fe/PC/public/version.json +++ b/fe/PC/public/version.json @@ -1,3 +1,3 @@ { - "version": "1.0.44" + "version": "1.0.45" } \ No newline at end of file diff --git a/fe/PC/src/views/interfaceBoard/dataExchangeFromOut_file.vue b/fe/PC/src/views/interfaceBoard/dataExchangeFromOut_file.vue index efb9d88b6..acc7f11f3 100644 --- a/fe/PC/src/views/interfaceBoard/dataExchangeFromOut_file.vue +++ b/fe/PC/src/views/interfaceBoard/dataExchangeFromOut_file.vue @@ -31,7 +31,7 @@ import { LoadingMixins } from "@/mixins/LoadingMixins"; import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"; import { mixins } from "@/mixins/mixins"; - import { getInterfaceBoard,dataExchangeFromOut_file } from "@/api/wms-interface" + import { dataExchangeFromOut_file } from "@/api/wms-interface" export default { name: "dataExchangeFromOut_file", @@ -49,68 +49,70 @@ this.defaultFreshBtn(),//刷新 // this.defaultFilterBtn(),//筛选 ], - setInterfaceBoardTableColumns:this.setTableColumns() + // setInterfaceBoardTableColumns:this.setTableColumns() }; }, mounted() { this.paging(); }, methods: { - setTableColumns(){ - let interfaceBoardColumnsNames = localStorage.getItem("interfaceBoardColumnsNames") - if(!interfaceBoardColumnsNames){ - console.log('获取接口监控看板表头数据并存储') + // setTableColumns(){ + // let interfaceBoardColumnsNames = localStorage.getItem("interfaceBoardColumnsNames") + // if(!interfaceBoardColumnsNames){ + // console.log('获取接口监控看板表头数据并存储') - .catch(err => { - }) - }else{ - let _Dashboard = JSON.parse(localStorage.getItem("interfaceBoardColumnsNames")) // 接口监控看板 - return [ - { label: '11111', prop: "number" }, - { label: _Dashboard.ArchivedOutgoingToExternalNumber, prop: "number" }, - { label: _Dashboard.ArchivedOutgoingToExternalRemark, prop: "remark", type:"showDetail" }, - { label: _Dashboard.ArchivedOutgoingToExternalDataType, prop: "dataType" }, - { label: _Dashboard.ArchivedOutgoingToExternalTableType, prop: "tableType" }, - { label: _Dashboard.ArchivedOutgoingToExternalDataAction, prop: "dataAction" }, - { label: _Dashboard.ArchivedOutgoingToExternalEffectiveDate, prop: "effectiveDate",type:'dateTime' }, - { label: _Dashboard.ArchivedOutgoingToExternalStatus, prop: "status" }, - { label: _Dashboard.ArchivedOutgoingToExternalSourceSystem, prop: "sourceSystem" }, - { label: _Dashboard.ArchivedOutgoingToExternalSourceDataId, prop: "sourceDataId" }, - { label: _Dashboard.ArchivedOutgoingToExternalSourceDataGroupCode, prop: "sourceDataGroupCode" }, - { label: _Dashboard.ArchivedOutgoingToExternalSourceDataDetailCode, prop: "sourceDataDetailCode" }, - { label: _Dashboard.ArchivedOutgoingToExternalSourceDataContent, prop: "sourceDataContent", type:"showJsonTable" }, - { label: _Dashboard.ArchivedOutgoingToExternalWriteTime, prop: "writeTime",type:'dateTime' }, - { label: _Dashboard.ArchivedOutgoingToExternalWriter, prop: "writer" }, - { label: _Dashboard.ArchivedOutgoingToExternalDestinationSystem, prop: "destinationSystem" }, - { label: _Dashboard.ArchivedOutgoingToExternalDestinationDataId, prop: "destinationDataId" }, - { label: _Dashboard.ArchivedOutgoingToExternalDestinationDataContent, prop: "destinationDataContent", type:"showJsonTable" }, - { label: _Dashboard.ArchivedOutgoingToExternalReadTime, prop: "readTime",type:'dateTime' }, - { label: _Dashboard.ArchivedOutgoingToExternalReader, prop: "reader" }, - { label: _Dashboard.ArchivedOutgoingToExternalErrorCode, prop: "errorCode" }, - { label: _Dashboard.ArchivedOutgoingToExternalErrorMessage, prop: "errorMessage", type:"showDetail" }, - { label: _Dashboard.ArchivedOutgoingToExternalRetryTimes, prop: "retryTimes" }, - // ************** 暂时隐藏 ************************ - // { label: _Public.creationTime, prop: "creationTime",type:'dateTime' }, - // { label: _Public.creatorId, prop: "creatorId" }, - // { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' }, - // { label: _Public.lastModifierId, prop: "lastModifierId" }, - // { label: _Public.ID, prop: "ID" }, - ] - } + // .catch(err => { + // }) + // }else{ + // let _Dashboard = JSON.parse(localStorage.getItem("interfaceBoardColumnsNames")) // 接口监控看板 + // return [ + // { label: '11111', prop: "number" }, + // { label: _Dashboard.ArchivedOutgoingToExternalNumber, prop: "number" }, + // { label: _Dashboard.ArchivedOutgoingToExternalRemark, prop: "remark", type:"showDetail" }, + // { label: _Dashboard.ArchivedOutgoingToExternalDataType, prop: "dataType" }, + // { label: _Dashboard.ArchivedOutgoingToExternalTableType, prop: "tableType" }, + // { label: _Dashboard.ArchivedOutgoingToExternalDataAction, prop: "dataAction" }, + // { label: _Dashboard.ArchivedOutgoingToExternalEffectiveDate, prop: "effectiveDate",type:'dateTime' }, + // { label: _Dashboard.ArchivedOutgoingToExternalStatus, prop: "status" }, + // { label: _Dashboard.ArchivedOutgoingToExternalSourceSystem, prop: "sourceSystem" }, + // { label: _Dashboard.ArchivedOutgoingToExternalSourceDataId, prop: "sourceDataId" }, + // { label: _Dashboard.ArchivedOutgoingToExternalSourceDataGroupCode, prop: "sourceDataGroupCode" }, + // { label: _Dashboard.ArchivedOutgoingToExternalSourceDataDetailCode, prop: "sourceDataDetailCode" }, + // { label: _Dashboard.ArchivedOutgoingToExternalSourceDataContent, prop: "sourceDataContent", type:"showJsonTable" }, + // { label: _Dashboard.ArchivedOutgoingToExternalWriteTime, prop: "writeTime",type:'dateTime' }, + // { label: _Dashboard.ArchivedOutgoingToExternalWriter, prop: "writer" }, + // { label: _Dashboard.ArchivedOutgoingToExternalDestinationSystem, prop: "destinationSystem" }, + // { label: _Dashboard.ArchivedOutgoingToExternalDestinationDataId, prop: "destinationDataId" }, + // { label: _Dashboard.ArchivedOutgoingToExternalDestinationDataContent, prop: "destinationDataContent", type:"showJsonTable" }, + // { label: _Dashboard.ArchivedOutgoingToExternalReadTime, prop: "readTime",type:'dateTime' }, + // { label: _Dashboard.ArchivedOutgoingToExternalReader, prop: "reader" }, + // { label: _Dashboard.ArchivedOutgoingToExternalErrorCode, prop: "errorCode" }, + // { label: _Dashboard.ArchivedOutgoingToExternalErrorMessage, prop: "errorMessage", type:"showDetail" }, + // { label: _Dashboard.ArchivedOutgoingToExternalRetryTimes, prop: "retryTimes" }, + // // ************** 暂时隐藏 ************************ + // // { label: _Public.creationTime, prop: "creationTime",type:'dateTime' }, + // // { label: _Public.creatorId, prop: "creatorId" }, + // // { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' }, + // // { label: _Public.lastModifierId, prop: "lastModifierId" }, + // // { label: _Public.ID, prop: "ID" }, + // ] + // } - }, + // }, //渲染数据 paging(callback) { this.Loading.tableLoading = true; this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount, dataExchangeFromOut_file(this.PageListParams) .then(result => { + console.log(108) let res = result.data this.tableData = res.items this.totalCount = res.totalCount this.pagingCallback(callback) }) .catch(err => { + console.log(115) this.Loading.tableLoading = false }) },