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
Expand all
Show 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
This diff is collapsed.
Click to expand it.
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
// });
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
// });
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