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

Merge branch 'master' of http://10.0.41.100:3000/xielei/xytSk-App

master
xielei 2024-11-07 17:46:06 +08:00
parent 887286e725 6aa24fae37
commit 70639bedb8
11 changed files with 67 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pages/messageList/index.vue
View File

@ -23,6 +23,7 @@
</view>
</view>
</view>
<view style="max-height:calc(100vh - 160px); overflow-y:auto;">
<view class="" v-for="(item,index) in list" :key="index" style="margin: 10px;background-color: #fff;padding: 10px;">
<view class="item">
<view class="align-center">
@ -46,6 +47,7 @@
</view>
</view>
</view>
</view>
<u-datetime-picker :show="showTime" v-model="stm" mode="datetime" @confirm="showTime=false"
@ -79,7 +81,6 @@
},
computed:{
startTime:function (){
return this.stm?moment(this.stm).format('YYYY-MM-DD HH:mm:ss'):this.start
},
endTime:function (){

92
pages/mypage/compents/wtcl/index.vue
View File

@ -1,11 +1,12 @@
<template>
<view :style="{height:'100vh',overflow:'hidden'}">
<u-status-bar></u-status-bar>
<u-navbar title="预警" :autoBack="true" :titleStyle="{
<u-navbar title="问题处理" :autoBack="true" :titleStyle="{
fontSize:'18px'
}" :height='44' :safeAreaInsetTop=true leftIconSize='20' leftIconColor='rgb(153, 153, 153)'>
</u-navbar>
<view class="" style="margin-top: 44px;;background-color: #f0f0f0;border-top: 1px solid #f0f0f0;overflow: auto;">
<view class=""
style="margin-top: 44px;;background-color: #f0f0f0;border-top: 1px solid #f0f0f0;overflow: auto;">
<view style="padding:0 10px;backgroundColor:#fff">
<view class="time-ranger">
<view class="start-time">
@ -21,31 +22,34 @@
</view>
</view>
</view>
<view class="" v-for="item in list" style="margin: 10px;background-color: #fff;padding: 10px;">
<view class="item">
<!-- {{item.title}} -->
<view class="title">
{{item.taskTitle}}
</view>
<view class="titleRight" @click="toDetail(item)">
<view class="border">
{{item.isHandle==1?'已处理':'待处理'}}
<view style="height:calc(100vh - 150px);overflow: auto;">
<view class="" v-for="(item,index) in list" :key="index"
style="margin:10px;background-color: #fff;padding: 10px;">
<view class="item">
<!-- {{item.title}} -->
<view class="title">
{{item.taskTitle}}
</view>
<view class="titleRight" @click="toDetail(item)">
<view class="border">
{{item.isHandle==1?'已处理':'待处理'}}
</view>
<u-icon name="arrow-right" size="20"></u-icon>
</view>
<u-icon name="arrow-right" size="20"></u-icon>
</view>
</view>
<view class="contentItem">
<view class="itemC">
<text>巡检项</text>
<text>{{item.itemDesc}}</text>
</view>
<view class="itemC">
<text>巡查人</text>
<text>{{item.inspectUserName}}</text>
</view>
<view class="itemC">
<text>巡查时间</text>
<text>{{item.finishTime}}</text>
<view class="contentItem">
<view class="itemC">
<text>巡检项</text>
<text>{{item.itemDesc}}</text>
</view>
<view class="itemC">
<text>巡查人</text>
<text>{{item.inspectUserName}}</text>
</view>
<view class="itemC">
<text>巡查时间</text>
<text>{{item.finishTime}}</text>
</view>
</view>
</view>
</view>
@ -65,33 +69,32 @@
data() {
return {
show: false,
showTime:false,
showTime1:false,
showTime: false,
showTime1: false,
start: '请选择开始时间',
end: '请选择结束时间',
stm:'',
etm:'',
stm: '',
etm: '',
customStyle: {
background: '#000'
},
list: [
]
list: []
};
},
onLoad() {
this.getList()
},
computed:{
startTime:function (){
return this.stm?moment(this.stm).format('YYYY-MM-DD HH:mm:ss'):this.start
computed: {
startTime: function () {
return this.stm ? moment(this.stm).format('YYYY-MM-DD HH:mm:ss') : this.start
},
endTime:function (){
return this.etm?moment(this.etm).format('YYYY-MM-DD HH:mm:ss'):this.end
endTime: function () {
return this.etm ? moment(this.etm).format('YYYY-MM-DD HH:mm:ss') : this.end
}
},
methods: {
searchTm(){
searchTm() {
this.getList()
},
getList() {
@ -102,14 +105,14 @@
"pageNumber": 1
},
"dateTimeRangeSo": {
start:this.stm?moment(this.stm).format('YYYY-MM-DD HH:mm:ss'):'',
end:this.etm?moment(this.etm).format('YYYY-MM-DD HH:mm:ss'):''
start: this.stm ? moment(this.stm).format('YYYY-MM-DD HH:mm:ss') : '',
end: this.etm ? moment(this.etm).format('YYYY-MM-DD HH:mm:ss') : ''
},
"isHandle": 1,
"inspectUserId": uni.getStorageSync('value').userId
}
uni.$http.post('/gunshiApp/xyt/inspect/detail/page', params).then(res => {
this.list=res.data.data.records
this.list = res.data.data.records
})
},
confirm(e) {
@ -123,7 +126,7 @@
},
toDetail(item) {
uni.navigateTo({
url: '/pages/mypage/compents/wtcl/detail/index?item='+JSON.stringify(item)
url: '/pages/mypage/compents/wtcl/detail/index?item=' + JSON.stringify(item)
})
}
}
@ -133,7 +136,7 @@
<style lang="scss" scoped>
.time-ranger {
margin-bottom: 10px;
.start-time,
.end-time {
display: flex;
@ -141,12 +144,13 @@
padding: 10px 0;
border-bottom: 1px solid #dfdfdf;
}
.search-btn {
margin: 3px 0 0 5px;
// color: #3399ef;
}
}
.myTitleStyle {
font-size: 30px;
background-color: red;

8
pages/mypage/mypage.vue
View File

@ -29,7 +29,7 @@
<div class="funcList" v-for="(item, index) in xjxList" :key="index" >
<div @click="navigateToSubPage(index)">
<div class="funcIcon">
<div class="funcIcon" style="width:30px:;height:30px">
<image
class="icon-left"
style="width: 100%; height: 100%"
@ -70,9 +70,9 @@
},
]
const xjxList = [
{img: '../../static/images/info.png', name: '巡查任务', url:'/pages/mypage/compents/xcrw/index'},
{img: '../../static/images/password.png', name: '维修养护', url:'/pages/mypage/compents/wxyh/index'},
{img: '../../static/images/password.png', name: '问题处理', url:'/pages/mypage/compents/wtcl/index'},
{img: '../../static/images/xcrw1.png', name: '巡查任务', url:'/pages/mypage/compents/xcrw/index'},
{img: '../../static/images/wxyh1.png', name: '维修养护', url:'/pages/mypage/compents/wxyh/index'},
{img: '../../static/images/wtcl1.png', name: '问题处理', url:'/pages/mypage/compents/wtcl/index'},
]
export default {
data() {

22
pages/skInfo/index.vue
View File

@ -2,8 +2,8 @@
<view class="skinfo" @click="toDetail()">
<view class="title">
<view class="left">
<u-icon name="file-text" color="origin"></u-icon>
<text>{{dataform.resName}}</text>
<u-icon name="file-text" color="#f59d29" size="20"></u-icon>
<text style="margin-left:5px">{{dataform.resName}}</text>
</view>
<view class="right">
{{tm}}
@ -13,7 +13,7 @@
<view class="" style="display: flex;">
<image src="../../static/c1.png" mode="" style="width:30%;height: 120px;"></image>
<view class="listItem">
<view class="item-text" v-for="(v,k) of list">
<view class="item-text" v-for="(v,k) of list" :key="k">
<text>{{v}}</text>:
<text>{{dataform[k]}}</text>
</view>
@ -42,16 +42,16 @@
data(){
return{
list:{
1:'当前水位m',
2:'今日雨量mm',
"rz":'当前水位m',
"today":'今日雨量mm',
'flLowLimLev':'汛限水位m',
4:'比汛期m',
"demo":'比汛期m',
'wcrstel':'堰顶高程m',
'crestElev':'坝顶高程m',
7:'24h预报',
8:'昨日雨量',
"24h":'24h预报mm',
"yesterdayDrp":'昨日雨量mm',
'totCap':'总库容m³',
10:'蓄水量万m³'
"cap":'蓄水量万m³'
},
tm: moment().format('YYYY-MM-DD HH:mm:ss'),
dataform:{
@ -97,15 +97,13 @@
justify-content: space-between;
align-items: center;
.left{
align-items: center;
font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑', sans-serif;
font-weight: 700;
font-style: normal;
font-size: 16px;
display: flex;
}
.right{
}
}
.content{

2
pages/wtcl/index.vue
View File

@ -1,7 +1,7 @@
<template>
<view :style="{height:'100vh',overflow:'hidden'}">
<u-status-bar></u-status-bar>
<u-navbar title="预警" :autoBack="true" :titleStyle="{
<u-navbar title="问题处理" :autoBack="true" :titleStyle="{
fontSize:'18px'
}" :height='44' :safeAreaInsetTop=true leftIconSize='20' leftIconColor='rgb(153, 153, 153)'>
</u-navbar>

1
pages/wxyh/formZdy/formTop.vue
View File

@ -25,7 +25,6 @@ export default {
};
},
onShow() {
debugger;
const userList=uni.getStorageSync('value')
console.log(userList,'3456789045678945678');
this.formData.reportUserName = uni.getStorageSync('value').nickName

2
pages/xcrw/index.vue
View File

@ -1,7 +1,7 @@
<template>
<view :style="{height:'100vh',overflow:'hidden'}">
<u-status-bar></u-status-bar>
<u-navbar title="巡查任务1" :autoBack="true" :titleStyle="{
<u-navbar title="巡查任务" :autoBack="true" :titleStyle="{
fontSize:'18px'
}" :height='44' :safeAreaInsetTop=true leftIconSize='20' leftIconColor='rgb(153, 153, 153)'>
</u-navbar>

3
pages/yj/index.vue
View File

@ -1,7 +1,7 @@
<template>
<view :style="{height:'100vh',overflow:'hidden'}">
<u-status-bar></u-status-bar>
<u-navbar title="预警11" :autoBack="true" :titleStyle="{
<u-navbar title="预警" :autoBack="true" :titleStyle="{
fontSize:'18px'
}" :height='44' :safeAreaInsetTop=true leftIconSize='20' leftIconColor='rgb(153, 153, 153)'>
</u-navbar>
@ -108,7 +108,6 @@
}
},
getList(){
debugger;
uni.$http.post('/gunshiApp/xyt/stQxWarnR/home/warn',this.model).then(res=>{
this.list = res.data.data
})

BIN
static/images/wtcl1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
static/images/wxyh1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
static/images/xcrw1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.7 KiB