7 Commits

Author SHA1 Message Date
5b17f49619 Merge pull request 'build: 🏗️ 调整构建方式,从本地构建后上传dist目录' (#86) from ci into develop
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #86
2022-06-07 10:37:06 +08:00
4929c41361 build: 🏗️ 调整构建方式,从本地构建后上传dist目录 2022-06-07 10:34:36 +08:00
dbb67e6064 Merge pull request '暂时改名字' (#85) from zwq into develop
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #85
2022-06-06 16:01:57 +08:00
zwq
05fa4c5e21 暂时改名字 2022-06-06 16:01:01 +08:00
8a18d705a4 Merge pull request '暂时改名字' (#84) from zwq into develop
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #84
2022-06-06 13:57:53 +08:00
zwq
a64de34ef1 暂时改名字 2022-06-06 13:57:21 +08:00
0bcc5baf7a Merge pull request 'fzq' (#83) from fzq into develop
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #83
2022-05-30 13:45:03 +08:00
7 changed files with 27 additions and 20 deletions

View File

@@ -1,7 +1,6 @@
.vscode/
.idea/
node_modules/
dist/
**/*.log
LICENSE
README.md

1
.gitignore vendored
View File

@@ -1,6 +1,5 @@
.DS_Store
node_modules/
dist/
npm-debug.log*
yarn-debug.log*
yarn-error.log*

View File

@@ -1,10 +1,14 @@
FROM node:12 AS builder
WORKDIR /app
ADD package.json /app/
RUN npm config set registry https://registry.npmmirror.com && npm install git+https://gitee.com/shihairong/raphael && npm install
ADD . /app
RUN npm run build:prod
#FROM node:12 AS builder
#WORKDIR /app
#ADD package.json /app/
#RUN npm config set registry https://registry.npmmirror.com && npm install git+https://gitee.com/shihairong/raphael && npm install
#ADD . /app
#RUN npm run build:prod
#
#FROM busybox
#LABEL maintainer thomas.hairong@gmail.com
#COPY --from=builder /app/dist /html
FROM busybox
LABEL maintainer thomas.hairong@gmail.com
COPY --from=builder /app/dist /html
COPY dist/ /html

View File

@@ -1,7 +1,9 @@
export default {
title: {
en: 'ARI WMS',
zh: '中建材自动化智能仓库管理系统'
en: 'SCC System',
zh: '供应链协同管理系统'
// en: 'ARI WMS',
// zh: '中建材自动化智能仓库管理系统'
},
btn: {
start: {

View File

@@ -1,8 +1,8 @@
/*
* @Author: gtz
* @Date: 2022-03-15 16:42:34
* @LastEditors: gtz
* @LastEditTime: 2022-03-16 20:01:32
* @LastEditors: zwq
* @LastEditTime: 2022-06-06 15:53:29
* @Description: file content
* @FilePath: \mt-ck-wms-ui\src\lang\i18n\en\module\dashboard.js
*/
@@ -10,7 +10,8 @@
export default {
first: 'First Row',
second: 'Second Row',
title: 'WMS Inventory Information',
title: 'Inventory Information',
// WMS
pageHeader: 'No.',
pageFooter: ' Page',
isEmpty: 'Is Empty',

View File

@@ -1,8 +1,8 @@
/*
* @Author: gtz
* @Date: 2022-03-15 16:42:34
* @LastEditors: gtz
* @LastEditTime: 2022-03-16 20:01:27
* @LastEditors: zwq
* @LastEditTime: 2022-06-06 15:53:43
* @Description: file content
* @FilePath: \mt-ck-wms-ui\src\lang\i18n\zh\module\dashboard.js
*/
@@ -10,7 +10,8 @@
export default {
first: '第一排',
second: '第二排',
title: 'WMS库存信息',
title: '库存信息',
// WMS
pageHeader: '第',
pageFooter: '页',
isEmpty: '是否为空',

View File

@@ -1,13 +1,14 @@
/*
* @Date: 2020-12-14 09:07:03
* @LastEditors: Please set LastEditors
* @LastEditTime: 2021-12-06 14:24:30
* @LastEditors: zwq
* @LastEditTime: 2022-06-06 15:58:41
* @FilePath: \basic-admin\src\settings.js
* @Description:
*/
module.exports = {
title: 'ARI WMS',
title: 'SCC System',
// title: 'ARI WMS',
/**
* @type {boolean} true | false