diff --git a/.env b/.env index 80e701f49..74e66bb15 100644 --- a/.env +++ b/.env @@ -1,5 +1,5 @@ # 标题 -VITE_APP_TITLE=富维海拉管理系统 +VITE_APP_TITLE=富维海拉智慧工厂管理平台 # 项目本地运行端口号 VITE_PORT=80 diff --git a/README.md b/README.md index d3e92e517..b955cfeb8 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,8 @@ form: { searchTitle: '生产线物料关系信息', // 查询弹窗标题 hiddenFilterButton:true,//是否隐藏筛选按钮 dialogWidth:'100px',//搜索出来弹窗的宽度 + isConcatDetailSchemas:true, // 是否主子表合并 + searchDetailSchemas: PurchasereceiptRecordDetail.allSchemas, // 查询弹窗所需子表类 searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类 searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法 searchCondition: [{ diff --git a/index.html b/index.html index ba11b4e50..b558105c9 100644 --- a/index.html +++ b/index.html @@ -3,16 +3,16 @@ - + %VITE_APP_TITLE% diff --git a/src/assets/imgs/login-bg.png b/src/assets/imgs/login-bg.png new file mode 100644 index 000000000..a0e6f1c61 Binary files /dev/null and b/src/assets/imgs/login-bg.png differ diff --git a/src/assets/imgs/login-bg1.png b/src/assets/imgs/login-bg1.png new file mode 100644 index 000000000..beb68b939 Binary files /dev/null and b/src/assets/imgs/login-bg1.png differ diff --git a/src/assets/imgs/logo1.png b/src/assets/imgs/logo1.png index 572b2e0ee..0dcd2fa03 100644 Binary files a/src/assets/imgs/logo1.png and b/src/assets/imgs/logo1.png differ diff --git a/src/views/login/login.vue b/src/views/login/login.vue index b9bf1709d..1969c440f 100644 --- a/src/views/login/login.vue +++ b/src/views/login/login.vue @@ -1,14 +1,14 @@