Merge branch 'master' of http://10.0.41.100:3000/xielei/xytSk-App
commit
70639bedb8
|
|
@ -23,6 +23,7 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</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="" v-for="(item,index) in list" :key="index" style="margin: 10px;background-color: #fff;padding: 10px;">
|
||||||
<view class="item">
|
<view class="item">
|
||||||
<view class="align-center">
|
<view class="align-center">
|
||||||
|
|
@ -46,6 +47,7 @@
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
</view>
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
<u-datetime-picker :show="showTime" v-model="stm" mode="datetime" @confirm="showTime=false"
|
<u-datetime-picker :show="showTime" v-model="stm" mode="datetime" @confirm="showTime=false"
|
||||||
|
|
@ -79,7 +81,6 @@
|
||||||
},
|
},
|
||||||
computed:{
|
computed:{
|
||||||
startTime:function (){
|
startTime:function (){
|
||||||
|
|
||||||
return this.stm?moment(this.stm).format('YYYY-MM-DD HH:mm:ss'):this.start
|
return this.stm?moment(this.stm).format('YYYY-MM-DD HH:mm:ss'):this.start
|
||||||
},
|
},
|
||||||
endTime:function (){
|
endTime:function (){
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,12 @@
|
||||||
<template>
|
<template>
|
||||||
<view :style="{height:'100vh',overflow:'hidden'}">
|
<view :style="{height:'100vh',overflow:'hidden'}">
|
||||||
<u-status-bar></u-status-bar>
|
<u-status-bar></u-status-bar>
|
||||||
<u-navbar title="预警" :autoBack="true" :titleStyle="{
|
<u-navbar title="问题处理" :autoBack="true" :titleStyle="{
|
||||||
fontSize:'18px'
|
fontSize:'18px'
|
||||||
}" :height='44' :safeAreaInsetTop=true leftIconSize='20' leftIconColor='rgb(153, 153, 153)'>
|
}" :height='44' :safeAreaInsetTop=true leftIconSize='20' leftIconColor='rgb(153, 153, 153)'>
|
||||||
</u-navbar>
|
</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 style="padding:0 10px;backgroundColor:#fff">
|
||||||
<view class="time-ranger">
|
<view class="time-ranger">
|
||||||
<view class="start-time">
|
<view class="start-time">
|
||||||
|
|
@ -21,7 +22,9 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="" v-for="item in list" style="margin: 10px;background-color: #fff;padding: 10px;">
|
<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">
|
<view class="item">
|
||||||
<!-- {{item.title}} -->
|
<!-- {{item.title}} -->
|
||||||
<view class="title">
|
<view class="title">
|
||||||
|
|
@ -49,6 +52,7 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
</view>
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
<u-datetime-picker :show="showTime" v-model="stm" mode="datetime" @confirm="showTime=false"
|
<u-datetime-picker :show="showTime" v-model="stm" mode="datetime" @confirm="showTime=false"
|
||||||
|
|
@ -74,8 +78,7 @@
|
||||||
customStyle: {
|
customStyle: {
|
||||||
background: '#000'
|
background: '#000'
|
||||||
},
|
},
|
||||||
list: [
|
list: []
|
||||||
]
|
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
onLoad() {
|
onLoad() {
|
||||||
|
|
@ -147,6 +150,7 @@
|
||||||
// color: #3399ef;
|
// color: #3399ef;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.myTitleStyle {
|
.myTitleStyle {
|
||||||
font-size: 30px;
|
font-size: 30px;
|
||||||
background-color: red;
|
background-color: red;
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,7 @@
|
||||||
|
|
||||||
<div class="funcList" v-for="(item, index) in xjxList" :key="index" >
|
<div class="funcList" v-for="(item, index) in xjxList" :key="index" >
|
||||||
<div @click="navigateToSubPage(index)">
|
<div @click="navigateToSubPage(index)">
|
||||||
<div class="funcIcon">
|
<div class="funcIcon" style="width:30px:;height:30px">
|
||||||
<image
|
<image
|
||||||
class="icon-left"
|
class="icon-left"
|
||||||
style="width: 100%; height: 100%"
|
style="width: 100%; height: 100%"
|
||||||
|
|
@ -70,9 +70,9 @@
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
const xjxList = [
|
const xjxList = [
|
||||||
{img: '../../static/images/info.png', name: '巡查任务', url:'/pages/mypage/compents/xcrw/index'},
|
{img: '../../static/images/xcrw1.png', name: '巡查任务', url:'/pages/mypage/compents/xcrw/index'},
|
||||||
{img: '../../static/images/password.png', name: '维修养护', url:'/pages/mypage/compents/wxyh/index'},
|
{img: '../../static/images/wxyh1.png', name: '维修养护', url:'/pages/mypage/compents/wxyh/index'},
|
||||||
{img: '../../static/images/password.png', name: '问题处理', url:'/pages/mypage/compents/wtcl/index'},
|
{img: '../../static/images/wtcl1.png', name: '问题处理', url:'/pages/mypage/compents/wtcl/index'},
|
||||||
]
|
]
|
||||||
export default {
|
export default {
|
||||||
data() {
|
data() {
|
||||||
|
|
|
||||||
|
|
@ -2,8 +2,8 @@
|
||||||
<view class="skinfo" @click="toDetail()">
|
<view class="skinfo" @click="toDetail()">
|
||||||
<view class="title">
|
<view class="title">
|
||||||
<view class="left">
|
<view class="left">
|
||||||
<u-icon name="file-text" color="origin"></u-icon>
|
<u-icon name="file-text" color="#f59d29" size="20"></u-icon>
|
||||||
<text>{{dataform.resName}}</text>
|
<text style="margin-left:5px">{{dataform.resName}}</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="right">
|
<view class="right">
|
||||||
{{tm}}
|
{{tm}}
|
||||||
|
|
@ -13,7 +13,7 @@
|
||||||
<view class="" style="display: flex;">
|
<view class="" style="display: flex;">
|
||||||
<image src="../../static/c1.png" mode="" style="width:30%;height: 120px;"></image>
|
<image src="../../static/c1.png" mode="" style="width:30%;height: 120px;"></image>
|
||||||
<view class="listItem">
|
<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>{{v}}</text>:
|
||||||
<text>{{dataform[k]}}</text>
|
<text>{{dataform[k]}}</text>
|
||||||
</view>
|
</view>
|
||||||
|
|
@ -42,16 +42,16 @@
|
||||||
data(){
|
data(){
|
||||||
return{
|
return{
|
||||||
list:{
|
list:{
|
||||||
1:'当前水位m',
|
"rz":'当前水位m',
|
||||||
2:'今日雨量mm',
|
"today":'今日雨量mm',
|
||||||
'flLowLimLev':'汛限水位m',
|
'flLowLimLev':'汛限水位m',
|
||||||
4:'比汛期m',
|
"demo":'比汛期m',
|
||||||
'wcrstel':'堰顶高程m',
|
'wcrstel':'堰顶高程m',
|
||||||
'crestElev':'坝顶高程m',
|
'crestElev':'坝顶高程m',
|
||||||
7:'24h预报',
|
"24h":'24h预报mm',
|
||||||
8:'昨日雨量',
|
"yesterdayDrp":'昨日雨量mm',
|
||||||
'totCap':'总库容m³',
|
'totCap':'总库容m³',
|
||||||
10:'蓄水量万m³'
|
"cap":'蓄水量万m³'
|
||||||
},
|
},
|
||||||
tm: moment().format('YYYY-MM-DD HH:mm:ss'),
|
tm: moment().format('YYYY-MM-DD HH:mm:ss'),
|
||||||
dataform:{
|
dataform:{
|
||||||
|
|
@ -97,15 +97,13 @@
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
.left{
|
.left{
|
||||||
|
align-items: center;
|
||||||
font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑', sans-serif;
|
font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑', sans-serif;
|
||||||
font-weight: 700;
|
font-weight: 700;
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
display: flex;
|
display: flex;
|
||||||
}
|
}
|
||||||
.right{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
.content{
|
.content{
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
<template>
|
<template>
|
||||||
<view :style="{height:'100vh',overflow:'hidden'}">
|
<view :style="{height:'100vh',overflow:'hidden'}">
|
||||||
<u-status-bar></u-status-bar>
|
<u-status-bar></u-status-bar>
|
||||||
<u-navbar title="预警" :autoBack="true" :titleStyle="{
|
<u-navbar title="问题处理" :autoBack="true" :titleStyle="{
|
||||||
fontSize:'18px'
|
fontSize:'18px'
|
||||||
}" :height='44' :safeAreaInsetTop=true leftIconSize='20' leftIconColor='rgb(153, 153, 153)'>
|
}" :height='44' :safeAreaInsetTop=true leftIconSize='20' leftIconColor='rgb(153, 153, 153)'>
|
||||||
</u-navbar>
|
</u-navbar>
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,6 @@ export default {
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
onShow() {
|
onShow() {
|
||||||
debugger;
|
|
||||||
const userList=uni.getStorageSync('value')
|
const userList=uni.getStorageSync('value')
|
||||||
console.log(userList,'3456789045678945678');
|
console.log(userList,'3456789045678945678');
|
||||||
this.formData.reportUserName = uni.getStorageSync('value').nickName
|
this.formData.reportUserName = uni.getStorageSync('value').nickName
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
<template>
|
<template>
|
||||||
<view :style="{height:'100vh',overflow:'hidden'}">
|
<view :style="{height:'100vh',overflow:'hidden'}">
|
||||||
<u-status-bar></u-status-bar>
|
<u-status-bar></u-status-bar>
|
||||||
<u-navbar title="巡查任务1" :autoBack="true" :titleStyle="{
|
<u-navbar title="巡查任务" :autoBack="true" :titleStyle="{
|
||||||
fontSize:'18px'
|
fontSize:'18px'
|
||||||
}" :height='44' :safeAreaInsetTop=true leftIconSize='20' leftIconColor='rgb(153, 153, 153)'>
|
}" :height='44' :safeAreaInsetTop=true leftIconSize='20' leftIconColor='rgb(153, 153, 153)'>
|
||||||
</u-navbar>
|
</u-navbar>
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
<template>
|
<template>
|
||||||
<view :style="{height:'100vh',overflow:'hidden'}">
|
<view :style="{height:'100vh',overflow:'hidden'}">
|
||||||
<u-status-bar></u-status-bar>
|
<u-status-bar></u-status-bar>
|
||||||
<u-navbar title="预警11" :autoBack="true" :titleStyle="{
|
<u-navbar title="预警" :autoBack="true" :titleStyle="{
|
||||||
fontSize:'18px'
|
fontSize:'18px'
|
||||||
}" :height='44' :safeAreaInsetTop=true leftIconSize='20' leftIconColor='rgb(153, 153, 153)'>
|
}" :height='44' :safeAreaInsetTop=true leftIconSize='20' leftIconColor='rgb(153, 153, 153)'>
|
||||||
</u-navbar>
|
</u-navbar>
|
||||||
|
|
@ -108,7 +108,6 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
getList(){
|
getList(){
|
||||||
debugger;
|
|
||||||
uni.$http.post('/gunshiApp/xyt/stQxWarnR/home/warn',this.model).then(res=>{
|
uni.$http.post('/gunshiApp/xyt/stQxWarnR/home/warn',this.model).then(res=>{
|
||||||
this.list = res.data.data
|
this.list = res.data.data
|
||||||
})
|
})
|
||||||
|
|
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 2.3 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.1 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 4.7 KiB |
Loading…
Reference in New Issue