From be52942b0100d9b8f4323a22175786683e82b3bd Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 30 十一月 2024 16:13:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/polling/task.vue | 81 ++++++++++++++++++++++++++++++++--------
1 files changed, 65 insertions(+), 16 deletions(-)
diff --git a/h5/pages/polling/task.vue b/h5/pages/polling/task.vue
index 17f1208..ee37c83 100644
--- a/h5/pages/polling/task.vue
+++ b/h5/pages/polling/task.vue
@@ -8,11 +8,11 @@
</view> -->
<!-- -->
<view class="tabs">
- <view class="tab" :class="{active: activeTab == 0}" @click="tabsClick(0)">
+ <view class="tab" :class="{active: param.status == 0}" @click="tabsClick(0)">
<text>寰呭鐞�</text>
<text class="border"></text>
</view>
- <view class="tab" :class="{active: activeTab == 1}" @click="tabsClick(1)">
+ <view class="tab" :class="{active: param.status == 3}" @click="tabsClick(3)">
<text>宸插鐞�</text>
<text class="border"></text>
</view>
@@ -27,18 +27,22 @@
</view>
<!-- -->
<view class="list">
- <view class="item" v-for="item in 10" @click="itemClick(item)">
- <image v-if="item.stats == 1" src="@/static/side/xunjianed.png" class="icon"></image>
+ <view class="item" v-for="item in list" @click="itemClick(item)">
+ <image v-if="item.status == 0 || item.status == 1" src="@/static/side/xunjianed.png" class="icon"></image>
<image v-else src="@/static/side/xunjian.png" class="icon"></image>
<view class="content">
<view class="name_wrap line">
- <view class="name">宸℃閰掑晩</view>
- <view class="status">寰呭紑濮�</view>
+ <view class="name">{{item.planTitle}}</view>
+ <view class="status" :class="{
+ green: item.status == 1,
+ red: item.status == 2,
+ gray: item.status == 3 || item.status == 4
+ }">{{statusM[item.status]}}</view>
</view>
- <view class="line">浠诲姟鏃ユ湡锛歺xx</view>
- <view class="line">鎵ц鏃堕棿锛�121212</view>
+ <view class="line" v-if="item.startDate && item.endDate">浠诲姟鏃ユ湡锛歿{ item.startDate.slice(0, 11) }} 鑷� {{ item.endDate.slice(0, 11) }}</view>
+ <view class="line">鎵ц鏃堕棿锛歿{ item.startDate.slice(11, 16) }} - {{ item.endDate.slice(11, 16) }}</view>
<view class="line">
- <view>瀹屾垚鎯呭喌锛�121212</view>
+ <view>瀹屾垚鎯呭喌锛歿{item.finishNum}}/{{item.patrolNum}}</view>
<view class="btn">
<image src="@/static/side/ic_saoma@2x.png" class="saoma" mode=""></image>
<view>鎵爜宸℃</view>
@@ -51,29 +55,68 @@
</view>
</template>
-<script>
+<script>
+ import { ywPatrolTaskPost } from '@/api'
export default {
data() {
return {
- param: {},
+ param: {
+ status: 0
+ },
+ list: [],
activeTab: 0,
- selectAll: false
+ selectAll: false,
+ page: 1,
+
+ statusM: {
+ 0: '寰呭紑濮�',
+ 1: '杩涜涓�',
+ 2: '宸茶秴鏈�',
+ 3: '宸插畬鎴�',
+ 4: '宸插彇娑�',
+ }
};
+ },
+ onLoad() {
+ this.getList()
+ },
+ onReachBottom() {
+ const {total,list} = this
+ if (list.length < total) {
+ this.page = this.page + 1
+ this.getList()
+ } else {
+ this.showToast('鏆傛棤鏇村鏁版嵁')
+ }
},
methods: {
tabsClick(val) {
- this.activeTab = val
+ this.param.status = val
+ this.page = 1
+ this.list = []
+ this.getList()
},
allClick() {
this.selectAll = !this.selectAll
+ this.list = []
+ this.page = 1
+ this.getList()
},
- itemClick() {
+ itemClick(item) {
uni.navigateTo({
- url: '/pages/polling/detail'
+ url: '/pages/polling/detail?id=' + item.id
})
},
getList() {
- console.log('---');
+ const { page, param, selectAll } = this
+ ywPatrolTaskPost({
+ model: {...param, dispatchUserId: selectAll ? '' : uni.getStorageSync('userInfo').id, },
+ page,
+ capacity: 10
+ }).then(res => {
+ this.list = [...this.list, ...res.data.records]
+ this.total = res.data.total
+ })
}
}
}
@@ -206,6 +249,12 @@
.status{
color: $primaryColor;
}
+ .green{
+ color: #0ADE79;
+ }
+ .gray{
+ color: #999999;
+ }
}
}
}
--
Gitblit v1.9.3