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 9c8ef13e
authored
Jul 17, 2020
by
潘建波
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
feat
✨
增加特殊车辆字段
1 parent
e099984c
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
21 deletions
dist.zip
public/js/version.json
src/assets/js/buildcodes.js
src/views/search/vehicleSearch.vue
src/views/taskManage/subtask.vue
dist.zip
View file @
9c8ef13
No preview for this file type
public/js/version.json
View file @
9c8ef13
{
"commit"
:
"dcb9d66c635c688972056ce7870ea62d69070588"
,
"commitDate"
:
"2020-7-16 14:28"
,
"buildDate"
:
"2020-7-16 18:33"
,
"version"
:
"2.0.5"
,
"info"
:
"🐛修改任务下发后再获取下发设备显示依旧是空的问题"
}
\ No newline at end of file
{
"commit"
:
"e099984c055e080adad6a3f2e43fc2b0df9aa893"
,
"commitDate"
:
"2020-7-17 14:52"
,
"buildDate"
:
"2020-7-17 14:53"
,
"version"
:
"2.0.6"
,
"info"
:
"🐛【BUG】修改车道线不能用折线问题 【BUG】检测区域和车道区域用曲线标识 【BUG】优化标定绘制长时间绘制会消失问题 【BUG】修改智能检索图片放大后关闭按钮标识不明显问题"
}
\ No newline at end of file
src/assets/js/buildcodes.js
View file @
9c8ef13
...
...
@@ -123,21 +123,10 @@ class Codes {
this
.
allData
.
event_data
.
vehicle
.
body
.
type
.
special_type
)
||
this
.
allData
.
event_data
.
vehicle
.
body
.
type
.
special_type
==
0
)
{
if
(
this
.
allData
.
event_data
.
vehicle
.
body
.
type
.
special_type
==
0
)
{
this
.
result
.
special_text
=
"正常车辆"
;
}
else
if
(
this
.
allData
.
event_data
.
vehicle
.
body
.
type
.
special_type
==
1
)
{
this
.
result
.
special_text
=
"车辆运输车"
;
}
else
if
(
this
.
allData
.
event_data
.
vehicle
.
body
.
type
.
special_type
==
2
)
{
this
.
result
.
special_text
=
"危险品运输车"
;
}
else
if
(
this
.
allData
.
event_data
.
vehicle
.
body
.
type
.
special_type
==
3
)
{
this
.
result
.
special_text
=
"救护车"
;
}
this
.
result
.
special_text
=
this
.
getCode
(
"特殊车辆"
,
this
.
allData
.
event_data
.
vehicle
.
body
.
type
.
special_type
);
}
else
{
this
.
result
.
special_text
=
"未知"
;
}
...
...
src/views/search/vehicleSearch.vue
View file @
9c8ef13
...
...
@@ -136,10 +136,12 @@
v-model=
"conditions.special_type"
>
<el-option
value=
""
label=
"全部"
></el-option>
<el-option
value=
"0"
label=
"普通车辆"
></el-option>
<el-option
value=
"1"
label=
"车辆运输车"
></el-option>
<el-option
value=
"2"
label=
"危险品运输车"
></el-option>
<el-option
value=
"3"
label=
"救护车"
></el-option>
<el-option
v-for=
"(item, index) in SpecialVehiclesList"
:value=
"item.code"
:label=
"item.name"
:key=
"index"
></el-option>
</el-select>
</span>
</el-form-item>
...
...
@@ -389,6 +391,7 @@ export default {
vehicleTypeList
:
this
.
$buildCode
.
getCodeList
(
"车辆类型"
)
||
[],
vehicleColorList
:
this
.
$buildCode
.
getCodeList
(
"车身颜色"
)
||
[],
plateColorList
:
this
.
$buildCode
.
getCodeList
(
"号牌颜色"
)
||
[],
SpecialVehiclesList
:
this
.
$buildCode
.
getCodeList
(
"特殊车辆"
)
||
[],
tableData
:
[],
formatterData
:
[],
total
:
0
,
...
...
src/views/taskManage/subtask.vue
View file @
9c8ef13
...
...
@@ -22,7 +22,7 @@
<span
class=
"subtask-info"
>
{{
subTaskData
.
info
}}
</span>
<span
class=
"label"
hidden
>
分析设备
</span>
<span
class=
"subtask-info"
hidden
>
<el-select
v-model=
"assign_id"
>
<el-select
v-model=
"assign_id"
filterable
>
<!--
<el-option
v-for=
"(item, index) in freeList"
:key=
"index"
...
...
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