提交代码

main
姜玉琦 2023-08-28 16:11:02 +08:00
parent dacb5bdb7f
commit e69bf75a22
43 changed files with 311 additions and 62 deletions

View File

@ -30,8 +30,8 @@ App({
// reqUrl:"http://wxw.ngrok.makalu.cc",
//reqUrl:'https://jaapplets.makalu.cc',
//reqUrl:'https://sxyanzhu.com/jhwxapp',
reqUrl:'https://cf.makalu.cc',
//reqUrl:'http://127.0.0.1:8091',
//reqUrl:'https://cf.makalu.cc',
reqUrl:'http://127.0.0.1:8091',
uploadUrl:"https://cf.makalu.cc/wechat",
//御景路数字化集成管控平台接口访问域名
@ -57,7 +57,7 @@ App({
value1:'省',
value2:'市/区',
value3:'公司',
projectInfoList:{},
projectInfoList:[],
projectId:'',
projectName:'',
companyName:'',

View File

@ -288,6 +288,13 @@ Page({
})
},
returnToPage: function () {
/*关闭当前页面,跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
wx.navigateTo({
url: '../list/index',
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/

View File

@ -2,5 +2,6 @@
"usingComponents": {
"van-overlay": "@vant/weapp/overlay/index"
},
"navigationStyle":"custom",
"navigationBarTitleText": "新增举牌验收"
}

View File

@ -1,5 +1,18 @@
<!--pageage/safetyManagement/addSafetyInspect/index.wxml-->
<view class="inspect_info">
<view class="header_title">
<view class="header_title_row">
<van-row>
<van-col span="3">
<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 module_title_flex">
<view>{{projectName}}</view>
</view>
@ -53,6 +66,7 @@
<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">

View File

@ -116,6 +116,13 @@ Page({
})
},
returnToPage: function () {
/*关闭当前页面,跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
wx.navigateTo({
url: '../list/index',
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/

View File

@ -2,5 +2,6 @@
"usingComponents": {
"van-popup": "@vant/weapp/popup/index"
},
"navigationStyle":"custom",
"navigationBarTitleText": "举牌验收详情"
}

View File

@ -1,5 +1,17 @@
<!--pageage/safetyManagement/problemRectification/index.wxml-->
<view>
<view class="header_title">
<view class="header_title_row">
<van-row>
<van-col span="3">
<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_overview_max">
<view class="inspect_overview">
<view class="module_title module_title_padding">

View File

@ -87,6 +87,15 @@ Page({
})
},
//项目切换 返回值
onProjectSelect(e){
let projectId = e.detail.id;
let projectName = e.detail.text;
app.globalData.projectId = projectId;
app.globalData.projectName = projectName;
this.onLoad();
},
/**
* 生命周期函数--监听页面初次渲染完成
*/

View File

@ -11,7 +11,7 @@
</view>
</view>
<view class="max_content">
<project-select init="{{initData}}"></project-select>
<project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
<view class="inspect_max">
<view class="inspect_list">
<view class="inspect_for" wx:for="{{listData}}" wx:key="index" data-set="{{item}}" bindtap="getInfo">

View File

@ -161,8 +161,8 @@ Page({
userNames+=","+it.userName;
});
this.setData({
copySend:phoneNumbers.substring(1),
copySendUser:userNames.substring(1)
copySend:userNames.substring(1),
copySendUser:phoneNumbers.substring(1)
})
}else{
this.setData({
@ -363,6 +363,13 @@ Page({
})
},
returnToPage: function () {
/*关闭当前页面,跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
wx.navigateTo({
url: '../list/index',
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/

View File

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

View File

@ -1,5 +1,18 @@
<!--pageage/safetyManagement/addSafetyInspect/index.wxml-->
<view class="inspect_info">
<view class="header_title">
<view class="header_title_row">
<van-row>
<van-col span="3">
<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 module_title_flex">
<view>{{projectName}}</view>
</view>
@ -61,6 +74,7 @@
<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">

View File

@ -228,6 +228,13 @@ Page({
})
},
returnToPage: function () {
/*关闭当前页面,跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
wx.navigateTo({
url: '../list/index',
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/

View File

@ -3,5 +3,6 @@
"van-popup": "@vant/weapp/popup/index",
"van-overlay": "@vant/weapp/overlay/index"
},
"navigationStyle":"custom",
"navigationBarTitleText": "质量隐患复检"
}

View File

@ -1,4 +1,17 @@
<!--pageage/safetyManagement/problemRectification/index.wxml-->
<view class="header_title">
<view class="header_title_row">
<van-row>
<van-col span="3">
<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_overview_max">
<view class="inspect_overview">
<view class="module_title module_title_padding">
@ -126,6 +139,8 @@
<view class="problem_submit_to_btn" bindtap="onRejectSave">整改驳回</view>
<view class="problem_submit_to_btn problem_submit_to_save" bindtap="onPassSave">整改通过</view>
</view>
</view>
<van-overlay show="{{loadShow}}">
<view class="gif">
<image src="../../../../images/loding2.gif"></image>

View File

@ -161,6 +161,13 @@ Page({
})
},
returnToPage: function () {
/*关闭当前页面,跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
wx.navigateTo({
url: '../list/index',
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/

View File

@ -1,4 +1,5 @@
{
"usingComponents": {},
"navigationStyle":"custom",
"navigationBarTitleText": "质量隐患详情"
}

View File

@ -1,5 +1,17 @@
<!--pageage/safetyManagement/problemRectification/index.wxml-->
<view>
<view class="header_title">
<view class="header_title_row">
<van-row>
<van-col span="3">
<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_overview_max">
<view class="inspect_overview">
<view class="module_title module_title_padding">
@ -128,7 +140,8 @@
</view>
</view>
</view>
</view>
<view class="problem_submit_to" wx:if="{{showDel}}">
<view class="problem_submit_to_btn problem_submit_to_delete" bindtap="onDelete">删除</view>
</view>
</view>

View File

@ -171,6 +171,15 @@ Page({
})
},
//项目切换 返回值
onProjectSelect(e){
let projectId = e.detail.id;
let projectName = e.detail.text;
app.globalData.projectId = projectId;
app.globalData.projectName = projectName;
this.onLoad();
},
/**
* 生命周期函数--监听页面隐藏
*/

View File

@ -11,7 +11,7 @@
</view>
</view>
<view class="max_content">
<project-select init="{{initData}}"></project-select>
<project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
<view class="modify_video_nav" style="margin-top: 5rpx;">
<view class="{{activeState=='dzg'?'active':''}}" bindtap="trainingTypeJump" data-index="1"><text>待我办理({{dzgCount}}</text></view>
<view class="{{activeState=='ycl'?'active':''}}" bindtap="trainingTypeJump" data-index="2"><text>整改完成({{yclCount}}</text></view>

View File

@ -223,6 +223,13 @@ Page({
})
},
returnToPage: function () {
/*关闭当前页面,跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
wx.navigateTo({
url: '../list/index',
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/

View File

@ -3,5 +3,6 @@
"van-popup": "@vant/weapp/popup/index",
"van-overlay": "@vant/weapp/overlay/index"
},
"navigationStyle":"custom",
"navigationBarTitleText": "质量隐患整改"
}

View File

@ -1,5 +1,17 @@
<!--pageage/safetyManagement/problemRectification/index.wxml-->
<view>
<view class="header_title">
<view class="header_title_row">
<van-row>
<van-col span="3">
<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_overview_max">
<view class="inspect_overview">
<view class="module_title module_title_padding">
@ -119,11 +131,11 @@
</view>
</view>
</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="onSubmitSave">保存</view>
</view>
</view>
<van-overlay show="{{loadShow}}">
<view class="gif">

View File

@ -161,8 +161,8 @@ Page({
userNames+=","+it.userName;
});
this.setData({
copySend:phoneNumbers.substring(1),
copySendUser:userNames.substring(1)
copySend:userNames.substring(1),
copySendUser:phoneNumbers.substring(1)
})
}else{
this.setData({
@ -370,6 +370,13 @@ Page({
})
},
returnToPage: function () {
/*关闭当前页面,跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
wx.navigateTo({
url: '../list/index',
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/

View File

@ -2,5 +2,6 @@
"usingComponents": {
"van-overlay": "@vant/weapp/overlay/index"
},
"navigationStyle":"custom",
"navigationBarTitleText": "新增安全隐患"
}

View File

@ -1,5 +1,18 @@
<!--pageage/safetyManagement/addSafetyInspect/index.wxml-->
<view class="inspect_info">
<view class="header_title">
<view class="header_title_row">
<van-row>
<van-col span="3">
<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 module_title_flex">
<view>{{projectName}}</view>
</view>
@ -61,6 +74,7 @@
<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">

View File

@ -228,6 +228,12 @@ Page({
})
},
returnToPage: function () {
/*关闭当前页面,跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
wx.navigateTo({
url: '../list/index',
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/

View File

@ -3,5 +3,6 @@
"van-popup": "@vant/weapp/popup/index",
"van-overlay": "@vant/weapp/overlay/index"
},
"navigationStyle":"custom",
"navigationBarTitleText": "安全隐患复检"
}

View File

@ -1,5 +1,18 @@
<!--pageage/safetyManagement/problemRectification/index.wxml-->
<view class="inspect_overview_max">
<view class="header_title">
<view class="header_title_row">
<van-row>
<van-col span="3">
<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_overview_max">
<view class="inspect_overview">
<view class="module_title module_title_padding">
<view>{{infoData.problemArea}}</view>
@ -126,6 +139,8 @@
<view class="problem_submit_to_btn" bindtap="onRejectSave">整改驳回</view>
<view class="problem_submit_to_btn problem_submit_to_save" bindtap="onPassSave">整改通过</view>
</view>
</view>
<van-overlay show="{{loadShow}}">
<view class="gif">
<image src="../../../../images/loding2.gif"></image>

View File

@ -158,6 +158,13 @@ Page({
})
},
returnToPage: function () {
/*关闭当前页面,跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
wx.navigateTo({
url: '../list/index',
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/

View File

@ -1,4 +1,5 @@
{
"usingComponents": {},
"navigationStyle":"custom",
"navigationBarTitleText": "安全隐患详情"
}

View File

@ -1,5 +1,17 @@
<!--pageage/safetyManagement/problemRectification/index.wxml-->
<view>
<view class="header_title">
<view class="header_title_row">
<van-row>
<van-col span="3">
<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_overview_max">
<view class="inspect_overview">
<view class="module_title module_title_padding">
@ -128,9 +140,10 @@
</view>
</view>
</view>
</view>
<view class="problem_submit_to" wx:if="{{showDel}}">
<view class="problem_submit_to_btn problem_submit_to_delete" bindtap="onDelete">
删除</view>
</view>
</view>

View File

@ -156,6 +156,14 @@ Page({
})
},
//项目切换 返回值
onProjectSelect(e){
let projectId = e.detail.id;
let projectName = e.detail.text;
app.globalData.projectId = projectId;
app.globalData.projectName = projectName;
this.onLoad();
},
/**
* 生命周期函数--监听页面初次渲染完成

View File

@ -11,7 +11,7 @@
</view>
</view>
<view class="max_content">
<project-select init="{{initData}}"></project-select>
<project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
<view class="modify_video_nav" style="margin-top: 5rpx;">
<view class="{{activeState=='dzg'?'active':''}}" bindtap="trainingTypeJump" data-index="1"><text>待我办理({{dzgCount}}</text></view>
<view class="{{activeState=='ycl'?'active':''}}" bindtap="trainingTypeJump" data-index="2"><text>整改完成({{yclCount}}</text></view>

View File

@ -223,6 +223,13 @@ Page({
})
},
returnToPage: function () {
/*关闭当前页面,跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
wx.navigateTo({
url: '../list/index',
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/

View File

@ -3,5 +3,6 @@
"van-popup": "@vant/weapp/popup/index",
"van-overlay": "@vant/weapp/overlay/index"
},
"navigationStyle":"custom",
"navigationBarTitleText": "安全隐患整改"
}

View File

@ -1,5 +1,17 @@
<!--pageage/safetyManagement/problemRectification/index.wxml-->
<view>
<view class="header_title">
<view class="header_title_row">
<van-row>
<van-col span="3">
<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_overview_max">
<view class="inspect_overview">
<view class="module_title module_title_padding">
@ -118,11 +130,11 @@
</view>
</view>
</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="onSubmitSave">保存</view>
</view>
</view>
<van-overlay show="{{loadShow}}">
<view class="gif">

View File

@ -38,29 +38,35 @@ Component({
created(){
//this.getProjectNameList();
this.setData({
projectList:app.globalData.projectInfoList
})
},
/**
* 组件的方法列表
*/
methods: {
showPopup() {
// var data = this.data.projectList;
// var initData = this.data.init
// for(var i=0;i<data.length;i++ ){
// if(data[i].id == initData.id){
// this.setData({
// index:i
// })
// break
// }
// }
// console.log(this.data.index)
// this.setData({
// columns:data,
// show: true
// });
if(this.data.projectList.length>1){
let data = this.data.projectList;
let initData = this.data.init;
let selectColumns = [];
data.forEach((item,i) =>{
selectColumns.push({id:item.projectId,text:item.projectName});
if(initData.id==item.projectId){
this.setData({
index:i
})
}
});
console.log("default-index="+this.data.index);
this.setData({
columns:selectColumns,
show: true
});
}
},
onClose() {
this.setData({ show: false });
},

View File

@ -2,15 +2,16 @@
<view class="header_title">
<view class="header_title_row">
<van-row>
<!-- <van-col span="3">
<view class="header_img" bindtap="showPopup"><image src="/images/core.png"></image></view>
</van-col> -->
<van-col span="3">
<view class="header_img" bindtap="goGCLB">
<view class="header_img" bindtap="showPopup"><image src="/images/core.png"></image></view>
</van-col>
<van-col span="4">
<view class="header_img" bindtap="XMGK">
<image src="/images/left.png"></image>
<text class="header_fh">返回</text>
</view>
</van-col>
<van-col span="15">
<van-col span="10">
<view class="header_name">更多功能</view>
</van-col>
</van-row>

View File

@ -466,6 +466,7 @@ Page({
projectData:res.data,
projectInfoList:res.data
})
app.globalData.projectInfoList = res.data;
//if(that.data.type == 1){
// that.setData({
// proCount:res.data.length,
@ -584,7 +585,7 @@ Page({
//赋值到公共参数
app.globalData.projectId = even.currentTarget.dataset['id'];
app.globalData.projectName = even.currentTarget.dataset['name'];
app.globalData.projectInfoList = JSON.stringify(this.data.projectInfoList);
//app.globalData.projectInfoList = JSON.stringify(this.data.projectInfoList);
app.globalData.type = this.data.type;
app.globalData.value1 = this.data.value1;
app.globalData.value2 = this.data.value2;

View File

@ -105,7 +105,8 @@ Page({
//赋值到公共参数
app.globalData.projectId = rd.projectInfo.projectId;
app.globalData.projectName = rd.projectInfo.projectName;
app.globalData.projectInfoList = rd.projectInfo.projectInfoList;
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;
@ -171,7 +172,8 @@ Page({
//赋值到公共参数
app.globalData.projectId = rd.projectInfo.projectId;
app.globalData.projectName = rd.projectInfo.projectName;
app.globalData.projectInfoList = rd.projectInfo.projectInfoList;
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;

View File

@ -475,6 +475,7 @@ Page({
initialLon:res.data[0].longitude,
initialLat:res.data[0].latitude,
})
app.globalData.projectInfoList = res.data;
}else{
that.setData({
markers:res.data,
@ -616,7 +617,7 @@ Page({
//赋值到公共参数
app.globalData.projectId = this.data.markers[even.markerId].projectId;
app.globalData.projectName = this.data.markers[even.markerId].projectName;
app.globalData.projectInfoList = JSON.stringify(projectData);
//app.globalData.projectInfoList = JSON.stringify(projectData);
app.globalData.type = 1;
app.globalData.value1 = value1;
app.globalData.value2 = value2;
@ -651,7 +652,7 @@ Page({
value3 = '公司';
}
//添加数据到app.js文件固定参数
app.globalData.projectInfoList = JSON.stringify(projectData);
//app.globalData.projectInfoList = JSON.stringify(projectData);
app.globalData.type = 1;
app.globalData.value1 = value1;
app.globalData.value2 = value2;
@ -683,7 +684,7 @@ Page({
value3 = '公司';
}
//添加数据到app.js文件固定参数
app.globalData.projectInfoList = JSON.stringify(environProjectData);
//app.globalData.projectInfoList = JSON.stringify(environProjectData);
app.globalData.type = 2;
app.globalData.value1 = value1;
app.globalData.value2 = value2;

View File

@ -309,7 +309,6 @@ Page({
projectId:projectId,
projectName:projectName
})
this.onLoad();
},
@ -373,7 +372,7 @@ Page({
},
onClickShow() {
this.setData({ loadShow: true });
this.setData({ loadShow: false });
},
onClickHide() {
@ -439,7 +438,7 @@ Page({
id:even
},
success:resData=> {
this.onClickHide();
this.onClickHide()
this.setData({
projectInfo:resData.data
})
@ -481,8 +480,8 @@ Page({
projectId:projectId
},
success:resData=> {
that.onClickHide();
this.setData ({
that.onClickHide()
that.setData ({
projectUnitsList:resData.data
})
}