Merge pull request '更改favicon.ico文件' (#199) from xuxiaoming into develop

Reviewed-on: #199

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

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() {

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
         });
       }