Browse Source

优化主生产计划

pull/141/head
xuxiaoming 3 years ago
parent
commit
f44ed077f8
7 changed files with 2341 additions and 2372 deletions
  1. +8
    -0
      .env.prod_1
  2. +8
    -0
      .env.prod_2
  3. +8
    -0
      .env.prod_3
  4. +32
    -5
      build_prod.sh
  5. +3
    -0
      package.json
  6. +12
    -2
      src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue
  7. +2270
    -2365
      yarn.lock

+ 8
- 0
.env.prod_1 View File

@ -0,0 +1,8 @@
NODE_ENV = 'production'
VUE_APP_BASE_URL = http://10.11.12.27:9003/
VUE_APP_TITLE = 生产计划管理系统
VUE_APP_LOGO = ../assets/img/logo.png
VUE_APP_LOGIN_BG = ../assets/img/bg-login.png
VUE_APP_LOGIN_LOGO = ../assets/img/customer-logo.png
VUE_APP_CUSTOMER_NAME = 瑞玛工业
VUE_APP_CUSTOMER_LOGO = ../assets/img/customer-logo.png

+ 8
- 0
.env.prod_2 View File

@ -0,0 +1,8 @@
NODE_ENV = 'production'
VUE_APP_BASE_URL = http://10.11.12.27:9001/
VUE_APP_TITLE = 生产计划管理系统
VUE_APP_LOGO = ../assets/img/logo.png
VUE_APP_LOGIN_BG = ../assets/img/bg-login.png
VUE_APP_LOGIN_LOGO = ../assets/img/customer-logo.png
VUE_APP_CUSTOMER_NAME = 瑞玛工业
VUE_APP_CUSTOMER_LOGO = ../assets/img/customer-logo.png

+ 8
- 0
.env.prod_3 View File

@ -0,0 +1,8 @@
NODE_ENV = 'production'
VUE_APP_BASE_URL = http://10.11.3.207:9003/
VUE_APP_TITLE = 生产计划管理系统
VUE_APP_LOGO = ../assets/img/logo.png
VUE_APP_LOGIN_BG = ../assets/img/bg-login.png
VUE_APP_LOGIN_LOGO = ../assets/img/customer-logo.png
VUE_APP_CUSTOMER_NAME = 瑞玛工业
VUE_APP_CUSTOMER_LOGO = ../assets/img/customer-logo.png

+ 32
- 5
build_prod.sh View File

@ -9,6 +9,12 @@ CURRENT_BRANCH=""
# 压缩文件名设置
CUR_DATATIME="`date +%Y-%m-%d_%H-%M`"
ZIP_NAME="${CUR_DATATIME}.zip"
PROD_1="10.11.12.27_9003"
PROD_2="10.11.12.27_9001"
PROD_3="10.11.3.207_9003"
ZIP_NAME_1="${PROD_1}-${CUR_DATATIME}.zip"
ZIP_NAME_2="${PROD_2}-${CUR_DATATIME}.zip"
ZIP_NAME_3="${PROD_3}-${CUR_DATATIME}.zip"
CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
echo "\033[32m 当前分支为 ${CURRENT_BRANCH} \033[0m"
@ -19,18 +25,39 @@ echo "\033[32m 拉取develop最新数据 \033[0m"
(git pull) >/dev/null 2>&1
echo "\033[32m 拉取完成 \033[0m"
echo "\033[32m 开始部署文件,现在进行打包 \033[0m"
echo "\033[32m 开始部署文件,现在进行打包 \033[0m"
echo "\033[32m 打包10.11.12.27_9003 \033[0m"
cd $PROJECT_DIR
(yarn build:test) >/dev/null 2>&1
(yarn build:prod_1) >/dev/null 2>&1
echo "\033[32m 打包完成 \033[0m"
echo "\033[32m 开始压缩文件 \033[0m"
cd $DIST_DIT
zip -q -r $ZIP_NAME ./
zip -q -r "10.11.12.27_9003-"$ZIP_NAME ./
echo "\033[32m 压缩完成,文件名 ${ZIP_NAME} \033[0m"
echo "\033[32m 压缩完成,文件名 10.11.12.27_9003-${ZIP_NAME} \033[0m"
cp ${DIST_DIT}"10.11.12.27_9003-"${ZIP_NAME} "/Users/denny/Downloads/10.11.12.27_9003-${ZIP_NAME}"
echo "\033[32m 打包10.11.12.27_9001 \033[0m"
(yarn build:prod_2) >/dev/null 2>&1
echo "\033[32m 打包完成 \033[0m"
echo "\033[32m 开始压缩文件 \033[0m"
cd $DIST_DIT
zip -q -r "10.11.12.27_9001-"$ZIP_NAME ./
echo "\033[32m 压缩完成,文件名 10.11.12.27_9001_${ZIP_NAME} \033[0m"
cp ${DIST_DIT}"10.11.12.27_9001-"${ZIP_NAME} "/Users/denny/Downloads/10.11.12.27_9001-${ZIP_NAME}"
echo "\033[32m 打包10.11.3.207_9003 \033[0m"
(yarn build:prod_3) >/dev/null 2>&1
echo "\033[32m 打包完成 \033[0m"
echo "\033[32m 开始压缩文件 \033[0m"
cd $DIST_DIT
zip -q -r "10.11.3.207_9003-"$ZIP_NAME ./
echo "\033[32m 压缩完成,文件名 10.11.3.207_9003-${ZIP_NAME} \033[0m"
cp ${DIST_DIT}"10.11.3.207_9003-"${ZIP_NAME} "/Users/denny/Downloads/10.11.3.207_9003-${ZIP_NAME}"
cp ${DIST_DIT}${ZIP_NAME} "/Users/denny/Downloads/${ZIP_NAME}"
echo "\033[32m 编译完成,文件在桌面${ZIP_NAME} \033[0m"
echo "\033[32m 切换回到${CURRENT_BRANCH} \033[0m"

