From b0c3b655f2d40ba32050f685ba71c0f77db40707 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?= <819653817@qq.com> Date: Tue, 7 May 2024 14:13:53 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E9=97=A8=E7=89=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/index/index.js | 15 +++++++++++++++ pages/index/index.wxml | 8 ++++++++ pages/index/index.wxss | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+) diff --git a/pages/index/index.js b/pages/index/index.js index 80b82dc..183f474 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -288,6 +288,21 @@ toDemandCheck(){ wx.navigateTo({ url: '../../subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck', }) +}, +recognitionCard(){ + wx.navigateTo({ + url: '../../subpages/OCRCard/pages/index/index', + }) +}, +door(){ + wx.scanCode({ + success: (res) => { + console.log(res); + }, + fail: (err) => { + console.error(err); + } + }) } }) diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 9bfbf20..aea7d20 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -39,6 +39,14 @@ + + + 扫电子门牌 + + + 识别身份证 + + 人房信息采集 diff --git a/pages/index/index.wxss b/pages/index/index.wxss index d535010..d35ce6c 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -1117,3 +1117,41 @@ line-height: 40rpx; .bg_new_left{ margin-right: 20px; } +.electron{ + position:relative; + width: 100%; + height: 100rpx; + display: flex; + flex-direction:row; + justify-content: space-between; + align-items: center; + +} +.door{ + margin: 50rpx 0 0 30rpx; + display:flex; + width: 300rpx; + height: 90rpx; + background-color: #3da2ff; + border-radius: 20rpx; + justify-content: center; + align-items: center; +} +.door .door-text{ + color: white; + font-size: 32rpx; +} +.electron_card{ + margin: 50rpx 60rpx 0 30rpx; + display:flex; + width: 300rpx; + height: 90rpx; + background-color: #3da2ff; + border-radius: 20rpx; + justify-content: center; + align-items: center; +} +.card_text{ + color:white; + font-size: 32rpx; +} \ No newline at end of file From e7781efc90daa9f77a5472e28980914f745b6da5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?= <819653817@qq.com> Date: Tue, 14 May 2024 09:48:12 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E7=95=8C=E9=9D=A2=E5=8A=A0=E7=94=B5=E5=AD=90=E9=97=A8?= =?UTF-8?q?=E7=89=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/index/index.wxml | 2 + pages/index/index.wxss | 214 +++++------------------------------------ 2 files changed, 24 insertions(+), 192 deletions(-) diff --git a/pages/index/index.wxml b/pages/index/index.wxml index aea7d20..ee1446c 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -41,9 +41,11 @@ + 扫电子门牌 + 识别身份证 diff --git a/pages/index/index.wxss b/pages/index/index.wxss index d35ce6c..d44f561 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -1,188 +1,12 @@ -/**index.wxss**/ -/* .select{ - width: 100%; - height: 90rpx; - background-color: #fff; - display: flex; - justify-content: space-between; - box-sizing: border-box; - padding: 0 40rpx; - align-items: center; -} -.select view { - display: flex; - align-items: center; - font-size: 30rpx; - font-family: PingFang SC; - font-weight: 500; - color: #3A80E7; -} -.select view image{ - width: 16rpx; - height: 16rpx; - margin: 0 9rpx; -} -.select .delete { - font-size: 28rpx; - font-family: PingFang SC; - font-weight: 500; - color: #999999; -} -.select .delete image{ - width: 30rpx; - height: 30rpx; -} -.content{ - width: 100%; - display: flex; - height: auto; - flex-direction: column; - justify-content: flex-center; - margin: 30rpx 20rpx 0 30rpx; -} -/* .content .scroll { - height: calc(100vh - 130rpx); -*/ -/* .box{ - display: flex; - flex-direction: column; - background-color: #fff; -} -.hd_news{ - display: flex; - flex-direction:row; - justify-content: space-between; - margin: 20rpx 20rpx 0 30rpx -} -.hd_news .reminder{ - width: 134rpx; - height: 33rpx; - overflow-wrap: break-word; - color: rgba(51,51,51,1); - font-size: 34rpx; - font-family: PingFang-SC-Bold; - font-weight: 700; - text-align: left; - white-space: nowrap; - line-height: 52rpx; - -} - .card{ - width: 100%; - display: flex; - height: 168rpx; - margin: 20rpx 0 0 10rpx; - box-sizing: border-box; - overflow: hidden; - position: relative; - flex-direction: column; -} - -.content .card::before{ - content: ""; - position: absolute; - left: 30rpx; - right: 30rpx; - bottom: 0; - border-bottom: 2rpx solid #EAEAEA; -} - -.blue{ - color:#5693EE; -} -.yellow{ - color:#E2944D; -} -.cyan{ - color: #2EB4F2 ; -} -.cyanBg{ - background: rgba(56,189,253,0.1); -} -.yellowBg{ - background: rgba(248,188,122,0.1); -} -.blueBg{ - background: rgba(86,147,238,0.1); -} -.gray{ - color: #999999 !important; -} -.content .card .left{ - width: 100rpx; - height: 100rpx; - background: linear-gradient(0deg, #3E8DF8 0%, #68A8FD 100%); - border-radius: 20rpx; - color:#fff ; - font-size: 28rpx; - font-family: PingFang SC; - font-weight: 500; - text-align: center; - line-height: 100rpx; -} -.content .card .right{ - flex: 1; - overflow: hidden; - display: flex; - flex-direction: column; - justify-content: space-between; - overflow: hidden; - margin-left: 24rpx; -} -.content .card .right .top{ - display: flex; - align-items: center; - justify-content: space-between; -} -.content .card .right .title{ - font-size: 32rpx; - font-family: PingFang SC; - font-weight: 500; - color: #333333; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - width: calc(100% - 80rpx); -} - - -.content .card .right .bottom{ - display: flex; - justify-content: space-between; - align-items: center; - font-size: 28rpx; - font-family: PingFang SC; - color: #999999; -} -.textOver{ - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - max-width: 250rpx; -} -.content .card .right .bottom .flex_box{ - display: flex; - justify-content: left; -} */ -/* .bgBule{ - background-color: #dfebfb; - border: 1px solid #3A80E7; - border-radius: 32rpx; - padding:10rpx 20rpx; - box-sizing: border-box; -} -.bgBule image{ - margin-left: 50rpx !important; -} */ -.page { +page { overflow: hidden; position: relative; width: 750rpx; height: auto; display: flex; flex-direction: column; - background-color: #F7F7F7; + background-color: #f7f7f7; /* z-index: -9999; */ } .header { @@ -458,7 +282,7 @@ height: 412rpx; display: flex; flex-direction: column; - margin: 36rpx 0 0 30rpx; + margin: 20rpx 0 0 30rpx; } .text-wrapper_1 { background-color: rgba(255,255,255,1.000000); @@ -1119,39 +943,45 @@ line-height: 40rpx; } .electron{ position:relative; - width: 100%; + width: 690rpx; height: 100rpx; display: flex; flex-direction:row; justify-content: space-between; - align-items: center; - + margin: 21rpx 0 0 30rpx; } .door{ - margin: 50rpx 0 0 30rpx; display:flex; - width: 300rpx; - height: 90rpx; - background-color: #3da2ff; + width: 335rpx; + height: 100rpx; border-radius: 20rpx; justify-content: center; align-items: center; + background-color: #FFFFFF; } .door .door-text{ - color: white; + display: flex; + flex-direction: column; + justify-content: space-between; font-size: 32rpx; + margin-left: 20rpx; + +} +.img_door{ + height: 44rpx; + width: 44rpx; + } .electron_card{ - margin: 50rpx 60rpx 0 30rpx; display:flex; - width: 300rpx; - height: 90rpx; - background-color: #3da2ff; + width: 335rpx; + height: 100rpx; + background-color: #ffffff; border-radius: 20rpx; justify-content: center; align-items: center; } .card_text{ - color:white; + margin-left: 20rpx; font-size: 32rpx; } \ No newline at end of file From 2cafee5eb44c589bc4f362e4bc614c6aed8ebd14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?= <819653817@qq.com> Date: Wed, 15 May 2024 17:18:41 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E7=94=B5=E5=AD=90=E9=97=A8=E7=89=8C?= =?UTF-8?q?=E5=8A=A0=E9=A6=96=E9=A1=B5=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/index/index.js | 14 ++++++++++++++ pages/index/index.wxml | 2 +- pages/index/index.wxss | 5 +++-- project.config.json | 3 ++- utils/config.js | 1 - 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/pages/index/index.js b/pages/index/index.js index 183f474..4c29379 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -298,11 +298,25 @@ door(){ wx.scanCode({ success: (res) => { console.log(res); + console.log(res.result); + var parts = res.result.split('/'); + var number = parts[parts.length - 1]; + + console.log(number) + wx.navigateTo({ + url: `/subpages/house/pages/housePortrait/housePortrait?resiId=${number}`, + + }) }, fail: (err) => { console.error(err); } }) +}, +IDCard(){ +wx.navigateTo({ + url: '../../subpages/OCRCard/pages/index/index', +}) } }) diff --git a/pages/index/index.wxml b/pages/index/index.wxml index ee1446c..c5faa27 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -46,7 +46,7 @@ - 识别身份证 + 识别身份证 diff --git a/pages/index/index.wxss b/pages/index/index.wxss index d44f561..58f348c 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -1,6 +1,5 @@ page { - overflow: hidden; position: relative; width: 750rpx; height: auto; @@ -106,7 +105,7 @@ page { flex-direction: row; display: flex; justify-content: space-between; - margin: -100rpx 0 0 30rpx; + margin: -75rpx 0 0 30rpx; } @@ -958,6 +957,7 @@ line-height: 40rpx; justify-content: center; align-items: center; background-color: #FFFFFF; + box-shadow: 0px 2px 20px 0px rgba(150,161,175,0.150000); } .door .door-text{ display: flex; @@ -980,6 +980,7 @@ line-height: 40rpx; border-radius: 20rpx; justify-content: center; align-items: center; + box-shadow: 0px 2px 20px 0px rgba(150,161,175,0.150000); } .card_text{ margin-left: 20rpx; diff --git a/project.config.json b/project.config.json index 243fa51..49963e6 100644 --- a/project.config.json +++ b/project.config.json @@ -46,7 +46,8 @@ "minifyWXML": true, "showES6CompileOption": false, "useCompilerPlugins": false, - "condition": false + "condition": false, + "ignoreUploadUnusedFiles": true }, "compileType": "miniprogram", "libVersion": "2.19.4", diff --git a/utils/config.js b/utils/config.js index dce6c12..a32a3d6 100644 --- a/utils/config.js +++ b/utils/config.js @@ -8,7 +8,6 @@ module.exports = { return 'https://epmet-preview.elinkservice.cn/api/' // 演示环境 // return 'http://192.168.1.144/api/' //测试环境 // return 'http://219.146.91.110:30801/api/' - // return 'https://epmet-preview.elinkservice.cn/api/' // 演示环境 // return 'http://192.168.1.144/api/' //测试环境 // return 'http://219.146.91.110:30801/api/' From 20ef8aa9b649795528d2dbff238d1a4cb8efb6cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?= <819653817@qq.com> Date: Wed, 22 May 2024 09:21:12 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/index/index.wxss | 2 +- .../InspectionReport/InspectionReport.js | 695 ++++++++++++++++++ .../pages/historyQuery/historyQuery.wxss | 13 +- 3 files changed, 706 insertions(+), 4 deletions(-) create mode 100644 subpages/InspectionReport/pages/InspectionReport/InspectionReport.js diff --git a/pages/index/index.wxss b/pages/index/index.wxss index 1e51ade..b99ba51 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -736,7 +736,7 @@ page { height:auto ; background-color: #FFFFFF; margin: 30rpx 0 0 30rpx; - border-radius: 30rpx; + border-radius: 20rpx; } .hd_news{ display: flex; diff --git a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js new file mode 100644 index 0000000..6d47fc4 --- /dev/null +++ b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js @@ -0,0 +1,695 @@ +import { + $wuxActionSheet +} from '../../../../components/dist/index' +const config = require('../../../../utils/config') +const QQMapWX = require('../../../../utils/qqmap-wx-jssdk') +const App = getApp() + +import { + addRecord, + securityCheckk, + inspectionStaff, + showRecord +} from "../../../../utils/api" +Page({ + /** + * 页面的初始数据 + */ + data: { + showtime:false, + checkboxOptions:[], + checkboxOptionsnumber:0, + hiddenDangeList: [], + newObj:[], + addRecord: [], + attachmentUrl: '', + reviewTime: '', + checkResultFlag: '', + checkPersonsIdList: [], + pageNo: 1, + pageSize: 10, + id: 0, + addressContent: '', + fmData: { + gridId: '', + attachmentList: [], //图片 + voiceList: [], + latitude: "", + longitude: "", + resiId: "", + happenTime: "", + content: "", //内容 + address: "", //地址 + checkPersons: '' + }, + imageUrl: '', + remarks: '', //备注 + getData: '', + checkResultName: '', + array: ['不合格', '合格'], // 选择器的数据源 + arrlist: [], + fileList: [], + companyId: '', + showPopup: false, // 控制弹出层显示/隐藏的状态 + selectedOptions: [], // 选中的复选框项 + selectedNames: [], //显示检察人员 + // 用于存放复选框选择的结果 + result: [], + // 用于存放输入框的值 + hazardDesc: '', + hazardDesc2:'', + uploadImageList: [], + imageId: 1, + arr: [], + arr1: [], + addHiddenDangeList:[], + checkboxValue:[], + newContent:'', + currentDate: new Date().getTime(), + minDate: new Date(2020, 0, 1).getTime(), + maxDate: new Date(2030, 11, 31).getTime() + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + this.setData({ + companyId: options.resiId + }) + this.data.qqMapWX = new QQMapWX({ + key: 'CMJBZ-4DECI-JXGGN-5B4WU-QLV2H-B5BEJ' + }) + this.reverseLocation() + this.getList() + + }, + showTime(){ + this.setData({ + showtime:true + }) + }, + + showRecordData() { + console.log(this.data.companyId) + let parm = { + id: this.data.companyId + } + showRecord(parm).then(res => { + console.log(res) + if(res.data[0].hiddenDangeList){ + let checkboxOptions = res.data[0].hiddenDangeList.filter(item=>item.hazardStatus === 0).map(item=>({hazardDesc:item.hazardDesc,hazardStatus:0})); + let checkboxOptionsnumber=checkboxOptions.length+1; + console.log(checkboxOptionsnumber) + this.setData({ + checkboxOptions, + checkboxOptionsnumber + }) + } + this.setData({ + showList:res.data + }) + console.log(this.data.showList) + }) + }, + getCurrentDateTime() { + const now = new Date(); + const year = now.getFullYear(); + const month = (now.getMonth() + 1).toString().padStart(2, '0'); + const day = now.getDate().toString().padStart(2, '0'); + const hours = now.getHours().toString().padStart(2, '0'); + const minutes = now.getMinutes().toString().padStart(2, '0'); + const seconds = now.getSeconds().toString().padStart(2, '0'); + return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`; + }, + submitBiao() { + console.log("zhixingle") + console.log(this.data.newContent) + if (this.data.newContent) { + let newArr = this.data.addHiddenDangeList.concat({ + hazardDesc: this.data.newContent, + hazardStatus: 0 + }); + console.log(newArr) + this.setData({ + addHiddenDangeList: newArr, + }); + } + + if(!this.data.companyId){ + wx.showToast({ + title: '请选择企业', + icon:'none' + }) + return false + } + if(this.data.selectedOptions.length === 0){ + wx.showToast({ + title: '请选择检查人员', + icon:'none' + }) + return false + } + if(!this.data.checkResultFlag){ + wx.showToast({ + title: '请选择检查结论', + icon:'none' + }) + return false + } + if(this.data.checkResultFlag == 0 && !this.data.getData){ + wx.showToast({ + title: '请选择拟复查时间', + icon:'none' + }) + return false + } + console.log( this.data.addHiddenDangeList) + + if(this.data.checkResultFlag == 0 && this.data.addHiddenDangeList.length<1){ + wx.showToast({ + title: '隐患明细最少输入一条', + icon:'none' + }) + return false + } + const now = new Date(); + const hours = now.getHours().toString().padStart(2, '0'); + const minutes = now.getMinutes().toString().padStart(2, '0'); + const seconds = now.getSeconds().toString().padStart(2, '0'); + let checkboxOptions =this.data.addHiddenDangeList.filter(item=>item.hazardStatus === 0).map(item=>({hazardDesc:item.hazardDesc,hazardStatus:2,requirements:this.data.hazardDesc2})); + this.setData({ + addHiddenDangeList:checkboxOptions + }) + console.log(this.data.addHiddenDangeList) + let form={ companyId: this.data.companyId, + checkTime: this.getCurrentDateTime(), + checkPersonsIdList: this.data.checkPersonsIdList, + checkResultFlag: this.data.checkResultFlag, + reviewTime:this.data.getData, + hiddenDangeList:this.data.checkboxOptions.concat(this.data.addHiddenDangeList), + attachmentUrls:this.data.uploadImageList.map(item=>({fileName:item.originFileName,attachmentUrl:item.ossUrl.url})), + remark: '', + reviewAddress:this.data.addressContent + } + if (!this.data.reviewTime) { + form.reviewTime=null + } + console.log(form) + // addRecord( + // form + // ).then( + // res => { + // if(res.code == 0){ + // wx.showToast({ + // title: '新增成功', + // duration:2000, + // success:function(){ + // setTimeout(()=>{ + // wx.navigateBack({ + // delta: 1 + // }) + // },2000) + // } + // }) + // } + // }); + + }, + + getList() { + securityCheckk({ + pageNo: this.data.pageNo, + pageSize: this.data.pageSize, + }).then(({ + data + }) => { + console.log(data.list) + this.setData({ + companyList: data.list, + }); + }); + inspectionStaff({ + orgId: App.globalData.user.agencyId, + orgType: 'agency', + pageNo: 1, + pageSize: 100 + }).then(({ + data + }) => { + this.setData({ + arr: data.staffList + }) + }); + }, + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() {}, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + this.reverseLocation + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() {}, + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() {}, + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() {}, + /** + * 用户点击右上角分享 + */ + onShareAppMessage() {}, + onChange(event) { + console.log("111", event) + this.setData({ + result: event.detail + }); + console.log(this.data.result); + console.log(this.data.hiddenDangeList); + + }, + afterRead(event) { + const { + file + } = event.detail; + console.log(file) + // 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式 + wx.uploadFile({ + url: 'https://example.weixin.qq.com/upload', // 仅为示例，非真实的接口地址 + filePath: file.url, + name: 'file', + formData: { + user: 'test' + }, + success(res) { + // 上传完成需要更新 fileList + const { + fileList = [] + } = this.data; + fileList.push({ + ...file, + url: res.data + }); + this.setData({ + fileList + }); + }, + }); + }, + + showPopup() { + this.setData({ + showPopup: true + }); // 点击按钮显示弹出层 + }, + onClose() { + let names = [] + this.data.arr.forEach(item=>{ + if(this.data.selectedOptions.findIndex(itemC=>itemC === item.staffId) != -1){ + names.push(item.name) + } + }) + this.setData({ + showPopup: false, + selectedNames: names, + checkPersonsIdList:this.data.selectedOptions + }); // 关闭弹出层 + }, + onCloseTime(){ + + }, + onChange1(event) { + console.log(event) + this.setData({ + selectedOptions: event.detail + }); + console.log(this.data.selectedOptions) + }, + confirmSelection() { + // 点击确定按钮后触发，处理选中的复选框项 + console.log("选中的项：", this.data.selectedOptions); + let names = [] + this.data.arr.forEach(item=>{ + if(this.data.selectedOptions.findIndex(itemC=>itemC === item.staffId) != -1){ + names.push(item.name) + } + }) + this.setData({ + showPopup: false, + selectedNames: names, + checkPersonsIdList:this.data.selectedOptions + }); + }, + changeHazardDesc(e) { + this.setData({ + hazardDesc: e.detail.value + }); + }, + changeHazardDescStatus2(e){ + this.setData({ + hazardDesc2: e.detail.value + }); + console.log(this.data.hazardDesc2) + }, + changenewContent(e){ + this.setData({ + newContent: e.detail.value + }); + }, + addAnother() { + let newArr = this.data.addHiddenDangeList.concat({ hazardDesc: this.data.newContent, hazardStatus: 0, requirements:this.data.hazardDesc2}); + console.log() + this.setData({ + addHiddenDangeList: newArr, + newContent: '', // 清空输入框的值 + }); + console.log('添加后的数组:', this.data.addHiddenDangeList); + }, + pickerChange: function (e) { + this.setData({ + checkResultName: this.data.array[e.detail.value], + checkResultFlag:e.detail.value + }); + }, + pickerChange1: function (e) { + // 更新当前选中的索引 + console.log(e.detail.value), + this.setData({ + getData: e.detail.value + }); + this.data.reviewTime = e.detail.value + console.log(this.data.getData) + // 在这里可以根据选择的值进行相应的逻辑处理 + }, + pickerChange2: function (e) { + // 更新当前选中的索引 + this.setData({ + gridNName: this.data.companyList[e.detail.value].name, + companyId:this.data.companyList[e.detail.value].id + }); + this.showRecordData() + }, + bindRemarkInput(e) { + this.setData({ + remarks: e.detail.value + }); + console.log(this.data.remarks) + }, + chooseImage() { + if (this.data.uploadImageList.length > 3) { + wx.showToast({ + title: "最多上传3张照片", + icon: "none" + }) + return + } + const _this = this + + $wuxActionSheet().showSheet({ + buttons: [{ + text: '拍照' + }, + { + text: '从相册中获取', + openType: null, + }, + + ], + className: 'dialog-class', + // 进入到这里的方法 index是buttons中的选项的索引值 + buttonClicked(index) { + console.log(index) + if (index === 0) { + wx.chooseMedia({ + //具体属性看文档 + count: 1, //最多选择的数量 + sizeType: ['original', 'compressed'], //文件的类型 + sourceType: ['camera'], //可以用进行选择拍摄 + success(res) { + console.log(res); + // 将照片的长度赋值给他 + let deleteLength = _this.data.uploadImageList.length + // .将this中的uploadImageList重新赋值给uploadImageList + const uploadImageList = [..._this.data.uploadImageList] + // 判断数据的大小 + if (res.tempFiles[0].size <= 5 * 1024 * 1024) { + //uploadImageList + uploadImageList.push({ + // 已上传关闭 + uploaded: false, + // ossUrl服务器 + ossUrl: { + // 获取请求中的地址 + url: res.tempFiles[0].tempFilePath + }, + // 图片地址 + imgUrl: res.tempFiles[0].tempFilePath, + // 将data里边的imageId自动加1 + imageId: ++_this.data.imageId, + //获取路径的后三位，res.tempFiles[0].tempFilePath.length - 3, 3 从第三个为值截取，截取长度为3 + type: res.tempFiles[0].tempFilePath.substr(res.tempFiles[0].tempFilePath.length - 3, 3), + //格式，图片 + format: "image", + // 设置标识符 + name: 'wximage' + }) + } else { + _this.showToast('图片上限5M，请压缩后重试~') + return false + } + // 将uploadImageList赋值给uploadImageList + _this.setData({ + uploadImageList + }) + // 上传到服务器 + wx.uploadFile({ + // 服务器的地址 + url: `${config.BASEURL()}oss/file/uploadvariedfile`, + //上传的本地路径 + filePath: res.tempFiles[0].tempFilePath, + //文件都相应的key + name: 'file', + // 头部标识 + header: { + 'Content-type': 'application/json;charset=UTF-8', + 'Authorization': wx.getStorageSync('token') + }, + success(fileRes) { + //不懂 + console.log("执行了") + console.log(fileRes) + // 这段代码片段中 !JSON.parse(fileRes.data).data 是一个条件表达式，它用于判断 fileRes.data 中是否包含 data 属性的值。 + //fileRes将json转化为一个javascript对象 + if (!JSON.parse(fileRes.data).data) { + _this.showToast('图片上传失败，请重试~') + // 删除上传失败的图片 + // findIndex是找到符合条件的第一个索引 + const index = _this.data.uploadImageList.findIndex(item => item.imageId === _this.data.imageId) + if (index > -1) { + // 删掉splice索引为1 + _this.data.uploadImageList.splice(index, 1) + //更新uploadImageList + _this.setData({ + uploadImageList: _this.data.uploadImageList + }) + } + } else { + // 上传uploaded为true + uploadImageList[uploadImageList.length - 1].uploaded = true + // ossUrl为data + uploadImageList[uploadImageList.length - 1].ossUrl = JSON.parse(fileRes.data).data + _this.setData({ + uploadImageList + }) + } + }, + fail(fileRes) { + _this.setData({ + uploadImageList: [] + }) + _this.showToast('图片上传失败，请重试~') + } + }) + } + }) + } else if (index === 1) { + wx.chooseMedia({ + count: 1, + type: 'image', //类型是图片 + sourceType: ['album'], //允许从相册李删选 + success(res) { + console.log(res, '图片上传的res'); + let deleteLength = _this.data.uploadImageList.length + const uploadImageList = [] + const endIndex = _this.data.uploadImageList.length + res.tempFiles.forEach((item, index) => { + if (item.size <= 5 * 1024 * 1024) { + uploadImageList.push({ + uploaded: false, + ossUrl: { + url: item.tempFilePath + }, + imgUrl: item.tempFilePath, + imageId: ++_this.data.imageId, + format: "image", + type: item.tempFilePath.substr(item.tempFilePath.length - 3, 3), + originFileName: 'image' + index + 1 + }) + console.log(uploadImageList) + } else { + _this.showToast('图片上限5M，请压缩后重试~') + } + }) + _this.setData({ + uploadImageList: [..._this.data.uploadImageList, ...uploadImageList] + }) + console.log(_this.data.uploadImageList) + console.log(uploadImageList) + uploadImageList.forEach((item, index) => { + return (function (index) { + wx.uploadFile({ + url: `${config.BASEURL()}oss/file/uploadvariedfile`, + filePath: res.tempFiles[index].tempFilePath, + name: 'file', + header: { + 'Content-type': 'application/json;charset=UTF-8', + 'Authorization': wx.getStorageSync('token') + }, + success(fileRes) { + if (!JSON.parse(fileRes.data).data) { + _this.showToast('图片上传失败，请重试~') + _this.data.uploadImageList.splice(deleteLength, _this.data.uploadImageList.length - deleteLength) + _this.setData({ + uploadImageList: _this.data.uploadImageList + }) + } else { + uploadImageList[index].uploaded = true + uploadImageList[index].ossUrl = JSON.parse(fileRes.data).data + _this.data.uploadImageList = _this.data.uploadImageList.slice(0, endIndex) + _this.setData({ + uploadImageList: [..._this.data.uploadImageList, ...uploadImageList] + }) + } + }, + fail(fileRes) { + _this.setData({ + uploadImageList: [] + }) + _this.showToast('图片上传失败，请重试~') + } + }) + })(index) + }) + } + }) + } + return true + }, + cancelText: '取消', + //cancel()：当用户点击取消按钮时触发的回调函数。你可以在这个回调函数中执行相应的操作，比如关闭弹出框或者执行其他逻辑。 + + //destructiveButtonClicked()：当用户点击了破坏性按钮（如果有）时触发的回调函数。破坏性按钮通常用于执行一些危险操作，比如删除或者清除数据等。 + cancel() {}, + destructiveButtonClicked() {}, + }) + }, + // 删除选中的图片 + deleteImage(e) { + const index = this.data.uploadImageList.findIndex(item => item.imageId === e.currentTarget.dataset.imageid) + if (index > -1) { + this.data.uploadImageList.splice(index, 1) + this.setData({ + uploadImageList: this.data.uploadImageList + }) + } + }, + //跳转地图选点 + toughGetLocation() { + // this.getLocation(false); + wx.chooseLocation({ + success: res => { + console.log('resadddres', res) + const { + fmData + } = this.data; + this.setData({ + fmData: { + ...fmData, + address: res.address, + longitude: res.longitude, + latitude: res.latitude + }, + addressContent: res.address + }); + console.log(this.data.fmData); + } + }) + }, + // + reverseLocation() { + const _this = this + this.data.qqMapWX.reverseGeocoder({ + success(res) { + console.log(res); + _this.setData({ + addressContent: res.result.address, + 'fmData.address': res.result.address, + 'fmData.longitude': res.result.location.lng, + 'fmData.latitude': res.result.location.lat, + }) + }, + fail(err) { + console.debug(err) + } + }) + }, + closePopup() { + this.setData({ showPopup: false }); + }, + + onInput(event) { + var date = new Date(event.detail); + var year = date.getFullYear(); + var month = ("0" + (date.getMonth() + 1)).slice(-2); + var day = ("0" + date.getDate()).slice(-2); + var hour = ("0" + date.getHours()).slice(-2); + var minute = ("0" + date.getMinutes()).slice(-2); + var second = ("0" + date.getSeconds()).slice(-2); + var formattedDateTime = year + "-" + month + "-" + day + " " + hour + ":" + minute + ":" + second; + console.log(formattedDateTime); + this.setData({ + currentDate:formattedDateTime + }) + + }, + + onConfirm(event) { + const { value } = event.detail; + this.setData({ + currentDate: value, + showtime: false + }); + console.log('选中的日期时间:', new Date(value)); + }, + + onCancel() { + this.setData({ showtime: false }); + } +}) \ No newline at end of file diff --git a/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxss b/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxss index 713f934..441c288 100644 --- a/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxss +++ b/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxss @@ -196,6 +196,7 @@ page { align-items: center; justify-content: start; margin: 40rpx 0 0 0; + } .button{ width: 200rpx; @@ -209,9 +210,13 @@ page { margin: 20rpx 0 0 15rpx; box-sizing: border-box; font-weight: 500rpx; - height: 86rpx; + height: 56rpx; line-height: 86rpx; - background-color: rgba(57,116,246,1.000000) + background-color: rgba(57,116,246,1.000000); + justify-content: center; + align-items: center; + + } .button1{ width: 200rpx; @@ -225,8 +230,10 @@ page { margin: 20rpx 0 0 15rpx; box-sizing: border-box; font-weight: 500rpx; - height: 86rpx; + height: 56rpx; line-height: 86rpx; + justify-content: center; + align-items: center; } From 368e41195908cd1fdb096ddd53c281ec36f7125a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?= <819653817@qq.com> Date: Wed, 22 May 2024 09:56:52 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=B5=E5=AD=90?= =?UTF-8?q?=E9=97=A8=E7=89=8C=E7=9A=84=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- images/index/Door.png | Bin 0 -> 1858 bytes images/index/IDCard.png | Bin 0 -> 2067 bytes pages/index/index.wxml | 4 ++-- pages/index/index.wxss | 6 +++--- 4 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 images/index/Door.png create mode 100644 images/index/IDCard.png diff --git a/images/index/Door.png b/images/index/Door.png new file mode 100644 index 0000000000000000000000000000000000000000..5ec1359f3270dbeee188f6464e9455931cdb16b2 GIT binary patch literal 1858 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 - + 扫电子门牌 - + 识别身份证 diff --git a/pages/index/index.wxss b/pages/index/index.wxss index b99ba51..3b85f54 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -277,7 +277,7 @@ page { position: relative; background-color: rgba(255,255,255,1.000000); border-radius: 20rpx; - width: 710rpx; + width: 700rpx; height: 412rpx; display: flex; flex-direction: column; @@ -289,7 +289,7 @@ page { height: 90rpx; display: flex; flex-direction: column; - width: 710rpx; + width: 700rpx; } .text_7 { width: 202rpx; @@ -732,7 +732,7 @@ page { .content{ display: flex; flex-direction: column; - width: 710rpx; + width: 700rpx; height:auto ; background-color: #FFFFFF; margin: 30rpx 0 0 30rpx; From 99925bf4687934bec7873aff2d49aff72309c6c6 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Fri, 24 May 2024 14:55:06 +0800 Subject: [PATCH 6/7] 1 --- project.config.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/project.config.json b/project.config.json index 243fa51..49963e6 100644 --- a/project.config.json +++ b/project.config.json @@ -46,7 +46,8 @@ "minifyWXML": true, "showES6CompileOption": false, "useCompilerPlugins": false, - "condition": false + "condition": false, + "ignoreUploadUnusedFiles": true }, "compileType": "miniprogram", "libVersion": "2.19.4", From 63f090b4fa4516117017dd3f562f1f5f9b5b8179 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Mon, 27 May 2024 18:41:19 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=98=9F=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- subpages/searchResult/pages/resiInfo/resiInfo.wxml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/subpages/searchResult/pages/resiInfo/resiInfo.wxml b/subpages/searchResult/pages/resiInfo/resiInfo.wxml index 2529ce9..b36ce60 100644 --- a/subpages/searchResult/pages/resiInfo/resiInfo.wxml +++ b/subpages/searchResult/pages/resiInfo/resiInfo.wxml @@ -40,7 +40,7 @@ {{form.baseInfoDto.updatedTime}} - + {{item.name}} （{{ item.filledQty }}/{{ item.totalQty }}） @@ -112,7 +112,6 @@ {{item.agencyName}}{{item.homeName }} - * 人房关系： {{ item.resiHouseRel != null @@ -125,7 +124,6 @@ }} - * 人户状况： @@ -143,7 +141,6 @@ {{ item.placeOfDomicile?item.placeOfDomicile:'--'}} - * 与户主关系： {{dicts.houseHolderRelArr[item.houseHolderRel].label || "--" }} @@ -162,7 +159,6 @@ }} - * 就业状态： {{dicts.careerStatusArr[form.workInfoDto.careerStatus].label || '--'}}