diff --git a/app.js b/app.js index 9600c0d..33f747c 100644 --- a/app.js +++ b/app.js @@ -50,8 +50,8 @@ App({ globalData: { versionCode: 'V1', userInfo: {}, - headerUrl: "http://42.193.40.239:8017/" //线上 - // headerUrl: "http://192.168.110.10:8017/" //线下 + // headerUrl: "http://42.193.40.239:8017/" //线上 + headerUrl: "http://192.168.110.10:8017/" //线下 // headerUrl: "http://192.168.110.186:8017/" // headerUrl: "https://city.sczysoft.com/df/" }, diff --git a/app.json b/app.json index 331b233..0d21c8d 100644 --- a/app.json +++ b/app.json @@ -38,7 +38,9 @@ "pages/work/f-b-g-z/index/index", "pages/work/f-b-g-z/serve/index", "pages/risk-pool/index", - "pages/risk-pool/add-pool/index" + "pages/risk-pool/add-pool/index", + "pages/statistic/j-b-x-x/domicileDetail/index", + "pages/emergency/z-s/index/index" ], "window": { "backgroundTextStyle": "light", diff --git a/images/home/icon_yj_5.png b/images/home/icon_yj_5.png new file mode 100644 index 0000000..f30cce2 Binary files /dev/null and b/images/home/icon_yj_5.png differ diff --git a/pages/emergency/s-b/escalation/index.js b/pages/emergency/s-b/escalation/index.js index 378bc50..da3b1a7 100644 --- a/pages/emergency/s-b/escalation/index.js +++ b/pages/emergency/s-b/escalation/index.js @@ -15,9 +15,9 @@ Page({ showTypePop: false, showAdvicePop: false, TypeData: [], - postData: {}, files: [], userInfo:{}, + othplanList:[], areamultiArray:[], areamultiIndex: [0, 0, 0], @@ -32,6 +32,21 @@ Page({ newArr: [], organization:[], organizationtate : false, + + + areashowTypePop:false, + postData:{ + organization:'', + organizationName:'' + }, + //筛选树结构 + areaCode:'', + areaPathName:'', + unitTreepros: { + key: 'performclassname', + val: 'listperformid' + }, + unitTreelist: [], }, /** @@ -90,7 +105,7 @@ Page({ return } - if (this.data.organizationtate==false) { + if (!this.data.postData.organization) { wx.showToast({ title: '请选择所属组织', icon: 'none' @@ -124,9 +139,12 @@ Page({ emerEventId:this.data.uuid, userId:this.data.userInfo.userId, address:this.data.postData.addressName, + areaCode:'', + organization:'', }; - data.listPerformId = this.data.organization?this.data.multiArray[0].children[0].children[this.data.organization[2]].listperformid:''; + // data.listPerformId = this.data.organization?this.data.multiArray[0].children[0].children[this.data.organization[2]].listperformid:''; data.areaCode = this.data.areamultiArray[0].children[this.data.area[1]].orgcode?this.data.areamultiArray[0].children[this.data.area[1]].orgcode:''; + data.listPerformId=this.data.postData.organization; console.log(data,'data===>'); app.axios("POST", "app", `/emerEvent/saveEmerEvent`,data).then(res => { console.log(res,'res===>'); @@ -291,8 +309,14 @@ Page({ getEmerEventDetail: function (id) { app.axios("GET", "app", `/emerEvent/emerEventDetail/${id}`).then(res => { if (res.code == 1) { + console.log(res.data,'res=====>'); this.data.postData = res.data; this.data.postData.emerTypeName; + this.data.addressName = res.data.address; + this.data.postData.addressName = res.data.address; + // this.data.postData.areaPathName = res.data.performclassname; + this.data.postData.organizationName = res.data.performclassname; + this.data.othplanList = res.data.othplanList; for (let index = 0; index < this.data.TypeData.length; index++) { if (this.data.TypeData[index].emerTypeName == res.data.emerTypeName) { this.data.postData.type = index+1; @@ -536,6 +560,90 @@ toShowAddress() { }, }) }, + /** + * 显示/关闭弹窗筛选 + */ + areapopModal: function (params) { + console.log(params,'params===>'); + const type = params.currentTarget.dataset.type; + this.data[type] = !this.data[type]; + this.setData(this.data) + }, + /** + * 获取地区 + */ + getAreaTreetext: function () { + app.axios("GET", "app", "/Sys/getListperformTree").then(res => { + if (res.code == 1) { + this.data.unitTreelist = res.data; + console.log(res.data,'res====>'); + this.setData(this.data) + } + }) + }, + handleselectunit(e) { + // e.detail 选中的id数组 + this.data.page = 1; + this.data.list = []; + let postData = this.data.postData; // 获取当前的 postData 对象 + console.log(postData,'postData==>'); + postData.organization = e.detail.item.listperformid; + postData.organizationName = e.detail.item.performclassname; + this.setData({ + postData: postData, + areashowTypePop:false + }); // 设置更新后的 postData 对象 + }, + // 应急上报下载文件 + download :function (item) { + console.log(item,'item====>'); + console.log(this.data.baseUrl+item.currentTarget.dataset.item.filePath); + //触发点击事件，使用uni.showLoading()展示交互提示 + wx.showLoading({ + title: '正在下载……' + }); + // 使用wx.downloadFile()开始下载文件 + wx.downloadFile({ + url: this.data.baseUrl+item.currentTarget.dataset.item.filePath, //url:请求的完整地址 + success: function(res) { + wx.hideLoading() //调用结束，隐藏加载框 + const filePath = res.tempFilePath //临时文件路径 (本地路径) + if (res.statusCode == 200) { + //判断后端数据接收成功时提示下载完成 + wx.showToast({ + icon: 'none', + mask: true, + title: '下载完成，正在打开文件...', + duration: 2000, + }); + } + //设置定时器2秒后打开文件 + setTimeout(() => { + //调用wx.openDocument()打开刚刚下载的文件 + wx.openDocument({ + filePath: filePath, //上一步存储的临时文件路径 (本地路径) + fileType: item.type, //要打开的文件类型， + showMenu: true, //是否显示右上角菜单 + //下面的测试用了，写不写无所谓 + success: function(res) { + + }, + complete: function(msg) { + + } + }) + }, 2000) + }, + //文件下载失败，会走这里，具体可以把err打印出来看看有什么错误 + fail: (err) => { + uni.showToast({ + icon: 'none', + mask: true, + title: '文件下载失败', + }); + }, + }) + }, @@ -551,8 +659,8 @@ toShowAddress() { this.getEmerEventType(); this.getAreaTree(); this.getAreaTree1(); + this.getAreaTreetext(); if (options.emerEventId) { - console.log(options.emerEventId,'options.emerEventId===>'); this.getEmerEventDetail(options.emerEventId) } }, diff --git a/pages/emergency/s-b/escalation/index.wxml b/pages/emergency/s-b/escalation/index.wxml index c90ec97..1b280c9 100644 --- a/pages/emergency/s-b/escalation/index.wxml +++ b/pages/emergency/s-b/escalation/index.wxml @@ -2,12 +2,12 @@ - - + + 标题 - + @@ -28,41 +28,33 @@ 事件类型 - - + + 地区 - - - 当前选择：{{areamultiArray[0].children[area[1]].orgname}} - - - - + + + + 所属组织 - - - - - 当前选择：{{multiArray[0].children[0].children[organization[2]].performclassname}} + + 当前选择：{{postData.organizationName}} - - - + 详细地址 - + 地址：{{postData.addressName}} - + @@ -82,6 +74,21 @@ + + + + 预案名称： + {{item.planname}} + + + 预案简介： + {{item.introduction}} + + + 附件下载 + + + @@ -108,4 +115,20 @@ + + + + + + + + 选择所属组织 + + + + + + + + \ No newline at end of file diff --git a/pages/emergency/s-b/escalation/index.wxss b/pages/emergency/s-b/escalation/index.wxss index 3e14aab..8f9a189 100644 --- a/pages/emergency/s-b/escalation/index.wxss +++ b/pages/emergency/s-b/escalation/index.wxss @@ -120,4 +120,40 @@ scroll-view { margin-top: 16rpx; color: #333333; font-size: 28rpx; -} \ No newline at end of file +} +.item { + width: 686rpx; + /* height: 296rpx; */ + background-color: #FFFFFF; + margin: 32rpx auto; + border-radius: 16rpx; + padding: 32rpx; + position: relative; +} +.item_bot { + padding-top: 24rpx; +} +.item_address { + width: 100%; +} +.plan{ + margin-top: 50rpx; +} +.plan_div{ + border-radius: 10rpx; + padding: 20rpx; + margin-top: 30rpx; + background: #F5F7FC; +} +.plan_top{ + display: flex; +} +.plan_name{ + width: 250rpx; + font-size: 35rpx; + font-weight: bold; +} +.plan_cent{ + font-size: 30rpx; + margin-top: 10rpx; +} diff --git a/pages/emergency/t-x-l/index/index.js b/pages/emergency/t-x-l/index/index.js index df5c832..3f23082 100644 --- a/pages/emergency/t-x-l/index/index.js +++ b/pages/emergency/t-x-l/index/index.js @@ -63,7 +63,7 @@ Component({ userId: app.globalData.userInfo.userId, condition: this.data.condition } - app.axios("GET", "app", "/Othteam/getOthteamPage", params, false).then(res => { + app.axios("GET", "app", "/Othexpert/performUserPage", params, false).then(res => { console.log(res,'res===>'); this.data.freshIng = false; if (res.code == 1) { @@ -79,5 +79,10 @@ Component({ this.setData(this.data); }) }, + call:function(data){ + wx.makePhoneCall({ + phoneNumber: data.currentTarget.dataset.mobiletel, + }) + }, } }) \ No newline at end of file diff --git a/pages/emergency/t-x-l/index/index.wxml b/pages/emergency/t-x-l/index/index.wxml index b389c1c..73d16b6 100644 --- a/pages/emergency/t-x-l/index/index.wxml +++ b/pages/emergency/t-x-l/index/index.wxml @@ -14,7 +14,7 @@ 联系人： {{item.chinaname}} - {{item.mobiletel}} + {{item.mobiletel}} diff --git a/pages/emergency/t-x/index/index.js b/pages/emergency/t-x/index/index.js index d489c08..589aeb7 100644 --- a/pages/emergency/t-x/index/index.js +++ b/pages/emergency/t-x/index/index.js @@ -100,6 +100,12 @@ Component({ scale: 18, }); }, + // 拨打电话 + call:function(data){ + wx.makePhoneCall({ + phoneNumber: data.currentTarget.dataset.principaltel, + }) + }, /** * 获取列表 diff --git a/pages/emergency/t-x/index/index.wxml b/pages/emergency/t-x/index/index.wxml index d6c7e09..95f8fc5 100644 --- a/pages/emergency/t-x/index/index.wxml +++ b/pages/emergency/t-x/index/index.wxml @@ -20,7 +20,7 @@ 联系人： {{item.principal}} - {{item.principaltel}} + {{item.principaltel}} diff --git a/pages/emergency/z-s/index/index.js b/pages/emergency/z-s/index/index.js new file mode 100644 index 0000000..65bc98f --- /dev/null +++ b/pages/emergency/z-s/index/index.js @@ -0,0 +1,115 @@ +// pages/emergency/z-s/index/index.js +const app = getApp(); +Page({ + + /** + * 页面的初始数据 + */ + data: { + topBarH: app.globalData.CustomBar, + baseUrl: app.FILE_SERVER_URL, + + page: 1, + pageSize: 10, + list: [] + }, + /** + * 刷新 + */ + refresh: function (params) { + this.data.page = 1; + this.getList(); + }, + + + /** + * 获取列表 + */ + getList: function () { + console.log(this.data.curTab,parseInt(this.data.curTab) + 1,'=====>'); + app.axios("GET", "app", "/Othteam/dutyList", { + page: this.data.page, + limit: this.data.pageSize, + startTime: this.data.startTime || '', + endTime: this.data.endTime || '', + condition: this.data.condition || '', + state: parseInt(this.data.curTab) + 1, + userId: app.globalData.userInfo.userId + }, false).then(res => { + console.log(res,'resresres==>'); + this.data.freshIng = false; + if (res.code == 1) { + let page = Number.parseInt(res.data.pageNum); + if (this.data.page == 1) { + this.data.list = res.data.list; + } else { + var list = this.data.list; + if (this.data.page == page) this.data.list = [...list, ...res.data.list] + } + if (res.data.list?.length > 0) this.data.page = page + 1 + } + this.setData(this.data) + }) + }, + // 拨打电话 + call:function(data){ + wx.makePhoneCall({ + phoneNumber: data.currentTarget.dataset.mobile, + }) + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + this.getList(); + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/emergency/z-s/index/index.json b/pages/emergency/z-s/index/index.json new file mode 100644 index 0000000..965b8e8 --- /dev/null +++ b/pages/emergency/z-s/index/index.json @@ -0,0 +1,4 @@ +{ + "usingComponents": {}, + "navigationStyle": "custom" +} \ No newline at end of file diff --git a/pages/emergency/z-s/index/index.wxml b/pages/emergency/z-s/index/index.wxml new file mode 100644 index 0000000..44133b3 --- /dev/null +++ b/pages/emergency/z-s/index/index.wxml @@ -0,0 +1,25 @@ + + + + + + + + + {{item.name}} + + + + 联系电话：{{item.mobile}} + 值班时间：{{item.dutyTime}} + 值班地点：{{item.postName}} + 所属区域：{{item.areaName}} + + + + + + + + + \ No newline at end of file diff --git a/pages/emergency/z-s/index/index.wxss b/pages/emergency/z-s/index/index.wxss new file mode 100644 index 0000000..07c311a --- /dev/null +++ b/pages/emergency/z-s/index/index.wxss @@ -0,0 +1,161 @@ +page { + background-color: #f5f5f5; +} + +.filter { + margin: 0 10rpx 10rpx 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; +} + +.filter picker { + flex: 1; + display: flex; + align-items: center; + justify-content: center; +} + +.cu-item { + font-size: 30rpx; + font-weight: bold; +} + +.search { + height: 90rpx; + background-color: #f5f5f5; +} + +.cu-bar .search-form { + background: #FFFFFF; + box-shadow: 0rpx 0rpx 12rpx 2rpx #DDECF3; + border-radius: 12rpx; +} + +.item-bg { + padding: 0 32rpx 20rpx 32rpx; + background-color: #f5f5f5; + margin-top: 50rpx; +} + +.item { + background-color: #ffffff; + padding: 32rpx 20rpx 20rpx 20rpx; + position: relative; + border-radius: 10rpx; + z-index: 2; +} + +.item .head { + margin: 0 -20rpx; + margin-top: -32rpx; + background-color: #CDE5FC; + padding: 16rpx; + border-radius: 10rpx 10rpx 0 0; +} + +.item .head .single { + width: 8rpx; + height: 36rpx; + background: #4882EE; + border-radius: 4rpx; +} + +.item .head .title { + flex: 1; + margin-left: 16rpx; + font-size: 28rpx; + font-weight: bold; + color: #4882EE; +} + +.item .head .status { + font-weight: bold; + font-size: 28rpx; +} + +.item .tv { + font-size: 32rpx; + color: #222222; + padding-top: 20rpx; + margin-bottom: 10rpx; +} + +.item .time { + font-size: 26rpx; + color: #666666; + padding-top: 10rpx; +} + +.item .done { + color: rgb(12, 118, 240); + border-radius: 8rpx; + padding: 5rpx 20rpx; + background-color: rgba(0, 0, 0, 0.2); +} + +.item .bottom { + font-size: 26rpx; + font-weight: bold; + color: #222222; +} + +.item .g-container { + flex: 1; + height: 16rpx; + border-radius: 50rpx; + background: #eee; + margin: 20rpx 0; +} + +.item .g-progress { + width: 50%; + height: inherit; + border-radius: 50rpx; +} + +.item .val { + font-size: 26rpx; + font-weight: 500; + color: #222222; + margin-left: 20rpx; +} + +.item .line { + margin: 20rpx -20rpx; + border-top: 2rpx dashed #f5f5f5; +} + +.item .bottom-img { + width: calc(100vw - 65rpx); + max-width: calc(100vw - 65rpx); + height: 40rpx; + margin: 0 -20rpx; + position: absolute; + bottom: 0; + z-index: -1; +} +.center{ + display: flex; + justify-content: space-between; + align-items: center; +} +.content_img{ + width: 180rpx; + height: 140rpx; +} +.content_img image{ + width: 100%; + height: 100%; +} +.mobile{ + font-size: 35rpx !important; + color: #4882EE !important; +} diff --git a/pages/index/index.js b/pages/index/index.js index 4a274ac..ec1c4b9 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -136,6 +136,11 @@ Page({ name: "指挥体系", href: "/pages/emergency/t-x-l/index/index" }, + { + icon: "icon_yj_5", + name: "应急值守", + href: "/pages/emergency/z-s/index/index" + }, ], // 公告 diff --git a/pages/login/index.js b/pages/login/index.js index 958779c..de60ca1 100644 --- a/pages/login/index.js +++ b/pages/login/index.js @@ -8,10 +8,10 @@ Page({ * 页面的初始数据 */ data: { - // username: 'admin', - // password: 'Daofu202406', - username: '', - password: '', + username: 'admin', + password: 'Daofu202406', + // username: '', + // password: '', showLogin: true, newname:'', newphone:'', @@ -180,7 +180,6 @@ Page({ classify: 2 }).then(res => { if (res.code == 1) { - console.log(res,'res===>'); this.data.TypeData = res.data; this.setData(this.data) } diff --git a/pages/statistic/g-z-r-z/index/index.js b/pages/statistic/g-z-r-z/index/index.js index af5e389..af14f31 100644 --- a/pages/statistic/g-z-r-z/index/index.js +++ b/pages/statistic/g-z-r-z/index/index.js @@ -12,6 +12,7 @@ Page({ */ data: { topBarH: app.globalData.CustomBar, + baseUrl: app.FILE_SERVER_URL, currentIndex: 0, tabs: [{ lab: '今日工作' @@ -63,6 +64,7 @@ Page({ endTime: time, userId: app.globalData.userInfo.userId }, false).then(res => { + console.log(res,'res===>'); this.data.freshIng = false; if (res.code == 1) { let page = Number.parseInt(res.data.pageNum); diff --git a/pages/statistic/g-z-r-z/index/index.wxml b/pages/statistic/g-z-r-z/index/index.wxml index 29b1eef..0fb3810 100644 --- a/pages/statistic/g-z-r-z/index/index.wxml +++ b/pages/statistic/g-z-r-z/index/index.wxml @@ -20,6 +20,9 @@ {{item.detail}} 时间：{{item.createTime}} + + + diff --git a/pages/statistic/g-z-r-z/index/index.wxss b/pages/statistic/g-z-r-z/index/index.wxss index 90b5da5..3d20230 100644 --- a/pages/statistic/g-z-r-z/index/index.wxss +++ b/pages/statistic/g-z-r-z/index/index.wxss @@ -124,4 +124,12 @@ scroll-view { .item .more { position: absolute; right: 10rpx; +} +.content_img{ + width: 270rpx; + height: 170rpx; +} +.content_img image{ + width: 100%; + height: 100%; } \ No newline at end of file diff --git a/pages/statistic/j-b-x-x/domicileDetail/index.js b/pages/statistic/j-b-x-x/domicileDetail/index.js new file mode 100644 index 0000000..278f8f0 --- /dev/null +++ b/pages/statistic/j-b-x-x/domicileDetail/index.js @@ -0,0 +1,120 @@ + +import Utils from "../../../../utils/util" +const app = getApp(); + +Page({ + + /** + * 页面的初始数据 + */ + data: { + topBarH: app.globalData.CustomBar, + baseUrl: app.FILE_SERVER_URL, + + dateFilter: Utils.formatTime(new Date(), '-'), + showTypePop: false, + showAdvicePop: false, + TypeData: [], + postData: {}, + files: [], + userInfo:{}, + personnelList:[], + }, +/** + * 查看户籍详情 + */ + getDomicileDetail: function (id) { + app.axios("GET", "app", `/people/domicileDetail/${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); + } + }) + }, + /** + * 查看户籍下人员列表 + */ + getPersonnelList: function (id) { + let params = { + limit: 50, + page: 1, + domicileId:id + } + app.axios("GET", "app", `/people/domicilePeoplePageList`,params).then(res => { + if (res.code == 1) { + console.log(res.data,'data===>'); + this.data.personnelList = res.data.list; + this.setData(this.data); + } + }) + }, + + + + // 跳转人员详情 + goItem: function (params) { + wx.navigateTo({ + url: `/pages/statistic/j-b-x-x/detail/index?peopleId=${params.currentTarget.dataset.item.peopleId}`, + }) + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + if (options.id) { + this.getDomicileDetail(options.id); + this.getPersonnelList(options.id) + } + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/statistic/j-b-x-x/domicileDetail/index.json b/pages/statistic/j-b-x-x/domicileDetail/index.json new file mode 100644 index 0000000..c666f1f --- /dev/null +++ b/pages/statistic/j-b-x-x/domicileDetail/index.json @@ -0,0 +1,6 @@ +{ + "usingComponents": { + "tree": "/components/tree/index" + }, + "navigationStyle": "custom" +} \ No newline at end of file diff --git a/pages/statistic/j-b-x-x/domicileDetail/index.wxml b/pages/statistic/j-b-x-x/domicileDetail/index.wxml new file mode 100644 index 0000000..914053a --- /dev/null +++ b/pages/statistic/j-b-x-x/domicileDetail/index.wxml @@ -0,0 +1,65 @@ + + + + + + + 姓名 + {{userInfo.name}} + + + 性别 + {{userInfo.sex==1?'男':'女'}} + + + 出生日期 + {{userInfo.birthday}} + + + + 所属区域 + {{userInfo.areaName}} + + + 现居地址 + {{userInfo.address}} + + + 出生日期 + {{userInfo.birthday}} + + + 户籍创建时间 + {{userInfo.changeTime}} + + + + + 人员信息 + + + + + 姓名 + {{item.name}} + + + 性别 + {{item.sex==1?'男':'女'}} + + + 出生日期 + {{item.birthday}} + + + + + 家庭住址 + {{item.nowAddress}} + + + + 详情信息>> + + + \ No newline at end of file diff --git a/pages/statistic/j-b-x-x/domicileDetail/index.wxss b/pages/statistic/j-b-x-x/domicileDetail/index.wxss new file mode 100644 index 0000000..a8ce71a --- /dev/null +++ b/pages/statistic/j-b-x-x/domicileDetail/index.wxss @@ -0,0 +1,143 @@ +.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_cent { + border-bottom: 1rpx dashed #f5f5f5; + padding: 22rpx 0rpx; + display: flex; + justify-content: space-between; +} + +.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; +} + +.item_cent>view:nth-child(1) { + font-family: PingFang SC, PingFang SC; + font-weight: 500; + font-size: 28rpx; + color: #808080; +} + +.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; +font-family: PingFang SC, PingFang SC; +font-weight: bold; +font-size: 36rpx; +color: #333333; +} +.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 5d87ff6..edb5ae6 100644 --- a/pages/statistic/j-b-x-x/index/index.js +++ b/pages/statistic/j-b-x-x/index/index.js @@ -39,17 +39,9 @@ Page({ * 切换tab */ changeItem: function (params) { - 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) { @@ -103,7 +95,6 @@ Page({ 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) diff --git a/pages/statistic/j-b-x-x/index/index.wxml b/pages/statistic/j-b-x-x/index/index.wxml index 4759b97..f8ccac4 100644 --- a/pages/statistic/j-b-x-x/index/index.wxml +++ b/pages/statistic/j-b-x-x/index/index.wxml @@ -1,12 +1,12 @@ - 所属社区 - {{ postData.areaPathName }} - + 所属社区 + {{ postData.areaPathName }} + - + {{item.typeName}} {{item.houseNum}} @@ -28,17 +28,8 @@ - - - \ No newline at end of file diff --git a/pages/statistic/j-b-x-x/personnel/index.js b/pages/statistic/j-b-x-x/personnel/index.js index 44392e0..54b6ad1 100644 --- a/pages/statistic/j-b-x-x/personnel/index.js +++ b/pages/statistic/j-b-x-x/personnel/index.js @@ -19,7 +19,7 @@ Page({ showTypePop: false, postData: { orgcode: '', - areaPathName:'' + areaPathName: '' }, typeId: '', @@ -31,6 +31,8 @@ Page({ val: 'orgcode' }, unitTreelist: [], + // 判断是否户籍或者人员 1、户籍。2、人员 + listAttribute: 1, }, @@ -54,7 +56,7 @@ Page({ postData: postData, showTypePop: false }); // 设置更新后的 postData 对象 - this.getList(); + this.getListPersonnel(); }, /** * 获取地区 @@ -64,7 +66,6 @@ Page({ 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) @@ -78,30 +79,28 @@ Page({ this.data.page = 1; this.data.list = []; this.setData(this.data); - this.getList(); + this.getListPersonnel(); }, + // 下拉获取更多 dropDown: function (params) { this.data.page = this.data.page + 1; this.setData(this.data); - this.getList(); + this.getListPersonnel(); }, /** - * 获取工作统计每项数据列表 + * 获取人员列表 */ - getList: function (id) { + getListPersonnel: 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], @@ -110,25 +109,65 @@ Page({ } }) }, - goItem:function (params) { + /** + * 获取户籍列表 + */ + getListDomicile: function (id) { + let params = { + limit: this.data.pageSize, + page: this.data.page, + userId:this.data.userInfo.userId, + }; + if (this.data.postData.orgcode) { + params.orgCode = this.data.postData.orgcode + } + console.log(params,'params===>'); + app.axios("GET", "app", `/people/domicilePage`, params).then(res => { + if (res.code == 1) { + console.log(res.data,'data===>'); + 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}`, }) }, + // 跳转户籍详情 + goDomicile:function (params) { + console.log(params,'params====>'); + wx.navigateTo({ + url: `/pages/statistic/j-b-x-x/domicileDetail/index?id=${params.currentTarget.dataset.item.domicileId}`, + }) + }, /** * 生命周期函数--监听页面加载 */ onLoad(options) { - console.log(options, '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(); + if (options.typeId) { + this.data.listAttribute = 2; + this.data.title = options.typeName; + this.setData(this.data); + this.getListPersonnelPersonnel(); + } else { + this.data.listAttribute = 1; + this.data.title = '户籍'; + this.setData(this.data); + this.getListDomicile(); + } + this.getAreaTree(); }, diff --git a/pages/statistic/j-b-x-x/personnel/index.wxml b/pages/statistic/j-b-x-x/personnel/index.wxml index 8cd96c1..412098c 100644 --- a/pages/statistic/j-b-x-x/personnel/index.wxml +++ b/pages/statistic/j-b-x-x/personnel/index.wxml @@ -1,34 +1,78 @@ - + 所属社区 {{ postData.areaPathName }} - - - - 姓名 - {{item.name}} + + + + + + 姓名 + {{item.name}} + + + 性别 + {{item.sex==1?'男':'女'}} + + + 出生日期 + {{item.birthday}} + - - 性别 - {{item.sex==1?'男':'女'}} + + + 户籍状态 + {{item.domicileState==1?'正常':'注销'}} + - - 出生日期 - {{item.birthday}} + + + 居住地址 + {{item.address?item.address:'--'}} + - - - - 家庭住址 - 家庭住址家庭住址家庭住址家庭住址家庭住址 + + + 所在地区 + {{item.areaName?item.areaName:'--'}} + + + + 详情信息>> - - - 详情信息>> + + + + + + 姓名 + {{item.name}} + + + 性别 + {{item.sex==1?'男':'女'}} + + + 出生日期 + {{item.birthday}} + + + + + 家庭住址 + {{item.domicileAddress?item.domicileAddress:'--'}} + + + + 详情信息>> + + + + diff --git a/pages/work/d-b-s-x/index/index.js b/pages/work/d-b-s-x/index/index.js index 6d6f035..50283e7 100644 --- a/pages/work/d-b-s-x/index/index.js +++ b/pages/work/d-b-s-x/index/index.js @@ -8,6 +8,7 @@ Page({ */ data: { topBarH: app.globalData.CustomBar, + baseUrl: app.FILE_SERVER_URL, curTab: 0, tabs: [{ lab: '待办事项', @@ -73,6 +74,7 @@ Page({ state: parseInt(this.data.curTab) + 1, userId: app.globalData.userInfo.userId }, false).then(res => { + console.log(res,'resresres==>'); this.data.freshIng = false; if (res.code == 1) { let page = Number.parseInt(res.data.pageNum); diff --git a/pages/work/d-b-s-x/index/index.wxml b/pages/work/d-b-s-x/index/index.wxml index 42986ec..ba8c0b6 100644 --- a/pages/work/d-b-s-x/index/index.wxml +++ b/pages/work/d-b-s-x/index/index.wxml @@ -38,11 +38,20 @@ 前往完成 查看详情 - {{item.title}} - 任务周期：{{item.startTime}} 至 {{item.endTime}} - 接收时间：{{item.createTime}} - + + + {{item.title}} + 任务周期：{{item.startTime}} 至 {{item.endTime}} + 接收时间：{{item.createTime}} + + + + + + + + diff --git a/pages/work/d-b-s-x/index/index.wxss b/pages/work/d-b-s-x/index/index.wxss index ba3a127..3dc398e 100644 --- a/pages/work/d-b-s-x/index/index.wxss +++ b/pages/work/d-b-s-x/index/index.wxss @@ -141,4 +141,17 @@ page { position: absolute; bottom: 0; z-index: -1; +} +.center{ + display: flex; + justify-content: space-between; + align-items: center; +} +.content_img{ + width: 180rpx; + height: 140rpx; +} +.content_img image{ + width: 100%; + height: 100%; } \ 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 index 464647c..1cc5a02 100644 --- a/pages/work/f-b-g-z/index/index.js +++ b/pages/work/f-b-g-z/index/index.js @@ -7,6 +7,7 @@ Page({ */ data: { topBarH: app.globalData.CustomBar, + baseUrl: app.FILE_SERVER_URL, curTab: 0, tabs: [{ lab: '待办事项', diff --git a/pages/work/f-b-g-z/index/index.wxml b/pages/work/f-b-g-z/index/index.wxml index b50a416..5a12b80 100644 --- a/pages/work/f-b-g-z/index/index.wxml +++ b/pages/work/f-b-g-z/index/index.wxml @@ -32,10 +32,18 @@ 查看详情 - {{item.title}} + + + {{item.title}} 任务周期：{{item.startTime}}至 {{item.endTime}} 接收时间：{{item.modifyTime}} + + + + + + diff --git a/pages/work/f-b-g-z/index/index.wxss b/pages/work/f-b-g-z/index/index.wxss index 4cd565d..d8ac50e 100644 --- a/pages/work/f-b-g-z/index/index.wxss +++ b/pages/work/f-b-g-z/index/index.wxss @@ -140,4 +140,17 @@ page { position: absolute; bottom: 0; z-index: -1; +} +.center{ + display: flex; + justify-content: space-between; + align-items: center; +} +.content_img{ + width: 180rpx; + height: 140rpx; +} +.content_img image{ + width: 100%; + height: 100%; } \ No newline at end of file diff --git a/pages/work/f-b-g-z/serve/index.js b/pages/work/f-b-g-z/serve/index.js index ee2b205..ff2e031 100644 --- a/pages/work/f-b-g-z/serve/index.js +++ b/pages/work/f-b-g-z/serve/index.js @@ -221,7 +221,15 @@ Page({ ...this.data.postData, userId:this.data.userInfo.userId, typeId:this.data.postData.worktypeId, + filePath:'' } + this.data.files.forEach(item => { + let flie = item.filepath.substring(item.filepath.length-3); + if (flie == 'png'||flie == 'jpg') { + data.filePath = item.filepath; + return + } + }); console.log(data,'data===>'); app.axios("POST", "app", "/work/workAdd", data).then(res => { if (res.code == 1) { diff --git a/pages/work/s-b/index/index.js b/pages/work/s-b/index/index.js index 5942eeb..5235d72 100644 --- a/pages/work/s-b/index/index.js +++ b/pages/work/s-b/index/index.js @@ -245,7 +245,18 @@ Page({ }) return } - app.axios("POST", "app", "/work/wkDynamicsAdd", this.data.postData).then(res => { + let params = { + ...this.data.postData, + filePath:'' + } + this.data.files.forEach(item => { + let flie = item.filepath.substring(item.filepath.length-3); + if (flie == 'png'||flie == 'jpg') { + params.filePath = item.filepath; + return + } + }); + app.axios("POST", "app", "/work/wkDynamicsAdd", params).then(res => { if (res.code == 1) { wx.showToast({ title: '发布成功',