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

Merge branch 'master' into zl-dev

master
张林 2024-06-11 16:11:00 +08:00
parent 2cbfc7330f 9a6384fb80
commit 1bc56086b8
15 changed files with 93 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifest.json
View File

@ -17,7 +17,9 @@
"delay" : 0
},
"modules" : {
"VideoPlayer" : {}
"VideoPlayer" : {},
"Contacts" : {},
"Messaging" : {}
},
/* 模块配置 */
"distribute" : {
@ -39,7 +41,8 @@
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
"<uses-feature android:name=\"android.hardware.camera\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>"
]
},
"ios" : {

5
pages/addressBook/follow.vue
View File

@ -90,6 +90,11 @@
uni.$showMsg()
}
},
callNum(num) {
uni.makePhoneCall({
phoneNumber: num //仅为示例
});
}
},
created() {

7
pages/addressBook/myDept.vue
View File

@ -90,7 +90,12 @@
uni.$showMsg()
}
}
},
callNum(num) {
uni.makePhoneCall({
phoneNumber: num //仅为示例
});
},
},
created() {
this.getData()

12
pages/forewarning/forewarning.vue
View File

@ -24,7 +24,9 @@
itemStyle="height: 44px"
>
</u-tabs>
<component :is="tabsVal"></component>
<uniSh v-if="tabsVal==='uniSh'"></uniSh>
<uniSk v-if="tabsVal==='uniSk'"></uniSk>
<uniHd v-if="tabsVal==='uniHd'"></uniHd>
</view>
</template>
@ -41,18 +43,18 @@
tabsOptions:[
{
name:'水库预警',
components:uniSk
components:'uniSk'
},
{
name:'河道预警',
components:uniHd
components:'uniHd'
},
{
name:'山洪预警',
components:uniSh
components:'uniSh'
},
],
tabsVal:uniSk
tabsVal:'uniSk'
};
},
methods: {

10
pages/hdDetail/zbyq/zbyq.vue
View File

@ -14,7 +14,6 @@
src="../../../static/images/filter.png"
style="width: 20px; height: 20px; margin-right: 10px; margin-left: 10px;"
@click="popupOpen = true"
v-show="!popupOpen"
>
</image>
</view>
@ -42,14 +41,17 @@
</u-checkbox-group>
</view>
<text style="font-weight: bold; margin-bottom: 5px;">按距离</text>
<view style="display: flex; align-items: center;">
<u--input
placeholder="请输入"
border="surround"
type="number"
v-model="formData.distance"
style="width: 50%; margin-top: 5px;"
style="width: 50%; margin-top: 5px; margin-right: 10px;"
></u--input>
<view style="display: flex; margin-top: 170%;">
<text>(km)</text>
</view>
<view style="display: flex; margin-top: 211%;">
<u-button text="重置" class="bottom-btn1"
@click="formData = {...formData,sources,distance:1}"></u-button>
<u-button text="确认" color="#d9001b" class="bottom-btn2" @click="popConfirm"></u-button>
@ -152,7 +154,7 @@
.bottom-btn1{
width: 100px;
margin-left: 130px;
margin-left: 70px;
}
.bottom-btn2{
width: 100px;

8
pages/login/login.vue
View File

@ -63,10 +63,10 @@
uni.setStorageSync('loginName',postForm.loginName)
uni.setStorageSync('secretKey',postForm.secretKey)
} else {
uni.removeStorageSync('loginName')
uni.removeStorageSync('secretKey')
this.formData.username = ''
this.formData.password = ''
// uni.removeStorageSync('loginName')
// uni.removeStorageSync('secretKey')
// this.formData.username = ''
// this.formData.password = ''
}
//提交表单

11
pages/orderFeedback/orderInformation.vue
View File

@ -2,7 +2,7 @@
<view :style="{height:'100vh',overflow:'hidden',background:'#f7f7f7'}">
<u-status-bar></u-status-bar>
<u-navbar
title="2024年调度令05号"
:title="record.year+'年度调令第'+record.serial+'号'"
:autoBack="true"
:titleStyle="{
fontSize:'18px'
@ -25,7 +25,8 @@
>
</u-tabs>
<div class="mybody">
<component :is="tabsVal" :record="record"></component>
<uniZl v-if="tabsVal==='uniZl'" :record="record"></uniZl>
<uniFk v-if="tabsVal==='uniFk'" :record="record"></uniFk>
</div>
</view>
</template>
@ -37,11 +38,11 @@
const tabsOptions = [
{
name:'调度指令',
components:uniZl
components:'uniZl'
},
{
name:'执行反馈',
components:uniFk
components:'uniFk'
},
]
@ -50,7 +51,7 @@
data() {
return {
tabsOptions:tabsOptions,
tabsVal:uniZl,
tabsVal:'uniZl',
record:{}
};
},

11
pages/rain/Table.vue
View File

@ -21,11 +21,12 @@
</tr>
<div style="max-height: 460px; overflow-y: auto">
<tr v-for="(item, index) in list" :key="index">
<td style="width: 50px">{{ index + 1 }}</td>
<td style="width: 100px;color: #3399ef;" @click="jumpDetail(item)">{{ item.stnm }}</td>
<td style="width: 70px">{{ item.drp }}</td>
<td style="width: 50px;">{{ index + 1 }}</td>
<td style="width: 100px;color: #3399ef; overflow: hidden; white-space: nowrap; text-overflow: ellipsis;" @click="jumpDetail(item)">
{{ item.stnm }}</td>
<td style="width: 70px">{{ item.drp || 0 }}</td>
<td style="width: 70px">{{ item.yesDrp || 0 }}</td>
<td style="width: 100px">{{ item.adnm }}</td>
<td style="width: 100px;">{{ item.adnm }}</td>
</tr>
</div>
</table>
@ -46,7 +47,7 @@
jumpDetail(params){
console.log(123)
uni.navigateTo({
url:`/pages/rainDetail/rainDetail?stcd=${params.stcd}`
url:`/pages/rainDetail/rainDetail?stcd=${params.stcd}&stnm=${params.stnm}`
})
}
}

