diff --git a/public/img/logo-login.png b/public/img/logo-login.png new file mode 100644 index 00000000..e88b54c5 Binary files /dev/null and b/public/img/logo-login.png differ diff --git a/src/option/storagecost/Traincostbreakdown.js b/src/option/storagecost/Traincostbreakdown.js index 7f9af562..9451d7dd 100644 --- a/src/option/storagecost/Traincostbreakdown.js +++ b/src/option/storagecost/Traincostbreakdown.js @@ -89,6 +89,17 @@ export const columnList = [ sortable: true, head: false, }, + { + prop: 'trainCompletionTime', + label: '复核完成时', + type: 1, + values: '', + width: '200', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, { prop: 'destinationWarehouse', label: '目的仓', diff --git a/src/page/login/index.vue b/src/page/login/index.vue index 8ce5e630..6f482da9 100644 --- a/src/page/login/index.vue +++ b/src/page/login/index.vue @@ -14,8 +14,10 @@
@@ -76,7 +78,7 @@ export default { this.handleLogin(); this.getTime(); }, - mounted() {}, + mounted() { }, computed: { ...mapGetters(['tagWel']), }, @@ -148,13 +150,29 @@ export default { diff --git a/src/page/login/userlogin.vue b/src/page/login/userlogin.vue index 105f0cba..40e4d913 100644 --- a/src/page/login/userlogin.vue +++ b/src/page/login/userlogin.vue @@ -1,7 +1,5 @@