lilei 4 lat temu
rodzic
commit
3cf1ce9f05

+ 1 - 1
hybrid/html/video.html

@@ -258,7 +258,7 @@
 					},
 					// 获取任务考评项
 					getTaskItem(data) {
-						this.kpItem = JSON.parse(data)
+						this.kpItem=JSON.parse(data)
 						this.zbItem = this.kpItem.length ? this.kpItem[this.activeIndex].taskTargetVOList : []
 						this.showLoading = false
 					},

+ 4 - 1
pages/evaluatePlan/evaluatePlan.vue

@@ -24,12 +24,15 @@
 			return {
 				list: [],
 				value: [],
+				types: ''
 			}
 		},
 		onLoad(opts) {
 			this.value[0]=opts.id
+			this.types = opts.types
+			let t = {'video':'VIDEO_INSPECTION','scene':'SPOT_INSPECTION'}
 			// 查询方案
-			findScheme({status:1}).then(res=>{
+			findScheme({status:1,scopeType:t[opts.types]}).then(res=>{
 				console.log(res)
 				if(res.status == 200){
 					this.list = res.data

+ 5 - 3
pages/shopTour/shopTour.vue

@@ -258,8 +258,10 @@ export default {
 		// 任务考评项目明细
 		getTaskItem() {
 			getTaskItem({ id: this.taskId }).then(res => {
-				console.log(res, 'getTaskItem');
-				this.wv.evalJS("vm.getTaskItem('" + JSON.stringify(res.data) + "')");
+				// console.log(res, 'getTaskItem');
+				let str = JSON.stringify(res.data)
+				str = str.replace(/\\t|\\n|\\r|\\s/g,'')
+				this.wv.evalJS("vm.getTaskItem('" + str + "')");
 			});
 		},
 		// 更新方案项目
@@ -442,7 +444,7 @@ export default {
 		// 且当前没编辑图片或抓拍图片
 		if (e.index == 0 && !this.isEditImg) {
 			uni.navigateTo({
-				url: '/pages/evaluatePlan/evaluatePlan?id=' + this.assessSchemeId
+				url: '/pages/evaluatePlan/evaluatePlan?id=' + this.assessSchemeId + '&types='+this.types
 			});
 		} else {
 			uni.showToast({

Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/app-plus/app-service.js


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

@@ -258,7 +258,7 @@
 					},
 					// 获取任务考评项
 					getTaskItem(data) {
-						this.kpItem = JSON.parse(data)
+						this.kpItem=JSON.parse(data)
 						this.zbItem = this.kpItem.length ? this.kpItem[this.activeIndex].taskTargetVOList : []
 						this.showLoading = false
 					},

Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/app-plus/manifest.json


Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików