From 5f8cd55f32939d15c6224d491f89743421cab0f9 Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Mon, 20 Nov 2023 13:12:42 +0800
Subject: [PATCH] fix:分享修改
---
pages/actionChange/agencyPage/index.vue | 95 ++++++++++++++++++++++++++---------------------
1 files changed, 53 insertions(+), 42 deletions(-)
diff --git a/pages/actionChange/agencyPage/index.vue b/pages/actionChange/agencyPage/index.vue
index 0d8b9fd..46d84cb 100644
--- a/pages/actionChange/agencyPage/index.vue
+++ b/pages/actionChange/agencyPage/index.vue
@@ -24,7 +24,7 @@
<uni-datetime-picker v-model="range" type="daterange" rangeSeparator="���" />
</view>
<view>
- <u-button type="primary" size="small" text="������" @click="getWorkOrder"></u-button>
+ <u-button type="primary" size="small" text="������" @click="getSearch" throttleTime='500'></u-button>
</view>
</view>
<view :key="index" v-for="(item, index) in workOderList" class="workOrderDetail"
@@ -107,11 +107,7 @@
<view class="wholeLine">
<text class="rowTipContenetLabel">������������:</text>
<text class="rowTipContenetAll">
- {{ unitList.find(
- (a) =>
- item && parseInt(a.unitId) === item.escalationUnitId
- ).unitName
- }}
+ {{ item.escalationUnitName}}
</text>
</view>
</view>
@@ -207,16 +203,6 @@
return data
}
},
- onReachBottom() {
- //������������������������������������������
- if (this.isLoading) {
- this.status = 'loading'
- //������������������,���������++
- this.page.currentPage = ++this.page.currentPage
- //������������,������������tab������������
- this.getWorkOrder()
- }
- },
mounted() {},
filters: {
stateFormatter(val) {
@@ -226,14 +212,21 @@
},
onLoad: () => {},
methods: {
+ onBottom() {
+ //������������������������������������������
+ console.log('1122111')
+ this.status = 'loading'
+ //������������������,���������++
+ this.page.currentPage = ++this.page.currentPage
+ //������������,������������tab������������
+ this.getWorkOrder()
+ },
getLoadmore() {
- if (this.isLoading) {
- this.status = 'loading'
- //������������������,���������++
- this.page.currentPage = ++this.page.currentPage
- //������������,������������tab������������
- this.getWorkOrder()
- }
+ this.status = 'loading'
+ //������������������,���������++
+ this.page.currentPage = ++this.page.currentPage
+ //������������,������������tab������������
+ this.getWorkOrder()
},
async onChooseAvatar(e) {
const {
@@ -285,9 +278,26 @@
currentPage: 1,
pageSize: 10
}
+ this.workOderList = []
this.startTime = ''
this.endTime = ''
+ uni.$u.throttle(this.getWorkOrder, 500)
+ },
+ getSearch() {
+ this.workOderList = []
+ this.page = {
+ currentPage: 1,
+ pageSize: 10
+ }
this.getWorkOrder()
+ },
+ setData() {
+ this.workOderList = []
+ this.page = {
+ currentPage: 1,
+ pageSize: 10
+ }
+ this.getContaminateList()
},
// ������������������list
getUnitList() {
@@ -332,28 +342,25 @@
this.isLoading = true
this.status = 'loadmore'
}
- if (this.page.currentPage === res.data.page.currentPage) {
- this.workOderList = res.data.list
- } else {
- res.data.list.forEach(el => {
- this.workOderList.push(el)
- })
- }
+ res.data.list.forEach(el => {
+ this.workOderList.push(el)
+ })
} else {
this.status = 'nomore'
}
})
},
handleClick(e, pageState) {
- this.$http.httpGet('/allocation/detail', {
- id: e.allocationId
- }).then(res => {
- let data = res.data
- data.pageState = e.stateName === '���������' ? pageState : 'view'
- let myData = JSON.stringify(data)
- uni.navigateTo({
- url: '/pages/actionChange/workOrderDetails/index?infor=' + myData + '&type=jump',
- })
+ let data = {}
+ data.pageState = e.stateName === '���������' ? pageState : 'view'
+ data.stateName = e.stateName
+ data.allocationId = e.allocationId
+ data.state = e.state
+ data.allocationNum = e.allocationNum
+ data.current = this.current
+ let myData = JSON.stringify(data)
+ uni.navigateTo({
+ url: '/pages/actionChange/workOrderDetails/index?infor=' + myData + '&type=jump',
})
},
},
@@ -361,6 +368,10 @@
}
</script>
<style scoped lang="scss">
+ page {
+ height: 101vh;
+ }
+
/deep/.uni-page-head {
display: none;
}
@@ -471,9 +482,9 @@
opacity: 0;
padding: .1em .5em;
text-transform: uppercase;
- opacity: 0;
- transform: rotate(-2deg) scale(5);
- animation: seal .3s cubic-bezier(0.6, 0.04, 0.98, 0.335) forwards;
+ opacity: .75;
+ transform: rotate(-15deg) scale(1);
+ // animation: seal .3s cubic-bezier(0.6, 0.04, 0.98, 0.335) forwards;
}
@keyframes seal {
--
Gitblit v1.8.0