diff --git a/Web/.env.production b/Web/.env.production index b763518..825588d 100644 --- a/Web/.env.production +++ b/Web/.env.production @@ -2,5 +2,5 @@ ENV = 'production' # base api -VITE_API_BASE_URL = 'http://127.0.0.1:5001' +VITE_API_BASE_URL = 'http://192.168.1.228:7629' diff --git a/Web/src/api/common/index.js b/Web/src/api/common/index.js new file mode 100644 index 0000000..28e3535 --- /dev/null +++ b/Web/src/api/common/index.js @@ -0,0 +1,21 @@ +// 公用API +import request from '@/utils/request' + +// 获取分页 +export function getCommonPaged(urlName,params) { + return request({ + url: `/api/${urlName}/getpaged`, + method: 'get', + params:params + }) +} + +// 导出 +export function postCommonExport(urlName,params) { + return request({ + url: `/api/${urlName}/export`, + method: 'get', + responseType:'blob', + params:params + }) +} \ No newline at end of file diff --git a/Web/src/components/elPager/index.vue b/Web/src/components/elPager/index.vue new file mode 100644 index 0000000..fcc04a7 --- /dev/null +++ b/Web/src/components/elPager/index.vue @@ -0,0 +1,75 @@ + + + + + + \ No newline at end of file diff --git a/Web/src/components/elTable/index.vue b/Web/src/components/elTable/index.vue new file mode 100644 index 0000000..a1f52dc --- /dev/null +++ b/Web/src/components/elTable/index.vue @@ -0,0 +1,85 @@ + + + + + + \ No newline at end of file diff --git a/Web/src/components/tablePage/index.vue b/Web/src/components/tablePage/index.vue new file mode 100644 index 0000000..a6ca5eb --- /dev/null +++ b/Web/src/components/tablePage/index.vue @@ -0,0 +1,77 @@ + + + + + + \ No newline at end of file diff --git a/Web/src/settings.js b/Web/src/settings.js index c4b6000..6ffd73f 100644 --- a/Web/src/settings.js +++ b/Web/src/settings.js @@ -16,7 +16,7 @@ export default { /*** * 是否显示页脚 */ - showFooter: true, + showFooter: false, /** * @type {string | array} 'production' | ['production', 'development'] diff --git a/Web/src/utils/common/enumList.js b/Web/src/utils/common/enumList.js new file mode 100644 index 0000000..ccf51e3 --- /dev/null +++ b/Web/src/utils/common/enumList.js @@ -0,0 +1,8 @@ +const EnumList = { + whether:[ + {label:'是',value:1,type:'success'}, + {label:'否',value:0,type:'danger'} + ] +} + +export default EnumList diff --git a/Web/src/utils/formatTime.js b/Web/src/utils/formatTime.js index d6a8a26..94e6c2b 100644 --- a/Web/src/utils/formatTime.js +++ b/Web/src/utils/formatTime.js @@ -258,3 +258,15 @@ export function diffInSeconds(startDate, endDate) { const millisecondsPerSecond = 1000; return Math.floor((endDate - startDate) / millisecondsPerSecond); } + + +// 2022-08-31T09:45:51.9340433 转 2022-08-31 09:45:51 +export function formatTimeStrToStr(timeStr) { + if (!timeStr || !new Date(timeStr)) { + return '' + } + if (timeStr.lastIndexOf('.') == -1) { + return timeStr.replace('T',' ').substring(0,timeStr.length) + } + return timeStr.replace('T',' ').substring(0,timeStr.lastIndexOf('.')) +} \ No newline at end of file diff --git a/Web/src/views/logisticsPlan/supplierMrpMonth/index.vue b/Web/src/views/logisticsPlan/supplierMrpMonth/index.vue new file mode 100644 index 0000000..e4d32aa --- /dev/null +++ b/Web/src/views/logisticsPlan/supplierMrpMonth/index.vue @@ -0,0 +1,108 @@ + + + + + diff --git a/Web/src/views/logisticsPlan/supplierProPlaning/index.vue b/Web/src/views/logisticsPlan/supplierProPlaning/index.vue new file mode 100644 index 0000000..0f139ca --- /dev/null +++ b/Web/src/views/logisticsPlan/supplierProPlaning/index.vue @@ -0,0 +1,125 @@ + + + + + diff --git a/Web/src/views/logisticsPlan/supplierSaWeek/index.vue b/Web/src/views/logisticsPlan/supplierSaWeek/index.vue new file mode 100644 index 0000000..903e34c --- /dev/null +++ b/Web/src/views/logisticsPlan/supplierSaWeek/index.vue @@ -0,0 +1,98 @@ + + + + + diff --git a/Web/src/views/system/autoJob/index.vue b/Web/src/views/system/autoJob/index.vue index 4c1cb1a..ec157b6 100644 --- a/Web/src/views/system/autoJob/index.vue +++ b/Web/src/views/system/autoJob/index.vue @@ -63,7 +63,7 @@ - diff --git a/Web/src/views/system/dataDict/index.vue b/Web/src/views/system/dataDict/index.vue index 13a371c..7b4554c 100644 --- a/Web/src/views/system/dataDict/index.vue +++ b/Web/src/views/system/dataDict/index.vue @@ -55,7 +55,7 @@ - diff --git a/Web/src/views/system/log/logEventIndex.vue b/Web/src/views/system/log/logEventIndex.vue index 9e4440f..61ddc8c 100644 --- a/Web/src/views/system/log/logEventIndex.vue +++ b/Web/src/views/system/log/logEventIndex.vue @@ -32,7 +32,7 @@ - diff --git a/Web/src/views/system/log/logExceptionIndex.vue b/Web/src/views/system/log/logExceptionIndex.vue index 5fb9786..e1f5622 100644 --- a/Web/src/views/system/log/logExceptionIndex.vue +++ b/Web/src/views/system/log/logExceptionIndex.vue @@ -47,7 +47,7 @@ - diff --git a/Web/src/views/system/log/logJobIndex.vue b/Web/src/views/system/log/logJobIndex.vue index 3011d8c..d243909 100644 --- a/Web/src/views/system/log/logJobIndex.vue +++ b/Web/src/views/system/log/logJobIndex.vue @@ -32,7 +32,7 @@ - diff --git a/Web/src/views/system/log/logLoginIndex.vue b/Web/src/views/system/log/logLoginIndex.vue index 3f89cf5..1a6612e 100644 --- a/Web/src/views/system/log/logLoginIndex.vue +++ b/Web/src/views/system/log/logLoginIndex.vue @@ -31,7 +31,7 @@ - diff --git a/Web/src/views/system/log/logOperateIndex.vue b/Web/src/views/system/log/logOperateIndex.vue index 798a78d..f29703e 100644 --- a/Web/src/views/system/log/logOperateIndex.vue +++ b/Web/src/views/system/log/logOperateIndex.vue @@ -44,7 +44,7 @@ - diff --git a/Web/src/views/system/message/publishIndex.vue b/Web/src/views/system/message/publishIndex.vue index 9bac363..2af77b0 100644 --- a/Web/src/views/system/message/publishIndex.vue +++ b/Web/src/views/system/message/publishIndex.vue @@ -85,7 +85,7 @@