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 b33ad851
authored
Apr 08, 2020
by
潘建波
Browse Files
Options
Browse Files
Tag
Download
Plain Diff
合并了登录页冲突
2 parents
cf475910
6206b0d1
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
41 additions
and
31 deletions
src/assets/resetElementCss/index.css
src/views/Login.vue
src/views/search/illegal.vue
src/views/search/publicFlow.vue
src/assets/resetElementCss/index.css
View file @
b33ad85
...
@@ -179,6 +179,9 @@
...
@@ -179,6 +179,9 @@
.el-dialog__footer
{
.el-dialog__footer
{
padding
:
8px
27px
8px
;
padding
:
8px
27px
8px
;
}
}
.el-image__inner--center
{
transform
:
translate
(
-50%
);
}
/* dialog元素 */
/* dialog元素 */
.el-dialog
.el-input--small
.el-input__inner
{
.el-dialog
.el-input--small
.el-input__inner
{
height
:
26px
;
height
:
26px
;
...
...
src/views/Login.vue
View file @
b33ad85
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
</vue-particles>
-->
</vue-particles>
-->
<div
class=
"box"
>
<div
class=
"box"
>
<h1>
视频分析综合管理平台
</h1>
<h1>
视频分析综合管理平台
</h1>
<div
style=
"width: 6
0
%;margin: 0 auto;"
>
<div
style=
"width: 6
8
%;margin: 0 auto;"
>
<el-form
<el-form
:model=
"ruleForm"
:model=
"ruleForm"
:rules=
"rules"
:rules=
"rules"
...
@@ -340,11 +340,13 @@ export default {
...
@@ -340,11 +340,13 @@ export default {
}
}
h1
{
h1
{
color
:
#
000000
;
color
:
#
2F1136
;
height
:
40px
;
height
:
40px
;
line-height
:
40px
;
line-height
:
40px
;
padding
:
60px
0px
;
padding
:
60px
0px
;
font-size
:
44px
;
font-size
:
44px
;
font-family
:
PingFangSC-Semibold
,
PingFang
SC
;
font-weight
:
600
;
}
}
#login
{
#login
{
...
@@ -362,17 +364,22 @@ h1 {
...
@@ -362,17 +364,22 @@ h1 {
width
:
25%
;
width
:
25%
;
position
:
absolute
;
position
:
absolute
;
left
:
52%
;
left
:
52%
;
top
:
2
0
%
;
top
:
2
2
%
;
}
}
button
{
button
{
width
:
100%
;
width
:
100%
;
margin-top
:
40
px
;
margin-top
:
27
px
;
border-radius
:
3
0
px
;
border-radius
:
3
3
px
;
background
:
#0069ff
;
background
:
#0069ff
;
height
:
50px
;
height
:
60px
;
font-size
:
20px
;
font-size
:
26px
;
}
}
button
>>>
span
{
display
:
inline-block
;
text-align-last
:
justify
;
width
:
24%
;
}
button
:hover
{
button
:hover
{
color
:
#d6d9df
;
color
:
#d6d9df
;
}
}
...
...
src/views/search/illegal.vue
View file @
b33ad85
...
@@ -80,7 +80,7 @@
...
@@ -80,7 +80,7 @@
</el-col>
</el-col>
<div
style=
""
>
<div
style=
""
>
<el-table
<el-table
:data=
"formatt
t
erData"
:data=
"formatterData"
:height=
"tableHeight"
:height=
"tableHeight"
v-loading=
"loading"
v-loading=
"loading"
stripe
stripe
...
@@ -147,7 +147,7 @@
...
@@ -147,7 +147,7 @@
label=
"操作"
>
label=
"操作"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<el-tooltip
content=
"播放"
placement=
"bottom"
effect=
"light"
:visible-arrow=
false
>
<el-tooltip
content=
"播放"
placement=
"bottom"
effect=
"light"
:visible-arrow=
false
>
<span
:class=
"
{'iconfont icon-
fanxing-qido
ng playIcon':true,'no-btn':scope.row.video
&&
scope.row.video[0].src_url!=''?false:true}" @click="playFun(scope.$index, scope.row)">
</span>
<span
:class=
"
{'iconfont icon-
bofa
ng playIcon':true,'no-btn':scope.row.video
&&
scope.row.video[0].src_url!=''?false:true}" @click="playFun(scope.$index, scope.row)">
</span>
</el-tooltip>
</el-tooltip>
<span
class=
"tableSpanBorder"
></span>
<span
class=
"tableSpanBorder"
></span>
<el-tooltip
content=
"详情"
placement=
"bottom"
effect=
"light"
:visible-arrow=
false
>
<el-tooltip
content=
"详情"
placement=
"bottom"
effect=
"light"
:visible-arrow=
false
>
...
@@ -271,7 +271,7 @@
...
@@ -271,7 +271,7 @@
illegalList
:
this
.
$buildCode
.
getCodeList
(
'违法类型'
),
illegalList
:
this
.
$buildCode
.
getCodeList
(
'违法类型'
),
plateTypeList
:
this
.
$buildCode
.
getCodeList
(
'号牌类型'
),
plateTypeList
:
this
.
$buildCode
.
getCodeList
(
'号牌类型'
),
tableData
:[],
tableData
:[],
formatt
t
erData
:[],
formatterData
:[],
total
:
0
,
total
:
0
,
page
:
1
,
page
:
1
,
pageSize
:
30
,
pageSize
:
30
,
...
@@ -387,19 +387,19 @@
...
@@ -387,19 +387,19 @@
});
});
return
false
;
return
false
;
}
}
this
.
detailObj
=
this
.
formatt
t
erData
[
this
.
currentIndex
-
1
];
this
.
detailObj
=
this
.
formatterData
[
this
.
currentIndex
-
1
];
this
.
currentIndex
-=
1
;
this
.
currentIndex
-=
1
;
this
.
getImg
(
this
.
detailObj
.
pics
[
0
].
pic_unid
);
this
.
getImg
(
this
.
detailObj
.
pics
[
0
].
pic_unid
);
},
},
rightFun
(){
rightFun
(){
if
(
this
.
currentIndex
==
this
.
formatt
t
erData
.
length
-
1
){
if
(
this
.
currentIndex
==
this
.
formatterData
.
length
-
1
){
this
.
$message
({
this
.
$message
({
message
:
'目前为最后一条'
,
message
:
'目前为最后一条'
,
type
:
'warning'
type
:
'warning'
});
});
return
false
;
return
false
;
}
}
this
.
detailObj
=
this
.
formatt
t
erData
[
this
.
currentIndex
+
1
];
this
.
detailObj
=
this
.
formatterData
[
this
.
currentIndex
+
1
];
this
.
currentIndex
+=
1
;
this
.
currentIndex
+=
1
;
this
.
getImg
(
this
.
detailObj
.
pics
[
0
].
pic_unid
);
this
.
getImg
(
this
.
detailObj
.
pics
[
0
].
pic_unid
);
},
},
...
@@ -422,7 +422,7 @@
...
@@ -422,7 +422,7 @@
},
},
getData
(){
getData
(){
this
.
loading
=
true
;
this
.
loading
=
true
;
this
.
formatt
t
erData
=
[];
this
.
formatterData
=
[];
let
offset
=
(
this
.
page
-
1
)
*
this
.
pageSize
;
let
offset
=
(
this
.
page
-
1
)
*
this
.
pageSize
;
let
search_params
=
{
let
search_params
=
{
limit
:
this
.
pageSize
,
limit
:
this
.
pageSize
,
...
@@ -444,7 +444,7 @@
...
@@ -444,7 +444,7 @@
).
then
((
res
)
=>
{
).
then
((
res
)
=>
{
this
.
total
=
res
.
total_num
;
this
.
total
=
res
.
total_num
;
res
.
list_data
.
forEach
((
item
,
index
)
=>
{
res
.
list_data
.
forEach
((
item
,
index
)
=>
{
this
.
formatt
t
erData
.
push
(
this
.
$buildCode
.
init
(
item
));
this
.
formatterData
.
push
(
this
.
$buildCode
.
init
(
item
));
})
})
this
.
loading
=
false
;
this
.
loading
=
false
;
}).
catch
((
err
)
=>
{
}).
catch
((
err
)
=>
{
...
@@ -476,7 +476,7 @@
...
@@ -476,7 +476,7 @@
this
.
$api
.
search
.
delVehicle
({
this
.
$api
.
search
.
delVehicle
({
},
row
.
id
).
then
(
res
=>
{
},
row
.
id
).
then
(
res
=>
{
if
(
res
.
ecode
==
200
){
if
(
res
.
ecode
==
200
){
this
.
formatt
t
erData
.
splice
(
index
);
this
.
formatterData
.
splice
(
index
);
this
.
$message
({
this
.
$message
({
type
:
'success'
,
type
:
'success'
,
message
:
'删除成功!'
message
:
'删除成功!'
...
@@ -498,9 +498,9 @@
...
@@ -498,9 +498,9 @@
}).
then
(()
=>
{
}).
then
(()
=>
{
this
.
$api
.
search
.
delVehicle
({},
this
.
detailObj
.
id
).
then
(
res
=>
{
this
.
$api
.
search
.
delVehicle
({},
this
.
detailObj
.
id
).
then
(
res
=>
{
if
(
res
.
ecode
==
200
){
if
(
res
.
ecode
==
200
){
this
.
formatt
t
erData
.
splice
(
this
.
currentIndex
,
1
);
this
.
formatterData
.
splice
(
this
.
currentIndex
,
1
);
this
.
detailObj
=
Object
.
assign
({},
this
.
formatt
t
erData
[
this
.
currentIndex
]);
this
.
detailObj
=
Object
.
assign
({},
this
.
formatterData
[
this
.
currentIndex
]);
this
.
getImg
(
this
.
formatt
t
erData
[
this
.
currentIndex
].
pics
[
0
].
pic_unid
);
this
.
getImg
(
this
.
formatterData
[
this
.
currentIndex
].
pics
[
0
].
pic_unid
);
this
.
$message
({
this
.
$message
({
type
:
'success'
,
type
:
'success'
,
message
:
'删除成功!'
message
:
'删除成功!'
...
...
src/views/search/publicFlow.vue
View file @
b33ad85
...
@@ -72,7 +72,7 @@
...
@@ -72,7 +72,7 @@
</el-col>
</el-col>
<div
style=
""
>
<div
style=
""
>
<el-table
<el-table
:data=
"formatt
t
erData"
:data=
"formatterData"
height=
"574"
height=
"574"
stripe
stripe
border
border
...
@@ -227,7 +227,7 @@
...
@@ -227,7 +227,7 @@
},
},
bodyColorList
:
this
.
$buildCode
.
getCodeList
(
'车身颜色'
),
bodyColorList
:
this
.
$buildCode
.
getCodeList
(
'车身颜色'
),
tableData
:[],
tableData
:[],
formatt
t
erData
:[],
formatterData
:[],
total
:
0
,
total
:
0
,
page
:
1
,
page
:
1
,
pageSize
:
30
,
pageSize
:
30
,
...
@@ -321,19 +321,19 @@
...
@@ -321,19 +321,19 @@
});
});
return
false
;
return
false
;
}
}
this
.
detailObj
=
this
.
formatt
t
erData
[
this
.
currentIndex
-
1
];
this
.
detailObj
=
this
.
formatterData
[
this
.
currentIndex
-
1
];
this
.
currentIndex
-=
1
;
this
.
currentIndex
-=
1
;
this
.
getImg
(
this
.
detailObj
.
pics
[
0
].
pic_unid
);
this
.
getImg
(
this
.
detailObj
.
pics
[
0
].
pic_unid
);
},
},
rightFun
(){
rightFun
(){
if
(
this
.
currentIndex
==
this
.
formatt
t
erData
.
length
-
1
){
if
(
this
.
currentIndex
==
this
.
formatterData
.
length
-
1
){
this
.
$message
({
this
.
$message
({
message
:
'目前为最后一条'
,
message
:
'目前为最后一条'
,
type
:
'warning'
type
:
'warning'
});
});
return
false
;
return
false
;
}
}
this
.
detailObj
=
this
.
formatt
t
erData
[
this
.
currentIndex
+
1
];
this
.
detailObj
=
this
.
formatterData
[
this
.
currentIndex
+
1
];
this
.
currentIndex
+=
1
;
this
.
currentIndex
+=
1
;
this
.
getImg
(
this
.
detailObj
.
pics
[
0
].
pic_unid
);
this
.
getImg
(
this
.
detailObj
.
pics
[
0
].
pic_unid
);
},
},
...
@@ -356,7 +356,7 @@
...
@@ -356,7 +356,7 @@
},
},
getData
(){
getData
(){
this
.
loading
=
true
;
this
.
loading
=
true
;
this
.
formatt
t
erData
=
[];
this
.
formatterData
=
[];
let
offset
=
(
this
.
page
-
1
)
*
this
.
pageSize
;
let
offset
=
(
this
.
page
-
1
)
*
this
.
pageSize
;
let
search_params
=
{
let
search_params
=
{
limit
:
this
.
pageSize
,
limit
:
this
.
pageSize
,
...
@@ -375,7 +375,7 @@
...
@@ -375,7 +375,7 @@
).
then
((
res
)
=>
{
).
then
((
res
)
=>
{
this
.
total
=
res
.
total_num
;
this
.
total
=
res
.
total_num
;
res
.
list_data
.
forEach
((
item
,
index
)
=>
{
res
.
list_data
.
forEach
((
item
,
index
)
=>
{
this
.
formatt
t
erData
.
push
(
this
.
$buildCode
.
init
(
item
));
this
.
formatterData
.
push
(
this
.
$buildCode
.
init
(
item
));
})
})
this
.
loading
=
false
;
this
.
loading
=
false
;
}).
catch
((
err
)
=>
{
}).
catch
((
err
)
=>
{
...
@@ -407,7 +407,7 @@
...
@@ -407,7 +407,7 @@
this
.
$api
.
search
.
delVehicle
({
this
.
$api
.
search
.
delVehicle
({
},
row
.
id
).
then
(
res
=>
{
},
row
.
id
).
then
(
res
=>
{
if
(
res
.
ecode
==
200
){
if
(
res
.
ecode
==
200
){
this
.
formatt
t
erData
.
splice
(
index
);
this
.
formatterData
.
splice
(
index
);
this
.
$message
({
this
.
$message
({
type
:
'success'
,
type
:
'success'
,
message
:
'删除成功!'
message
:
'删除成功!'
...
@@ -429,9 +429,9 @@
...
@@ -429,9 +429,9 @@
}).
then
(()
=>
{
}).
then
(()
=>
{
this
.
$api
.
search
.
delVehicle
({},
this
.
detailObj
.
id
).
then
(
res
=>
{
this
.
$api
.
search
.
delVehicle
({},
this
.
detailObj
.
id
).
then
(
res
=>
{
if
(
res
.
ecode
==
200
){
if
(
res
.
ecode
==
200
){
this
.
formatt
t
erData
.
splice
(
this
.
currentIndex
,
1
);
this
.
formatterData
.
splice
(
this
.
currentIndex
,
1
);
this
.
detailObj
=
Object
.
assign
({},
this
.
formatt
t
erData
[
this
.
currentIndex
]);
this
.
detailObj
=
Object
.
assign
({},
this
.
formatterData
[
this
.
currentIndex
]);
this
.
getImg
(
this
.
formatt
t
erData
[
this
.
currentIndex
].
pics
[
0
].
pic_unid
);
this
.
getImg
(
this
.
formatterData
[
this
.
currentIndex
].
pics
[
0
].
pic_unid
);
this
.
$message
({
this
.
$message
({
type
:
'success'
,
type
:
'success'
,
message
:
'删除成功!'
message
:
'删除成功!'
...
...
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