Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
卡
卡车调度系统
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
caicaicai
卡车调度系统
Commits
398f62e3
Commit
398f62e3
authored
Mar 04, 2022
by
caicaicai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
0635bb91
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
298 additions
and
282 deletions
+298
-282
common.js
src/assets/js/common.js
+93
-0
index.vue
src/views/productionPlanManagement/productionPlan/index.vue
+111
-221
index.vue
src/views/regionalManagement/regionalInformation/index.vue
+94
-61
No files found.
src/assets/js/common.js
View file @
398f62e3
...
...
@@ -409,6 +409,37 @@ var HttpReq = function(){
data
:
data
,
})
},
//区域管理——区域信息设置——选择车辆设置
RegionalInformationCarQuery
:
function
(
param
){
return
request
({
url
:
'
/api/AreaCar
'
,
method
:
'
get
'
,
params
:
param
,
})
},
RegionalInformationCarAdd
:
function
(
data
){
return
request
({
url
:
'
/api/AreaCar
'
,
method
:
'
POST
'
,
data
:
data
,
}).
then
((
res
)
=>
{
return
res
})
},
RegionalInformationCarUpdate
:
function
(
data
){
return
request
({
url
:
'
/api/AreaCar
'
,
method
:
'
PUT
'
,
data
:
data
,
})
},
RegionalInformationCarDel
:
function
(
data
){
return
request
({
url
:
'
/api/AreaCar
'
,
method
:
'
Delete
'
,
data
:
data
,
})
},
//视频监控——矿山监控管理——分区管理
mineMonitoringPartitionQuery
:
function
(
param
){
return
request
({
...
...
@@ -535,6 +566,68 @@ var HttpReq = function(){
data
:
data
,
})
},
//生产计划管理——总生产计划设置
productionPlanAllQuery
:
function
(
param
){
return
request
({
url
:
'
/api/Plan
'
,
method
:
'
get
'
,
params
:
param
,
})
},
productionPlanAllAdd
:
function
(
data
){
return
request
({
url
:
'
/api/Plan
'
,
method
:
'
POST
'
,
data
:
data
,
}).
then
((
res
)
=>
{
return
res
})
},
productionPlanAllUpdate
:
function
(
data
){
return
request
({
url
:
'
/api/Plan
'
,
method
:
'
PUT
'
,
data
:
data
,
})
},
productionPlanAllDel
:
function
(
data
){
return
request
({
url
:
'
/api/Plan
'
,
method
:
'
Delete
'
,
data
:
data
,
})
},
//生产计划管理——各采区计划设置
productionPlanNewAllQuery
:
function
(
param
){
return
request
({
url
:
'
/api/PlanNews
'
,
method
:
'
get
'
,
params
:
param
,
})
},
productionPlanNewAllAdd
:
function
(
data
){
return
request
({
url
:
'
/api/PlanNew
'
,
method
:
'
POST
'
,
data
:
data
,
}).
then
((
res
)
=>
{
return
res
})
},
productionPlanNewAllUpdate
:
function
(
data
){
return
request
({
url
:
'
/api/PlanNew
'
,
method
:
'
PUT
'
,
data
:
data
,
})
},
productionPlanNewAllDel
:
function
(
data
){
return
request
({
url
:
'
/api/PlanNew
'
,
method
:
'
Delete
'
,
data
:
data
,
})
},
...
...
src/views/productionPlanManagement/productionPlan/index.vue
View file @
398f62e3
...
...
@@ -12,22 +12,14 @@
</div>
<div
class=
"content"
>
<el-table
:data=
"tableData"
v-loading=
"loading"
border
style=
"width:auto"
:row-class-name=
"tableRowClassName"
>
<el-table-column
prop=
"code"
label=
"编码"
align=
"center"
></el-table-column>
<el-table-column
prop=
"name"
label=
"区域名称"
align=
"center"
></el-table-column>
<el-table-column
prop=
"areaclass"
label=
"所属类别"
align=
"center"
></el-table-column>
<el-table-column
prop=
"coordinate"
label=
"中心坐标"
align=
"center"
></el-table-column>
<el-table-column
prop=
"card"
label=
"车辆标识图"
align=
"center"
>
<template
slot-scope=
"scope"
>
<img
:src=
"imgSrcStart + '/avatar/' + scope.row.card"
width=
"40"
height=
"40"
/>
</
template
>
</el-table-column>
<el-table-column
prop=
"max"
label=
"最大承接量"
align=
"center"
></el-table-column>
<el-table-column
prop=
"month"
label=
"生产计划月份"
align=
"center"
:formatter=
"changeTimeFormat"
></el-table-column>
<el-table-column
prop=
"plan"
label=
"预计总计划量"
align=
"center"
></el-table-column>
<el-table-column
prop=
"createTime"
label=
"日期"
align=
"center"
></el-table-column>
<el-table-column
label=
"操作"
align=
"center"
fixed=
"right"
>
<template
slot-scope=
"scope"
>
<el-button
size=
"mini"
type=
"success"
icon=
"el-icon-view"
@
click=
"showGradeTable(scope.row)"
></el-button>
<el-button
size=
"mini"
type=
"primary"
icon=
"el-icon-edit"
@
click=
"toEdit(scope.row)"
></el-button>
<el-button
size=
"mini"
type=
"danger"
icon=
"el-icon-delete"
@
click=
"toDelete(scope.row)"
></el-button>
<el-button
size=
"mini"
type=
"success"
icon=
"el-icon-view"
v-show=
"scope.row.areaore == '是'"
@
click=
"showGradeTable(scope.row)"
></el-button>
</
template
>
</el-table-column>
</el-table>
...
...
@@ -42,89 +34,13 @@
<!-- 表单渲染 -->
<el-dialog
append-to-body
:close-on-click-modal=
"true"
:before-close=
"cancelForm"
:visible.sync=
"form.visible"
:title=
"form.title"
width=
"700px"
>
<el-form
:model=
"form.item"
:rules=
"rules"
ref=
"form1"
:inline=
"true"
size=
"small"
label-width=
"150px"
>
<el-form-item
label=
"编码"
prop=
"code"
>
<el-input
v-model=
"form.item.code"
style=
"width:160px;"
placeholder=
"请输入编码"
/>
</el-form-item>
<el-form-item
label=
"所属类别"
prop=
"areaclass"
>
<el-select
v-model=
"form.item.areaclass"
placeholder=
"请选择所属类别"
size=
"small"
style=
"width:160px;"
>
<el-option
v-for=
"(obj,index) in RegionalTypeData"
:label=
"obj.classname"
:value=
"obj.classname"
:key=
"index"
></el-option>
</el-select>
</el-form-item>
<el-form-item
label=
"区域名称"
prop=
"name"
>
<el-input
v-model=
"form.item.name"
style=
"width:160px;"
placeholder=
"请输入区域名称"
/>
</el-form-item>
<el-form-item
label=
"是否需要遮罩层"
prop=
"shadow"
>
<el-select
v-model=
"form.item.shadow"
placeholder=
"请选择是否需要遮罩层"
style=
"width:160px;"
>
<el-option
label=
"是"
value=
"是"
></el-option>
<el-option
label=
"否"
value=
"否"
></el-option>
</el-select>
</el-form-item>
<el-form-item
label=
"最大承接车辆数"
prop=
"max"
>
<el-input
v-model=
"form.item.max"
style=
"width:160px;"
placeholder=
"请输入最大承接车辆数"
/>
</el-form-item>
<el-form-item
label=
"区域中心坐标点"
prop=
"coordinate"
>
<el-input
v-model=
"form.item.coordinate"
style=
"width:160px;"
placeholder=
"请输入区域中心坐标点"
/>
</el-form-item>
<el-form-item
label=
"区域标记"
>
<el-input
v-model=
"picFileName"
style=
"width:160px;"
placeholder=
"请上传区域标记"
disabled
/>
<input
type=
"file"
name=
"image"
@
change=
"excelImport($event)"
/>
</el-form-item>
<el-form-item
label=
"区域范围或直径"
prop=
"arearange"
>
<el-input
v-model=
"form.item.arearange"
style=
"width:160px;"
placeholder=
"请输入区域范围或直径"
/>
</el-form-item>
<el-form-item
label=
"电铲名称"
prop=
"areashovel"
>
<el-input
v-model=
"form.item.areashovel"
style=
"width:160px;"
placeholder=
"请输入电铲名称"
/>
</el-form-item>
<el-form-item
label=
"矿种"
prop=
"arearesources"
>
<el-select
v-model=
"form.item.arearesources"
placeholder=
"请选择矿种"
style=
"width:160px;"
>
<el-option
label=
"废石"
value=
"废石"
></el-option>
<el-option
label=
"矿石"
value=
"矿石"
></el-option>
</el-select>
</el-form-item>
<el-form-item
label=
"是否配矿"
prop=
"areaore"
>
<el-select
v-model=
"form.item.areaore"
placeholder=
"请选择是否配矿"
style=
"width:160px;"
>
<el-option
label=
"是"
value=
"是"
></el-option>
<el-option
label=
"否"
value=
"否"
></el-option>
</el-select>
<el-form-item
label=
"生产计划月份"
prop=
"month"
>
<el-date-picker
v-model=
"form.item.month"
type=
"month"
placeholder=
"选择月"
style=
"width:280px;"
></el-date-picker>
</el-form-item>
<el-form-item
label=
"优先级"
prop=
"areapriority"
>
<el-input-number
v-model=
"form.item.areapriority"
:min=
"1"
:max=
"10"
label=
"请选择优先级"
></el-input-number>
</el-form-item>
<!-- 如果所属类型是电子围栏,要添加一下属性 -->
<el-form-item
label=
"启用时间段"
prop=
"period"
v-show=
"form.item.areaclass == '电子围栏'"
>
<el-time-picker
is-range
v-model=
"timePeriod"
range-separator=
"至"
start-placeholder=
"开始时间"
end-placeholder=
"结束时间"
placeholder=
"选择时间范围"
>
</el-time-picker>
</el-form-item>
<el-form-item
label=
"限制类型"
prop=
"limitclass"
v-show=
"form.item.areaclass == '电子围栏'"
>
<el-select
v-model=
"form.item.limitclass"
placeholder=
"请选择限制类型"
style=
"width:160px;"
>
<el-option
label=
"限入"
value=
"限入"
></el-option>
<el-option
label=
"限出"
value=
"限出"
></el-option>
</el-select>
</el-form-item>
<br/>
<el-form-item
label=
"选择车辆"
prop=
"cars"
v-show=
"form.item.areaclass == '电子围栏'"
>
<div
class=
"checkboxViews"
>
<el-checkbox-group
v-model=
"checkDataList"
style=
"width:480px;"
>
<el-checkbox
v-for=
"(obj,index) in carInformationData"
:label=
"obj.name + '/' + obj.number"
:key=
"index"
>
{{obj.name + '/' + obj.number}}
</el-checkbox>
</el-checkbox-group>
</div>
</el-form-item>
<el-form-item
label=
"启停状态"
prop=
"status"
v-show=
"form.item.areaclass == '电子围栏'"
>
<el-select
v-model=
"form.item.status"
placeholder=
"请选择启停状态"
style=
"width:160px;"
>
<el-option
label=
"启用"
value=
"启用"
></el-option>
<el-option
label=
"停用"
value=
"停用"
></el-option>
</el-select>
<el-form-item
label=
"总计划量(kg)"
prop=
"plan"
>
<el-input
v-model=
"form.item.plan"
style=
"width:280px;"
placeholder=
"请输入总计划量(kg)"
/>
</el-form-item>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
type=
"text"
@
click=
"cancelForm"
>
取消
</el-button>
<el-button
:loading=
"form.status.cu === 2"
type=
"primary"
@
click=
"submitForm('form1', form.item)"
>
确认
</el-button>
...
...
@@ -132,15 +48,17 @@
</el-dialog>
<!--
品位
设置 -->
<el-dialog
title=
"品位设置
"
:visible.sync=
"dialogTableVisible"
>
<!--
采区计划量
设置 -->
<el-dialog
:title=
"miningAreaTitle
"
:visible.sync=
"dialogTableVisible"
>
<div
class=
"toolbar"
style=
"margin-bottom:15px;"
>
<el-button
size=
"mini"
type=
"primary"
icon=
"el-icon-plus"
@
click=
"gradeToAdd"
>
新增
</el-button>
</div>
<el-table
:data=
"gridData"
border
v-loading=
"gradeLoading"
>
<el-table-column
property=
"name"
label=
"品位名称"
align=
"center"
></el-table-column>
<el-table-column
property=
"content"
label=
"含量"
align=
"center"
></el-table-column>
<el-table-column
property=
"unit"
label=
"单位"
align=
"center"
></el-table-column>
<el-table-column
property=
"name"
label=
"采区名称"
align=
"center"
></el-table-column>
<el-table-column
property=
"plan"
label=
"计划量(kg)"
align=
"center"
></el-table-column>
<el-table-column
property=
"mean"
label=
"平均日产量(kg)"
align=
"center"
></el-table-column>
<el-table-column
property=
"total"
label=
"累计完成量(kg)"
align=
"center"
></el-table-column>
<el-table-column
property=
"ratio"
label=
"完成率(%)"
align=
"center"
></el-table-column>
<el-table-column
label=
"操作"
align=
"center"
fixed=
"right"
>
<
template
slot-scope=
"scope"
>
<el-button
size=
"mini"
type=
"primary"
icon=
"el-icon-edit"
@
click=
"gradeToEdit(scope.row)"
></el-button>
...
...
@@ -150,17 +68,19 @@
</el-table>
</el-dialog>
<!--
品位
设置表单 -->
<!--
采区计划量
设置表单 -->
<el-dialog
:title=
"gradeFrom.title"
:before-close=
"gradeCancelForm"
:visible.sync=
"gradeFrom.visible"
width=
"700px"
>
<el-form
:model=
"gradeFrom.item"
:inline=
"true"
ref=
"form2"
size=
"small"
label-width=
"150px"
>
<el-form-item
label=
"品位名称"
>
<el-input
v-model=
"gradeFrom.item.name"
style=
"width:260px;"
placeholder=
"请输入品位名称"
></el-input>
<el-form-item
label=
"采区"
>
<el-select
v-model=
"gradeFrom.item.name"
placeholder=
"请选择采区"
size=
"small"
style=
"width:260px;"
>
<el-option
v-for=
"(obj,index) in RegionalTypeData"
:label=
"obj.name"
:value=
"obj.name"
:key=
"index"
></el-option>
</el-select>
</el-form-item>
<el-form-item
label=
"
含量
"
>
<el-input
v-model=
"gradeFrom.item.
content"
style=
"width:260px;"
placeholder=
"请输入含量
"
></el-input>
<el-form-item
label=
"
计划量(kg)
"
>
<el-input
v-model=
"gradeFrom.item.
plan"
style=
"width:260px;"
placeholder=
"请输入计划量(kg)
"
></el-input>
</el-form-item>
<el-form-item
label=
"
单位
"
>
<el-input
v-model=
"gradeFrom.item.
unit"
style=
"width:260px;"
placeholder=
"请输入单位
"
></el-input>
<el-form-item
label=
"
累计完成量(kg)
"
>
<el-input
v-model=
"gradeFrom.item.
total"
style=
"width:260px;"
placeholder=
"请输入累计完成量(kg)
"
></el-input>
</el-form-item>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
...
...
@@ -174,10 +94,8 @@
<
script
>
import
{
Tools
,
HttpReq
,
Dates
}
from
'
@/assets/js/common.js
'
;
import
Axios
from
'
axios
'
export
default
{
name
:
'
CarType
'
,
components
:
{},
data
()
{
return
{
...
...
@@ -187,15 +105,13 @@ export default {
size
:
10
,
total
:
0
,
query
:{},
picFileName
:
''
,
tableData
:
[],
RegionalTypeData
:[],
carInformationData
:[],
checkAll
:
false
,
checkDataList
:[],
timePeriod
:[],
form
:
{
title
:
'
新增
区域信息
'
,
title
:
'
新增
生产计划
'
,
visible
:
false
,
reqType
:
'
add
'
,
status
:{
cu
:
0
},
...
...
@@ -208,13 +124,14 @@ export default {
},
//品味设置数据
//采区计划量设置数据
miningAreaTitle
:
''
,
dialogTableVisible
:
false
,
gridData
:
[],
gradeLoading
:
false
,
gradeQueryId
:
0
,
gradeFrom
:{
title
:
'
新增
品位
'
,
title
:
'
新增
采区计划量
'
,
visible
:
false
,
reqType
:
'
add
'
,
status
:{
cu
:
0
},
...
...
@@ -229,7 +146,7 @@ export default {
})
},
methods
:
{
//获取
区域信息
数据
//获取
生产计划
数据
loadData
()
{
var
sort
=
'
createTime,desc
'
;
var
param
=
this
.
query
;
...
...
@@ -238,25 +155,19 @@ export default {
param
.
sort
=
sort
;
this
.
$nextTick
(()
=>
{
HttpReq
.
truckDispatching
.
RegionalInformation
Query
(
param
).
then
((
res
)
=>
{
HttpReq
.
truckDispatching
.
productionPlanAll
Query
(
param
).
then
((
res
)
=>
{
if
(
res
.
code
==
200
){
this
.
loading
=
false
;
this
.
tableData
=
res
.
data
.
content
;
this
.
total
=
res
.
data
.
totalElements
;
}
})
//获取
所属类别
HttpReq
.
truckDispatching
.
Regional
TypeQuery
(
param
).
then
((
res
)
=>
{
//获取
采区信息
HttpReq
.
truckDispatching
.
Regional
InformationQuery
({
size
:
100
,
areaclass
:
'
采区
'
}
).
then
((
res
)
=>
{
if
(
res
.
code
==
200
){
this
.
RegionalTypeData
=
res
.
data
.
content
;
}
})
//获取车辆信息
HttpReq
.
truckDispatching
.
carInformationQuery
(
param
).
then
((
res
)
=>
{
if
(
res
.
code
==
200
){
this
.
carInformationData
=
res
.
data
.
content
;
}
})
})
},
...
...
@@ -274,24 +185,20 @@ export default {
toAdd
()
{
// 请除表单验证
this
.
$refs
[
'
form1
'
]
&&
this
.
$refs
[
'
form1
'
].
clearValidate
();
this
.
form
.
title
=
'
新增
区域信息
'
;
this
.
form
.
title
=
'
新增
生产计划
'
;
this
.
form
.
status
.
cu
=
0
;
this
.
form
.
visible
=
true
;
this
.
form
.
reqType
=
'
add
'
;
this
.
form
.
item
=
{};
this
.
picFileName
=
''
;
this
.
checkDataList
=
[];
},
toEdit
(
item
)
{
// 请除表单验证
this
.
$refs
[
'
form1
'
]
&&
this
.
$refs
[
'
form1
'
].
clearValidate
();
this
.
form
.
title
=
'
修改
区域信息
'
;
this
.
form
.
title
=
'
修改
生产计划
'
;
this
.
form
.
status
.
cu
=
0
;
this
.
form
.
visible
=
true
;
this
.
form
.
item
=
{...
item
};
this
.
form
.
reqType
=
'
edit
'
;
this
.
picFileName
=
this
.
form
.
item
.
card
;
this
.
checkDataList
=
this
.
form
.
item
.
cars
;
let
timePeriodCenter
=
[];
timePeriodCenter
.
push
(
this
.
form
.
item
.
startTime
);
timePeriodCenter
.
push
(
this
.
form
.
item
.
endTime
);
...
...
@@ -332,68 +239,56 @@ export default {
});
};
},
//新增
区域信息
//新增
生产计划
reqAddItem
(
form
,
item
){
let
lastData
=
{...
item
};
lastData
.
card
=
this
.
picFileName
;
lastData
.
cars
=
this
.
checkDataList
;
lastData
.
startTime
=
this
.
timePeriod
[
0
];
lastData
.
endTime
=
this
.
timePeriod
[
1
];
console
.
log
(
lastData
);
// HttpReq.truckDispatching.RegionalInformationAdd(lastData).then((res) => {
// form.visible = false;
// if(res.code == 200){
// this.$notify({
// title: '区域信息新增成功!',
// type: 'success',
// duration: 2500
// });
// this.loadData()
// }else{
// this.$notify({
// title: res.msg,
// type: 'error',
// duration: 2500
// })
// }
// }).catch(function(error) {
// form.status.cu = 0
// });
form
.
status
.
cu
=
0
HttpReq
.
truckDispatching
.
productionPlanAllAdd
(
lastData
).
then
((
res
)
=>
{
form
.
visible
=
false
;
if
(
res
.
code
==
200
){
this
.
$notify
({
title
:
'
生产计划新增成功!
'
,
type
:
'
success
'
,
duration
:
2500
});
this
.
loadData
()
}
else
{
this
.
$notify
({
title
:
res
.
msg
,
type
:
'
error
'
,
duration
:
2500
})
}
}).
catch
(
function
(
error
)
{
form
.
status
.
cu
=
0
});
},
//修改
区域信息
//修改
生产计划
reqUpdateItem
(
form
,
item
){
let
lastData
=
{...
item
};
lastData
.
card
=
this
.
picFileName
;
lastData
.
cars
=
this
.
checkDataList
;
lastData
.
startTime
=
this
.
timePeriod
[
0
];
lastData
.
endTime
=
this
.
timePeriod
[
1
];
console
.
log
(
lastData
);
// HttpReq.truckDispatching.RegionalInformationUpdate(lastData).then((res) => {
// form.visible = false;
// if(res.code == 200){
// this.$notify({
// title: '区域信息修改成功!',
// type: 'success',
// duration: 2500
// });
// this.loadData()
// }else{
// this.$notify({
// title: res.msg,
// type: 'error',
// duration: 2500
// })
// this.loadData()
// }
// }).catch(function(error) {
// form.status.cu = 0
// });
form
.
status
.
cu
=
0
HttpReq
.
truckDispatching
.
productionPlanAllUpdate
(
lastData
).
then
((
res
)
=>
{
form
.
visible
=
false
;
if
(
res
.
code
==
200
){
this
.
$notify
({
title
:
'
生产计划修改成功!
'
,
type
:
'
success
'
,
duration
:
2500
});
this
.
loadData
()
}
else
{
this
.
$notify
({
title
:
res
.
msg
,
type
:
'
error
'
,
duration
:
2500
})
this
.
loadData
()
}
}).
catch
(
function
(
error
)
{
form
.
status
.
cu
=
0
});
},
//删除
区域信息
//删除
生产计划
reqRemoveProject
(
item
){
HttpReq
.
truckDispatching
.
RegionalInformation
Del
(
item
).
then
((
res
)
=>
{
HttpReq
.
truckDispatching
.
productionPlanAll
Del
(
item
).
then
((
res
)
=>
{
if
(
res
.
status
==
400
){
this
.
$notify
({
title
:
res
.
msg
,
...
...
@@ -410,47 +305,24 @@ export default {
this
.
loadData
();
})
},
//图片上传
excelImport
(
event
)
{
let
that
=
this
;
let
file
=
event
.
target
.
files
[
0
];
let
formData1
=
new
FormData
();
formData1
.
append
(
"
avatar
"
,
file
);
Axios
({
url
:
process
.
env
.
VUE_APP_LOCAL_API2
+
'
/api/wEquipment/updateAvatar
'
,
method
:
"
post
"
,
data
:
formData1
,
}).
then
(
response
=>
{
if
(
response
.
status
==
200
)
{
this
.
$message
.
success
(
"
上传成功
"
);
that
.
picFileName
=
response
.
data
.
avatar
;
}
else
{
this
.
$message
.
error
(
"
上传失败
"
);
}
},
)
.
catch
(
error
=>
{
console
.
log
(
error
);
});
},
//
品味
设置方法
//
采区计划量
设置方法
showGradeTable
(
row
){
this
.
dialogTableVisible
=
true
;
this
.
gradeQueryId
=
row
.
id
;
this
.
miningAreaTitle
=
'
采区计划量
'
+
'
(月份:
'
+
this
.
currentTime
(
row
.
month
)
+
'
)
'
;
this
.
loadGradeData
();
},
//获取
品味
设置数据
//获取
采区计划量
设置数据
loadGradeData
(){
var
sort
=
'
id,desc
'
;
var
param
=
{};
param
.
sort
=
sort
;
param
.
area
Id
=
this
.
gradeQueryId
;
param
.
plan
Id
=
this
.
gradeQueryId
;
this
.
$nextTick
(()
=>
{
HttpReq
.
truckDispatching
.
RegionalInformationGrade
Query
(
param
).
then
((
res
)
=>
{
HttpReq
.
truckDispatching
.
productionPlanNewAll
Query
(
param
).
then
((
res
)
=>
{
if
(
res
.
code
==
200
){
this
.
gradeLoading
=
false
;
this
.
gridData
=
res
.
data
.
content
;
...
...
@@ -480,7 +352,7 @@ export default {
gradeToAdd
()
{
// 请除表单验证
this
.
$refs
[
'
form2
'
]
&&
this
.
$refs
[
'
form2
'
].
clearValidate
();
this
.
gradeFrom
.
title
=
'
新增
品味
'
;
this
.
gradeFrom
.
title
=
'
新增
采区计划量
'
;
this
.
gradeFrom
.
status
.
cu
=
0
;
this
.
gradeFrom
.
visible
=
true
;
this
.
gradeFrom
.
reqType
=
'
add
'
;
...
...
@@ -489,7 +361,7 @@ export default {
gradeToEdit
(
item
)
{
// 请除表单验证
this
.
$refs
[
'
form2
'
]
&&
this
.
$refs
[
'
form2
'
].
clearValidate
();
this
.
gradeFrom
.
title
=
'
修改
品位
设置
'
;
this
.
gradeFrom
.
title
=
'
修改
采区计划量
设置
'
;
this
.
gradeFrom
.
status
.
cu
=
0
;
this
.
gradeFrom
.
visible
=
true
;
this
.
gradeFrom
.
item
=
{...
item
};
...
...
@@ -505,15 +377,15 @@ export default {
this
.
gradeReqRemoveProject
([
id
])
}).
catch
((
e
)
=>
{})
},
//新增
品味
设置
//新增
采区计划量
设置
gradeReqAddItem
(
gradeFrom
,
item
){
let
lastData
=
{...
item
};
lastData
.
area
Id
=
this
.
gradeQueryId
;
HttpReq
.
truckDispatching
.
RegionalInformationGrade
Add
(
lastData
).
then
((
res
)
=>
{
lastData
.
plan
Id
=
this
.
gradeQueryId
;
HttpReq
.
truckDispatching
.
productionPlanNewAll
Add
(
lastData
).
then
((
res
)
=>
{
gradeFrom
.
visible
=
false
;
if
(
res
.
code
==
200
){
this
.
$notify
({
title
:
'
品味
设置新增成功!
'
,
title
:
'
采区计划量
设置新增成功!
'
,
type
:
'
success
'
,
duration
:
2500
});
...
...
@@ -529,14 +401,14 @@ export default {
gradeFrom
.
status
.
cu
=
0
});
},
//修改
品味
设置
//修改
采区计划量
设置
gradeReqUpdateItem
(
gradeFrom
,
item
){
let
lastData
=
{...
item
};
HttpReq
.
truckDispatching
.
RegionalInformationGrade
Update
(
lastData
).
then
((
res
)
=>
{
HttpReq
.
truckDispatching
.
productionPlanNewAll
Update
(
lastData
).
then
((
res
)
=>
{
gradeFrom
.
visible
=
false
;
if
(
res
.
code
==
200
){
this
.
$notify
({
title
:
'
品味
设置修改成功!
'
,
title
:
'
采区计划量
设置修改成功!
'
,
type
:
'
success
'
,
duration
:
2500
});
...
...
@@ -553,9 +425,9 @@ export default {
gradeFrom
.
status
.
cu
=
0
});
},
//删除
品味
设置
//删除
采区计划量
设置
gradeReqRemoveProject
(
item
){
HttpReq
.
truckDispatching
.
RegionalInformationGrade
Del
(
item
).
then
((
res
)
=>
{
HttpReq
.
truckDispatching
.
productionPlanNewAll
Del
(
item
).
then
((
res
)
=>
{
if
(
res
.
status
==
400
){
this
.
$notify
({
title
:
res
.
msg
,
...
...
@@ -573,6 +445,24 @@ export default {
})
},
//修改时间格式
changeTimeFormat
(
row
){
return
this
.
currentTime
(
row
.
month
);
},
currentTime
(
time
){
var
date
=
new
Date
(
time
);
var
year
=
date
.
getFullYear
();
//年 ,从 Date 对象以四位数字返回年份
var
month
=
date
.
getMonth
()
+
1
;
//月 ,从 Date 对象返回月份 (0 ~ 11) ,date.getMonth()比实际月份少 1 个月
//修改月份格式
if
(
month
>=
1
&&
month
<=
9
)
{
month
=
"
0
"
+
month
;
}
let
currentFormatDate
=
year
+
"
-
"
+
month
;
return
currentFormatDate
;
}
}
}
</
script
>
...
...
@@ -605,7 +495,7 @@ export default {
padding-left
:
10px
;
box-sizing
:
border-box
;
width
:
490px
;
height
:
12
0px
;
height
:
30
0px
;
border
:
1px
gainsboro
solid
;
overflow-y
:scroll
;
overflow-x
:hidden
;
...
...
src/views/regionalManagement/regionalInformation/index.vue
View file @
398f62e3
...
...
@@ -93,14 +93,14 @@
<!-- 如果所属类型是电子围栏,要添加一下属性 -->
<el-form-item
label=
"启用时间段"
prop=
"period"
v-show=
"form.item.areaclass == '电子围栏'"
>
<el-form-item
label=
"启用时间段"
v-show=
"form.item.areaclass == '电子围栏'"
>
<el-time-picker
is-range
v-model=
"timePeriod"
range-separator=
"至"
start-placeholder=
"开始时间"
end-placeholder=
"结束时间
"
placeholder=
"
选择时间范围
"
>
v-model=
"form.item.startTime"
placeholder=
"开始时间"
>
</el-time-picker>
<el-time-picker
v-model=
"form.item.endTime
"
placeholder=
"
结束时间
"
>
</el-time-picker>
</el-form-item>
<el-form-item
label=
"限制类型"
prop=
"limitclass"
v-show=
"form.item.areaclass == '电子围栏'"
>
...
...
@@ -193,7 +193,7 @@ export default {
carInformationData
:[],
checkAll
:
false
,
checkDataList
:[],
timePeriod
:[],
oldCheckDataList
:[],
form
:
{
title
:
'
新增区域信息
'
,
visible
:
false
,
...
...
@@ -291,11 +291,18 @@ export default {
this
.
form
.
item
=
{...
item
};
this
.
form
.
reqType
=
'
edit
'
;
this
.
picFileName
=
this
.
form
.
item
.
card
;
this
.
checkDataList
=
this
.
form
.
item
.
cars
;
let
timePeriodCenter
=
[];
timePeriodCenter
.
push
(
this
.
form
.
item
.
startTime
);
timePeriodCenter
.
push
(
this
.
form
.
item
.
endTime
);
this
.
timePeriod
=
timePeriodCenter
;
let
oldCheckDataListCenterId
=
[];
let
oldCheckDataListCenterCarIn
=
[];
HttpReq
.
truckDispatching
.
RegionalInformationCarQuery
({
areaId
:
item
.
code
}).
then
((
res
)
=>
{
if
(
res
.
code
==
200
){
res
.
data
.
content
.
forEach
((
item
)
=>
{
oldCheckDataListCenterId
.
push
(
item
.
id
);
oldCheckDataListCenterCarIn
.
push
(
item
.
car
);
})
}
})
this
.
checkDataList
=
oldCheckDataListCenterCarIn
;
this
.
oldCheckDataList
=
oldCheckDataListCenterId
;
},
toDelete
(
item
)
{
var
id
=
item
.
id
;
...
...
@@ -336,60 +343,86 @@ export default {
reqAddItem
(
form
,
item
){
let
lastData
=
{...
item
};
lastData
.
card
=
this
.
picFileName
;
lastData
.
cars
=
this
.
checkDataList
;
lastData
.
startTime
=
this
.
timePeriod
[
0
];
lastData
.
endTime
=
this
.
timePeriod
[
1
];
console
.
log
(
lastData
);
// HttpReq.truckDispatching.RegionalInformationAdd(lastData).then((res) => {
// form.visible = false;
// if(res.code == 200){
// this.$notify({
// title: '区域信息新增成功!',
// type: 'success',
// duration: 2500
// });
// this.loadData()
// }else{
// this.$notify({
// title: res.msg,
// type: 'error',
// duration: 2500
// })
// }
// }).catch(function(error) {
// form.status.cu = 0
// });
form
.
status
.
cu
=
0
HttpReq
.
truckDispatching
.
RegionalInformationAdd
(
lastData
).
then
((
res
)
=>
{
form
.
visible
=
false
;
if
(
res
.
code
==
200
){
this
.
$notify
({
title
:
'
区域信息新增成功!
'
,
type
:
'
success
'
,
duration
:
2500
});
this
.
loadData
()
}
else
{
this
.
$notify
({
title
:
res
.
msg
,
type
:
'
error
'
,
duration
:
2500
})
}
}).
catch
(
function
(
error
)
{
form
.
status
.
cu
=
0
});
this
.
checkDataList
.
forEach
((
carItem
,
index
)
=>
{
let
uploadCarData
=
{};
uploadCarData
.
car
=
carItem
;
uploadCarData
.
areaId
=
item
.
code
;
console
.
log
(
'
uploadCarData
'
,
uploadCarData
);
HttpReq
.
truckDispatching
.
RegionalInformationCarAdd
(
uploadCarData
).
then
((
res
)
=>
{
if
(
res
.
code
==
200
){
}
else
{
this
.
$notify
({
title
:
res
.
msg
,
type
:
'
error
'
,
duration
:
2500
})
}
}).
catch
(
function
(
error
)
{
});
})
},
//修改区域信息
reqUpdateItem
(
form
,
item
){
let
lastData
=
{...
item
};
lastData
.
card
=
this
.
picFileName
;
lastData
.
cars
=
this
.
checkDataList
;
lastData
.
startTime
=
this
.
timePeriod
[
0
];
lastData
.
endTime
=
this
.
timePeriod
[
1
];
console
.
log
(
lastData
);
// HttpReq.truckDispatching.RegionalInformationUpdate(lastData).then((res) => {
// form.visible = false;
// if(res.code == 200){
// this.$notify({
// title: '区域信息修改成功!',
// type: 'success',
// duration: 2500
// });
// this.loadData()
// }else{
// this.$notify({
// title: res.msg,
// type: 'error',
// duration: 2500
// })
// this.loadData()
// }
// }).catch(function(error) {
// form.status.cu = 0
// });
form
.
status
.
cu
=
0
HttpReq
.
truckDispatching
.
RegionalInformationUpdate
(
lastData
).
then
((
res
)
=>
{
form
.
visible
=
false
;
if
(
res
.
code
==
200
){
this
.
$notify
({
title
:
'
区域信息修改成功!
'
,
type
:
'
success
'
,
duration
:
2500
});
this
.
loadData
()
}
else
{
this
.
$notify
({
title
:
res
.
msg
,
type
:
'
error
'
,
duration
:
2500
})
this
.
loadData
()
}
}).
catch
(
function
(
error
)
{
form
.
status
.
cu
=
0
});
HttpReq
.
truckDispatching
.
RegionalInformationCarDel
(
this
.
oldCheckDataList
).
then
((
res
)
=>
{
})
this
.
$nextTick
(()
=>
{
this
.
checkDataList
.
forEach
((
carItem
,
index
)
=>
{
let
uploadCarData
=
{};
uploadCarData
.
car
=
carItem
;
uploadCarData
.
areaId
=
item
.
code
;
HttpReq
.
truckDispatching
.
RegionalInformationCarAdd
(
uploadCarData
).
then
((
res
)
=>
{
if
(
res
.
code
==
200
){
}
else
{
this
.
$notify
({
title
:
res
.
msg
,
type
:
'
error
'
,
duration
:
2500
})
}
}).
catch
(
function
(
error
)
{
});
})
})
},
//删除区域信息
reqRemoveProject
(
item
){
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment