Skip to content

platform / fanxing_new

Go to a project
Commit b33ad851 by 潘建波
Options

合并了登录页冲突

2 parents cf475910 6206b0d1
Inline Side-by-side
Showing 4 changed files with 41 additions and 31 deletions
src/assets/resetElementCss/index.css
......@@ -179,6 +179,9 @@
.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/views/Login.vue
......@@ -21,7 +21,7 @@
</vue-particles> -->
<div class="box">
<h1>视频分析综合管理平台</h1>
<div style="width: 60%;margin: 0 auto;">
<div style="width: 68%;margin: 0 auto;">
<el-form
:model="ruleForm"
:rules="rules"
......@@ -340,11 +340,13 @@ export default {
}
h1 {
color: #000000;
color: #2F1136;
height: 40px;
line-height: 40px;
padding: 60px 0px;
font-size: 44px;
font-family:PingFangSC-Semibold,PingFang SC;
font-weight:600;
}
#login {
......@@ -362,17 +364,22 @@ h1 {
width: 25%;
position: absolute;
left: 52%;
top: 20%;
top: 22%;
}
button {
width: 100%;
margin-top: 40px;
border-radius: 30px;
margin-top: 27px;
border-radius: 33px;
background: #0069ff;
height: 50px;
font-size: 20px;
}
height: 60px;
font-size: 26px;
}
button >>>span {
display: inline-block;
text-align-last: justify;
width: 24%;
}
button:hover {
color: #d6d9df;
}
......
src/views/search/illegal.vue
......@@ -80,7 +80,7 @@
</el-col>
<div style="">
<el-table
:data="formattterData"
:data="formatterData"
:height="tableHeight"
v-loading="loading"
stripe
......@@ -147,7 +147,7 @@
label="操作">
<template slot-scope="scope">
<el-tooltip content="播放" placement="bottom" effect="light" :visible-arrow=false>
<span :class="{'iconfont icon-fanxing-qidong 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-bofang playIcon':true,'no-btn':scope.row.video&&scope.row.video[0].src_url!=''?false:true}" @click="playFun(scope.$index, scope.row)"></span>
</el-tooltip>
<span class="tableSpanBorder"></span>
<el-tooltip content="详情" placement="bottom" effect="light" :visible-arrow=false>
......@@ -271,7 +271,7 @@
illegalList:this.$buildCode.getCodeList('违法类型'),
plateTypeList:this.$buildCode.getCodeList('号牌类型'),
tableData:[],
formattterData:[],
formatterData:[],
total:0,
page:1,
pageSize:30,
......@@ -387,19 +387,19 @@
});
return false;
}
this.detailObj=this.formattterData[this.currentIndex-1];
this.detailObj=this.formatterData[this.currentIndex-1];
this.currentIndex-=1;
this.getImg(this.detailObj.pics[0].pic_unid);
},
rightFun(){
if(this.currentIndex==this.formattterData.length-1){
if(this.currentIndex==this.formatterData.length-1){
this.$message({
message: '目前为最后一条',
type: 'warning'
});
return false;
}
this.detailObj=this.formattterData[this.currentIndex+1];
this.detailObj=this.formatterData[this.currentIndex+1];
this.currentIndex+=1;
this.getImg(this.detailObj.pics[0].pic_unid);
},
......@@ -422,7 +422,7 @@
},
getData(){
this.loading=true;
this.formattterData=[];
this.formatterData=[];
let offset = (this.page - 1) * this.pageSize;
let search_params = {
limit: this.pageSize,
......@@ -444,7 +444,7 @@
).then((res)=>{
this.total=res.total_num;
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)=>{
......@@ -476,7 +476,7 @@
this.$api.search.delVehicle({
},row.id).then(res=>{
if(res.ecode==200){
this.formattterData.splice(index);
this.formatterData.splice(index);
this.$message({
type: 'success',
message: '删除成功!'
......@@ -498,9 +498,9 @@
}).then(() => {
this.$api.search.delVehicle({},this.detailObj.id).then(res=>{
if(res.ecode==200){
this.formattterData.splice(this.currentIndex,1);
this.detailObj = Object.assign({},this.formattterData[this.currentIndex]);
this.getImg(this.formattterData[this.currentIndex].pics[0].pic_unid);
this.formatterData.splice(this.currentIndex,1);
this.detailObj = Object.assign({},this.formatterData[this.currentIndex]);
this.getImg(this.formatterData[this.currentIndex].pics[0].pic_unid);
this.$message({
type: 'success',
message: '删除成功!'
......
src/views/search/publicFlow.vue
......@@ -72,7 +72,7 @@
</el-col>
<div style="">
<el-table
:data="formattterData"
:data="formatterData"
height="574"
stripe
border
......@@ -227,7 +227,7 @@
},
bodyColorList:this.$buildCode.getCodeList('车身颜色'),
tableData:[],
formattterData:[],
formatterData:[],
total:0,
page:1,
pageSize:30,
......@@ -321,19 +321,19 @@
});
return false;
}
this.detailObj=this.formattterData[this.currentIndex-1];
this.detailObj=this.formatterData[this.currentIndex-1];
this.currentIndex-=1;
this.getImg(this.detailObj.pics[0].pic_unid);
},
rightFun(){
if(this.currentIndex==this.formattterData.length-1){
if(this.currentIndex==this.formatterData.length-1){
this.$message({
message: '目前为最后一条',
type: 'warning'
});
return false;
}
this.detailObj=this.formattterData[this.currentIndex+1];
this.detailObj=this.formatterData[this.currentIndex+1];
this.currentIndex+=1;
this.getImg(this.detailObj.pics[0].pic_unid);
},
......@@ -356,7 +356,7 @@
},
getData(){
this.loading=true;
this.formattterData=[];
this.formatterData=[];
let offset = (this.page - 1) * this.pageSize;
let search_params = {
limit: this.pageSize,
......@@ -375,7 +375,7 @@
).then((res)=>{
this.total=res.total_num;
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)=>{
......@@ -407,7 +407,7 @@
this.$api.search.delVehicle({
},row.id).then(res=>{
if(res.ecode==200){
this.formattterData.splice(index);
this.formatterData.splice(index);
this.$message({
type: 'success',
message: '删除成功!'
......@@ -429,9 +429,9 @@
}).then(() => {
this.$api.search.delVehicle({},this.detailObj.id).then(res=>{
if(res.ecode==200){
this.formattterData.splice(this.currentIndex,1);
this.detailObj = Object.assign({},this.formattterData[this.currentIndex]);
this.getImg(this.formattterData[this.currentIndex].pics[0].pic_unid);
this.formatterData.splice(this.currentIndex,1);
this.detailObj = Object.assign({},this.formatterData[this.currentIndex]);
this.getImg(this.formatterData[this.currentIndex].pics[0].pic_unid);
this.$message({
type: 'success',
message: '删除成功!'
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!