合并冲突

.env.prod

@@ -1,5 +1,5 @@
 NODE_ENV = 'production'
-VUE_APP_BASE_URL = http://101.201.121.115:9003/
+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

.env.test

@@ -1,5 +1,5 @@
 NODE_ENV = 'production'
-VUE_APP_BASE_URL = http://10.11.3.207:9003/
+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

build_prod.sh

@@ -9,7 +9,6 @@ CURRENT_BRANCH=""
 # 压缩文件名设置
 CUR_DATATIME="`date +%Y-%m-%d_%H-%M`"
 ZIP_NAME="${CUR_DATATIME}.zip"
- 
 
 CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
 echo "\033[32m 当前分支为 ${CURRENT_BRANCH} \033[0m"
@@ -31,9 +30,8 @@ zip -q -r $ZIP_NAME ./
 echo "\033[32m 压缩完成，文件名  ${ZIP_NAME} \033[0m"
 
 
-cp ${DIST_DIT}${ZIP_NAME} "/Users/denny/Desktop/${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"
 (git checkout $CURRENT_BRANCH) >/dev/null 2>&1

deploy.sh

@@ -10,71 +10,61 @@ CURRENT_BRANCH=""
 CUR_DATATIME="`date +%Y-%m-%d_%H-%M`"
 ZIP_NAME="${CUR_DATATIME}.zip"
 
-GIT_MERGE_URL=""
-# test() {git add . && git commit -m "$1" && git checkout develop && git pull && git checkout xuxiaoming && git merge develop && git push origin xuxiaoming };test
-# 提交代码
-git add .
-git commit -m "$1"
-git checkout develop
-git pull
-git checkout xuxiaoming
-git merge develop
-GIT_MERGE_URL=`git push origin xuxiaoming`
-echo "\033[32m 当前分支为 ${GIT_MERGE_URL} \033[0m"
+# 服务器设置
+SSH_HOST="101.201.121.115"
+SSH_USER="administrator"
+SSH_PASSWORD="Leit2021@@"
+# 部署目录
+REMOTE_DIR="C:/frontendApp/mds/dist/"
+# 获得当前分支
+CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+echo "\033[32m 当前分支为 ${CURRENT_BRANCH} \033[0m"
+# 切换分支到develop上，并拉取最新代码
+echo "\033[32m 切换分支到develop \033[0m"
+(git checkout develop) >/dev/null 2>&1
+echo "\033[32m 拉取develop最新数据 \033[0m"
+(git pull) >/dev/null 2>&1
+echo "\033[32m 拉取完成 \033[0m"
+# 开始本地打包并亚瑟
+echo "\033[32m 开始部署文件，现在进行打包 \033[0m"
+cd $PROJECT_DIR
+(yarn build:dev) >/dev/null 2>&1
+echo "\033[32m 打包完成 \033[0m"
+echo "\033[32m 开始压缩文件 \033[0m"
+cd $DIST_DIT
+zip -q -r $ZIP_NAME ./
+echo "\033[32m 压缩完成，文件名  ${ZIP_NAME} \033[0m"
 
+cp ${DIST_DIT}${ZIP_NAME} "/Users/denny/Downloads/${ZIP_NAME}"
 
