diff --git a/app.js b/app.js
index e1e133c..c2bf99b 100644
--- a/app.js
+++ b/app.js
@@ -52,7 +52,8 @@ App({
userInfo: {},
// headerUrl: "http://42.193.40.239:8017/" //线上
// headerUrl: "http://192.168.110.10:8017/" //线下
- headerUrl: "https://city.sczysoft.com/df/"
+ headerUrl: "http://192.168.110.186:8017/"
+ // headerUrl: "https://city.sczysoft.com/df/"
},
// https://city.sczysoft.com/df/doc.html //接口
// https://city.sczysoft.com/dffile //查看拼接
diff --git a/app.json b/app.json
index 93144d9..5ad17cd 100644
--- a/app.json
+++ b/app.json
@@ -33,7 +33,9 @@
"pages/emergency/s-b/escalation/index",
"pages/agreement/index",
"pages/emergency/t-x-l/index/index",
- "pages/statistic/j-b-x-x/detail/index"
+ "pages/statistic/j-b-x-x/personnel/index",
+ "pages/statistic/j-b-x-x/detail/index",
+ "pages/work/f-b-g-z/index/index"
],
"window": {
"backgroundTextStyle": "light",
@@ -48,7 +50,10 @@
"title-bar": "/components/title-bar/index",
"tree-node": "components/tree-node/index"
},
- "requiredPrivateInfos": ["getLocation","chooseLocation"],
+ "requiredPrivateInfos": [
+ "getLocation",
+ "chooseLocation"
+ ],
"permission": {
"scope.userLocation": {
"desc": "你的位置信息将用于记录检查佐证"
diff --git a/images/home/icon_w_5.png b/images/home/icon_w_5.png
new file mode 100644
index 0000000..788877f
Binary files /dev/null and b/images/home/icon_w_5.png differ
diff --git a/images/home/icon_yj_4.png b/images/home/icon_yj_4.png
new file mode 100644
index 0000000..1b01fb3
Binary files /dev/null and b/images/home/icon_yj_4.png differ
diff --git a/pages/emergency/s-b/escalation/index.js b/pages/emergency/s-b/escalation/index.js
index 3f5a455..378bc50 100644
--- a/pages/emergency/s-b/escalation/index.js
+++ b/pages/emergency/s-b/escalation/index.js
@@ -189,8 +189,9 @@ Page({
console.log(resdata,'resdata===>');
// if (resdata.code == 1) {
console.log(resdata,'res==>');
- wx.hideLoading();
+
this.getFiles();
+ wx.hideLoading();
// }
})
},
diff --git a/pages/index/index.js b/pages/index/index.js
index 51c3f3a..298492b 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -104,6 +104,11 @@ Page({
name: "有事找党员",
href: "/pages/party-member/index/index"
},
+ {
+ icon: "icon_w_5",
+ name: "发布工作",
+ href: "/pages/work/f-b-g-z/index/index"
+ },
],
// 应急指挥
tab3: [{
@@ -117,7 +122,7 @@ Page({
href: "/pages/emergency/s-b/index/index"
},
{
- icon: "icon_yj_3",
+ icon: "icon_yj_4",
name: "应急通讯录",
href: "/pages/emergency/t-x/index/index"
},
diff --git a/pages/login/index.js b/pages/login/index.js
index 9d02d15..b9aec9c 100644
--- a/pages/login/index.js
+++ b/pages/login/index.js
@@ -8,10 +8,10 @@ Page({
* 页面的初始数据
*/
data: {
- // username: 'admin',
- // password: 'Daofu123456',
- username: '',
- password: '',
+ username: 'admin',
+ password: 'Daofu202406',
+ // username: '',
+ // password: '',
showLogin: true,
newname:'',
newphone:'',
diff --git a/pages/statistic/j-b-x-x/detail/index.js b/pages/statistic/j-b-x-x/detail/index.js
index 8af9d76..5dd27fd 100644
--- a/pages/statistic/j-b-x-x/detail/index.js
+++ b/pages/statistic/j-b-x-x/detail/index.js
@@ -23,11 +23,14 @@ Page({
* 查看人员详情
*/
getEmerEventDetail: function (id) {
+
app.axios("GET", "app", `/people/peopleDetail/${id}`).then(res => {
if (res.code == 1) {
console.log(res.data,'data===>');
this.data.userInfo = res.data;
+ this.data.freshIng = false,
this.setData(this.data);
+ wx.hideLoading();
// this.data.postData.emerTypeName;
// for (let index = 0; index < this.data.TypeData.length; index++) {
// if (this.data.TypeData[index].emerTypeName == res.data.emerTypeName) {
@@ -39,6 +42,14 @@ Page({
}
})
},
+ goItem: function (params) {
+ console.log(params,'params==?');
+ this.data.freshIng = true,
+ wx.showLoading({
+ title: '加载中',
+ })
+ this.getEmerEventDetail(params.currentTarget.dataset.item.peopleId);
+ },
/**
* 生命周期函数--监听页面加载
*/
diff --git a/pages/statistic/j-b-x-x/detail/index.wxml b/pages/statistic/j-b-x-x/detail/index.wxml
index 70b57af..f781500 100644
--- a/pages/statistic/j-b-x-x/detail/index.wxml
+++ b/pages/statistic/j-b-x-x/detail/index.wxml
@@ -1,72 +1,75 @@
-
-
-
+
+
-
-
+
+
+ 同户主其他人员
+
+
+
+
+ 姓名
+ {{item.name}}
+
+
+ 性别
+ {{item.sex==1?'男':'女'}}
+
+
+ 出生日期
+ {{item.birthday}}
+
+
+
+
+ 家庭住址
+ {{item.nowAddress}}
+
+
+
+ 详情信息>>
+
+
+
\ No newline at end of file
diff --git a/pages/statistic/j-b-x-x/detail/index.wxss b/pages/statistic/j-b-x-x/detail/index.wxss
index 6ccb7fa..a8ce71a 100644
--- a/pages/statistic/j-b-x-x/detail/index.wxss
+++ b/pages/statistic/j-b-x-x/detail/index.wxss
@@ -1,113 +1,143 @@
-/* pages/msg/push/index.wxss */
-scroll-view {
+.content {
+ display: flex;
+ flex-direction: column;
+}
+
+
+.line {
+ width: 1rpx;
+ height: 80%;
background-color: #f5f5f5;
- box-sizing: border-box;
}
-.filter {
- margin: 0 10rpx;
- height: 80rpx;
- display: flex;
- flex-direction: row;
- background-color: white;
- border-radius: 10rpx;
+.in-bg {
+ margin: auto;
+ background: #ffffff;
+ border-radius: 12rpx;
+ height: 76rpx;
+ width: 92%;
+ margin-top: 24rpx;
+ padding: 0 20rpx;
}
-.filter picker {
- flex: 1;
+.in-bg input {
+ width: 100%;
height: 100%;
- display: flex;
- align-items: center;
+}
+
+.in-bg image {
+ width: 40rpx;
+ height: 35rpx;
+ margin-right: 20rpx;
+}
+
+.in-bg .lab {
+ margin-left: 20rpx;
+ width: 230rpx;
+ font-size: 28rpx;
+ color: #333333;
}
.item {
- background-color: #ffffff;
- margin: 32rpx 20rpx 20rpx 20rpx;
- padding: 20rpx;
+ width: 686rpx;
+ /* height: 296rpx; */
+ background-color: #FFFFFF;
+ margin: 32rpx auto;
+ border-radius: 16rpx;
+ padding: 32rpx;
position: relative;
- border-radius: 10rpx;
- z-index: 2;
}
-.item .header {
- margin-top: 16rpx;
+.item_top {
+ display: flex;
+ border-bottom: 1rpx dashed #f5f5f5;
+ padding-bottom: 24rpx;
}
-.item .header .single {
- width: 8rpx;
- height: 36rpx;
- background: #4882EE;
- border-radius: 4rpx;
- margin-right: 10rpx;
+.item_cent {
+ border-bottom: 1rpx dashed #f5f5f5;
+ padding: 22rpx 0rpx;
+ display: flex;
+ justify-content: space-between;
}
-.item .header .title {
- font-size: 30rpx;
- font-weight: bold;
- color: #222222;
+.item_bot {
+ padding-top: 24rpx;
}
-.item .put {
- width: 100%;
- background: #F5F7FC;
- border-radius: 12rpx;
- min-height: 72rpx;
- padding: 15rpx;
- margin-top: 16rpx;
- color: #333333;
+.item>view>view>view:nth-child(1) {
+ font-family: PingFang SC, PingFang SC;
+ font-weight: 500;
font-size: 28rpx;
+ color: #808080;
}
-.grid {
- margin-top: 20rpx;
- display: grid;
- grid-gap: 20rpx 20rpx;
- grid-template-columns: calc((100vw - 140rpx)/3) auto auto;
+.item>view>view>view:nth-child(2) {
+ font-family: PingFang SC, PingFang SC;
+ font-weight: 500;
+ font-size: 32rpx;
+ color: #333333;
}
-.grid .img {
- width: calc((100vw - 140rpx)/3);
- height: calc((100vw - 140rpx)/3);
- background-color: #f5f5f5;
- border-radius: 10rpx;
+.item_name {
+ width: 210rpx;
}
-.grid .del {
+.item_sex {
+ width: 110rpx;
+}
+
+.item_birthday {
+ width: 200rpx;
+}
+
+.item_address {
+ width: 100%;
+}
+
+.item_details {
+ width: 180rpx;
+ height: 48rpx;
+ background-color: #3587FB;
+ border-radius: 0rpx 16rpx 0rpx 16rpx;
position: absolute;
- bottom: 0;
- left: 0;
- z-index: 1;
- font-size: 40rpx;
+ top: 0rpx;
+ right: 0rpx;
+ text-align: center;
+ line-height: 48rpx;
+ font-family: PingFang SC, PingFang SC;
+ font-weight: 400;
+ font-size: 26rpx;
+ color: #FFFFFF;
}
-.option {
- position: fixed;
- bottom: calc(constant(safe-area-inset-bottom) + 30rpx);
- bottom: calc(env(safe-area-inset-bottom) + 30rpx);
- left: 0;
- right: 0;
- margin-top: 30rpx;
- padding: 16rpx 32rpx;
- background: #FFFFFF;
- box-shadow: 0rpx 0rpx 12rpx 2rpx #DDECF3;
- z-index: 10;
+.item_cent>view:nth-child(1) {
+ font-family: PingFang SC, PingFang SC;
+ font-weight: 500;
+ font-size: 28rpx;
+ color: #808080;
}
-.option .btn {
- padding: 14rpx;
+.item_cent>view:nth-child(2) {
+ font-family: PingFang SC, PingFang SC;
+ font-weight: 500;
+ font-size: 32rpx;
+ color: #333333;
+}
+.br{
+ width: 92%;
+ margin: auto;
display: flex;
align-items: center;
- justify-content: center;
- background: #409CFF;
- color: #FFFFFF;
- border-radius: 12rpx;
+font-family: PingFang SC, PingFang SC;
+font-weight: bold;
+font-size: 36rpx;
+color: #333333;
}
-
-.option .btn:active {
- opacity: 0.8;
-}
-
-.space {
- height: calc(constant(safe-area-inset-bottom) + 150rpx);
- height: calc(env(safe-area-inset-bottom) + 150rpx);
+.br>view{
+ width: 4rpx;
+ height: 36rpx;
+ background-color: #3587fb;
+ margin-right: 8rpx;
+ border-radius: 4rpx 4rpx 4rpx 4rpx;
}
\ No newline at end of file
diff --git a/pages/statistic/j-b-x-x/index/index.js b/pages/statistic/j-b-x-x/index/index.js
index b72964c..5d87ff6 100644
--- a/pages/statistic/j-b-x-x/index/index.js
+++ b/pages/statistic/j-b-x-x/index/index.js
@@ -20,11 +20,12 @@ Page({
TypeData: [],
showTypePop: false,
postData:{
- orgcode:''
+ orgcode:'',
+ areaPathName:''
},
typeId:'',
- //树结构
+ //筛选树结构
areaCode:'',
areaPathName:'',
unitTreepros: {
@@ -32,43 +33,23 @@ Page({
val: 'orgcode'
},
unitTreelist: [],
-
-
- // 地区数据
- areamultiIndex: [0, 0, 0],
- areamultiIds: [],
- areanewArr: [],
- area:[],
-
- // value:'',
- // tree: [
- // {
- // id: 1,
- // name: '001',
- // open: true,
- // children: [{
- // id: 2,
- // name: '001-01',
- // children: [{
- // id: 3,
- // name: '001-01-01',
- // children: []
- // }]
- // }]
- // }
- // ]
},
/**
* 切换tab
*/
changeItem: function (params) {
- this.data.currentIndex = params.currentTarget.dataset.index;
- this.data.page = 1;
- this.data.list = [];
- this.setData(this.data);
- this.data.typeId = params.currentTarget.dataset.item.typeId;
- this.getList(params.currentTarget.dataset.item.typeId);
+ console.log(params,'切换tabparams====>');
+ //
+ wx.navigateTo({
+ url: `/pages/statistic/j-b-x-x/personnel/index?typeId=${params.currentTarget.dataset.item.typeId}&typeName=${params.currentTarget.dataset.item.typeName}&orgcode=${this.data.postData.orgcode}&areaPathName=${this.data.postData.areaPathName}`,
+ })
+ // this.data.currentIndex = params.currentTarget.dataset.index;
+ // this.data.page = 1;
+ // this.data.list = [];
+ // this.setData(this.data);
+ // this.data.typeId = params.currentTarget.dataset.item.typeId;
+ // this.getList(params.currentTarget.dataset.item.typeId);
},
handleselectunit(e) {
@@ -76,13 +57,14 @@ Page({
this.data.page = 1;
this.data.list = [];
let postData = this.data.postData; // 获取当前的 postData 对象
+ console.log(postData,'postData==>');
postData.orgcode = e.detail.item.orgcode;
postData.areaPathName = e.detail.item.orgname;
this.setData({
postData: postData,
showTypePop:false
}); // 设置更新后的 postData 对象
- this.getList(this.data.typeId);
+ this.getType();
},
/**
* 查看详情
@@ -112,7 +94,6 @@ Page({
this.data.postData.orgcode = this.data.TypeData[index].orgcode;
this.data.showTypePop = false;
this.setData(this.data);
- this.getList(this.data.typeId);
},
/**
* 获取地区
@@ -129,38 +110,18 @@ Page({
}
})
},
- // /**
- // * 开始时间
- // */
- // startTimeChange: function (e) {
- // this.data.startTime = e.detail.value;
- // this.timeGetList();
- // },
- // /**
- // * 开始时间
- // */
- // endTimeChange: function (e) {
- // this.data.endTime = e.detail.value;
- // this.timeGetList();
- // },
- // //时间请求
- // timeGetList: function () {
- // this.data.page = 1;
- // this.data.currentIndex = 0;
- // this.data.list = [];
- // this.setData(this.data);
- // this.getList(this.data.tab[0].typeId);
- // },
/**
* 获取工作统计类型
*/
getType: function () {
- app.axios("GET", "app", `/people/populationByType`).then(res => {
+ let params = {
+ areaCode:this.data.postData.orgcode
+ }
+ app.axios("GET", "app", `/people/populationByType`,params).then(res => {
if (res.code == 1) {
this.data.tab = res.data;
this.setData(this.data);
this.data.typeId = res.data[0].typeId;
- this.getList(res.data[0].typeId);
}
})
},
@@ -168,156 +129,14 @@ Page({
* 上拉刷新
*/
refresh: function () {
- this.data.page = 1;
- this.data.currentIndex = 0;
- this.data.list = [];
+ this.data.freshIng = false;
this.setData(this.data);
- this.getList(this.data.tab[0].typeId);
},
dropDown: function (params) {
this.data.page = this.data.page+1;
+ this.data.freshIng = false;
this.setData(this.data);
- this.getList(this.data.tab[this.data.currentIndex].typeId);
},
- /**
- * 获取工作统计每项数据列表
- */
- getList: function (id) {
- let params = {
- limit:this.data.pageSize,
- page:this.data.page,
- // endTime:this.data.endTime,
- // startTime:this.data.startTime,
- typeId:id,
- // userId:this.data.userInfo.userId,
- condition:this.data.search,
- };
-
- if (this.data.postData.orgcode) {
- params.orgCode = this.data.postData.orgcode
- }
- console.log(params,'params==>');
- app.axios("GET", "app", `/people/peopleInfoByType`, params).then(res => {
- if (res.code == 1) {
- this.setData({
- list:[...this.data.list,...res.data.list],
- freshIng:false,
- });
- }
- })
- },
-
-
-
-
-
-
- // 地区获取
-// getAreaTree: function () {
-// app.axios("GET", "common", "/sysorg/areaTree").then(res => {
-// if (res.code == 1) {
-// this.data.areamultiArray = res.data
-// this.setData(this.data);
-// let state = {
-// arr: [],
-// arr1: [],
-// arr2: [],
-// arr3: [],
-// areamultiIds: []
-// }
-// this.data.areamultiArray.map((v, vk) => {
-// state.arr1.push(v.orgname);
-// if (this.data.areamultiIndex[0] === vk) {
-// state.areamultiIds[0] = v;
-// }
-// if (state.arr2.length <= 0) {
-// v.children.map((c, ck) => {
-// state.arr2.push(c.orgname);
-// if (this.data.areamultiIndex[1] === ck) {
-// state.areamultiIds[1] = c;
-// }
-// if (state.arr3.length <= 0) {
-// c.children.map((t, tk) => {
-// state.arr3.push(t.orgname);
-// if (this.data.areamultiIndex[2] === tk) {
-// state.areamultiIds[2] = t;
-// }
-// });
-// }
-// });
-// }
-// });
-// state.arr[0] = state.arr1;
-// state.arr[1] = state.arr2;
-// state.arr[2] = state.arr3;
-// this.setData({
-// areanewArr: state.arr,
-// areamultiIds: state.areamultiIds,
-// });
-// }
-// })
-// },
- // 级联选择地区
- areabindMultiPickerChange(e) {
- console.log(this.data.areamultiIds,'级联选择地区==>');
- this.setData({
- area: e.detail.value,
- areatate:true
- });
- },
- areabindMultiPickerColumnChange(e) {
- let data = {
- areanewArr: this.data.areanewArr,
- areamultiIndex: this.data.areamultiIndex,
- areamultiIds: this.data.areamultiIds,
- };
- data.areamultiIndex[e.detail.column] = e.detail.value;
-
- let searchColumn = () => {
- let arr1 = [];
- let arr2 = [];
- this.data.areamultiArray.map((v, vk) => {
- if (data.areamultiIndex[0] === vk) {
- data.areamultiIds[0] = {
- ...v,
- };
- v.children.map((c, ck) => {
- arr1.push(c.orgname);
- if (data.areamultiIndex[1] === ck) {
- data.areamultiIds[1] = {
- ...c,
- };
- c.children.map((t, vt) => {
- arr2.push(t.orgname);
- if (data.areamultiIndex[2] === vt) {
- data.areamultiIds[2] = {
- ...t,
- };
- }
- });
- }
- });
- }
- });
- data.areanewArr[1] = arr1;
- data.areanewArr[2] = arr2;
- };
- switch (e.detail.column) {
- case 0:
- // 每次切换还原初始值
- data.areamultiIndex[1] = 0;
- data.areamultiIndex[2] = 0;
- // 执行函数处理
- searchColumn();
- break;
- case 1:
- data.areamultiIndex[2] = 0;
- searchColumn();
- break;
- }
- this.setData(data);
- },
-
/**
* 生命周期函数--监听页面加载
*/
diff --git a/pages/statistic/j-b-x-x/index/index.wxml b/pages/statistic/j-b-x-x/index/index.wxml
index db85261..25fb673 100644
--- a/pages/statistic/j-b-x-x/index/index.wxml
+++ b/pages/statistic/j-b-x-x/index/index.wxml
@@ -1,71 +1,17 @@
-
-
+
+ 所属社区
+ {{ postData.areaPathName }}
+
-
-
-
-
+
+
{{item.typeName}}
{{item.typeNum}}
人
-
-
-
-
-
-
-
- 所属社区
-
- {{ postData.areaPathName }}
-
-
-
-
-
-
-
-
-
- 姓名：
- {{item.name}}
-
-
- 性别：{{item.sex==1?"男":"女"}}
-
-
-
- 出生日期：{{item.birthday}}
-
-
-
- 家庭住址：
- {{item.domicileAddress}}
-
-
+
@@ -80,7 +26,7 @@
-
+
-
+
\ No newline at end of file
diff --git a/pages/statistic/j-b-x-x/index/index.wxss b/pages/statistic/j-b-x-x/index/index.wxss
index 4640e0c..7214693 100644
--- a/pages/statistic/j-b-x-x/index/index.wxss
+++ b/pages/statistic/j-b-x-x/index/index.wxss
@@ -3,8 +3,9 @@
display: flex;
flex-direction: column;
background-color: white;
- margin: 10rpx;
- border-right: 10rpx;
+ margin: 30rpx auto;
+ width: 92%;
+ border-radius: 20rpx;
}
.table .tab-item {
@@ -12,26 +13,26 @@
flex-direction: row;
align-items: center;
width: 100%;
- padding: 10rpx;
- border-radius: 10rpx;
- border-bottom: 1rpx solid #f5f5f5;
+ padding: 20rpx;
+ border-bottom: 1rpx dashed #f5f5f5;
}
-.table .tab-item-checked {
+/* .table .tab-item-checked {
background-color: rgba(0, 0, 0, 0.1);
-}
+} */
.table .tab-item .lab {
font-size: 30rpx;
width: 30vw;
- text-align: center;
- border-right: 1rpx solid #f5f5f5;
+ margin-left: 10rpx;
+ /* text-align: center; */
+ /* border-right: 1rpx solid #f5f5f5; */
}
.table .tab-item .val {
font-size: 35rpx;
font-weight: bold;
- padding-left: 10vw;
+ padding-left: 40rpx;
padding-right: 10rpx;
}
@@ -44,85 +45,6 @@
flex-direction: column;
}
-.content .search {
- background-color: white;
- margin: 10rpx;
- height: 80rpx;
- border-radius: 10rpx;
- padding: 0 20rpx;
- font-size: 28rpx;
- position: sticky;
- /* top: 90rpx; */
- border-bottom: 1rpx solid #f5f5f5;
-}
-
-.content .filter {
- margin: 0 10rpx;
- width: calc(100vw - 20rpx);
- height: 80rpx;
- display: flex;
- flex-direction: row;
- background-color: white;
- border-radius: 10rpx;
- align-items: center;
- position: sticky;
- top: 0;
- border-bottom: 1rpx solid #f5f5f5;
-}
-
-.content .filter picker {
- flex: 1;
- display: flex;
- align-items: center;
- justify-content: center;
- font-size: 30rpx;
-}
-
-.content .item {
- background-color: #ffffff;
- padding: 32rpx 20rpx 20rpx 20rpx;
- box-shadow: 0px 0px 6px 1px #DDECF3;
- margin: 16rpx 16rpx 0 16rpx;
- border-radius: 10rpx;
- font-size: 32rpx;
- color: #222222;
-}
-
-.content .item .single::before {
- display: inline-block;
- content: '';
- width: 20rpx;
- height: 20rpx;
- margin-right: 10rpx;
- border-radius: 50%;
- background-color: var(--blue);
-}
-
-.content .item .child:not(:last-child) {
- margin-bottom: 40rpx;
-}
-
-.content .item .lab {
- margin-left: 16rpx;
-}
-
-.content .item .val {
- margin-left: 16rpx;
- color: #000000;
-}
-
-.content .item .age {
- margin-left: 100rpx;
-}
-
-.content .item .phone {
- color: var(--blue);
- font-weight: bold;
-}
-
-.content .item .address {
- color: #666666;
-}
.line {
width: 1rpx;
@@ -133,10 +55,10 @@
.in-bg {
margin: auto;
background: #ffffff;
- border-radius: 90rpx;
- height: 90rpx;
- width: 95%;
- margin-top: 5rpx;
+ border-radius: 12rpx;
+ height: 76rpx;
+ width: 92%;
+ margin-top: 24rpx;
padding: 0 20rpx;
}
diff --git a/pages/statistic/j-b-x-x/personnel/index.js b/pages/statistic/j-b-x-x/personnel/index.js
new file mode 100644
index 0000000..44392e0
--- /dev/null
+++ b/pages/statistic/j-b-x-x/personnel/index.js
@@ -0,0 +1,183 @@
+const app = getApp();
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ topBarH: app.globalData.CustomBar,
+ title: '',
+ typeId: '',
+ currentIndex: 0,
+ tab: [],
+ list: [],
+ page: 1,
+ pageSize: 10,
+ userInfo: {},
+ search: "",
+ TypeData: [],
+ showTypePop: false,
+ postData: {
+ orgcode: '',
+ areaPathName:''
+ },
+ typeId: '',
+
+ //筛选树结构
+ areaCode: '',
+ areaPathName: '',
+ unitTreepros: {
+ key: 'orgname',
+ val: 'orgcode'
+ },
+ unitTreelist: [],
+ },
+
+
+
+ /**
+ * 显示/关闭弹窗筛选
+ */
+ popModal: function (params) {
+ const type = params.currentTarget.dataset.type;
+ this.data[type] = !this.data[type];
+ this.setData(this.data)
+ },
+ handleselectunit(e) {
+ // e.detail 选中的id数组
+ this.data.page = 1;
+ this.data.list = [];
+ let postData = this.data.postData; // 获取当前的 postData 对象
+ postData.orgcode = e.detail.item.orgcode;
+ postData.areaPathName = e.detail.item.orgname;
+ this.setData({
+ postData: postData,
+ showTypePop: false
+ }); // 设置更新后的 postData 对象
+ this.getList();
+ },
+ /**
+ * 获取地区
+ */
+ getAreaTree: function () {
+ app.axios("GET", "common", "/sysorg/areaTree", {
+ classify: 2
+ }).then(res => {
+ if (res.code == 1) {
+ console.log(res, 'res===>');
+ this.data.TypeData = res.data[0].children;
+ this.data.unitTreelist = res.data;
+ this.setData(this.data)
+ }
+ })
+ },
+ /**
+ * 上拉刷新
+ */
+ refresh: function () {
+ this.data.page = 1;
+ this.data.list = [];
+ this.setData(this.data);
+ this.getList();
+ },
+ dropDown: function (params) {
+ this.data.page = this.data.page + 1;
+ this.setData(this.data);
+ this.getList();
+ },
+ /**
+ * 获取工作统计每项数据列表
+ */
+ getList: function (id) {
+ let params = {
+ limit: this.data.pageSize,
+ page: this.data.page,
+ typeId: this.data.typeId,
+ condition: this.data.search,
+ };
+
+ if (this.data.postData.orgcode) {
+ params.orgCode = this.data.postData.orgcode
+ }
+ console.log(params, 'params==>');
+ app.axios("GET", "app", `/people/peopleInfoByType`, params).then(res => {
+ console.log(res.data, 'res.data=====>');
+ if (res.code == 1) {
+ this.setData({
+ list: [...this.data.list, ...res.data.list],
+ freshIng: false,
+ });
+ }
+ })
+ },
+ goItem:function (params) {
+ wx.navigateTo({
+ url: `/pages/statistic/j-b-x-x/detail/index?peopleId=${params.currentTarget.dataset.item.peopleId}`,
+ })
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+ console.log(options, 'options==>');
+ this.data.postData.orgcode = options.orgcode;
+ this.data.postData.areaPathName = options.areaPathName;
+ this.data.title = options.typeName;
+ this.data.typeId = options.typeId;
+ this.data.freshIng = true;
+ this.data.userInfo = app.globalData.userInfo;
+ this.setData(this.data);
+ this.getList();
+ this.getAreaTree();
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/pages/statistic/j-b-x-x/personnel/index.json b/pages/statistic/j-b-x-x/personnel/index.json
new file mode 100644
index 0000000..02e59f1
--- /dev/null
+++ b/pages/statistic/j-b-x-x/personnel/index.json
@@ -0,0 +1,6 @@
+{
+ "usingComponents": {
+ "tree-node":"/components/tree-node/index"
+ },
+ "navigationStyle": "custom"
+}
\ No newline at end of file
diff --git a/pages/statistic/j-b-x-x/personnel/index.wxml b/pages/statistic/j-b-x-x/personnel/index.wxml
new file mode 100644
index 0000000..8cd96c1
--- /dev/null
+++ b/pages/statistic/j-b-x-x/personnel/index.wxml
@@ -0,0 +1,55 @@
+
+
+
+ 所属社区
+ {{ postData.areaPathName }}
+
+
+
+
+ 姓名
+ {{item.name}}
+
+
+ 性别
+ {{item.sex==1?'男':'女'}}
+
+
+ 出生日期
+ {{item.birthday}}
+
+
+
+
+ 家庭住址
+ 家庭住址家庭住址家庭住址家庭住址家庭住址
+
+
+
+ 详情信息>>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/statistic/j-b-x-x/personnel/index.wxss b/pages/statistic/j-b-x-x/personnel/index.wxss
new file mode 100644
index 0000000..49d203f
--- /dev/null
+++ b/pages/statistic/j-b-x-x/personnel/index.wxss
@@ -0,0 +1,105 @@
+.content {
+ display: flex;
+ flex-direction: column;
+}
+
+
+.line {
+ width: 1rpx;
+ height: 80%;
+ background-color: #f5f5f5;
+}
+
+.in-bg {
+ margin: auto;
+ background: #ffffff;
+ border-radius: 12rpx;
+ height: 76rpx;
+ width: 92%;
+ margin-top: 24rpx;
+ padding: 0 20rpx;
+}
+
+.in-bg input {
+ width: 100%;
+ height: 100%;
+}
+
+.in-bg image {
+ width: 40rpx;
+ height: 35rpx;
+ margin-right: 20rpx;
+}
+
+.in-bg .lab {
+ margin-left: 20rpx;
+ width: 230rpx;
+ font-size: 28rpx;
+ color: #333333;
+}
+
+.item {
+ width: 686rpx;
+ /* height: 296rpx; */
+ background-color: #FFFFFF;
+ margin: 32rpx auto;
+ border-radius: 16rpx;
+ padding: 32rpx;
+ position: relative;
+}
+
+.item_top {
+ display: flex;
+ border-bottom: 1rpx dashed #f5f5f5;
+ padding-bottom: 24rpx;
+}
+
+.item_bot {
+ padding-top: 24rpx;
+}
+
+.item>view>view>view:nth-child(1) {
+ font-family: PingFang SC, PingFang SC;
+ font-weight: 500;
+ font-size: 28rpx;
+ color: #808080;
+}
+
+.item>view>view>view:nth-child(2) {
+ font-family: PingFang SC, PingFang SC;
+ font-weight: 500;
+ font-size: 32rpx;
+ color: #333333;
+}
+
+.item_name {
+ width: 210rpx;
+}
+
+.item_sex {
+ width: 110rpx;
+}
+
+.item_birthday {
+ width: 200rpx;
+}
+
+.item_address {
+ width: 100%;
+}
+
+.item_details {
+ width: 180rpx;
+ height: 48rpx;
+ background-color: #3587FB;
+ border-radius: 0rpx 16rpx 0rpx 16rpx;
+ position: absolute;
+ top: 0rpx;
+ right: 0rpx;
+ text-align: center;
+ line-height: 48rpx;
+ font-family: PingFang SC, PingFang SC;
+ font-weight: 400;
+ font-size: 26rpx;
+ color: #FFFFFF;
+}
\ No newline at end of file
diff --git a/pages/work/f-b-g-z/index/index.js b/pages/work/f-b-g-z/index/index.js
new file mode 100644
index 0000000..57dbc9b
--- /dev/null
+++ b/pages/work/f-b-g-z/index/index.js
@@ -0,0 +1,66 @@
+// pages/work/f-b-g-z/index/index.js
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/pages/work/f-b-g-z/index/index.json b/pages/work/f-b-g-z/index/index.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/work/f-b-g-z/index/index.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/work/f-b-g-z/index/index.wxml b/pages/work/f-b-g-z/index/index.wxml
new file mode 100644
index 0000000..5ea395f
--- /dev/null
+++ b/pages/work/f-b-g-z/index/index.wxml
@@ -0,0 +1,2 @@
+
+pages/work/f-b-g-z/index/index.wxml
\ No newline at end of file
diff --git a/pages/work/f-b-g-z/index/index.wxss b/pages/work/f-b-g-z/index/index.wxss
new file mode 100644
index 0000000..b5f3694
--- /dev/null
+++ b/pages/work/f-b-g-z/index/index.wxss
@@ -0,0 +1 @@
+/* pages/work/f-b-g-z/index/index.wxss */
\ No newline at end of file