From e31eec216c15f915a71eb9f7459196afbee23bfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Sun, 27 Aug 2023 13:20:30 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- miniprogram/app.wxss | 4 +- miniprogram/images/delete.png | Bin 385 -> 0 bytes .../pageage/project_checking/info/index.js | 4 +- .../pageage/project_checking/info/index.wxml | 2 +- .../quality/add/index.js | 2 +- .../quality/info/index.js | 2 +- .../quality/info/index.wxml | 2 +- .../security/info/index.js | 2 +- .../security/info/index.wxml | 4 +- .../xiangmuhuanjing/xiangmuhuanjing.js | 2 +- .../pageage/xiangmuyujing/xiangmuyujing.js | 2 +- .../gongchengliebiao/gongchengliebiao.js | 40 ++++++++-------- miniprogram/pages/login/login.js | 27 ++++++----- miniprogram/pages/map/map.js | 17 ++++--- .../pages/updatePassword/updatePassword.js | 43 ++++++------------ .../pages/updatePassword/updatePassword.wxml | 6 +-- .../pages/xiangmugaikuang/xiangmugaikuang.js | 4 +- 17 files changed, 77 insertions(+), 86 deletions(-) delete mode 100644 miniprogram/images/delete.png diff --git a/miniprogram/app.wxss b/miniprogram/app.wxss index bd10bd4..0609808 100644 --- a/miniprogram/app.wxss +++ b/miniprogram/app.wxss @@ -1486,8 +1486,8 @@ swiper-item video{ padding-right: 25rpx; } .problem_submit_to_delete{ - border-bottom: 1px solid red; - background-color: red; + border-bottom: 1px solid #c13636; + background-color: #c13636; } .code_label{ font-size: 0.6rem; diff --git a/miniprogram/images/delete.png b/miniprogram/images/delete.png deleted file mode 100644 index 32ee0294f0062cbf1225b874c00ce5d0992a0624..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 385 zcmV-{0e=38P)Px$J4r-AR9HvtmqAVgF$_ijzXywQ66hJqh86TAz)1=#HgE>YNnpV}KKi3Dnx-?v zp#zmrBF$!G*)QL*;}Az)JaT-50VFK|+yJ;PKyLx8NxnxmR|D`Bd|7b30k9=`H#fjb z#IYnRbVafR+VRyWV1Ngb_uuX8#{iNnT`9j2RUx0v^-c3G){1PPm+{71v(9WA+E7paJ}~0v=9% z$A`x1DBRT5JvNYd$S{P*@7HL6g54Q_+f*6-j4=5wkmT|*h`%|OCnG=Cc7j(uOy-~% f^AUa-{T9F{FAs+>!*mJ#00000NkvXXu0mjf_{^YW diff --git a/miniprogram/pageage/project_checking/info/index.js b/miniprogram/pageage/project_checking/info/index.js index 93ae250..d84ae3e 100644 --- a/miniprogram/pageage/project_checking/info/index.js +++ b/miniprogram/pageage/project_checking/info/index.js @@ -79,7 +79,7 @@ Page({ let that = this wx.showModal({ title: '提示', - content: '是否确定撤回删除此条数据？', + content: '是否确定删除此条数据？', success: function (sm) { if (sm.confirm) { // 用户点击了确定 可以调用了 @@ -93,7 +93,7 @@ Page({ deleteData(){ let {id} = this.data wx.request({ - url: app.globalData.reqUrl+'/wechat/projectProblemmodify/remove', + url: app.globalData.reqUrl+'/wechat/projectchecking/remove', data:{ id:id }, diff --git a/miniprogram/pageage/project_checking/info/index.wxml b/miniprogram/pageage/project_checking/info/index.wxml index e38e7ee..bef21e3 100644 --- a/miniprogram/pageage/project_checking/info/index.wxml +++ b/miniprogram/pageage/project_checking/info/index.wxml @@ -76,5 +76,5 @@ - 撤回删除 + 删除 diff --git a/miniprogram/pageage/project_problemmodify/quality/add/index.js b/miniprogram/pageage/project_problemmodify/quality/add/index.js index 2eee6e9..609e8df 100644 --- a/miniprogram/pageage/project_problemmodify/quality/add/index.js +++ b/miniprogram/pageage/project_problemmodify/quality/add/index.js @@ -96,7 +96,7 @@ Page({ success(res){ res = res.data if(res.code == 200){ - let list=[{"id":"",text:""}]; + let list=[]; res.data.forEach(it =>{ list.push({"id":it.dictValue,"text":it.dictLabel}); }) diff --git a/miniprogram/pageage/project_problemmodify/quality/info/index.js b/miniprogram/pageage/project_problemmodify/quality/info/index.js index eec8e14..af99163 100644 --- a/miniprogram/pageage/project_problemmodify/quality/info/index.js +++ b/miniprogram/pageage/project_problemmodify/quality/info/index.js @@ -111,7 +111,7 @@ Page({ let that = this wx.showModal({ title: '提示', - content: '是否确定撤回删除此条数据？', + content: '是否确定删除此条数据？', success: function (sm) { if (sm.confirm) { // 用户点击了确定 可以调用了 diff --git a/miniprogram/pageage/project_problemmodify/quality/info/index.wxml b/miniprogram/pageage/project_problemmodify/quality/info/index.wxml index 49ab990..d4439de 100644 --- a/miniprogram/pageage/project_problemmodify/quality/info/index.wxml +++ b/miniprogram/pageage/project_problemmodify/quality/info/index.wxml @@ -130,5 +130,5 @@ - 撤回删除 + 删除 diff --git a/miniprogram/pageage/project_problemmodify/security/info/index.js b/miniprogram/pageage/project_problemmodify/security/info/index.js index a19fbb9..b063a36 100644 --- a/miniprogram/pageage/project_problemmodify/security/info/index.js +++ b/miniprogram/pageage/project_problemmodify/security/info/index.js @@ -109,7 +109,7 @@ Page({ let that = this wx.showModal({ title: '提示', - content: '是否确定撤回删除此条数据？', + content: '是否确定删除此条数据？', success: function (sm) { if (sm.confirm) { // 用户点击了确定 可以调用了 diff --git a/miniprogram/pageage/project_problemmodify/security/info/index.wxml b/miniprogram/pageage/project_problemmodify/security/info/index.wxml index 49ab990..5da89a2 100644 --- a/miniprogram/pageage/project_problemmodify/security/info/index.wxml +++ b/miniprogram/pageage/project_problemmodify/security/info/index.wxml @@ -130,5 +130,7 @@ - 撤回删除 + + + 删除 diff --git a/miniprogram/pageage/xiangmuhuanjing/xiangmuhuanjing.js b/miniprogram/pageage/xiangmuhuanjing/xiangmuhuanjing.js index 2094c76..87ecf02 100644 --- a/miniprogram/pageage/xiangmuhuanjing/xiangmuhuanjing.js +++ b/miniprogram/pageage/xiangmuhuanjing/xiangmuhuanjing.js @@ -778,7 +778,7 @@ Page({ getProjectlngandlat: function (even) { var that = this; wx.request({ - url: app.globalData.reqUrl + '/weixin/projectInfo/getProjectFoundation', + url: app.globalData.reqUrl + '/wechat/project/getProjectFoundation', data: { "id": even }, diff --git a/miniprogram/pageage/xiangmuyujing/xiangmuyujing.js b/miniprogram/pageage/xiangmuyujing/xiangmuyujing.js index 0cbce44..b50d8d6 100644 --- a/miniprogram/pageage/xiangmuyujing/xiangmuyujing.js +++ b/miniprogram/pageage/xiangmuyujing/xiangmuyujing.js @@ -1065,7 +1065,7 @@ Page({ getEarlyWarningData:function(even){ var that =this; wx.request({ - url: app.globalData.reqUrl+'/weixin/projectInfo/getProjectFoundation', + url: app.globalData.reqUrl+'/wechat/project/getProjectFoundation', data:{ "id":even }, diff --git a/miniprogram/pages/gongchengliebiao/gongchengliebiao.js b/miniprogram/pages/gongchengliebiao/gongchengliebiao.js index e2c6ede..892739a 100644 --- a/miniprogram/pages/gongchengliebiao/gongchengliebiao.js +++ b/miniprogram/pages/gongchengliebiao/gongchengliebiao.js @@ -310,21 +310,18 @@ Page({ value2:app.globalData.value2, value3:app.globalData.value3 }) - var json =JSON.parse(app.globalData.projectInfoList); - if(json.find(item=>item.id=="-1")){ - json.splice(json.findIndex(item=>item.id=="-1"),json.length); - } + let _dataList = app.globalData.projectInfoList; if(app.globalData.type == "1"){ that.setData({ "type":'1', title:"工程列表", - proCount:json.length, - projectInfoList:json, + proCount:_dataList.length, + projectInfoList:_dataList, }) }else{ that.setData({ - projectInfoList:JSON.parse(app.globalData.projectInfoList), - proCount:JSON.parse(app.globalData.projectInfoList).length, + projectInfoList:_dataList, + proCount:_dataList.length, title:"预警列表", "type":'2', }) @@ -343,14 +340,16 @@ Page({ getFilstDept:function(even,even1){ var that = this; wx.request({ - url: app.globalData.reqUrl+'/weixin/projectInfo/selectDeptAll', + url: app.globalData.reqUrl+'/wechat/selectDeptAll', data:{ "deptId":even, - "userId":even1 + "userId":even1, + "minRoleId":that.data.userInfo?.minRoleId }, method:"GET", success:function(res){ console.log(res.data); + res = res.data; //判断登录是否项目人员 if(res.data.projectId != undefined){ var projectData = [{projectId:res.data.projectId,projectName:res.data.projectName,projectAddress:res.data.projectAddress,companyName:res.data.companyName,streamNumber:res.data.streamNumber,projectCount:res.data.projectCount,videoNum:res.data.videoNum,monitoringCount:res.data.monitoringCount}] @@ -411,7 +410,7 @@ Page({ getDeptSubordinate:function(provinceId){ var that = this; wx.request({ - url: app.globalData.reqUrl+'/weixin/projectInfo/selectDeptSubordinate', + url: app.globalData.reqUrl+'/wechat/project/selectDeptSubordinate', data:{ "userId":this.data.userInfo.userId, "provinceId":provinceId, @@ -449,13 +448,14 @@ Page({ selectProjectByCompanyId:function(deptId,provinceId,cityId,areaId){ var that = this; wx.request({ - url: app.globalData.reqUrl+'/weixin/projectInfo/selectProjectByCompanyId', + url: app.globalData.reqUrl+'/wechat/project/selectProjectByCompanyId', data:{ "userId":this.data.userInfo.userId, "deptId":deptId, "provinceId":provinceId, "cityId":cityId, - "areaId":areaId + "areaId":areaId, + "minRoleId":that.data.userInfo.minRoleId }, method:"GET", success:function(res){ @@ -484,7 +484,7 @@ Page({ selectCompanyJG:function(deptId,state){ var that = this; wx.request({ - url: app.globalData.reqUrl+'/weixin/projectInfo/selectCompanyJG', + url: app.globalData.reqUrl+'/wechat/project/selectCompanyJG', data:{ "deptId":deptId }, @@ -538,18 +538,16 @@ Page({ that.setData({Fuzzylist:[]}); if(event.detail.value != ""){ wx.request({ - url: app.globalData.reqUrl+'/weixin/projectInfo/selectProjectInfoByName', + url: app.globalData.reqUrl+'/wechat/project/selectProjectInfoByName', data:{ "projectName":event.detail.value, - "deptId":this.data.FuzzyDeptId, - "companyId":this.data.FuzzyCompanyId, - "type":this.data.FuzzyType, - "projectId":this.data.FuzzyPorjectId, - "ifSonCompany":this.data.FuzzyifSonCompany, - "state":app.globalData.type + "userId":that.data.userInfo.userId, + "deptId":that.data.jt.length==1?that.data.userInfo.deptId:(wx.getStorageSync('select_dept_id')==""?"0":wx.getStorageSync('select_dept_id')), + "minRoleId":that.data.userInfo.minRoleId }, method:"GET", success:function(res){ + res = res.data; that.setData({ Fuzzylist:res.data }) diff --git a/miniprogram/pages/login/login.js b/miniprogram/pages/login/login.js index 01c07fb..f5d141e 100644 --- a/miniprogram/pages/login/login.js +++ b/miniprogram/pages/login/login.js @@ -54,6 +54,7 @@ Page({ "appId": app.globalData.appId, }, success:(res)=>{ + res = res.data; this.onClickHide(); this.setData({ openId:res.data.openid, @@ -93,10 +94,10 @@ Page({ key: 'userinfo', data: res.data.data.userinfo }); - wx.setStorageSync({ - key: 'token', - data: res.data.token - }); + // wx.setStorageSync({ + // key: 'token', + // data: res.data.token + // }); that.onClickHide(); let rd = res.data.data; //只有一个项目时直接跳转详情页 @@ -125,8 +126,8 @@ Page({ //登录 userLogin:function(){ var that = this; - var username = this.data.username; - var password = this.data.password; + var username = that.data.username; + var password = that.data.password; if(username == ""){ app.toast("账号不能为空"); return; @@ -135,6 +136,10 @@ Page({ app.toast("密码不能为空"); return; } + if(!that.data.openId){ + app.toast("获取微信小程序授权失败，请重启应用或微信再试！如果还是授权失败，请删除应用后再试..."); + return; + } //启动蒙版 that.onClickShow(); //发送请求 @@ -143,7 +148,7 @@ Page({ data:{ "username":username, "password":password, - "openId":this.data.openId, + "openId":that.data.openId, }, method:"POST", success(res){ @@ -155,10 +160,10 @@ Page({ key: 'userinfo', data: res.data.data.userinfo }); - wx.setStorageSync({ - key: 'token', - data: res.data.token - }); + // wx.setStorageSync({ + // key: 'token', + // data: res.data.token + // }); wx.setStorageSync('isReload', ""); let rd = res.data.data; //只有一个项目时直接跳转详情页 diff --git a/miniprogram/pages/map/map.js b/miniprogram/pages/map/map.js index 1713add..e87202f 100644 --- a/miniprogram/pages/map/map.js +++ b/miniprogram/pages/map/map.js @@ -330,14 +330,16 @@ Page({ getFilstDept:function(deptId,userId){ var that = this; wx.request({ - url: app.globalData.reqUrl+'/weixin/projectInfo/selectDeptAll', + url: app.globalData.reqUrl+'/wechat/selectDeptAll', data:{ "deptId":deptId, - "userId":userId + "userId":userId, + "minRoleId":that.data.userInfo?.minRoleId }, method:"GET", success:function(res){ console.log(res.data); + res = res.data; //判断登录是否项目人员 if(res.data.projectId != undefined){ var markers = [{id:0,projectId:res.data.projectId,longitude:res.data.longitude,latitude:res.data.latitude,projectName:res.data.projectName}]; @@ -412,7 +414,7 @@ Page({ getDeptSubordinate:function(provinceId){ var that = this; wx.request({ - url: app.globalData.reqUrl+'/weixin/projectInfo/selectDeptSubordinate', + url: app.globalData.reqUrl+'/wechat/project/selectDeptSubordinate', data:{ "userId":this.data.userInfo.userId, "provinceId":provinceId, @@ -451,13 +453,14 @@ Page({ selectProjectByCompanyId:function(deptId,provinceId,cityId,areaId){ var that = this; wx.request({ - url: app.globalData.reqUrl+'/weixin/projectInfo/selectProjectByCompanyId', + url: app.globalData.reqUrl+'/wechat/project/selectProjectByCompanyId', data:{ - "userId":this.data.userInfo.userId, + "userId":that.data.userInfo.userId, "deptId":deptId, "provinceId":provinceId, "cityId":cityId, - "areaId":areaId + "areaId":areaId, + "minRoleId":that.data.userInfo.minRoleId }, method:"GET", success:function(res){ @@ -492,7 +495,7 @@ Page({ selectCompanyJG:function(deptId,state){ var that = this; wx.request({ - url: app.globalData.reqUrl+'/weixin/projectInfo/selectCompanyJG', + url: app.globalData.reqUrl+'/wechat/project/selectCompanyJG', data:{ "deptId":deptId }, diff --git a/miniprogram/pages/updatePassword/updatePassword.js b/miniprogram/pages/updatePassword/updatePassword.js index 2a74f2a..685bb19 100644 --- a/miniprogram/pages/updatePassword/updatePassword.js +++ b/miniprogram/pages/updatePassword/updatePassword.js @@ -23,25 +23,6 @@ Page({ this.setData({ show: false }); }, - //获取填写的旧密码信息 - oldPsw:function(even){ - this.setData({ - oldPsw:even.detail.value - }) - }, - //获取填写的新密码信息 - newPsw:function(even){ - this.setData({ - newPsw:even.detail.value - }) - }, - //获取填写的新密码信息 - password:function(even){ - this.setData({ - password:even.detail.value - }) - }, - seeTap1:function(){ let that = this;     this.setData({ @@ -73,18 +54,24 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad: function (options) { - this.onClickShow(); + this.onClickShow(); var that = this; //获取缓存数据 wx.getStorage({ key: 'userinfo', success:function(res){ + that.onClickHide(); that.setData({ loginName:res.data.loginName, - }) + }) + if(that.data.loginName == null || that.data.loginName == ""){ + app.toast("数据异常！！"); + wx.redirectTo({ + url: '../updatePassword/updatePassword' + }) + } } }) - this.onClickHide(); }, /** * 添加预警信息 @@ -95,10 +82,6 @@ Page({ app.toast("请输入旧密码！"); return; } - if(that.data.newPsw == ''){ - app.toast("请输入旧密码！"); - return; - } if(that.data.password == ''){ app.toast("请确认新密码！"); return; @@ -107,15 +90,15 @@ Page({ app.toast("两次密码输入不一致！"); return; } - if(this.data.oldPsw.length<6){ + if(that.data.oldPsw.length<6){ app.toast("请输入旧密码长度 [6-20]位字符！"); return; } - if(this.data.newPsw.length<6){ + if(that.data.newPsw.length<6){ app.toast("请输入新密码长度 [6-20]位字符！"); return; } - if(this.data.password.length<6){ + if(that.data.password.length<6){ app.toast("请输入确认密码长度 [6-20]位字符！"); return; } @@ -124,7 +107,7 @@ Page({ header: { 'content-type': 'application/x-www-form-urlencoded' }, - url:app.globalData.reqUrl+'/weixin/userLogin/updatePassword', + url:app.globalData.reqUrl+'/wechat/updatePassword', data:{ loginName:that.data.loginName, oldPsw:that.data.oldPsw, diff --git a/miniprogram/pages/updatePassword/updatePassword.wxml b/miniprogram/pages/updatePassword/updatePassword.wxml index 3b8fdcb..d73d41f 100644 --- a/miniprogram/pages/updatePassword/updatePassword.wxml +++ b/miniprogram/pages/updatePassword/updatePassword.wxml @@ -18,7 +18,7 @@ + placeholder-style="color:#6777aa;" password="{{showOldPass}}" maxlength="20" class="pass" model:value="{{oldPsw}}"/> @@ -28,7 +28,7 @@ + placeholder-style="color:#6777aa;" password="{{showNewPass}}" maxlength="20" class="pass" model:value="{{newPsw}}"/> @@ -38,7 +38,7 @@ + placeholder-style="color:#6777aa;" password="{{showPassWord}}" maxlength="20" class="pass" model:value="{{password}}"/> diff --git a/miniprogram/pages/xiangmugaikuang/xiangmugaikuang.js b/miniprogram/pages/xiangmugaikuang/xiangmugaikuang.js index dd0639c..5ece969 100644 --- a/miniprogram/pages/xiangmugaikuang/xiangmugaikuang.js +++ b/miniprogram/pages/xiangmugaikuang/xiangmugaikuang.js @@ -433,7 +433,7 @@ Page({ //获取项目的基本数据 getProjectBaseInfo:function(even) { wx.request({ - url: app.globalData.reqUrl+'/weixin/projectInfo/getProjectFoundation', + url: app.globalData.reqUrl+'/wechat/project/getProjectFoundation', method:'GET', data:{ id:even @@ -475,7 +475,7 @@ Page({ getProjectUnitList:function(projectId) { var that = this; wx.request({ - url: app.globalData.reqUrl+'/weixin/projectInfo/getProjectUnitList', + url: app.globalData.reqUrl+'/wechat/project/getProjectUnitList', method:'GET', data:{ projectId:projectId