42
pages/rain/rain.vue
View File

@ -2,17 +2,19 @@
<view class="rain-box">
<view class="nav-bar">
<u-icon name="arrow-left" color="#000" size="28" @click="backTo"></u-icon>
<view class="">
<view>
雨情
</view>
<!-- <u-icon name="arrow-right" color="#000" size="28"></u-icon> -->
<cover-image
<view @click="popupOpen = true" style="margin-right:10px">
<image
src="../../static/images/filter.png"
style="width: 20px; height: 20px; margin-right: 10px;"
@click="popupOpen = true"
v-show="!popupOpen"
style="width: 20px; height: 20px; "
>
</cover-image>
</image>
</view>
</view>
<!-- 搜索以及多级下拉 -->
<view class="search-box">
@ -70,23 +72,23 @@
<u-icon name="arrow-down-fill" color="#000" size="20" v-show="!rainTime"></u-icon>
<u-icon name="arrow-up-fill" color="#000" size="20" v-show="rainTime"></u-icon>
<view class="rain-time-dropdown" v-show="rainTime">
<view class="" :class="{'active': formData.timeType == 1}" @click="timesort(1)" style="border-bottom: 1px solid #dfdfdf; border-top: 1px solid #dfdfdf; padding: 10px 0; display: flex; align-items: center;">
<view :class="{'active': formData.timeType == 1}" @click="timesort(1)" style="border-bottom: 1px solid #dfdfdf; border-top: 1px solid #dfdfdf; padding: 10px 0; display: flex; align-items: center;">
<text style="margin-right: 300px;">1h</text>
<u-icon name="checkmark" color="#02a7f0" size="20" v-show="formData.timeType == 1"></u-icon>
</view>
<view class="" :class="{'active': formData.timeType == 3}" @click="timesort(3)" style="border-bottom: 1px solid #dfdfdf; padding-bottom: 10px; display: flex; align-items: center;">
<view :class="{'active': formData.timeType == 3}" @click="timesort(3)" style="border-bottom: 1px solid #dfdfdf; padding-bottom: 10px; display: flex; align-items: center;">
<text style="margin-right: 300px;">3h</text>
<u-icon name="checkmark" color="#02a7f0" size="20" v-show="formData.timeType == 3"></u-icon>
</view>
<view class="" :class="{'active': formData.timeType == 6}" @click="timesort(6)" style="border-bottom: 1px solid #dfdfdf; padding-bottom: 10px; display: flex; align-items: center;">
<view :class="{'active': formData.timeType == 6}" @click="timesort(6)" style="border-bottom: 1px solid #dfdfdf; padding-bottom: 10px; display: flex; align-items: center;">
<text style="margin-right: 300px;">6h</text>
<u-icon name="checkmark" color="#02a7f0" size="20" v-show="formData.timeType == 6"></u-icon>
</view>
<view class="" :class="{'active': formData.timeType == 12}" @click="timesort(12)" style="border-bottom: 1px solid #dfdfdf; padding-bottom: 10px; display: flex; align-items: center;">
<view :class="{'active': formData.timeType == 12}" @click="timesort(12)" style="border-bottom: 1px solid #dfdfdf; padding-bottom: 10px; display: flex; align-items: center;">
<text style="margin-right: 300px;">12h</text>
<u-icon name="checkmark" color="#02a7f0" size="20" v-show="formData.timeType == 12"></u-icon>
</view>
<view class="" :class="{'active': formData.timeType == 24}" @click="timesort(24)" style="border-bottom: 1px solid #dfdfdf; padding-bottom: 10px; display: flex; align-items: center;">
<view :class="{'active': formData.timeType == 24}" @click="timesort(24)" style="border-bottom: 1px solid #dfdfdf; padding-bottom: 10px; display: flex; align-items: center;">
<text style="margin-right: 300px;">24h</text>
<u-icon name="checkmark" color="#02a7f0" size="20" v-show="formData.timeType == 24"></u-icon>
</view>
@ -223,8 +225,10 @@
source:["SH","SW","QX","SK"],
stArg:'',
adcd:type == 1 ? undefined :adcd,
etm:moment().set({ hour: 8, minute: 0, second: 0, millisecond: 0 }).format("YYYY-MM-DD HH:mm"),
stm:moment().subtract(1, 'day').set({ hour: 8, minute: 0, second: 0, millisecond: 0 }).format("YYYY-MM-DD HH:mm")
etm:moment().format("YYYY-MM-DD HH:mm"),
stm:moment().subtract(1, 'day').format("YYYY-MM-DD HH:mm")
// etm:moment().set({ hour: 8, minute: 0, second: 0, millisecond: 0 }).format("YYYY-MM-DD HH:mm"),
// stm:moment().subtract(1, 'day').set({ hour: 8, minute: 0, second: 0, millisecond: 0 }).format("YYYY-MM-DD HH:mm")
}
}
},
@ -391,9 +395,13 @@
},
// 获取雨情列表
async getRainList(){
let obj = {
...this.formData,
timeType:undefined
}
try{
const {data} = await uni.$http.post(
"/gunshiApp/xfflood/real/rain/list",{...this.formData,timeType:undefined}
"/gunshiApp/xfflood/real/rain/app/list",obj
)
if(data.code == 200){
this.rainList = [...data.data];
@ -499,12 +507,14 @@
background-color: #f2f2f2;
}
.bottom-btn1,.bottom-btn2{
width: 30%;
width: 100px;
}
.bottom-btn1{
margin-left: 130px;
margin-left: 70px;
}
.bottom-btn2{
margin-right: -12px;
margin-left: 10px;
}
</style>

8
pages/rainDetail/rainDetail.vue
View File

@ -3,7 +3,7 @@
<view class="nav-bar">
<u-icon name="arrow-left" color="#000" size="28" @click="backTo"></u-icon>
<view class="title">
雨情
{{stnm}}
</view>
</view>
<view class="tab-bar" >
@ -33,7 +33,8 @@
data(){
return {
activeOne:0,
stcd:''
stcd:'',
stnm:''
}
},
components:{
@ -47,7 +48,8 @@
}
},
onLoad(option) {
this.stcd = option.stcd
this.stcd = option.stcd;
this.stnm = option.stnm;
}
}
</script>

