From 5d9c852fef51d556a024b3a082339a9a2a33ae33 Mon Sep 17 00:00:00 2001
From: guanqb <18720758508@163.com>
Date: Mon, 09 Oct 2023 09:23:56 +0800
Subject: [PATCH] 登录页加版权文字、首页酒店数据对接-弹窗表格筛选和定位弹窗
---
src/views/home/components/leftContainer.vue | 60 +++++++++++++++++++++++++++++++++---------------------------
1 files changed, 33 insertions(+), 27 deletions(-)
diff --git a/src/views/home/components/leftContainer.vue b/src/views/home/components/leftContainer.vue
index 26284cb..f19dad7 100644
--- a/src/views/home/components/leftContainer.vue
+++ b/src/views/home/components/leftContainer.vue
@@ -148,7 +148,7 @@
import { serviceObjJSON } from '../homeleft/serviceObj'
import { difficultyJSON } from '../homeleft/difficulty'
-import { getVillagePersonStatisticInfo, getVillagePersonStatisticInfoByPoliceStationId, getPersonInfo, getPersonInfoPage, getHouseStatisticInfo } from "@/api/dept"
+import { getVillagePersonStatisticInfo, getVillagePersonStatisticInfoByPoliceStationId, getPersonInfo, getPersonInfoPage, getHouseStatisticInfo, getHotelList } from "@/api/dept"
let homePersonmyChart = null
let keyPersonmyChart = null
@@ -198,16 +198,6 @@
policeStaionID: '',
peopleLoading: false,
personEchartsHeight: '100%',
- syldPage: {
- total: 0,
- pageSize: 15,
- currentPage: 1
- },
- gzcsPage: {
- total: 0,
- pageSize: 15,
- currentPage: 1
- },
syldBigType: '',
syldName: '',
gzcsType: '',
@@ -217,9 +207,6 @@
isFirstMounted: true,
clickPoliceStationId: '',
}
- },
-
- created () {
},
mounted () {
@@ -240,6 +227,18 @@
},
methods: {
+ // 酒店列表
+ getHotelList () {
+ getHotelList({ deptId: this.$parent.areaChangeValue, orderName: 'hotel_name', hotelName: this.$parent.zhuSuName, orderRule: 'asc', size: this.$parent.zhuSuPage.pageSize, current: this.$parent.zhuSuPage.currentPage }).then(res => {
+ console.log(res.data.data.records, 'getHotelList-1234')
+ this.$parent.zhuSuPage.total = res.data.data.total
+ this.$parent.zhuSuArr = res.data.data.records
+ setTimeout(() => {
+ this.$parent.zhuSuLoading = false
+ }, 500)
+ })
+ },
+
// 设备饼图轮播
keyPeopleEchartsCarousel () {
let curIndex = 0
@@ -762,7 +761,7 @@
// 实有住宅统计
getVillageStatisticData (params) {
getVillageStatisticData(params).then(res => {
- console.log('getVillageStatisticData', params)
+ console.log('getVillageStatisticData', params, res)
this.disposeHouseEchart()
let xDate = []
let yDate = []
@@ -791,7 +790,7 @@
// 实有住宅详情
getVillageStatisticDetail () {
- getVillageStatisticDetail({ deptId: this.userInfo.dept_id, bigType: this.syldBigType, name: this.syldName, current: this.syldPage.currentPage, size: this.syldPage.pageSize }).then(res => {
+ getVillageStatisticDetail({ deptId: this.userInfo.dept_id, bigType: this.syldBigType, name: this.syldName, current: this.$parent.syldPage.currentPage, size: this.$parent.syldPage.pageSize }).then(res => {
console.log('getVillageStatisticDetail', res, res.data.data.records)
this.$parent.syldPage.total = res.data.data.total
this.$parent.syldArr = res.data.data.records
@@ -833,7 +832,7 @@
// 关注场所详情
getPlaceOfConcernStatisticDetail () {
- getPlaceOfConcernStatisticDetail({ deptId: this.userInfo.dept_id, type: this.gzcsType, unitName: this.gzcsUnitName, person: this.gzcsPerson, phone: this.gzcsPhone, current: this.gzcsPage.currentPage, size: this.gzcsPage.pageSize }).then(res => {
+ getPlaceOfConcernStatisticDetail({ deptId: this.userInfo.dept_id, type: this.gzcsType, unitName: this.gzcsUnitName, person: this.gzcsPerson, phone: this.gzcsPhone, current: this.$parent.gzcsPage.currentPage, size: this.$parent.gzcsPage.pageSize }).then(res => {
console.log('getPlaceOfConcernStatisticDetail', res, res.data.data.records)
this.$parent.gzcsPage.total = res.data.data.total
this.$parent.gzcsArr = res.data.data.records
@@ -1120,18 +1119,25 @@
}
if (type == '实有住宅') {
- this.syldPage.currentPage = 1
- this.$parent.syldPage.currentPage = 1
- this.$parent.syldPopupTitle = params.name
- this.syldBigType = params.name
- this.syldName = ''
- this.$parent.syldArr = []
- this.$parent.syldPopupShow = true
- this.$parent.syldLoading = true
- this.getVillageStatisticDetail()
+ if (params.name == '住宿服务') {
+ this.$parent.zhuSuPage.currentPage = 1
+ this.$parent.zhuSuPopupShow = true
+ this.$parent.zhuSuLoading = true
+ this.getHotelList()
+
+ } else {
+ this.$parent.syldPage.currentPage = 1
+ this.$parent.syldPopupTitle = params.name
+ this.syldBigType = params.name
+ this.syldName = ''
+ this.$parent.syldArr = []
+ this.$parent.syldPopupShow = true
+ this.$parent.syldLoading = true
+ this.getVillageStatisticDetail()
+ }
+
} else {
console.log('关注场所')
- this.gzcsPage.currentPage = 1
this.$parent.gzcsPage.currentPage = 1
this.gzcsType = params.name
this.gzcsUnitName = ''
--
Gitblit v1.9.3