diff --git a/fe/PC/public/config.js b/fe/PC/public/config.js
index c443cca3b..5e620a5ee 100644
--- a/fe/PC/public/config.js
+++ b/fe/PC/public/config.js
@@ -23,6 +23,8 @@ 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['interfaceBoardColumnsApi'] = 'api/abp/application-configuration'
// mock
// window.SITE_CONFIG['apifoxToken'] = 'NXHNi5mp0dnUHGt0wkCrjvfcidsFKV33'
diff --git a/fe/PC/public/version.json b/fe/PC/public/version.json
index 3a1d429ca..9287b0af9 100644
--- a/fe/PC/public/version.json
+++ b/fe/PC/public/version.json
@@ -1,3 +1,3 @@
{
- "version": "1.0.34"
+ "version": "1.0.35"
}
\ No newline at end of file
diff --git a/fe/PC/src/App.vue b/fe/PC/src/App.vue
index f98313b85..c52b9824e 100644
--- a/fe/PC/src/App.vue
+++ b/fe/PC/src/App.vue
@@ -18,7 +18,7 @@ localStorage.setItem('apifoxToken',window.SITE_CONFIG['apifoxToken'])
localStorage.setItem('reportsUrl',window.SITE_CONFIG['reportsUrl'])
localStorage.setItem('companyName',window.SITE_CONFIG['companyName'])
localStorage.setItem('interfaceBoardUrl',window.SITE_CONFIG['interfaceBoardUrl'])
-
+localStorage.setItem('interfaceBoardColumnsApi',window.SITE_CONFIG['interfaceBoardColumnsApi'])
\ No newline at end of file
diff --git a/fe/PC/src/views/interfaceBoard/comingFromOut.vue b/fe/PC/src/views/interfaceBoard/comingFromOut.vue
index 15f347a17..b99dec2fe 100644
--- a/fe/PC/src/views/interfaceBoard/comingFromOut.vue
+++ b/fe/PC/src/views/interfaceBoard/comingFromOut.vue
@@ -47,7 +47,7 @@
currenButtonData: [
this.defaultFieldSettingBtn(),//字段设置
this.defaultFreshBtn(),//刷新
- // this.defaultFilterBtn(),//筛选
+ // this.defaultFilterBtn(),//筛选
],
};
},
diff --git a/fe/PC/src/views/interfaceBoard/comingFromOut_file.vue b/fe/PC/src/views/interfaceBoard/comingFromOut_file.vue
index 40646beda..a6512c1d5 100644
--- a/fe/PC/src/views/interfaceBoard/comingFromOut_file.vue
+++ b/fe/PC/src/views/interfaceBoard/comingFromOut_file.vue
@@ -47,7 +47,7 @@
currenButtonData: [
this.defaultFieldSettingBtn(),//字段设置
this.defaultFreshBtn(),//刷新
- // this.defaultFilterBtn(),//筛选
+ // this.defaultFilterBtn(),//筛选
],
};
},
diff --git a/fe/PC/src/views/interfaceBoard/comingToWms.vue b/fe/PC/src/views/interfaceBoard/comingToWms.vue
index a53aef709..c2a5e9db6 100644
--- a/fe/PC/src/views/interfaceBoard/comingToWms.vue
+++ b/fe/PC/src/views/interfaceBoard/comingToWms.vue
@@ -48,7 +48,7 @@
currenButtonData: [
this.defaultFieldSettingBtn(),//字段设置
this.defaultFreshBtn(),//刷新
- // this.defaultFilterBtn(),//筛选
+ // this.defaultFilterBtn(),//筛选
],
};
},
diff --git a/fe/PC/src/views/interfaceBoard/comingToWms_file.vue b/fe/PC/src/views/interfaceBoard/comingToWms_file.vue
index 64b432d0f..a4160d1cb 100644
--- a/fe/PC/src/views/interfaceBoard/comingToWms_file.vue
+++ b/fe/PC/src/views/interfaceBoard/comingToWms_file.vue
@@ -47,7 +47,7 @@
currenButtonData: [
this.defaultFieldSettingBtn(),//字段设置
this.defaultFreshBtn(),//刷新
- // this.defaultFilterBtn(),//筛选
+ // this.defaultFilterBtn(),//筛选
],
};
},
diff --git a/fe/PC/src/views/interfaceBoard/dataExchangeFromOut.vue b/fe/PC/src/views/interfaceBoard/dataExchangeFromOut.vue
index 0e69e73d3..9a2edd9f3 100644
--- a/fe/PC/src/views/interfaceBoard/dataExchangeFromOut.vue
+++ b/fe/PC/src/views/interfaceBoard/dataExchangeFromOut.vue
@@ -24,36 +24,6 @@
:httpOverallSearchData="httpOverallSearchData"
>
-
-
- (displayDialog.detailsDialog = val)"
- @drawerbutton="drawerbutton"
- @handleCommand="drawerHandle"
- @close-value="closeValue"
- >
diff --git a/fe/PC/src/views/interfaceBoard/dataExchangeFromOut_file.vue b/fe/PC/src/views/interfaceBoard/dataExchangeFromOut_file.vue
index aaef0872f..efb9d88b6 100644
--- a/fe/PC/src/views/interfaceBoard/dataExchangeFromOut_file.vue
+++ b/fe/PC/src/views/interfaceBoard/dataExchangeFromOut_file.vue
@@ -31,7 +31,7 @@
import { LoadingMixins } from "@/mixins/LoadingMixins";
import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
import { mixins } from "@/mixins/mixins";
- import { dataExchangeFromOut_file } from "@/api/wms-interface"
+ import { getInterfaceBoard,dataExchangeFromOut_file } from "@/api/wms-interface"
export default {
name: "dataExchangeFromOut_file",
@@ -47,16 +47,60 @@
currenButtonData: [
this.defaultFieldSettingBtn(),//字段设置
this.defaultFreshBtn(),//刷新
- // this.defaultFilterBtn(),//筛选
+ // this.defaultFilterBtn(),//筛选
],
+ setInterfaceBoardTableColumns:this.setTableColumns()
};
},
mounted() {
this.paging();
},
methods: {
- //渲染数据
- paging(callback) {
+ setTableColumns(){
+ let interfaceBoardColumnsNames = localStorage.getItem("interfaceBoardColumnsNames")
+ if(!interfaceBoardColumnsNames){
+ console.log('获取接口监控看板表头数据并存储')
+
+ .catch(err => {
+ })
+ }else{
+ let _Dashboard = JSON.parse(localStorage.getItem("interfaceBoardColumnsNames")) // 接口监控看板
+ return [
+ { label: '11111', prop: "number" },
+ { label: _Dashboard.ArchivedOutgoingToExternalNumber, prop: "number" },
+ { label: _Dashboard.ArchivedOutgoingToExternalRemark, prop: "remark", type:"showDetail" },
+ { label: _Dashboard.ArchivedOutgoingToExternalDataType, prop: "dataType" },
+ { label: _Dashboard.ArchivedOutgoingToExternalTableType, prop: "tableType" },
+ { label: _Dashboard.ArchivedOutgoingToExternalDataAction, prop: "dataAction" },
+ { label: _Dashboard.ArchivedOutgoingToExternalEffectiveDate, prop: "effectiveDate",type:'dateTime' },
+ { label: _Dashboard.ArchivedOutgoingToExternalStatus, prop: "status" },
+ { label: _Dashboard.ArchivedOutgoingToExternalSourceSystem, prop: "sourceSystem" },
+ { label: _Dashboard.ArchivedOutgoingToExternalSourceDataId, prop: "sourceDataId" },
+ { label: _Dashboard.ArchivedOutgoingToExternalSourceDataGroupCode, prop: "sourceDataGroupCode" },
+ { label: _Dashboard.ArchivedOutgoingToExternalSourceDataDetailCode, prop: "sourceDataDetailCode" },
+ { label: _Dashboard.ArchivedOutgoingToExternalSourceDataContent, prop: "sourceDataContent", type:"showJsonTable" },
+ { label: _Dashboard.ArchivedOutgoingToExternalWriteTime, prop: "writeTime",type:'dateTime' },
+ { label: _Dashboard.ArchivedOutgoingToExternalWriter, prop: "writer" },
+ { label: _Dashboard.ArchivedOutgoingToExternalDestinationSystem, prop: "destinationSystem" },
+ { label: _Dashboard.ArchivedOutgoingToExternalDestinationDataId, prop: "destinationDataId" },
+ { label: _Dashboard.ArchivedOutgoingToExternalDestinationDataContent, prop: "destinationDataContent", type:"showJsonTable" },
+ { label: _Dashboard.ArchivedOutgoingToExternalReadTime, prop: "readTime",type:'dateTime' },
+ { label: _Dashboard.ArchivedOutgoingToExternalReader, prop: "reader" },
+ { label: _Dashboard.ArchivedOutgoingToExternalErrorCode, prop: "errorCode" },
+ { label: _Dashboard.ArchivedOutgoingToExternalErrorMessage, prop: "errorMessage", type:"showDetail" },
+ { label: _Dashboard.ArchivedOutgoingToExternalRetryTimes, prop: "retryTimes" },
+ // ************** 暂时隐藏 ************************
+ // { label: _Public.creationTime, prop: "creationTime",type:'dateTime' },
+ // { label: _Public.creatorId, prop: "creatorId" },
+ // { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' },
+ // { label: _Public.lastModifierId, prop: "lastModifierId" },
+ // { label: _Public.ID, prop: "ID" },
+ ]
+ }
+
+ },
+ //渲染数据
+ paging(callback) {
this.Loading.tableLoading = true;
this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount,
dataExchangeFromOut_file(this.PageListParams)
diff --git a/fe/PC/src/views/interfaceBoard/dataExchangeFromWms.vue b/fe/PC/src/views/interfaceBoard/dataExchangeFromWms.vue
index 6cc8f4081..2f90c41d6 100644
--- a/fe/PC/src/views/interfaceBoard/dataExchangeFromWms.vue
+++ b/fe/PC/src/views/interfaceBoard/dataExchangeFromWms.vue
@@ -47,7 +47,7 @@
currenButtonData: [
this.defaultFieldSettingBtn(),//字段设置
this.defaultFreshBtn(),//刷新
- // this.defaultFilterBtn(),//筛选
+ // this.defaultFilterBtn(),//筛选
],
};
},
diff --git a/fe/PC/src/views/interfaceBoard/dataExchangeFromWms_file.vue b/fe/PC/src/views/interfaceBoard/dataExchangeFromWms_file.vue
index 4e831e7d5..24821e6ee 100644
--- a/fe/PC/src/views/interfaceBoard/dataExchangeFromWms_file.vue
+++ b/fe/PC/src/views/interfaceBoard/dataExchangeFromWms_file.vue
@@ -47,7 +47,7 @@
currenButtonData: [
this.defaultFieldSettingBtn(),//字段设置
this.defaultFreshBtn(),//刷新
- // this.defaultFilterBtn(),//筛选
+ // this.defaultFilterBtn(),//筛选
],
};
},