Skip to content

platform / fanxing_new

Go to a project
Commit b7e3b2ec by 夏新然
Options

修改局部loading

1 parent 2d6459fb
Inline Side-by-side
Showing 12 changed files with 179 additions and 113 deletions
package-lock.json
...@@ -5573,7 +5573,8 @@ ...@@ -5573,7 +5573,8 @@
"ansi-regex": { "ansi-regex": {
"version": "2.1.1", "version": "2.1.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"aproba": { "aproba": {
"version": "1.2.0", "version": "1.2.0",
...@@ -5594,12 +5595,14 @@ ...@@ -5594,12 +5595,14 @@
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
...@@ -5614,17 +5617,20 @@ ...@@ -5614,17 +5617,20 @@
"code-point-at": { "code-point-at": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
...@@ -5741,7 +5747,8 @@ ...@@ -5741,7 +5747,8 @@
"inherits": { "inherits": {
"version": "2.0.4", "version": "2.0.4",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"ini": { "ini": {
"version": "1.3.5", "version": "1.3.5",
...@@ -5753,6 +5760,7 @@ ...@@ -5753,6 +5760,7 @@
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"number-is-nan": "^1.0.0" "number-is-nan": "^1.0.0"
} }
...@@ -5767,6 +5775,7 @@ ...@@ -5767,6 +5775,7 @@
"version": "3.0.4", "version": "3.0.4",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
...@@ -5774,12 +5783,14 @@ ...@@ -5774,12 +5783,14 @@
"minimist": { "minimist": {
"version": "0.0.8", "version": "0.0.8",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"minipass": { "minipass": {
"version": "2.9.0", "version": "2.9.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.1.2", "safe-buffer": "^5.1.2",
"yallist": "^3.0.0" "yallist": "^3.0.0"
...@@ -5798,6 +5809,7 @@ ...@@ -5798,6 +5809,7 @@
"version": "0.5.1", "version": "0.5.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"minimist": "0.0.8" "minimist": "0.0.8"
} }
...@@ -5887,7 +5899,8 @@ ...@@ -5887,7 +5899,8 @@
"number-is-nan": { "number-is-nan": {
"version": "1.0.1", "version": "1.0.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"object-assign": { "object-assign": {
"version": "4.1.1", "version": "4.1.1",
...@@ -5899,6 +5912,7 @@ ...@@ -5899,6 +5912,7 @@
"version": "1.4.0", "version": "1.4.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
...@@ -5984,7 +5998,8 @@ ...@@ -5984,7 +5998,8 @@
"safe-buffer": { "safe-buffer": {
"version": "5.1.2", "version": "5.1.2",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"safer-buffer": { "safer-buffer": {
"version": "2.1.2", "version": "2.1.2",
...@@ -6020,6 +6035,7 @@ ...@@ -6020,6 +6035,7 @@
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",
...@@ -6039,6 +6055,7 @@ ...@@ -6039,6 +6055,7 @@
"version": "3.0.1", "version": "3.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "^2.0.0"
} }
...@@ -6082,12 +6099,14 @@ ...@@ -6082,12 +6099,14 @@
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"yallist": { "yallist": {
"version": "3.1.1", "version": "3.1.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
} }
} }
}, },
......
src/api/resource/index.js
...@@ -42,6 +42,9 @@ export default { ...@@ -42,6 +42,9 @@ export default {
editVideo(params,id,id2){ editVideo(params,id,id2){
return api.post(`${baseUrl}/api/v1/devconf_fx/devs/${id}/vchans/${id2}`, params) return api.post(`${baseUrl}/api/v1/devconf_fx/devs/${id}/vchans/${id2}`, params)
}, },
delVideo(params,id,id2){
return api.delete(`${baseUrl}/api/v1/devconf_fx/devs/${id}/vchans/${id2}`, params)
},
addCamera(params,id){ addCamera(params,id){
return api.post(`${baseUrl}/api/v1/devconf_fx/devs/${id}/vchans`, params) return api.post(`${baseUrl}/api/v1/devconf_fx/devs/${id}/vchans`, params)
}, },
......
src/assets/resetElementCss/index.css
...@@ -184,9 +184,13 @@ ...@@ -184,9 +184,13 @@
height: 26px; height: 26px;
line-height: 26px; line-height: 26px;
} }
.el-dialog__body{ .el-dialog__body{
padding: 30px 34px; padding: 30px 34px;
} }
.detailDialog .el-dialog__body{
padding: 0 34px;
}
.el-dialog .el-select--small{ .el-dialog .el-select--small{
width: 100%; width: 100%;
} }
......
src/assets/scss/common.scss
...@@ -145,9 +145,12 @@ a:active{ ...@@ -145,9 +145,12 @@ a:active{
overflow: hidden; overflow: hidden;
} }
} }
.leftButton{
float: left;
}
.detaiCon span{ .detaiCon span{
display: inline-block; display: inline-block;
width: 150px; width: 80px;
} }
.arrow{ .arrow{
position: absolute; position: absolute;
......
src/views/resource/treeComponents/videoTree.vue
...@@ -105,7 +105,6 @@ ...@@ -105,7 +105,6 @@
this.file.push(param.file) this.file.push(param.file)
}, },
handleNodeClick(data){ handleNodeClick(data){
console.log(data)
this.$emit('clickHandle',data,'video'); this.$emit('clickHandle',data,'video');
// this.$parent.$parent.getVideoTable(data,'video') // this.$parent.$parent.getVideoTable(data,'video')
}, },
...@@ -122,8 +121,24 @@ ...@@ -122,8 +121,24 @@
upData.append('vchan_type', 'vfile'); upData.append('vchan_type', 'vfile');
upData.append('vchan_refid', new Date().getTime()); upData.append('vchan_refid', new Date().getTime());
}) })
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
this.$api.resource.uploadFile(upData,this.devsId).then(res=>{ this.$api.resource.uploadFile(upData,this.devsId).then(res=>{
console.log(res) if(res.enote==400){
this.$message.error(res.ecode);
}else{
this.$emit('getTree');
this.$message({
message: '添加成功',
type: 'success'
});
this.addVisible=false;
loading.close();
}
}) })
}, },
......
src/views/resource/videoEquipment.vue
...@@ -128,6 +128,7 @@ ...@@ -128,6 +128,7 @@
vchan_type: "vfile" vchan_type: "vfile"
},this.dev_unid).then(res=>{ },this.dev_unid).then(res=>{
this.videoTree=res.list_data; this.videoTree=res.list_data;
this.getTable(this.videoTree,'video')
}) })
}, },
submitLaterGet(data){ submitLaterGet(data){
...@@ -138,7 +139,7 @@ ...@@ -138,7 +139,7 @@
this.cameraTree=res.vchan_struct; this.cameraTree=res.vchan_struct;
this.cameraArr=[]; this.cameraArr=[];
this.cameraBuildTree(res.vchan_struct); this.cameraBuildTree(res.vchan_struct);
this.getTable(data) this.getTable(data,'camera')
}) })
}, },
//处理树状图数据 //处理树状图数据
...@@ -260,11 +261,12 @@ ...@@ -260,11 +261,12 @@
}) })
} }
}else if(this.tableType=="video"){ }else if(this.tableType=="video"){
console.log(data)
if(data.org_type=='video'){ if(data.org_type=='video'){
this.formattterData=data.childs; this.formattterData=data.childs;
}else{ }else{
this.formattterData=[]; this.formattterData=data;
this.formattterData.push(data) console.log('aaaaaa',this.formattterData)
} }
} }
...@@ -308,8 +310,35 @@ ...@@ -308,8 +310,35 @@
this.videoEditVisible=false; this.videoEditVisible=false;
}) })
}, },
delVideo(){ delVideo(index,row){
this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$api.resource.delVideo({},this.dev_unid,row.vchan_duid).then(res=>{
if(res.ecode==200){
this.$message({
type: 'success',
message: res.enote
});
this.getVideoTree();
// this.formattterData.forEach(item=>{
// if(item.vchan_duid==this.vchan_duid){
// item.vchan_name=this.videoEditParam.vchan_name
// }
// })
}else{
this.$message.error(res.enote);
}
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
});
});
} }
}, },
} }
......
src/views/search/event.vue
...@@ -63,6 +63,7 @@ ...@@ -63,6 +63,7 @@
:data="formattterData" :data="formattterData"
:height="tableHeight" :height="tableHeight"
stripe stripe
v-loading="loading"
border border
@selection-change="handleSelectionChange"> @selection-change="handleSelectionChange">
<el-table-column <el-table-column
...@@ -139,35 +140,34 @@ ...@@ -139,35 +140,34 @@
title="详情" title="详情"
top="12vh" top="12vh"
:visible.sync="detailVisible" :visible.sync="detailVisible"
width="700px"> class="detailDialog"
width="800px">
<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">
<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="120px" inline> <el-form label-width="80px" inline>
<div>
<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>
<el-form-item label="经过时间:"> <el-form-item label="经过时间:">
<span>{{ detailObj.shoot_time ? detailObj.shoot_time : '' }}</span> <span>{{ detailObj.shoot_time ? detailObj.shoot_time : '' }}</span>
</el-form-item> </el-form-item>
</div>
<div>
<el-form-item label="事件类型:"> <el-form-item label="事件类型:">
<span>{{ detailObj.event_type }}</span> <span>{{ detailObj.event_type }}</span>
</el-form-item> </el-form-item>
</div>
</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> -->
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button type="primary" @click="detailVisible = false">关 闭</el-button> <el-button type="primary" @click="leftFun">上一条</el-button>
<el-button type="primary" @click="rightFun">下一条</el-button>
<el-button @click="detailVisible = false">关 闭</el-button>
</span> </span>
</el-dialog> </el-dialog>
<videoDialog ref="visableDialog" :playersrc="playurl"></videoDialog> <videoDialog ref="visableDialog" :playersrc="playurl"></videoDialog>
...@@ -195,6 +195,7 @@ ...@@ -195,6 +195,7 @@
event_cate:'安防事件' event_cate:'安防事件'
}, },
tableData:[], tableData:[],
loading:false,
formattterData:[], formattterData:[],
total:0, total:0,
page:1, page:1,
...@@ -327,6 +328,7 @@ ...@@ -327,6 +328,7 @@
this.getData(); this.getData();
}, },
getData(){ getData(){
this.loading=true;
this.formattterData=[]; this.formattterData=[];
let offset = (this.page - 1) * this.pageSize; let offset = (this.page - 1) * this.pageSize;
let search_params = { let search_params = {
...@@ -350,7 +352,7 @@ ...@@ -350,7 +352,7 @@
res.list_data.forEach((item,index)=>{ res.list_data.forEach((item,index)=>{
this.formattterData.push(this.$buildCode.init(item)); this.formattterData.push(this.$buildCode.init(item));
}) })
this.loading=false;
}).catch((err)=>{ }).catch((err)=>{
}) })
......
src/views/search/illegal.vue
...@@ -82,6 +82,7 @@ ...@@ -82,6 +82,7 @@
<el-table <el-table
:data="formattterData" :data="formattterData"
:height="tableHeight" :height="tableHeight"
v-loading="loading"
stripe stripe
border border
@selection-change="handleSelectionChange"> @selection-change="handleSelectionChange">
...@@ -142,6 +143,7 @@ ...@@ -142,6 +143,7 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
width="150"
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>
...@@ -178,68 +180,59 @@ ...@@ -178,68 +180,59 @@
title="详情" title="详情"
top="12vh" top="12vh"
:visible.sync="detailVisible" :visible.sync="detailVisible"
width="700px"> class="detailDialog"
width="1000px">
<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: 60%;display: block;margin: 0 auto;" :src="this.detailImg">
<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="120px" inline> <el-form label-width="80px" inline>
<div>
<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>
</div>
<div>
<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>
<el-form-item label="经过时间:"> <el-form-item label="经过时间:">
<span>{{ detailObj.shoot_time ? detailObj.shoot_time : '' }}</span> <span>{{ detailObj.shoot_time ? detailObj.shoot_time : '' }}</span>
</el-form-item> </el-form-item>
</div>
<div>
<el-form-item label="经过地点:"> <el-form-item label="经过地点:">
<span>{{ detailObj.location_name }}</span> <span>{{ detailObj.location_name }}</span>
</el-form-item> </el-form-item>
<el-form-item label="车辆品牌:"> <el-form-item label="车辆品牌:">
<span>{{ detailObj.vehicle_body_logo_text }}</span> <span>{{ detailObj.vehicle_body_logo_text }}</span>
</el-form-item> </el-form-item>
</div>
<div>
<el-form-item label="车辆类型:"> <el-form-item label="车辆类型:">
<span>{{ detailObj.vehicle_body_type_text }}</span> <span>{{ detailObj.vehicle_body_type_text }}</span>
</el-form-item> </el-form-item>
<el-form-item label="车牌颜色:"> <el-form-item label="车牌颜色:">
<span>{{ detailObj.plate_color_text }}</span> <span>{{ detailObj.plate_color_text }}</span>
</el-form-item> </el-form-item>
</div>
<div>
<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>
</div>
<div>
<el-form-item label="违法类型:"> <el-form-item label="违法类型:">
<span>{{ detailObj.illegalType }}</span> <span>{{ detailObj.illegalType }}</span>
</el-form-item> </el-form-item>
</div>
</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> -->
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="detailDel">删 除</el-button> <el-button type="danger" @click="detailDel" class="leftButton">删 除</el-button>
<el-button type="primary" @click="detailVisible = false">关 闭</el-button> <el-button type="primary" @click="leftFun">上一条</el-button>
<el-button type="primary" @click="rightFun">下一条</el-button>
<el-button @click="detailVisible = false">关 闭</el-button>
</span> </span>
</el-dialog> </el-dialog>
<curVideo ref="visableDialog" :playersrc="playurl"></curVideo> <curVideo ref="visableDialog" :playersrc="playurl"></curVideo>
...@@ -252,6 +245,7 @@ ...@@ -252,6 +245,7 @@
let start_dt = this.$moment('2019-12-20').format('YYYY-MM-DD')+' 00:00:00'; let start_dt = this.$moment('2019-12-20').format('YYYY-MM-DD')+' 00:00:00';
let end_dt = this.$moment().format('YYYY-MM-DD')+' 23:59:59'; let end_dt = this.$moment().format('YYYY-MM-DD')+' 23:59:59';
return{ return{
loading:false,
playurl:'', playurl:'',
detailObj:{}, detailObj:{},
carImg:require("@/assets/img/home/defaultImg.png"), carImg:require("@/assets/img/home/defaultImg.png"),
...@@ -427,6 +421,7 @@ ...@@ -427,6 +421,7 @@
this.getData(); this.getData();
}, },
getData(){ getData(){
this.loading=true;
this.formattterData=[]; this.formattterData=[];
let offset = (this.page - 1) * this.pageSize; let offset = (this.page - 1) * this.pageSize;
let search_params = { let search_params = {
...@@ -451,7 +446,7 @@ ...@@ -451,7 +446,7 @@
res.list_data.forEach((item,index)=>{ res.list_data.forEach((item,index)=>{
this.formattterData.push(this.$buildCode.init(item)); this.formattterData.push(this.$buildCode.init(item));
}) })
this.loading=false;
}).catch((err)=>{ }).catch((err)=>{
}) })
......
src/views/search/publicFlow.vue
...@@ -76,6 +76,7 @@ ...@@ -76,6 +76,7 @@
height="574" height="574"
stripe stripe
border border
v-loading="loading"
@selection-change="handleSelectionChange"> @selection-change="handleSelectionChange">
<el-table-column <el-table-column
type="selection" type="selection"
...@@ -207,6 +208,7 @@ ...@@ -207,6 +208,7 @@
let start_dt = this.$moment('2019-12-20').format('YYYY-MM-DD')+' 00:00:00'; let start_dt = this.$moment('2019-12-20').format('YYYY-MM-DD')+' 00:00:00';
let end_dt = this.$moment().format('YYYY-MM-DD')+' 23:59:59'; let end_dt = this.$moment().format('YYYY-MM-DD')+' 23:59:59';
return{ return{
loading:false,
detailObj:{}, detailObj:{},
carImg:require("@/assets/img/home/defaultImg.png"), carImg:require("@/assets/img/home/defaultImg.png"),
detailImg:'', detailImg:'',
...@@ -353,6 +355,7 @@ ...@@ -353,6 +355,7 @@
this.getData(); this.getData();
}, },
getData(){ getData(){
this.loading=true;
this.formattterData=[]; this.formattterData=[];
let offset = (this.page - 1) * this.pageSize; let offset = (this.page - 1) * this.pageSize;
let search_params = { let search_params = {
...@@ -374,7 +377,7 @@ ...@@ -374,7 +377,7 @@
res.list_data.forEach((item,index)=>{ res.list_data.forEach((item,index)=>{
this.formattterData.push(this.$buildCode.init(item)); this.formattterData.push(this.$buildCode.init(item));
}) })
this.loading=false;
}).catch((err)=>{ }).catch((err)=>{
}) })
......
src/views/search/traficflow.vue
...@@ -68,9 +68,10 @@ ...@@ -68,9 +68,10 @@
</el-col> </el-col>
<div style=""> <div style="">
<el-table <el-table
:data="formattterData" :data="formatterData"
:height="tableHeight" :height="tableHeight"
stripe stripe
v-loading="loading"
border> border>
<el-table-column <el-table-column
prop="index" prop="index"
...@@ -186,6 +187,7 @@ ...@@ -186,6 +187,7 @@
let start_dt = this.$moment('2019-12-20').format('YYYY-MM-DD')+' 00:00:00'; let start_dt = this.$moment('2019-12-20').format('YYYY-MM-DD')+' 00:00:00';
let end_dt = this.$moment().format('YYYY-MM-DD')+' 23:59:59'; let end_dt = this.$moment().format('YYYY-MM-DD')+' 23:59:59';
return{ return{
loading:false,
dates:[ start_dt,end_dt ], dates:[ start_dt,end_dt ],
conditions: { conditions: {
start_dt:start_dt, start_dt:start_dt,
...@@ -195,7 +197,7 @@ ...@@ -195,7 +197,7 @@
detection_type: '', detection_type: '',
statistic_type: 'road' statistic_type: 'road'
}, },
formattterData:[], formatterData:[],
total:0, total:0,
page:1, page:1,
pageSize:30, pageSize:30,
...@@ -287,7 +289,8 @@ ...@@ -287,7 +289,8 @@
this.getData(); this.getData();
}, },
getData(){ getData(){
this.formattterData=[]; this.loading=true;
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,
...@@ -303,9 +306,9 @@ ...@@ -303,9 +306,9 @@
).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.formattterData.push(this.$buildCode.init(item)); this.formatterData.push(this.$buildCode.init(item));
}) })
this.loading=false;
}).catch((err)=>{ }).catch((err)=>{
}) })
......
src/views/search/vehicleSearch.vue
...@@ -110,10 +110,11 @@ ...@@ -110,10 +110,11 @@
</el-col> </el-col>
<div style=""> <div style="">
<el-table <el-table
:data="formattterData" :data="formatterData"
:height="tableHeight" :height="tableHeight"
stripe stripe
border border
v-loading="loading"
@selection-change="handleSelectionChange"> @selection-change="handleSelectionChange">
<el-table-column <el-table-column
...@@ -210,63 +211,56 @@ ...@@ -210,63 +211,56 @@
title="详情" title="详情"
top="12vh" top="12vh"
:visible.sync="detailVisible" :visible.sync="detailVisible"
width="700px"> class="detailDialog"
width="1000px">
<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">
<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: 30%;display: block;margin: 0 auto;">
</div> </div>
</el-image> </el-image>
<el-form label-width="120px" inline> <el-form label-width="120px" inline>
<div>
<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>
</div>
<div>
<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>
<el-form-item label="经过时间:"> <el-form-item label="经过时间:">
<span>{{ detailObj.shoot_time ? detailObj.shoot_time : '' }}</span> <span>{{ detailObj.shoot_time ? detailObj.shoot_time : '' }}</span>
</el-form-item> </el-form-item>
</div>
<div>
<el-form-item label="经过地点:"> <el-form-item label="经过地点:">
<span>{{ detailObj.location_name }}</span> <span>{{ detailObj.location_name }}</span>
</el-form-item> </el-form-item>
<el-form-item label="车辆品牌:"> <el-form-item label="车辆品牌:">
<span>{{ detailObj.vehicle_body_logo_text }}</span> <span>{{ detailObj.vehicle_body_logo_text }}</span>
</el-form-item> </el-form-item>
</div>
<div>
<el-form-item label="车辆类型:"> <el-form-item label="车辆类型:">
<span>{{ detailObj.vehicle_body_type_text }}</span> <span>{{ detailObj.vehicle_body_type_text }}</span>
</el-form-item> </el-form-item>
<el-form-item label="车牌颜色:"> <el-form-item label="车牌颜色:">
<span>{{ detailObj.plate_color_text }}</span> <span>{{ detailObj.plate_color_text }}</span>
</el-form-item> </el-form-item>
</div>
<div>
<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>
</div>
</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> -->
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="detailDel">删 除</el-button> <el-button type="danger" @click="detailDel" class="leftButton">删 除</el-button>
<el-button type="primary" @click="detailVisible = false">关 闭</el-button> <el-button type="primary" @click="leftFun">上一条</el-button>
<el-button type="primary" @click="rightFun">下一条</el-button>
<el-button @click="detailVisible = false">关 闭</el-button>
</span> </span>
</el-dialog> </el-dialog>
</div> </div>
...@@ -297,11 +291,12 @@ ...@@ -297,11 +291,12 @@
special_type:'', special_type:'',
subtask_id:'' subtask_id:''
}, },
loading:false,
brandList:this.$buildCode.getCodeList('车辆品牌'), brandList:this.$buildCode.getCodeList('车辆品牌'),
vehicleTypeList:this.$buildCode.getCodeList('车辆类型'), vehicleTypeList:this.$buildCode.getCodeList('车辆类型'),
vehicleColorList:this.$buildCode.getCodeList('车身颜色'), vehicleColorList:this.$buildCode.getCodeList('车身颜色'),
tableData:[], tableData:[],
formattterData:[], formatterData:[],
total:0, total:0,
page:1, page:1,
pageSize:30, pageSize:30,
...@@ -405,19 +400,19 @@ ...@@ -405,19 +400,19 @@
}); });
return false; return false;
} }
this.detailObj=this.formattterData[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.formattterData.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.formattterData[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);
}, },
...@@ -439,7 +434,8 @@ ...@@ -439,7 +434,8 @@
this.getData(); this.getData();
}, },
getData(){ getData(){
this.formattterData=[]; this.loading=true;
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,
...@@ -462,9 +458,9 @@ ...@@ -462,9 +458,9 @@
).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.formattterData.push(this.$buildCode.init(item)); this.formatterData.push(this.$buildCode.init(item));
}) })
this.loading=false;
}).catch((err)=>{ }).catch((err)=>{
}) })
...@@ -494,7 +490,7 @@ ...@@ -494,7 +490,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.formattterData.splice(index); this.formatterData.splice(index);
this.$message({ this.$message({
type: 'success', type: 'success',
message: '删除成功!' message: '删除成功!'
...@@ -516,9 +512,9 @@ ...@@ -516,9 +512,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.formattterData.splice(this.currentIndex,1); this.formatterData.splice(this.currentIndex,1);
this.detailObj = Object.assign({},this.formattterData[this.currentIndex]); this.detailObj = Object.assign({},this.formatterData[this.currentIndex]);
this.getImg(this.formattterData[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/xcycle.vue
...@@ -133,7 +133,8 @@ ...@@ -133,7 +133,8 @@
</el-col> </el-col>
<div style=""> <div style="">
<el-table <el-table
:data="formattterData" :data="formatterData"
v-loading="loading"
:height="tableHeight" :height="tableHeight"
stripe stripe
border border
...@@ -244,33 +245,29 @@ ...@@ -244,33 +245,29 @@
title="详情" title="详情"
top="12vh" top="12vh"
:visible.sync="detailVisible" :visible.sync="detailVisible"
width="700px"> class="detailDialog"
width="1000px">
<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">
<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: 36%;display: block;margin: 0 auto;">
</div> </div>
</el-image> </el-image>
<el-form label-width="120px" inline> <el-form label-width="80px" inline>
<div>
<el-form-item label="检测类型:"> <el-form-item label="检测类型:">
<span>{{ detailObj.xcycle_type_text }}</span> <span>{{ detailObj.xcycle_type_text }}</span>
</el-form-item> </el-form-item>
<el-form-item label="经过地点:"> <el-form-item label="经过地点:">
<span>{{ detailObj.location_name }}</span> <span>{{ detailObj.location_name }}</span>
</el-form-item> </el-form-item>
</div>
<div>
<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>
<el-form-item label="经过时间:"> <el-form-item label="经过时间:">
<span>{{ detailObj.shoot_time ? detailObj.shoot_time : '' }}</span> <span>{{ detailObj.shoot_time ? detailObj.shoot_time : '' }}</span>
</el-form-item> </el-form-item>
</div>
<div>
<el-form-item label="身高:"> <el-form-item label="身高:">
<span>{{ detailObj.driver_height }}</span> <span>{{ detailObj.driver_height }}</span>
...@@ -278,38 +275,33 @@ ...@@ -278,38 +275,33 @@
<el-form-item label="速度:"> <el-form-item label="速度:">
<span>{{ detailObj.location_speed }}</span> <span>{{ detailObj.location_speed }}</span>
</el-form-item> </el-form-item>
</div>
<div>
<el-form-item label="性别:"> <el-form-item label="性别:">
<span>{{ detailObj.driver_face_sex }}</span> <span>{{ detailObj.driver_face_sex }}</span>
</el-form-item> </el-form-item>
<el-form-item label="运营公司:"> <el-form-item label="运营公司:">
<span>{{ detailObj.company }}</span> <span>{{ detailObj.company }}</span>
</el-form-item> </el-form-item>
</div>
<div>
<el-form-item label="上身颜色:"> <el-form-item label="上身颜色:">
<span>{{ detailObj.driver_face_upbody_text }}</span> <span>{{ detailObj.driver_face_upbody_text }}</span>
</el-form-item> </el-form-item>
<el-form-item label="下身颜色:"> <el-form-item label="下身颜色:">
<span>{{ detailObj.driver_face_lobody_text }}</span> <span>{{ detailObj.driver_face_lobody_text }}</span>
</el-form-item> </el-form-item>
</div>
<div>
<el-form-item label="戴帽子:"> <el-form-item label="戴帽子:">
<span>{{ detailObj.driver_face_with_hats }}</span> <span>{{ detailObj.driver_face_with_hats }}</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>
</div>
</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> -->
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="detailDel">删 除</el-button> <el-button type="danger" @click="detailDel" class="leftButton">删 除</el-button>
<el-button type="primary" @click="detailVisible = false">关 闭</el-button> <el-button type="primary" @click="leftFun">上一条</el-button>
<el-button type="primary" @click="rightFun">下一条</el-button>
<el-button @click="detailVisible = false">关 闭</el-button>
</span> </span>
</el-dialog> </el-dialog>
</div> </div>
...@@ -325,6 +317,7 @@ ...@@ -325,6 +317,7 @@
bodyColorList:this.$buildCode.getCodeList('车身颜色'), bodyColorList:this.$buildCode.getCodeList('车身颜色'),
detailImg:'', detailImg:'',
detailVisible:false, detailVisible:false,
loading:false,
dates:[ start_dt,end_dt ], dates:[ start_dt,end_dt ],
conditions: { conditions: {
start_dt:start_dt, start_dt:start_dt,
...@@ -344,7 +337,7 @@ ...@@ -344,7 +337,7 @@
vehicleTypeList:this.$buildCode.getCodeList('车辆类型'), vehicleTypeList:this.$buildCode.getCodeList('车辆类型'),
vehicleColorList:this.$buildCode.getCodeList('车身颜色'), vehicleColorList:this.$buildCode.getCodeList('车身颜色'),
tableData:[], tableData:[],
formattterData:[], formatterData:[],
total:0, total:0,
page:1, page:1,
pageSize:30, pageSize:30,
...@@ -489,19 +482,19 @@ ...@@ -489,19 +482,19 @@
}); });
return false; return false;
} }
this.detailObj=this.formattterData[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.formattterData.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.formattterData[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);
}, },
...@@ -523,7 +516,8 @@ ...@@ -523,7 +516,8 @@
this.getData(); this.getData();
}, },
getData(){ getData(){
this.formattterData=[]; this.loading=true;
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,
...@@ -549,9 +543,9 @@ ...@@ -549,9 +543,9 @@
).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.formattterData.push(this.$buildCode.init(item)); this.formatterData.push(this.$buildCode.init(item));
}) })
this.loading=false;
}).catch((err)=>{ }).catch((err)=>{
}) })
...@@ -581,7 +575,7 @@ ...@@ -581,7 +575,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.formattterData.splice(index); this.formatterData.splice(index);
this.$message({ this.$message({
type: 'success', type: 'success',
message: '删除成功!' message: '删除成功!'
...@@ -603,9 +597,9 @@ ...@@ -603,9 +597,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.formattterData.splice(this.currentIndex,1); this.formatterData.splice(this.currentIndex,1);
this.detailObj = Object.assign({},this.formattterData[this.currentIndex]); this.detailObj = Object.assign({},this.formatterData[this.currentIndex]);
this.getImg(this.formattterData[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: '删除成功!'
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!