+ 3
- 0
package.json View File

@ -7,6 +7,9 @@
"build:dev": "vue-cli-service build --mode dev",
"build:test": "vue-cli-service build --mode test",
"build:prod": "vue-cli-service build --mode prod",
"build:prod_1": "vue-cli-service build --mode prod_1",
"build:prod_2": "vue-cli-service build --mode prod_2",
"build:prod_3": "vue-cli-service build --mode prod_3",
"lint": "vue-cli-service lint"
},
"dependencies": {


+ 12
- 2
src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue View File

@ -286,14 +286,18 @@ export default {
"SET_evaluationMainResourceData",
"SET_evaluationSecondResourceListData",
"SET_evaluationMainResourceLoading",
"SET_evaluationSecondResourceLoading"
"SET_evaluationSecondResourceLoading",
"SET_articleDemandLoading"
]),
handleQuery() {
this.SET_articleDemandLoading(true)
publishedVersion().then( ({ data = ""}) => {
this.SET_articleDemandLoading(false)
this.promptMessage = data
}).catch(() => {
this.$message({ type: "error", message: "获取消息失败" });
this.SET_articleDemandLoading(false)
this.$message({ type: "error", message: "获取消息失败" });
});
this.$emit("searchData", this.queryParams);
},
@ -413,12 +417,15 @@ export default {
},
//
reloadData() {
this.SET_articleDemandLoading(true)
reloadData({ "customerid": this.customerId }).then(({ msg }) => {
setTimeout(()=>{
this.handleQuery()
},2000)
this.SET_articleDemandLoading(false)
this.$message({ type: "success", message: msg });
}).catch(() => {
this.SET_articleDemandLoading(false)
// this.$message({ type: "error", message: "访" });
});
},
@ -450,17 +457,20 @@ export default {
this.INIT_evaluationMainResourceData();
this.SET_evaluationMainResourceLoading(true);
this.SET_evaluationSecondResourceLoading(true);
this.SET_articleDemandLoading(true)
saveDemand(param).then(({ data = [] }) => {
this.SET_evaluationMainResourceData(data["ArticleResourceMpsGroupLst"] || []);
this.SET_evaluationSecondResourceListData(data["ArticleSecondResourceMpsGroupLst"] || []);
this.SET_evaluationSecondResourceLoading(false);
this.SET_evaluationMainResourceLoading(false);
this.SET_articleDemandLoading(false)
this.handleQuery()
this.editKeyList = []
this.$message({ type: "success", message: "保存成功" });
}).catch(() => {
this.SET_evaluationSecondResourceLoading(false);
this.SET_evaluationMainResourceLoading(false);
this.SET_articleDemandLoading(false)
this.$message({ type: "error", message: "保存失败" });
});


+ 2270
- 2365
yarn.lock
File diff suppressed because it is too large
View File


Loading…
Cancel
Save