From 0c396fa28b54f0b08a6606284ea2fe3b1a976503 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Fri, 7 Jul 2023 11:45:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E6=8E=A5=E5=8F=A3=E7=9C=8B?= =?UTF-8?q?=E6=9D=BF=E5=A4=B4=E9=83=A8=E8=B5=B0=E6=8E=A5=E5=8F=A3=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/public/config.js | 2 - fe/PC/src/App.vue | 1 - fe/PC/src/api/wms-interface.js | 68 --- .../components/filterForDetailPage/index.vue | 197 --------- fe/PC/src/lang/zh.js | 51 ++- fe/PC/src/permission.js | 8 - fe/PC/src/router/index.js | 30 +- .../isLocalApiDetailsTableColumns/index.js | 26 -- .../src/utils/isLocalApiTableColums/index.js | 252 ----------- .../utils/isLocalApiTableDesTions/index.js | 252 ----------- fe/PC/src/utils/tableColumns/index.js | 228 ++++++++++ fe/PC/src/utils/tableColumns/index_new.js | 7 - fe/PC/src/utils/utils.js | 2 - fe/PC/src/views/interfaceBoard/TestSchool.vue | 407 ------------------ .../views/interfaceBoard/comingFromOut.vue | 6 +- .../interfaceBoard/comingFromOut_file.vue | 6 +- .../src/views/interfaceBoard/comingToWms.vue | 6 +- .../views/interfaceBoard/comingToWms_file.vue | 6 +- .../interfaceBoard/dataExchangeFromOut.vue | 6 +- .../dataExchangeFromOut_file.vue | 6 +- .../interfaceBoard/dataExchangeFromWms.vue | 6 +- .../dataExchangeFromWms_file.vue | 6 +- fe/PC/src/views/login/index.vue | 15 +- 23 files changed, 278 insertions(+), 1316 deletions(-) delete mode 100644 fe/PC/src/components/filterForDetailPage/index.vue delete mode 100644 fe/PC/src/utils/isLocalApiDetailsTableColumns/index.js delete mode 100644 fe/PC/src/utils/isLocalApiTableColums/index.js delete mode 100644 fe/PC/src/utils/isLocalApiTableDesTions/index.js delete mode 100644 fe/PC/src/views/interfaceBoard/TestSchool.vue diff --git a/fe/PC/public/config.js b/fe/PC/public/config.js index 9d7a91b52..99679ba8a 100644 --- a/fe/PC/public/config.js +++ b/fe/PC/public/config.js @@ -24,8 +24,6 @@ window.SITE_CONFIG['companyName'] = '长春一汽富维东阳汽车塑料零部 // 接口看板地址 window.SITE_CONFIG['interfaceBoardUrl'] = 'http://dev.ccwin-in.com:60090/' // window.SITE_CONFIG['interfaceBoardUrl'] = 'http://dev.ccwin-in.com:60069/' -// 接口看板表头获取地址 -window.SITE_CONFIG['interfaceBoardColumnsApi'] = 'api/abp/application-configuration' // mock // window.SITE_CONFIG['apifoxToken'] = 'NXHNi5mp0dnUHGt0wkCrjvfcidsFKV33' diff --git a/fe/PC/src/App.vue b/fe/PC/src/App.vue index c52b9824e..124f1fd8a 100644 --- a/fe/PC/src/App.vue +++ b/fe/PC/src/App.vue @@ -18,7 +18,6 @@ localStorage.setItem('apifoxToken',window.SITE_CONFIG['apifoxToken']) localStorage.setItem('reportsUrl',window.SITE_CONFIG['reportsUrl']) localStorage.setItem('companyName',window.SITE_CONFIG['companyName']) localStorage.setItem('interfaceBoardUrl',window.SITE_CONFIG['interfaceBoardUrl']) -localStorage.setItem('interfaceBoardColumnsApi',window.SITE_CONFIG['interfaceBoardColumnsApi']) \ No newline at end of file diff --git a/fe/PC/src/lang/zh.js b/fe/PC/src/lang/zh.js index a0fc0101c..53102b095 100644 --- a/fe/PC/src/lang/zh.js +++ b/fe/PC/src/lang/zh.js @@ -89,30 +89,29 @@ export default { }, // 接口监控看板 - // 现使用接口数据：config文件中【interfaceBoardUrl】+【interfaceBoardColumnsApi】地址 - // ColumsDashboard:{ - // number:'编号', - // dataType:'数据类型', - // tableType:'数据表类型', - // dataAction:'数据动作', - // effectiveDate:'生效时间', - // status:'数据状态', - // dataIdentityCode:'数据识别码', - // dataContent:'数据内容', - // sourceSystem:'来源系统', - // sourceDataId:'来源数据ID', - // sourceDataGroupCode:'来源数据组码', - // sourceDataDetailCode:'来源数据明细码', - // sourceDataContent:'来源数据内容', - // writeTime:'写入时间', - // writer:'写入者', - // destinationSystem:'目标系统', - // destinationDataId:'目标数据ID', - // destinationDataContent:'目标数据内容', - // readTime:'读取时间', - // reader:'读取者', - // errorCode:'错误代码', - // errorMessage:'错误信息', - // retryTimes:'重试次数', - // } + ColumsDashboard:{ + number:'编号', + dataType:'数据类型', + tableType:'数据表类型', + dataAction:'数据动作', + effectiveDate:'生效时间', + status:'数据状态', + dataIdentityCode:'数据识别码', + dataContent:'数据内容', + sourceSystem:'来源系统', + sourceDataId:'来源数据ID', + sourceDataGroupCode:'来源数据组码', + sourceDataDetailCode:'来源数据明细码', + sourceDataContent:'来源数据内容', + writeTime:'写入时间', + writer:'写入者', + destinationSystem:'目标系统', + destinationDataId:'目标数据ID', + destinationDataContent:'目标数据内容', + readTime:'读取时间', + reader:'读取者', + errorCode:'错误代码', + errorMessage:'错误信息', + retryTimes:'重试次数', + } } diff --git a/fe/PC/src/permission.js b/fe/PC/src/permission.js index 6a1e49a47..259e30db3 100644 --- a/fe/PC/src/permission.js +++ b/fe/PC/src/permission.js @@ -58,14 +58,6 @@ router.beforeEach(async (to, from, next) => { // get user info // note: roles must be a object array! such as: ['admin'] or ,['developer','editor'] - // 如果缓存中没有 interfaceBoardColumnsNames(接口监控看板表头信息) 的缓存数据 则退出登录 - let _interfaceBoardColumnsNames = localStorage.getItem("interfaceBoardColumnsNames") - if(!_interfaceBoardColumnsNames || _interfaceBoardColumnsNames == 'undefined' || _interfaceBoardColumnsNames == 'null'){ - await store.dispatch('user/logout') - next(`/login?redirect=${to.path}`) - NProgress.done() - } - const { roles } = await store.dispatch('user/getInfo') diff --git a/fe/PC/src/router/index.js b/fe/PC/src/router/index.js index b00fe8ba6..347489245 100644 --- a/fe/PC/src/router/index.js +++ b/fe/PC/src/router/index.js @@ -137,21 +137,21 @@ export const constantRoutes = [ // }, // 开发中模拟路由 - { - path: '/', - component: Layout, - redirect: '/TestSchool', - hidden: true, - children: [{ - path: 'TestSchool', - component: () => import('@/views/interfaceBoard/TestSchool.vue'), - name: 'TestSchool', - meta: { - title: 'TestSchool', - icon: '拆分记录', - } - }] - }, + // { + // path: '/', + // component: Layout, + // redirect: '/TestSchool', + // hidden: true, + // children: [{ + // path: 'TestSchool', + // component: () => import('@/views/interfaceBoard/TestSchool.vue'), + // name: 'TestSchool', + // meta: { + // title: 'TestSchool', + // icon: '拆分记录', + // } + // }] + // }, // { // path: '/', // component: Layout, diff --git a/fe/PC/src/utils/isLocalApiDetailsTableColumns/index.js b/fe/PC/src/utils/isLocalApiDetailsTableColumns/index.js deleted file mode 100644 index ddd34a333..000000000 --- a/fe/PC/src/utils/isLocalApiDetailsTableColumns/index.js +++ /dev/null @@ -1,26 +0,0 @@ -//全局从接口缓存的明细（如：接口监控看板） -// import { getInterfaceBoard } from "@/api/wms-interface" - -// getList = () => { -// getInterfaceBoard().then(result => { - -// localStorage.setItem("interfaceBoardColumnsNames", JSON.stringify(result.data.localization.values.Dashboard)); -// }) -// .catch(err => { -// }) -// } -let _Dashboard = localStorage.getItem("interfaceBoardColumnsNames") -if(_Dashboard && _Dashboard != 'undefined' && _Dashboard != 'null') { - _Dashboard = JSON.parse(localStorage.getItem("interfaceBoardColumnsNames")) -} -// 用于如果没有表头数据时候报错问题处理 -const initDashboardLable = (data) => { - return _Dashboard ? _Dashboard[data] : null -} - -// 测试数据 -export const TestSchool = [ - { label: '学生33', prop: "studentName" }, - { label: 'orderType33', prop: "orderType" }, - { label: '创建时间33', prop: "creationTime", type:'dateTime' }, -] \ No newline at end of file diff --git a/fe/PC/src/utils/isLocalApiTableColums/index.js b/fe/PC/src/utils/isLocalApiTableColums/index.js deleted file mode 100644 index 76c1d2945..000000000 --- a/fe/PC/src/utils/isLocalApiTableColums/index.js +++ /dev/null @@ -1,252 +0,0 @@ -//全局从接口缓存的表头（如：接口监控看板） -// import { getInterfaceBoard } from "@/api/wms-interface" - -// getList = () => { -// getInterfaceBoard().then(result => { - -// localStorage.setItem("interfaceBoardColumnsNames", JSON.stringify(result.data.localization.values.Dashboard)); -// }) -// .catch(err => { -// }) -// } -let _Dashboard = localStorage.getItem("interfaceBoardColumnsNames") -if(_Dashboard && _Dashboard != 'undefined' && _Dashboard != 'null') { - _Dashboard = JSON.parse(localStorage.getItem("interfaceBoardColumnsNames")) -} -// 用于如果没有表头数据时候报错问题处理 -const initDashboardLable = (data) => { - return _Dashboard ? _Dashboard[data] : null -} - -// 1外部数据转换 -export const dataExchangeFromOut = [ - { label: initDashboardLable('OutgoingToExternalNumber'), prop: "number" }, - { label: initDashboardLable('OutgoingToExternalRemark'), prop: "remark", type:"showDetail" }, - { label: initDashboardLable('OutgoingToExternalDataType'), prop: "dataType", type:"showDetail" }, - { label: initDashboardLable('OutgoingToExternalTableType'), prop: "tableType" }, - { label: initDashboardLable('OutgoingToExternalDataAction'), prop: "dataAction" }, - { label: initDashboardLable('OutgoingToExternalEffectiveDate'), prop: "effectiveDate",type:'dateTime' }, - { label: initDashboardLable('OutgoingToExternalStatus'), prop: "status" }, - { label: initDashboardLable('OutgoingToExternalSourceSystem'), prop: "sourceSystem", type:"showDetail" }, - { label: initDashboardLable('OutgoingToExternalSourceDataId'), prop: "sourceDataId" }, - { label: initDashboardLable('OutgoingToExternalSourceDataGroupCode'), prop: "sourceDataGroupCode", type:"showDetail" }, - { label: initDashboardLable('OutgoingToExternalSourceDataDetailCode'), prop: "sourceDataDetailCode", type:"showDetail" }, - { label: initDashboardLable('OutgoingToExternalSourceDataContent'), prop: "sourceDataContent", type:"showJsonTable" }, - { label: initDashboardLable('OutgoingToExternalWriteTime'), prop: "writeTime",type:'dateTime' }, - { label: initDashboardLable('OutgoingToExternalWriter'), prop: "writer" }, - { label: initDashboardLable('OutgoingToExternalDestinationSystem'), prop: "destinationSystem", type:"showDetail" }, - { label: initDashboardLable('OutgoingToExternalDestinationDataId'), prop: "destinationDataId" }, - { label: initDashboardLable('OutgoingToExternalDestinationDataContent'), prop: "destinationDataContent", type:"showJsonTable" }, - { label: initDashboardLable('OutgoingToExternalReadTime'), prop: "readTime",type:'dateTime' }, - { label: initDashboardLable('OutgoingToExternalReader'), prop: "reader" }, - { label: initDashboardLable('OutgoingToExternalErrorCode'), prop: "errorCode" }, - { label: initDashboardLable('OutgoingToExternalErrorMessage'), prop: "errorMessage", type:"showDetail" }, - { label: initDashboardLable('OutgoingToExternalRetryTimes'), 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" }, -] - -// 2归档外部数据转换 -export const dataExchangeFromOut_file = [ - { label: initDashboardLable('ArchivedOutgoingToExternalNumber'), prop: "number" }, - { label: initDashboardLable('ArchivedOutgoingToExternalRemark'), prop: "remark", type:"showDetail" }, - { label: initDashboardLable('ArchivedOutgoingToExternalDataType'), prop: "dataType" }, - { label: initDashboardLable('ArchivedOutgoingToExternalTableType'), prop: "tableType" }, - { label: initDashboardLable('ArchivedOutgoingToExternalDataAction'), prop: "dataAction" }, - { label: initDashboardLable('ArchivedOutgoingToExternalEffectiveDate'), prop: "effectiveDate",type:'dateTime' }, - { label: initDashboardLable('ArchivedOutgoingToExternalStatus'), prop: "status" }, - { label: initDashboardLable('ArchivedOutgoingToExternalSourceSystem'), prop: "sourceSystem" }, - { label: initDashboardLable('ArchivedOutgoingToExternalSourceDataId'), prop: "sourceDataId" }, - { label: initDashboardLable('ArchivedOutgoingToExternalSourceDataGroupCode'), prop: "sourceDataGroupCode" }, - { label: initDashboardLable('ArchivedOutgoingToExternalSourceDataDetailCode'), prop: "sourceDataDetailCode" }, - { label: initDashboardLable('ArchivedOutgoingToExternalSourceDataContent'), prop: "sourceDataContent", type:"showJsonTable" }, - { label: initDashboardLable('ArchivedOutgoingToExternalWriteTime'), prop: "writeTime",type:'dateTime' }, - { label: initDashboardLable('ArchivedOutgoingToExternalWriter'), prop: "writer" }, - { label: initDashboardLable('ArchivedOutgoingToExternalDestinationSystem'), prop: "destinationSystem" }, - { label: initDashboardLable('ArchivedOutgoingToExternalDestinationDataId'), prop: "destinationDataId" }, - { label: initDashboardLable('ArchivedOutgoingToExternalDestinationDataContent'), prop: "destinationDataContent", type:"showJsonTable" }, - { label: initDashboardLable('ArchivedOutgoingToExternalReadTime'), prop: "readTime",type:'dateTime' }, - { label: initDashboardLable('ArchivedOutgoingToExternalReader'), prop: "reader" }, - { label: initDashboardLable('ArchivedOutgoingToExternalErrorCode'), prop: "errorCode" }, - { label: initDashboardLable('ArchivedOutgoingToExternalErrorMessage'), prop: "errorMessage", type:"showDetail" }, - { label: initDashboardLable('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" }, -] - -// 3WMS数据接收 -export const comingToWms = [ - { label: initDashboardLable('IncomingToWmsNumber'), prop: "number" }, - { label: initDashboardLable('IncomingToWmsRemark'), prop: "remark", type:"showDetail" }, - { label: initDashboardLable('IncomingToWmsDataType'), prop: "dataType" }, - { label: initDashboardLable('IncomingToWmsDataAction'), prop: "dataAction" }, - { label: initDashboardLable('IncomingToWmsEffectiveDate'), prop: "effectiveDate",type:'dateTime' }, - { label: initDashboardLable('IncomingToWmsStatus'), prop: "status" }, - { label: initDashboardLable('IncomingToWmsDataIdentityCode'), prop: "dataIdentityCode" }, - { label: initDashboardLable('IncomingToWmsDataContent'), prop: "dataContent", type:"showJsonTable" }, - { label: initDashboardLable('IncomingToWmsSourceSystem'), prop: "sourceSystem" }, - { label: initDashboardLable('IncomingToWmsWriteTime'), prop: "writeTime",type:'dateTime' }, - { label: initDashboardLable('IncomingToWmsReadTime'), prop: "readTime",type:'dateTime' }, - { label: initDashboardLable('IncomingToWmsErrorCode'), prop: "errorCode" }, - { label: initDashboardLable('IncomingToWmsErrorMessage'), prop: "errorMessage", type:"showDetail" }, - { label: initDashboardLable('IncomingToWmsRetryTimes'), 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" }, -] - -// 4归档WMS数据接收 -export const comingToWms_file = [ - { label: initDashboardLable('ArchivedIncomingToWmsNumber'), prop: "number" }, - { label: initDashboardLable('ArchivedIncomingToWmsRemark'), prop: "remark", type:"showDetail" }, - { label: initDashboardLable('ArchivedIncomingToWmsDataType'), prop: "dataType" }, - { label: initDashboardLable('ArchivedIncomingToWmsDataAction'), prop: "dataAction" }, - { label: initDashboardLable('ArchivedIncomingToWmsEffectiveDate'), prop: "effectiveDate",type:'dateTime' }, - { label: initDashboardLable('ArchivedIncomingToWmsStatus'), prop: "status" }, - { label: initDashboardLable('ArchivedIncomingToWmsDataIdentityCode'), prop: "dataIdentityCode" }, - { label: initDashboardLable('ArchivedIncomingToWmsDataContent'), prop: "dataContent", type:"showJsonTable" }, - { label: initDashboardLable('ArchivedIncomingToWmsSourceSystem'), prop: "sourceSystem" }, - { label: initDashboardLable('ArchivedIncomingToWmsWriteTime'), prop: "writeTime",type:'dateTime' }, - { label: initDashboardLable('ArchivedIncomingToWmsReadTime'), prop: "readTime",type:'dateTime' }, - { label: initDashboardLable('ArchivedIncomingToWmsErrorCode'), prop: "errorCode" }, - { label: initDashboardLable('ArchivedIncomingToWmsErrorMessage'), prop: "errorMessage", type:"showDetail" }, - { label: initDashboardLable('ArchivedIncomingToWmsRetryTimes'), 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" }, -] - -// 5WMS数据转换 -export const dataExchangeFromWms = [ - { label: initDashboardLable('DataExchange_OutgoingFromWmsNumber'), prop: "number" }, - { label: initDashboardLable('DataExchange_OutgoingFromWmsRemark'), prop: "remark", type:"showDetail" }, - { label: initDashboardLable('DataExchange_OutgoingFromWmsDataType'), prop: "dataType" }, - { label: initDashboardLable('DataExchange_OutgoingFromWmsDataAction'), prop: "dataAction" }, - { label: initDashboardLable('DataExchange_OutgoingFromWmsEffectiveDate'), prop: "effectiveDate",type:'dateTime' }, - { label: initDashboardLable('DataExchange_OutgoingFromWmsStatus'), prop: "status" }, - { label: initDashboardLable('DataExchange_OutgoingFromWmsDataIdentityCode'), prop: "dataIdentityCode" }, - { label: initDashboardLable('DataExchange_OutgoingFromWmsDataContent'), prop: "dataContent", type:"showJsonTable" }, - { label: initDashboardLable('DataExchange_OutgoingFromWmsSourceSystem'), prop: "sourceSystem" }, - { label: initDashboardLable('DataExchange_OutgoingFromWmsWriteTime'), prop: "writeTime",type:'dateTime' }, - { label: initDashboardLable('DataExchange_OutgoingFromWmsDestinationSystem'), prop: "destinationSystem" }, - { label: initDashboardLable('DataExchange_OutgoingFromWmsReadTime'), prop: "readTime",type:'dateTime' }, - { label: initDashboardLable('DataExchange_OutgoingFromWmsErrorCode'), prop: "errorCode" }, - { label: initDashboardLable('DataExchange_OutgoingFromWmsErrorMessage'), prop: "errorMessage", type:"showDetail" }, - { label: initDashboardLable('DataExchange_OutgoingFromWmsRetryTimes'), 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" }, -] - -// 6归档WMS数据转换 -export const dataExchangeFromWms_file = [ - { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsNumber'), prop: "number" }, - { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsRemark'), prop: "remark", type:"showDetail" }, - { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsDataType'), prop: "dataType" }, - { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsDataAction'), prop: "dataAction" }, - { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsEffectiveDate'), prop: "effectiveDate",type:'dateTime' }, - { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsStatus'), prop: "status" }, - { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsDataIdentityCode'), prop: "dataIdentityCode" }, - { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsDataContent'), prop: "dataContent", type:"showJsonTable" }, - { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsSourceSystem'), prop: "sourceSystem" }, - { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsWriteTime'), prop: "writeTime",type:'dateTime' }, - // { label: _Dashboard.destinationSystem, prop: "destinationSystem" }, - { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsReadTime'), prop: "readTime",type:'dateTime' }, - { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsErrorCode'), prop: "errorCode" }, - { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsErrorMessage'), prop: "errorMessage", type:"showDetail" }, - { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsRetryTimes'), 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" }, -] - -// 7外部数据接收 -export const comingFromOut = [ - { label: initDashboardLable('DataExchange_IncomingFromExternalNumber'), prop: "number" }, - { label: initDashboardLable('DataExchange_IncomingFromExternalRemark'), prop: "remark", type:"showDetail" }, - { label: initDashboardLable('DataExchange_IncomingFromExternalDataType'), prop: "dataType" }, - { label: initDashboardLable('DataExchange_IncomingFromExternalTableType'), prop: "tableType" }, - { label: initDashboardLable('DataExchange_IncomingFromExternalDataAction'), prop: "dataAction" }, - { label: initDashboardLable('DataExchange_IncomingFromExternalEffectiveDate'), prop: "effectiveDate",type:'dateTime' }, - { label: initDashboardLable('DataExchange_IncomingFromExternalStatus'), prop: "status" }, - { label: initDashboardLable('DataExchange_IncomingFromExternalSourceSystem'), prop: "sourceSystem" }, - { label: initDashboardLable('DataExchange_IncomingFromExternalSourceDataId'), prop: "sourceDataId" }, - { label: initDashboardLable('DataExchange_IncomingFromExternalSourceDataGroupCode'), prop: "sourceDataGroupCode" }, - { label: initDashboardLable('DataExchange_IncomingFromExternalSourceDataDetailCode'), prop: "sourceDataDetailCode" }, - { label: initDashboardLable('DataExchange_IncomingFromExternalSourceDataContent'), prop: "sourceDataContent", type:"showJsonTable" }, - { label: initDashboardLable('DataExchange_IncomingFromExternalWriteTime'), prop: "writeTime",type:'dateTime' }, - { label: initDashboardLable('DataExchange_IncomingFromExternalWriter'), prop: "writer" }, - { label: initDashboardLable('DataExchange_IncomingFromExternalDestinationSystem'), prop: "destinationSystem" }, - { label: initDashboardLable('DataExchange_IncomingFromExternalDestinationDataId'), prop: "destinationDataId" }, - { label: initDashboardLable('DataExchange_IncomingFromExternalDestinationDataContent'), prop: "destinationDataContent", type:"showJsonTable" }, - { label: initDashboardLable('DataExchange_IncomingFromExternalReadTime'), prop: "readTime",type:'dateTime' }, - { label: initDashboardLable('DataExchange_IncomingFromExternalReader'), prop: "reader" }, - { label: initDashboardLable('DataExchange_IncomingFromExternalErrorCode'), prop: "errorCode" }, - { label: initDashboardLable('DataExchange_IncomingFromExternalErrorMessage'), prop: "errorMessage", type:"showDetail" }, - { label: initDashboardLable('DataExchange_IncomingFromExternalRetryTimes'), 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" }, -] - -// 8归档外部数据接收 -export const comingFromOut_file = [ - { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalNumber'), prop: "number" }, - { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalRemark'), prop: "remark", type:"showDetail" }, - { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalDataType'), prop: "dataType" }, - { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalTableType'), prop: "tableType" }, - { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalDataAction'), prop: "dataAction" }, - { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalEffectiveDate'), prop: "effectiveDate",type:'dateTime' }, - { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalStatus'), prop: "status" }, - { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalSourceSystem'), prop: "sourceSystem" }, - { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalSourceDataId'), prop: "sourceDataId" }, - { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalSourceDataGroupCode'), prop: "sourceDataGroupCode" }, - { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalSourceDataDetailCode'), prop: "sourceDataDetailCode" }, - { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalSourceDataContent'), prop: "sourceDataContent", type:"showJsonTable" }, - { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalWriteTime'), prop: "writeTime",type:'dateTime' }, - { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalWriter'), prop: "writer" }, - { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalDestinationSystem'), prop: "destinationSystem" }, - { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalDestinationDataId'), prop: "destinationDataId" }, - { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalDestinationDataContent'), prop: "destinationDataContent", type:"showJsonTable" }, - { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalReadTime'), prop: "readTime",type:'dateTime' }, - { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalReader'), prop: "reader" }, - { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalErrorCode'), prop: "errorCode" }, - { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalErrorMessage'), prop: "errorMessage", type:"showDetail" }, - { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalRetryTimes'), 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" }, -] - -// 测试数据 -export const TestSchool = [ - { label: '名称11', prop: "schoolName", fixed: "left", type: "name" }, - { label: 'orderType11', prop: "orderType" }, - { label: '创建时间11', prop: "creationTime", type:'dateTime' }, -] \ No newline at end of file diff --git a/fe/PC/src/utils/isLocalApiTableDesTions/index.js b/fe/PC/src/utils/isLocalApiTableDesTions/index.js deleted file mode 100644 index ee238b5fa..000000000 --- a/fe/PC/src/utils/isLocalApiTableDesTions/index.js +++ /dev/null @@ -1,252 +0,0 @@ -//全局从接口缓存的详情（如：接口监控看板） -// import { getInterfaceBoard } from "@/api/wms-interface" - -// getList = () => { -// getInterfaceBoard().then(result => { - -// localStorage.setItem("interfaceBoardColumnsNames", JSON.stringify(result.data.localization.values.Dashboard)); -// }) -// .catch(err => { -// }) -// } -let _Dashboard = localStorage.getItem("interfaceBoardColumnsNames") -if(_Dashboard && _Dashboard != 'undefined' && _Dashboard != 'null') { - _Dashboard = JSON.parse(localStorage.getItem("interfaceBoardColumnsNames")) -} -// 用于如果没有表头数据时候报错问题处理 -const initDashboardLable = (data) => { - return _Dashboard ? _Dashboard[data] : null -} - -// 1外部数据转换 -export const dataExchangeFromOut = [ - { label: initDashboardLable('OutgoingToExternalNumber'), prop: "number" }, - { label: initDashboardLable('OutgoingToExternalRemark'), prop: "remark", type:"showDetail" }, - { label: initDashboardLable('OutgoingToExternalDataType'), prop: "dataType", type:"showDetail" }, - { label: initDashboardLable('OutgoingToExternalTableType'), prop: "tableType" }, - { label: initDashboardLable('OutgoingToExternalDataAction'), prop: "dataAction" }, - { label: initDashboardLable('OutgoingToExternalEffectiveDate'), prop: "effectiveDate",type:'dateTime' }, - { label: initDashboardLable('OutgoingToExternalStatus'), prop: "status" }, - { label: initDashboardLable('OutgoingToExternalSourceSystem'), prop: "sourceSystem", type:"showDetail" }, - { label: initDashboardLable('OutgoingToExternalSourceDataId'), prop: "sourceDataId" }, - { label: initDashboardLable('OutgoingToExternalSourceDataGroupCode'), prop: "sourceDataGroupCode", type:"showDetail" }, - { label: initDashboardLable('OutgoingToExternalSourceDataDetailCode'), prop: "sourceDataDetailCode", type:"showDetail" }, - { label: initDashboardLable('OutgoingToExternalSourceDataContent'), prop: "sourceDataContent", type:"showJsonTable" }, - { label: initDashboardLable('OutgoingToExternalWriteTime'), prop: "writeTime",type:'dateTime' }, - { label: initDashboardLable('OutgoingToExternalWriter'), prop: "writer" }, - { label: initDashboardLable('OutgoingToExternalDestinationSystem'), prop: "destinationSystem", type:"showDetail" }, - { label: initDashboardLable('OutgoingToExternalDestinationDataId'), prop: "destinationDataId" }, - { label: initDashboardLable('OutgoingToExternalDestinationDataContent'), prop: "destinationDataContent", type:"showJsonTable" }, - { label: initDashboardLable('OutgoingToExternalReadTime'), prop: "readTime",type:'dateTime' }, - { label: initDashboardLable('OutgoingToExternalReader'), prop: "reader" }, - { label: initDashboardLable('OutgoingToExternalErrorCode'), prop: "errorCode" }, - { label: initDashboardLable('OutgoingToExternalErrorMessage'), prop: "errorMessage", type:"showDetail" }, - { label: initDashboardLable('OutgoingToExternalRetryTimes'), 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" }, -] - -// 2归档外部数据转换 -export const dataExchangeFromOut_file = [ - { label: initDashboardLable('ArchivedOutgoingToExternalNumber'), prop: "number" }, - { label: initDashboardLable('ArchivedOutgoingToExternalRemark'), prop: "remark", type:"showDetail" }, - { label: initDashboardLable('ArchivedOutgoingToExternalDataType'), prop: "dataType" }, - { label: initDashboardLable('ArchivedOutgoingToExternalTableType'), prop: "tableType" }, - { label: initDashboardLable('ArchivedOutgoingToExternalDataAction'), prop: "dataAction" }, - { label: initDashboardLable('ArchivedOutgoingToExternalEffectiveDate'), prop: "effectiveDate",type:'dateTime' }, - { label: initDashboardLable('ArchivedOutgoingToExternalStatus'), prop: "status" }, - { label: initDashboardLable('ArchivedOutgoingToExternalSourceSystem'), prop: "sourceSystem" }, - { label: initDashboardLable('ArchivedOutgoingToExternalSourceDataId'), prop: "sourceDataId" }, - { label: initDashboardLable('ArchivedOutgoingToExternalSourceDataGroupCode'), prop: "sourceDataGroupCode" }, - { label: initDashboardLable('ArchivedOutgoingToExternalSourceDataDetailCode'), prop: "sourceDataDetailCode" }, - { label: initDashboardLable('ArchivedOutgoingToExternalSourceDataContent'), prop: "sourceDataContent", type:"showJsonTable" }, - { label: initDashboardLable('ArchivedOutgoingToExternalWriteTime'), prop: "writeTime",type:'dateTime' }, - { label: initDashboardLable('ArchivedOutgoingToExternalWriter'), prop: "writer" }, - { label: initDashboardLable('ArchivedOutgoingToExternalDestinationSystem'), prop: "destinationSystem" }, - { label: initDashboardLable('ArchivedOutgoingToExternalDestinationDataId'), prop: "destinationDataId" }, - { label: initDashboardLable('ArchivedOutgoingToExternalDestinationDataContent'), prop: "destinationDataContent", type:"showJsonTable" }, - { label: initDashboardLable('ArchivedOutgoingToExternalReadTime'), prop: "readTime",type:'dateTime' }, - { label: initDashboardLable('ArchivedOutgoingToExternalReader'), prop: "reader" }, - { label: initDashboardLable('ArchivedOutgoingToExternalErrorCode'), prop: "errorCode" }, - { label: initDashboardLable('ArchivedOutgoingToExternalErrorMessage'), prop: "errorMessage", type:"showDetail" }, - { label: initDashboardLable('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" }, -] - -// 3WMS数据接收 -export const comingToWms = [ - { label: initDashboardLable('IncomingToWmsNumber'), prop: "number" }, - { label: initDashboardLable('IncomingToWmsRemark'), prop: "remark", type:"showDetail" }, - { label: initDashboardLable('IncomingToWmsDataType'), prop: "dataType" }, - { label: initDashboardLable('IncomingToWmsDataAction'), prop: "dataAction" }, - { label: initDashboardLable('IncomingToWmsEffectiveDate'), prop: "effectiveDate",type:'dateTime' }, - { label: initDashboardLable('IncomingToWmsStatus'), prop: "status" }, - { label: initDashboardLable('IncomingToWmsDataIdentityCode'), prop: "dataIdentityCode" }, - { label: initDashboardLable('IncomingToWmsDataContent'), prop: "dataContent", type:"showJsonTable" }, - { label: initDashboardLable('IncomingToWmsSourceSystem'), prop: "sourceSystem" }, - { label: initDashboardLable('IncomingToWmsWriteTime'), prop: "writeTime",type:'dateTime' }, - { label: initDashboardLable('IncomingToWmsReadTime'), prop: "readTime",type:'dateTime' }, - { label: initDashboardLable('IncomingToWmsErrorCode'), prop: "errorCode" }, - { label: initDashboardLable('IncomingToWmsErrorMessage'), prop: "errorMessage", type:"showDetail" }, - { label: initDashboardLable('IncomingToWmsRetryTimes'), 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" }, -] - -// 4归档WMS数据接收 -export const comingToWms_file = [ - { label: initDashboardLable('ArchivedIncomingToWmsNumber'), prop: "number" }, - { label: initDashboardLable('ArchivedIncomingToWmsRemark'), prop: "remark", type:"showDetail" }, - { label: initDashboardLable('ArchivedIncomingToWmsDataType'), prop: "dataType" }, - { label: initDashboardLable('ArchivedIncomingToWmsDataAction'), prop: "dataAction" }, - { label: initDashboardLable('ArchivedIncomingToWmsEffectiveDate'), prop: "effectiveDate",type:'dateTime' }, - { label: initDashboardLable('ArchivedIncomingToWmsStatus'), prop: "status" }, - { label: initDashboardLable('ArchivedIncomingToWmsDataIdentityCode'), prop: "dataIdentityCode" }, - { label: initDashboardLable('ArchivedIncomingToWmsDataContent'), prop: "dataContent", type:"showJsonTable" }, - { label: initDashboardLable('ArchivedIncomingToWmsSourceSystem'), prop: "sourceSystem" }, - { label: initDashboardLable('ArchivedIncomingToWmsWriteTime'), prop: "writeTime",type:'dateTime' }, - { label: initDashboardLable('ArchivedIncomingToWmsReadTime'), prop: "readTime",type:'dateTime' }, - { label: initDashboardLable('ArchivedIncomingToWmsErrorCode'), prop: "errorCode" }, - { label: initDashboardLable('ArchivedIncomingToWmsErrorMessage'), prop: "errorMessage", type:"showDetail" }, - { label: initDashboardLable('ArchivedIncomingToWmsRetryTimes'), 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" }, -] - -// 5WMS数据转换 -export const dataExchangeFromWms = [ - { label: initDashboardLable('DataExchange_OutgoingFromWmsNumber'), prop: "number" }, - { label: initDashboardLable('DataExchange_OutgoingFromWmsRemark'), prop: "remark", type:"showDetail" }, - { label: initDashboardLable('DataExchange_OutgoingFromWmsDataType'), prop: "dataType" }, - { label: initDashboardLable('DataExchange_OutgoingFromWmsDataAction'), prop: "dataAction" }, - { label: initDashboardLable('DataExchange_OutgoingFromWmsEffectiveDate'), prop: "effectiveDate",type:'dateTime' }, - { label: initDashboardLable('DataExchange_OutgoingFromWmsStatus'), prop: "status" }, - { label: initDashboardLable('DataExchange_OutgoingFromWmsDataIdentityCode'), prop: "dataIdentityCode" }, - { label: initDashboardLable('DataExchange_OutgoingFromWmsDataContent'), prop: "dataContent", type:"showJsonTable" }, - { label: initDashboardLable('DataExchange_OutgoingFromWmsSourceSystem'), prop: "sourceSystem" }, - { label: initDashboardLable('DataExchange_OutgoingFromWmsWriteTime'), prop: "writeTime",type:'dateTime' }, - { label: initDashboardLable('DataExchange_OutgoingFromWmsDestinationSystem'), prop: "destinationSystem" }, - { label: initDashboardLable('DataExchange_OutgoingFromWmsReadTime'), prop: "readTime",type:'dateTime' }, - { label: initDashboardLable('DataExchange_OutgoingFromWmsErrorCode'), prop: "errorCode" }, - { label: initDashboardLable('DataExchange_OutgoingFromWmsErrorMessage'), prop: "errorMessage", type:"showDetail" }, - { label: initDashboardLable('DataExchange_OutgoingFromWmsRetryTimes'), 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" }, -] - -// 6归档WMS数据转换 -export const dataExchangeFromWms_file = [ - { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsNumber'), prop: "number" }, - { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsRemark'), prop: "remark", type:"showDetail" }, - { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsDataType'), prop: "dataType" }, - { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsDataAction'), prop: "dataAction" }, - { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsEffectiveDate'), prop: "effectiveDate",type:'dateTime' }, - { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsStatus'), prop: "status" }, - { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsDataIdentityCode'), prop: "dataIdentityCode" }, - { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsDataContent'), prop: "dataContent", type:"showJsonTable" }, - { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsSourceSystem'), prop: "sourceSystem" }, - { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsWriteTime'), prop: "writeTime",type:'dateTime' }, - // { label: _Dashboard.destinationSystem, prop: "destinationSystem" }, - { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsReadTime'), prop: "readTime",type:'dateTime' }, - { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsErrorCode'), prop: "errorCode" }, - { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsErrorMessage'), prop: "errorMessage", type:"showDetail" }, - { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsRetryTimes'), 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" }, -] - -// 7外部数据接收 -export const comingFromOut = [ - { label: initDashboardLable('DataExchange_IncomingFromExternalNumber'), prop: "number" }, - { label: initDashboardLable('DataExchange_IncomingFromExternalRemark'), prop: "remark", type:"showDetail" }, - { label: initDashboardLable('DataExchange_IncomingFromExternalDataType'), prop: "dataType" }, - { label: initDashboardLable('DataExchange_IncomingFromExternalTableType'), prop: "tableType" }, - { label: initDashboardLable('DataExchange_IncomingFromExternalDataAction'), prop: "dataAction" }, - { label: initDashboardLable('DataExchange_IncomingFromExternalEffectiveDate'), prop: "effectiveDate",type:'dateTime' }, - { label: initDashboardLable('DataExchange_IncomingFromExternalStatus'), prop: "status" }, - { label: initDashboardLable('DataExchange_IncomingFromExternalSourceSystem'), prop: "sourceSystem" }, - { label: initDashboardLable('DataExchange_IncomingFromExternalSourceDataId'), prop: "sourceDataId" }, - { label: initDashboardLable('DataExchange_IncomingFromExternalSourceDataGroupCode'), prop: "sourceDataGroupCode" }, - { label: initDashboardLable('DataExchange_IncomingFromExternalSourceDataDetailCode'), prop: "sourceDataDetailCode" }, - { label: initDashboardLable('DataExchange_IncomingFromExternalSourceDataContent'), prop: "sourceDataContent", type:"showJsonTable" }, - { label: initDashboardLable('DataExchange_IncomingFromExternalWriteTime'), prop: "writeTime",type:'dateTime' }, - { label: initDashboardLable('DataExchange_IncomingFromExternalWriter'), prop: "writer" }, - { label: initDashboardLable('DataExchange_IncomingFromExternalDestinationSystem'), prop: "destinationSystem" }, - { label: initDashboardLable('DataExchange_IncomingFromExternalDestinationDataId'), prop: "destinationDataId" }, - { label: initDashboardLable('DataExchange_IncomingFromExternalDestinationDataContent'), prop: "destinationDataContent", type:"showJsonTable" }, - { label: initDashboardLable('DataExchange_IncomingFromExternalReadTime'), prop: "readTime",type:'dateTime' }, - { label: initDashboardLable('DataExchange_IncomingFromExternalReader'), prop: "reader" }, - { label: initDashboardLable('DataExchange_IncomingFromExternalErrorCode'), prop: "errorCode" }, - { label: initDashboardLable('DataExchange_IncomingFromExternalErrorMessage'), prop: "errorMessage", type:"showDetail" }, - { label: initDashboardLable('DataExchange_IncomingFromExternalRetryTimes'), 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" }, -] - -// 8归档外部数据接收 -export const comingFromOut_file = [ - { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalNumber'), prop: "number" }, - { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalRemark'), prop: "remark", type:"showDetail" }, - { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalDataType'), prop: "dataType" }, - { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalTableType'), prop: "tableType" }, - { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalDataAction'), prop: "dataAction" }, - { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalEffectiveDate'), prop: "effectiveDate",type:'dateTime' }, - { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalStatus'), prop: "status" }, - { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalSourceSystem'), prop: "sourceSystem" }, - { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalSourceDataId'), prop: "sourceDataId" }, - { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalSourceDataGroupCode'), prop: "sourceDataGroupCode" }, - { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalSourceDataDetailCode'), prop: "sourceDataDetailCode" }, - { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalSourceDataContent'), prop: "sourceDataContent", type:"showJsonTable" }, - { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalWriteTime'), prop: "writeTime",type:'dateTime' }, - { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalWriter'), prop: "writer" }, - { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalDestinationSystem'), prop: "destinationSystem" }, - { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalDestinationDataId'), prop: "destinationDataId" }, - { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalDestinationDataContent'), prop: "destinationDataContent", type:"showJsonTable" }, - { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalReadTime'), prop: "readTime",type:'dateTime' }, - { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalReader'), prop: "reader" }, - { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalErrorCode'), prop: "errorCode" }, - { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalErrorMessage'), prop: "errorMessage", type:"showDetail" }, - { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalRetryTimes'), 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" }, -] - -// 测试数据 -export const TestSchool = [ - { label: '名称22', prop: "schoolName", fixed: "left", type: "name" }, - { label: 'orderType22', prop: "orderType" }, - { label: '创建时间22', prop: "creationTime", type:'dateTime' }, -] \ No newline at end of file diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index c3c8dc9cf..6005b4c31 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -3,6 +3,7 @@ const orderWidth = 180 import zh from '@/lang/zh' let _Public = zh.ColumsPublic // 字段通用 let _Names = zh.ColumsNames // 业务字段 +let _Dashboard = zh.ColumsDashboard // 接口监控看板字段 // 基础信息数据管理 /**/ @@ -3530,6 +3531,233 @@ export const Department = [ { label: "备注", prop: 'remark' }, ] +// 外部数据转换 +export const dataExchangeFromOut = [ + { label: _Dashboard.number, prop: "number" }, + { label: _Public.remark, prop: "remark", type:"showDetail" }, + { label: _Dashboard.dataType, prop: "dataType", type:"showDetail" }, + { label: _Dashboard.tableType, prop: "tableType" }, + { label: _Dashboard.dataAction, prop: "dataAction" }, + { label: _Dashboard.effectiveDate, prop: "effectiveDate",type:'dateTime' }, + { label: _Dashboard.status, prop: "status" }, + { label: _Dashboard.sourceSystem, prop: "sourceSystem", type:"showDetail" }, + { label: _Dashboard.sourceDataId, prop: "sourceDataId" }, + { label: _Dashboard.sourceDataGroupCode, prop: "sourceDataGroupCode", type:"showDetail" }, + { label: _Dashboard.sourceDataDetailCode, prop: "sourceDataDetailCode", type:"showDetail" }, + { label: _Dashboard.sourceDataContent, prop: "sourceDataContent", type:"showJsonTable" }, + { label: _Dashboard.writeTime, prop: "writeTime",type:'dateTime' }, + { label: _Dashboard.writer, prop: "writer" }, + { label: _Dashboard.destinationSystem, prop: "destinationSystem", type:"showDetail" }, + { label: _Dashboard.destinationDataId, prop: "destinationDataId" }, + { label: _Dashboard.destinationDataContent, prop: "destinationDataContent", type:"showJsonTable" }, + { label: _Dashboard.readTime, prop: "readTime",type:'dateTime' }, + { label: _Dashboard.reader, prop: "reader" }, + { label: _Dashboard.errorCode, prop: "errorCode" }, + { label: _Dashboard.errorMessage, prop: "errorMessage", type:"showDetail" }, + { label: _Dashboard.retryTimes, 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" }, +] + +// 归档外部数据转换 +export const dataExchangeFromOut_file = [ + { label: _Dashboard.number, prop: "number" }, + { label: _Public.remark, prop: "remark", type:"showDetail" }, + { label: _Dashboard.dataType, prop: "dataType" }, + { label: _Dashboard.tableType, prop: "tableType" }, + { label: _Dashboard.dataAction, prop: "dataAction" }, + { label: _Dashboard.effectiveDate, prop: "effectiveDate",type:'dateTime' }, + { label: _Dashboard.status, prop: "status" }, + { label: _Dashboard.sourceSystem, prop: "sourceSystem" }, + { label: _Dashboard.sourceDataId, prop: "sourceDataId" }, + { label: _Dashboard.sourceDataGroupCode, prop: "sourceDataGroupCode" }, + { label: _Dashboard.sourceDataDetailCode, prop: "sourceDataDetailCode" }, + { label: _Dashboard.sourceDataContent, prop: "sourceDataContent", type:"showJsonTable" }, + { label: _Dashboard.writeTime, prop: "writeTime",type:'dateTime' }, + { label: _Dashboard.writer, prop: "writer" }, + { label: _Dashboard.destinationSystem, prop: "destinationSystem" }, + { label: _Dashboard.destinationDataId, prop: "destinationDataId" }, + { label: _Dashboard.destinationDataContent, prop: "destinationDataContent", type:"showJsonTable" }, + { label: _Dashboard.readTime, prop: "readTime",type:'dateTime' }, + { label: _Dashboard.reader, prop: "reader" }, + { label: _Dashboard.errorCode, prop: "errorCode" }, + { label: _Dashboard.errorMessage, prop: "errorMessage", type:"showDetail" }, + { label: _Dashboard.retryTimes, 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" }, +] + +// WMS数据接收 +export const comingToWms = [ + { label: _Dashboard.number, prop: "number" }, + { label: _Public.remark, prop: "remark", type:"showDetail" }, + { label: _Dashboard.dataType, prop: "dataType" }, + { label: _Dashboard.dataAction, prop: "dataAction" }, + { label: _Dashboard.effectiveDate, prop: "effectiveDate",type:'dateTime' }, + { label: _Dashboard.status, prop: "status" }, + { label: _Dashboard.dataIdentityCode, prop: "dataIdentityCode" }, + { label: _Dashboard.dataContent, prop: "dataContent", type:"showJsonTable" }, + { label: _Dashboard.sourceSystem, prop: "sourceSystem" }, + { label: _Dashboard.writeTime, prop: "writeTime",type:'dateTime' }, + { label: _Dashboard.readTime, prop: "readTime",type:'dateTime' }, + { label: _Dashboard.errorCode, prop: "errorCode" }, + { label: _Dashboard.errorMessage, prop: "errorMessage", type:"showDetail" }, + { label: _Dashboard.retryTimes, 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" }, +] + +// 归档WMS数据接收 +export const comingToWms_file = [ + { label: _Dashboard.number, prop: "number" }, + { label: _Public.remark, prop: "remark", type:"showDetail" }, + { label: _Dashboard.dataType, prop: "dataType" }, + { label: _Dashboard.dataAction, prop: "dataAction" }, + { label: _Dashboard.effectiveDate, prop: "effectiveDate",type:'dateTime' }, + { label: _Dashboard.status, prop: "status" }, + { label: _Dashboard.dataIdentityCode, prop: "dataIdentityCode" }, + { label: _Dashboard.dataContent, prop: "dataContent", type:"showJsonTable" }, + { label: _Dashboard.sourceSystem, prop: "sourceSystem" }, + { label: _Dashboard.writeTime, prop: "writeTime",type:'dateTime' }, + { label: _Dashboard.readTime, prop: "readTime",type:'dateTime' }, + { label: _Dashboard.errorCode, prop: "errorCode" }, + { label: _Dashboard.errorMessage, prop: "errorMessage", type:"showDetail" }, + { label: _Dashboard.retryTimes, 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" }, +] + +// WMS数据转换 +export const dataExchangeFromWms = [ + { label: _Dashboard.number, prop: "number" }, + { label: _Public.remark, prop: "remark", type:"showDetail" }, + { label: _Dashboard.dataType, prop: "dataType" }, + { label: _Dashboard.dataAction, prop: "dataAction" }, + { label: _Dashboard.effectiveDate, prop: "effectiveDate",type:'dateTime' }, + { label: _Dashboard.status, prop: "status" }, + { label: _Dashboard.dataIdentityCode, prop: "dataIdentityCode" }, + { label: _Dashboard.dataContent, prop: "dataContent", type:"showJsonTable" }, + { label: _Dashboard.sourceSystem, prop: "sourceSystem" }, + { label: _Dashboard.writeTime, prop: "writeTime",type:'dateTime' }, + { label: _Dashboard.destinationSystem, prop: "destinationSystem" }, + { label: _Dashboard.readTime, prop: "readTime",type:'dateTime' }, + { label: _Dashboard.errorCode, prop: "errorCode" }, + { label: _Dashboard.errorMessage, prop: "errorMessage", type:"showDetail" }, + { label: _Dashboard.retryTimes, 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" }, +] + +// 归档WMS数据转换 +export const dataExchangeFromWms_file = [ + { label: _Dashboard.number, prop: "number" }, + { label: _Public.remark, prop: "remark", type:"showDetail" }, + { label: _Dashboard.dataType, prop: "dataType" }, + { label: _Dashboard.dataAction, prop: "dataAction" }, + { label: _Dashboard.effectiveDate, prop: "effectiveDate",type:'dateTime' }, + { label: _Dashboard.status, prop: "status" }, + { label: _Dashboard.dataIdentityCode, prop: "dataIdentityCode" }, + { label: _Dashboard.dataContent, prop: "dataContent", type:"showJsonTable" }, + { label: _Dashboard.sourceSystem, prop: "sourceSystem" }, + { label: _Dashboard.writeTime, prop: "writeTime",type:'dateTime' }, + { label: _Dashboard.destinationSystem, prop: "destinationSystem" }, + { label: _Dashboard.readTime, prop: "readTime",type:'dateTime' }, + { label: _Dashboard.errorCode, prop: "errorCode" }, + { label: _Dashboard.errorMessage, prop: "errorMessage", type:"showDetail" }, + { label: _Dashboard.retryTimes, 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" }, +] + + +// 外部数据接收 +export const comingFromOut = [ + { label: _Dashboard.number, prop: "number" }, + { label: _Public.remark, prop: "remark", type:"showDetail" }, + { label: _Dashboard.dataType, prop: "dataType" }, + { label: _Dashboard.tableType, prop: "tableType" }, + { label: _Dashboard.dataAction, prop: "dataAction" }, + { label: _Dashboard.effectiveDate, prop: "effectiveDate",type:'dateTime' }, + { label: _Dashboard.status, prop: "status" }, + { label: _Dashboard.sourceSystem, prop: "sourceSystem" }, + { label: _Dashboard.sourceDataId, prop: "sourceDataId" }, + { label: _Dashboard.sourceDataGroupCode, prop: "sourceDataGroupCode" }, + { label: _Dashboard.sourceDataDetailCode, prop: "sourceDataDetailCode" }, + { label: _Dashboard.sourceDataContent, prop: "sourceDataContent", type:"showJsonTable" }, + { label: _Dashboard.writeTime, prop: "writeTime",type:'dateTime' }, + { label: _Dashboard.writer, prop: "writer" }, + { label: _Dashboard.destinationSystem, prop: "destinationSystem" }, + { label: _Dashboard.destinationDataId, prop: "destinationDataId" }, + { label: _Dashboard.destinationDataContent, prop: "destinationDataContent", type:"showJsonTable" }, + { label: _Dashboard.readTime, prop: "readTime",type:'dateTime' }, + { label: _Dashboard.reader, prop: "reader" }, + { label: _Dashboard.errorCode, prop: "errorCode" }, + { label: _Dashboard.errorMessage, prop: "errorMessage", type:"showDetail" }, + { label: _Dashboard.retryTimes, 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" }, +] + +// 归档外部数据接收 +export const comingFromOut_file = [ + { label: _Dashboard.number, prop: "number" }, + { label: _Public.remark, prop: "remark", type:"showDetail" }, + { label: _Dashboard.dataType, prop: "dataType" }, + { label: _Dashboard.tableType, prop: "tableType" }, + { label: _Dashboard.dataAction, prop: "dataAction" }, + { label: _Dashboard.effectiveDate, prop: "effectiveDate",type:'dateTime' }, + { label: _Dashboard.status, prop: "status" }, + { label: _Dashboard.sourceSystem, prop: "sourceSystem" }, + { label: _Dashboard.sourceDataId, prop: "sourceDataId" }, + { label: _Dashboard.sourceDataGroupCode, prop: "sourceDataGroupCode" }, + { label: _Dashboard.sourceDataDetailCode, prop: "sourceDataDetailCode" }, + { label: _Dashboard.sourceDataContent, prop: "sourceDataContent", type:"showJsonTable" }, + { label: _Dashboard.writeTime, prop: "writeTime",type:'dateTime' }, + { label: _Dashboard.writer, prop: "writer" }, + { label: _Dashboard.destinationSystem, prop: "destinationSystem" }, + { label: _Dashboard.destinationDataId, prop: "destinationDataId" }, + { label: _Dashboard.destinationDataContent, prop: "destinationDataContent", type:"showJsonTable" }, + { label: _Dashboard.readTime, prop: "readTime",type:'dateTime' }, + { label: _Dashboard.reader, prop: "reader" }, + { label: _Dashboard.errorCode, prop: "errorCode" }, + { label: _Dashboard.errorMessage, prop: "errorMessage", type:"showDetail" }, + { label: _Dashboard.retryTimes, 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" }, +] + // 字段说明 // showProp: true //隐藏该字段的高级筛选+列表排序 diff --git a/fe/PC/src/utils/tableColumns/index_new.js b/fe/PC/src/utils/tableColumns/index_new.js index 9fe1e37a1..232e9e63b 100644 --- a/fe/PC/src/utils/tableColumns/index_new.js +++ b/fe/PC/src/utils/tableColumns/index_new.js @@ -3779,13 +3779,6 @@ export const comingFromOut_file = [ ] -// 测试数据 -export const TestSchool = [ - { label: '名称', prop: "schoolName", fixed: "left", type: "name" }, - { label: 'orderType', prop: "orderType" }, - { label: '创建时间', prop: "creationTime", type:'dateTime' }, -] - // 外部数据转换 // export const dataExchangeFromOut = [ // { diff --git a/fe/PC/src/utils/utils.js b/fe/PC/src/utils/utils.js index c5354744b..5445d889d 100644 --- a/fe/PC/src/utils/utils.js +++ b/fe/PC/src/utils/utils.js @@ -62,7 +62,6 @@ import newAndEdiDialog from '@/components/newAndEdiDialog' //普通新增与编 import stepsForm from '@/components/StepsForm' //步骤新增 import handelFrom from '@/components/handelFrom' //执行表单 import umyTable from '@/components/umyTable' // 用于数据量过大table -import filterForDetailPage from '@/components/filterForDetailPage' //明细查询 // Mixins // import { tableMixins } from "@/mixins/TableMixins" @@ -114,7 +113,6 @@ Vue.component('newAndEdiDialog', newAndEdiDialog) Vue.component('stepsForm', stepsForm) Vue.component('handelFrom', handelFrom) Vue.component('umyTable', umyTable) -Vue.component('filterForDetailPage', filterForDetailPage) Vue.prototype.$echarts = eCharts Vue.prototype.$isMobile = navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i) Vue.prototype.$isAndroid = navigator.userAgent.indexOf('Android') > -1 || navigator.userAgent.indexOf('Adr') > -1 diff --git a/fe/PC/src/views/interfaceBoard/TestSchool.vue b/fe/PC/src/views/interfaceBoard/TestSchool.vue deleted file mode 100644 index f96a39b40..000000000 --- a/fe/PC/src/views/interfaceBoard/TestSchool.vue +++ /dev/null @@ -1,407 +0,0 @@ - - - \ No newline at end of file diff --git a/fe/PC/src/views/interfaceBoard/comingFromOut.vue b/fe/PC/src/views/interfaceBoard/comingFromOut.vue index 6ac78ca9f..703a74ae0 100644 --- a/fe/PC/src/views/interfaceBoard/comingFromOut.vue +++ b/fe/PC/src/views/interfaceBoard/comingFromOut.vue @@ -1,11 +1,10 @@