diff --git a/src/project/pingchang/AppCheckpointRegistration/AppCheckpointRegistration.vue b/src/project/pingchang/AppCheckpointRegistration/AppCheckpointRegistration.vue index 042c2fe3..1e8cc35c 100644 --- a/src/project/pingchang/AppCheckpointRegistration/AppCheckpointRegistration.vue +++ b/src/project/pingchang/AppCheckpointRegistration/AppCheckpointRegistration.vue @@ -3,22 +3,19 @@
-

{{ userList.today }}

+

{{totalInfo.today}}

今日返乡

-

{{ userList.unReport }}

+

{{totalInfo.todayUnusual}}

今日风险

-
-

{{ userList.total }}

+
+

{{totalInfo.release}}

风险处理

- -
- -
+
@@ -27,50 +24,23 @@
- - + +
+
+
返乡人员
+
异常人员
- -
- - - -
- -
- - - +
+
+

{{item.name}}有异常

+

{{item.idNumber}}

+

{{item.startAreaName}}

+

{{item.arriveAreaName}}

+

{{item.arriveTime}}

+
+
@@ -78,141 +48,94 @@ import { mapState } from 'vuex' export default { - appName: '卡口登记', + name: 'AppCheckpointRegistration', + appName: '卡口登记', data() { return { - keyword: '', areaId: '', areaName: '', + tabIndex: 0, current: 1, - size: 10, - tabList: [ - { - name: '返乡人员', - }, - { - name: '异常人员', - }, - ], - currentTabs: 0, - userList: [], - data: [{name: '123'}], + list: [], + name: '', + totalInfo: {} } }, - computed: { - ...mapState(['user']), - }, - watch: {}, - onLoad() { + computed: { ...mapState(['user']) }, + created() { this.areaId = this.user.areaId this.areaName = this.user.areaName - // this.getList() - // this.getUserList() - - uni.$on('updateLists', () => { - this.current = 1 - this.getList() - this.getUserList() - }) }, onShow() { document.title = '卡口登记' + this.getList() + this.getTotal() + uni.$on('updateList', () => { + this.getListInit() + }) }, methods: { - getList() { - this.$http - .post('/app/appepidemicreportmember/list', null, { - params: { size: this.size, current: this.current, status: this.currentTabs == 1 ? '0' : '', areaId: this.areaId, name: this.keyword }, - }) - .then((res) => { - if (res.code == 0) { - this.data = this.current > 1 ? [...this.data, ...res.data.records] : res.data.records - this.$forceUpdate() - } - }) - .catch(() => { - this.$forceUpdate() - }) - .finally(() => { - this.$forceUpdate() - }) + areaSelect(e) { + this.areaId =e + this.$nextTick(() => { + this.getListInit() + }) + this.getTotal() }, - - getUserList() { - this.$http.post(`/app/appepidemicreportmember/statistic?areaId=${this.areaId}`).then((res) => { + tabClick(index) { + this.tabIndex = index + this.getListInit() + }, + getListInit() { + this.current = 1 + this.list = [] + this.getList() + }, + getList() { + var status = '' + if(this.tabIndex == 1) { + status = 0 + } + this.$http.post(`/app/appepidemicbackhomerecord/list?current=${this.current}&size=10&status=${status}&name=${this.name}&arriveAreaId=${this.areaId}`) + .then((res) => { if (res.code == 0) { - this.userList = res.data + res.data.records.map((item) => { + item.idNumber = item.idNumber.replace(/(.{6}).*(.{4})/,"$1********$2") + }) + this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records } }) }, - - goDetail(item) { - uni.navigateTo({ - url: `./Detail?id=${item.id}&diffNum=${item.diffNum}&today=${item.today}`, + getTotal() { + this.$http.post(`/app/appepidemicbackhomerecord/statistic?areaId=${this.areaId}`).then((res) => { + if (res.code == 0) { + this.totalInfo = res.data + } }) }, - - areaSelect(e) { - this.areaId = e - this.getList() - this.getUserList() - }, - - change(index) { - this.data = [] - // this.areaId = this.user.areaId - this.keyword = '' - this.currentTabs = index - this.current = 1 - this.getList() - }, - - handerSearch(e) { - this.keyword = e - this.current = 1 - this.getList() - }, - - handerClear() { - this.keyword = '' - this.current = 1 - this.getList() - }, + toUser(row) { + uni.navigateTo({url: `./UserInfo?id=${row.id}`}) + } }, onReachBottom() { - this.current++ + this.current ++ this.getList() - }, + } } - diff --git a/src/project/pingchang/AppCheckpointRegistration/Detail.vue b/src/project/pingchang/AppCheckpointRegistration/ErrorInfo.vue similarity index 61% rename from src/project/pingchang/AppCheckpointRegistration/Detail.vue rename to src/project/pingchang/AppCheckpointRegistration/ErrorInfo.vue index ec8b46e5..c094efe0 100644 --- a/src/project/pingchang/AppCheckpointRegistration/Detail.vue +++ b/src/project/pingchang/AppCheckpointRegistration/ErrorInfo.vue @@ -1,34 +1,40 @@ @@ -36,6 +42,8 @@ import { mapState } from 'vuex' export default { + components: {}, + props: {}, data() { return { show: false, @@ -52,8 +60,7 @@ export default { document.title = '异常情况处理' }, onLoad(option) { - // this.id = option.id - this.id = '5173745c3c00452a9346d1c559266982' + this.id = option.id this.$dict.load('epidemicRecentHealth').then(() => { this.getDetail() }) @@ -113,27 +120,25 @@ export default { callPhone(phone) { uni.makePhoneCall({phoneNumber: phone}) }, - toContent() { - uni.navigateTo({url: './Content'}) - } }, } diff --git a/src/project/pingchang/AppCheckpointRegistration/components/img/blue-icon.png b/src/project/pingchang/AppCheckpointRegistration/components/img/blue-icon.png new file mode 100644 index 00000000..db08e4d0 Binary files /dev/null and b/src/project/pingchang/AppCheckpointRegistration/components/img/blue-icon.png differ diff --git a/src/project/pingchang/AppCheckpointRegistration/components/img/fxry.png b/src/project/pingchang/AppCheckpointRegistration/components/img/fxry.png new file mode 100644 index 00000000..16c7e3c8 Binary files /dev/null and b/src/project/pingchang/AppCheckpointRegistration/components/img/fxry.png differ diff --git a/src/project/pingchang/AppCheckpointRegistration/components/img/header.png b/src/project/pingchang/AppCheckpointRegistration/components/img/header.png new file mode 100644 index 00000000..56cdd003 Binary files /dev/null and b/src/project/pingchang/AppCheckpointRegistration/components/img/header.png differ diff --git a/src/project/pingchang/AppCheckpointRegistration/components/img/jkjc.png b/src/project/pingchang/AppCheckpointRegistration/components/img/jkjc.png new file mode 100644 index 00000000..36c789cd Binary files /dev/null and b/src/project/pingchang/AppCheckpointRegistration/components/img/jkjc.png differ diff --git a/src/project/pingchang/AppCheckpointRegistration/components/img/org-icon.png b/src/project/pingchang/AppCheckpointRegistration/components/img/org-icon.png new file mode 100644 index 00000000..93c85c58 Binary files /dev/null and b/src/project/pingchang/AppCheckpointRegistration/components/img/org-icon.png differ diff --git a/src/project/pingchang/AppCheckpointRegistration/components/img/phone-icon.png b/src/project/pingchang/AppCheckpointRegistration/components/img/phone-icon.png new file mode 100644 index 00000000..3f374d30 Binary files /dev/null and b/src/project/pingchang/AppCheckpointRegistration/components/img/phone-icon.png differ diff --git a/src/project/pingchang/AppCheckpointRegistration/components/img/phone2@.png b/src/project/pingchang/AppCheckpointRegistration/components/img/phone2@.png new file mode 100644 index 00000000..0cc0c1ca Binary files /dev/null and b/src/project/pingchang/AppCheckpointRegistration/components/img/phone2@.png differ diff --git a/src/project/pingchang/AppCheckpointRegistration/components/img/time-icon.png b/src/project/pingchang/AppCheckpointRegistration/components/img/time-icon.png new file mode 100644 index 00000000..d7b3df68 Binary files /dev/null and b/src/project/pingchang/AppCheckpointRegistration/components/img/time-icon.png differ