Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Toggle navigation
This project
Loading...
Sign in
platform
/
fanxing_new
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit 97a3bd35
authored
Apr 14, 2020
by
潘建波
Browse Files
Options
Browse Files
Tag
Download
Plain Diff
Merge branch 'fanxing' of
http://git.keliuyun.com:55676/platform/fanxing_new
into fanxing
2 parents
7faee8e8
09a4606f
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
68 additions
and
51 deletions
src/assets/js/buildcodes.js
src/assets/resetElementCss/index.css
src/assets/scss/common.scss
src/views/Login.vue
src/views/search/illegal.vue
src/views/search/vehicleSearch.vue
src/assets/js/buildcodes.js
View file @
97a3bd3
...
...
@@ -162,7 +162,7 @@ class Codes {
try
{
this
.
result
.
location_name
=
this
.
allData
.
event_data
.
location
.
name
===
""
?
"
无
"
?
"
未知
"
:
this
.
allData
.
event_data
.
location
.
name
;
}
catch
(
e
)
{
this
.
result
.
location_name
=
"未识别"
;
...
...
@@ -192,6 +192,14 @@ class Codes {
this
.
result
.
plate_type_text
=
"未识别"
;
}
try
{
this
.
result
.
plate_color_text
=
this
.
getCode
(
"号牌颜色"
,
this
.
allData
.
event_data
.
vehicle
.
plate
.
color_code
);
}
catch
(
err
)
{
this
.
result
.
plate_color_text
=
"未识别"
;
}
try
{
this
.
result
.
vehicle_body_color_text
=
this
.
getCode
(
"车身颜色"
,
this
.
allData
.
event_data
.
vehicle
.
body
.
color
.
code
...
...
src/assets/resetElementCss/index.css
View file @
97a3bd3
...
...
@@ -14,6 +14,9 @@
#login
.el-form-item--mini.el-form-item
,
#login
.el-form-item--small.el-form-item
{
margin-bottom
:
28px
!important
;
}
.detaiCon
.el-image__inner--center
{
transform
:
translate
(
-50%
)
!important
;
}
.el-main
{
padding
:
0
;
}
...
...
@@ -127,10 +130,19 @@
.el-pagination
.el-select
.el-input
.el-input__inner
{
border-radius
:
2px
;
}
.el-image-viewer__img
{
max-height
:
100%
;
max-width
:
none
!important
;
width
:
100%
!important
;
}
/* 表格 */
.el-table--small
td
,
.el-table--small
th
{
padding
:
8px
0
;
}
body
.el-table
th
.gutter
{
width
:
17px
!important
;
display
:
table-cell
!important
;
}
.el-table--mini
,
.el-table--small
,
.el-table__expand-icon
{
font-size
:
14px
;
}
...
...
@@ -179,9 +191,6 @@
.el-dialog__footer
{
padding
:
8px
27px
8px
;
}
.el-image__inner--center
{
transform
:
translate
(
-50%
);
}
/* dialog元素 */
.el-dialog
.el-input--small
.el-input__inner
{
height
:
26px
;
...
...
src/assets/scss/common.scss
View file @
97a3bd3
...
...
@@ -150,7 +150,7 @@ a:active{
}
.detaiCon
span
{
display
:
inline-block
;
width
:
8
0px
;
width
:
12
0px
;
}
.arrow
{
position
:
absolute
;
...
...
src/views/Login.vue
View file @
97a3bd3
...
...
@@ -21,7 +21,7 @@
</vue-particles>
-->
<div
class=
"box"
>
<h1>
视频分析综合管理平台
</h1>
<div
style=
"width: 6
8
%;margin: 0 auto;"
>
<div
style=
"width: 6
0
%;margin: 0 auto;"
>
<el-form
:model=
"ruleForm"
:rules=
"rules"
...
...
@@ -296,7 +296,6 @@ export default {
background-position
:
50%
50%
;
background-repeat
:
no-repeat
;
}
#particles
{
position
:
absolute
;
width
:
100%
;
...
...
@@ -340,13 +339,11 @@ export default {
}
h1
{
color
:
#
2F1136
;
color
:
#
000000
;
height
:
40px
;
line-height
:
40px
;
padding
:
60px
0px
;
font-size
:
44px
;
font-family
:
PingFangSC-Semibold
,
PingFang
SC
;
font-weight
:
600
;
}
#login
{
...
...
@@ -364,22 +361,17 @@ h1 {
width
:
25%
;
position
:
absolute
;
left
:
52%
;
top
:
2
2
%
;
top
:
2
0
%
;
}
button
{
width
:
100%
;
margin-top
:
27
px
;
border-radius
:
3
3
px
;
margin-top
:
40
px
;
border-radius
:
3
0
px
;
background
:
#0069ff
;
height
:
60px
;
font-size
:
26px
;
height
:
50px
;
font-size
:
20px
;
}
button
>>>
span
{
display
:
inline-block
;
text-align-last
:
justify
;
width
:
24%
;
}
button
:hover
{
color
:
#d6d9df
;
}
...
...
src/views/search/illegal.vue
View file @
97a3bd3
...
...
@@ -21,11 +21,11 @@
<el-input
placeholder=
"请输入车牌号码"
v-model=
"conditions.plate"
></el-input>
</span>
</el-form-item>
<el-form-item
label=
"车牌
类型
"
>
<el-form-item
label=
"车牌
颜色
"
>
<span
class=
"selectBox"
>
<el-select
placeholder=
"请选择"
:popper-append-to-body=
false
v-model=
"conditions.plate_
type
"
>
<el-select
placeholder=
"请选择"
:popper-append-to-body=
false
v-model=
"conditions.plate_
color
"
>
<el-option
value=
""
label=
'全部'
></el-option>
<el-option
v-for=
'item in plate
Type
List'
:value=
"item.code"
:key=
"item.code"
:label=
'item.name'
></el-option>
<el-option
v-for=
'item in plate
Color
List'
:value=
"item.code"
:key=
"item.code"
:label=
'item.name'
></el-option>
</el-select>
</span>
</el-form-item>
...
...
@@ -119,9 +119,9 @@
label=
"车身颜色"
>
</el-table-column>
<el-table-column
prop=
"
RefinedFeature
_text"
prop=
"
plate_color
_text"
align=
"center"
label=
"
标识物
"
>
label=
"
车牌颜色
"
>
</el-table-column>
<el-table-column
prop=
"illegalType"
...
...
@@ -185,18 +185,15 @@
<div
style=
"position: relative;padding: 10px 20px;"
>
<!-- <div class="leftArrow" @click="leftFun"><i class="el-icon-d-arrow-left"></i></div> -->
<div
class=
"detaiCon"
>
<el-image
style=
"width: 60%;display: block;margin: 0 auto;"
:src=
"this.detailImg"
>
<el-image
style=
"width: 60%;display: block;margin: 0 auto;"
:src=
"this.detailImg"
:preview-src-list=
"srcList"
>
<div
slot=
"error"
class=
"image-slot"
>
<img
:src=
"carImg"
alt=
""
style=
"width: 40%;display: block;margin: 0 auto;"
>
</div>
</el-image>
<el-form
label-width=
"
8
0px"
inline
>
<el-form
label-width=
"
9
0px"
inline
>
<el-form-item
label=
"车牌号码:"
>
<span>
{{ detailObj.vehicle_plate_text }}
</span>
</el-form-item>
<el-form-item
label=
"车牌类型:"
>
<span>
{{ detailObj.plate_type_text }}
</span>
</el-form-item>
<el-form-item
label=
"经过日期:"
>
<span>
{{ detailObj.shoot_date ? detailObj.shoot_date : '' }}
</span>
</el-form-item>
...
...
@@ -218,9 +215,9 @@
<el-form-item
label=
"车身颜色:"
>
<span>
{{ detailObj.vehicle_body_color_text }}
</span>
</el-form-item>
<el-form-item
label=
"标志物:"
>
<
!-- <
el-form-item label="标志物:">
<span>{{ detailObj.RefinedFeature_text }}</span>
</el-form-item>
</el-form-item>
-->
<el-form-item
label=
"违法类型:"
>
<span>
{{ detailObj.illegalType }}
</span>
</el-form-item>
...
...
@@ -235,7 +232,7 @@
<el-button
@
click=
"detailVisible = false"
>
关 闭
</el-button>
</span>
</el-dialog>
<
curVideo
ref=
"visableDialog"
:playersrc=
"playurl"
></curVideo
>
<
videoDialog
ref=
"visableDialog"
:playersrc=
"playurl"
></videoDialog
>
</div>
</template>
<
script
>
...
...
@@ -250,6 +247,7 @@
detailObj
:{},
carImg
:
require
(
"@/assets/img/home/defaultImg.png"
),
detailImg
:
''
,
srcList
:
[],
detailVisible
:
false
,
dates
:[
start_dt
,
end_dt
],
conditions
:
{
...
...
@@ -258,7 +256,7 @@
task_id
:
''
,
subtask_id
:
''
,
plate
:
''
,
plate_
type
:
''
,
plate_
color
:
''
,
car_type
:
''
,
car_color
:
''
,
illegal
:
'all'
,
...
...
@@ -269,7 +267,7 @@
vehicleTypeList
:
this
.
$buildCode
.
getCodeList
(
'车辆类型'
),
vehicleColorList
:
this
.
$buildCode
.
getCodeList
(
'车身颜色'
),
illegalList
:
this
.
$buildCode
.
getCodeList
(
'违法类型'
),
plate
TypeList
:
this
.
$buildCode
.
getCodeList
(
'号牌类型
'
),
plate
ColorList
:
this
.
$buildCode
.
getCodeList
(
'号牌颜色
'
),
tableData
:[],
formatterData
:[],
total
:
0
,
...
...
@@ -288,7 +286,7 @@
this
.
conditions
.
end_dt
=
val
[
1
];
}
},
components
:{},
components
:{
videoDialog
},
mounted
(){
this
.
getTaskList
();
this
.
getData
()
...
...
@@ -342,7 +340,7 @@
'&task_id='
+
this
.
conditions
.
task_id
+
'&subtask_id='
+
this
.
conditions
.
subtask_id
+
'&plate_number__like='
+
this
.
conditions
.
plate
+
'&plate_
type='
+
this
.
conditions
.
plate_type
+
'&plate_
color='
+
this
.
conditions
.
plate_color
+
'&vehicle_type='
+
this
.
conditions
.
car_type
+
'&body_color='
+
this
.
conditions
.
car_color
+
'&is_key_vehicle='
+
this
.
conditions
.
is_key_vehicle
+
...
...
@@ -432,7 +430,7 @@
task_id
:
this
.
conditions
.
task_id
,
subtask_id
:
this
.
conditions
.
subtask_id
,
plate_number__like
:
this
.
conditions
.
plate
,
plate_
type
:
this
.
conditions
.
plate_type
,
plate_
color
:
this
.
conditions
.
plate_color
,
vehicle_type
:
this
.
conditions
.
car_type
,
body_color
:
this
.
conditions
.
car_color
,
illegal_code
:
this
.
conditions
.
illegal
,
...
...
@@ -452,9 +450,11 @@
})
},
getImg
(
unid
){
this
.
srcList
=
[];
this
.
$api
.
search
.
detailImg
({
},
unid
).
then
(
res
=>
{
this
.
detailImg
=
res
.
pic_url
?
res
.
pic_url
:
carImg
;
this
.
srcList
.
push
(
this
.
detailImg
)
}).
catch
(
e
=>
{
})
...
...
src/views/search/vehicleSearch.vue
View file @
97a3bd3
...
...
@@ -30,11 +30,11 @@
<el-input
placeholder=
"请输入车牌号码"
v-model=
"conditions.plate"
></el-input>
</span>
</el-form-item>
<el-form-item
label=
"车牌
类型
"
>
<el-form-item
label=
"车牌
颜色
"
>
<span
class=
"selectBox"
>
<el-select
placeholder=
"请选择"
:popper-append-to-body=
false
v-model=
"conditions.plate_
type
"
>
<el-select
placeholder=
"请选择"
:popper-append-to-body=
false
v-model=
"conditions.plate_
color
"
>
<el-option
value=
""
label=
'全部'
></el-option>
<
!--
<el-option
v-for=
'item in vehicleTypeList'
:value=
"item.code"
:key=
"item.code"
:label=
'item.name'
></el-option>
--
>
<
el-option
v-for=
'item in plateColorList'
:value=
"item.code"
:key=
"item.code"
:label=
'item.name'
></el-option
>
</el-select>
</span>
</el-form-item>
...
...
@@ -135,9 +135,9 @@
label=
"车牌号码"
>
</el-table-column>
<el-table-column
prop=
"
vehicle_body_type
_text"
prop=
"
plate_color
_text"
align=
"center"
label=
"车牌
类型
"
>
label=
"车牌
颜色
"
>
</el-table-column>
<el-table-column
prop=
"vehicle_body_type_text"
...
...
@@ -216,7 +216,7 @@
<div
style=
"position: relative;padding: 10px 20px;"
>
<!-- <div class="leftArrow" @click="leftFun"><i class="el-icon-d-arrow-left"></i></div> -->
<div
class=
"detaiCon"
>
<el-image
style=
"width: 100%;"
:src=
"this.detailImg"
>
<el-image
style=
"width: 100%;"
:src=
"this.detailImg"
:preview-src-list=
"srcList"
>
<div
slot=
"error"
class=
"image-slot"
>
<img
:src=
"carImg"
alt=
""
style=
"width: 30%;display: block;margin: 0 auto;"
>
</div>
...
...
@@ -225,9 +225,9 @@
<el-form-item
label=
"车牌号码:"
>
<span>
{{ detailObj.vehicle_plate_text }}
</span>
</el-form-item>
<el-form-item
label=
"车牌类型:"
>
<
!-- <
el-form-item label="车牌类型:">
<span>{{ detailObj.plate_type_text }}</span>
</el-form-item>
</el-form-item>
-->
<el-form-item
label=
"经过日期:"
>
<span>
{{ detailObj.shoot_date ? detailObj.shoot_date : '' }}
</span>
</el-form-item>
...
...
@@ -249,9 +249,12 @@
<el-form-item
label=
"车身颜色:"
>
<span>
{{ detailObj.vehicle_body_color_text }}
</span>
</el-form-item>
<el-form-item
label=
"
标志物
:"
>
<span>
{{ detailObj.
RefinedFeature
_text }}
</span>
<el-form-item
label=
"
特殊车辆
:"
>
<span>
{{ detailObj.
special
_text }}
</span>
</el-form-item>
<!-- <el-form-item label="标志物:">
<span>{{ detailObj.RefinedFeature_text }}</span>
</el-form-item> -->
</el-form>
</div>
<!-- <div class="rightArrow" @click="rightFun"><i class="el-icon-d-arrow-right"></i></div> -->
...
...
@@ -274,13 +277,14 @@
detailObj
:{},
carImg
:
require
(
"@/assets/img/home/defaultImg.png"
),
detailImg
:
''
,
srcList
:
[],
detailVisible
:
false
,
dates
:[
start_dt
,
end_dt
],
conditions
:
{
start_dt
:
start_dt
,
end_dt
:
end_dt
,
source_type
:
'pull_video_stream'
,
plate_
type
:
''
,
plate_
color
:
''
,
marker
:
''
,
car_type
:
''
,
car_color
:
''
,
...
...
@@ -295,6 +299,7 @@
brandList
:
this
.
$buildCode
.
getCodeList
(
'车辆品牌'
),
vehicleTypeList
:
this
.
$buildCode
.
getCodeList
(
'车辆类型'
),
vehicleColorList
:
this
.
$buildCode
.
getCodeList
(
'车身颜色'
),
plateColorList
:
this
.
$buildCode
.
getCodeList
(
'号牌颜色'
),
tableData
:[],
formatterData
:[],
total
:
0
,
...
...
@@ -358,6 +363,7 @@
+
'&body_color='
+
this
.
conditions
.
car_color
+
'&logo_type='
+
this
.
conditions
.
logo_type
+
'&plate_number__like='
+
this
.
conditions
.
plate
+
'&plate_color='
+
this
.
conditions
.
plate_color
+
'&task_id='
+
this
.
conditions
.
task_id
+
'&special_type='
+
this
.
conditions
.
special_type
))
},
...
...
@@ -448,7 +454,7 @@
logo_type
:
this
.
conditions
.
logo_type
,
plate_number__like
:
this
.
conditions
.
plate
,
// marker: this.conditions.marker,
plate_
type
:
this
.
conditions
.
plate_type
,
plate_
color
:
this
.
conditions
.
plate_color
,
event_type
:
''
,
special_type
:
this
.
conditions
.
special_type
,
task_id
:
this
.
conditions
.
task_id
,
...
...
@@ -466,9 +472,11 @@
})
},
getImg
(
unid
){
this
.
srcList
=
[];
this
.
$api
.
search
.
detailImg
({
},
unid
).
then
(
res
=>
{
this
.
detailImg
=
res
.
pic_url
?
res
.
pic_url
:
carImg
;
this
.
srcList
.
push
(
this
.
detailImg
)
}).
catch
(
e
=>
{
})
...
...
Write
Preview
Markdown
is supported
Attach a file
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 post a comment