Pārlūkot izejas kodu

远程巡店接口对接

lilei 4 gadi atpakaļ
vecāks
revīzija
12171054cf

+ 4 - 1
hybrid/html/css/styles.less

@@ -112,6 +112,9 @@ body{
             margin-bottom: 10px;
             border-radius: 5px;
             box-shadow: 1px 1px 3px #eee;
+			.remarks{
+				padding: 5px;
+			}
 			.photos{
 			  span{
 				  border: 1px solid #eee;
@@ -240,7 +243,7 @@ body{
 			  padding: 3px;
 			  border: 1px solid #eee;
 			  border-radius: 5px;
-			  margin-right: 15px;
+			  margin-right: 10px;
 			  img{
 				  width: 45px;
 				  height: 45px;

+ 53 - 21
hybrid/html/video.html

@@ -109,12 +109,20 @@
             <div>
               <div><b>{{zb.assessTargetName}}</b></div>
 			  <!-- 点击打开拍照 -->
-              <div @click="openCamera()"><a-icon type="camera" style="font-size: 30px;" /></div>
+              <div @click="openCamera(zbIndex)"><a-icon type="camera" style="font-size: 30px;" /></div>
             </div>
 			<!-- 拍照图片 -->
 			<div class="photos">
-				<div @click="previewImgs('https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png')"><a-avatar :size="40" shape="square" src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png" /></div>
-				<div @click="previewImgs('https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png')"><a-avatar :size="40" shape="square" src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png" /></div>
+				<div 
+				v-for="(photo,pindex) in zb.taskTargetPhotoVOList" 
+				:key="photo.id"
+				>
+				<a-avatar :size="40" shape="square" :src="photo.photoPath" />
+				</div>
+			</div>
+			<!-- 评论 -->
+			<div class="remarks">
+				评论:{{zb.remarks}}
 			</div>
 			<!-- 评分 -->
             <div>
@@ -150,7 +158,7 @@
 		  <!-- 评论 -->
 		  <div class="pz-pinglun">
 			  <div class="remarks">
-				  <a-textarea placeholder="请填写备注内容(选填)" :rows="4" />
+				  <a-textarea placeholder="请填写备注内容(选填)" v-model="curZbItem.remarks" :rows="4" />
 			  </div>
 			  <div class="icons">
 				  <a-icon class="aicon" type="camera" />
@@ -158,18 +166,16 @@
 		  </div>
 		  <!-- 图片列表 -->
 		  <div class="imglist">
-			  <div>
-				  <img @click="previewImgs('https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png')" src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png">
-				  <a-icon class="aicon" type="close" />
-			  </div>
-			  <div>
-				  <img @click="previewImgs('https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png')" src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png">
-				  <a-icon class="aicon" type="close" />
+			  <div v-for="(photo,pindex) in curZbItem.taskTargetPhotoVOList" 
+				:key="photo.id"
+				>
+				  <img @click="editImgs(photo.photoPath,activeZbIndex,pindex)" :src="photo.photoPath">
+				  <a-icon @click.stop="delImgs(pindex)" class="aicon" type="close" />
 			  </div>
 		  </div>
 		  <!-- 提交 -->
 		  <div class="f-btns">
-			  <a-button size="large" type="primary" block> 提交 </a-button>
+			  <a-button size="large" @click="saveZbPlImgs" type="primary" block> 提交 </a-button>
 		  </div>
 	  </div>
 	</a-drawer>
@@ -199,6 +205,9 @@
 		  PED: null, // 图片编辑对象
 		  hsID: null, // 耗时计时器id
 		  activeIndex:0, // 当前选择的考评项
+		  activeZbIndex:0,//当前编辑的指标index
+		  activeZbPhoto:0, //当前编辑的指标图片index
+		  curZbItem: {remarks:'',taskTargetPhotoVOList:[]},// 当前编辑的指标评论图片对象
 		  // 考评统计
 		  kptj:{
 			  haoshi: '0时0分'
@@ -311,11 +320,8 @@
 		  },
 		  // 耗时计算
 		  haoshi(){
-			let _this = this
-			// 耗时
 			let s = this.kptj.startTime
-			console.log()
-			_this.kptj.haoshi = moment().diff(s,'hours') + '时' + moment().diff(s,'minutes')%60 + '分'
+			this.kptj.haoshi = moment().diff(s,'hours') + '时' + moment().diff(s,'minutes')%60 + '分'
 		  },
 		  // 发送消息给app 页面
 		  sendMsg (action,msg) {
@@ -336,18 +342,31 @@
 		    this.sendMsg('kzyt','控制云台' + cmd[index - 1])
 		  },
 		  // 打开抓拍照片弹框
-		  openCamera(){
+		  openCamera(index){
 			 this.showPz = true
+			 this.activeZbIndex = index
 			 this.sendMsg('getWinStatus',JSON.stringify({key:'showPz',val: true}))
+			 // 当前查看的指标对象
+			 let obj = this.zbItem[this.activeZbIndex]
+			 this.curZbItem = JSON.parse(JSON.stringify(obj))
 		  },
 		  // 关闭抓拍弹框
 		  onClosePz(){
 			  this.showPz = false
 			  this.sendMsg('getWinStatus',JSON.stringify({key:'showPz',val: false}))
 		  },
+		  // 删除图片
+		  delImgs(index){
+			  this.sendMsg('delImgs',index)
+		  },
+		  delImgsSuccess(index){
+			  this.curZbItem.taskTargetPhotoVOList.splice(index,1)
+		  },
 		  // 预览编辑图片
-		  previewImgs(url){
+		  editImgs(url,index,pindex){
 			   let _this = this
+			   _this.activeZbIndex = index
+			   _this.activeZbPhoto = pindex
 			   _this.sendMsg('getWinStatus',JSON.stringify({key:'isEditImg',val: true}))
 			   this.PED = new window.PED.imageInfo(
 			   url,
@@ -366,7 +385,8 @@
 		  },
 		  // 更新编辑后的图片
 		  updateItemImg(path){
-			  console.log(path)
+			  let photoList = this.curZbItem.taskTargetPhotoVOList
+			  photoList[this.activeZbPhoto].photoPath = path
 		  },
 		  // 更新已完成考评数
 		  updateKpFinish(){
@@ -378,8 +398,9 @@
 				  }
 			  })
 			  kpItem.finishedTargetCount = a
+			  // 更新总进度
+			  this.sendMsg('updateKpTj','')
 		  },
-		  // -----考评项相关代码---------------
 		  // 删除考评项
 		  confirmDelKpx(id){
 			  this.sendMsg('delKpItem',id)
@@ -390,6 +411,8 @@
 			  if(index>=0){
 				  this.kpItem.splice(index,1)
 				  this.getKpItemZb(0)
+				  // 更新总进度
+				  this.sendMsg('updateKpTj','')
 			  }
 		  },
 		  // 切换考评项对应的指标
@@ -404,7 +427,7 @@
 		  },
 		  // 保存指标结果成功
 		  saveZbResultSuccess(id,result){
-			  console.log(id,result)
+			  console.log(result)
 			  let ret = ['bsy','bhg','hg']
 			  let zb = this.zbItem.find(item=> item.id == id)
 			  if(zb){
@@ -412,6 +435,15 @@
 				  // 更新考评项已完成指标数
 				  this.updateKpFinish()
 			  }
+		  },
+		  // 保存指标评论及图片
+		  saveZbPlImgs(){
+			  this.sendMsg('saveZbPlImgs',JSON.stringify(this.curZbItem))
+		  },
+		  // 更新指标评论及图片成功
+		  saveZbPlImgsSuccess(){
+			  this.zbItem.splice(this.activeZbIndex,1,this.curZbItem)
+			  this.onClosePz()
 		  }
 		}
 	})

+ 2 - 1
libs/tools.js

@@ -293,7 +293,8 @@ export const saveBase64ToAliOss = function(base64,callback){
 			quality: 100 //图片质量,1-100 默认50, 100质量最高
 		}, function(e) {
 			uni.uploadFile({
-				url: getApp().globalData.baseUrl + '/upload', //自行修改各自的对应的接口 
+				// url: getApp().globalData.baseUrl + '/upload', //自行修改各自的对应的接口 
+				url:'http://md.test.zyucgj.com/saas/clz/upload',
 				filePath: e.target,
 				name: 'file',
 				success: (uploadFileRes) => {

+ 41 - 4
pages/shopTour/shopTour.vue

@@ -37,6 +37,10 @@
 				if(data.action == 'saveEditImg'){
 					this.uploadImg(data.msg)
 				}
+				// 删除图片
+				if(data.action == 'delImgs'){
+					this.delImgs(data.msg)
+				}
 				// 删除考评项
 				if(data.action == 'delKpItem'){
 					this.delKpItem(data.msg)
@@ -45,12 +49,30 @@
 				if(data.action == 'selZbResult'){
 					this.saveZbResult(JSON.parse(data.msg))
 				}
+				// 指标评论,图片更新保存
+				if(data.action == 'saveZbPlImgs'){
+					this.saveZbPlImgs(JSON.parse(data.msg))
+				}
+				// 更新考评总计
+				if(data.action == 'updateKpTj'){
+					this.getTaskDetail()
+				}
+			},
+			//指标评论,图片更新保存
+			saveZbPlImgs(data){
+				taskCommentsSave(data).then(res=>{
+					if(res.status == 200){
+						this.wv.evalJS("vm.saveZbPlImgsSuccess()") 
+					}
+					uni.showToast({
+						icon:'none',
+						title: res.message
+					})
+				})
 			},
 			// 保存指标结果
 			saveZbResult(data){
-				console.log(data,'saveZbResult')
 				taskTargetSave(data).then(res=>{
-					console.log(res,'saveZbResult')
 					if(res.status == 200){
 						this.wv.evalJS("vm.saveZbResultSuccess("+data.id+",'"+data.result+"')") 
 					}
@@ -60,6 +82,19 @@
 					})
 				})
 			},
+			// 删除图片
+			delImgs(index){
+				const _this = this;
+				clzConfirm({
+					title: '提示',
+					content: '确定删除此图片,删除后无法恢复?',
+					success: function(res) {
+						if (res.confirm || res.index == 0) {
+							_this.wv.evalJS("vm.delImgsSuccess("+index+")") 
+						}
+					}
+				});
+			},
 			// 删除考评项
 			delKpItem(id){
 				const _this = this;
@@ -106,6 +141,7 @@
 					if(res.status == 200){
 						// 创建成功,查询任务明细
 						this.getTaskDetail()
+						this.getTaskItem()
 					}else{
 						uni.showToast({
 							icon:'none',
@@ -116,11 +152,12 @@
 			},
 			// 查询任务明细
 			getTaskDetail(){
-				// 任务详细内容
 				getTaskDetail({id:this.taskId}).then(res => {
 					this.wv.evalJS("vm.getTaskDetail('"+JSON.stringify(res.data)+"')")
 				})
-				// 任务考评项目明细
+			},
+			// 任务考评项目明细
+			getTaskItem(){
 				getTaskItem({id:this.taskId}).then(res => {
 					this.wv.evalJS("vm.getTaskItem('"+JSON.stringify(res.data)+"')")
 				})

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
unpackage/dist/dev/app-plus/app-service.js


+ 4 - 1
unpackage/dist/dev/app-plus/hybrid/html/css/styles.less

@@ -112,6 +112,9 @@ body{
             margin-bottom: 10px;
             border-radius: 5px;
             box-shadow: 1px 1px 3px #eee;
+			.remarks{
+				padding: 5px;
+			}
 			.photos{
 			  span{
 				  border: 1px solid #eee;
@@ -240,7 +243,7 @@ body{
 			  padding: 3px;
 			  border: 1px solid #eee;
 			  border-radius: 5px;
-			  margin-right: 15px;
+			  margin-right: 10px;
 			  img{
 				  width: 45px;
 				  height: 45px;

+ 53 - 21
unpackage/dist/dev/app-plus/hybrid/html/video.html

@@ -109,12 +109,20 @@
             <div>
               <div><b>{{zb.assessTargetName}}</b></div>
 			  <!-- 点击打开拍照 -->
-              <div @click="openCamera()"><a-icon type="camera" style="font-size: 30px;" /></div>
+              <div @click="openCamera(zbIndex)"><a-icon type="camera" style="font-size: 30px;" /></div>
             </div>
 			<!-- 拍照图片 -->
 			<div class="photos">
-				<div @click="previewImgs('https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png')"><a-avatar :size="40" shape="square" src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png" /></div>
-				<div @click="previewImgs('https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png')"><a-avatar :size="40" shape="square" src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png" /></div>
+				<div 
+				v-for="(photo,pindex) in zb.taskTargetPhotoVOList" 
+				:key="photo.id"
+				>
+				<a-avatar :size="40" shape="square" :src="photo.photoPath" />
+				</div>
+			</div>
+			<!-- 评论 -->
+			<div class="remarks">
+				评论:{{zb.remarks}}
 			</div>
 			<!-- 评分 -->
             <div>
@@ -150,7 +158,7 @@
 		  <!-- 评论 -->
 		  <div class="pz-pinglun">
 			  <div class="remarks">
-				  <a-textarea placeholder="请填写备注内容(选填)" :rows="4" />
+				  <a-textarea placeholder="请填写备注内容(选填)" v-model="curZbItem.remarks" :rows="4" />
 			  </div>
 			  <div class="icons">
 				  <a-icon class="aicon" type="camera" />
@@ -158,18 +166,16 @@
 		  </div>
 		  <!-- 图片列表 -->
 		  <div class="imglist">
-			  <div>
-				  <img @click="previewImgs('https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png')" src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png">
-				  <a-icon class="aicon" type="close" />
-			  </div>
-			  <div>
-				  <img @click="previewImgs('https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png')" src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png">
-				  <a-icon class="aicon" type="close" />
+			  <div v-for="(photo,pindex) in curZbItem.taskTargetPhotoVOList" 
+				:key="photo.id"
+				>
+				  <img @click="editImgs(photo.photoPath,activeZbIndex,pindex)" :src="photo.photoPath">
+				  <a-icon @click.stop="delImgs(pindex)" class="aicon" type="close" />
 			  </div>
 		  </div>
 		  <!-- 提交 -->
 		  <div class="f-btns">
-			  <a-button size="large" type="primary" block> 提交 </a-button>
+			  <a-button size="large" @click="saveZbPlImgs" type="primary" block> 提交 </a-button>
 		  </div>
 	  </div>
 	</a-drawer>
@@ -199,6 +205,9 @@
 		  PED: null, // 图片编辑对象
 		  hsID: null, // 耗时计时器id
 		  activeIndex:0, // 当前选择的考评项
+		  activeZbIndex:0,//当前编辑的指标index
+		  activeZbPhoto:0, //当前编辑的指标图片index
+		  curZbItem: {remarks:'',taskTargetPhotoVOList:[]},// 当前编辑的指标评论图片对象
 		  // 考评统计
 		  kptj:{
 			  haoshi: '0时0分'
@@ -311,11 +320,8 @@
 		  },
 		  // 耗时计算
 		  haoshi(){
-			let _this = this
-			// 耗时
 			let s = this.kptj.startTime
-			console.log()
-			_this.kptj.haoshi = moment().diff(s,'hours') + '时' + moment().diff(s,'minutes')%60 + '分'
+			this.kptj.haoshi = moment().diff(s,'hours') + '时' + moment().diff(s,'minutes')%60 + '分'
 		  },
 		  // 发送消息给app 页面
 		  sendMsg (action,msg) {
@@ -336,18 +342,31 @@
 		    this.sendMsg('kzyt','控制云台' + cmd[index - 1])
 		  },
 		  // 打开抓拍照片弹框
-		  openCamera(){
+		  openCamera(index){
 			 this.showPz = true
+			 this.activeZbIndex = index
 			 this.sendMsg('getWinStatus',JSON.stringify({key:'showPz',val: true}))
+			 // 当前查看的指标对象
+			 let obj = this.zbItem[this.activeZbIndex]
+			 this.curZbItem = JSON.parse(JSON.stringify(obj))
 		  },
 		  // 关闭抓拍弹框
 		  onClosePz(){
 			  this.showPz = false
 			  this.sendMsg('getWinStatus',JSON.stringify({key:'showPz',val: false}))
 		  },
+		  // 删除图片
+		  delImgs(index){
+			  this.sendMsg('delImgs',index)
+		  },
+		  delImgsSuccess(index){
+			  this.curZbItem.taskTargetPhotoVOList.splice(index,1)
+		  },
 		  // 预览编辑图片
-		  previewImgs(url){
+		  editImgs(url,index,pindex){
 			   let _this = this
+			   _this.activeZbIndex = index
+			   _this.activeZbPhoto = pindex
 			   _this.sendMsg('getWinStatus',JSON.stringify({key:'isEditImg',val: true}))
 			   this.PED = new window.PED.imageInfo(
 			   url,
@@ -366,7 +385,8 @@
 		  },
 		  // 更新编辑后的图片
 		  updateItemImg(path){
-			  console.log(path)
+			  let photoList = this.curZbItem.taskTargetPhotoVOList
+			  photoList[this.activeZbPhoto].photoPath = path
 		  },
 		  // 更新已完成考评数
 		  updateKpFinish(){
@@ -378,8 +398,9 @@
 				  }
 			  })
 			  kpItem.finishedTargetCount = a
+			  // 更新总进度
+			  this.sendMsg('updateKpTj','')
 		  },
-		  // -----考评项相关代码---------------
 		  // 删除考评项
 		  confirmDelKpx(id){
 			  this.sendMsg('delKpItem',id)
@@ -390,6 +411,8 @@
 			  if(index>=0){
 				  this.kpItem.splice(index,1)
 				  this.getKpItemZb(0)
+				  // 更新总进度
+				  this.sendMsg('updateKpTj','')
 			  }
 		  },
 		  // 切换考评项对应的指标
@@ -404,7 +427,7 @@
 		  },
 		  // 保存指标结果成功
 		  saveZbResultSuccess(id,result){
-			  console.log(id,result)
+			  console.log(result)
 			  let ret = ['bsy','bhg','hg']
 			  let zb = this.zbItem.find(item=> item.id == id)
 			  if(zb){
@@ -412,6 +435,15 @@
 				  // 更新考评项已完成指标数
 				  this.updateKpFinish()
 			  }
+		  },
+		  // 保存指标评论及图片
+		  saveZbPlImgs(){
+			  this.sendMsg('saveZbPlImgs',JSON.stringify(this.curZbItem))
+		  },
+		  // 更新指标评论及图片成功
+		  saveZbPlImgsSuccess(){
+			  this.zbItem.splice(this.activeZbIndex,1,this.curZbItem)
+			  this.onClosePz()
 		  }
 		}
 	})

Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels