leo
/
LAPP_AdvancedPlanner_Front
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front into lingxiao

pull/143/head
liwei 3 years ago
parent
9771c4c3a4 314e02bf3e
commit
54297451c0
13 changed files with 2363 additions and 2410 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  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. +4
    -28
      src/assets/css/base.css
  7. +3
    -2
      src/views/factoryModel/materialResourceMaintenance/artStockResource/index.vue
  8. +3
    -3
      src/views/plan/workbench/homePage/formal/analysis/commonLineChart.vue
  9. +7
    -3
      src/views/plan/workbench/homePage/formal/analysis/index.vue
  10. +1
    -1
      src/views/plan/workbench/homePage/formal/analysis/lineBarChart.vue
  11. +4
    -1
      src/views/plan/workbench/materialAnalysis/filter/index.vue
  12. +12
    -2
      src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue
  13. +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": {


+ 4
- 28
src/assets/css/base.css View File

@ -23,33 +23,12 @@ li {
height: 100%;
}
/* table样式 */
.el-table th {
background: linear-gradient(180deg, #FAFCFC 0%, #EEEEEE 47%, #E7E7E7 100%);
}
.el-table--border td {
border-bottom: 2px solid #D5D5D5;
}
.el-table--border td {
border-right: 2px solid #D5D5D5;
}
.el-table th.is-leaf {
border-right: none !important;
}
.el-table tr td:first-child {
border-left: 2px solid #D5D5D5;
}
.el-table thead {
color: #3D3D42;
}
.el-table th>.cell {
font-size: 16px;
font-family: PingFangSC-Medium, PingFang SC;
.el-table--mini td, .el-table--mini th {
padding: 3px 0;
color: #3D3D42;
}
.el-table .el-table__body .cell {
font-size: 14px;
font-family: PingFangSC-Medium, PingFang SC;
color: #5C5A5A;
.el-table__row:nth-child(even) {
background: #F7F7F7;
}
.el-table .el-table__body tr.current-row>td {
background: linear-gradient(180deg, #327e77 0%, #2c9b92 46%, #1e524d 100%);
@ -57,9 +36,6 @@ li {
.el-table .el-table__body tr.current-row>td div {
color: #fff;
}
.el-table--mini td, .el-table--mini th{
padding: 3px 0;
}
/* button样式 */
.el-button {
color: #5C5A5A;


+ 3
- 2
src/views/factoryModel/materialResourceMaintenance/artStockResource/index.vue View File

@ -3,7 +3,8 @@
<SearchTemplate>
<el-form :inline="true" class="clearfix search-content">
<el-form-item :label="getColumnName('AP_ArticleStockLevel-ArtId')">
<el-select
<el-input v-model="queryParams.ArtId" placeholder="请输入" clearable></el-input>
<!-- <el-select
v-model="queryParams.ArtId"
placeholder="请选择"
>
@ -13,7 +14,7 @@
:label="item['Article-ArtId']+'-'+item['Article-Descr1']"
:value="item['Article-ArtId']"
/>
</el-select>
</el-select> -->
</el-form-item>
<el-form-item :label="getColumnName('AP_ArticleStockLevel-CompleteStatus')">
<el-select


+ 3
- 3
src/views/plan/workbench/homePage/formal/analysis/commonLineChart.vue View File

@ -60,7 +60,7 @@ export default {
yAxis: this.maxValue,
label: {
formatter: '{c}%{b}',
position: 'end'
position: 'middle'
}
},
{
@ -68,7 +68,7 @@ export default {
yAxis: this.minValue,
label: {
formatter: '{c}%{b}',
position: 'end'
position: 'middle'
}
}
]
@ -96,7 +96,7 @@ export default {
grid: {
top: '10%',
left: '5%',
right: '15%',
right: '0%',
bottom: '0%',
containLabel: true
},


+ 7
- 3
src/views/plan/workbench/homePage/formal/analysis/index.vue View File

@ -10,7 +10,7 @@
<el-radio label="2">环比</el-radio>
</el-radio-group>
</div>
<div class="mt30">
<div class="mt30" @change="singleRadioChange">
<el-radio v-model="allTheSingle" label="1">所有超差</el-radio>
<el-radio v-model="allTheSingle" label="2">指定零件</el-radio>
</div>
@ -59,12 +59,12 @@
</el-table>
</div>
</el-col>
<el-col :span="9">
<el-col :span="allTheSingle === '2' ? 9 : 11">
<div class="">
<CommonLineChart :dataList="dataList.PerCustomerDeviationDetailItem|| []" />
</div>
</el-col>
<el-col :span="7">
<el-col :span="allTheSingle === '2' ? 7 : 9">
<div class="">
<LineBarChart :dataList="dataList.CustomerDeviationDetailItem || []" />
</div>
@ -134,6 +134,10 @@ export default {
ringRadioChange() {
this.queryParams.versionId = ''
},
// 监听所有超差、指定零件
singleRadioChange() {
this.getLineBarChartData()
},
// 搜索
handleQuery() {
if (this.allTheSingle === '1') {


+ 1
- 1
src/views/plan/workbench/homePage/formal/analysis/lineBarChart.vue View File

@ -81,7 +81,7 @@ export default {
grid: {
top: '10%',
left: '5%',
right: '15%',
right: '0%',
bottom: '0%',
containLabel: true
},


+ 4
- 1
src/views/plan/workbench/materialAnalysis/filter/index.vue View File

@ -6,6 +6,8 @@
<el-form class="clearfix">
<el-form-item label="原材料">
<el-select
filterable
clearable
style="width: 230px;"
v-model="queryParams.artcle"
placeholder="请选择原材料">
@ -17,6 +19,7 @@
</el-form-item>
<el-form-item label="规格">
<el-select
clearable
style="width: 230px;"
v-model="queryParams.optionId"
placeholder="请选择规格">
@ -63,7 +66,7 @@ export default {
},
created() {
// 获取原材料
get(`/admin/base/article/selectlist`, {ArtTypeId: 'MATERIALS'}).then(({ code, data }) => {
get(`/admin/base/article/selectdata`, {ArtTypeId: 'MATERIALS'}).then(({ code, data }) => {
if (code === 200) {
this.specificationsData = data
}


+ 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


Write Preview
Loading…
Cancel
Save