From 41ce77eb87228359cd6d692e68613174b4fc20d2 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 4 Dec 2024 16:32:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E6=88=BF=E9=A1=B5=E9=9D=A2=E5=A2=9E?=
=?UTF-8?q?=E5=8A=A0=E8=BD=A6=E8=BE=86=E6=9F=A5=E8=AF=A2=EF=BC=8C=E5=B7=A5?=
=?UTF-8?q?=E4=BD=9C=E9=9A=90=E8=97=8F=E6=8E=89=E7=BD=91=E6=A0=BC=E5=B7=A1?=
=?UTF-8?q?=E6=9F=A5=E8=B7=9F=E6=BB=A1=E6=84=8F=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/index/index.vue | 7 +-
pages/resiAndHouse/resiAndHouse.vue | 261 ++++++++++++++++------------
pages/work2/work2.vue | 39 +----
utils/api.js | 7 +-
4 files changed, 155 insertions(+), 159 deletions(-)
diff --git a/pages/index/index.vue b/pages/index/index.vue
index c1843d2..fbb98e8 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -45,10 +45,6 @@
-
-
- 扫电子门牌
-
识别身份证
@@ -362,6 +358,7 @@ export default {
this.setData({
loadMoreType: res.data.list.length === this.pageSize ? 'more' : 'none',
tableData: this.tableData.concat(res.data.list)
+
});
console.log(this.tableData);
if (this.tableData.length == 0) {
@@ -1571,7 +1568,7 @@ page {
}
.electron_card {
display: flex;
- width: 335rpx;
+ width: 100%;
height: 100rpx;
background-color: #ffffff;
border-radius: 20rpx;
diff --git a/pages/resiAndHouse/resiAndHouse.vue b/pages/resiAndHouse/resiAndHouse.vue
index 0124fb8..b3ebb5b 100644
--- a/pages/resiAndHouse/resiAndHouse.vue
+++ b/pages/resiAndHouse/resiAndHouse.vue
@@ -7,9 +7,7 @@
-
+
查居民
@@ -19,7 +17,7 @@
查房屋
-
+
查车辆
@@ -28,7 +26,7 @@
- {{ cascaderName }}
-
-
- 切换
-
+
@@ -300,31 +294,53 @@
新增房屋
+
+
+
+ {{ cascaderName }}
+
+
+ 切换
+
+
+
+
+
+
+
+
+ {{ item.carNumber }}
+
+
+
+
+ {{ item.carColor }}·{{item.carBrand}}
+
+
+
+ 车主
+ ：
+ {{ item.carOwnerName }}
+
+
+ 电话：
+ {{ item.carOwnerMobile || '--' }}
+
+
+ 地址：
+ {{ item.orgNamePath || '' }}
+
+
+
+
+
+ {{ loadMoreType == 'more' ? '加载中...' : '暂无数据' }}
+
+
+
-
-
-
-
-
-
+
+
@@ -333,7 +349,7 @@ import customTabBar from '../../components/custom-tab-bar/index.vue';
import loadMore from '../../components/loadMore/loadMore';
import noData from '../../components/noData/nodata';
const app = getApp();
-import api, { getAllOrgCategoryCount, getResidentBaseInfo, getTopTree, getNextTree, houseSearch, allOrgHouseInfo, getCommunityHouse } from '../../utils/api';
+import api, { getResidentBaseInfo, getNextTree, houseSearch, allOrgHouseInfo, getCommunityHouse } from '../../utils/api';
export default {
components: {
customTabBar,
@@ -381,9 +397,6 @@ export default {
//组织树
angencyFwList: [],
- //房屋组织树
- showAngenCascader: false,
-
agencyName: '',
fieldName: {
@@ -393,7 +406,6 @@ export default {
},
cascaderNameFw: null,
- showFw: false,
params: {
agencyId: '',
@@ -448,7 +460,8 @@ export default {
selectedOptions: '',
loadLeve: '',
resiSearch: '',
- houseSearch: ''
+ houseSearch: '',
+ carList:[]
};
},
/**
@@ -524,6 +537,59 @@ export default {
*/
onShareAppMessage() {},
methods: {
+ completeGrid(e) {
+
+ },
+ async carInfoPage(){
+ try {
+ this.setData({
+ loadMoreVisible: true,
+ nodata: false,
+ loadMoreType: 'more'
+ });
+ let parm = {
+ agencyId:'',
+ orgIdPath:'',//所属组织
+ keyword:this.keyWord,
+ pageSize:this.pageSize,
+ pageNo:this.pageNo
+ }
+ let { data, code, msg } = await api.carInfoPage(parm);
+ if (code == 0) {
+ this.setData({
+ loadMoreType: data.list.length === this.pageSize ? 'more' : 'none',
+ carList: this.carList.concat(...data.list)
+ });
+ if (this.carList.length == 0) {
+ this.setData({
+ loadMoreVisible: false,
+ nodata: true
+ });
+ }
+ } else {
+ this.setData({
+ loadMoreVisible: false,
+ nodata: true,
+ loadMoreType: 'none'
+ });
+ }
+ } catch (err) {
+ this.setData({
+ loadMoreVisible: false,
+ nodata: true,
+ loadMoreType: 'none'
+ });
+ }
+ },
+ changeResiCascader(e){
+ this.searchOrgIdPath = e.value;
+ this.setData({
+ pageNo: 1,
+ tableData: []
+ });
+ this.getTableData();
+ this.getAllOrgCategoryCount();
+ },
handelClickedit(e) {
console.log(e);
uni.navigateTo({
@@ -615,31 +681,37 @@ export default {
},
getTopTreeData() {
- getTopTree().then((res) => {
- const arr = res.data.children.map((item) => {
- return {
- ...item,
- children: []
- };
- });
+ api.getAgencygridtree().then((res) => {
this.setData({
- angencyFwList: [
- {
- ...res.data,
- children: arr
- }
- ],
- angencyJmList: [
- {
- ...res.data,
- children: arr
- }
- ]
+ angencyList: this.convertLabelToText([res.data])
});
- console.log(this.angencyFwList);
});
},
+ convertLabelToText(tree) {
+ return tree.map(node => {
+ const newNode = {
+ ...node
+ };
+ // 将 label 替换为 text
+ if (newNode.agencyName !== undefined) {
+ newNode.text = newNode.agencyName;
+ delete newNode.agencyName;
+ }
+ if (newNode.subAgencyList && newNode.subAgencyList.length > 0) {
+ newNode.children = newNode.subAgencyList
+ delete newNode.subAgencyList;
+ }
+ if (newNode.agencyId) {
+ newNode.value = newNode.agencyId
+ delete newNode.agencyId;
+ }
+ if (newNode.children && newNode.children.length > 0) {
+ newNode.children = this.convertLabelToText(newNode.children);
+ }
+ return newNode;
+ });
+ },
getTreeFun(id, arr, data) {
return arr.map((item) => {
if (id == item.id) {
@@ -749,38 +821,6 @@ export default {
}
},
- onCloseFw() {
- this.setData({
- showFw: false
- });
- },
-
- onFinishFw(e) {
- const { selectedOptions, value } = e.detail;
- const level = selectedOptions[selectedOptions.length - 1].level;
- this.setData({
- cascaderNameFw: e.detail.selectedOptions.map((item) => item.label).join(' '),
- showFw: false,
- cascaderFwValue: value,
- params: {
- ...this.params,
- orgId: value,
- level: level == 'grid' ? 'grid' : 'agency',
- agencyId: app.globalData.user.agencyId
- },
- params1: {
- pageNo: 1,
- ...this.params1,
- searchOrgIdPath: value,
- // orgId: value,
- level
- },
- tableFwData: [],
- selectedOptions
- });
- this.getTableFwData();
- },
-
handelClickSearchType(e) {
this.setData({
selectVale: e.currentTarget.dataset.type
@@ -798,21 +838,14 @@ export default {
tableFwData: []
});
this.getUnitoption(this.angencyFwList);
+ } else if (e.currentTarget.dataset.type === 'car') {
+ this.setData({
+ pageNo: 1,
+ carList: []
+ });
+ this.carInfoPage();
}
},
-
- handelClickShowTree() {
- this.setData({
- showAngenCascader: true
- });
- },
-
- handelClickShowTreeFw() {
- this.setData({
- showFw: true
- });
- },
-
async handelClickSearch() {
if (this.selectVale === 'resi') {
this.setData({
@@ -821,7 +854,7 @@ export default {
});
this.getTableData();
this.getAllOrgCategoryCount();
- } else {
+ } else if(this.selectVale === 'house'){
if (this.keyWord) {
this.setData({
houseListSearchFlag: true,
@@ -837,6 +870,12 @@ export default {
tableFwData: []
});
this.getTableFwData();
+ }else{
+ this.setData({
+ pageNo: 1,
+ carList:[]
+ });
+ this.carInfoPage()
}
},
@@ -891,12 +930,7 @@ export default {
});
},
- onClose() {
- this.setData({
- showAngenCascader: false
- });
- },
-
+
onScrollToLower(e) {
if (this.loadMoreType === 'more') {
this.setData({
@@ -956,9 +990,6 @@ export default {
});
}
} catch (err) {
- console.log('CatchClause', err);
- console.log('CatchClause', err);
- console.log(err);
this.setData({
loadMoreVisible: false,
nodata: true,
diff --git a/pages/work2/work2.vue b/pages/work2/work2.vue
index 1ec7fba..09b79be 100644
--- a/pages/work2/work2.vue
+++ b/pages/work2/work2.vue
@@ -56,34 +56,14 @@
诉求办理
-
-
- 满意度调查
-
-
+
基层治理
-
热线接办
@@ -170,11 +150,6 @@ export default {
});
},
- onHistoryQuery() {
- uni.navigateTo({
- url: '../../subpages/communitySelfInsp/pages/historyQuery/historyQuery'
- });
- },
onFollowUpList() {
uni.navigateTo({
@@ -210,18 +185,6 @@ export default {
});
},
- onData() {
- // wx.switchTab({
- uni.navigateTo({
- url: '/subpages/securityCheck/pages/securityCheck'
- });
- },
-
- // onAddHouse(){
- // wx.navigateTo({
- // url: '../../subpages/addhouse/pages/addhouse/addhouse',
- // })
- // },
onHotlineCompletion() {
let token = uni.getStorageSync('token');
console.log(token, 'jhgjgjjhbj');
diff --git a/utils/api.js b/utils/api.js
index 9484497..a209c60 100644
--- a/utils/api.js
+++ b/utils/api.js
@@ -91,7 +91,8 @@ module.exports = {
hotResidentSearch,
hotHouseSearch,
carInfoSave,
- statisticEventInfo
+ statisticEventInfo,
+ carInfoPage
};
// 获取公钥
@@ -488,3 +489,7 @@ function carInfoSave(data) {
function statisticEventInfo(parm) {
return fly.get(`governance/icEventSpecialSubject/statisticEventInfo`, parm);
}
+// 获取车辆列表
+function carInfoPage(data) {
+ return fly.get(`epmetuser/carInfo/page`,data);
+}
\ No newline at end of file