sxyanzhu
/
jhwxapp
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

简化代码

main
姜玉琦 2023-08-27 13:20:30 +08:00
parent a938ea25c2
commit e31eec216c
17 changed files with 77 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
miniprogram/app.wxss
View File

@ -1486,8 +1486,8 @@ swiper-item video{
padding-right: 25rpx; padding-right: 25rpx;
} }
.problem_submit_to_delete{ .problem_submit_to_delete{
border-bottom: 1px solid red; border-bottom: 1px solid #c13636;
background-color: red; background-color: #c13636;
} }
.code_label{ .code_label{
font-size: 0.6rem; font-size: 0.6rem;

BIN
miniprogram/images/delete.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 385 B

4
miniprogram/pageage/project_checking/info/index.js
View File

@ -79,7 +79,7 @@ Page({
let that = this let that = this
wx.showModal({ wx.showModal({
title: '提示', title: '提示',
content: '是否确定撤回删除此条数据？', content: '是否确定删除此条数据？',
success: function (sm) { success: function (sm) {
if (sm.confirm) { if (sm.confirm) {
// 用户点击了确定 可以调用了 // 用户点击了确定 可以调用了
@ -93,7 +93,7 @@ Page({
deleteData(){ deleteData(){
let {id} = this.data let {id} = this.data
wx.request({ wx.request({
url: app.globalData.reqUrl+'/wechat/projectProblemmodify/remove', url: app.globalData.reqUrl+'/wechat/projectchecking/remove',
data:{ data:{
id:id id:id
}, },

2
miniprogram/pageage/project_checking/info/index.wxml
View File

@ -76,5 +76,5 @@
</view> </view>
</view> </view>
<view class="problem_submit_to" wx:if="{{showDel}}"> <view class="problem_submit_to" wx:if="{{showDel}}">
<view class="problem_submit_to_btn problem_submit_to_delete" bindtap="onDelete">撤回删除</view> <view class="problem_submit_to_btn problem_submit_to_delete" bindtap="onDelete">删除</view>
</view> </view>

2
miniprogram/pageage/project_problemmodify/quality/add/index.js
View File

@ -96,7 +96,7 @@ Page({
success(res){ success(res){
res = res.data res = res.data
if(res.code == 200){ if(res.code == 200){
let list=[{"id":"",text:""}]; let list=[];
res.data.forEach(it =>{ res.data.forEach(it =>{
list.push({"id":it.dictValue,"text":it.dictLabel}); list.push({"id":it.dictValue,"text":it.dictLabel});
}) })

2
miniprogram/pageage/project_problemmodify/quality/info/index.js
View File

@ -111,7 +111,7 @@ Page({
let that = this let that = this
wx.showModal({ wx.showModal({
title: '提示', title: '提示',
content: '是否确定撤回删除此条数据？', content: '是否确定删除此条数据？',
success: function (sm) { success: function (sm) {
if (sm.confirm) { if (sm.confirm) {
// 用户点击了确定 可以调用了 // 用户点击了确定 可以调用了

2
miniprogram/pageage/project_problemmodify/quality/info/index.wxml
View File

@ -130,5 +130,5 @@
</view> </view>
</view> </view>
<view class="problem_submit_to" wx:if="{{showDel}}"> <view class="problem_submit_to" wx:if="{{showDel}}">
<view class="problem_submit_to_btn problem_submit_to_delete" bindtap="onDelete">撤回删除</view> <view class="problem_submit_to_btn problem_submit_to_delete" bindtap="onDelete">删除</view>
</view> </view>

2
miniprogram/pageage/project_problemmodify/security/info/index.js
View File

@ -109,7 +109,7 @@ Page({
let that = this let that = this
wx.showModal({ wx.showModal({
title: '提示', title: '提示',
content: '是否确定撤回删除此条数据？', content: '是否确定删除此条数据？',
success: function (sm) { success: function (sm) {
if (sm.confirm) { if (sm.confirm) {
// 用户点击了确定 可以调用了 // 用户点击了确定 可以调用了

4
miniprogram/pageage/project_problemmodify/security/info/index.wxml
View File

@ -130,5 +130,7 @@
</view> </view>
</view> </view>
<view class="problem_submit_to" wx:if="{{showDel}}"> <view class="problem_submit_to" wx:if="{{showDel}}">
<view class="problem_submit_to_btn problem_submit_to_delete" bindtap="onDelete">撤回删除</view>
<view class="problem_submit_to_btn problem_submit_to_delete" bindtap="onDelete">
删除</view>
</view> </view>

2
miniprogram/pageage/xiangmuhuanjing/xiangmuhuanjing.js
View File

@ -778,7 +778,7 @@ Page({
getProjectlngandlat: function (even) { getProjectlngandlat: function (even) {
var that = this; var that = this;
wx.request({ wx.request({
url: app.globalData.reqUrl + '/weixin/projectInfo/getProjectFoundation', url: app.globalData.reqUrl + '/wechat/project/getProjectFoundation',
data: { data: {
"id": even "id": even
}, },

2
miniprogram/pageage/xiangmuyujing/xiangmuyujing.js
View File

@ -1065,7 +1065,7 @@ Page({
getEarlyWarningData:function(even){ getEarlyWarningData:function(even){
var that =this; var that =this;
wx.request({ wx.request({
url: app.globalData.reqUrl+'/weixin/projectInfo/getProjectFoundation', url: app.globalData.reqUrl+'/wechat/project/getProjectFoundation',
data:{ data:{
"id":even "id":even
}, },

40
miniprogram/pages/gongchengliebiao/gongchengliebiao.js
View File

@ -310,21 +310,18 @@ Page({
value2:app.globalData.value2, value2:app.globalData.value2,
value3:app.globalData.value3 value3:app.globalData.value3
}) })
var json =JSON.parse(app.globalData.projectInfoList); let _dataList = app.globalData.projectInfoList;
if(json.find(item=>item.id=="-1")){
json.splice(json.findIndex(item=>item.id=="-1"),json.length);
}
if(app.globalData.type == "1"){ if(app.globalData.type == "1"){
that.setData({ that.setData({
"type":'1', "type":'1',
title:"工程列表", title:"工程列表",
proCount:json.length, proCount:_dataList.length,
projectInfoList:json, projectInfoList:_dataList,
}) })
}else{ }else{
that.setData({ that.setData({
projectInfoList:JSON.parse(app.globalData.projectInfoList), projectInfoList:_dataList,
proCount:JSON.parse(app.globalData.projectInfoList).length, proCount:_dataList.length,
title:"预警列表", title:"预警列表",
"type":'2', "type":'2',
}) })
@ -343,14 +340,16 @@ Page({
getFilstDept:function(even,even1){ getFilstDept:function(even,even1){
var that = this; var that = this;
wx.request({ wx.request({
url: app.globalData.reqUrl+'/weixin/projectInfo/selectDeptAll', url: app.globalData.reqUrl+'/wechat/selectDeptAll',
data:{ data:{
"deptId":even, "deptId":even,
"userId":even1 "userId":even1,
"minRoleId":that.data.userInfo?.minRoleId
}, },
method:"GET", method:"GET",
success:function(res){ success:function(res){
console.log(res.data); console.log(res.data);
res = res.data;
//判断登录是否项目人员 //判断登录是否项目人员
if(res.data.projectId != undefined){ 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}] 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){ getDeptSubordinate:function(provinceId){
var that = this; var that = this;
wx.request({ wx.request({
url: app.globalData.reqUrl+'/weixin/projectInfo/selectDeptSubordinate', url: app.globalData.reqUrl+'/wechat/project/selectDeptSubordinate',
data:{ data:{
"userId":this.data.userInfo.userId, "userId":this.data.userInfo.userId,
"provinceId":provinceId, "provinceId":provinceId,
@ -449,13 +448,14 @@ Page({
selectProjectByCompanyId:function(deptId,provinceId,cityId,areaId){ selectProjectByCompanyId:function(deptId,provinceId,cityId,areaId){
var that = this; var that = this;
wx.request({ wx.request({
url: app.globalData.reqUrl+'/weixin/projectInfo/selectProjectByCompanyId', url: app.globalData.reqUrl+'/wechat/project/selectProjectByCompanyId',
data:{ data:{
"userId":this.data.userInfo.userId, "userId":this.data.userInfo.userId,
"deptId":deptId, "deptId":deptId,
"provinceId":provinceId, "provinceId":provinceId,
"cityId":cityId, "cityId":cityId,
"areaId":areaId "areaId":areaId,
"minRoleId":that.data.userInfo.minRoleId
}, },
method:"GET", method:"GET",
success:function(res){ success:function(res){
@ -484,7 +484,7 @@ Page({
selectCompanyJG:function(deptId,state){ selectCompanyJG:function(deptId,state){
var that = this; var that = this;
wx.request({ wx.request({
url: app.globalData.reqUrl+'/weixin/projectInfo/selectCompanyJG', url: app.globalData.reqUrl+'/wechat/project/selectCompanyJG',
data:{ data:{
"deptId":deptId "deptId":deptId
}, },
@ -538,18 +538,16 @@ Page({
that.setData({Fuzzylist:[]}); that.setData({Fuzzylist:[]});
if(event.detail.value != ""){ if(event.detail.value != ""){
wx.request({ wx.request({
url: app.globalData.reqUrl+'/weixin/projectInfo/selectProjectInfoByName', url: app.globalData.reqUrl+'/wechat/project/selectProjectInfoByName',
data:{ data:{
"projectName":event.detail.value, "projectName":event.detail.value,
"deptId":this.data.FuzzyDeptId, "userId":that.data.userInfo.userId,
"companyId":this.data.FuzzyCompanyId, "deptId":that.data.jt.length==1?that.data.userInfo.deptId:(wx.getStorageSync('select_dept_id')==""?"0":wx.getStorageSync('select_dept_id')),
"type":this.data.FuzzyType, "minRoleId":that.data.userInfo.minRoleId
"projectId":this.data.FuzzyPorjectId,
"ifSonCompany":this.data.FuzzyifSonCompany,
"state":app.globalData.type
}, },
method:"GET", method:"GET",
success:function(res){ success:function(res){
res = res.data;
that.setData({ that.setData({
Fuzzylist:res.data Fuzzylist:res.data
}) })

27
miniprogram/pages/login/login.js
View File

@ -54,6 +54,7 @@ Page({
"appId": app.globalData.appId, "appId": app.globalData.appId,
}, },
success:(res)=>{ success:(res)=>{
res = res.data;
this.onClickHide(); this.onClickHide();
this.setData({ this.setData({
openId:res.data.openid, openId:res.data.openid,
@ -93,10 +94,10 @@ Page({
key: 'userinfo', key: 'userinfo',
data: res.data.data.userinfo data: res.data.data.userinfo
}); });
wx.setStorageSync({ // wx.setStorageSync({
key: 'token', // key: 'token',
data: res.data.token // data: res.data.token
}); // });
that.onClickHide(); that.onClickHide();
let rd = res.data.data; let rd = res.data.data;
//只有一个项目时直接跳转详情页 //只有一个项目时直接跳转详情页
@ -125,8 +126,8 @@ Page({
//登录 //登录
userLogin:function(){ userLogin:function(){
var that = this; var that = this;
var username = this.data.username; var username = that.data.username;
var password = this.data.password; var password = that.data.password;
if(username == ""){ if(username == ""){
app.toast("账号不能为空"); app.toast("账号不能为空");
return; return;
@ -135,6 +136,10 @@ Page({
app.toast("密码不能为空"); app.toast("密码不能为空");
return; return;
} }
if(!that.data.openId){
app.toast("获取微信小程序授权失败，请重启应用或微信再试！如果还是授权失败，请删除应用后再试...");
return;
}
//启动蒙版 //启动蒙版
that.onClickShow(); that.onClickShow();
//发送请求 //发送请求
@ -143,7 +148,7 @@ Page({
data:{ data:{
"username":username, "username":username,
"password":password, "password":password,
"openId":this.data.openId, "openId":that.data.openId,
}, },
method:"POST", method:"POST",
success(res){ success(res){
@ -155,10 +160,10 @@ Page({
key: 'userinfo', key: 'userinfo',
data: res.data.data.userinfo data: res.data.data.userinfo
}); });
wx.setStorageSync({ // wx.setStorageSync({
key: 'token', // key: 'token',
data: res.data.token // data: res.data.token
}); // });
wx.setStorageSync('isReload', ""); wx.setStorageSync('isReload', "");
let rd = res.data.data; let rd = res.data.data;
//只有一个项目时直接跳转详情页 //只有一个项目时直接跳转详情页

17
miniprogram/pages/map/map.js
View File

@ -330,14 +330,16 @@ Page({
getFilstDept:function(deptId,userId){ getFilstDept:function(deptId,userId){
var that = this; var that = this;
wx.request({ wx.request({
url: app.globalData.reqUrl+'/weixin/projectInfo/selectDeptAll', url: app.globalData.reqUrl+'/wechat/selectDeptAll',
data:{ data:{
"deptId":deptId, "deptId":deptId,
"userId":userId "userId":userId,
"minRoleId":that.data.userInfo?.minRoleId
}, },
method:"GET", method:"GET",
success:function(res){ success:function(res){
console.log(res.data); console.log(res.data);
res = res.data;
//判断登录是否项目人员 //判断登录是否项目人员
if(res.data.projectId != undefined){ 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}]; 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){ getDeptSubordinate:function(provinceId){
var that = this; var that = this;
wx.request({ wx.request({
url: app.globalData.reqUrl+'/weixin/projectInfo/selectDeptSubordinate', url: app.globalData.reqUrl+'/wechat/project/selectDeptSubordinate',
data:{ data:{
"userId":this.data.userInfo.userId, "userId":this.data.userInfo.userId,
"provinceId":provinceId, "provinceId":provinceId,
@ -451,13 +453,14 @@ Page({
selectProjectByCompanyId:function(deptId,provinceId,cityId,areaId){ selectProjectByCompanyId:function(deptId,provinceId,cityId,areaId){
var that = this; var that = this;
wx.request({ wx.request({
url: app.globalData.reqUrl+'/weixin/projectInfo/selectProjectByCompanyId', url: app.globalData.reqUrl+'/wechat/project/selectProjectByCompanyId',
data:{ data:{
"userId":this.data.userInfo.userId, "userId":that.data.userInfo.userId,
"deptId":deptId, "deptId":deptId,
"provinceId":provinceId, "provinceId":provinceId,
"cityId":cityId, "cityId":cityId,
"areaId":areaId "areaId":areaId,
"minRoleId":that.data.userInfo.minRoleId
}, },
method:"GET", method:"GET",
success:function(res){ success:function(res){
@ -492,7 +495,7 @@ Page({
selectCompanyJG:function(deptId,state){ selectCompanyJG:function(deptId,state){
var that = this; var that = this;
wx.request({ wx.request({
url: app.globalData.reqUrl+'/weixin/projectInfo/selectCompanyJG', url: app.globalData.reqUrl+'/wechat/project/selectCompanyJG',
data:{ data:{
"deptId":deptId "deptId":deptId
}, },

43
miniprogram/pages/updatePassword/updatePassword.js
View File

@ -23,25 +23,6 @@ Page({
this.setData({ show: false }); 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(){ seeTap1:function(){
let that = this; let that = this;
    this.setData({     this.setData({
@ -73,18 +54,24 @@ Page({
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad: function (options) { onLoad: function (options) {
this.onClickShow(); this.onClickShow();
var that = this; var that = this;
//获取缓存数据 //获取缓存数据
wx.getStorage({ wx.getStorage({
key: 'userinfo', key: 'userinfo',
success:function(res){ success:function(res){
that.onClickHide();
that.setData({ that.setData({
loginName:res.data.loginName, 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("请输入旧密码！"); app.toast("请输入旧密码！");
return; return;
} }
if(that.data.newPsw == ''){
app.toast("请输入旧密码！");
return;
}
if(that.data.password == ''){ if(that.data.password == ''){
app.toast("请确认新密码！"); app.toast("请确认新密码！");
return; return;
@ -107,15 +90,15 @@ Page({
app.toast("两次密码输入不一致！"); app.toast("两次密码输入不一致！");
return; return;
} }
if(this.data.oldPsw.length<6){ if(that.data.oldPsw.length<6){
app.toast("请输入旧密码长度 [6-20]位字符！"); app.toast("请输入旧密码长度 [6-20]位字符！");
return; return;
} }
if(this.data.newPsw.length<6){ if(that.data.newPsw.length<6){
app.toast("请输入新密码长度 [6-20]位字符！"); app.toast("请输入新密码长度 [6-20]位字符！");
return; return;
} }
if(this.data.password.length<6){ if(that.data.password.length<6){
app.toast("请输入确认密码长度 [6-20]位字符！"); app.toast("请输入确认密码长度 [6-20]位字符！");
return; return;
} }
@ -124,7 +107,7 @@ Page({
header: { header: {
'content-type': 'application/x-www-form-urlencoded' 'content-type': 'application/x-www-form-urlencoded'
}, },
url:app.globalData.reqUrl+'/weixin/userLogin/updatePassword', url:app.globalData.reqUrl+'/wechat/updatePassword',
data:{ data:{
loginName:that.data.loginName, loginName:that.data.loginName,
oldPsw:that.data.oldPsw, oldPsw:that.data.oldPsw,

6
miniprogram/pages/updatePassword/updatePassword.wxml
View File

@ -18,7 +18,7 @@
<view class="voucher_select_max"> <view class="voucher_select_max">
<view class="voucher_select_min"> <view class="voucher_select_min">
<input placeholder="请输入旧密码" <input placeholder="请输入旧密码"
placeholder-style="color:#6777aa;" password="{{showOldPass}}" maxlength="20" class="pass" bindinput='oldPsw'/> placeholder-style="color:#6777aa;" password="{{showOldPass}}" maxlength="20" class="pass" model:value="{{oldPsw}}"/>
<image wx:if="{{showOldPass}}" class="password-icon" src="../../images/biyan.png" bindtap="seeTap1" ></image> <image wx:if="{{showOldPass}}" class="password-icon" src="../../images/biyan.png" bindtap="seeTap1" ></image>
<image wx:else class="password-icon" src="../../images/yj_01.png" bindtap="seeTap1"></image> <image wx:else class="password-icon" src="../../images/yj_01.png" bindtap="seeTap1"></image>
</view> </view>
@ -28,7 +28,7 @@
<view class="voucher_select_max"> <view class="voucher_select_max">
<view class="voucher_select_min"> <view class="voucher_select_min">
<input placeholder="请输入新密码" <input placeholder="请输入新密码"
placeholder-style="color:#6777aa;" password="{{showNewPass}}" maxlength="20" class="pass" bindinput='newPsw'/> placeholder-style="color:#6777aa;" password="{{showNewPass}}" maxlength="20" class="pass" model:value="{{newPsw}}"/>
<image class="password-icon" src="../../images/biyan.png" bindtap="seeTap2" wx:if="{{showNewPass}}"/> <image class="password-icon" src="../../images/biyan.png" bindtap="seeTap2" wx:if="{{showNewPass}}"/>
<image class="password-icon" src="../../images/yj_01.png" bindtap="seeTap2" wx:else/> <image class="password-icon" src="../../images/yj_01.png" bindtap="seeTap2" wx:else/>
</view> </view>
@ -38,7 +38,7 @@
<view class="voucher_select_max"> <view class="voucher_select_max">
<view class="voucher_select_min"> <view class="voucher_select_min">
<input placeholder="请确认新密码" <input placeholder="请确认新密码"
placeholder-style="color:#6777aa;" password="{{showPassWord}}" maxlength="20" class="pass" bindinput='password'/> placeholder-style="color:#6777aa;" password="{{showPassWord}}" maxlength="20" class="pass" model:value="{{password}}"/>
<image class="password-icon" src="../../images/biyan.png"bindtap="seeTap3" wx:if="{{showPassWord}}"/> <image class="password-icon" src="../../images/biyan.png"bindtap="seeTap3" wx:if="{{showPassWord}}"/>
<image class="password-icon" src="../../images/yj_01.png" bindtap="seeTap3" wx:else/> <image class="password-icon" src="../../images/yj_01.png" bindtap="seeTap3" wx:else/>
</view> </view>

4
miniprogram/pages/xiangmugaikuang/xiangmugaikuang.js
View File

@ -433,7 +433,7 @@ Page({
//获取项目的基本数据 //获取项目的基本数据
getProjectBaseInfo:function(even) { getProjectBaseInfo:function(even) {
wx.request({ wx.request({
url: app.globalData.reqUrl+'/weixin/projectInfo/getProjectFoundation', url: app.globalData.reqUrl+'/wechat/project/getProjectFoundation',
method:'GET', method:'GET',
data:{ data:{
id:even id:even
@ -475,7 +475,7 @@ Page({
getProjectUnitList:function(projectId) { getProjectUnitList:function(projectId) {
var that = this; var that = this;
wx.request({ wx.request({
url: app.globalData.reqUrl+'/weixin/projectInfo/getProjectUnitList', url: app.globalData.reqUrl+'/wechat/project/getProjectUnitList',
method:'GET', method:'GET',
data:{ data:{
projectId:projectId projectId:projectId