From acc2d660c7f8ebcb30554312e0731e2488e9ccc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Wed, 5 Jul 2023 17:28:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=9B=91=E6=8E=A7=E5=BC=80?= =?UTF-8?q?=E5=8F=91=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/public/config.js | 1 + fe/PC/src/api/wms-interface.js | 42 +- fe/PC/src/permission.js | 28 +- fe/PC/src/utils/tableColumns/index_new.js | 474 +++++++++++++----- fe/PC/src/utils/tabsDesTions/index.js | 43 -- fe/PC/src/views/interfaceBoard/TestSchool.vue | 412 ++++++++++++--- .../interfaceBoard/_dataExchangeFromOut.vue | 304 ----------- .../interfaceBoard/dataExchangeFromOut.vue | 3 +- fe/PC/src/views/login/index.vue | 4 + 9 files changed, 741 insertions(+), 570 deletions(-) delete mode 100644 fe/PC/src/views/interfaceBoard/_dataExchangeFromOut.vue diff --git a/fe/PC/public/config.js b/fe/PC/public/config.js index 5e620a5ee..9d7a91b52 100644 --- a/fe/PC/public/config.js +++ b/fe/PC/public/config.js @@ -23,6 +23,7 @@ window.SITE_CONFIG['versionUrl'] = 'http://dev.ccwin-in.com:60070' 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' diff --git a/fe/PC/src/api/wms-interface.js b/fe/PC/src/api/wms-interface.js index 63adef412..08b3db456 100644 --- a/fe/PC/src/api/wms-interface.js +++ b/fe/PC/src/api/wms-interface.js @@ -1,7 +1,9 @@ // 接口监控看板相关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) => { @@ -11,6 +13,15 @@ const initParams = (data) => { sorting:data.Sorting } } + +// 获取表头数据 +export function getInterfaceBoard() { + return axios({ + method:'get', + url: base_api + colum_url + }) +} + //外部数据转换 export function dataExchangeFromOut(data) { return axios({ @@ -83,21 +94,32 @@ export function comingFromOut_file(data) { }) } -//外部数据转换新增、编辑 -export function dataExchangeFromOut_save(data,add) { - let _type = add ? 'CreateModal' : 'EditModal' +// 测试数据-列表 +export function TestSchool(data, includeDetails) { + return axios({ + method:'post', + url: base_api + 'api/TestSchool/base/get-list-page-by-filter?includeDetails='+Boolean(includeDetails), + data + }) +} + +// 测试数据-新增、编辑 +export function TestSchool_save(data,isAdd) { + let _type = isAdd ? 'create' : 'update-by-id' + // let _url = isEdit ? '/api/TestSchool/base/update-by-id?id='+ data.id : '/api/TestSchool/base/create' return axios({ method:'post', - headers: { - 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' - }, - url: base_api + 'AppBusiness/OutgoingToExternal/OutgoingToExternal/'+_type, - data:data + // headers: { + // 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' + // }, + url: base_api + 'api/TestSchool/base/'+_type, + data:data, + params:{id:data.id} }) } -//外部数据转换删除 -export function dataExchangeFromOut_delete(id) { +// 测试数据-删除 +export function TestSchool_delete(id) { return axios({ method:'DELETE', url: base_api + 'outgoing-to-external/' + id, diff --git a/fe/PC/src/permission.js b/fe/PC/src/permission.js index 5ec9a8501..305379867 100644 --- a/fe/PC/src/permission.js +++ b/fe/PC/src/permission.js @@ -12,7 +12,6 @@ import getPageTitle from '@/utils/get-page-title' import { asyncRoutes } from '@/router' -import { getInterfaceBoard } from "@/api/wms-interface" NProgress.configure({ showSpinner: false @@ -33,6 +32,16 @@ router.beforeEach(async (to, from, next) => { const hasToken = getToken() if (hasToken) { + // if(from.path != '/login'){ + // let _interfaceBoardColumnsNames = localStorage.getItem("interfaceBoardColumnsNames") + // if(!_interfaceBoardColumnsNames){ + // console.log(39,_interfaceBoardColumnsNames) + // // next({ + // // path: '/' + // // }) + // // NProgress.done() + // } + // } if (to.path === '/login') { // if is logged in, redirect to the home page next({ @@ -48,18 +57,15 @@ router.beforeEach(async (to, from, next) => { try { // get user info // note: roles must be a object array! such as: ['admin'] or ,['developer','editor'] - // 除了登录页以外，如果缓存中没有 interfaceBoardColumnsNames(监控数据表头信息) 的缓存 则跳出登录页 - // getInterfaceBoard().then(result => { + + // 如果缓存中没有 interfaceBoardColumnsNames(接口监控看板表头信息) 的缓存数据 则退出登录 + // let _interfaceBoardColumnsNames = localStorage.getItem("interfaceBoardColumnsNames") + // if(!_interfaceBoardColumnsNames){ + // await store.dispatch('user/logout') // next(`/login?redirect=${to.path}`) // NProgress.done() - // // let _obj = {"OutgoingToExternal":"外部数据转换","OutgoingToExternalNumber":"编号","OutgoingToExternalRemark":"备注11111111111","OutgoingToExternalDataType":"数据类型","OutgoingToExternalTableType":"数据表类型","OutgoingToExternalDataAction":"数据动作","OutgoingToExternalEffectiveDate":"生效日期","OutgoingToExternalStatus":"数据状态","OutgoingToExternalSourceSystem":"来源系统","OutgoingToExternalSourceDataId":"来源数据ID","OutgoingToExternalSourceDataGroupCode":"来源数据组码","OutgoingToExternalSourceDataDetailCode":"来源数据明细码","OutgoingToExternalSourceDataContent":"来源数据内容","OutgoingToExternalWriteTime":"写入时间","OutgoingToExternalWriter":"写入者","OutgoingToExternalDestinationDataId":"目标数据ID","OutgoingToExternalDestinationDataContent":"目标数据内容","OutgoingToExternalDestinationSystem":"目标系统","OutgoingToExternalReadTime":"读取时间","OutgoingToExternalReader":"读取者","OutgoingToExternalErrorCode":"错误代码","OutgoingToExternalErrorMessage":"错误信息","OutgoingToExternalRetryTimes":"重试次数"} - // // localStorage.setItem("interfaceBoardColumnsNames", JSON.stringify(_obj)); - // // localStorage.setItem("interfaceBoardColumnsNames", JSON.stringify(result.data.localization.values.Dashboard)); - // // console.log(5858585858,localStorage.getItem("interfaceBoardColumnsNames")) - // }) - // .catch(err => { - - // }) + // } + const { roles } = await store.dispatch('user/getInfo') diff --git a/fe/PC/src/utils/tableColumns/index_new.js b/fe/PC/src/utils/tableColumns/index_new.js index a77597e8c..c7070af64 100644 --- a/fe/PC/src/utils/tableColumns/index_new.js +++ b/fe/PC/src/utils/tableColumns/index_new.js @@ -2,15 +2,8 @@ const orderWidth = 180 import zh from '@/lang/zh' let _Public = zh.ColumsPublic // 字段通用 -// let _Dashboard = zh.ColumsDashboard // 接口监控看板 -let _Dashboard = JSON.parse(localStorage.getItem("interfaceBoardColumnsNames")) // 接口监控看板 -let _Names = zh.ColumsNames // 接口监控看板 -window.addEventListener('setItemEvent', (item) => { - if(item.key == "interfaceBoardColumnsNames"){ - _Dashboard = JSON.parse(localStorage.getItem("interfaceBoardColumnsNames")) // 接口监控看板 - console.log(11,_Dashboard) - } -}) +let _Names = zh.ColumsNames + // 基础信息数据管理 /**/ // 物品基础信息 @@ -3538,17 +3531,25 @@ export const Department = [ ] // 接口监控看板 +// let _Dashboard = zh.ColumsDashboard // 接口监控看板 +let _Dashboard = localStorage.getItem("interfaceBoardColumnsNames") +if(_Dashboard && _Dashboard != 'undefined' && _Dashboard != 'null') { + _Dashboard = JSON.parse(localStorage.getItem("interfaceBoardColumnsNames")) +} +// window.addEventListener('setItemEvent', (item) => { +// if(item.key == "interfaceBoardColumnsNames"){ +// _Dashboard = JSON.parse(localStorage.getItem("interfaceBoardColumnsNames")) // 接口监控看板 +// console.log(11,_Dashboard) +// } +// }) +// 用于处理刚进来的时候没有表头数据问题处理 const initDashboardLable = (data) => { return _Dashboard ? _Dashboard[data] : null } + // 外部数据转换 export const dataExchangeFromOut = [ - { - label: initDashboardLable('OutgoingToExternalNumber'), - prop: "number", - // fixed: "left", - // type: "name" - }, + { label: initDashboardLable('OutgoingToExternalNumber'), prop: "number" }, { label: initDashboardLable('OutgoingToExternalRemark'), prop: "remark", type:"showDetail" }, { label: initDashboardLable('OutgoingToExternalDataType'), prop: "dataType", type:"showDetail" }, { label: initDashboardLable('OutgoingToExternalTableType'), prop: "tableType" }, @@ -3610,22 +3611,261 @@ export const dataExchangeFromOut_file = [ // { label: _Public.ID, prop: "ID" }, ] +// WMS数据接收 +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" }, +] + +// // 归档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" }, +] + +// // WMS数据转换 +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" }, +] + +// // 归档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" }, +] + +// // 外部数据接收 +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" }, +] + +// // 归档外部数据接收 +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: '名称', prop: "schoolName", fixed: "left", type: "name" }, + { label: 'orderType', prop: "orderType" }, + { label: '创建时间', prop: "creationTime", type:'dateTime' }, +] + +// 外部数据转换 +// 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.IncomingToWmsNumber, prop: "number" }, -// { label: _Dashboard.IncomingToWmsRemark, prop: "remark", type:"showDetail" }, -// { label: _Dashboard.IncomingToWmsDataType, prop: "dataType" }, -// { label: _Dashboard.IncomingToWmsDataAction, prop: "dataAction" }, -// { label: _Dashboard.IncomingToWmsEffectiveDate, prop: "effectiveDate",type:'dateTime' }, -// { label: _Dashboard.IncomingToWmsStatus, prop: "status" }, -// { label: _Dashboard.IncomingToWmsDataIdentityCode, prop: "dataIdentityCode" }, -// { label: _Dashboard.IncomingToWmsDataContent, prop: "dataContent", type:"showJsonTable" }, -// { label: _Dashboard.IncomingToWmsSourceSystem, prop: "sourceSystem" }, -// { label: _Dashboard.IncomingToWmsWriteTime, prop: "writeTime",type:'dateTime' }, -// { label: _Dashboard.IncomingToWmsReadTime, prop: "readTime",type:'dateTime' }, -// { label: _Dashboard.IncomingToWmsErrorCode, prop: "errorCode" }, -// { label: _Dashboard.IncomingToWmsErrorMessage, prop: "errorMessage", type:"showDetail" }, -// { label: _Dashboard.IncomingToWmsRetryTimes, prop: "retryTimes" }, +// { 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" }, @@ -3636,20 +3876,20 @@ export const dataExchangeFromOut_file = [ // // 归档WMS数据接收 // export const comingToWms_file = [ -// { label: _Dashboard.ArchivedIncomingToWmsNumber, prop: "number" }, -// { label: _Dashboard.ArchivedIncomingToWmsRemark, prop: "remark", type:"showDetail" }, -// { label: _Dashboard.ArchivedIncomingToWmsDataType, prop: "dataType" }, -// { label: _Dashboard.ArchivedIncomingToWmsDataAction, prop: "dataAction" }, -// { label: _Dashboard.ArchivedIncomingToWmsEffectiveDate, prop: "effectiveDate",type:'dateTime' }, -// { label: _Dashboard.ArchivedIncomingToWmsStatus, prop: "status" }, -// { label: _Dashboard.ArchivedIncomingToWmsDataIdentityCode, prop: "dataIdentityCode" }, -// { label: _Dashboard.ArchivedIncomingToWmsDataContent, prop: "dataContent", type:"showJsonTable" }, -// { label: _Dashboard.ArchivedIncomingToWmsSourceSystem, prop: "sourceSystem" }, -// { label: _Dashboard.ArchivedIncomingToWmsWriteTime, prop: "writeTime",type:'dateTime' }, -// { label: _Dashboard.ArchivedIncomingToWmsReadTime, prop: "readTime",type:'dateTime' }, -// { label: _Dashboard.ArchivedIncomingToWmsErrorCode, prop: "errorCode" }, -// { label: _Dashboard.ArchivedIncomingToWmsErrorMessage, prop: "errorMessage", type:"showDetail" }, -// { label: _Dashboard.ArchivedIncomingToWmsRetryTimes, prop: "retryTimes" }, +// { 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" }, @@ -3660,21 +3900,21 @@ export const dataExchangeFromOut_file = [ // // WMS数据转换 // export const dataExchangeFromWms = [ -// { label: _Dashboard.DataExchange_OutgoingFromWmsNumber, prop: "number" }, -// { label: _Dashboard.DataExchange_OutgoingFromWmsRemark, prop: "remark", type:"showDetail" }, -// { label: _Dashboard.DataExchange_OutgoingFromWmsDataType, prop: "dataType" }, -// { label: _Dashboard.DataExchange_OutgoingFromWmsDataAction, prop: "dataAction" }, -// { label: _Dashboard.DataExchange_OutgoingFromWmsEffectiveDate, prop: "effectiveDate",type:'dateTime' }, -// { label: _Dashboard.DataExchange_OutgoingFromWmsStatus, prop: "status" }, -// { label: _Dashboard.DataExchange_OutgoingFromWmsDataIdentityCode, prop: "dataIdentityCode" }, -// { label: _Dashboard.DataExchange_OutgoingFromWmsDataContent, prop: "dataContent", type:"showJsonTable" }, -// { label: _Dashboard.DataExchange_OutgoingFromWmsSourceSystem, prop: "sourceSystem" }, -// { label: _Dashboard.DataExchange_OutgoingFromWmsWriteTime, prop: "writeTime",type:'dateTime' }, -// { label: _Dashboard.DataExchange_OutgoingFromWmsDestinationSystem, prop: "destinationSystem" }, -// { label: _Dashboard.DataExchange_OutgoingFromWmsReadTime, prop: "readTime",type:'dateTime' }, -// { label: _Dashboard.DataExchange_OutgoingFromWmsErrorCode, prop: "errorCode" }, -// { label: _Dashboard.DataExchange_OutgoingFromWmsErrorMessage, prop: "errorMessage", type:"showDetail" }, -// { label: _Dashboard.DataExchange_OutgoingFromWmsRetryTimes, prop: "retryTimes" }, +// { 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" }, @@ -3685,21 +3925,21 @@ export const dataExchangeFromOut_file = [ // // 归档WMS数据转换 // export const dataExchangeFromWms_file = [ -// { label: _Dashboard.DataExchange_ArchivedOutgoingFromWmsNumber, prop: "number" }, -// { label: _Dashboard.DataExchange_ArchivedOutgoingFromWmsRemark, prop: "remark", type:"showDetail" }, -// { label: _Dashboard.DataExchange_ArchivedOutgoingFromWmsDataType, prop: "dataType" }, -// { label: _Dashboard.DataExchange_ArchivedOutgoingFromWmsDataAction, prop: "dataAction" }, -// { label: _Dashboard.DataExchange_ArchivedOutgoingFromWmsEffectiveDate, prop: "effectiveDate",type:'dateTime' }, -// { label: _Dashboard.DataExchange_ArchivedOutgoingFromWmsStatus, prop: "status" }, -// { label: _Dashboard.DataExchange_ArchivedOutgoingFromWmsDataIdentityCode, prop: "dataIdentityCode" }, -// { label: _Dashboard.DataExchange_ArchivedOutgoingFromWmsDataContent, prop: "dataContent", type:"showJsonTable" }, -// { label: _Dashboard.DataExchange_ArchivedOutgoingFromWmsSourceSystem, prop: "sourceSystem" }, -// { label: _Dashboard.DataExchange_ArchivedOutgoingFromWmsWriteTime, prop: "writeTime",type:'dateTime' }, -// // { label: _Dashboard.destinationSystem, prop: "destinationSystem" }, -// { label: _Dashboard.DataExchange_ArchivedOutgoingFromWmsReadTime, prop: "readTime",type:'dateTime' }, -// { label: _Dashboard.DataExchange_ArchivedOutgoingFromWmsErrorCode, prop: "errorCode" }, -// { label: _Dashboard.DataExchange_ArchivedOutgoingFromWmsErrorMessage, prop: "errorMessage", type:"showDetail" }, -// { label: _Dashboard.DataExchange_ArchivedOutgoingFromWmsRetryTimes, prop: "retryTimes" }, +// { 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" }, @@ -3711,28 +3951,28 @@ export const dataExchangeFromOut_file = [ // // 外部数据接收 // export const comingFromOut = [ -// { label: _Dashboard.DataExchange_IncomingFromExternalNumber, prop: "number" }, -// { label: _Dashboard.DataExchange_IncomingFromExternalRemark, prop: "remark", type:"showDetail" }, -// { label: _Dashboard.DataExchange_IncomingFromExternalDataType, prop: "dataType" }, -// { label: _Dashboard.DataExchange_IncomingFromExternalTableType, prop: "tableType" }, -// { label: _Dashboard.DataExchange_IncomingFromExternalDataAction, prop: "dataAction" }, -// { label: _Dashboard.DataExchange_IncomingFromExternalEffectiveDate, prop: "effectiveDate",type:'dateTime' }, -// { label: _Dashboard.DataExchange_IncomingFromExternalStatus, prop: "status" }, -// { label: _Dashboard.DataExchange_IncomingFromExternalSourceSystem, prop: "sourceSystem" }, -// { label: _Dashboard.DataExchange_IncomingFromExternalSourceDataId, prop: "sourceDataId" }, -// { label: _Dashboard.DataExchange_IncomingFromExternalSourceDataGroupCode, prop: "sourceDataGroupCode" }, -// { label: _Dashboard.DataExchange_IncomingFromExternalSourceDataDetailCode, prop: "sourceDataDetailCode" }, -// { label: _Dashboard.DataExchange_IncomingFromExternalSourceDataContent, prop: "sourceDataContent", type:"showJsonTable" }, -// { label: _Dashboard.DataExchange_IncomingFromExternalWriteTime, prop: "writeTime",type:'dateTime' }, -// { label: _Dashboard.DataExchange_IncomingFromExternalWriter, prop: "writer" }, -// { label: _Dashboard.DataExchange_IncomingFromExternalDestinationSystem, prop: "destinationSystem" }, -// { label: _Dashboard.DataExchange_IncomingFromExternalDestinationDataId, prop: "destinationDataId" }, -// { label: _Dashboard.DataExchange_IncomingFromExternalDestinationDataContent, prop: "destinationDataContent", type:"showJsonTable" }, -// { label: _Dashboard.DataExchange_IncomingFromExternalReadTime, prop: "readTime",type:'dateTime' }, -// { label: _Dashboard.DataExchange_IncomingFromExternalReader, prop: "reader" }, -// { label: _Dashboard.DataExchange_IncomingFromExternalErrorCode, prop: "errorCode" }, -// { label: _Dashboard.DataExchange_IncomingFromExternalErrorMessage, prop: "errorMessage", type:"showDetail" }, -// { label: _Dashboard.DataExchange_IncomingFromExternalRetryTimes, prop: "retryTimes" }, +// { 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" }, @@ -3743,28 +3983,28 @@ export const dataExchangeFromOut_file = [ // // 归档外部数据接收 // export const comingFromOut_file = [ -// { label: _Dashboard.DataExchange_ArchivedIncomingFromExternalNumber, prop: "number" }, -// { label: _Dashboard.DataExchange_ArchivedIncomingFromExternalRemark, prop: "remark", type:"showDetail" }, -// { label: _Dashboard.DataExchange_ArchivedIncomingFromExternalDataType, prop: "dataType" }, -// { label: _Dashboard.DataExchange_ArchivedIncomingFromExternalTableType, prop: "tableType" }, -// { label: _Dashboard.DataExchange_ArchivedIncomingFromExternalDataAction, prop: "dataAction" }, -// { label: _Dashboard.DataExchange_ArchivedIncomingFromExternalEffectiveDate, prop: "effectiveDate",type:'dateTime' }, -// { label: _Dashboard.DataExchange_ArchivedIncomingFromExternalStatus, prop: "status" }, -// { label: _Dashboard.DataExchange_ArchivedIncomingFromExternalSourceSystem, prop: "sourceSystem" }, -// { label: _Dashboard.DataExchange_ArchivedIncomingFromExternalSourceDataId, prop: "sourceDataId" }, -// { label: _Dashboard.DataExchange_ArchivedIncomingFromExternalSourceDataGroupCode, prop: "sourceDataGroupCode" }, -// { label: _Dashboard.DataExchange_ArchivedIncomingFromExternalSourceDataDetailCode, prop: "sourceDataDetailCode" }, -// { label: _Dashboard.DataExchange_ArchivedIncomingFromExternalSourceDataContent, prop: "sourceDataContent", type:"showJsonTable" }, -// { label: _Dashboard.DataExchange_ArchivedIncomingFromExternalWriteTime, prop: "writeTime",type:'dateTime' }, -// { label: _Dashboard.DataExchange_ArchivedIncomingFromExternalWriter, prop: "writer" }, -// { label: _Dashboard.DataExchange_ArchivedIncomingFromExternalDestinationSystem, prop: "destinationSystem" }, -// { label: _Dashboard.DataExchange_ArchivedIncomingFromExternalDestinationDataId, prop: "destinationDataId" }, -// { label: _Dashboard.DataExchange_ArchivedIncomingFromExternalDestinationDataContent, prop: "destinationDataContent", type:"showJsonTable" }, -// { label: _Dashboard.DataExchange_ArchivedIncomingFromExternalReadTime, prop: "readTime",type:'dateTime' }, -// { label: _Dashboard.DataExchange_ArchivedIncomingFromExternalReader, prop: "reader" }, -// { label: _Dashboard.DataExchange_ArchivedIncomingFromExternalErrorCode, prop: "errorCode" }, -// { label: _Dashboard.DataExchange_ArchivedIncomingFromExternalErrorMessage, prop: "errorMessage", type:"showDetail" }, -// { label: _Dashboard.DataExchange_ArchivedIncomingFromExternalRetryTimes, prop: "retryTimes" }, +// { 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" }, diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js index 595231746..92c9211c2 100644 --- a/fe/PC/src/utils/tabsDesTions/index.js +++ b/fe/PC/src/utils/tabsDesTions/index.js @@ -1,7 +1,5 @@ import zh from '@/lang/zh' let _Public = zh.ColumsPublic // 字段通用 -// let _Dashboard = zh.ColumsDashboard // 接口监控看板 -let _Dashboard = JSON.parse(localStorage.getItem("interfaceBoardColumnsNames")) // 接口监控看板 let _Names = zh.ColumsNames // 接口监控看板 // 基础信息数据管理 @@ -2690,44 +2688,3 @@ export const Department = [ // { label: "ID", prop: 'id' }, // ************** 确认隐藏 ************************ ] - -// 接口监控看板 -const initDashboardLable = (data) => { - return _Dashboard ? _Dashboard[data] : null -} -// 外部数据转换 -export const dataExchangeFromOut = [ - { - label: initDashboardLable('OutgoingToExternalNumber'), - prop: "number", - // fixed: "left", - // type: "name" - }, - { 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/views/interfaceBoard/TestSchool.vue b/fe/PC/src/views/interfaceBoard/TestSchool.vue index 9a2edd9f3..b8499003d 100644 --- a/fe/PC/src/views/interfaceBoard/TestSchool.vue +++ b/fe/PC/src/views/interfaceBoard/TestSchool.vue @@ -1,95 +1,341 @@ - +} + \ No newline at end of file diff --git a/fe/PC/src/views/interfaceBoard/_dataExchangeFromOut.vue b/fe/PC/src/views/interfaceBoard/_dataExchangeFromOut.vue deleted file mode 100644 index 4187f894a..000000000 --- a/fe/PC/src/views/interfaceBoard/_dataExchangeFromOut.vue +++ /dev/null @@ -1,304 +0,0 @@ - - - \ No newline at end of file diff --git a/fe/PC/src/views/interfaceBoard/dataExchangeFromOut.vue b/fe/PC/src/views/interfaceBoard/dataExchangeFromOut.vue index 9a2edd9f3..2ef9192df 100644 --- a/fe/PC/src/views/interfaceBoard/dataExchangeFromOut.vue +++ b/fe/PC/src/views/interfaceBoard/dataExchangeFromOut.vue @@ -34,8 +34,7 @@ import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins" import { mixins } from "@/mixins/mixins"; import { filterSelectMixins } from '@/mixins/filter-Select' - import { getInterfaceBoard,dataExchangeFromOut,dataExchangeFromOut_save,dataExchangeFromOut_delete } from "@/api/wms-interface" - import { getToken } from '@/utils/auth' + import { dataExchangeFromOut } from "@/api/wms-interface" export default { name: "dataExchangeFromOut", diff --git a/fe/PC/src/views/login/index.vue b/fe/PC/src/views/login/index.vue index 16ea649fa..c43240972 100644 --- a/fe/PC/src/views/login/index.vue +++ b/fe/PC/src/views/login/index.vue @@ -171,8 +171,12 @@ export default { // 提前获取接口监控看板表头数据并存储 // getInterfaceBoard().then(result => { // localStorage.setItem("interfaceBoardColumnsNames", JSON.stringify(result.data.localization.values.Dashboard)); + // this.$router.push({ path: '/'}) + // this.loading = false // }) // .catch(err => { + // this.$message.error('获取表头失败，请重试') + // this.loading = false // }) this.$router.push({ path: '/'}) this.loading = false