diff --git a/pages/projectEnd/carManage/addCar.vue b/pages/projectEnd/carManage/addCar.vue index 73ff2653..210dff92 100644 --- a/pages/projectEnd/carManage/addCar.vue +++ b/pages/projectEnd/carManage/addCar.vue @@ -100,10 +100,10 @@ 车牌照片 - - - - + + + + @@ -114,10 +114,10 @@ 驾驶证 - - - - + + + + @@ -128,10 +128,10 @@ 行驶证 - - - - + + + + @@ -142,10 +142,10 @@ 交强险 - - - - + + + + @@ -156,10 +156,10 @@ 其他证明 - - - - + + + + @@ -203,7 +203,7 @@ - + * 司机姓名 @@ -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%; diff --git a/pages/projectEnd/carManage/index.vue b/pages/projectEnd/carManage/index.vue index 31b21c8d..e4ca6d30 100644 --- a/pages/projectEnd/carManage/index.vue +++ b/pages/projectEnd/carManage/index.vue @@ -50,7 +50,7 @@ {{ item.location }} - 车牌颜色: + 车辆颜色: {{ item.carColor }} diff --git a/pages/videoManage/playVideo.vue b/pages/videoManage/playVideo.vue index 7b5460bd..fcfc60cb 100644 --- a/pages/videoManage/playVideo.vue +++ b/pages/videoManage/playVideo.vue @@ -10,21 +10,20 @@ {{videoInfo.videoName}} - + - - - - + + + + - - + + @@ -36,82 +35,70 @@ \ No newline at end of file +.videoOperateBox .top { + width: 33px; + height: 28px; + background: url("../../static/videoControlIcon/top.png"); + top: 25px; + left: 50%; + margin-left: -16px; +} + +.videoOperateBox .bottom { + width: 33px; + height: 28px; + background: url("../../static/videoControlIcon/bottom.png"); + bottom: 25px; + left: 50%; + margin-left: -16px; +} + +// .videoOperateBox .center { +// width: 44px; +// height: 40px; +// background: url("../../static/videoControlIcon/center.png"); +// left: 50%; +// top: 50%; +// margin-top: -20px; +// margin-left: -22px; +// } +