diff --git a/fe/PC/src/api/wms-interface_new.js b/fe/PC/src/api/wms-interface_new.js deleted file mode 100644 index fa3f55d2b..000000000 --- a/fe/PC/src/api/wms-interface_new.js +++ /dev/null @@ -1,117 +0,0 @@ -// 接口监控看板相关api -import axios from 'axios' -import request from '@/utils/request' -let filter = 'get-page-list-by-filter' -let base_api = localStorage.getItem('interfaceBoardUrl') -let colum_url = localStorage.getItem('interfaceBoardColumnsApi') -let interfaceBoard_api = base_api + 'api/app/' -// 转义传参 -const initParams = (data) => { - return { - skipCount:data.SkipCount, - maxResultCount:data.MaxResultCount, - sorting:data.Sorting - } -} - -// 获取表头数据 -export function getInterfaceBoard() { - return axios({ - method:'get', - url: base_api + colum_url - }) -} - -//外部数据转换 -export function dataExchangeFromOut(data,includeDetails) { - return axios({ - method:'post', - url: interfaceBoard_api + 'outgoing-to-external/' + filter + '?includeDetails='+ Boolean(includeDetails), - data - }) -} - -//归档外部数据转换 -export function dataExchangeFromOut_file(data,includeDetails) { - return axios({ - method:'post', - url: interfaceBoard_api + 'archived-outgoing-to-external/' + filter + '?includeDetails='+ Boolean(includeDetails), - data - }) -} - -//wms数据接收 -export function comingToWms(data,includeDetails) { - return axios({ - method:'post', - url: interfaceBoard_api + 'incoming-to-wms/' + filter + '?includeDetails='+ Boolean(includeDetails), - data - }) -} - -//归档wms数据接收 -export function comingToWms_file(data,includeDetails) { - return axios({ - method:'post', - url: interfaceBoard_api + 'archived-incoming-to-wms/' + filter + '?includeDetails='+ Boolean(includeDetails), - data - }) -} - -//wms数据转换 -export function dataExchangeFromWms(data,includeDetails) { - return axios({ - method:'post', - url: interfaceBoard_api + 'data-exchange_Outgoing-from-wms/' + filter + '?includeDetails='+ Boolean(includeDetails), - data - }) -} - -// 归档wms数据转换 -export function dataExchangeFromWms_file(data,includeDetails) { - return axios({ - method:'post', - url: interfaceBoard_api + 'data-exchange_Archived-outgoing-from-wms/' + filter + '?includeDetails='+ Boolean(includeDetails), - data - }) -} - -//外部数据接收 -export function comingFromOut(data,includeDetails) { - return axios({ - method:'post', - url: interfaceBoard_api + 'data-exchange_Incoming-from-external/' + filter + '?includeDetails='+ Boolean(includeDetails), - data - }) -} - -//归档外部数据接收 -export function comingFromOut_file(data,includeDetails) { - return axios({ - method:'post', - url: interfaceBoard_api + 'data-exchange_Archived-incoming-from-external/' + filter + '?includeDetails='+ Boolean(includeDetails), - data - }) -} - -//外部数据转换新增、编辑 -export function dataExchangeFromOut_save(data,add) { - let _type = add ? 'CreateModal' : 'EditModal' - return axios({ - method:'post', - headers: { - 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' - }, - url: base_api + 'AppBusiness/OutgoingToExternal/OutgoingToExternal/'+_type, - data:data - }) -} - -//外部数据转换删除 -export function dataExchangeFromOut_delete(id) { - return axios({ - method:'DELETE', - url: base_api + 'outgoing-to-external/' + id, - }) -} - diff --git a/fe/PC/src/lang/zh.js b/fe/PC/src/lang/zh.js index 031525d6d..a0fc0101c 100644 --- a/fe/PC/src/lang/zh.js +++ b/fe/PC/src/lang/zh.js @@ -90,29 +90,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 305379867..6a1e49a47 100644 --- a/fe/PC/src/permission.js +++ b/fe/PC/src/permission.js @@ -59,12 +59,12 @@ router.beforeEach(async (to, from, next) => { // note: roles must be a object array! such as: ['admin'] or ,['developer','editor'] // 如果缓存中没有 interfaceBoardColumnsNames(接口监控看板表头信息) 的缓存数据 则退出登录 - // let _interfaceBoardColumnsNames = localStorage.getItem("interfaceBoardColumnsNames") - // if(!_interfaceBoardColumnsNames){ - // await store.dispatch('user/logout') - // next(`/login?redirect=${to.path}`) - // NProgress.done() - // } + 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 diff --git a/fe/PC/src/router/index.js b/fe/PC/src/router/index.js index 347489245..b00fe8ba6 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/isLocalApiTableColums/index.js b/fe/PC/src/utils/isLocalApiTableColums/index.js new file mode 100644 index 000000000..9f60bf473 --- /dev/null +++ b/fe/PC/src/utils/isLocalApiTableColums/index.js @@ -0,0 +1,277 @@ + +// 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: 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" }, +] \ 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 a7b601376..c3c8dc9cf 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -2,8 +2,7 @@ const orderWidth = 180 import zh from '@/lang/zh' let _Public = zh.ColumsPublic // 字段通用 -let _Dashboard = zh.ColumsDashboard // 接口监控看板 -let _Names = zh.ColumsNames // 接口监控看板 +let _Names = zh.ColumsNames // 业务字段 // 基础信息数据管理 /**/ @@ -3531,240 +3530,6 @@ export const Department = [ { label: "备注", prop: 'remark' }, ] -// 接口监控看板 -// 外部数据转换 -export const dataExchangeFromOut = [ - { - label: _Dashboard.number, - prop: "number", - // fixed: "left", - // type: "name" - }, - { 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 c7070af64..9fe1e37a1 100644 --- a/fe/PC/src/utils/tableColumns/index_new.js +++ b/fe/PC/src/utils/tableColumns/index_new.js @@ -3532,24 +3532,29 @@ export const Department = [ // 接口监控看板 // let _Dashboard = zh.ColumsDashboard // 接口监控看板 -let _Dashboard = localStorage.getItem("interfaceBoardColumnsNames") -if(_Dashboard && _Dashboard != 'undefined' && _Dashboard != 'null') { - _Dashboard = JSON.parse(localStorage.getItem("interfaceBoardColumnsNames")) +const initDashboard = () =>{ + let _Dashboard = localStorage.getItem("interfaceBoardColumnsNames") + if(_Dashboard && _Dashboard != 'undefined' && _Dashboard != 'null') { + _Dashboard = JSON.parse(localStorage.getItem("interfaceBoardColumnsNames")) + } + return _Dashboard } -// window.addEventListener('setItemEvent', (item) => { -// if(item.key == "interfaceBoardColumnsNames"){ -// _Dashboard = JSON.parse(localStorage.getItem("interfaceBoardColumnsNames")) // 接口监控看板 -// console.log(11,_Dashboard) -// } -// }) +let _Dashboard = initDashboard() +window.addEventListener('setItemEvent', (item) => { + setTimeout(()=>{ + if(item.key == "interfaceBoardColumnsNames"){ + _Dashboard = initDashboard() + console.log(11,initDashboard()) + } + },100) +}) // 用于处理刚进来的时候没有表头数据问题处理 const initDashboardLable = (data) => { return _Dashboard ? _Dashboard[data] : null } - -// 外部数据转换 +// 1外部数据转换 export const dataExchangeFromOut = [ - { label: initDashboardLable('OutgoingToExternalNumber'), prop: "number" }, + { label: _Dashboard ? _Dashboard['OutgoingToExternalNumber'] : null, prop: "number" }, { label: initDashboardLable('OutgoingToExternalRemark'), prop: "remark", type:"showDetail" }, { label: initDashboardLable('OutgoingToExternalDataType'), prop: "dataType", type:"showDetail" }, { label: initDashboardLable('OutgoingToExternalTableType'), prop: "tableType" }, @@ -3579,7 +3584,7 @@ export const dataExchangeFromOut = [ // { label: _Public.ID, prop: "ID" }, ] -// 归档外部数据转换 +// 2归档外部数据转换 export const dataExchangeFromOut_file = [ { label: initDashboardLable('ArchivedOutgoingToExternalNumber'), prop: "number" }, { label: initDashboardLable('ArchivedOutgoingToExternalRemark'), prop: "remark", type:"showDetail" }, @@ -3611,7 +3616,7 @@ export const dataExchangeFromOut_file = [ // { label: _Public.ID, prop: "ID" }, ] -// WMS数据接收 +// 3WMS数据接收 export const comingToWms = [ { label: initDashboardLable('IncomingToWmsNumber'), prop: "number" }, { label: initDashboardLable('IncomingToWmsRemark'), prop: "remark", type:"showDetail" }, @@ -3635,7 +3640,7 @@ export const comingToWms = [ // { label: _Public.ID, prop: "ID" }, ] -// // 归档WMS数据接收 +// 4归档WMS数据接收 export const comingToWms_file = [ { label: initDashboardLable('ArchivedIncomingToWmsNumber'), prop: "number" }, { label: initDashboardLable('ArchivedIncomingToWmsRemark'), prop: "remark", type:"showDetail" }, @@ -3659,7 +3664,7 @@ export const comingToWms_file = [ // { label: _Public.ID, prop: "ID" }, ] -// // WMS数据转换 +// 5WMS数据转换 export const dataExchangeFromWms = [ { label: initDashboardLable('DataExchange_OutgoingFromWmsNumber'), prop: "number" }, { label: initDashboardLable('DataExchange_OutgoingFromWmsRemark'), prop: "remark", type:"showDetail" }, @@ -3684,7 +3689,7 @@ export const dataExchangeFromWms = [ // { label: _Public.ID, prop: "ID" }, ] -// // 归档WMS数据转换 +// 6归档WMS数据转换 export const dataExchangeFromWms_file = [ { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsNumber'), prop: "number" }, { label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsRemark'), prop: "remark", type:"showDetail" }, @@ -3709,7 +3714,7 @@ export const dataExchangeFromWms_file = [ // { label: _Public.ID, prop: "ID" }, ] -// // 外部数据接收 +// 7外部数据接收 export const comingFromOut = [ { label: initDashboardLable('DataExchange_IncomingFromExternalNumber'), prop: "number" }, { label: initDashboardLable('DataExchange_IncomingFromExternalRemark'), prop: "remark", type:"showDetail" }, @@ -3741,7 +3746,7 @@ export const comingFromOut = [ // { label: _Public.ID, prop: "ID" }, ] -// // 归档外部数据接收 +// 8归档外部数据接收 export const comingFromOut_file = [ { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalNumber'), prop: "number" }, { label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalRemark'), prop: "remark", type:"showDetail" }, diff --git a/fe/PC/src/views/interfaceBoard/TestSchool.vue b/fe/PC/src/views/interfaceBoard/TestSchool.vue index b8499003d..7b2d58a8f 100644 --- a/fe/PC/src/views/interfaceBoard/TestSchool.vue +++ b/fe/PC/src/views/interfaceBoard/TestSchool.vue @@ -1,10 +1,11 @@