diff --git a/public/config.js b/public/config.js index 1d6ece1..b3cab0c 100644 --- a/public/config.js +++ b/public/config.js @@ -6,11 +6,8 @@ // } config = { // API_URL: 'http://172.119.50.248:8081', - API_URL: 'http://121.36.65.171:9999', - // API_URL: 'http://10.10.9.71:8081', + // API_URL: 'http://121.36.65.171:9999', + API_URL: 'http://10.10.9.71:8081', - // UPLOAD_URL: "http://61.135.192.42:8082/attachment/uploadOne", - // DOWNLOAD_URL: "http://61.135.192.42:8082/api-ftp/ftp/download?filename=", - // SHOW_URL: "http://www.fatoaniic.com/ftpfile/", } \ No newline at end of file diff --git a/public/img/icons/android-chrome-192x192.png b/public/img/icons/android-chrome-192x192.png new file mode 100644 index 0000000..b02aa64 Binary files /dev/null and b/public/img/icons/android-chrome-192x192.png differ diff --git a/public/img/icons/android-chrome-512x512.png b/public/img/icons/android-chrome-512x512.png new file mode 100644 index 0000000..06088b0 Binary files /dev/null and b/public/img/icons/android-chrome-512x512.png differ diff --git a/public/img/icons/android-chrome-maskable-192x192.png b/public/img/icons/android-chrome-maskable-192x192.png new file mode 100644 index 0000000..791e9c8 Binary files /dev/null and b/public/img/icons/android-chrome-maskable-192x192.png differ diff --git a/public/img/icons/android-chrome-maskable-512x512.png b/public/img/icons/android-chrome-maskable-512x512.png new file mode 100644 index 0000000..5f2098e Binary files /dev/null and b/public/img/icons/android-chrome-maskable-512x512.png differ diff --git a/public/img/icons/apple-touch-icon-120x120.png b/public/img/icons/apple-touch-icon-120x120.png new file mode 100644 index 0000000..1427cf6 Binary files /dev/null and b/public/img/icons/apple-touch-icon-120x120.png differ diff --git a/public/img/icons/apple-touch-icon-152x152.png b/public/img/icons/apple-touch-icon-152x152.png new file mode 100644 index 0000000..f24d454 Binary files /dev/null and b/public/img/icons/apple-touch-icon-152x152.png differ diff --git a/public/img/icons/apple-touch-icon-180x180.png b/public/img/icons/apple-touch-icon-180x180.png new file mode 100644 index 0000000..404e192 Binary files /dev/null and b/public/img/icons/apple-touch-icon-180x180.png differ diff --git a/public/img/icons/apple-touch-icon-60x60.png b/public/img/icons/apple-touch-icon-60x60.png new file mode 100644 index 0000000..cf10a56 Binary files /dev/null and b/public/img/icons/apple-touch-icon-60x60.png differ diff --git a/public/img/icons/apple-touch-icon-76x76.png b/public/img/icons/apple-touch-icon-76x76.png new file mode 100644 index 0000000..c500769 Binary files /dev/null and b/public/img/icons/apple-touch-icon-76x76.png differ diff --git a/public/img/icons/apple-touch-icon.png b/public/img/icons/apple-touch-icon.png new file mode 100644 index 0000000..03c0c5d Binary files /dev/null and b/public/img/icons/apple-touch-icon.png differ diff --git a/public/img/icons/favicon-16x16.png b/public/img/icons/favicon-16x16.png new file mode 100644 index 0000000..3408040 Binary files /dev/null and b/public/img/icons/favicon-16x16.png differ diff --git a/public/img/icons/favicon-32x32.png b/public/img/icons/favicon-32x32.png new file mode 100644 index 0000000..3408040 Binary files /dev/null and b/public/img/icons/favicon-32x32.png differ diff --git a/public/img/icons/msapplication-icon-144x144.png b/public/img/icons/msapplication-icon-144x144.png new file mode 100644 index 0000000..7808237 Binary files /dev/null and b/public/img/icons/msapplication-icon-144x144.png differ diff --git a/public/img/icons/mstile-150x150.png b/public/img/icons/mstile-150x150.png new file mode 100644 index 0000000..3b37a43 Binary files /dev/null and b/public/img/icons/mstile-150x150.png differ diff --git a/public/img/icons/safari-pinned-tab.svg b/public/img/icons/safari-pinned-tab.svg new file mode 100644 index 0000000..732afd8 --- /dev/null +++ b/public/img/icons/safari-pinned-tab.svg @@ -0,0 +1,149 @@ + + + + +Created by potrace 1.11, written by Peter Selinger 2001-2013 + + + + + diff --git a/public/index.html b/public/index.html index 066c65d..1dea119 100644 --- a/public/index.html +++ b/public/index.html @@ -5,7 +5,7 @@ - + 牛栏山工业互联网防伪系统 diff --git a/src/api/get.js b/src/api/get.js index cdaa13c..5501308 100644 --- a/src/api/get.js +++ b/src/api/get.js @@ -59,4 +59,13 @@ export function getDownloadUrl(params) { }); } +//下载txt +export function downFiles(params) { + return request({ + url: params, + // responseType: 'blob', + method: 'get', + // params + }); +} diff --git a/src/views/get/cancel.vue b/src/views/get/cancel.vue index a01ecaf..af19ba1 100644 --- a/src/views/get/cancel.vue +++ b/src/views/get/cancel.vue @@ -73,6 +73,8 @@ import { getDiscardList,addDiscard } from "@/api/cancel" import { getFetchList } from "@/api/get" +import {getToken} from "@/utils/auth" import {getDayTime,getDay2} from "@/utils/validate" export default { name: "getCancel", @@ -103,6 +106,9 @@ export default { time: '', number: '', }, + upload_headers:{ + token: getToken() || '' + }, UPLOAD_URL:config.API_URL + '/discard/upload', currentPage: 1, //当前页 pageSize: 10, //每页条数 @@ -183,6 +189,7 @@ export default { message: res.msg, type: res.code == 200 ? 'success' : 'error' }); + this.initData() }) this.resetForm('cancelForm') } else { diff --git a/src/views/get/deliverGoods.vue b/src/views/get/deliverGoods.vue index 66f8fa4..9667c67 100644 --- a/src/views/get/deliverGoods.vue +++ b/src/views/get/deliverGoods.vue @@ -67,7 +67,9 @@ :rules="paramsForm.paramsRules.receipt">