Skip to content

platform / fanxing_new

Go to a project
Commit 09a4606f by 夏新然
Options

修改doc问题

1 parent 59f72971
Inline Side-by-side
Showing 5 changed files with 55 additions and 30 deletions
src/assets/js/buildcodes.js
...@@ -163,7 +163,7 @@ class Codes { ...@@ -163,7 +163,7 @@ class Codes {
try { try {
this.result.location_name = this.result.location_name =
this.allData.event_data.location.name === "" this.allData.event_data.location.name === ""
? "无" ? "未知"
: this.allData.event_data.location.name; : this.allData.event_data.location.name;
} catch (e) { } catch (e) {
this.result.location_name = "未识别"; this.result.location_name = "未识别";
...@@ -192,6 +192,14 @@ class Codes { ...@@ -192,6 +192,14 @@ class Codes {
} catch (err) { } catch (err) {
this.result.plate_type_text = "未识别"; 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 { try {
this.result.vehicle_body_color_text = this.getCode( this.result.vehicle_body_color_text = this.getCode(
"车身颜色", "车身颜色",
......
src/assets/resetElementCss/index.css
...@@ -130,10 +130,19 @@ ...@@ -130,10 +130,19 @@
.el-pagination .el-select .el-input .el-input__inner{ .el-pagination .el-select .el-input .el-input__inner{
border-radius: 2px; 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{ .el-table--small td, .el-table--small th{
padding: 8px 0; 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{ .el-table--mini, .el-table--small, .el-table__expand-icon{
font-size: 14px; font-size: 14px;
} }
......
src/assets/scss/common.scss
...@@ -150,7 +150,7 @@ a:active{ ...@@ -150,7 +150,7 @@ a:active{
} }
.detaiCon span{ .detaiCon span{
display: inline-block; display: inline-block;
width: 80px; width: 120px;
} }
.arrow{ .arrow{
position: absolute; position: absolute;
......
src/views/search/illegal.vue
...@@ -21,11 +21,11 @@ ...@@ -21,11 +21,11 @@
<el-input placeholder="请输入车牌号码" v-model="conditions.plate"></el-input> <el-input placeholder="请输入车牌号码" v-model="conditions.plate"></el-input>
</span> </span>
</el-form-item> </el-form-item>
<el-form-item label="车牌类型"> <el-form-item label="车牌颜色">
<span class="selectBox"> <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 value="" label='全部'></el-option>
<el-option v-for='item in plateTypeList' :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> </el-select>
</span> </span>
</el-form-item> </el-form-item>
...@@ -119,9 +119,9 @@ ...@@ -119,9 +119,9 @@
label="车身颜色"> label="车身颜色">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="RefinedFeature_text" prop="plate_color_text"
align="center" align="center"
label="标识物"> label="车牌颜色">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="illegalType" prop="illegalType"
...@@ -185,18 +185,15 @@ ...@@ -185,18 +185,15 @@
<div style="position: relative;padding: 10px 20px;"> <div style="position: relative;padding: 10px 20px;">
<!-- <div class="leftArrow" @click="leftFun"><i class="el-icon-d-arrow-left"></i></div> --> <!-- <div class="leftArrow" @click="leftFun"><i class="el-icon-d-arrow-left"></i></div> -->
<div class="detaiCon"> <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"> <div slot="error" class="image-slot">
<img :src="carImg" alt="" style="width: 40%;display: block;margin: 0 auto;"> <img :src="carImg" alt="" style="width: 40%;display: block;margin: 0 auto;">
</div> </div>
</el-image> </el-image>
<el-form label-width="80px" inline> <el-form label-width="90px" inline>
<el-form-item label="车牌号码:"> <el-form-item label="车牌号码:">
<span>{{ detailObj.vehicle_plate_text }}</span> <span>{{ detailObj.vehicle_plate_text }}</span>
</el-form-item> </el-form-item>
<el-form-item label="车牌类型:">
<span>{{ detailObj.plate_type_text }}</span>
</el-form-item>
<el-form-item label="经过日期:"> <el-form-item label="经过日期:">
<span>{{ detailObj.shoot_date ? detailObj.shoot_date : '' }}</span> <span>{{ detailObj.shoot_date ? detailObj.shoot_date : '' }}</span>
</el-form-item> </el-form-item>
...@@ -218,9 +215,9 @@ ...@@ -218,9 +215,9 @@
<el-form-item label="车身颜色:"> <el-form-item label="车身颜色:">
<span>{{ detailObj.vehicle_body_color_text }}</span> <span>{{ detailObj.vehicle_body_color_text }}</span>
</el-form-item> </el-form-item>
<el-form-item label="标志物:"> <!-- <el-form-item label="标志物:">
<span>{{ detailObj.RefinedFeature_text }}</span> <span>{{ detailObj.RefinedFeature_text }}</span>
</el-form-item> </el-form-item> -->
<el-form-item label="违法类型:"> <el-form-item label="违法类型:">
<span>{{ detailObj.illegalType }}</span> <span>{{ detailObj.illegalType }}</span>
</el-form-item> </el-form-item>
...@@ -250,6 +247,7 @@ ...@@ -250,6 +247,7 @@
detailObj:{}, detailObj:{},
carImg:require("@/assets/img/home/defaultImg.png"), carImg:require("@/assets/img/home/defaultImg.png"),
detailImg:'', detailImg:'',
srcList: [],
detailVisible:false, detailVisible:false,
dates:[ start_dt,end_dt ], dates:[ start_dt,end_dt ],
conditions: { conditions: {
...@@ -258,7 +256,7 @@ ...@@ -258,7 +256,7 @@
task_id:'', task_id:'',
subtask_id:'', subtask_id:'',
plate:'', plate:'',
plate_type:'', plate_color:'',
car_type: '', car_type: '',
car_color: '', car_color: '',
illegal:'all', illegal:'all',
...@@ -269,7 +267,7 @@ ...@@ -269,7 +267,7 @@
vehicleTypeList:this.$buildCode.getCodeList('车辆类型'), vehicleTypeList:this.$buildCode.getCodeList('车辆类型'),
vehicleColorList:this.$buildCode.getCodeList('车身颜色'), vehicleColorList:this.$buildCode.getCodeList('车身颜色'),
illegalList:this.$buildCode.getCodeList('违法类型'), illegalList:this.$buildCode.getCodeList('违法类型'),
plateTypeList:this.$buildCode.getCodeList('号牌类型'), plateColorList:this.$buildCode.getCodeList('号牌颜色'),
tableData:[], tableData:[],
formatterData:[], formatterData:[],
total:0, total:0,
...@@ -342,7 +340,7 @@ ...@@ -342,7 +340,7 @@
'&task_id='+this.conditions.task_id+ '&task_id='+this.conditions.task_id+
'&subtask_id='+this.conditions.subtask_id+ '&subtask_id='+this.conditions.subtask_id+
'&plate_number__like='+this.conditions.plate+ '&plate_number__like='+this.conditions.plate+
'&plate_type='+this.conditions.plate_type+ '&plate_color='+this.conditions.plate_color+
'&vehicle_type='+this.conditions.car_type+ '&vehicle_type='+this.conditions.car_type+
'&body_color='+this.conditions.car_color+ '&body_color='+this.conditions.car_color+
'&is_key_vehicle='+this.conditions.is_key_vehicle+ '&is_key_vehicle='+this.conditions.is_key_vehicle+
...@@ -432,7 +430,7 @@ ...@@ -432,7 +430,7 @@
task_id:this.conditions.task_id, task_id:this.conditions.task_id,
subtask_id:this.conditions.subtask_id, subtask_id:this.conditions.subtask_id,
plate_number__like: this.conditions.plate, plate_number__like: this.conditions.plate,
plate_type:this.conditions.plate_type, plate_color:this.conditions.plate_color,
vehicle_type: this.conditions.car_type, vehicle_type: this.conditions.car_type,
body_color: this.conditions.car_color, body_color: this.conditions.car_color,
illegal_code:this.conditions.illegal, illegal_code:this.conditions.illegal,
...@@ -452,9 +450,11 @@ ...@@ -452,9 +450,11 @@
}) })
}, },
getImg(unid){ getImg(unid){
this.srcList=[];
this.$api.search.detailImg({ this.$api.search.detailImg({
},unid).then(res=>{ },unid).then(res=>{
this.detailImg=res.pic_url ? res.pic_url : carImg; this.detailImg=res.pic_url ? res.pic_url : carImg;
this.srcList.push(this.detailImg)
}).catch(e=>{ }).catch(e=>{
}) })
......
src/views/search/vehicleSearch.vue
...@@ -30,11 +30,11 @@ ...@@ -30,11 +30,11 @@
<el-input placeholder="请输入车牌号码" v-model="conditions.plate"></el-input> <el-input placeholder="请输入车牌号码" v-model="conditions.plate"></el-input>
</span> </span>
</el-form-item> </el-form-item>
<el-form-item label="车牌类型"> <el-form-item label="车牌颜色">
<span class="selectBox"> <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 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> </el-select>
</span> </span>
</el-form-item> </el-form-item>
...@@ -135,9 +135,9 @@ ...@@ -135,9 +135,9 @@
label="车牌号码"> label="车牌号码">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="vehicle_body_type_text" prop="plate_color_text"
align="center" align="center"
label="车牌类型"> label="车牌颜色">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="vehicle_body_type_text" prop="vehicle_body_type_text"
...@@ -216,7 +216,7 @@ ...@@ -216,7 +216,7 @@
<div style="position: relative;padding: 10px 20px;"> <div style="position: relative;padding: 10px 20px;">
<!-- <div class="leftArrow" @click="leftFun"><i class="el-icon-d-arrow-left"></i></div> --> <!-- <div class="leftArrow" @click="leftFun"><i class="el-icon-d-arrow-left"></i></div> -->
<div class="detaiCon"> <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"> <div slot="error" class="image-slot">
<img :src="carImg" alt="" style="width: 30%;display: block;margin: 0 auto;"> <img :src="carImg" alt="" style="width: 30%;display: block;margin: 0 auto;">
</div> </div>
...@@ -225,9 +225,9 @@ ...@@ -225,9 +225,9 @@
<el-form-item label="车牌号码:"> <el-form-item label="车牌号码:">
<span>{{ detailObj.vehicle_plate_text }}</span> <span>{{ detailObj.vehicle_plate_text }}</span>
</el-form-item> </el-form-item>
<el-form-item label="车牌类型:"> <!-- <el-form-item label="车牌类型:">
<span>{{ detailObj.plate_type_text }}</span> <span>{{ detailObj.plate_type_text }}</span>
</el-form-item> </el-form-item> -->
<el-form-item label="经过日期:"> <el-form-item label="经过日期:">
<span>{{ detailObj.shoot_date ? detailObj.shoot_date : '' }}</span> <span>{{ detailObj.shoot_date ? detailObj.shoot_date : '' }}</span>
</el-form-item> </el-form-item>
...@@ -249,9 +249,12 @@ ...@@ -249,9 +249,12 @@
<el-form-item label="车身颜色:"> <el-form-item label="车身颜色:">
<span>{{ detailObj.vehicle_body_color_text }}</span> <span>{{ detailObj.vehicle_body_color_text }}</span>
</el-form-item> </el-form-item>
<el-form-item label="标志物:"> <el-form-item label="特殊车辆:">
<span>{{ detailObj.RefinedFeature_text }}</span> <span>{{ detailObj.special_text }}</span>
</el-form-item> </el-form-item>
<!-- <el-form-item label="标志物:">
<span>{{ detailObj.RefinedFeature_text }}</span>
</el-form-item> -->
</el-form> </el-form>
</div> </div>
<!-- <div class="rightArrow" @click="rightFun"><i class="el-icon-d-arrow-right"></i></div> --> <!-- <div class="rightArrow" @click="rightFun"><i class="el-icon-d-arrow-right"></i></div> -->
...@@ -274,13 +277,14 @@ ...@@ -274,13 +277,14 @@
detailObj:{}, detailObj:{},
carImg:require("@/assets/img/home/defaultImg.png"), carImg:require("@/assets/img/home/defaultImg.png"),
detailImg:'', detailImg:'',
srcList: [],
detailVisible:false, detailVisible:false,
dates:[ start_dt,end_dt ], dates:[ start_dt,end_dt ],
conditions: { conditions: {
start_dt:start_dt, start_dt:start_dt,
end_dt:end_dt, end_dt:end_dt,
source_type: 'pull_video_stream', source_type: 'pull_video_stream',
plate_type:'', plate_color:'',
marker: '', marker: '',
car_type: '', car_type: '',
car_color: '', car_color: '',
...@@ -295,6 +299,7 @@ ...@@ -295,6 +299,7 @@
brandList:this.$buildCode.getCodeList('车辆品牌'), brandList:this.$buildCode.getCodeList('车辆品牌'),
vehicleTypeList:this.$buildCode.getCodeList('车辆类型'), vehicleTypeList:this.$buildCode.getCodeList('车辆类型'),
vehicleColorList:this.$buildCode.getCodeList('车身颜色'), vehicleColorList:this.$buildCode.getCodeList('车身颜色'),
plateColorList:this.$buildCode.getCodeList('号牌颜色'),
tableData:[], tableData:[],
formatterData:[], formatterData:[],
total:0, total:0,
...@@ -358,6 +363,7 @@ ...@@ -358,6 +363,7 @@
+'&body_color='+this.conditions.car_color +'&body_color='+this.conditions.car_color
+'&logo_type='+this.conditions.logo_type +'&logo_type='+this.conditions.logo_type
+'&plate_number__like='+this.conditions.plate +'&plate_number__like='+this.conditions.plate
+'&plate_color='+this.conditions.plate_color
+'&task_id='+this.conditions.task_id +'&task_id='+this.conditions.task_id
+'&special_type='+this.conditions.special_type)) +'&special_type='+this.conditions.special_type))
}, },
...@@ -448,7 +454,7 @@ ...@@ -448,7 +454,7 @@
logo_type: this.conditions.logo_type, logo_type: this.conditions.logo_type,
plate_number__like: this.conditions.plate, plate_number__like: this.conditions.plate,
// marker: this.conditions.marker, // marker: this.conditions.marker,
plate_type: this.conditions.plate_type, plate_color: this.conditions.plate_color,
event_type: '', event_type: '',
special_type:this.conditions.special_type, special_type:this.conditions.special_type,
task_id: this.conditions.task_id, task_id: this.conditions.task_id,
...@@ -466,9 +472,11 @@ ...@@ -466,9 +472,11 @@
}) })
}, },
getImg(unid){ getImg(unid){
this.srcList=[];
this.$api.search.detailImg({ this.$api.search.detailImg({
},unid).then(res=>{ },unid).then(res=>{
this.detailImg=res.pic_url ? res.pic_url : carImg; this.detailImg=res.pic_url ? res.pic_url : carImg;
this.srcList.push(this.detailImg)
}).catch(e=>{ }).catch(e=>{
}) })
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!