master
Tuzki 2 years ago
parent c560989824
commit 0f98e69544
  1. 9
      subPackWork/commandDispatch/caseFiling/caseFiling.vue
  2. 27
      subPackWork/commandDispatch/commandDispatch.vue
  3. 37
      subPackWork/electronicPatrol/taskDetails.vue
  4. 1
      subPackWork/myReport/myReport.vue
  5. 2
      uni_modules/liu-dropdown/components/liu-dropdown/liu-dropdown.vue

@ -115,13 +115,8 @@
uni.showToast({
title: '归档成功'
});
uni.navigateBack({
delta: 1,
complete: () => {
setTimeout(()=>{
uni.startPullDownRefresh()
},1000)
}
uni.redirectTo({
url:'../commandDispatch'
});
}
});

@ -1,12 +1,12 @@
<template>
<view class="v-page">
<view class="v-page" @touchstart="refreshStart" @touchmove="refreshMove" @touchend="refreshEnd">
<refresh ref="refresh" @isRefresh="isRefresh"></refresh>
<view class="v-page-top">
<liu-dropdown :menuList="menuList" :dataObj="dataObj" @change="change"></liu-dropdown>
</view>
<view class="v-card contain" style="padding-top: 80rpx; padding-bottom: 40rpx;">
<view @touchstart="refreshStart" @touchmove="refreshMove" @touchend="refreshEnd">
<refresh ref="refresh" @isRefresh="isRefresh"></refresh>
<scroll-view style="height: 100%" scroll-y="true" @scrolltolower="lower1" scroll-with-animation>
<scroll-view style="height: 100%" scroll-y="true" @scrolltolower="lower1" scroll-with-animation>
<view class="v-card contain" style="padding-top:80rpx;padding-bottom:40rpx;">
<view>
<view class="v-card-item" v-for="(item, index) in list" v-if="list.length > 0" :key="index"
@click.stop="goDetail(item)">
<view class="v-card-box row">
@ -24,10 +24,10 @@
@click.stop="saveDetail(item)">警情归档</view></view>
</view>
</view>
</scroll-view>
<view class="noCard" v-if="!list || list.length === 0">暂无信息</view>
</view>
</view>
</scroll-view>
</view>
</template>
@ -50,7 +50,7 @@
data() {
return {
pageNum: 1,
pageBottoms: false,
pageBottoms: [],
menuList: [{
id: 1,
name: '时间',
@ -115,6 +115,11 @@
this.getEventReportData();
}
},
onUnload(){
uni.navigateBack({
delta:3
})
},
mounted() {
//
this.getWaringList();
@ -308,7 +313,7 @@
//
isRequest() {
return new Promise((resolve, reject) => {
this.pagesNum++;
this.pageNum++;
var that = this;
setTimeout(() => {
@ -324,7 +329,7 @@
setTimeout(() => {
this.list = [];
this.pageBottoms = false;
this.pagesNum = 1;
this.pageNum = 1;
this.getEventReportData();
uni.showToast({
icon: 'success',
@ -336,6 +341,7 @@
},
// util.throttle
lower1: util.throttle(function(e) {
console.log(e)
if (this.pageBottoms) {
return;
}
@ -369,4 +375,7 @@
box-shadow: 0 0 10rpx 0 rgba(0, 0, 0, 0.1);
border-radius: 10rpx;
}
.v-page{
height: 100vh;
}
</style>

@ -133,28 +133,27 @@ export default {
success: function (res) {
console.log('当前位置的经度:' + res.longitude);
console.log('当前位置的纬度:' + res.latitude);
let data ={
"patrolDate": _that.patrolDate,
"taskId": _that.taskId,
"matterId": val.matterId,
"patrolPointId": val.patrolPointId,
"longitude": res.longitude,
"dimension":res.latitude
}
patrollingClock(data).then(res =>{
let _that = this
if(res.code == 200){
uni.showToast({
title:"打卡成功"
let data ={
"patrolDate": _that.patrolDate,
"taskId": _that.taskId,
"matterId": val.matterId,
"patrolPointId": val.patrolPointId,
"longitude": res.longitude,
"dimension":res.latitude
}
patrollingClock(data).then(res =>{
if(res.code == 200){
uni.showToast({
title:"打卡成功"
})
console.log(1111)
_that.getPatrollingTaskDetail();
console.log(2222)
}
})
_that.getPatrollingTaskDetail();
}
})
}
});
},
}
};

@ -138,6 +138,7 @@
},
// util.throttle
lower1: util.throttle(function(e) {
console.log(1111)
if (this.pageBottoms[this.currentTab]) {
return;

@ -218,7 +218,7 @@
.popup-box {
width: 100%;
height: auto;
position: fixed;
// position: fixed;
overflow: hidden;
background-color: #FFFFFF;
z-index: 99999 !important;

Loading…
Cancel
Save