elink-star
/
epmet-work-mp
19
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

首页基本实现，未采集房屋信息和人防信息页面基本完成

work_tab_bar
是小王呀\24601 2 years ago
parent
b530df68fb
commit
7eb1acb129
13 changed files with 743 additions and 23 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      app.json
  2. 49
      pages/index/index.js
  3. 18
      pages/index/index.wxml
  4. 17
      pages/index/index.wxss
  5. 5
      pages/work/work.js
  6. 81
      subpages/nohouse/pages/nohouse/nohouse.js
  7. 4
      subpages/nohouse/pages/nohouse/nohouse.json
  8. 21
      subpages/nohouse/pages/nohouse/nohouse.wxml
  9. 86
      subpages/nohouse/pages/nohouse/nohouse.wxss
  10. 66
      subpages/resnoinformation/pages/resnoinformation/resnoinformation.js
  11. 4
      subpages/resnoinformation/pages/resnoinformation/resnoinformation.json
  12. 54
      subpages/resnoinformation/pages/resnoinformation/resnoinformation.wxml
  13. 343
      subpages/resnoinformation/pages/resnoinformation/resnoinformation.wxss

18
app.json
View File

@ -22,7 +22,21 @@
"pages/addhouse/addhouse"
]
},
{
"root": "subpages/nohouse",
"name": "nohouse",
"pages": [
"pages/nohouse/nohouse"
]
},
{
"root": "subpages/resnoinformation",
"name": "resnoinformation",
"pages": [
"pages/resnoinformation/resnoinformation"
]
},
{
"root": "subpages/searchResult",
@ -155,6 +169,8 @@
"iconPath": "images/home/mine.png",
"selectedIconPath": "images/home/mineSelected.png"
}
]
},
"permission": {

49
pages/index/index.js
View File

@ -6,6 +6,7 @@ import config from "../../utils/config"
Page({
data: {
topDisplay:false,
selectList:['全部消息','居民信息采集','房屋信息采集','社区满意度自查'],
selectValue:0,
pageSize:5,
@ -60,28 +61,33 @@ onScrollToLower(e){
const parm = {
type:this.data.selectValue == 0? null :this.data.selectValue - 1,
limit:this.data.pageSize,
page:this.data.pageNo
page:this.data.pageNo,
}
if(!parm.type) delete parm.type
if(this.data.tableData.length !==0){
return
}
getIntelligentMessage(parm).then(res=>{
console.log('1234',parm)
res.data.list = res.data.list.map(item => {
if (item.createdByName && item.createdByName.length >= 3) {
item.createdByName = item.createdByName.slice(1,3);
}
return item;
});
// res.data.list = res.data.list.map(item => {
// if (item.createdByName && item.createdByName.length >= 3) {
// item.createdByName = item.createdByName.slice(1,3);
// }
// return item;
// });
this.setData({
loadMoreType: res.data.list.length === this.data.pageSize ? 'more' : 'none',
tableData: this.data.tableData.concat(res.data.list),
})
if (this.data.tableData.length == 0) {
if (this.data.tableData.length == 0) {
this.setData({
loadMoreVisible: false,
nodata: true
nodata: true,
})
}
}
}).catch(err=>{
console.log(err);
this.setData({
@ -89,6 +95,7 @@ onScrollToLower(e){
nodata: true,
})
})
},
getToken(){
const parm = {
@ -195,4 +202,24 @@ onScrollToLower(e){
console.log(err);
})
},
onAddResident(){
wx.navigateTo({
url: '../../subpages/addResi/pages/addResi/addResi',
})
},
onAddHouseLL(){
wx.navigateTo({
url: '../../subpages/addhouse/pages/addhouse/addhouse',
})
},
noHouse(){
wx.navigateTo({
url: '../../subpages/nohouse/pages/nohouse/nohouse',
})
},
onresno(){
wx.navigateTo({
url: '../../subpages/resnoinformation/pages/resnoinformation/resnoinformation',
})
}
})

18
pages/index/index.wxml
View File

@ -14,7 +14,7 @@
</view>
<view class="group_1">
<view class="section_1">
<view class="image-text_1">
<view class="image-text_1" bind:tap="onAddHouseLL">
<view class="text-group_1">
<text lines="1" class="text_1">房屋登记</text>
<text lines="1" class="text_2">登记房屋数据</text>
@ -23,7 +23,7 @@
</view>
</view>
<view class="section_2">
<view class="image-text_2">
<view class="image-text_2" bind:tap="onAddResident">
<view class="text-group_2">
<text lines="1" class="text_3">居民登记</text>
<text lines="1" class="text_4">登记居民数据</text>
@ -33,7 +33,7 @@
</view>
<view class="section_3">
<view class="image-text_3">
<view class="text-group_3">
<view class="text-group_3" bind:tap="toDemandCheck">
<text lines="1" class="text_5">诉求上报</text>
<text lines="1" class="text_6">登记居民诉求</text>
</view>
@ -51,7 +51,7 @@
<text lines="1" class="text_8">{{collectedHouseCount?collectedHouseCount:'--'}}</text>
<text lines="1" class="text_9">录入房屋</text>
</view>
<view class="text-group_5">
<view class="text-group_5" bind:tap="noHouse">
<text lines="1" class="text_10">{{pendingHouseCount?pendingHouseCount:'--'}}</text>
<text lines="1" class="text_11">未采集居民房屋</text>
</view>
@ -61,7 +61,7 @@
<text lines="1" class="text_12">{{collectedPopulationCount?collectedPopulationCount:'--'}}</text>
<text lines="1" class="text_13">录入居民</text>
</view>
<view class="text-group_7">
<view class="text-group_7" bind:tap="onresno">
<text lines="1" class="text_14">{{pendingPopulationCount?pendingPopulationCount:'--'}}</text>
<text lines="1" class="text_15">居民信息不完整</text>
</view>
@ -75,8 +75,12 @@
</view>
<view class="card">
<view class="Information" wx:for="{{tableData}}" wx:key="index" data-item="{{item}}" data-index="{{index}}" bind:tap="toDetail">
<view class="Information_one">
<text class="Information_test">{{item.content}}</text>
<view class="Information_one">
<view class="one_one">
<image src="../../images/index/Topping.png" class="Information_image" wx:if="{{index === 0}}"></image>
<text class="Information_test">{{item.content}}</text>
</view>
<text class="Information_test2">{{item.readFlag != '1'?'未读':'已读'}}</text>
</view>
<view class="Information_two">

17
pages/index/index.wxss
View File

@ -183,7 +183,7 @@
display: flex;
flex-direction: column;
background-color: #F7F7F7;
z-index: -9999;
/* z-index: -9999; */
}
.header {
display: flex;
@ -943,7 +943,7 @@ white-space: nowrap;
}
.Information_test2{
width: 60rpx;
height: 25rpx;
height: auto;
font-family: PingFang SC;
font-weight: 500;
font-size: 26rpx;
@ -956,7 +956,7 @@ white-space: nowrap;
}
.Information_test3{
width: 169rpx;
height: 27rpx;
height: auto;
font-family: PingFang SC;
font-weight: 500;
font-size: 28rpx;
@ -965,10 +965,19 @@ line-height: 40rpx;
}
.Information_test4{
width: 228rpx;
height: 20rpx;
height: auto;
font-family: PingFang SC;
font-weight: 500;
font-size: 26rpx;
color: #C1C1C1;
line-height: 40rpx;
}
.one_one{
display: flex;
flex-direction: row;
}
.Information_image{
width: 30rpx;
height: 30rpx;
margin-right: 10rpx;
}

5
pages/work/work.js
View File

@ -267,6 +267,11 @@ Page({
url: '/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck',
})
},
toDemandCheck(){
wx.navigateTo({
url: '/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck',
})
},
toOCRCard(){
wx.navigateTo({
url: '/subpages/OCRCard/pages/index/index',

81
subpages/nohouse/pages/nohouse/nohouse.js
View File

@ -0,0 +1,81 @@
// subpages/nohouse/pages/nohouse/nohouse.js
Page({
/**
* 页面的初始数据
*/
visible: false,
data: {
selectedItem:'',
itemList : [
{ value: '1', label: '选项一' },
{ value: '2', label: '选项二' },
{ value: '3', label: '选项三' }
],
},
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage() {
},
handelShow(){
this.setData({
visible:true
})
},
bindPickerChange(){
}
})

4
subpages/nohouse/pages/nohouse/nohouse.json
View File

@ -0,0 +1,4 @@
{
"usingComponents": {},
"navigationBarTitleText": "待采集居民房屋列表"
}

21
subpages/nohouse/pages/nohouse/nohouse.wxml
View File

@ -0,0 +1,21 @@
<!--subpages/nohouse/pages/nohouse/nohouse.wxml-->
<view class="header">
<view class="input" >
<picker range="{{serviceOptions}}" range-key="label" >
<view class="items">
<view class=" {{serviceIndex >= 0 ? '' : 'gray'}}">
{{serviceIndex >= 0 ? serviceOptions[serviceIndex].label : '按管辖范围'}}
</view>
</view>
</picker>
</view>
<view class="button">
<test class="button_text">筛选</test></view>
</view>
<view class="content">
<view class="form" wx:for="{{houseData}}" wx:key="index" data-item="{{item}}" data-index="{{index}}" bind:tap="toDetail" >
<test class="from_test1">123</test>
<test class="from_test2">></test>
</view>
</view>

86
subpages/nohouse/pages/nohouse/nohouse.wxss
View File

@ -0,0 +1,86 @@
/* subpages/nohouse/pages/nohouse/nohouse.wxss */
page{
width: 100%;
min-height: 100vh;
overflow-y: auto;
overflow-x: hidden;
background: #F7F7F7;
}
.header{
display: flex;
flex-direction: row;
width: 100%;
height: 90rpx;
background-color: #FFFFFF;
}
.input{
background-color: rgba(193,193,193,0.160000);
border-radius: 28rpx;
width: 559rpx;
height: 57rpx;
border: 1px solid rgba(219,219,219,1);
flex-direction: row;
display: flex;
margin: 17rpx 0 0 19rpx;
}
.gray{
color: #C1C1C1;
padding-left: 30rpx;
}
.button{
width: 120rpx;
height: 56rpx;
background: #3974F6;
border-radius: 28rpx;
margin: 17rpx 0 0 19rpx;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
}
.button_text{
font-family: PingFang SC;
font-weight: 500;
font-size: 28rpx;
color: #FFFFFF;
line-height: 46rpx;
}
.content{
display: flex;
overflow: hidden;
height: 1000rpx;
background: #FFFFFF;
margin: 20rpx 20rpx 197rpx 20rpx;
flex-direction: column;
border-radius: 30rpx;
}
.form{
display: flex;
flex-direction: row;
justify-content: space-between;
padding: 30rpx;
border-bottom: 2rpx solid #EAEAEA;
}
.from_test1{
display: flex;
overflow-wrap: break-word;
color: rgba(51,51,51,1);
font-size: 32rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
text-align: left;
white-space: nowrap;
line-height: 42rpx;
}
.from_test2{
display: flex;
overflow-wrap: break-word;
color: rgba(51,51,51,1);
font-size: 32rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
text-align: left;
white-space: nowrap;
line-height: 42rpx;
}

66
subpages/resnoinformation/pages/resnoinformation/resnoinformation.js
View File

@ -0,0 +1,66 @@
// subpages/resnoinformation/pages/resnoinformation/resnoinformation.js
Page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage() {
}
})

4
subpages/resnoinformation/pages/resnoinformation/resnoinformation.json
View File

@ -0,0 +1,4 @@
{
"usingComponents": {},
"navigationBarTitleText": "居民信息不完整列表"
}

54
subpages/resnoinformation/pages/resnoinformation/resnoinformation.wxml
View File

@ -0,0 +1,54 @@
<!--subpages/resnoinformation/pages/resnoinformation/resnoinformation.wxml-->
<view class="header">
<view class="card">
<picker range="{{serviceOptions}}" range-key="label" bind:change="getServiceuserList" class="card_one">
<view class="items">
<view class="text1">海伦路街道</view>
</view>
</picker>
<view>
<picker range="{{serviceOptiondList}}" bind:change="serviceOptiondListChange" range-key="label" class="card_two">
<view class="items">
<view class="text2">按照居民分类</view>
</view>
</picker>
</view>
<view class="card_three">
<text class="test3">筛选</text>
</view>
</view>
</view>
<view class="context">
<scroll-view lass="scroll" scroll-y="{{true}}" lower-threshold="{{ lowerThreshold }}" bindscrolltolower="onScrollToLower">
<view class="card_top">
<view class="box_19">
<view class="text-wrapper_10">
<text lines="1" class="text_21">国籍：</text>
<text lines="1" class="text_22">{{item.nationalityName || "--"}}</text>
</view>
<view class="text-wrapper_11">
<text lines="1" class="text_23">民族：</text>
<text lines="1" class="text_24">{{item.nationName || '--'}}</text>
</view>
</view>
<view class="text-wrapper_12">
<text lines="1" class="text_25">电话：</text>
<text lines="1" class="text_26">{{item.mobile}}</text>
</view>
<view class="text-wrapper_13">
<text lines="1" class="text_27">证件号</text>
<text lines="1" class="text_28">：</text>
<text lines="1" class="text_29">{{item.idNum}}</text>
</view>
<view class="text-wrapper_14">
<text lines="1" class="text_30">地址：</text>
<text lines="1" class="text_31">{{item.agencyName || ''}} {{item.homeName || ''}}</text>
</view>
<view class="text-wrapper_15">
<text lines="1" class="text_32">最新更新时间：</text>
<text lines="1" decode="true" class="text_33">{{item.updatedTime|| '--'}}</text>
</view>
</view>
</scroll-view>
</view>

343
subpages/resnoinformation/pages/resnoinformation/resnoinformation.wxss
View File

@ -0,0 +1,343 @@
/* subpages/resnoinformation/pages/resnoinformation/resnoinformation.wxss */
page{
width: 100%;
min-height: 100vh;
overflow-y: auto;
overflow-x: hidden;
background: #F7F7F7;
}
.header{
display: flex;
flex-direction: row;
width: 100%;
height: 90rpx;
background-color: #FFFFFF;
}
.card{
display: flex;
align-items: center;
justify-content: center;
}
.card_one{
display: flex;
align-items: center;
justify-content: center;
background-color: rgba(57,116,246,0.160000);
border-radius: 28rpx;
width: 273rpx;
height: 57rpx;
border: 1px solid rgba(57,116,246,1);
flex-direction: row;
display: flex;
margin: 16rpx 0 0 20rpx;
}
.text1{
overflow-wrap: break-word;
color: rgba(57,116,246,1);
font-size: 30rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
text-align: left;
white-space: nowrap;
line-height: 52rpx;
}
.card_two{
display: flex;
align-items: center;
justify-content: center;
background-color: #F5F5F5;
border-radius: 28rpx;
width: 273rpx;
height: 57rpx;
border: 1px solid #C1C1C1;
flex-direction: row;
display: flex;
margin: 16rpx 0 0 20rpx;
}
.text2{
overflow-wrap: break-word;
color: rgba(193,193,193,1);
font-size: 30rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
text-align: left;
white-space: nowrap;
line-height: 46rpx;
}
.card_three{
background-color: rgba(57,116,246,1.000000);
border-radius: 28rpx;
height: 56rpx;
display: flex;
flex-direction: column;
width: 120rpx;
margin: 18rpx 22rpx 0 28rpx;
align-items: center;
justify-content: center;
}
.test3{
overflow-wrap: break-word;
color: rgba(255,255,255,1);
font-size: 28rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
text-align: left;
white-space: nowrap;
line-height: 46rpx;
}
.context{
width: auto;
height: auto;
display: flex;
flex-direction: column;
background: white;
margin: 20rpx;
}
.
.box_19 {
width: 533rpx;
height: 29rpx;
flex-direction: row;
display: flex;
justify-content: space-between;
margin: 27rpx 0 0 0;
}
.text-wrapper_10 {
width: 146rpx;
height: 29rpx;
overflow-wrap: break-word;
font-size: 0rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
text-align: left;
white-space: nowrap;
line-height: 40rpx;
}
.text_21 {
width: 146rpx;
height: 29rpx;
overflow-wrap: break-word;
color: rgba(153, 153, 153, 1);
font-size: 30rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
text-align: left;
white-space: nowrap;
line-height: 40rpx;
}
.text_22 {
width: 146rpx;
height: 29rpx;
overflow-wrap: break-word;
color: rgba(51, 51, 51, 1);
font-size: 30rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
text-align: left;
white-space: nowrap;
line-height: 40rpx;
}
.text-wrapper_11 {
width: 145rpx;
height: 28rpx;
overflow-wrap: break-word;
font-size: 0rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
text-align: left;
white-space: nowrap;
line-height: 40rpx;
}
.text_23 {
width: 145rpx;
height: 28rpx;
overflow-wrap: break-word;
color: rgba(153, 153, 153, 1);
font-size: 30rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
text-align: left;
white-space: nowrap;
line-height: 40rpx;
}
.text_24 {
width: 145rpx;
height: 28rpx;
overflow-wrap: break-word;
color: rgba(51, 51, 51, 1);
font-size: 30rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
text-align: left;
white-space: nowrap;
line-height: 40rpx;
}
.text-wrapper_12 {
width: 263rpx;
height: 28rpx;
overflow-wrap: break-word;
font-size: 0rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
text-align: left;
white-space: nowrap;
line-height: 40rpx;
margin: 19rpx 0 0 0;
}
.text_25 {
width: 263rpx;
height: 28rpx;
overflow-wrap: break-word;
color: rgba(153, 153, 153, 1);
font-size: 30rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
text-align: left;
white-space: nowrap;
line-height: 40rpx;
}
.text_26 {
width: 263rpx;
height: 28rpx;
overflow-wrap: break-word;
color: rgba(51, 51, 51, 1);
font-size: 30rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
text-align: left;
white-space: nowrap;
line-height: 40rpx;
}
.text-wrapper_13 {
width: 415rpx;
height: 28rpx;
overflow-wrap: break-word;
font-size: 0rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
text-align: left;
white-space: nowrap;
line-height: 40rpx;
margin: 20rpx 0 0 0;
}
.text_27 {
width: 415rpx;
height: 28rpx;
overflow-wrap: break-word;
color: rgba(153, 153, 153, 1);
font-size: 30rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
text-align: left;
white-space: nowrap;
line-height: 40rpx;
}
.text_28 {
width: 415rpx;
height: 28rpx;
overflow-wrap: break-word;
color: rgba(153, 153, 153, 1);
font-size: 30rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
text-align: left;
white-space: nowrap;
line-height: 40rpx;
}
.text_29 {
width: 415rpx;
height: 28rpx;
overflow-wrap: break-word;
color: rgba(51, 51, 51, 1);
font-size: 30rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
text-align: left;
white-space: nowrap;
line-height: 40rpx;
}
.text-wrapper_14 {
width: 639rpx;
height: 28rpx;
overflow-wrap: break-word;
font-size: 0rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
text-align: left;
white-space: nowrap;
line-height: 40rpx;
margin: 20rpx 0 0 0;
}
.text_30 {
width: 639rpx;
height: 28rpx;
overflow-wrap: break-word;
color: rgba(153, 153, 153, 1);
font-size: 30rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
text-align: left;
white-space: nowrap;
line-height: 40rpx;
}
.text_31 {
width: 639rpx;
height: 28rpx;
overflow-wrap: break-word;
color: rgba(51, 51, 51, 1);
font-size: 30rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
text-align: left;
white-space: nowrap;
line-height: 40rpx;
}
.text-wrapper_15 {
width: 537rpx;
height: 28rpx;
overflow-wrap: break-word;
font-size: 0rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
text-align: left;
white-space: nowrap;
line-height: 40rpx;
margin: 20rpx 0 0 0;
}
.text_32 {
width: 537rpx;
height: 28rpx;
overflow-wrap: break-word;
color: rgba(153, 153, 153, 1);
font-size: 30rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
text-align: left;
white-space: nowrap;
line-height: 40rpx;
}
.card_top{
display: flex;
}
Write Preview
Loading…
Cancel
Save