diff --git a/fe/PC/src/api/wms-interface.js b/fe/PC/src/api/wms-interface.js
new file mode 100644
index 000000000..41f10698d
--- /dev/null
+++ b/fe/PC/src/api/wms-interface.js
@@ -0,0 +1,86 @@
+// 接口监控看板相关api
+import axios from 'axios'
+let interfaceBoard_api = localStorage.getItem('interfaceBoardUrl') + 'api/app/'
+// 转义传参
+const initParams = (data) => {
+ return {
+ skipCount:data.SkipCount,
+ maxResultCount:data.MaxResultCount,
+ sorting:data.Sorting
+ }
+}
+//外部数据转换
+export function dataExchangeFromOut(data) {
+ return axios({
+ method:'get',
+ url: interfaceBoard_api + 'outgoing-to-external',
+ params:initParams(data)
+ })
+}
+
+//归档外部数据转换
+export function dataExchangeFromOut_file(data) {
+ return axios({
+ method:'get',
+ url: interfaceBoard_api + 'archived-outgoing-to-external',
+ params:initParams(data)
+ })
+}
+
+//wms数据接收
+export function comingToWms(data) {
+ return axios({
+ method:'get',
+ url: interfaceBoard_api + 'incoming-to-wms',
+ params:initParams(data)
+ })
+}
+
+//归档wms数据接收
+export function comingToWms_file(data) {
+ return axios({
+ method:'get',
+ url: interfaceBoard_api + 'archived-incoming-to-wms',
+ params:initParams(data)
+ })
+}
+
+//wms数据转换
+export function dataExchangeFromWms(data) {
+ return axios({
+ method:'get',
+ url: interfaceBoard_api + 'data-exchange_Outgoing-from-wms',
+ params:initParams(data)
+ })
+}
+
+// 归档wms数据转换
+export function dataExchangeFromWms_file(data) {
+ return axios({
+ method:'get',
+ url: interfaceBoard_api + 'data-exchange_Archived-outgoing-from-wms',
+ params:initParams(data)
+ })
+}
+
+//外部数据接收
+export function comingFromOut(data) {
+ return axios({
+ method:'get',
+ url: interfaceBoard_api + 'data-exchange_Incoming-from-external',
+ params:initParams(data)
+ })
+}
+
+//归档外部数据接收
+export function comingFromOut_file(data) {
+ return axios({
+ method:'get',
+ url: interfaceBoard_api + 'data-exchange_Archived-incoming-from-external',
+ params:initParams(data)
+ })
+}
+
+
+
+
diff --git a/fe/PC/src/components/tablePagination/index.vue b/fe/PC/src/components/tablePagination/index.vue
index d90b40d05..89d948364 100644
--- a/fe/PC/src/components/tablePagination/index.vue
+++ b/fe/PC/src/components/tablePagination/index.vue
@@ -53,6 +53,7 @@
:tableBorder="true"
:firstFixed="true"
:cellStyle = "cellStyle"
+ :showOverflowTooltip="showOverflowTooltip"
>
@@ -84,6 +85,11 @@ export default {
rowDrop
},
props: {
+ // 超出内容是否提示
+ showOverflowTooltip:{
+ type: Boolean,
+ default: true,
+ },
// 显示搜索配置
quicklySearchOption:{
type: Object,
diff --git a/fe/PC/src/components/umyTable/index.vue b/fe/PC/src/components/umyTable/index.vue
index 00cde0744..3aba21480 100644
--- a/fe/PC/src/components/umyTable/index.vue
+++ b/fe/PC/src/components/umyTable/index.vue
@@ -27,7 +27,7 @@
:prop="item.showProp ? item.prop + '.' + item.showProp : item.prop"
:sortable="item.sortable"
:fixed="setItemFixed(item,index)"
- :show-overflow-tooltip="true"
+ :show-overflow-tooltip="showOverflowTooltip"
:width="item.width"
:align="item.tableAlign"
:header-align="item.tableHeaderAlign"
@@ -306,16 +306,85 @@
{{ scope.row[item.prop] | triggerList(item.filters, "label") }}
+
+ {{ scope.row[item.prop] ? scope.row[item.prop] + "" : scope.row[item.prop] }}
+
+ {{ scope.row[item.prop] ? scope.row[item.prop] + "" : scope.row[item.prop] }}
{{ scope.row[item.prop] ? scope.row[item.prop] + "" : scope.row[item.prop] }}
-
+
+
+
+
+ {{ showDetailData ? showDetailData + "" : showDetailData }}
+
+
+
+
+
+
+
+
+
+ {{scope.row}}
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/fe/PC/src/views/interfaceBoard/comingToWms_file.vue b/fe/PC/src/views/interfaceBoard/comingToWms_file.vue
new file mode 100644
index 000000000..0d83678ae
--- /dev/null
+++ b/fe/PC/src/views/interfaceBoard/comingToWms_file.vue
@@ -0,0 +1,79 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/fe/PC/src/views/interfaceBoard/dataExchangeFromOut.vue b/fe/PC/src/views/interfaceBoard/dataExchangeFromOut.vue
new file mode 100644
index 000000000..2d7c0dbec
--- /dev/null
+++ b/fe/PC/src/views/interfaceBoard/dataExchangeFromOut.vue
@@ -0,0 +1,79 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/fe/PC/src/views/interfaceBoard/dataExchangeFromOut_file.vue b/fe/PC/src/views/interfaceBoard/dataExchangeFromOut_file.vue
new file mode 100644
index 000000000..e67fc410e
--- /dev/null
+++ b/fe/PC/src/views/interfaceBoard/dataExchangeFromOut_file.vue
@@ -0,0 +1,79 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/fe/PC/src/views/interfaceBoard/dataExchangeFromWms.vue b/fe/PC/src/views/interfaceBoard/dataExchangeFromWms.vue
new file mode 100644
index 000000000..d86c2d707
--- /dev/null
+++ b/fe/PC/src/views/interfaceBoard/dataExchangeFromWms.vue
@@ -0,0 +1,79 @@
+
+
+
+
+
\ No newline at end of file