xielei
/
xytSk-App
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'qzc-dev3' into master1

master
秦子超 2024-06-07 11:22:48 +08:00
parent dec9b69f8f 5ae5795a17
commit 407e6ae0d7
4 changed files with 134 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
pages/orderFeedback/fk.vue
View File

@ -1,6 +1,33 @@
<template> <template>
<view> <view :style="{height:'99%',position:'relative'}">
<text>反馈{{record}}</text> <div class="row">
<text class="lf">指令内容:</text>
<div class="rf">
<u--textarea
v-model="value"
:disabled='record.isDisabled'
height=100
></u--textarea>
</div>
</div>
<div :style="{margin:'0 10px'}"><u-divider></u-divider></div>
<div class="mybody">
<div class="row2" v-for="(item,index) in list">
<text>2024-01-13 09:38:20执行反馈</text>
</div>
</div>
<div :style="{width:'100%',position:'absolute',bottom:'40px'}">
<u-button
type="primary"
text="反馈"
customStyle="margin-top: 20px"
></u-button>
<u-button
type="primary"
text="反馈并结束"
customStyle="margin-top: 10px"
></u-button>
</div>
</view> </view>
</template> </template>
@ -16,6 +43,8 @@
}, },
data() { data() {
return { return {
value:'',
list:[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15]
}; };
}, },
methods: { methods: {
@ -26,4 +55,33 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.row{
display: flex;
margin-top: 5px;
}
.lf{
width: 25%;
min-height: 40px;
text-align: right;
line-height: 38px;
padding-right: 10px;
}
.rf{
width: 75%;
min-height: 40px;
padding-right: 20px;
padding-top: 1px;
}
.mybody{
background-color: #ffffff;
margin: 5px 5px;
padding: 5px 10px;
height: calc( 100vh - 410px );
overflow: scroll;
}
.row2{
background-color: rgba(217, 217, 217, 1);
margin: 10px 0;
padding: 10px;
}
</style> </style>

94
pages/orderFeedback/orderFeedback.vue
View File

@ -34,14 +34,14 @@
> >
</u-tabs> </u-tabs>
<div class="mybody"> <div class="mybody">
<div class="countNum"><text>共4条信息</text></div> <div class="countNum"><text>共{{list.length}}条信息</text></div>
<div v-for="(item,index) in list" class="listItem" @click="myNavigateTo(item)"> <div v-for="(item,index) in list" class="listItem" @click="myNavigateTo(item)">
<div class="row1"><text>2024年调度令第03号</text></div> <div class="row1"><text>{{item.year+'年度调令第'+item.serial+'号'}}</text></div>
<div class="row2"> <div class="row2">
<div><text>水库调度</text></div> <div><text>{{item.dispatchType}}</text></div>
<div> <div>
<text>刘明</text> <text :style="{marginRight:'5px'}">{{item.createUserName}}</text>
<text>2024-01-09 08:32:09</text> <text>{{item.createTm}}</text>
</div> </div>
</div> </div>
</div> </div>
@ -63,8 +63,8 @@
v-model="check" v-model="check"
:style="{padding:'10px 0px 20px 0px'}" :style="{padding:'10px 0px 20px 0px'}"
> >
<u-checkbox name="水库调洪" label="水库调洪" class="checkItem"></u-checkbox> <u-checkbox name="0" label="水库调洪" class="checkItem"></u-checkbox>
<u-checkbox name="人员转移" label="人员转移" class="checkItem"></u-checkbox> <u-checkbox name="1" label="人员转移" class="checkItem"></u-checkbox>
</u-checkbox-group> </u-checkbox-group>
<text class="title">按时间</text> <text class="title">按时间</text>
<div :style="{display:'flex',marginTop:'10px'}"> <div :style="{display:'flex',marginTop:'10px'}">
@ -130,10 +130,12 @@
import moment from 'moment' import moment from 'moment'
const tabsOptions = [ const tabsOptions = [
{ {
name:'待执行', name:'执行中',
value:1
}, },
{ {
name:'已执行', name:'完成',
value:2
}, },
] ]
@ -142,12 +144,30 @@
return { return {
tabsOptions:tabsOptions, tabsOptions:tabsOptions,
show:false, show:false,
check:['水库调洪','人员转移'], tabVal:1,
check:['0','1'],
showStmPicker:false, showStmPicker:false,
showEtmPicker:false, showEtmPicker:false,
stm:Number(moment(new Date()).add(-7,'days')), stm:Number(moment(new Date()).add(-7,'days')),
etm:Number(new Date()), etm:Number(new Date()),
list:[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17] 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: { computed: {
@ -160,6 +180,8 @@
}, },
methods: { methods: {
tabsChange(item) { tabsChange(item) {
this.tabVal = item.value
this.submit()
}, },
myShow() { myShow() {
this.show = true this.show = true
@ -170,34 +192,44 @@
reSet() { reSet() {
this.stm = Number(moment(new Date()).add(-7,'days')) this.stm = Number(moment(new Date()).add(-7,'days'))
this.etm = Number(new Date()) this.etm = Number(new Date())
this.check = ['水库调洪','人员转移'] this.check = ['0','1']
}, },
async submit() { async submit() {
this.close() try{
// try{ const params = {
// const params = { status:this.tabVal,
// } dispatchTypeList:this.check,
// const res = await uni.$http.post('/gunshiApp/xfflood/current/situation/app/rv/warn',params) dateTimeRangeSo:{
// this.list = res.data.data start:moment(this.stm).format('YYYY-MM-DD HH:mm:sss'),
// this.close() end:moment(this.etm).format('YYYY-MM-DD HH:mm:sss')
// }catch(e){ }
// //TODO handle the exception }
// this.$refs.uToast.show({ console.log('params',params)
// type: 'error', const res = await uni.$http.post('/gunshiApp/xfflood/xfEmerDispatchR/app/list',params)
// title: '失败主题', console.log('res',res)
// message: "请求失败", this.list = res.data.data
// }) this.close()
// setTimeout(()=>{ }catch(e){
// this.close() //TODO handle the exception
// },1000) this.$refs.uToast.show({
// } type: 'error',
title: '失败主题',
message: "请求失败",
})
setTimeout(()=>{
this.close()
},1000)
}
}, },
myNavigateTo (record) { myNavigateTo (record) {
uni.navigateTo({ uni.navigateTo({
url: '/pages/orderFeedback/orderInformation?obj='+JSON.stringify(record) // 跳转到对应路径的页面 url: '/pages/orderFeedback/orderInformation?obj='+JSON.stringify({...record,isDisabled:this.tabVal===1?false:true}) // 跳转到对应路径的页面
}); });
} }
}, },
created() {
// this.submit()
}
} }
</script> </script>

10
pages/orderFeedback/orderInformation.vue
View File

@ -12,15 +12,6 @@
leftIconSize='20' leftIconSize='20'
leftIconColor='rgb(153, 153, 153)' leftIconColor='rgb(153, 153, 153)'
> >
<view
slot="right"
hover-class="is-hover"
class="searchBox_right_btn"
hover-stay-time=100
@click="myShow"
>
<u--image :src="'../../static/images/filter.png'" width="20px" height="20px"></u--image>
</view>
</u-navbar> </u-navbar>
<u-tabs <u-tabs
:list="tabsOptions" :list="tabsOptions"
@ -35,7 +26,6 @@
</u-tabs> </u-tabs>
<div class="mybody"> <div class="mybody">
<component :is="tabsVal" :record="record"></component> <component :is="tabsVal" :record="record"></component>
<div :style="{height:'100px'}"></div>
</div> </div>
</view> </view>
</template> </template>

21
pages/orderFeedback/zl.vue
View File

@ -5,7 +5,7 @@
<div class="rf"> <div class="rf">
<u--input <u--input
border="surround" border="surround"
v-model="xz" v-model="record.serial"
:disabled='true' :disabled='true'
></u--input> ></u--input>
</div> </div>
@ -15,7 +15,7 @@
<div class="rf"> <div class="rf">
<u--input <u--input
border="surround" border="surround"
v-model="xz" v-model="record.year"
:disabled='true' :disabled='true'
></u--input> ></u--input>
</div> </div>
@ -25,7 +25,7 @@
<div class="rf"> <div class="rf">
<u--input <u--input
border="surround" border="surround"
v-model="xz" v-model="record.executeOrgName"
:disabled='true' :disabled='true'
></u--input> ></u--input>
</div> </div>
@ -35,7 +35,7 @@
<div class="rf"> <div class="rf">
<u--input <u--input
border="surround" border="surround"
v-model="xz" v-model="record.dispatchType"
:disabled='true' :disabled='true'
></u--input> ></u--input>
</div> </div>
@ -45,7 +45,7 @@
<div class="rf"> <div class="rf">
<u--input <u--input
border="surround" border="surround"
v-model="wxdj" v-model="record.forwardOrgName"
:disabled='true' :disabled='true'
></u--input> ></u--input>
</div> </div>
@ -55,7 +55,7 @@
<div class="rf"> <div class="rf">
<u--input <u--input
border="surround" border="surround"
v-model="xz" v-model="record.startTm"
:disabled='true' :disabled='true'
></u--input> ></u--input>
</div> </div>
@ -65,7 +65,7 @@
<div class="rf"> <div class="rf">
<u--input <u--input
border="surround" border="surround"
v-model="xz" v-model="record.endTm"
:disabled='true' :disabled='true'
></u--input> ></u--input>
</div> </div>
@ -74,7 +74,7 @@
<text class="lf">指令内容:</text> <text class="lf">指令内容:</text>
<div class="rf"> <div class="rf">
<u--textarea <u--textarea
v-model="yjyj" v-model="record.content"
:disabled='true' :disabled='true'
height=200 height=200
></u--textarea> ></u--textarea>
@ -85,7 +85,7 @@
<div class="rf"> <div class="rf">
<u--input <u--input
border="surround" border="surround"
v-model="yjsj" v-model="record.createTm"
:disabled='true' :disabled='true'
></u--input> ></u--input>
</div> </div>
@ -95,11 +95,12 @@
<div class="rf"> <div class="rf">
<u--input <u--input
border="surround" border="surround"
v-model="yjsj" v-model="record.createUserName"
:disabled='true' :disabled='true'
></u--input> ></u--input>
</div> </div>
</div> </div>
<div :style="{height:'100px'}"></div>
</view> </view>
</template> </template>