From 2077207a60b644d7d4138f8afefd7a9a22e16823 Mon Sep 17 00:00:00 2001
From: xuxiaoming <xiaoming.xu@le-it.com.cn>
Date: Thu, 24 Feb 2022 09:23:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9favicon.ico=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build_prod.sh                                 |  22 ++++++++++--------
 public/favicon.ico                            | Bin 2982 -> 2362 bytes
 .../demandPlanning/articleDemand/index.vue    |   2 ++
 .../demandPlanning/articleDemand/public.vue   |   2 ++
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/build_prod.sh b/build_prod.sh
index 217c6d7..6df32b9 100755
--- a/build_prod.sh
+++ b/build_prod.sh
@@ -35,32 +35,34 @@ cd $PROJECT_DIR
 (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_1 ./
+zip -q -r $ZIP_NAME_1 ./dist
 echo "\033[32m 压缩完成，文件名  ${ZIP_NAME_1} \033[0m"
-cp ${DIST_DIT}${ZIP_NAME_1} ${CP_TARGET_DIR}${ZIP_NAME_1}
+cp ${PROJECT_DIR}"/"${ZIP_NAME_1} ${CP_TARGET_DIR}${ZIP_NAME_1}
+rm ${PROJECT_DIR}"/"${ZIP_NAME_1}
 
 
 echo "\033[32m 打包${PROD_2} \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 $ZIP_NAME_2 ./
+# cd $DIST_DIT
+zip -q -r $ZIP_NAME_2 ./dist
 echo "\033[32m 压缩完成，文件名 ${ZIP_NAME_2} \033[0m"
-cp ${DIST_DIT}${ZIP_NAME_2} ${CP_TARGET_DIR}${ZIP_NAME_2}
+cp ${PROJECT_DIR}"/"${ZIP_NAME_2} ${CP_TARGET_DIR}${ZIP_NAME_2}
+rm ${PROJECT_DIR}"/"${ZIP_NAME_2}
 
 echo "\033[32m 打包${PROD_3} \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 $ZIP_NAME_3 ./
+# cd $DIST_DIT
+zip -q -r $ZIP_NAME_3 ./dist
 echo "\033[32m 压缩完成，文件名 ${ZIP_NAME_3} \033[0m"
-cp ${DIST_DIT}${ZIP_NAME_3} ${CP_TARGET_DIR}${ZIP_NAME_3}
+cp ${PROJECT_DIR}"/"${ZIP_NAME_3} ${CP_TARGET_DIR}${ZIP_NAME_3}
+rm ${PROJECT_DIR}"/"${ZIP_NAME_3}
 
 
 
-echo "\033[32m 编译完成，文件在桌面${ZIP_NAME} \033[0m"
+echo "\033[32m 编译完成，文件在下载目录中${ZIP_NAME} \033[0m"
 echo "\033[32m 切换回到${CURRENT_BRANCH} \033[0m"
 (git checkout $CURRENT_BRANCH) >/dev/null 2>&1
\ No newline at end of file
diff --git a/public/favicon.ico b/public/favicon.ico
index ab6e51baba81daf88e48d0b7cdb38866744c7bb2..94b3fbedc9b0b5b27f0bc836a33655815d148102 100644
GIT binary patch
delta 2352
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
W`x};#*oOW90000<MNUMnLSTZ=5rF6b

delta 2977
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
XgIRF+nkbOe00000NkvXXu0mjfMc>a!

diff --git a/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue b/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue
index b6c0af6..028e765 100644
--- a/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue
+++ b/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue
@@ -413,7 +413,9 @@
           this.historyList.push({
             publishedVersionNr:data["version"]
           })
+          console.log('%cindex.vue line:416 object 1', 'color: #007acc;', baseURL + "admin/common/log/read/planlog/"+data["version"]);
           window.open(baseURL + "admin/common/log/read/planlog/"+data["version"])
+          console.log('%cindex.vue line:416 object 2', 'color: #007acc;', baseURL + "admin/common/log/read/planlog/"+data["version"]);
         }
       },
       toggleChar() {
diff --git a/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/public.vue b/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/public.vue
index d76a902..9d230f4 100644
--- a/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/public.vue
+++ b/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/public.vue
@@ -152,12 +152,14 @@
         this.$emit("cancelHandle", false)
       },
       submitForm() {
+    
         this.loading = true
         publicData(this.formData).then(({ data = [] }) => {
           this.loading = false
           this.$message({ type: "success", message: "发布成功" });
           this.$emit("cancelHandle", this.formData)
         }).catch(() => {
+          this.$emit("cancelHandle", this.formData)
           this.loading = false
         });
       }