From 24b7097bef89eb8de2136277bc52abd30775a16c Mon Sep 17 00:00:00 2001
From: CD配唱片 <CD配唱片>
Date: 星期四, 24 四月 2025 15:19:35 +0800
Subject: [PATCH] 解决导出冲突
---
/dev/null | 13 ------
.env.development | 2
.env.int | 2
src/views/mainPlan/platePlanList/index.vue | 33 ++++++++--------
package.json | 14 +++----
.env.production | 7 ---
.env.uat | 4 +-
7 files changed, 27 insertions(+), 48 deletions(-)
diff --git a/.env.dev b/.env.dev
deleted file mode 100644
index bd1b5ff..0000000
--- a/.env.dev
+++ /dev/null
@@ -1,13 +0,0 @@
-# 椤甸潰鏍囬
-VITE_APP_TITLE = APS
-
-# 寮�鍙戠幆澧冮厤缃�
-VITE_APP_ENV = 'dev'
-
-# 鑻ヤ緷绠＄悊绯荤粺/寮�鍙戠幆澧�
-VITE_APP_BASE_API = '/prod-api'
-# 鏍囪瘑鏈湴寮�鍙戞湇鍔★紝鐢ㄤ簬GateWay杞彂鍒版湰鍦版湇鍔�
-# 閰嶅悎鍚庣鏈嶅姟
-# VITE_APP_LOCAL = 'int'
-# VITE_APP_LOCAL = 'hjy'
-VITE_APP_LOCAL = 'zhl'
\ No newline at end of file
diff --git a/.env.development b/.env.development
index 584e630..6a34bf6 100644
--- a/.env.development
+++ b/.env.development
@@ -9,4 +9,4 @@
# 鏍囪瘑鏈湴寮�鍙戞湇鍔★紝鐢ㄤ簬GateWay杞彂鍒版湰鍦版湇鍔�
# 閰嶅悎鍚庣鏈嶅姟
# VITE_APP_LOCAL = 'int'
-VITE_APP_LOCAL = 'int'
+VITE_APP_LOCAL = 'zhl'
diff --git a/.env.staging b/.env.int
similarity index 88%
rename from .env.staging
rename to .env.int
index 1b6cadc..1bacc5f 100644
--- a/.env.staging
+++ b/.env.int
@@ -2,7 +2,7 @@
VITE_APP_TITLE = APS
# 鐢熶骇鐜閰嶇疆
-VITE_APP_ENV = 'staging'
+VITE_APP_ENV = 'production'
# 鑻ヤ緷绠＄悊绯荤粺/鐢熶骇鐜
VITE_APP_BASE_API = '/prod-api'
diff --git a/.env.production b/.env.production
index 7d77f07..c3d198e 100644
--- a/.env.production
+++ b/.env.production
@@ -9,10 +9,3 @@
# 鏄惁鍦ㄦ墦鍖呮椂寮�鍚帇缂╋紝鏀寔 gzip 鍜� brotli
VITE_BUILD_COMPRESS = gzip
-
-# 鏍囪瘑鏈湴寮�鍙戞湇鍔★紝鐢ㄤ簬GateWay杞彂鍒版湰鍦版湇鍔�
-# 閰嶅悎鍚庣鏈嶅姟
-VITE_APP_LOCAL = 'int'
-
-# 椤甸潰鏍囬
-VITE_APP_TITLE = APS
diff --git a/.env.staging b/.env.uat
similarity index 81%
copy from .env.staging
copy to .env.uat
index 1b6cadc..39aee07 100644
--- a/.env.staging
+++ b/.env.uat
@@ -2,11 +2,11 @@
VITE_APP_TITLE = APS
# 鐢熶骇鐜閰嶇疆
-VITE_APP_ENV = 'staging'
+VITE_APP_ENV = 'production'
# 鑻ヤ緷绠＄悊绯荤粺/鐢熶骇鐜
VITE_APP_BASE_API = '/prod-api'
-VITE_APP_LOCAL = 'int'
+
# 鏄惁鍦ㄦ墦鍖呮椂寮�鍚帇缂╋紝鏀寔 gzip 鍜� brotli
VITE_BUILD_COMPRESS = gzip
diff --git a/package.json b/package.json
index 5fffbc4..b3d39e0 100644
--- a/package.json
+++ b/package.json
@@ -1,17 +1,15 @@
{
- "name": "ruoyi",
+ "name": "aps",
"version": "3.6.5",
- "description": "鑻ヤ緷绠＄悊绯荤粺",
- "author": "鑻ヤ緷",
+ "description": "APS",
+ "author": "aps",
"license": "MIT",
"type": "module",
"scripts": {
- "dev:local": "vite --mode dev",
- "dev": "vite --mode development",
- "dev:stage": "vite --mode staging",
+ "dev": "vite",
+ "build:int": "vite build --mode int",
+ "build:uat": "vite build --mode uat",
"build:prod": "vite build --mode production",
- "build:dev": "vite build --mode development",
- "build:stage": "vite build --mode staging",
"preview": "vite preview"
},
"repository": {
diff --git a/src/views/mainPlan/platePlanList/index.vue b/src/views/mainPlan/platePlanList/index.vue
index aa02926..a48996f 100644
--- a/src/views/mainPlan/platePlanList/index.vue
+++ b/src/views/mainPlan/platePlanList/index.vue
@@ -39,7 +39,7 @@
plain
icon="Download"
@click="handleExport"
- v-hasPermi="['apsPlateProcessStat:export']"
+ v-hasPermi="['plateProcessShopStat:export']"
>瀵煎嚭</el-button
>
</el-col>
@@ -164,66 +164,67 @@
{
title: "涓氬姟绫诲瀷",
field: "businessType",
+ width: 150,
},
{
title: "鍗曟嵁鍙�",
field: "documentNumber",
- width: 100,
+ width: 200,
},
{
title: "褰撳墠宸ュ簭鍙�",
field: "currentProcessNumberTxt",
- width: 100,
+ width: 150,
},
{
title: "闇�姹傚垎绫�",
field: "requirementType",
- width: 80,
+ width: 100,
},
{
title: "鍗曟嵁鐘舵��",
field: "documentStatus",
- width: 80,
+ width: 100,
},
{
title: "褰撳墠宸ュ簭",
field: "workCenter",
- width: 80,
+ width: 200,
},
{
title: "璁″垝寮�宸ユ棩",
field: "processPlanStartDaytxt",
- width: 140,
+ width: 200,
type: "html",
},
{
title: "鏂欏彿",
field: "itemNumber",
- width: 140,
+ width: 150,
type: "html",
},
{
title: "鍥惧彿",
field: "drawingNo",
- width: 120,
+ width: 150,
// format: 'YYYY-MM-DD'
},
{
title: "鐗堟湰鍙�",
field: "versionNumber",
- width: 140,
+ width: 100,
type: "html",
},
{
title: "鐢熶骇鏁伴噺",
field: "productionQuantity",
- width: 140,
+ width: 100,
type: "html",
},
{
title: "璁″垝瀹屽伐鏃�",
field: "planEndDay",
- width: 140,
+ width: 150,
format: "YYYY-MM-DD hh:mm:ss",
},
]);
@@ -377,10 +378,10 @@
`aps_plate_process_shop_stat_${new Date().getTime()}.xlsx`
);
}
-
-onMounted(async () => {
- getList();
-});
+getList();
+// onMounted(async () => {
+//
+// });
</script>
<style lang="scss" scoped>
::v-deep(.mytable-style.vxe-table .vxe-body--row.row-green) {
--
Gitblit v1.9.3