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
4d95d96f
Commit
4d95d96f
authored
Mar 29, 2022
by
caicaicai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
33f630ef
Changes
11
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
499 additions
and
45 deletions
+499
-45
index.vue
src/views/DeviceManage/deviceMan/index.vue
+2
-5
index.vue
src/views/MLargeScreen/components/dataAnalysis/index.vue
+463
-7
index.vue
src/views/carManagement/carFault/index.vue
+0
-1
index.vue
src/views/carManagement/carFleet/index.vue
+8
-12
index.vue
src/views/carManagement/carInformation/index.vue
+8
-5
index.vue
src/views/carManagement/carModel/index.vue
+8
-5
index.vue
src/views/carManagement/carRepair/index.vue
+0
-1
index.vue
src/views/carManagement/carType/index.vue
+4
-2
index.vue
src/views/performanceStatistics/caiquOutput/day/index.vue
+4
-4
index.vue
src/views/regionalManagement/regionalType/index.vue
+0
-2
vue.config.js
vue.config.js
+2
-1
No files found.
src/views/DeviceManage/deviceMan/index.vue
View file @
4d95d96f
...
@@ -5,18 +5,15 @@
...
@@ -5,18 +5,15 @@
<!--工具栏-->
<!--工具栏-->
<div
class=
"head-container"
>
<div
class=
"head-container"
>
<!-- 搜索 -->
<!-- 搜索 -->
<label
class=
"el-form-item-label"
style=
"font-weight: 500;"
>
终端车辆类型
</label>
<
!--
<
label
class=
"el-form-item-label"
style=
"font-weight: 500;"
>
终端车辆类型
</label>
<el-select
v-model=
"query.carclass"
placeholder=
"请选择终端车辆类型"
style=
"width:180px;"
>
<el-select
v-model=
"query.carclass"
placeholder=
"请选择终端车辆类型"
style=
"width:180px;"
>
<el-option
label=
"卡车"
value=
"卡车"
></el-option>
<el-option
label=
"卡车"
value=
"卡车"
></el-option>
<el-option
label=
"电铲"
value=
"电铲"
></el-option>
<el-option
label=
"电铲"
value=
"电铲"
></el-option>
</el-select>
</el-select>
-->
<label
class=
"el-form-item-label"
style=
"font-weight: 500;"
>
设备编码
</label>
<label
class=
"el-form-item-label"
style=
"font-weight: 500;"
>
设备编码
</label>
<el-input
v-model=
"query.code"
clearable
size=
"small"
placeholder=
"请输入设备编码"
style=
"width:180px;"
/>
<el-input
v-model=
"query.code"
clearable
size=
"small"
placeholder=
"请输入设备编码"
style=
"width:180px;"
/>
<label
class=
"el-form-item-label"
style=
"font-weight: 500;"
>
安装车辆
</label>
<el-input
v-model=
"query.carname"
clearable
size=
"small"
placeholder=
"请输入安装车辆"
style=
"width:180px;"
/>
<el-button
size=
"mini"
type=
"success"
icon=
"el-icon-search"
@
click=
"toSearch"
>
搜索
</el-button>
<el-button
size=
"mini"
type=
"success"
icon=
"el-icon-search"
@
click=
"toSearch"
>
搜索
</el-button>
<el-button
size=
"mini"
icon=
"el-icon-refresh"
@
click=
"clearLimit"
>
重置
</el-button>
<el-button
size=
"mini"
icon=
"el-icon-refresh"
@
click=
"clearLimit"
>
重置
</el-button>
</div>
</div>
...
...
src/views/MLargeScreen/components/dataAnalysis/index.vue
View file @
4d95d96f
<
template
>
<
template
>
<div
class=
"dataAnaView"
>
<div
class=
"dataAnalysisScrView"
v-if=
"whetherShow"
>
数据分析
<div
class=
"dataAnalysisScrView_leftView"
>
<!-- 采区产量统计 -->
<div>
<div
class=
"dataAnalysisScrView_leftView_title"
>
采区产量统计
</div>
<div
class=
"dataAnalysisScrView_leftView_content"
style=
"position: relative;"
>
<div
id=
"echarts1View"
></div>
</div>
</div>
<!-- 各采区日产量排名 -->
<div>
<div
class=
"dataAnalysisScrView_leftView_title"
>
各采区日产量排名
</div>
<div
class=
"dataAnalysisScrView_leftView_content"
>
<div
class=
"outputRankView"
>
<div
v-for=
"(item, index) in outputRankData"
:key=
"index"
style=
"display:flex;margin-bottom:15px;padding:0px 10px 0px 0px"
>
<div
class=
"l-left"
>
{{
item
.
name
}}
</div>
<el-progress
:stroke-width=
"10"
:percentage=
"parseInt(item.output) / 10"
:format=
"progressFormat"
style=
"color:white;"
></el-progress>
</div>
</div>
</div>
</div>
<!-- 各采区当月完成率-->
<div>
<div
class=
"dataAnalysisScrView_leftView_title"
>
各采区当月完成率
</div>
<div
class=
"dataAnalysisScrView_leftView_content"
style=
"position: relative;"
>
<div
id=
"echarts2View"
></div>
</div>
</div>
<!-- 月生产完成效率-->
<div>
<div
class=
"dataAnalysisScrView_leftView_title"
>
月生产完成效率
</div>
<div
class=
"dataAnalysisScrView_leftView_content"
style=
"position: relative;"
>
<div
id=
"echarts3View"
></div>
</div>
</div>
</div>
<div
class=
"dataAnalysisScrView_rightView"
>
<!-- 装卸点平均时长 -->
<div>
<div
class=
"dataAnalysisScrView_rightView_title"
>
装卸点平均时长
</div>
<div
class=
"dataAnalysisScrView_rightView_content"
>
</div>
</div>
<!-- 矿石产量比-->
<div>
<div
class=
"dataAnalysisScrView_rightView_title"
>
矿石产量比
</div>
<div
class=
"dataAnalysisScrView_rightView_content"
>
</div>
</div>
<!-- 报警路障申报统计 -->
<div>
<div
class=
"dataAnalysisScrView_rightView_title"
>
报警路障申报统计
</div>
<div
class=
"dataAnalysisScrView_rightView_content"
>
</div>
</div>
<!-- 卸货点卸货量统计 -->
<div>
<div
class=
"dataAnalysisScrView_rightView_title"
>
卸货点卸货量统计
</div>
<div
class=
"dataAnalysisScrView_rightView_content"
>
</div>
</div>
</div>
</div>
</div>
</
template
>
</
template
>
<
script
>
<
script
>
import
{
Tools
,
HttpReq
,
Dates
}
from
'
@/assets/js/common.js
'
;
import
*
as
echarts
from
'
echarts
'
;
export
default
{
export
default
{
data
()
{
data
()
{
return
{
return
{
whetherShow
:
false
,
//时间
currentTime
:{
day
:
''
,
month
:
''
,
year
:
''
,
},
//采取产量统计
echarts1Data
:[
{
value
:
104
,
name
:
'
Ca2o
'
},
{
value
:
735
,
name
:
'
Ca3o
'
},
{
value
:
580
,
name
:
'
Ca4o
'
},
{
value
:
484
,
name
:
'
Ca5o
'
},
{
value
:
300
,
name
:
'
Ca6o
'
}
],
//各采区日产量排名
outputRankData
:[],
//各采区当月完成率
echarts2Data
:{
caiquName
:[
'
采区一
'
,
'
采区二
'
,
'
采区三
'
,
'
采区四
'
],
wanchengNum
:[
200
,
250
,
485
,
632
],
jihuaNum
:[
300
,
500
,
600
,
700
],
wanchengRate
:[
20
,
50
,
60
,
80
],
},
//月生产完成效率
echarts3Data
:{},
}
}
},
},
mounted
()
{
},
mounted
()
{
},
methods
:
{
methods
:
{
loadData
(){
loadData
(){
console
.
log
(
'
数据分析
'
);
this
.
whetherShow
=
true
;
this
.
dayCurrentTimeFn
();
this
.
monthCurrentTimeFn
();
this
.
yearCurrentTimeFn
();
this
.
$nextTick
(()
=>
{
//采取产量统计图表
this
.
echarts1Fn
();
//各采区日产量排名
HttpReq
.
truckDispatching
.
caiquAreaQueryDay
({
size
:
10
,
createTime
:
this
.
currentTime
.
day
,
sort
:
'
output,desc
'
,}).
then
((
res
)
=>
{
if
(
res
.
code
==
200
){
this
.
outputRankData
=
res
.
data
.
content
;
}
})
//各采区当月完成率
this
.
echarts2Fn
();
})
},
//采取产量统计
echarts1Fn
(){
var
myChart
=
echarts
.
init
(
document
.
getElementById
(
'
echarts1View
'
));
var
option
=
{
tooltip
:
{
trigger
:
'
item
'
},
legend
:
{
orient
:
'
vertical
'
,
top
:
'
center
'
,
right
:
'
right
'
,
textStyle
:{
color
:
'
white
'
,
fontSize
:
16
,
}
},
color
:[
'
#1999D5
'
,
'
#E68220
'
,
'
rgb(24,228,240)
'
,
'
#F3EF76
'
,
'
#F5335C
'
],
series
:
[
{
name
:
'
产量(吨)
'
,
type
:
'
pie
'
,
radius
:
[
'
40%
'
,
'
85%
'
],
avoidLabelOverlap
:
false
,
label
:
{
show
:
true
,
position
:
'
inner
'
,
formatter
:
'
({d}%)
'
},
labelLine
:
{
show
:
false
},
data
:
this
.
echarts1Data
,
}
]
};
option
&&
myChart
.
setOption
(
option
);
},
//排行榜进度条文字转换
progressFormat
(
number
){
let
num
=
parseFloat
(
number
)
*
10
return
num
;
},
//各采区当月完成率
echarts2Fn
(){
var
myChart
=
echarts
.
init
(
document
.
getElementById
(
'
echarts2View
'
));
var
option
=
{
tooltip
:
{
trigger
:
'
axis
'
,
},
legend
:
{
data
:
[
'
完成量
'
,
'
计划量
'
,
'
完成率
'
],
textStyle
:{
color
:
'
white
'
,
fontSize
:
15
,
}
},
xAxis
:
[
{
type
:
'
category
'
,
data
:
this
.
echarts2Data
.
caiquName
,
axisPointer
:
{
type
:
'
shadow
'
},
axisLabel
:
{
show
:
true
,
textStyle
:
{
color
:
'
white
'
}
},
axisLine
:
{
lineStyle
:
{
color
:
'
white
'
,
width
:
1
}
}
}
],
yAxis
:
[
{
type
:
'
value
'
,
name
:
'
产量(T)
'
,
min
:
0
,
max
:
1000
,
interval
:
200
,
axisLabel
:
{
formatter
:
'
{value}
'
,
show
:
true
,
textStyle
:
{
color
:
'
white
'
}
},
axisLine
:
{
lineStyle
:
{
color
:
'
white
'
,
width
:
0
}
}
},
{
type
:
'
value
'
,
name
:
'
完成率(%)
'
,
min
:
0
,
max
:
100
,
interval
:
20
,
axisLabel
:
{
formatter
:
'
{value}
'
,
show
:
true
,
textStyle
:
{
color
:
'
white
'
}
},
axisLine
:
{
lineStyle
:
{
color
:
'
white
'
,
width
:
0
}
}
}
],
series
:
[
{
name
:
'
完成量
'
,
type
:
'
bar
'
,
tooltip
:
{
valueFormatter
:
function
(
value
)
{
return
value
+
'
T
'
;
}
},
data
:
this
.
echarts2Data
.
wanchengNum
,
barWidth
:
10
,
itemStyle
:
{
normal
:
{
color
:
'
#09EDFB
'
}
}
},
{
name
:
'
计划量
'
,
type
:
'
bar
'
,
tooltip
:
{
valueFormatter
:
function
(
value
)
{
return
value
+
'
T
'
;
}
},
data
:
this
.
echarts2Data
.
jihuaNum
,
barWidth
:
10
,
itemStyle
:
{
normal
:
{
color
:
'
#00ACE9
'
}
}
},
{
name
:
'
完成率
'
,
type
:
'
line
'
,
yAxisIndex
:
1
,
tooltip
:
{
valueFormatter
:
function
(
value
)
{
return
value
+
'
%
'
;
}
},
data
:
this
.
echarts2Data
.
wanchengRate
,
itemStyle
:
{
normal
:
{
lineStyle
:
{
color
:
'
#FFC200
'
}
//设置线条颜色
}
}
}
]
};
option
&&
myChart
.
setOption
(
option
);
},
//月生产完成效率
echarts3Fn
(){
var
myChart
=
echarts
.
init
(
document
.
getElementById
(
'
echarts3View
'
));
},
//获取当前时间
dayCurrentTimeFn
(){
var
date
=
new
Date
();
var
year
=
date
.
getFullYear
();
//年 ,从 Date 对象以四位数字返回年份
var
month
=
date
.
getMonth
()
+
1
;
//月 ,从 Date 对象返回月份 (0 ~ 11) ,date.getMonth()比实际月份少 1 个月
var
day
=
date
.
getDate
();
//日 ,从 Date 对象返回一个月中的某一天 (1 ~ 31)
//修改月份格式
if
(
month
>=
1
&&
month
<=
9
)
{
month
=
"
0
"
+
month
;
}
//修改日期格式
if
(
day
>=
0
&&
day
<=
9
)
{
day
=
"
0
"
+
day
;
}
let
currentFormatDate
=
year
+
"
-
"
+
month
+
"
-
"
+
day
;
this
.
currentTime
.
day
=
currentFormatDate
;
},
monthCurrentTimeFn
(){
var
date
=
new
Date
();
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
;
this
.
currentTime
.
month
=
currentFormatDate
;
},
yearCurrentTimeFn
(){
var
date
=
new
Date
();
var
year
=
date
.
getFullYear
();
//年 ,从 Date 对象以四位数字返回年份
let
currentFormatDate
=
year
;
this
.
currentTime
.
year
=
currentFormatDate
;
},
},
},
},
}
}
</
script
>
</
script
>
<
style
>
<
style
scoped
>
.dataAnaView
{
.dataAna
lysisScr
View
{
width
:
100%
;
width
:
100%
;
height
:
100%
;
height
:
100%
;
overflow
:
hidden
;
overflow
:
hidden
;
background-color
:
aliceblue
;
display
:
flex
;
justify-content
:
space-between
;
}
.dataAnalysisScrView_leftView
{
height
:
100%
;
width
:
20%
;
}
.dataAnalysisScrView_centerView
{
height
:
100%
;
width
:
60%
;
position
:
relative
;
}
.dataAnalysisScrView_rightView
{
height
:
100%
;
width
:
20%
;
}
.dataAnalysisScrView_leftView
>
div
{
width
:
100%
;
height
:
23.5vh
;
background
:
no-repeat
center
center
url('~@/assets/images/cutGraph/yuanjianjuxing1.png')
;
background-size
:
100%
100%
;
padding
:
5px
7px
;
box-sizing
:
border-box
;
overflow
:
hidden
;
}
.dataAnalysisScrView_rightView
>
div
{
width
:
100%
;
height
:
23.5vh
;
background
:
no-repeat
center
center
url('~@/assets/images/cutGraph/yuanjianjuxing1.png')
;
background-size
:
100%
100%
;
padding
:
5px
7px
;
box-sizing
:
border-box
;
overflow
:
hidden
;
}
.dataAnalysisScrView_leftView_title
,
.dataAnalysisScrView_rightView_title
{
margin-bottom
:
5px
;
width
:
100%
;
height
:
3.5vh
;
background
:
no-repeat
center
center
url('~@/assets/images/cutGraph/biaoti1.png')
;
background-size
:
100%
100%
;
padding-left
:
10px
;
box-sizing
:
border-box
;
font-size
:
18px
;
line-height
:
3.5vh
;
color
:
#FAFAFB
;
letter-spacing
:
1px
;
text-shadow
:
1px
1px
1px
#92CBFF
;
}
.dataAnalysisScrView_leftView_content
,
.dataAnalysisScrView_rightView_content
{
width
:
100%
;
height
:
19vh
;
}
.table-box
{
margin-top
:
-10px
;
}
dl
{
display
:
table
;
width
:
100%
;
}
dt
{
margin-top
:
20px
;
display
:
table-row
;
background-color
:
#274088
;
}
dt
>
div
{
display
:
table-cell
;
padding
:
5px
3px
;
font-size
:
15px
;
font-weight
:
500
;
color
:
rgb
(
24
,
228
,
240
);
}
dd
{
display
:
table-row
;
}
dd
>
div
{
display
:
table-cell
;
padding
:
5px
3px
;
font-size
:
14px
;
color
:
rgb
(
24
,
228
,
240
);
}
.truck_titleStyle
{
display
:
flex
;
justify-content
:
space-between
;
padding-right
:
4vw
;
}
#echarts1View
{
position
:
absolute
;
left
:
-5vh
;
width
:
100%
;
height
:
19vh
;
}
.outputRankView
{
width
:
100%
;
height
:
18.5vh
;
overflow-y
:
auto
;
scrollbar-width
:
none
;
}
.outputRankView
::-webkit-scrollbar
{
display
:
none
;
}
.l-left
{
font-size
:
16px
;
width
:
100px
;
text-align
:
center
;
color
:
#BFF7FF
;
overflow
:
hidden
;
white-space
:
nowrap
;
text-overflow
:
ellipsis
;
word-wrap
:
normal
;
}
.el-progress
{
width
:
70%
;
}
.outputRankView
>>>
.el-progress__text
{
color
:
white
;
}
#echarts2View
{
position
:
absolute
;
left
:
0vh
;
width
:
100%
;
height
:
23vh
;
}
#echarts3View
{
width
:
100%
;
height
:
23vh
;
}
}
</
style
>
</
style
>
\ No newline at end of file
src/views/carManagement/carFault/index.vue
View file @
4d95d96f
...
@@ -12,7 +12,6 @@
...
@@ -12,7 +12,6 @@
</div>
</div>
<div
class=
"content"
>
<div
class=
"content"
>
<el-table
:data=
"tableData"
v-loading=
"loading"
border
style=
"width:auto"
:row-class-name=
"tableRowClassName"
>
<el-table
:data=
"tableData"
v-loading=
"loading"
border
style=
"width:auto"
:row-class-name=
"tableRowClassName"
>
<el-table-column
prop=
"id"
label=
"序号"
align=
"center"
></el-table-column>
<el-table-column
prop=
"name"
label=
"编码"
align=
"center"
></el-table-column>
<el-table-column
prop=
"name"
label=
"编码"
align=
"center"
></el-table-column>
<el-table-column
prop=
"number"
label=
"车辆名称"
align=
"center"
></el-table-column>
<el-table-column
prop=
"number"
label=
"车辆名称"
align=
"center"
></el-table-column>
<el-table-column
prop=
"driver"
label=
"司机"
align=
"center"
></el-table-column>
<el-table-column
prop=
"driver"
label=
"司机"
align=
"center"
></el-table-column>
...
...
src/views/carManagement/carFleet/index.vue
View file @
4d95d96f
...
@@ -12,9 +12,7 @@
...
@@ -12,9 +12,7 @@
</div>
</div>
<div
class=
"content"
>
<div
class=
"content"
>
<el-table
:data=
"tableData"
v-loading=
"loading"
border
style=
"width:auto"
:row-class-name=
"tableRowClassName"
>
<el-table
:data=
"tableData"
v-loading=
"loading"
border
style=
"width:auto"
:row-class-name=
"tableRowClassName"
>
<el-table-column
prop=
"id"
label=
"序号"
align=
"center"
></el-table-column>
<el-table-column
prop=
"name"
label=
"车队名称"
align=
"center"
></el-table-column>
<el-table-column
prop=
"name"
label=
"车队名称"
align=
"center"
></el-table-column>
<el-table-column
prop=
"carclass"
label=
"车辆类型"
align=
"center"
></el-table-column>
<el-table-column
prop=
"area"
label=
"所属矿区"
align=
"center"
></el-table-column>
<el-table-column
prop=
"area"
label=
"所属矿区"
align=
"center"
></el-table-column>
<el-table-column
prop=
"createTime"
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"
>
<el-table-column
label=
"操作"
align=
"center"
fixed=
"right"
>
...
@@ -38,18 +36,9 @@
...
@@ -38,18 +36,9 @@
<el-form-item
label=
"车队名称"
prop=
"name"
>
<el-form-item
label=
"车队名称"
prop=
"name"
>
<el-input
v-model=
"form.item.name"
style=
"width:280px;"
placeholder=
"请输入车队名称"
/>
<el-input
v-model=
"form.item.name"
style=
"width:280px;"
placeholder=
"请输入车队名称"
/>
</el-form-item>
</el-form-item>
<el-form-item
label=
"所属车辆类型"
prop=
"carclass"
>
<el-select
v-model=
"form.item.carclass"
placeholder=
"请选择车辆类型"
style=
"width:280px;"
>
<el-option
label=
"挖机"
value=
"挖机"
></el-option>
<el-option
label=
"铲车"
value=
"铲车"
></el-option>
<el-option
label=
"卡车"
value=
"卡车"
></el-option>
<el-option
label=
"清扫车"
value=
"清扫车"
></el-option>
</el-select>
</el-form-item>
<el-form-item
label=
"所属矿区"
prop=
"area"
>
<el-form-item
label=
"所属矿区"
prop=
"area"
>
<el-select
v-model=
"form.item.area"
placeholder=
"请选择所属矿区"
style=
"width:280px;"
>
<el-select
v-model=
"form.item.area"
placeholder=
"请选择所属矿区"
style=
"width:280px;"
>
<el-option
label=
"矿区1"
value=
"矿区1"
></el-option>
<el-option
v-for=
"(obj,index) in belongAreaData"
:label=
"obj.name"
:value=
"obj.name"
:key=
"index"
></el-option>
<el-option
label=
"矿区2"
value=
"矿区2"
></el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</el-form>
</el-form>
...
@@ -76,6 +65,7 @@ export default {
...
@@ -76,6 +65,7 @@ export default {
total
:
0
,
total
:
0
,
query
:{},
query
:{},
tableData
:
[],
tableData
:
[],
belongAreaData
:[],
form
:
{
form
:
{
title
:
'
新增车队
'
,
title
:
'
新增车队
'
,
visible
:
false
,
visible
:
false
,
...
@@ -112,6 +102,12 @@ export default {
...
@@ -112,6 +102,12 @@ export default {
this
.
total
=
res
.
data
.
totalElements
;
this
.
total
=
res
.
data
.
totalElements
;
}
}
})
})
//获取区域
HttpReq
.
truckDispatching
.
RegionalInformationQuery
(
param
).
then
((
res
)
=>
{
if
(
res
.
code
==
200
){
this
.
belongAreaData
=
res
.
data
.
content
;
}
})
})
})
},
},
...
...
src/views/carManagement/carInformation/index.vue
View file @
4d95d96f
...
@@ -73,10 +73,7 @@
...
@@ -73,10 +73,7 @@
</el-form-item>
</el-form-item>
<el-form-item
label=
"卡车类型"
prop=
"carclass"
>
<el-form-item
label=
"卡车类型"
prop=
"carclass"
>
<el-select
v-model=
"form.item.carclass"
placeholder=
"请选择卡车类型"
style=
"width:160px;"
>
<el-select
v-model=
"form.item.carclass"
placeholder=
"请选择卡车类型"
style=
"width:160px;"
>
<el-option
label=
"挖机"
value=
"挖机"
></el-option>
<el-option
v-for=
"(obj,index) in carTypeData"
:label=
"obj.name"
:value=
"obj.name"
:key=
"index"
></el-option>
<el-option
label=
"铲车"
value=
"铲车"
></el-option>
<el-option
label=
"卡车"
value=
"卡车"
></el-option>
<el-option
label=
"清扫车"
value=
"清扫车"
></el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"车队名称"
prop=
"road"
>
<el-form-item
label=
"车队名称"
prop=
"road"
>
...
@@ -130,7 +127,6 @@ import { Tools, HttpReq, Dates} from '@/assets/js/common.js';
...
@@ -130,7 +127,6 @@ import { Tools, HttpReq, Dates} from '@/assets/js/common.js';
export
default
{
export
default
{
name
:
'
CarInformation
'
,
name
:
'
CarInformation
'
,
components
:
{},
data
()
{
data
()
{
return
{
return
{
loading
:
false
,
loading
:
false
,
...
@@ -141,6 +137,7 @@ export default {
...
@@ -141,6 +137,7 @@ export default {
tableData
:
[],
tableData
:
[],
selectList
:[],
selectList
:[],
terminalList
:[],
terminalList
:[],
carTypeData
:[],
form
:
{
form
:
{
title
:
'
新增车辆
'
,
title
:
'
新增车辆
'
,
visible
:
false
,
visible
:
false
,
...
@@ -190,6 +187,12 @@ export default {
...
@@ -190,6 +187,12 @@ export default {
this
.
terminalList
=
res
.
data
.
content
;
this
.
terminalList
=
res
.
data
.
content
;
}
}
})
})
//获取车辆类型
HttpReq
.
truckDispatching
.
carTypeQuery
({
size
:
9999
}).
then
((
res
)
=>
{
if
(
res
.
code
==
200
){
this
.
carTypeData
=
res
.
data
.
content
;
}
})
})
})
},
},
...
...
src/views/carManagement/carModel/index.vue
View file @
4d95d96f
...
@@ -12,7 +12,6 @@
...
@@ -12,7 +12,6 @@
</div>
</div>
<div
class=
"content"
>
<div
class=
"content"
>
<el-table
:data=
"tableData"
v-loading=
"loading"
border
style=
"width:auto"
:row-class-name=
"tableRowClassName"
>
<el-table
:data=
"tableData"
v-loading=
"loading"
border
style=
"width:auto"
:row-class-name=
"tableRowClassName"
>
<el-table-column
prop=
"id"
label=
"序号"
align=
"center"
></el-table-column>
<el-table-column
prop=
"model"
label=
"车辆型号"
align=
"center"
></el-table-column>
<el-table-column
prop=
"model"
label=
"车辆型号"
align=
"center"
></el-table-column>
<el-table-column
prop=
"carclass"
label=
"所属车辆类型"
align=
"center"
></el-table-column>
<el-table-column
prop=
"carclass"
label=
"所属车辆类型"
align=
"center"
></el-table-column>
<el-table-column
prop=
"weight"
label=
"运重(kg)"
align=
"center"
></el-table-column>
<el-table-column
prop=
"weight"
label=
"运重(kg)"
align=
"center"
></el-table-column>
...
@@ -41,10 +40,7 @@
...
@@ -41,10 +40,7 @@
</el-form-item>
</el-form-item>
<el-form-item
label=
"所属车辆类型"
>
<el-form-item
label=
"所属车辆类型"
>
<el-select
v-model=
"form.item.carclass"
placeholder=
"请选择所属车辆类型"
style=
"width:280px;"
>
<el-select
v-model=
"form.item.carclass"
placeholder=
"请选择所属车辆类型"
style=
"width:280px;"
>
<el-option
label=
"挖机"
value=
"挖机"
></el-option>
<el-option
v-for=
"(obj,index) in carTypeData"
:label=
"obj.name"
:value=
"obj.name"
:key=
"index"
></el-option>
<el-option
label=
"铲车"
value=
"铲车"
></el-option>
<el-option
label=
"卡车"
value=
"卡车"
></el-option>
<el-option
label=
"清扫车"
value=
"清扫车"
></el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"运重(kg)"
prop=
"weight"
>
<el-form-item
label=
"运重(kg)"
prop=
"weight"
>
...
@@ -77,6 +73,7 @@ export default {
...
@@ -77,6 +73,7 @@ export default {
total
:
0
,
total
:
0
,
query
:{},
query
:{},
tableData
:
[],
tableData
:
[],
carTypeData
:[],
form
:
{
form
:
{
title
:
'
新增车辆型号
'
,
title
:
'
新增车辆型号
'
,
visible
:
false
,
visible
:
false
,
...
@@ -113,6 +110,12 @@ export default {
...
@@ -113,6 +110,12 @@ export default {
this
.
total
=
res
.
data
.
totalElements
;
this
.
total
=
res
.
data
.
totalElements
;
}
}
})
})
//获取车辆类型
HttpReq
.
truckDispatching
.
carTypeQuery
({
size
:
9999
}).
then
((
res
)
=>
{
if
(
res
.
code
==
200
){
this
.
carTypeData
=
res
.
data
.
content
;
}
})
})
})
},
},
...
...
src/views/carManagement/carRepair/index.vue
View file @
4d95d96f
...
@@ -12,7 +12,6 @@
...
@@ -12,7 +12,6 @@
</div>
</div>
<div
class=
"content"
>
<div
class=
"content"
>
<el-table
:data=
"tableData"
v-loading=
"loading"
border
style=
"width:auto"
:row-class-name=
"tableRowClassName"
>
<el-table
:data=
"tableData"
v-loading=
"loading"
border
style=
"width:auto"
:row-class-name=
"tableRowClassName"
>
<el-table-column
prop=
"id"
label=
"序号"
align=
"center"
></el-table-column>
<el-table-column
prop=
"number"
label=
"编码"
align=
"center"
></el-table-column>
<el-table-column
prop=
"number"
label=
"编码"
align=
"center"
></el-table-column>
<el-table-column
prop=
"name"
label=
"车辆名称"
align=
"center"
></el-table-column>
<el-table-column
prop=
"name"
label=
"车辆名称"
align=
"center"
></el-table-column>
<el-table-column
prop=
"driver"
label=
"司机"
align=
"center"
></el-table-column>
<el-table-column
prop=
"driver"
label=
"司机"
align=
"center"
></el-table-column>
...
...
src/views/carManagement/carType/index.vue
View file @
4d95d96f
...
@@ -12,7 +12,6 @@
...
@@ -12,7 +12,6 @@
</div>
</div>
<div
class=
"content"
>
<div
class=
"content"
>
<el-table
:data=
"tableData"
v-loading=
"loading"
border
style=
"width:auto"
:row-class-name=
"tableRowClassName"
>
<el-table
:data=
"tableData"
v-loading=
"loading"
border
style=
"width:auto"
:row-class-name=
"tableRowClassName"
>
<el-table-column
prop=
"id"
label=
"序号"
align=
"center"
></el-table-column>
<el-table-column
prop=
"code"
label=
"编码"
align=
"center"
></el-table-column>
<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=
"name"
label=
"车辆类型名称"
align=
"center"
></el-table-column>
<el-table-column
prop=
"card"
label=
"车辆标识图"
align=
"center"
>
<el-table-column
prop=
"card"
label=
"车辆标识图"
align=
"center"
>
...
@@ -43,13 +42,16 @@
...
@@ -43,13 +42,16 @@
<el-input
v-model=
"form.item.code"
style=
"width:280px;"
placeholder=
"请输入编码"
/>
<el-input
v-model=
"form.item.code"
style=
"width:280px;"
placeholder=
"请输入编码"
/>
</el-form-item>
</el-form-item>
<el-form-item
label=
"车辆类型名称"
>
<el-form-item
label=
"车辆类型名称"
>
<el-input
v-model=
"form.item.name"
style=
"width:280px;"
placeholder=
"请输入车辆类型"
/>
</el-form-item>
<!-- <el-form-item label="车辆类型名称">
<el-select v-model="form.item.name" placeholder="请选择车辆类型" style="width:280px;">
<el-select v-model="form.item.name" placeholder="请选择车辆类型" style="width:280px;">
<el-option label="挖机" value="挖机"></el-option>
<el-option label="挖机" value="挖机"></el-option>
<el-option label="铲车" value="铲车"></el-option>
<el-option label="铲车" value="铲车"></el-option>
<el-option label="卡车" value="卡车"></el-option>
<el-option label="卡车" value="卡车"></el-option>
<el-option label="清扫车" value="清扫车"></el-option>
<el-option label="清扫车" value="清扫车"></el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
-->
<el-form-item
label=
"车辆标识图"
prop=
"position"
>
<el-form-item
label=
"车辆标识图"
prop=
"position"
>
<el-input
v-model=
"picFileName"
style=
"width:160px;"
placeholder=
"请上传设备位置"
disabled
/>
<el-input
v-model=
"picFileName"
style=
"width:160px;"
placeholder=
"请上传设备位置"
disabled
/>
<input
type=
"file"
name=
"image"
@
change=
"excelImport($event)"
/>
<input
type=
"file"
name=
"image"
@
change=
"excelImport($event)"
/>
...
...
src/views/performanceStatistics/caiquOutput/day/index.vue
View file @
4d95d96f
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
<div
class=
"head-container"
>
<div
class=
"head-container"
>
<!-- 搜索 -->
<!-- 搜索 -->
<label
class=
"el-form-item-label"
style=
"font-weight: 500;"
>
选择日期
</label>
<label
class=
"el-form-item-label"
style=
"font-weight: 500;"
>
选择日期
</label>
<el-date-picker
v-model=
"query.
add
Time"
type=
"date"
placeholder=
"选择日期"
></el-date-picker>
<el-date-picker
v-model=
"query.
create
Time"
type=
"date"
placeholder=
"选择日期"
></el-date-picker>
<el-button
size=
"mini"
type=
"success"
icon=
"el-icon-search"
@
click=
"toSearch"
>
搜索
</el-button>
<el-button
size=
"mini"
type=
"success"
icon=
"el-icon-search"
@
click=
"toSearch"
>
搜索
</el-button>
<el-button
size=
"mini"
icon=
"el-icon-refresh"
@
click=
"clearLimit"
>
重置
</el-button>
<el-button
size=
"mini"
icon=
"el-icon-refresh"
@
click=
"clearLimit"
>
重置
</el-button>
...
@@ -69,10 +69,10 @@ export default {
...
@@ -69,10 +69,10 @@ export default {
param
.
page
=
this
.
page
-
1
;
param
.
page
=
this
.
page
-
1
;
param
.
size
=
this
.
size
;
param
.
size
=
this
.
size
;
param
.
sort
=
sort
;
param
.
sort
=
sort
;
if
(
this
.
query
.
add
Time
){
if
(
this
.
query
.
create
Time
){
param
.
addTime
=
this
.
changeTimeFn
(
this
.
query
.
add
Time
);
param
.
createTime
=
this
.
changeTimeFn
(
this
.
query
.
create
Time
);
}
else
{
}
else
{
param
.
add
Time
=
this
.
currentTime
;
param
.
create
Time
=
this
.
currentTime
;
}
}
this
.
$nextTick
(()
=>
{
this
.
$nextTick
(()
=>
{
...
...
src/views/regionalManagement/regionalType/index.vue
View file @
4d95d96f
...
@@ -12,7 +12,6 @@
...
@@ -12,7 +12,6 @@
</div>
</div>
<div
class=
"content"
>
<div
class=
"content"
>
<el-table
:data=
"tableData"
v-loading=
"loading"
border
style=
"width:auto"
:row-class-name=
"tableRowClassName"
>
<el-table
:data=
"tableData"
v-loading=
"loading"
border
style=
"width:auto"
:row-class-name=
"tableRowClassName"
>
<el-table-column
prop=
"id"
label=
"序号"
align=
"center"
></el-table-column>
<el-table-column
prop=
"code"
label=
"区域编码"
align=
"center"
></el-table-column>
<el-table-column
prop=
"code"
label=
"区域编码"
align=
"center"
></el-table-column>
<el-table-column
prop=
"classname"
label=
"类别名称"
align=
"center"
></el-table-column>
<el-table-column
prop=
"classname"
label=
"类别名称"
align=
"center"
></el-table-column>
<el-table-column
prop=
"color"
label=
"区域遮罩层颜色"
align=
"center"
></el-table-column>
<el-table-column
prop=
"color"
label=
"区域遮罩层颜色"
align=
"center"
></el-table-column>
...
@@ -59,7 +58,6 @@ import { Tools, HttpReq, Dates} from '@/assets/js/common.js';
...
@@ -59,7 +58,6 @@ import { Tools, HttpReq, Dates} from '@/assets/js/common.js';
export
default
{
export
default
{
name
:
'
RegionalType
'
,
name
:
'
RegionalType
'
,
components
:
{},
data
()
{
data
()
{
return
{
return
{
loading
:
false
,
loading
:
false
,
...
...
vue.config.js
View file @
4d95d96f
...
@@ -22,7 +22,8 @@ module.exports = {
...
@@ -22,7 +22,8 @@ module.exports = {
lintOnSave
:
process
.
env
.
NODE_ENV
===
'
development
'
,
lintOnSave
:
process
.
env
.
NODE_ENV
===
'
development
'
,
productionSourceMap
:
false
,
productionSourceMap
:
false
,
devServer
:
{
devServer
:
{
host
:
'
localhost
'
,
// 也可以直接写IP地址这样方便真机测试
//host: 'localhost', // 也可以直接写IP地址这样方便真机测试
host
:
'
192.168.0.101
'
,
// 也可以直接写IP地址这样方便真机测试
port
:
port
,
port
:
port
,
open
:
true
,
open
:
true
,
overlay
:
{
overlay
:
{
...
...
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