-# # 服务器设置
-# SSH_HOST="101.201.121.115"
-# SSH_USER="administrator"
-# SSH_PASSWORD="Leit2021@@"
-# # 部署目录
-# REMOTE_DIR="C:/frontendApp/mds/dist/"
-# # 获得当前分支
-# CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
-# echo "\033[32m 当前分支为 ${CURRENT_BRANCH} \033[0m"
-# # 切换分支到develop上，并拉取最新代码
-# echo "\033[32m 切换分支到develop \033[0m"
-# (git checkout develop) >/dev/null 2>&1
-# echo "\033[32m 拉取develop最新数据 \033[0m"
-# (git pull) >/dev/null 2>&1
-# echo "\033[32m 拉取完成 \033[0m"
-# # 开始本地打包并亚瑟
-# echo "\033[32m 开始部署文件，现在进行打包 \033[0m"
-# cd $PROJECT_DIR
-# (yarn build:dev) >/dev/null 2>&1
-# echo "\033[32m 打包完成 \033[0m"
-# echo "\033[32m 开始压缩文件 \033[0m"
-# cd $DIST_DIT
-# zip -q -r $ZIP_NAME ./
-# echo "\033[32m 压缩完成，文件名  ${ZIP_NAME} \033[0m"
-# echo "\033[32m 开始传输文件 \033[0m"
-# # 远程传送文件
-# (expect -c "
-# spawn scp $ZIP_NAME "${SSH_USER}@${SSH_HOST}:${REMOTE_DIR}"
-# expect \"password:\"
-# send \"${SSH_PASSWORD}\r\"
-# expect eof
-# ") >/dev/null 2>&1
-# echo "\033[32m 传送完成，传送到服务器目录：${REMOTE_DIR}${ZIP_NAME} \033[0m"
-# # 远程解压及部署
-# echo "\033[32m 开始部署 \033[0m"
-# (expect -c "
-# spawn ssh -t "${SSH_USER}@${SSH_HOST}"
-# set timeout 3
-# expect \"password:\"
-# send \"${SSH_PASSWORD}\r\"
-# expect \"\$\"
-# send \"cd ${REMOTE_DIR}\r\"
-# expect \"\$\"
-# send \"rmdir /s /q static && del  index.html favicon.ico\r\"
-# expect \"\$\"
-# send \"unzip ${ZIP_NAME}\r\"
-# expect \"\$\"
-# send \"del ${ZIP_NAME}\r\"
-# send \"exit\r\"
-# expect eof
-# ") >/dev/null 2>&1
-# echo "\033[32m 部署完成 \033[0m"
-# # 切回分支
-# echo "\033[32m 切换回到${CURRENT_BRANCH} \033[0m"
-# (git checkout $CURRENT_BRANCH) >/dev/null 2>&1
+echo "\033[32m 开始传输文件 \033[0m"
+# 远程传送文件
+(expect -c "
+spawn scp $ZIP_NAME "${SSH_USER}@${SSH_HOST}:${REMOTE_DIR}"
+expect \"password:\"
+send \"${SSH_PASSWORD}\r\"
+expect eof
+") >/dev/null 2>&1
+echo "\033[32m 传送完成，传送到服务器目录：${REMOTE_DIR}${ZIP_NAME} \033[0m"
+# 远程解压及部署
+echo "\033[32m 开始部署 \033[0m"
+(expect -c "
+spawn ssh -t "${SSH_USER}@${SSH_HOST}"
+set timeout 3
+expect \"password:\"
+send \"${SSH_PASSWORD}\r\"
+expect \"\$\"
+send \"cd ${REMOTE_DIR}\r\"
+expect \"\$\"
+send \"rmdir /s /q static && del  index.html favicon.ico\r\"
+expect \"\$\"
+send \"unzip ${ZIP_NAME}\r\"
+expect \"\$\"
+send \"del ${ZIP_NAME}\r\"
+send \"exit\r\"
+expect eof
+") >/dev/null 2>&1
+echo "\033[32m 部署完成 \033[0m"
+# 切回分支
+echo "\033[32m 切换回到${CURRENT_BRANCH} \033[0m"
+(git checkout $CURRENT_BRANCH) >/dev/null 2>&1

public/index.html

@@ -6,9 +6,7 @@
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width,initial-scale=1.0">
 	<link rel="icon" href="<%= BASE_URL %>favicon.ico">
-	<title>
-		<%= htmlWebpackPlugin.options.title %>
-	</title>
+	<title>生产计划管理系统</title>
 	<style>
 		html,
 		body,

src/components/Header.vue

@@ -133,7 +133,7 @@ export default {
     float: left;
     width: 40px;
     height: 40px;
-    margin-top: 20px;
+    margin-top: 10px;
     margin-left: 24px;
     cursor: pointer;
   }
@@ -163,7 +163,7 @@ export default {
     box-shadow: 0px 1px 3px 0px #1e514d;
     border-radius: 2px;
     border: 1px solid #2c998f;
-    margin-top: 12px;
+    margin-top: 2px;
     margin-right: 16px;
     .user-details-wrap {
       float: right;
@@ -213,7 +213,7 @@ export default {
     float: left;
     width: 185px;
     height: 26px;
-    margin-top: 27px;
+    margin-top: 17px;
     margin-left: 40px;
   }
   .customer-name {

src/components/Layout.vue

@@ -39,7 +39,7 @@ export default {
   width: 100%;
   height: 100%;
   box-sizing: border-box;
-  padding-top: 80px;
+  padding-top: 62px;
   padding-left: 250px;
   background: #f3f3f3;
   #content-title {
@@ -47,16 +47,16 @@ export default {
     top: 0;
     left: 0;
     width: 100%;
-    height: 80px;
-    line-height: 80px;
+    height: 62px;
+    line-height: 62px;
     background: linear-gradient(180deg, #327e77 0%, #2c9b92 46%, #1e524d 100%);
   }
   #content-nav-menu {
     position: absolute;
-    top: 80px;
+    top: 62px;
     left: 0;
     width: 250px;
-    height: calc(100% - 80px);
+    height: calc(100% - 62px);
     background: #eeeeee;
     box-sizing: border-box;
     padding-top: 12px;

src/views/factoryModel/materialResourceMaintenance/artStockResource/addOrEdit.vue

@@ -510,8 +510,20 @@ data() {
     artList:[],
     loading: false,
     formData: {
-        "ArtStockResourceData-ArticleStockLevel":{},
+        "ArtStockResourceData-ArtId":"",
+        "ArtStockResourceData-ArticleStockLevel":{
+          'AP_ArticleStockLevel-MinCoverPeriod':"",
+          'AP_ArticleStockLevel-MinCoverPeriodType':"",
+          'AP_ArticleStockLevel-MaxCoverPeriod':"",
+          'AP_ArticleStockLevel-MaxCoverPeriodType':"",
+        },
         "ArtStockResourceData-ArticleResource":{
+            "AP_ArticleResource-ResourceId":"",
+            'AP_ArticleResource-QuantityPerHour':"",
+            'AP_ArticleResource-OpTimePerItem':"",
+            'AP_ArticleResource-BatchTime':"",
+            'AP_ArticleResource-BatchQuantity':"",
+            'AP_ArticleResource-TimeUom':"",
             "AP_ArticleResource-RatePerHourToggle":true,
             "AP_ArticleResource-TimePerItemToggle":true,
             "AP_ArticleResource-BatchTimeFieldToggle":true

src/views/factoryModel/timeModel/dayModel/shiftCconfiguration.vue

@@ -171,6 +171,18 @@ export default {
       end:"23:59"
     };
   },
+  watch: {
+    formData(data, oldValue) {
+      if(this.formData["DayModel-EnableS"+this.shiftIndex+"CrossDayToggle"]){
+        this.end= "47:59"
+      }
+    },
+    shiftIndex(data, oldValue) {
+      if(this.formData["DayModel-EnableS"+this.shiftIndex+"CrossDayToggle"]){
+        this.end= "47:59"
+      }
+    }
+  },
   methods:{
     // 时间更新，清空后续所有已选时间
     clearTime(){

src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue

@@ -415,7 +415,7 @@ export default {
         },2000)
         this.$message({ type: "success", message: msg });
       }).catch(() => {
-        this.$message({ type: "error", message: "访问失败" });
+        // this.$message({ type: "error", message: "访问失败" });
       });
     },
     // 保存数据
@@ -496,7 +496,7 @@ export default {
     },
     // 设置选中行
     setSelectRow(row) {
-       
+
       if (row.Label == "净生产量") {
         this.SET_artId(row.artid)
         this.setRowStatus(row.key);

src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/public.vue

@@ -99,7 +99,7 @@
           this.$emit("cancelHandle", "submit")
         }).catch(() => {
           this.loading = false
-          this.$message({ type: "error", message: "发布失败" });
+          // this.$message({ type: "error", message: "发布失败" });
         });
       }
     },