From 49b67fc3c60b0ba6db865ffd09299b45c4200b1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BE=99=E8=BF=90=E6=A8=A1?= <1724894114@qq.com> Date: Wed, 11 Dec 2024 16:28:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=8A=E5=88=97=E8=A1=A8=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 16 ++++++++-------- src/style/app.scss | 2 +- src/style/pages.scss | 2 +- src/views/cost/feeRecords/index.vue | 2 +- src/views/cost/shipmentStatistics/index.vue | 2 +- src/views/docsManager/document.vue | 2 +- src/views/earlyManager/index.vue | 2 +- src/views/order/inventoryList/index.vue | 2 +- src/views/order/inventoryStatistics/index.vue | 2 +- src/views/order/orderList/index.vue | 2 +- src/views/reports/keepRepairReports/index.vue | 2 +- src/views/reports/shipmentReports/index.vue | 2 +- src/views/serveView/components/commonPage.vue | 3 ++- src/views/setting/bom/index.vue | 2 +- src/views/setting/company/index.vue | 2 +- src/views/setting/log/components/ability.vue | 2 +- src/views/setting/log/components/command.vue | 2 +- src/views/setting/partsMag/components/info.vue | 2 +- .../setting/partsMag/components/library.vue | 2 +- src/views/setting/user/index.vue | 2 +- src/views/shipment/shipmentDataConfirm/index.vue | 2 +- src/views/shipment/shipmentStatistics/index.vue | 2 +- src/views/userCenter/user/logs.vue | 2 +- 23 files changed, 31 insertions(+), 30 deletions(-) diff --git a/.env.production b/.env.production index 3198248..6f8ae33 100644 --- a/.env.production +++ b/.env.production @@ -5,15 +5,15 @@ NODE_ENV = production VUE_APP_TITLE = 象纬云科 # 测试环境 -# VUE_APP_API_BASEURL = https://dev.api.linkwing.com/api/v1 -# VUE_APP_API_DEV = https://dev.api.linkwing.com/api/v1 -# VUE_APP_WS_URL = wss://dev.api.linkwing.com/wss -# VUE_APP_WSS_URL = wss://dev.api.linkwing.com/wss + VUE_APP_API_BASEURL = https://dev.api.linkwing.com/api/v1 + VUE_APP_API_DEV = https://dev.api.linkwing.com/api/v1 + VUE_APP_WS_URL = wss://dev.api.linkwing.com/wss + VUE_APP_WSS_URL = wss://dev.api.linkwing.com/wss # 线上环境 # 接口地址 # WS地址 - VUE_APP_API_BASEURL = https://prod.api.linkwing.com/api/v1 - VUE_APP_API_DEV = https://prod.api.linkwing.com/api/v1 - VUE_APP_WS_URL = wss://prod.api.linkwing.com/wss - VUE_APP_WSS_URL = wss://prod.api.linkwing.com/wss +# VUE_APP_API_BASEURL = https://prod.api.linkwing.com/api/v1 +# VUE_APP_API_DEV = https://prod.api.linkwing.com/api/v1 +# VUE_APP_WS_URL = wss://prod.api.linkwing.com/wss +# VUE_APP_WSS_URL = wss://prod.api.linkwing.com/wss diff --git a/src/style/app.scss b/src/style/app.scss index 6c4fb53..f768ef6 100644 --- a/src/style/app.scss +++ b/src/style/app.scss @@ -26,7 +26,7 @@ a,button,input,textarea{-webkit-tap-highlight-color:rgba(0,0,0,0);box-sizing: bo /* 头部 */ .adminui-header {height: 50px;background: #fff;color: #222;display: flex;justify-content:space-between;} -.adminui-header-left {display: flex;align-items: center;} +.adminui-header-left {display: flex;align-items: center;flex: 1;min-width: 0;} .adminui-header-right {display: flex;align-items: center;} .adminui-header .logo-bar {font-size: 18px;font-weight: bold;display: flex;align-items: center;justify-content: center;width: 190px;height: 100%;border-right: 1px solid #f2f2f2;} .adminui-header .isCollapse{width: 65px;} diff --git a/src/style/pages.scss b/src/style/pages.scss index 0c59a07..d91debc 100644 --- a/src/style/pages.scss +++ b/src/style/pages.scss @@ -25,7 +25,7 @@ /*common-page*/ .common-page {} .pageHeader{box-shadow: 0 1px 8px rgba(0,0,0,0.06);margin-bottom: 10px;} -.common-header-left {display: flex;align-items: center;} +.common-header-left {display: flex;align-items: center;flex: 1;min-width: 0;} .common-header-logo {display: flex;align-items: center;} .common-header-logo img {margin-right: 10px;vertical-align: bottom;width: 180px;} .common-header-logo label {font-size: 20px;} diff --git a/src/views/cost/feeRecords/index.vue b/src/views/cost/feeRecords/index.vue index 491ae77..a929aec 100644 --- a/src/views/cost/feeRecords/index.vue +++ b/src/views/cost/feeRecords/index.vue @@ -15,7 +15,7 @@
- 下载 + 导出
diff --git a/src/views/cost/shipmentStatistics/index.vue b/src/views/cost/shipmentStatistics/index.vue index 0dd8283..26e1cde 100644 --- a/src/views/cost/shipmentStatistics/index.vue +++ b/src/views/cost/shipmentStatistics/index.vue @@ -24,7 +24,7 @@
- 下载 + 导出
diff --git a/src/views/docsManager/document.vue b/src/views/docsManager/document.vue index 9f6040d..4d23f4a 100644 --- a/src/views/docsManager/document.vue +++ b/src/views/docsManager/document.vue @@ -55,7 +55,7 @@
- 下载 + 导出
diff --git a/src/views/earlyManager/index.vue b/src/views/earlyManager/index.vue index 3c81557..85d1e73 100644 --- a/src/views/earlyManager/index.vue +++ b/src/views/earlyManager/index.vue @@ -7,7 +7,7 @@
- 下载 + 导出
diff --git a/src/views/order/inventoryList/index.vue b/src/views/order/inventoryList/index.vue index 9234ece..9911b2e 100644 --- a/src/views/order/inventoryList/index.vue +++ b/src/views/order/inventoryList/index.vue @@ -13,7 +13,7 @@
- 下载 + 导出
diff --git a/src/views/order/inventoryStatistics/index.vue b/src/views/order/inventoryStatistics/index.vue index 14d4fe3..b686a05 100644 --- a/src/views/order/inventoryStatistics/index.vue +++ b/src/views/order/inventoryStatistics/index.vue @@ -14,7 +14,7 @@
- 下载 + 导出
diff --git a/src/views/order/orderList/index.vue b/src/views/order/orderList/index.vue index 781814d..c5828ee 100644 --- a/src/views/order/orderList/index.vue +++ b/src/views/order/orderList/index.vue @@ -17,7 +17,7 @@
- 下载 + 导出
diff --git a/src/views/reports/keepRepairReports/index.vue b/src/views/reports/keepRepairReports/index.vue index d6f0284..4746e4e 100644 --- a/src/views/reports/keepRepairReports/index.vue +++ b/src/views/reports/keepRepairReports/index.vue @@ -14,7 +14,7 @@
- 下载 + 导出
diff --git a/src/views/reports/shipmentReports/index.vue b/src/views/reports/shipmentReports/index.vue index d6f0284..4746e4e 100644 --- a/src/views/reports/shipmentReports/index.vue +++ b/src/views/reports/shipmentReports/index.vue @@ -14,7 +14,7 @@
- 下载 + 导出
diff --git a/src/views/serveView/components/commonPage.vue b/src/views/serveView/components/commonPage.vue index 31f0e24..fd3ff78 100644 --- a/src/views/serveView/components/commonPage.vue +++ b/src/views/serveView/components/commonPage.vue @@ -174,8 +174,9 @@ export default {