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

提交问题

main
姜玉琦 2023-10-16 00:00:50 +08:00
parent 92a951339c
commit 1c65a3b715
30 changed files with 962 additions and 360 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
miniprogram/app.json
View File

@ -1,6 +1,5 @@
{
"pages": [
"pages/login2/login",
"pages/login/login",
"pages/gongchengliebiao/gongchengliebiao",
"pages/gengduogongneng/gengduogongneng",
@ -79,11 +78,13 @@
"project_problemmodify/security/modify/index",
"project_problemmodify/security/check/index",
"project_problemmodify/security/add/index",
"project_problemmodify/security/draft/index",
"project_problemmodify/quality/list/index",
"project_problemmodify/quality/info/index",
"project_problemmodify/quality/modify/index",
"project_problemmodify/quality/check/index",
"project_problemmodify/quality/add/index",
"project_problemmodify/quality/draft/index",
"project_schedule/list/index",
"project_schedule/add/index",
"project_schedule/info/index",

24
miniprogram/app.wxss
View File

@ -828,6 +828,12 @@ page{
padding-left: 40rpx;
background: url("http://fileimg.makalu.cc/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx;
}
.module_title_2{
height: 40rpx;
line-height: 40rpx;
padding-left: 40rpx;
background: url("http://fileimg.makalu.cc/CORE_B1C818B4CF2C44FE9D96624589329EBC.png") no-repeat left/35rpx;
}
.safety_inspect{
padding:30rpx 20rpx;
}
@ -1280,6 +1286,22 @@ swiper-item video{
width: 40rpx;
height: 40rpx;
}
.inspect_add_to_darft{
position: fixed;
left: 30rpx;
bottom: 50rpx;
width: 120rpx;
height: 120rpx;
border-radius: 50%;
background: #273252;
text-align: center;
font-size: 26rpx;
color: #b0ccf5
}
.inspect_add_to_darft image{
width: 40rpx;
height: 40rpx;
}
.add_to_font_size{
font-size: 50rpx !important;
}
@ -1429,7 +1451,7 @@ swiper-item video{
}
.module_see_info_delete{
font-size: 26rpx;
color: #ff0000;
color: #ef4a4a;
display: flex;
align-items: center;
}

325
miniprogram/pageage/project_problemmodify/quality/draft/index.js 100644
View File

@ -0,0 +1,325 @@
// pageage/safetyManagement/addSafetyInspect/index.js
const app = getApp()
Page({
/**
* 页面的初始数据
*/
data: {
maxDate:new Date(2088,1,1).getTime(),
minDate:new Date().getTime()+(3600*48*1000),
projectId:"",
projectName:"",
loginName:"",
userName:"",
rectifierData:[],
loadShow:false,
showHis:false,
inspectInfoData:[
{
image_upload:[]
}
],
lordSent:"",
lordSentUser:"",
},
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
//获取缓存数据
wx.getStorage({
key: 'userinfo',
success:res=>{
this.setData({
projectId:app.globalData.projectId,
projectName:app.globalData.projectName,
loginName:res.data.loginName,
userName:res.data.nickName
})
this.getAllProjectUserData();
this.getHisInfo();
}
})
},
//查询项目人员数据
getAllProjectUserData(){
let that = this
wx.request({
url: app.globalData.reqUrl+'/wechat/projectuserinfo/selectProjectUnitUser',
method:"get",
data:{
projectId:that.data.projectId,
loginName:that.data.loginName
},
header:{
'content-type': 'application/x-www-form-urlencoded'
},
success(res){
res = res.data
if(res.code == 200){
that.setData({
rectifierData:res.data
})
}
}
})
},
getHisInfo(){
//这里查询当前登录人上次提交隐患，自动填充整改人，复检人，抄送人
let that = this
wx.request({
url: app.globalData.reqUrl+'/wechat/projectProblemmodify/findDraftLastDataByParams',
method:"get",
data:{
projectId:that.data.projectId,
createUser:that.data.loginName,
infoType:1
},
header:{
'content-type': 'application/x-www-form-urlencoded'
},
success(res){
res = res.data
if(res.code == 200 && res.data){
that.setData({
showHis:true,
lordSent:res.data.lordSent,
lordSentUser:res.data.lordSentUser
})
}
}
})
},
// list 上传图片
onImagesArr(e){
var index = e.currentTarget.dataset.index
var data = this.data.inspectInfoData
data[index].image_upload = e.detail
this.setData({
inspectInfoData:data
})
},
//添加整改人
onAddLordSent(e){
if(e.detail.length>0){
this.setData({
lordSent:e.detail[0].userName,
lordSentUser:e.detail[0].phoneNumber
})
}
},
//取消页面
cancelSaveView(){
this.returnToPage()
},
//保存
onProblemSubmitSave(){
this.setData({
loadShow:true
})
let that = this
let {projectId,projectName,lordSent,lordSentUser,loginName,inspectInfoData} = that.data;
//数据效验
if(projectId==""||loginName==""){
app.toast("数据异常，请刷新页面重试!")
that.setData({
loadShow:false
})
return;
}
if(lordSent==""||lordSentUser==""){
app.toast("请选择整改人!")
that.setData({
loadShow:false
})
return;
}
let fileUrls = [];
inspectInfoData.forEach(async (item)=>{
let beforeCheckUrl = [];
item.image_upload.forEach(async (it)=>{
let uploadUrl = app.globalData.uploadUrl+'/common/upload'
let name = "file";
//这里复杂的图片上传，改为同步上传，因为小程序只能上传一张图片
let obj = await that.syncUploadImage(uploadUrl,it,name);
beforeCheckUrl.push(obj.data.fileName);
if(beforeCheckUrl.length >= item.image_upload.length){
fileUrls.push(beforeCheckUrl);
}
//验证图片上传完毕
if(fileUrls.length >= inspectInfoData.length){
let params = {
projectId,
infoType:"1",
problemArea:projectName,
lordSent,
lordSentUser,
checkState:0,
fileUrls:fileUrls,
createUser:loginName
}
wx.request({
url: app.globalData.reqUrl + '/wechat/projectProblemmodify/addQualityDraft',
method:"POST",
data:params,
header: {
"Username": loginName,
"Content-Type": "application/json"
},
success(res){
that.setData({
loadShow:false
})
res = res.data
if(res.code == 200){
app.toast("添加成功!")
setTimeout(()=>{
if(wx.getStorageSync('nav-menu')=="list"){
wx.redirectTo({
url: '../list/index',
})
}else{
wx.redirectTo({
url: '../../../../pages/quality_manage/index',
})
}
},200);
}
}
})
}
});
})
},
/**
* 这里考虑上传图片异步问题，封装为同步
*/
syncUploadImage(url,uploadFile,name) {
return new Promise((resolve, reject) => {
wx.uploadFile({
url, // 上传的服务器接口地址
filePath: uploadFile,
header: {
"Content-Type": "application/x-www-form-urlencoded;charset=UTF-8"
},
name, //上传的所需字段，后端提供
formData: { user: 'test' },
success: (res) => {
// 上传完成操作
const data = JSON.parse(res.data)
resolve({
data: data
})
},
fail: (err) => {
//上传失败：修改pedding为reject
console.log("访问接口失败", err);
wx.showToast({
title: "网络出错,上传失败",
icon: 'none',
duration: 1000
});
reject(err)
}
});
})
},
returnToPage: function () {
/*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
if(wx.getStorageSync('nav-menu')=="list"){
wx.redirectTo({
url: '../list/index',
})
}else{
wx.redirectTo({
url: '../../../../pages/quality_manage/index',
})
}
},
//新增问题
onNewIssues(){
var data = this.data.inspectInfoData
if(data.length==5){
app.toast("一次最多只能提交5个问题!");
return false;
}
data.push(
{
image_upload:[]
}
)
this.setData({
inspectInfoData:data
})
},
//删除
onNewIssuesDelete(e){
var index = e.currentTarget.dataset.index
var data = this.data.inspectInfoData
data.splice(index, 1)　
this.setData({
inspectInfoData:data
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage() {
}
})

7
miniprogram/pageage/project_problemmodify/quality/draft/index.json 100644
View File

@ -0,0 +1,7 @@
{
"usingComponents": {
"van-overlay": "@vant/weapp/overlay/index"
},
"navigationStyle":"custom",
"navigationBarTitleText": "新增质量隐患"
}

107
miniprogram/pageage/project_problemmodify/quality/draft/index.wxml 100644
View File

@ -0,0 +1,107 @@
<!--pageage/safetyManagement/addSafetyInspect/index.wxml-->
<view class="header_title">
<view class="header_title_row">
<van-row>
<van-col span="4">
<view class="header_img" bindtap="returnToPage"><image src="/images/left.png"></image></view>
</van-col>
<van-col span="15">
<view class="header_name">新增质量隐患草稿</view>
</van-col>
</van-row>
</view>
</view>
<view class="max_content">
<view class="inspect_info ">
<view class="module_title_2 module_title_flex">
<view>{{projectName}}</view>
</view>
<view class="inspect_info_list">
<view class="inspect_info_title" style="padding: 20rpx 0 10rpx;">整改人员</view>
<view class="inspect_info_content">
<select-group-person rectifierData="{{rectifierData}}" multiple="{{fales}}" bindselected="onAddLordSent" index="1" title="请选择整改人员" choose="{{lordSent}}">
</select-group-person>
</view>
</view>
<view class="safety_inspect_title module_title_flex" wx:if="{{showHis}}">
<text class="color_orange">已自动填充上次选择的隐患整改人员。</text>
</view>
<view class="inspect_info_list" wx:for="{{inspectInfoData}}" wx:key="index">
<view class="module_title module_title_flex">
<view>问题 {{index + 1}}</view>
<view class="module_see_info_delete" wx:if="{{index != 0}}" bindtap="onNewIssuesDelete" data-index="{{index}}"><van-icon name="delete" /> 删除</view>
</view>
<view class="inspect_info_list">
<view class="inspect_info_title" style="padding: 20rpx 0 20rpx;">检查图片</view>
<view class="problem_list_info_con">
<file-uploader bindimages="onImagesArr" data-index="{{index}}" fileUrlArray="{{item.image_upload}}"></file-uploader>
</view>
</view>
</view>
<view class="inspect_new_issues_max">
<view class="inspect_new_issues" bindtap="onNewIssues"><van-icon name="add-o" style="position: relative;top:5rpx"/> 新增问题</view>
</view>
<view class="safety_prop module_title_flex" wx:if="{{showHis}}">
<text class="color_orange">草稿添加的数据在电脑端提交后生效！</text>
</view>
</view>
<view class="problem_submit_to">
<view class="problem_submit_to_btn" bindtap="cancelSaveView">取消</view>
<view class="problem_submit_to_btn problem_submit_to_save" bindtap="onProblemSubmitSave">提交隐患</view>
</view>
</view>
<van-overlay show="{{loadShow}}">
<view class="gif">
<image src="../../../../images/loding2.gif"></image>
<view>数据加载中！请稍后...</view>
</view>
</van-overlay>

7
miniprogram/pageage/project_problemmodify/quality/draft/index.wxss 100644
View File

@ -0,0 +1,7 @@
/* pageage/safetyManagement/addSafetyInspect/index.wxss */
.van-popup{
background: none !important;
}
.van-image__img{
border-radius: 10rpx !important;
}

7
miniprogram/pageage/project_problemmodify/quality/list/index.js
View File

@ -33,6 +33,13 @@ Page({
})
},
skipAddDarft(){
wx.setStorageSync('nav-menu', "list");
wx.redirectTo({
url: `../add/index?projectId=${this.data.initData.id}&projectName=`+this.data.initData.text,
})
},
getInfo(e){
let {id,checkState,lordSentUser,recheckSendUser} = e.currentTarget.dataset.set
if((checkState==0 || checkState==3) && lordSentUser==this.data.loginName){

8
miniprogram/pageage/project_problemmodify/quality/list/index.wxml
View File

@ -55,7 +55,13 @@
<view style="color: #a5abbb;">暂无数据</view>
</view>
</view>
<view class="inspect_add_to" bindtap="skipAdd">
<view class="inspect_add_to_darft" bindtap="skipAddDarft">
<view style="padding-top: 22rpx;">
<image src="../../../../images/new_add.png"></image>
<view>草稿</view>
</view>
</view>
<view class="inspect_add_to" bindtap="skipAdd">
<view style="padding-top: 22rpx;">
<image src="../../../../images/new_add.png"></image>
<view>新增</view>

325
miniprogram/pageage/project_problemmodify/security/draft/index.js 100644
View File

@ -0,0 +1,325 @@
// pageage/safetyManagement/addSafetyInspect/index.js
const app = getApp()
Page({
/**
* 页面的初始数据
*/
data: {
maxDate:new Date(2088,1,1).getTime(),
minDate:new Date().getTime()+(3600*48*1000),
projectId:"",
projectName:"",
loginName:"",
userName:"",
rectifierData:[],
loadShow:false,
showHis:false,
inspectInfoData:[
{
image_upload:[]
}
],
lordSent:"",
lordSentUser:"",
},
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
//获取缓存数据
wx.getStorage({
key: 'userinfo',
success:res=>{
this.setData({
projectId:app.globalData.projectId,
projectName:app.globalData.projectName,
loginName:res.data.loginName,
userName:res.data.nickName
})
this.getAllProjectUserData();
this.getHisInfo();
}
})
},
//查询项目人员数据
getAllProjectUserData(){
let that = this
wx.request({
url: app.globalData.reqUrl+'/wechat/projectuserinfo/selectProjectUnitUser',
method:"get",
data:{
projectId:that.data.projectId,
loginName:that.data.loginName
},
header:{
'content-type': 'application/x-www-form-urlencoded'
},
success(res){
res = res.data
if(res.code == 200){
that.setData({
rectifierData:res.data
})
}
}
})
},
getHisInfo(){
//这里查询当前登录人上次提交隐患，自动填充整改人，复检人，抄送人
let that = this
wx.request({
url: app.globalData.reqUrl+'/wechat/projectProblemmodify/findDraftLastDataByParams',
method:"get",
data:{
projectId:that.data.projectId,
createUser:that.data.loginName,
infoType:0
},
header:{
'content-type': 'application/x-www-form-urlencoded'
},
success(res){
res = res.data
if(res.code == 200 && res.data){
that.setData({
showHis:true,
lordSent:res.data.lordSent,
lordSentUser:res.data.lordSentUser
})
}
}
})
},
// list 上传图片
onImagesArr(e){
var index = e.currentTarget.dataset.index
var data = this.data.inspectInfoData
data[index].image_upload = e.detail
this.setData({
inspectInfoData:data
})
},
//添加整改人
onAddLordSent(e){
if(e.detail.length>0){
this.setData({
lordSent:e.detail[0].userName,
lordSentUser:e.detail[0].phoneNumber
})
}
},
//取消页面
cancelSaveView(){
this.returnToPage()
},
//保存
onProblemSubmitSave(){
this.setData({
loadShow:true
})
let that = this
let {projectId,projectName,lordSent,lordSentUser,loginName,inspectInfoData} = that.data;
//数据效验
if(projectId==""||loginName==""){
app.toast("数据异常，请刷新页面重试!")
that.setData({
loadShow:false
})
return;
}
if(lordSent==""||lordSentUser==""){
app.toast("请选择整改人!")
that.setData({
loadShow:false
})
return;
}
let fileUrls = [];
inspectInfoData.forEach(async (item)=>{
let beforeCheckUrl = [];
item.image_upload.forEach(async (it)=>{
let uploadUrl = app.globalData.uploadUrl+'/common/upload'
let name = "file";
//这里复杂的图片上传，改为同步上传，因为小程序只能上传一张图片
let obj = await that.syncUploadImage(uploadUrl,it,name);
beforeCheckUrl.push(obj.data.fileName);
if(beforeCheckUrl.length >= item.image_upload.length){
fileUrls.push(beforeCheckUrl);
}
//验证图片上传完毕
if(fileUrls.length >= inspectInfoData.length){
let params = {
projectId,
infoType:"0",
problemArea:projectName,
lordSent,
lordSentUser,
checkState:0,
fileUrls:fileUrls,
createUser:loginName
}
wx.request({
url: app.globalData.reqUrl + '/wechat/projectProblemmodify/addQualityDraft',
method:"POST",
data:params,
header: {
"Username": loginName,
"Content-Type": "application/json"
},
success(res){
that.setData({
loadShow:false
})
res = res.data
if(res.code == 200){
app.toast("添加成功!")
setTimeout(()=>{
if(wx.getStorageSync('nav-menu')=="list"){
wx.redirectTo({
url: '../list/index',
})
}else{
wx.redirectTo({
url: '../../../../pages/safety_manage/index',
})
}
},200);
}
}
})
}
});
})
},
/**
* 这里考虑上传图片异步问题，封装为同步
*/
syncUploadImage(url,uploadFile,name) {
return new Promise((resolve, reject) => {
wx.uploadFile({
url, // 上传的服务器接口地址
filePath: uploadFile,
header: {
"Content-Type": "application/x-www-form-urlencoded;charset=UTF-8"
},
name, //上传的所需字段，后端提供
formData: { user: 'test' },
success: (res) => {
// 上传完成操作
const data = JSON.parse(res.data)
resolve({
data: data
})
},
fail: (err) => {
//上传失败：修改pedding为reject
console.log("访问接口失败", err);
wx.showToast({
title: "网络出错,上传失败",
icon: 'none',
duration: 1000
});
reject(err)
}
});
})
},
returnToPage: function () {
/*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
if(wx.getStorageSync('nav-menu')=="list"){
wx.redirectTo({
url: '../list/index',
})
}else{
wx.redirectTo({
url: '../../../../pages/safety_manage/index',
})
}
},
//新增问题
onNewIssues(){
var data = this.data.inspectInfoData
if(data.length==5){
app.toast("一次最多只能提交5个问题!");
return false;
}
data.push(
{
image_upload:[]
}
)
this.setData({
inspectInfoData:data
})
},
//删除
onNewIssuesDelete(e){
var index = e.currentTarget.dataset.index
var data = this.data.inspectInfoData
data.splice(index, 1)　
this.setData({
inspectInfoData:data
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage() {
}
})

7
miniprogram/pageage/project_problemmodify/security/draft/index.json 100644
View File

@ -0,0 +1,7 @@
{
"usingComponents": {
"van-overlay": "@vant/weapp/overlay/index"
},
"navigationStyle":"custom",
"navigationBarTitleText": "新增质量隐患"
}

107
miniprogram/pageage/project_problemmodify/security/draft/index.wxml 100644
View File

@ -0,0 +1,107 @@
<!--pageage/safetyManagement/addSafetyInspect/index.wxml-->
<view class="header_title">
<view class="header_title_row">
<van-row>
<van-col span="4">
<view class="header_img" bindtap="returnToPage"><image src="/images/left.png"></image></view>
</van-col>
<van-col span="15">
<view class="header_name">新增安全隐患草稿</view>
</van-col>
</van-row>
</view>
</view>
<view class="max_content">
<view class="inspect_info ">
<view class="module_title_2 module_title_flex">
<view>{{projectName}}</view>
</view>
<view class="inspect_info_list">
<view class="inspect_info_title" style="padding: 20rpx 0 10rpx;">整改人员</view>
<view class="inspect_info_content">
<select-group-person rectifierData="{{rectifierData}}" multiple="{{fales}}" bindselected="onAddLordSent" index="1" title="请选择整改人员" choose="{{lordSent}}">
</select-group-person>
</view>
</view>
<view class="safety_inspect_title module_title_flex" wx:if="{{showHis}}">
<text class="color_orange">已自动填充上次选择的隐患整改人员。</text>
</view>
<view class="inspect_info_list" wx:for="{{inspectInfoData}}" wx:key="index">
<view class="module_title module_title_flex">
<view>问题 {{index + 1}}</view>
<view class="module_see_info_delete" wx:if="{{index != 0}}" bindtap="onNewIssuesDelete" data-index="{{index}}"><van-icon name="delete" /> 删除</view>
</view>
<view class="inspect_info_list">
<view class="inspect_info_title" style="padding: 20rpx 0 20rpx;">检查图片</view>
<view class="problem_list_info_con">
<file-uploader bindimages="onImagesArr" data-index="{{index}}" fileUrlArray="{{item.image_upload}}"></file-uploader>
</view>
</view>
</view>
<view class="inspect_new_issues_max">
<view class="inspect_new_issues" bindtap="onNewIssues"><van-icon name="add-o" style="position: relative;top:5rpx"/> 新增问题</view>
</view>
<view class="safety_prop module_title_flex" wx:if="{{showHis}}">
<text class="color_orange">草稿添加的数据在电脑端提交后生效！</text>
</view>
</view>
<view class="problem_submit_to">
<view class="problem_submit_to_btn" bindtap="cancelSaveView">取消</view>
<view class="problem_submit_to_btn problem_submit_to_save" bindtap="onProblemSubmitSave">提交隐患</view>
</view>
</view>
<van-overlay show="{{loadShow}}">
<view class="gif">
<image src="../../../../images/loding2.gif"></image>
<view>数据加载中！请稍后...</view>
</view>
</van-overlay>

7
miniprogram/pageage/project_problemmodify/security/draft/index.wxss 100644
View File

@ -0,0 +1,7 @@
/* pageage/safetyManagement/addSafetyInspect/index.wxss */
.van-popup{
background: none !important;
}
.van-image__img{
border-radius: 10rpx !important;
}

7
miniprogram/pageage/project_problemmodify/security/list/index.js
View File

@ -199,6 +199,13 @@ Page({
}
},
skipAddDarft(){
wx.setStorageSync('nav-menu', "list");
wx.redirectTo({
url: `../add/index?projectId=${this.data.initData.id}&projectName=`+this.data.initData.text,
})
},
//项目切换 返回值
onProjectSelect(e){
let projectId = e.detail.id;

6
miniprogram/pageage/project_problemmodify/security/list/index.wxml
View File

@ -55,6 +55,12 @@
<view style="color: #a5abbb;">暂无数据</view>
</view>
</view>
<view class="inspect_add_to_darft" bindtap="skipAddDarft">
<view style="padding-top: 22rpx;">
<image src="../../../../images/new_add.png"></image>
<view>草稿</view>
</view>
</view>
<view class="inspect_add_to" bindtap="skipAdd">
<view style="padding-top: 22rpx;">
<image src="../../../../images/new_add.png"></image>

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

@ -909,7 +909,7 @@ Page({
wx.clearStorageSync();
wx.setStorageSync('isReload', "1")
wx.redirectTo({
url: '../login2/login',
url: '../login/login',
})
},

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

@ -118,7 +118,7 @@ Page({
wx.clearStorageSync();
wx.setStorageSync('isReload', "1")
wx.redirectTo({
url: '../login2/login',
url: '../login/login',
})
},

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

@ -1378,7 +1378,7 @@ Page({
wx.clearStorageSync();
wx.setStorageSync('isReload', "1")
wx.redirectTo({
url:'../login2/login',
url:'../login/login',
})
},

2
miniprogram/pages/gengduogongneng/gengduogongneng.js
View File

@ -174,7 +174,7 @@ Page({
wx.clearStorageSync();
wx.setStorageSync('isReload', "1")
wx.redirectTo({
url: '../login2/login',
url: '../login/login',
})
},

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

@ -292,7 +292,7 @@ Page({
wx.clearStorageSync();
wx.setStorageSync('isReload', "1")
wx.redirectTo({
url: '../login2/login',
url: '../login/login',
})
},
/**

4
miniprogram/pages/login/login.wxml
View File

@ -10,10 +10,10 @@
<view class="login_ex">请使用手机号登录</view>
<view class="login_input">
<input placeholder="输入账户号码" placeholder-style="color:#5e6ea2" bindinput="name"/>
<input placeholder="输入登录手机" placeholder-style="color:#5e6ea2" bindinput="name"/>
</view>
<view class="login_input">
<input placeholder="输入账户密码" placeholder-style="color:#5e6ea2" password="true" bindinput="psw"/>
<input placeholder="输入登录密码" placeholder-style="color:#5e6ea2" password="true" bindinput="psw"/>
</view>

14
miniprogram/pages/login/login.wxss
View File

@ -6,7 +6,7 @@ page{
height: 180rpx;
line-height: 180rpx;
color: #728ce3;
font-size: 40rpx;
font-size: 41rpx;
font-weight: bold;
text-align: center;
}
@ -17,8 +17,7 @@ page{
border-radius: 20rpx;
margin: 0 40rpx;
padding: 25rpx 40rpx;
margin-top: 50rpx;
border: 1rpx solid #728ce3;
margin-top: 10rpx;
}
.login_dl{
color: #ffffff;
@ -27,10 +26,9 @@ page{
}
.login_ex{
padding:20rpx 0;
font-size: 28rpx;
color: #c7d1f3;
font-size: 30rpx;
border-bottom: 20rpx dashed #ffffff;
width: 45%;
width: 50%;
}
.login_input{
margin-top: 50rpx;
@ -57,11 +55,11 @@ page{
.login_logo{
width: 100%;
height:80rpx;
margin-top: 60rpx;
margin-top: 100rpx;
text-align: center;
}
.login_logo image{
height: 72rpx;
height: 65rpx;
}

202
miniprogram/pages/login2/login.js
View File

@ -1,202 +0,0 @@
// pages/login/login.js
const app = getApp();
Page({
/**
* 页面的初始数据
*/
data: {
username:'',
password:'',
show:false,
openId:'',
},
//获取填写的账号信息
name:function(even){
this.setData({
username:even.detail.value
})
},
//获取填写的密码信息
psw:function(even){
this.setData({
password:even.detail.value
})
},
onClickShow() {
this.setData({ show: true });
},
onClickHide() {
this.setData({ show: false });
},
onLoad: function (option) {
this.getOPenId();
},
/**
* 获取用户openid
*/
getOPenId:function () {
wx.login({
success :res=>{
//启动蒙版
let oid = wx.getStorageSync("openId");
if(!oid){
this.onClickShow();
wx.request({
url: app.globalData.reqUrl+'/wechat/getOpenId',
data:{
"code": res.code,
"appId": app.globalData.appId,
},
success:(res)=>{
res = res.data;
this.onClickHide();
this.setData({
openId:res.data.openid,
})
wx.setStorageSync('openId', res.data.openid)
//验证登录用户
this.selectUserInfoByOpenId(res.data.openid);
}
})
}else{
//验证登录用户
this.selectUserInfoByOpenId(oid);
}
}
})
},
//验证用户是否是第一次登陆
selectUserInfoByOpenId:function(openId){
//跳转页面
let isRelogin=wx.getStorageSync("isReload");
if(isRelogin){
return;
}
this.onClickShow();
var that = this;
wx.request({
url: app.globalData.reqUrl+'/wechat/openIdLogin',
data:{
"openId":openId
},
method:"POST",
success:function(res){
if(res.data.code == '200'){
//把数据存到缓存中
wx.setStorage({
key: 'userinfo',
data: res.data.data.userinfo
});
// wx.setStorageSync({
// key: 'token',
// data: res.data.token
// });
that.onClickHide();
let rd = res.data.data;
//只有一个项目时直接跳转详情页
if(rd.projectInfo!=null || rd.projectInfo!=undefined){
//赋值到公共参数
app.globalData.projectId = rd.projectInfo.projectId;
app.globalData.projectName = rd.projectInfo.projectName;
app.globalData.projectInfoList = [];
app.globalData.projectInfoList.push(rd.projectInfo);
app.globalData.value1 = rd.projectInfo.shengName;
app.globalData.value2 = rd.projectInfo.shiName+'/'+rd.projectInfo.quName;
app.globalData.value3 = rd.projectInfo.logCompanyName;
wx.redirectTo({
url: '../xiangmugaikuang/xiangmugaikuang',
})
}else{
//跳转页面
wx.redirectTo({
url: '../map/map',
})
}
}else{
that.onClickHide();
}
}
})
},
//登录
userLogin:function(openid){
var that = this;
var username = that.data.username;
var password = that.data.password;
if(username == ""){
app.toast("账号不能为空");
return;
}
if(password == ""){
app.toast("密码不能为空");
return;
}
let openId = that.data.openId
if(openId==""){
openId = wx.getStorageSync("openId");
if(openId==""){
app.toast("获取微信授权失败，请卸载后重新进入应用！！");
return;
}
}
//启动蒙版
that.onClickShow();
//发送请求
wx.request({
url: app.globalData.reqUrl+'/wechat/login',
data:{
"username":username,
"password":password,
"openId":openId,
},
method:"POST",
success(res){
//关闭蒙版
that.onClickHide();
if(res.data.code=='200'){
//把数据存到缓存中
wx.setStorage({
key: 'userinfo',
data: res.data.data.userinfo
});
// wx.setStorageSync({
// key: 'token',
// data: res.data.token
// });
wx.setStorageSync('isReload', "");
let rd = res.data.data;
//只有一个项目时直接跳转详情页
if(rd.projectInfo!=null || rd.projectInfo!=undefined){
//赋值到公共参数
app.globalData.projectId = rd.projectInfo.projectId;
app.globalData.projectName = rd.projectInfo.projectName;
app.globalData.projectInfoList = [];
app.globalData.projectInfoList.push(rd.projectInfo);
app.globalData.value1 = rd.projectInfo.shengName;
app.globalData.value2 = rd.projectInfo.shiName+'/'+rd.projectInfo.quName;
app.globalData.value3 = rd.projectInfo.logCompanyName;
wx.redirectTo({
url: '../xiangmugaikuang/xiangmugaikuang',
})
}else{
//跳转页面
wx.redirectTo({
url: '../map/map',
})
}
}else{
app.toast(res.data.msg);
}
}
})
},
})

5
miniprogram/pages/login2/login.json
View File

@ -1,5 +0,0 @@
{
"usingComponents": {
"van-overlay": "@vant/weapp/overlay/index"
}
}

58
miniprogram/pages/login2/login.wxml
View File

@ -1,58 +0,0 @@
<!--pages/login/login.wxml-->
<view class="login_logo">
<image src="https://cf.makalu.cc/profile/wechat/logo5.png"></image>
</view>
<view class="login_bg">
<view class="login_title">
<text>北跨泾河-产发工程数字管理平台</text>
</view>
<view class="login_input">
<input class="user" placeholder="输入账户号码" placeholder-style="color:#5e6ea2" bindinput="name"/>
</view>
<view class="login_input">
<input class="pass" placeholder="输入账户密码" placeholder-style="color:#5e6ea2" password="true" bindinput="psw"/>
</view>
<view class="login_btn" bindtap="userLogin">
确 定
</view>
<van-overlay show="{{show}}">
<view class="gif">
<image src="../../images/loding2.gif"></image>
<view>正在登陆中！请稍后...</view>
</view>
</van-overlay>
</view>

72
miniprogram/pages/login2/login.wxss
View File

@ -1,72 +0,0 @@
/* pages/login/login.wxss */
page{
/* background: #191d28 url("http://fileimg.makalu.cc/CORE_40247DD946964A15AA0D4000E1031E19.png") no-repeat bottom/100%; */
}
.login_title{
height: 180rpx;
line-height: 180rpx;
color: #FFFFFF;
font-size: 40rpx;
font-weight: bold;
text-align: center;
}
.login_bg{
border-radius: 20rpx;
margin: 0 40rpx;
padding: 25rpx 40rpx;
margin-top: 80rpx;
background-color: #000000;
border: 1rpx solid #FFFFFF;
}
.login_dl{
color: #ffffff;
font-size: 40rpx;
font-weight: bold;
}
.login_ex{
padding:20rpx 0;
font-size: 28rpx;
color: #c7d1f3;
border-bottom: 20rpx dashed #ffffff;
width: 45%;
}
.login_input{
margin-top: 50rpx;
}
.login_input input{
border: 1px solid #5e6ea2;
border-radius: 5%;
height: 100rpx;
width: 93%;
color: #728ce3;
padding: 0 20rpx;
border-radius: 10px;
}
.login_btn{
margin:80rpx 50rpx 0;
height: 80rpx;
background-image: linear-gradient(#5b9fff, #7655fc);
border-radius: 80rpx;
text-align: center;
line-height: 80rpx;
margin-bottom: 150rpx;
}
.login_btn:active{
margin:82rpx 55rpx 0;
}
.login_logo{
width: 100%;
height:80rpx;
margin-top: 50rpx;
margin-left: 45rpx;
}
.login_logo image{
height: 72rpx;
width: 180rpx;
}

2
miniprogram/pages/quality_manage/index.js
View File

@ -423,7 +423,7 @@ Page({
wx.clearStorageSync();
wx.setStorageSync('isReload', "1")
wx.redirectTo({
url: '../login2/login',
url: '../login/login',
})
},
//修改密码

2
miniprogram/pages/renyuanguanli/renyuanguanli.js
View File

@ -556,7 +556,7 @@ Page({
wx.clearStorageSync();
wx.setStorageSync('isReload', "1")
wx.redirectTo({
url: '../login2/login',
url: '../login/login',
})
},

2
miniprogram/pages/safety_manage/index.js
View File

@ -437,7 +437,7 @@ Page({
wx.clearStorageSync();
wx.setStorageSync('isReload', "1")
wx.redirectTo({
url: '../login2/login',
url: '../login/login',
})
},
//修改密码

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

@ -122,7 +122,7 @@ Page({
wx.setStorageSync('isReload', "1");
app.toast("密码修改成功！");
wx.redirectTo({
url: '../login2/login',
url: '../login/login',
});
}else{
app.toast(res.data.info);

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

@ -648,7 +648,7 @@ Page({
wx.clearStorageSync();
wx.setStorageSync('isReload', "1")
wx.redirectTo({
url: '../login2/login',
url: '../login/login',
})
},