From 1cf2b3a08559db63d94c0fdc4e9520e13da76610 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 10 Oct 2022 16:16:41 +0800
Subject: [PATCH] 巡检任务跳转到上报事件时传递任务id，事件上报添加标题
---
pages/taskinfo/detail.vue | 6 +++---
pages/taskinfo/list.vue | 6 +++---
pages/eventgm/eventsReported.vue | 13 +++++++++++++
3 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/pages/eventgm/eventsReported.vue b/pages/eventgm/eventsReported.vue
index ccbe98c..e6b455d 100644
--- a/pages/eventgm/eventsReported.vue
+++ b/pages/eventgm/eventsReported.vue
@@ -2,6 +2,10 @@
<view class="container">
<u-form :model="form" ref="uForm" :rules="rules">
+ <u-form-item label="标题:">
+ <u-input v-model="form.title"/>
+ </u-form-item>
+
<u-form-item label="地址:">
<u-input :disabled="true" v-model="form.address" placeholder="请输入地址" @click="getAddress"/>
</u-form-item>
@@ -72,6 +76,7 @@
data() {
return {
form: {
+ title:"",
address:"章贡区",
longitude:"",
latitude:"",
@@ -83,6 +88,7 @@
sourceText:"APP",
picUrls:[],
remark:"",
+ taskinfoId:"",
},
rules:{
type:[{
@@ -118,11 +124,18 @@
value:'APP'
},
],
+
};
},
onReady() {
this.$refs.uForm.setRules(this.rules);
},
+ onLoad(option) {
+ if(option.id){
+ console.log(option.id)
+ this.form.taskinfoId = option.id
+ }
+ },
created() {
this.getType()
this.getState()
diff --git a/pages/taskinfo/detail.vue b/pages/taskinfo/detail.vue
index 1d04ba1..f9c00a4 100644
--- a/pages/taskinfo/detail.vue
+++ b/pages/taskinfo/detail.vue
@@ -54,7 +54,7 @@
<view class="once-c">
<u-button v-if="taskinfoData.state == 0" type="success" @click="startTask(taskinfoData)">开始任务</u-button>
<u-button v-if="taskinfoData.state == 1" type="success" @click="finishTask(taskinfoData)">完成任务</u-button>
- <u-button v-if="taskinfoData.state == 1" type="error" @click="goToEventsReported">事件上报</u-button>
+ <u-button v-if="taskinfoData.state == 1" type="error" @click="goToEventsReported(taskinfoData.id)">事件上报</u-button>
</view>
</view>
</view>
@@ -161,9 +161,9 @@
}
})
},
- goToEventsReported() {
+ goToEventsReported(id) {
uni.navigateTo({
- url: "/pages/eventgm/eventsReported"
+ url: "/pages/eventgm/eventsReported?id="+id
})
},
},
diff --git a/pages/taskinfo/list.vue b/pages/taskinfo/list.vue
index c8dceea..cefe283 100644
--- a/pages/taskinfo/list.vue
+++ b/pages/taskinfo/list.vue
@@ -31,7 +31,7 @@
<view class="onve-right">
<u-button class='greens' size="mini" v-if="current == 0" @click="startTask(item)">开始任务</u-button>
<u-button class='greens' size="mini" v-if="current == 1" @click="finishTask(item)">完成任务</u-button>
- <u-button class='o-r-down' plain type="error" size="mini" v-if="current == 1" @click="goToEventsReported">事件上报
+ <u-button class='o-r-down' plain type="error" size="mini" v-if="current == 1" @click="goToEventsReported(item.id)">事件上报
</u-button>
</view>
</view>
@@ -152,9 +152,9 @@
})
},
//事件上报
- goToEventsReported(){
+ goToEventsReported(id){
uni.navigateTo({
- url:"/pages/eventgm/eventsReported"
+ url:"/pages/eventgm/eventsReported?id="+id
})
}
}
--
Gitblit v1.9.3