From 1b36ca19859d22ff77a394cc09782ac0d09dbb19 Mon Sep 17 00:00:00 2001 From: qzc Date: Fri, 7 Jun 2024 15:41:32 +0800 Subject: [PATCH] =?UTF-8?q?qzc=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/forewarning/hd.vue | 9 +- pages/forewarning/sk.vue | 9 +- pages/homeIndex/index.vue | 117 +++++++++++++++++--------- pages/orderFeedback/fk.vue | 69 +++++++++++++-- pages/orderFeedback/orderFeedback.vue | 41 +++++---- pages/orderFeedback/zl.vue | 2 +- 6 files changed, 173 insertions(+), 74 deletions(-) diff --git a/pages/forewarning/hd.vue b/pages/forewarning/hd.vue index 9cfb2ee..81c2c12 100644 --- a/pages/forewarning/hd.vue +++ b/pages/forewarning/hd.vue @@ -145,10 +145,11 @@ const sttp = { },1000) } }, - toSh(record) { - // uni.navigateTo({ - // url: '/pages/forewarning/shInformation/shInformation?obj='+JSON.stringify(record) // 跳转到对应路径的页面 - // }); + toSh(params) { + console.log(`/pages/hdDetail/hdDetail?stcd=${params.stcd}&stnm=${params.stnm}&source=${params.source}&wrz=${params.wrz}&grz=${params.grz}`) + uni.navigateTo({ + url:`/pages/hdDetail/hdDetail?stcd=${params.stcd}&stnm=${params.stnm}&source=${params.source}&wrz=${params.wrz}&grz=${params.grz}` + }) }, }, created() { diff --git a/pages/forewarning/sk.vue b/pages/forewarning/sk.vue index 9469f60..ba019d1 100644 --- a/pages/forewarning/sk.vue +++ b/pages/forewarning/sk.vue @@ -147,10 +147,11 @@ const sttp = { },1000) } }, - toSh(record) { - // uni.navigateTo({ - // url: '/pages/forewarning/shInformation/shInformation?obj='+JSON.stringify(record) // 跳转到对应路径的页面 - // }); + toSh(params) { + console.log(`/pages/skDetail/skDetail?stcd=${params.stcd}&stnm=${params.stnm}&source=${params.source}&afsltdz=${params.afsltdz}&flLowLimLev=${params.flLowLimLev}&desFloodLev=${params.desFloodLev}&calFloodLev=${params.calFloodLev}&resCode=${params.resCode}`) + uni.navigateTo({ + url:`/pages/skDetail/skDetail?stcd=${params.stcd}&stnm=${params.stnm}&source=${params.source}&afsltdz=${params.afsltdz}&flLowLimLev=${params.flLowLimLev}&desFloodLev=${params.desFloodLev}&calFloodLev=${params.calFloodLev}&resCode=${params.resCode}` + }) }, }, created() { diff --git a/pages/homeIndex/index.vue b/pages/homeIndex/index.vue index e00be51..36934cd 100644 --- a/pages/homeIndex/index.vue +++ b/pages/homeIndex/index.vue @@ -24,7 +24,7 @@ -
+
-
+ +
指令内容:
@@ -13,19 +13,21 @@
- 2024-01-13 09:38:20执行反馈 + {{item.tm+' '+item.content}}
-
+
@@ -37,19 +39,74 @@ export default { props:{ record:{ - type: String, + type: Object, required: true, }, }, data() { return { value:'', - list:[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15] + list:[] }; }, + created() { + this.getData() + }, methods: { tabsChange(item) { }, + async getData() { + try{ + const res = await uni.$http.get('/gunshiApp/xfflood/xfEmerDispatchR/getFeedbackById/'+this.record.id) + console.log('res',res) + this.list = res.data.data + }catch(e){ + uni.$showMsg() + } + }, + async submit1() { + try{ + if(!this.value){ + this.$refs.uToast.show({ + type: 'error', + title: '失败主题', + message: "请输入指令内容", + }) + return + } + const params = { + dispatchId:this.record.id, + content:this.value, + } + console.log('params',params) + const res = await uni.$http.post('/gunshiApp/xfflood/xfEmerDispatchR/feedback',params) + console.log('res',res) + this.value = '' + this.getData() + }catch(e){ + uni.$showMsg() + } + }, + async submit2() { + try{ + if(!this.value){ + this.$refs.uToast.show({ + type: 'error', + title: '失败主题', + message: "请输入指令内容", + }) + return + } + const params = { + dispatchId:this.record.id, + content:this.value, + } + const res = await uni.$http.post('/gunshiApp/xfflood/xfEmerDispatchR/feedbackAndEnd',params) + uni.navigateBack() + }catch(e){ + uni.$showMsg() + } + } }, } diff --git a/pages/orderFeedback/orderFeedback.vue b/pages/orderFeedback/orderFeedback.vue index 5b0aa21..032f637 100644 --- a/pages/orderFeedback/orderFeedback.vue +++ b/pages/orderFeedback/orderFeedback.vue @@ -150,24 +150,25 @@ showEtmPicker:false, stm:Number(moment(new Date()).add(-7,'days')), etm:Number(new Date()), - list:[{ - serial:'10',//调度指令编号 - year:'2023',//调度令年度 - executeOrgCode:'执行单位编码',//执行单位编码 - executeOrgName:'执行单位名称',//执行单位名称 - dispatchType:'水库调洪',//调度类型 - forwardOrgName:'抄送单位',//抄送单位 - startTm:'计划执行时间',//计划执行时间 - endTm:'计划结束时间',//计划结束时间 - content:'指令内容',//指令内容 - createTm:'指令日期',//指令日期 - createUserId:'指令发起人id',//指令发起人id - createUserName:'张三',//指令发起人 - status:'1',//调令状态，0=待下发，1=执行中，2=完成 - createTm:'2023-10-10 12:12:10', - dispatchId: '14' + list:[], + // { + // serial:'10',//调度指令编号 + // year:'2023',//调度令年度 + // executeOrgCode:'执行单位编码',//执行单位编码 + // executeOrgName:'执行单位名称',//执行单位名称 + // dispatchType:'水库调洪',//调度类型 + // forwardOrgName:'抄送单位',//抄送单位 + // startTm:'计划执行时间',//计划执行时间 + // endTm:'计划结束时间',//计划结束时间 + // content:'指令内容',//指令内容 + // createTm:'指令日期',//指令日期 + // createUserId:'指令发起人id',//指令发起人id + // createUserName:'张三',//指令发起人 + // status:'1',//调令状态，0=待下发，1=执行中，2=完成 + // createTm:'2023-10-10 12:12:10', + // dispatchId: '14' - }] + // } }; }, computed: { @@ -228,8 +229,12 @@ } }, created() { - // this.submit() + this.submit() + }, + onShow() { + this.submit() } + } diff --git a/pages/orderFeedback/zl.vue b/pages/orderFeedback/zl.vue index 20ea3a4..a5ee543 100644 --- a/pages/orderFeedback/zl.vue +++ b/pages/orderFeedback/zl.vue @@ -110,7 +110,7 @@ export default { props:{ record:{ - type: String, + type: Object, required: true, }, },