From 054ecbf25d3cb358429b71b099162d5fec93be59 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Mon, 27 Jul 2020 11:48:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E4=BC=98=E5=8C=96=E5=AE=8C?=
=?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
manifest.json | 2 +-
pages/excuteInspection/excuteInspection.vue | 76 +++++++++++--------
.../excuteOneInspection.vue | 2 +-
pages/inspection/inspection.vue | 1 +
4 files changed, 48 insertions(+), 33 deletions(-)
diff --git a/manifest.json b/manifest.json
index c1e0c5e..cea243c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -81,7 +81,7 @@
"disableHostCheck" : true,
"proxy" : {
"/app" : {
- "target" : "https://app.demo.winqi.cn", //目标接口域名
+ "target" : "http://192.168.1.16:8012", //目标接口域名https://app.demo.winqi.cn
"changeOrigin" : true, //是否跨域
"secure" : true // 设置支持https协议的代理
}
diff --git a/pages/excuteInspection/excuteInspection.vue b/pages/excuteInspection/excuteInspection.vue
index 1c85333..6d866ec 100644
--- a/pages/excuteInspection/excuteInspection.vue
+++ b/pages/excuteInspection/excuteInspection.vue
@@ -3,23 +3,34 @@
{{inspectionPlanName}}
巡检点
-
+
{{item.inspectionName}}
+
+ 处理意见： {{item.description}}
+
+
+
+
+
+
+
+
-
+
-
+
-
+
@@ -38,34 +49,36 @@
export default {
data() {
return {
- taskId:'',
- inspectionPlanName:'',
+ srcPath: '',
+ taskId: '',
+ inspectionPlanName: '',
scroll: 0,
- communityId:'',
- userId:'',
- userName:'',
- taskDetails:[],
- viewImage:false,
- viewImageSrc:''
-
+ communityId: '',
+ userId: '',
+ userName: '',
+ taskDetails: [],
+ viewImage: false,
+ viewImageSrc: ''
+
}
},
onLoad(options) {
this.taskId = options.taskId;
this.inspectionPlanName = options.inspectionPlanName;
+ this.srcPath = this.java110Constant.url.hcBaseUrl;
this.communityId = this.java110Context.getCurrentCommunity().communityId;
let _userInfo = this.java110Context.getUserInfo();
this.userName = _userInfo.userName;
this.userId = _userInfo.userId;
-
+
},
onShow() {
this._queryTaskDetail();
},
methods: {
- _queryTaskDetail:function(){
+ _queryTaskDetail: function() {
let _that = this;
-
+
_that.java110Context.request({
header: _that.java110Context.getHeaders(),
url: _that.java110Constant.url.listInspectionTaskDetails,
@@ -73,7 +86,8 @@
data: {
communityId: _that.communityId,
page: 1,
- row: 100
+ row: 100,
+ taskId: _that.taskId
},
success: function(res) {
// TODO 判断
@@ -82,26 +96,27 @@
// item.timeStr = item.planInsTime.replace(/:\d{1,2}$/, ' ');
// });
let _inspectionTaskDetails = res.data.inspectionTaskDetails;
- _inspectionTaskDetails.forEach(function(_item){
- if(_item.state == '20200407'){
+ _inspectionTaskDetails.forEach(function(_item) {
+ if (_item.state == '20200407') {
_item.photos.forEach(function(_photoTmp) {
_photoTmp.url = _that.java110Constant.url.hcBaseUrl + _photoTmp.url;
});
}
-
+
})
_that.taskDetails = _inspectionTaskDetails;
}
});
},
-
+
ScrollSteps() {
- this.scroll= this.scroll == 9 ? 0 : this.scroll + 1
+ this.scroll = this.scroll == 9 ? 0 : this.scroll + 1
},
- _excuteInspection:function(_item){
- console.log('巡检点',_item);
+ _excuteInspection: function(_item) {
+ console.log('巡检点', _item);
uni.navigateTo({
- url:'/pages/excuteOneInspection/excuteOneInspection?taskDetailId='+_item.taskDetailId+"&taskId="+_item.taskId+"&inspectionId="+_item.inspectionId+"&inspectionName="+_item.inspectionName
+ url: '/pages/excuteOneInspection/excuteOneInspection?taskDetailId=' + _item.taskDetailId + "&taskId=" + _item.taskId +
+ "&inspectionId=" + _item.inspectionId + "&inspectionName=" + _item.inspectionName
});
},
preview: function(_src) {
@@ -117,11 +132,10 @@
diff --git a/pages/excuteOneInspection/excuteOneInspection.vue b/pages/excuteOneInspection/excuteOneInspection.vue
index 1dd4b23..27a1ab4 100644
--- a/pages/excuteOneInspection/excuteOneInspection.vue
+++ b/pages/excuteOneInspection/excuteOneInspection.vue
@@ -82,7 +82,7 @@
this.patrolType = this.patrolTypes[e.detail.value];
},
removePhoto: function(e) {
- console.log(e.detail.index);
+ console.log(e);
let _imgList = [];
this.imgList.forEach(function(item, index) {
if (index != e.detail.index) {
diff --git a/pages/inspection/inspection.vue b/pages/inspection/inspection.vue
index 0590384..8f1e406 100644
--- a/pages/inspection/inspection.vue
+++ b/pages/inspection/inspection.vue
@@ -70,6 +70,7 @@
page: 1,
row: 10,
planUserId: _that.userId,
+ moreState:'20200405,20200406'
},
success: function(res) {