10
pages/rainDetail/zbyq/zbyq.vue
View File

@ -14,7 +14,6 @@
src="../../../static/images/filter.png"
style="width: 20px; height: 20px; margin-right: 10px; margin-left: 10px;"
@click="popupOpen = true"
v-show="!popupOpen"
>
</image>
</view>
@ -42,14 +41,17 @@
</u-checkbox-group>
</view>
<text style="font-weight: bold; margin-bottom: 5px;">按距离</text>
<view style="display: flex; align-items: center;">
<u--input
placeholder="请输入"
border="surround"
type="number"
v-model="formData.distance"
style="width: 50%; margin-top: 5px;"
style="width: 50%; margin-top: 5px; margin-right: 10px;"
></u--input>
<view style="display: flex; margin-top: 170%;">
<text>(km)</text>
</view>
<view style="display: flex; margin-top: 211%;">
<u-button text="重置" class="bottom-btn1"
@click="formData = {...formData,sources,distance:1}"></u-button>
<u-button text="确认" color="#d9001b" class="bottom-btn2" @click="popConfirm"></u-button>
@ -152,7 +154,7 @@
.bottom-btn1{
width: 100px;
margin-left: 130px;
margin-left: 70px;
}
.bottom-btn2{
width: 100px;

2
pages/skDetail/jcsj/jcsjTable.vue
View File

@ -13,7 +13,7 @@
<th style="width: 90px;">
水位(m)
</th>
<th style="width: 80px; position: relative;">
<th style="width: 90px; position: relative;">
<view>
库容(万m³)
<!-- <text style="position: absolute; bottom:-10px; left: 20px;">(m³/s)</text> -->

10
pages/skDetail/zbyq/zbyq.vue
View File

@ -14,7 +14,6 @@
src="../../../static/images/filter.png"
style="width: 20px; height: 20px; margin-right: 10px; margin-left: 10px;"
@click="popupOpen = true"
v-show="!popupOpen"
>
</image>
</view>
@ -42,14 +41,17 @@
</u-checkbox-group>
</view>
<text style="font-weight: bold; margin-bottom: 5px;">按距离</text>
<view style="display: flex; align-items: center;">
<u--input
placeholder="请输入"
border="surround"
type="number"
v-model="formData.distance"
style="width: 50%; margin-top: 5px;"
style="width: 50%; margin-top: 5px; margin-right: 10px;"
></u--input>
<view style="display: flex; margin-top: 170%;">
<text>(km)</text>
</view>
<view style="display: flex; margin-top: 211%;">
<u-button text="重置" class="bottom-btn1"
@click="formData = {...formData,sources,distance:1}"></u-button>
<u-button text="确认" color="#d9001b" class="bottom-btn2" @click="popConfirm"></u-button>
@ -152,7 +154,7 @@
.bottom-btn1{
width: 100px;
margin-left: 130px;
margin-left: 70px;
}
.bottom-btn2{
width: 100px;

5
pages/water/hdWater/hdWater.vue
View File

@ -14,7 +14,6 @@
src="../../../static/images/filter.png"
style="width: 20px; height: 20px; margin-left: 20px;"
@click="popupOpen = true"
v-show="!popupOpen"
>
</image>
</view>
@ -39,7 +38,7 @@
</u-checkbox>
</u-checkbox-group>
</view>
<view style="display: flex; margin-top: 195%;">
<view style="display: flex; margin-top: 240%;">
<u-button text="重置" class="bottom-btn1"
@click="formData = {...formData,sources}"></u-button>
<u-button text="确认" color="#d9001b" class="bottom-btn2" @click="popConfirm"></u-button>
@ -139,7 +138,7 @@
.bottom-btn1{
width: 100px;
margin-left: 130px;
margin-left: 70px;
}
.bottom-btn2{
width: 100px;

5
pages/water/skWater/skWater.vue
View File

@ -14,7 +14,6 @@
src="../../../static/images/filter.png"
style="width: 20px; height: 20px; margin-left: 20px;"
@click="popupOpen = true"
v-show="!popupOpen"
>
</image>
</view>
@ -39,7 +38,7 @@
</u-checkbox>
</u-checkbox-group>
</view>
<view style="display: flex; margin-top: 195%;">
<view style="display: flex; margin-top: 240%;">
<u-button text="重置" class="bottom-btn1"
@click="formData = {...formData,sources}"></u-button>
<u-button text="确认" color="#d9001b" class="bottom-btn2" @click="popConfirm"></u-button>
@ -140,7 +139,7 @@
.bottom-btn1{
width: 100px;
margin-left: 130px;
margin-left: 70px;
}
.bottom-btn2{
width: 100px;