admin/zhgdyunapp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: BUG修改

Browse Source
This commit is contained in:
kun 2024-05-27 21:51:47 +08:00
parent 114ea17389
commit 0f8af40914
3 changed files with 91 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

170
pages/projectEnd/carManage/addCar.vue
View File

@ -100,10 +100,10 @@
<view class="uni-form-label">
车牌照片
</view>
<view class="uni-form-input" style="display: inline-flex;">
<view class="imgBox" v-show="form.carPhotosUrl">
<image :src="url_config+'image/'+form.carPhotosUrl" class="img"></image>
<uni-icons @click="deleteImg(1)" class="deleteImg" type="clear" size="24"></uni-icons>
<view class="uni-form-input" style="display: flex;align-items: center;flex-wrap: wrap;">
<view class="imgBox" v-for="(item,index) in form.carPhotosUrl" :key="index">
<image :src="url_config+'image/'+item.url" class="img"></image>
<uni-icons2 @click="deleteImg(1,index)" class="deleteImg" type="clear" size="24"></uni-icons2>
</view>
<view class="addImgBox" @click="selectImg(1)">
<image src="/static/icon-add.png" class="icon-add"></image>
@ -114,10 +114,10 @@
<view class="uni-form-label">
驾驶证
</view>
<view class="uni-form-input" style="display: inline-flex;">
<view class="imgBox" v-show="form.jsz">
<image :src="url_config+'image/'+form.jsz" class="img"></image>
<uni-icons @click="deleteImg(2)" class="deleteImg" type="clear" size="24"></uni-icons>
<view class="uni-form-input" style="display: flex;align-items: center;flex-wrap: wrap;">
<view class="imgBox" v-for="(item,index) in form.jsz" :key="index">
<image :src="url_config+'image/'+item.url" class="img"></image>
<uni-icons2 @click="deleteImg(2,index)" class="deleteImg" type="clear" size="24"></uni-icons2>
</view>
<view class="addImgBox" @click="selectImg(2)">
<image src="/static/icon-add.png" class="icon-add"></image>
@ -128,10 +128,10 @@
<view class="uni-form-label">
行驶证
</view>
<view class="uni-form-input" style="display: inline-flex;">
<view class="imgBox" v-show="form.xsz">
<image :src="url_config+'image/'+form.xsz" class="img"></image>
<uni-icons @click="deleteImg(3)" class="deleteImg" type="clear" size="24"></uni-icons>
<view class="uni-form-input" style="display: flex;align-items: center;flex-wrap: wrap;">
<view class="imgBox" v-for="(item,index) in form.xsz" :key="index">
<image :src="url_config+'image/'+item.url" class="img"></image>
<uni-icons2 @click="deleteImg(3,index)" class="deleteImg" type="clear" size="24"></uni-icons2>
</view>
<view class="addImgBox" @click="selectImg(3)">
<image src="/static/icon-add.png" class="icon-add"></image>
@ -142,10 +142,10 @@
<view class="uni-form-label">
交强险
</view>
<view class="uni-form-input" style="display: inline-flex;">
<view class="imgBox" v-show="form.jqx">
<image :src="url_config+'image/'+form.jqx" class="img"></image>
<uni-icons @click="deleteImg(4)" class="deleteImg" type="clear" size="24"></uni-icons>
<view class="uni-form-input" style="display: flex;align-items: center;flex-wrap: wrap;">
<view class="imgBox" v-for="(item,index) in form.jqx" :key="index">
<image :src="url_config+'image/'+item.url" class="img"></image>
<uni-icons2 @click="deleteImg(4,index)" class="deleteImg" type="clear" size="24"></uni-icons2>
</view>
<view class="addImgBox" @click="selectImg(4)">
<image src="/static/icon-add.png" class="icon-add"></image>
@ -156,10 +156,10 @@
<view class="uni-form-label">
其他证明
</view>
<view class="uni-form-input" style="display: inline-flex;">
<view class="imgBox" v-show="form.otherProve">
<image :src="url_config+'image/'+form.otherProve" class="img"></image>
<uni-icons @click="deleteImg(5)" class="deleteImg" type="clear" size="24"></uni-icons>
<view class="uni-form-input" style="display: flex;align-items: center;flex-wrap: wrap;">
<view class="imgBox" v-for="(item,index) in form.otherProve" :key="index">
<image :src="url_config+'image/'+item.url" class="img"></image>
<uni-icons2 @click="deleteImg(5,index)" class="deleteImg" type="clear" size="24"></uni-icons2>
</view>
<view class="addImgBox" @click="selectImg(5)">
<image src="/static/icon-add.png" class="icon-add"></image>
@ -203,7 +203,7 @@
</view>
</view>
<view class="uni-form-item">
<view class="uni-form-item" v-show="[1,2].includes(form.carModuleType)">
<view class="uni-form-label">
<text class="star">*</text>
司机姓名
@ -330,18 +330,19 @@
carModuleType: 1,
carColor: "",
carNumber: "",
carPhotosUrl: "",
jsz: "",
xsz: "",
jqx: "",
otherProve: "",
carPhotosUrl: [],
jsz: [],
xsz: [],
jqx: [],
otherProve: [],
carType: "",
driverName: "",
driverTelephone: "",
driverWorkerName: "",
outsideDriverIdCard: "",
isBlack: '',
projectSn: ''
projectSn: '',
entryAndExitPermit: 0
},
personList: [],
projectDetail: {},
@ -467,37 +468,35 @@
success: (uploadFileRes) => {
console.log(uploadFileRes.data);
if (type == 1) {
that.form.carPhotosUrl = JSON.parse(uploadFileRes.data).data[0]
.imageUrl
that.form.carPhotosUrl.push({name: "",url: JSON.parse(uploadFileRes.data).data[0].imageUrl})
// that.form.carPhotosUrl = JSON.parse(uploadFileRes.data).data[0]
// .imageUrl
} else if (type == 2) {
that.form.jsz = JSON.parse(uploadFileRes.data).data[0]
.imageUrl
that.form.jsz.push({name: "",url: JSON.parse(uploadFileRes.data).data[0].imageUrl})
} else if (type == 3) {
that.form.xsz = JSON.parse(uploadFileRes.data).data[0]
.imageUrl
that.form.xsz.push({name: "",url: JSON.parse(uploadFileRes.data).data[0].imageUrl})
} else if (type == 4) {
that.form.jqx = JSON.parse(uploadFileRes.data).data[0]
.imageUrl
that.form.jqx.push({name: "",url: JSON.parse(uploadFileRes.data).data[0].imageUrl})
} else if (type == 5) {
that.form.otherProve = JSON.parse(uploadFileRes.data).data[0]
.imageUrl
that.form.otherProve.push({name: "",url: JSON.parse(uploadFileRes.data).data[0].imageUrl})
}
}
});
}
})
},
deleteImg(type) {
deleteImg(type,index) {
if (type == 1) {
this.form.carPhotosUrl = ''
this.form.carPhotosUrl.splice(index,1)
// this.form.carPhotosUrl = ''
} else if (type == 2) {
this.form.jsz = ''
this.form.jsz.splice(index,1)
} else if (type == 3) {
this.form.xsz = ''
this.form.xsz.splice(index,1)
} else if (type == 4) {
this.form.jqx = ''
this.form.jqx.splice(index,1)
} else if (type == 5) {
this.form.otherProve = ''
this.form.otherProve.splice(index,1)
}
},
radioChange(e) {
@ -588,53 +587,53 @@
if (that.form.carPhotosUrl) {
var arr = JSON.parse(that.form.carPhotosUrl)
if (arr.length > 0) {
that.form.carPhotosUrl = arr[0].url
that.form.carPhotosUrl = arr
} else {
that.form.carPhotosUrl = ''
that.form.carPhotosUrl = []
}
} else {
that.form.carPhotosUrl = ''
that.form.carPhotosUrl = []
}
if (that.form.jsz) {
var arr = JSON.parse(that.form.jsz)
if (arr.length > 0) {
that.form.jsz = arr[0].url
that.form.jsz = arr
} else {
that.form.jsz = []
}
} else {
that.form.jsz = ''
that.form.jsz = []
}
} else {
that.form.jsz = ''
}
if (that.form.xsz) {
var arr = JSON.parse(that.form.xsz)
if (arr.length > 0) {
that.form.xsz = arr[0].url
that.form.xsz = arr
} else {
that.form.xsz = []
}
} else {
that.form.xsz = ''
that.form.xsz = []
}
} else {
that.form.xsz = ''
}
if (that.form.jqx) {
var arr = JSON.parse(that.form.jqx)
if (arr.length > 0) {
that.form.jqx = arr[0].url
that.form.jqx = arr
} else {
that.form.jqx = []
}
} else {
that.form.jqx = ''
that.form.jqx = []
}
} else {
that.form.jqx = ''
}
if (that.form.otherProve) {
var arr = JSON.parse(that.form.otherProve)
if (arr.length > 0) {
that.form.otherProve = arr[0].url
that.form.otherProve = arr
} else {
that.form.otherProve = []
}
} else {
that.form.otherProve = ''
that.form.otherProve = []
}
} else {
that.form.otherProve = ''
}
}
})
},
@ -710,6 +709,7 @@
return false;
}
if([1,2].includes(this.form.carModuleType)){
delete params.driverWorkerName;
if (this.driverNameIndex == null) {
uni.showToast({
title: '请选择司机姓名',
@ -729,13 +729,15 @@
}
let idCardReg = /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[012])(0[1-9]|[12]\d|3[01])\d{3}(\d|X)$/i
if([3].includes(this.form.carModuleType)){
if (!reg.test(params.outsideDriverIdCard)) {
if (!idCardReg.test(params.outsideDriverIdCard)) {
uni.showToast({
title: '请输入正确的身份证格式',
icon: 'none'
})
return false;
}
} else {
delete params.outsideDriverIdCard;
}
if (params.carNumber == '') {
uni.showToast({
@ -766,34 +768,23 @@
return false;
}
if (this.form.carPhotosUrl) {
params.carPhotosUrl = JSON.stringify([{
name: '',
url: this.form.carPhotosUrl
}])
params.carPhotosUrl = JSON.stringify(this.form.carPhotosUrl)
}
if (this.form.jsz) {
params.jsz = JSON.stringify([{
name: '',
url: this.form.jsz
}])
params.jsz = JSON.stringify(this.form.jsz)
}
if (this.form.xsz) {
params.xsz = JSON.stringify([{
name: '',
url: this.form.xsz
}])
params.xsz = JSON.stringify(this.form.xsz)
// params.xsz = JSON.stringify([{
// name: '',
// url: this.form.xsz
// }])
}
if (this.form.jqx) {
params.jqx = JSON.stringify([{
name: '',
url: this.form.jqx
}])
params.jqx = JSON.stringify(this.form.jqx)
}
if (this.form.otherProve) {
params.otherProve = JSON.stringify([{
name: '',
url: this.form.otherProve
}])
params.otherProve = JSON.stringify(this.form.otherProve)
}
params.carColor = this.colorList[this.selectIndex]
if (this.driverNameList[this.driverNameIndex]) {
@ -839,7 +830,6 @@
}
console.log(params, "params");
this.sendRequest({
url: url,
data: params,
@ -852,7 +842,7 @@
// })
uni.navigateTo({
url: './index'
url: './index?listType=1'
});
}
@ -897,7 +887,7 @@
display: inline-flex;
position: relative;
margin-right: 15px;
margin-bottom: 15rpx;
.img {
width: 100%;
height: 100%;

2
pages/projectEnd/carManage/index.vue
View File

@ -50,7 +50,7 @@
<text class="value">{{ item.location }}</text>
</view>
<view class="alarmItem">
<text class="label">车牌颜色：</text>
<text class="label">车辆颜色：</text>
<text class="value">{{ item.carColor }}</text>
</view>
<view class="alarmItem">

18
pages/videoManage/playVideo.vue
View File

@ -16,15 +16,15 @@
<view class="videoOperateBox">
<view class="box">
<image src="../../static/videoControlIcon/bg.png" class="bg"></image>
<view class="pic top" @click="controlVideoFn(0,0.2,0,'UP')"></view>
<view class="pic left" @click="controlVideoFn(-0.2,0,0,'LEFT')"></view>
<view class="pic bottom" @click="controlVideoFn(0,-0.2,0,'DOWN')"></view>
<view class="pic right" @click="controlVideoFn(0.2,0,0,'RIGHT')"></view>
<view class="pic top" :style="{backgroundImage: typeName == 'UP' && videoFlag?'url(../../static/videoControlIcon/top-active.png)':'url(../../static/videoControlIcon/top.png)'}" @click="controlVideoFn(0,0.2,0,'UP')"></view>
<view class="pic left" :style="{backgroundImage: typeName == 'LEFT' && videoFlag?'url(../../static/videoControlIcon/left-active.png)':'url(../../static/videoControlIcon/left.png)'}" @click="controlVideoFn(-0.2,0,0,'LEFT')"></view>
<view class="pic bottom" :style="{backgroundImage: typeName == 'DOWN' && videoFlag?'url(../../static/videoControlIcon/bottom-active.png)':'url(../../static/videoControlIcon/bottom.png)'}" @click="controlVideoFn(0,-0.2,0,'DOWN')"></view>
<view class="pic right" :style="{backgroundImage: typeName == 'RIGHT' && videoFlag?'url(../../static/videoControlIcon/right-active.png)':'url(../../static/videoControlIcon/right.png)'}" @click="controlVideoFn(0.2,0,0,'RIGHT')"></view>
<!-- <view class="pic center" @click="stop()"></view> -->
</view>
<view class="box2">
<view class="zoom zoomin" @click="controlVideoFn(0,0,0.2,'ZOOM_IN')"></view>
<view class="zoom zoomout" @click="controlVideoFn(0,0,-0.2,'ZOOM_OUT')"></view>
<view class="zoom zoomin" :style="{backgroundImage: typeName == 'ZOOM_IN' && videoFlag?'url(../../static/videoControlIcon/2.png)':'url(../../static/videoControlIcon/1.png)'}" @click="controlVideoFn(0,0,0.2,'ZOOM_IN')"></view>
<view class="zoom zoomout" :style="{backgroundImage: typeName == 'ZOOM_OUT' && videoFlag?'url(../../static/videoControlIcon/4.png)':'url(../../static/videoControlIcon/3.png)'}" @click="controlVideoFn(0,0,-0.2,'ZOOM_OUT')"></view>
</view>
</view>
<view class="video-playback" @click="toBackList">
@ -49,6 +49,7 @@
streamType: 1, //1是子码流 2是主码流
videoResponseInfo: {},
videoFlag: false,
typeName: ""
};
},
onLoad(options) {
@ -119,6 +120,7 @@
})
},
controlVideoFn(pan, tilt, zoom, opType) {
this.typeName = opType
if (this.videoFlag) {
uni.showToast({
title: '不要重复点击',
@ -170,7 +172,7 @@
})
},
complete() {
this.videoFlag = false;
that.videoFlag = false;
}
})
},
@ -203,7 +205,7 @@
})
},
complete() {
this.videoFlag = false;
that.videoFlag = false;
}
})
}