提交代码
parent
45bfbec9c8
commit
f1e8f21275
|
@ -5,20 +5,15 @@
|
|||
"pages/gengduogongneng/gengduogongneng",
|
||||
"pages/xiangmugaikuang/xiangmugaikuang",
|
||||
"pages/renyuanguanli/renyuanguanli",
|
||||
"pages/shebieguanli-tzsb/taji",
|
||||
"pages/shebieguanli-jxsb/shajiangguan",
|
||||
"pages/ranyuanguanli-map/map",
|
||||
"pages/map/map",
|
||||
"pages/shebeiguanli-map/jixiedingwei",
|
||||
"pages/winter-training/index",
|
||||
"pages/saft-education-user-bind/index",
|
||||
"pages/Highlight-photos/index",
|
||||
"pages/Security-control-echarts/index",
|
||||
"pages/construction/index",
|
||||
"pages/Construction-Log/index",
|
||||
"pages/updatePassword/updatePassword",
|
||||
"pages/safety_manage/index",
|
||||
"pages/quality_manage/index",
|
||||
"pages/progress_manage/index",
|
||||
"pages/project_flowable/initTask/index",
|
||||
"pages/project_flowable/myFlowDefinition/index",
|
||||
"pages/project_flowable/await/index",
|
||||
|
@ -60,7 +55,6 @@
|
|||
"safetyManagement/problemRectification/index",
|
||||
"safetyManagement/securityCheckRectified/index",
|
||||
"safetyManagement/addSafetyInspect/index",
|
||||
"Security-control-echarts/index",
|
||||
"samplingRetesting/index",
|
||||
"samplingRetestingDeliver/index",
|
||||
"samplingRetestingUpload/index",
|
||||
|
|
|
@ -834,6 +834,12 @@ page{
|
|||
padding-left: 40rpx;
|
||||
background: url("http://fileimg.makalu.cc/CORE_B1C818B4CF2C44FE9D96624589329EBC.png") no-repeat left/35rpx;
|
||||
}
|
||||
.module_title_3{
|
||||
height: 50rpx;
|
||||
line-height: 50rpx;
|
||||
padding-left: 40rpx;
|
||||
background: url("http://fileimg.makalu.cc/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx;
|
||||
}
|
||||
.safety_inspect{
|
||||
padding:30rpx 20rpx;
|
||||
}
|
||||
|
@ -1539,14 +1545,12 @@ swiper-item video{
|
|||
background-color: #E6A23C;
|
||||
}
|
||||
.code_label{
|
||||
font-size: 0.6rem;
|
||||
width: 120rpx;
|
||||
font-size: 1.0rem;
|
||||
width: 180rpx;
|
||||
margin: auto;
|
||||
text-align: center;
|
||||
padding: 0.1rem;
|
||||
border-radius: 0.5rem 0 0.5rem 0;
|
||||
margin-bottom: 15rpx;
|
||||
margin-left: -3rpx;
|
||||
margin-left: 48rpx;
|
||||
border-radius: 0.8rem 0 0.8rem 0;
|
||||
}
|
||||
.code_label_2{
|
||||
font-size: 0.8rem;
|
||||
|
|
|
@ -2,7 +2,9 @@
|
|||
<view class="header_title_row">
|
||||
<van-row>
|
||||
<van-col span="4">
|
||||
<view class="header_img" bindtap="returnToPage"><image src="/images/left.png"></image></view>
|
||||
<view class="header_img" bindtap="returnToPage">
|
||||
<image src="/images/left.png"></image>
|
||||
</view>
|
||||
</van-col>
|
||||
<van-col span="15">
|
||||
<view class="header_name">质量隐患排查</view>
|
||||
|
@ -11,20 +13,26 @@
|
|||
</view>
|
||||
</view>
|
||||
<scroll-view class="max_content_scroll" type="list" scroll-y bindscrolltolower="onScrollToLower">
|
||||
<project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
|
||||
<view class="modify_video_nav" style="margin-top: 5rpx;">
|
||||
<project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
|
||||
<view class="modify_video_nav" style="margin-top: 5rpx;">
|
||||
<view class="{{activeState=='zg'?'active':''}}" bindtap="trainingTypeJump" data-index="1"><text>整改({{dzgCount}})</text></view>
|
||||
<view class="{{activeState=='fj'?'active':''}}" bindtap="trainingTypeJump" data-index="2"><text>复检({{dfjCount}})</text></view>
|
||||
<view class="{{activeState=='ycl'?'active':''}}" bindtap="trainingTypeJump" data-index="3"><text>完成({{yclCount}})</text></view>
|
||||
<view class="{{activeState=='zgcs'?'active':''}}" bindtap="trainingTypeJump" data-index="4"><text>超时({{zgcsCount}})</text></view>
|
||||
</view>
|
||||
<view class="inspect_max_scroll">
|
||||
<view class="inspect_for_scroll {{item.problemType=='2'?'zxjc':''}}" v-if="{{ listData.length>0 }}" wx:for="{{listData}}" wx:key="index" data-set="{{item}}" bindtap="getInfo">
|
||||
<!--专项检查样式zxjc-->
|
||||
<view class="inspect_for_scroll {{item.problemType=='2'?'':''}}" v-if="{{ listData.length>0 }}" wx:for="{{listData}}" wx:key="index" data-set="{{item}}" bindtap="getInfo">
|
||||
<view class="inspect_for_bgd">
|
||||
<view class="inspect_list_title">
|
||||
<view class="inspect_list_title_label inspect_list_title_width">
|
||||
<view class="inspect_list_title_number">{{index < 9 ?'0'+(index+1):(index+1)}}</view>
|
||||
<view class="module_title module_title_flex inspect_list_title_text_2">{{item.workParts}}</view>
|
||||
<view class="module_title_3 module_title_flex inspect_list_title_text_2">
|
||||
<view wx:if="{{item.checkState==0}}" class="code_label code_label_yellow">待整改</view>
|
||||
<view wx:if="{{item.checkState==1}}" class="code_label code_label_blueviolet">待复检</view>
|
||||
<view wx:if="{{item.checkState==3}}" class="code_label code_label_red">复检驳回</view>
|
||||
<view wx:if="{{item.checkState==4}}" class="code_label code_label_green">整改完成</view>
|
||||
</view>
|
||||
<text class="timeline_for_state_1" wx:if="{{item.problemType=='1'}}">常规检查</text>
|
||||
<text class="timeline_for_state_2" wx:if="{{item.problemType=='2'}}">专项检查</text>
|
||||
</view>
|
||||
|
@ -32,14 +40,11 @@
|
|||
<view class="inspect_list_info">
|
||||
<view class="inspect_list_info_details">
|
||||
<view class="inspect_list_info_img">
|
||||
<view wx:if="{{item.checkState==0}}" class="code_label code_label_yellow">待整改</view>
|
||||
<view wx:if="{{item.checkState==1}}" class="code_label code_label_blueviolet">待复检</view>
|
||||
<view wx:if="{{item.checkState==3}}" class="code_label code_label_red">复检驳回</view>
|
||||
<view wx:if="{{item.checkState==4}}" class="code_label code_label_green">整改完成</view>
|
||||
<van-image width="120rpx" height="120rpx" fit="cover" src="{{request+item.marksPicture+'.min.jpg'}}"/>
|
||||
<van-image width="120rpx" height="120rpx" fit="cover" src="{{request+item.marksPicture+'.min.jpg'}}" />
|
||||
</view>
|
||||
<view class="inspect_list_info_data">
|
||||
<view class="inspect_list_info_data_prop">隐患类型:<text>{{item.dangerTypeName}}</text></view>
|
||||
<view class="inspect_list_info_data_prop color_blue">隐患类型:<text>{{item.dangerTypeName}}</text></view>
|
||||
<view class="inspect_list_info_data_prop">隐患描述:<text>{{item.workParts}}</text></view>
|
||||
<view class="inspect_list_info_data_prop">检查单位:<text>{{item.deptName}}</text></view>
|
||||
<view class="inspect_list_info_data_prop">检查时间:<text class="color_blue">{{item.createTime}}</text></view>
|
||||
</view>
|
||||
|
@ -61,19 +66,12 @@
|
|||
<image src="../../../../images/new_add.png"></image>
|
||||
<view>草稿</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="inspect_add_to" bindtap="skipAdd">
|
||||
</view>
|
||||
<view class="inspect_add_to" bindtap="skipAdd">
|
||||
<view style="padding-top: 22rpx;">
|
||||
<image src="../../../../images/new_add.png"></image>
|
||||
<view>新增</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</scroll-view>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -19,12 +19,18 @@
|
|||
<view class="{{activeState=='zgcs'?'active':''}}" bindtap="trainingTypeJump" data-index="4"><text>超时({{zgcsCount}})</text></view>
|
||||
</view>
|
||||
<view class="inspect_max_scroll">
|
||||
<view class="inspect_for_scroll {{item.problemType=='2'?'zxjc':''}}" wx:for="{{listData}}" wx:key="index" data-set="{{item}}" bindtap="getInfo">
|
||||
<!--专项检查样式zxjc-->
|
||||
<view class="inspect_for_scroll {{item.problemType=='2'?'':''}}" wx:for="{{listData}}" wx:key="index" data-set="{{item}}" bindtap="getInfo">
|
||||
<view class="inspect_for_bgd">
|
||||
<view class="inspect_list_title">
|
||||
<view class="inspect_list_title_label inspect_list_title_width">
|
||||
<view class="inspect_list_title_number">{{index < 9 ?'0'+(index+1):(index+1)}}</view>
|
||||
<view class="module_title module_title_flex inspect_list_title_text_2">{{item.workParts}}</view>
|
||||
<view class="module_title_3 module_title_flex inspect_list_title_text_2">
|
||||
<view wx:if="{{item.checkState==0}}" class="code_label code_label_yellow">待整改</view>
|
||||
<view wx:if="{{item.checkState==1}}" class="code_label code_label_blueviolet">待复检</view>
|
||||
<view wx:if="{{item.checkState==3}}" class="code_label code_label_red">复检驳回</view>
|
||||
<view wx:if="{{item.checkState==4}}" class="code_label code_label_green">整改完成</view>
|
||||
</view>
|
||||
<text class="timeline_for_state_1" wx:if="{{item.problemType=='1'}}">常规检查</text>
|
||||
<text class="timeline_for_state_2" wx:if="{{item.problemType=='2'}}">专项检查</text>
|
||||
</view>
|
||||
|
@ -32,14 +38,12 @@
|
|||
<view class="inspect_list_info">
|
||||
<view class="inspect_list_info_details">
|
||||
<view class="inspect_list_info_img">
|
||||
<view wx:if="{{item.checkState==0}}" class="code_label code_label_yellow">待整改</view>
|
||||
<view wx:if="{{item.checkState==1}}" class="code_label code_label_blueviolet">待复检</view>
|
||||
<view wx:if="{{item.checkState==3}}" class="code_label code_label_red">复检驳回</view>
|
||||
<view wx:if="{{item.checkState==4}}" class="code_label code_label_green">整改完成</view>
|
||||
|
||||
<van-image width="120rpx" height="120rpx" fit="cover" src="{{request+item.marksPicture+'.min.jpg'}}"/>
|
||||
</view>
|
||||
<view class="inspect_list_info_data">
|
||||
<view class="inspect_list_info_data_prop">隐患类型:<text>{{item.dangerTypeName}}</text></view>
|
||||
<view class="inspect_list_info_data_prop color_blue">隐患类型:<text>{{item.dangerTypeName}}</text></view>
|
||||
<view class="inspect_list_info_data_prop">隐患描述:<text>{{item.workParts}}</text></view>
|
||||
<view class="inspect_list_info_data_prop">检查单位:<text>{{item.deptName}}</text></view>
|
||||
<view class="inspect_list_info_data_prop">检查时间:<text class="color_blue">{{item.createTime}}</text></view>
|
||||
</view>
|
||||
|
|
|
@ -15,7 +15,8 @@ Page({
|
|||
initData: {},
|
||||
show:false,
|
||||
listData:[],
|
||||
request:app.globalData.reqUrl
|
||||
request:app.globalData.reqUrl,
|
||||
addFlag:false,
|
||||
},
|
||||
|
||||
onClose(){
|
||||
|
@ -46,19 +47,40 @@ Page({
|
|||
wx.getStorage({
|
||||
key: 'userinfo',
|
||||
success:res=>{
|
||||
this.getMenus(res.data.loginName);
|
||||
this.setData({
|
||||
deptId:res.data.deptId,
|
||||
loginName:res.data.loginName,
|
||||
userName:res.data.userName,
|
||||
projectId:app.globalData.projectId,
|
||||
projectNameArgs:app.globalData.projectName,
|
||||
initData:{text:app.globalData.projectName,id:app.globalData.projectId}
|
||||
initData:{text:app.globalData.projectName,id:app.globalData.projectId},
|
||||
})
|
||||
this.getListData(app.globalData.projectId);
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
getMenus:function(loginName){
|
||||
var that = this;
|
||||
wx.request({
|
||||
url: app.globalData.reqUrl+'/wechat/selectRoleMenuList',
|
||||
data:{
|
||||
username:loginName,
|
||||
type:"jd"
|
||||
},
|
||||
method:"get",
|
||||
success:function(res){
|
||||
res=res.data;
|
||||
if(res.code =='200' && res.data.length>0){
|
||||
that.setData({
|
||||
addFlag:true
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
/**
|
||||
* 查询项目举牌验收数据
|
||||
*/
|
||||
|
|
|
@ -45,7 +45,7 @@
|
|||
</view>
|
||||
</view>
|
||||
|
||||
<view class="inspect_add_to" bindtap="skipAdd">
|
||||
<view wx:if="{{addFlag}}" class="inspect_add_to" bindtap="skipAdd">
|
||||
<view style="padding-top: 22rpx;">
|
||||
<image src="../../../images/new_add.png"></image>
|
||||
<view>新增</view>
|
||||
|
|
|
@ -1,66 +0,0 @@
|
|||
// pages/Security-control-echarts/index.js
|
||||
Page({
|
||||
|
||||
/**
|
||||
* 页面的初始数据
|
||||
*/
|
||||
data: {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面加载
|
||||
*/
|
||||
onLoad(options) {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面初次渲染完成
|
||||
*/
|
||||
onReady() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面显示
|
||||
*/
|
||||
onShow() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面隐藏
|
||||
*/
|
||||
onHide() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面卸载
|
||||
*/
|
||||
onUnload() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 页面相关事件处理函数--监听用户下拉动作
|
||||
*/
|
||||
onPullDownRefresh() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 页面上拉触底事件的处理函数
|
||||
*/
|
||||
onReachBottom() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 用户点击右上角分享
|
||||
*/
|
||||
onShareAppMessage() {
|
||||
|
||||
}
|
||||
})
|
|
@ -1,2 +0,0 @@
|
|||
<!--pages/Security-control-echarts/index.wxml-->
|
||||
<text>pages/Security-control-echarts/index.wxml</text>
|
|
@ -5,22 +5,22 @@ Component({
|
|||
* 组件的属性列表
|
||||
*/
|
||||
properties: {
|
||||
init:{
|
||||
type:Object
|
||||
init: {
|
||||
type: Object
|
||||
},
|
||||
width:{
|
||||
type:String
|
||||
width: {
|
||||
type: String
|
||||
},
|
||||
left:{
|
||||
type:String
|
||||
left: {
|
||||
type: String
|
||||
}
|
||||
},
|
||||
/**数据监听 */
|
||||
observers: {
|
||||
init: function (val) {
|
||||
if(val){
|
||||
if (val) {
|
||||
this.setData({
|
||||
item:val,
|
||||
item: val,
|
||||
})
|
||||
}
|
||||
},
|
||||
|
@ -30,16 +30,19 @@ Component({
|
|||
*/
|
||||
data: {
|
||||
show: false,
|
||||
index:0,
|
||||
item:'',
|
||||
columns:[],
|
||||
projectList:[],
|
||||
index: 0,
|
||||
item: '',
|
||||
columns: [],
|
||||
defaultColumns: [],
|
||||
projectList: [],
|
||||
findProjectValue:"",
|
||||
},
|
||||
|
||||
created(){
|
||||
created() {
|
||||
//this.getProjectNameList();
|
||||
this.setData({
|
||||
projectList:app.globalData.projectInfoList
|
||||
projectList: app.globalData.projectInfoList,
|
||||
findProjectValue:"",
|
||||
})
|
||||
},
|
||||
/**
|
||||
|
@ -47,53 +50,81 @@ Component({
|
|||
*/
|
||||
methods: {
|
||||
showPopup() {
|
||||
if(this.data.projectList.length>1){
|
||||
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){
|
||||
data.forEach((item, i) => {
|
||||
selectColumns.push({
|
||||
id: item.projectId,
|
||||
text: item.projectName
|
||||
});
|
||||
if (initData.id == item.projectId) {
|
||||
this.setData({
|
||||
index:i
|
||||
index: i
|
||||
})
|
||||
}
|
||||
});
|
||||
console.log("default-index="+this.data.index);
|
||||
this.setData({
|
||||
columns:selectColumns,
|
||||
findProjectValue:"",
|
||||
columns: selectColumns,
|
||||
defaultColumns:selectColumns,
|
||||
show: true
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
//获取搜索的项目名称
|
||||
findProject: function (even) {
|
||||
if(even.detail.value){
|
||||
let list = [];
|
||||
this.data.columns.forEach(item=>{
|
||||
console.log(item.text,even.detail.value,item.text.indexOf(even.detail.value)>-1)
|
||||
if(item.text.indexOf(even.detail.value)>-1){
|
||||
list.push(item);
|
||||
}
|
||||
});
|
||||
this.setData({
|
||||
columns: list
|
||||
})
|
||||
}else{
|
||||
this.setData({
|
||||
columns: this.data.defaultColumns
|
||||
})
|
||||
}
|
||||
},
|
||||
|
||||
onClose() {
|
||||
this.setData({ show: false });
|
||||
},
|
||||
onSelectChange(e){
|
||||
this.setData({
|
||||
item:e.detail.value
|
||||
show: false
|
||||
});
|
||||
},
|
||||
onSelectChange(e) {
|
||||
this.setData({
|
||||
item: e.detail.value
|
||||
})
|
||||
},
|
||||
onConfirm(){
|
||||
onConfirm() {
|
||||
this.setData({
|
||||
value:this.data.item.text
|
||||
value: this.data.item.text
|
||||
})
|
||||
this.triggerEvent('change',this.data.item)
|
||||
this.setData({ show: false });
|
||||
this.triggerEvent('change', this.data.item)
|
||||
this.setData({
|
||||
show: false
|
||||
});
|
||||
},
|
||||
getProjectNameList:function(){
|
||||
getProjectNameList: function () {
|
||||
wx.request({
|
||||
url: app.globalData.reqUrl+'/weixin/security/getProjectNameList',
|
||||
method:"GET",
|
||||
data:{
|
||||
deptId:app.globalData.deptId,
|
||||
projectId:app.globalData.userProjectId
|
||||
url: app.globalData.reqUrl + '/weixin/security/getProjectNameList',
|
||||
method: "GET",
|
||||
data: {
|
||||
deptId: app.globalData.deptId,
|
||||
projectId: app.globalData.userProjectId
|
||||
},
|
||||
success: (res) =>{
|
||||
success: (res) => {
|
||||
var that = this;
|
||||
that.setData({
|
||||
projectList:res.data
|
||||
projectList: res.data
|
||||
})
|
||||
}
|
||||
});
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
<van-popup show="{{ show }}" bind:close="onClose" position="bottom" custom-class="popup_style">
|
||||
<view class="option_list_title">
|
||||
<view class="option_list_title_btn" bindtap="onClose">取消</view>
|
||||
<view>{{placeholder}}</view>
|
||||
<view style="text-align: center;"><input placeholder="请输入项目名称搜索" style="width: 280rpx;" bindinput="findProject" value="{{findProjectValue}}"/></view>
|
||||
<view class="option_list_title_btn" bindtap="onConfirm">确认</view>
|
||||
</view>
|
||||
<van-picker columns="{{ columns }}" bind:change="onSelectChange" custom-class="time_select_style" default-index="{{ index }}"
|
||||
|
|
|
@ -23,6 +23,7 @@ Page({
|
|||
approveDB:0,
|
||||
ad:0,
|
||||
td:0,
|
||||
aq:0,
|
||||
},
|
||||
|
||||
|
||||
|
@ -40,7 +41,6 @@ Page({
|
|||
|
||||
showPopup() {
|
||||
this.setData({ show: true });
|
||||
|
||||
},
|
||||
|
||||
onClose() {
|
||||
|
@ -163,11 +163,10 @@ Page({
|
|||
},
|
||||
//跳转到进度管理
|
||||
JDGL2:function(){
|
||||
app.toast("敬请期待!");
|
||||
// wx.redirectTo({
|
||||
// //url: '../deepExcavation/index'
|
||||
// url:'../../pageage/Progress-management/index'
|
||||
// })
|
||||
//app.toast("敬请期待!");
|
||||
wx.redirectTo({
|
||||
url:'../../pageage/project_schedule/list/index'
|
||||
})
|
||||
},
|
||||
|
||||
//退出登录
|
||||
|
@ -201,7 +200,7 @@ Page({
|
|||
//查询当前登录人的代办任务
|
||||
awaitTask(minRoleId,deptId,loginName,userId) {
|
||||
let param = {
|
||||
//"businessKey":this.data.projectId,
|
||||
"businessKey":app.globalData.projectId,
|
||||
"nowRole":minRoleId,
|
||||
"nowDept":deptId,
|
||||
"nowUserName":loginName,
|
||||
|
@ -219,11 +218,9 @@ Page({
|
|||
that.setData({
|
||||
todoDB:res.data.todo,
|
||||
td:res.data.todo,
|
||||
ad:res.data.approve
|
||||
ad:res.data.approve+res.data.zlCount,
|
||||
aq:res.data.aqCount,
|
||||
})
|
||||
console.log("db");
|
||||
console.log(that.data.todoDB)
|
||||
console.log(that.data.approveDB)
|
||||
}
|
||||
}
|
||||
})
|
||||
|
|
|
@ -127,6 +127,7 @@
|
|||
style="width:40rpx; height: 40rpx;"
|
||||
/>
|
||||
安全管理
|
||||
<span class="tabNum" wx:if="{{aq>0}}">{{aq}}</span>
|
||||
</van-tabbar-item>
|
||||
|
||||
<van-tabbar-item bindtap="ZLGL">
|
||||
|
|
|
@ -8,8 +8,8 @@ Page({
|
|||
deptId:'',
|
||||
height:"auto",
|
||||
scale:'10',
|
||||
initialLon:'108.922306',
|
||||
initialLat:'34.191848',
|
||||
initialLon:'108.90975705669825',
|
||||
initialLat:'34.53095652639473',
|
||||
markers: [],
|
||||
value1:'省',
|
||||
value2:'市/区',
|
||||
|
@ -349,7 +349,7 @@ Page({
|
|||
value2:res.data.shiName+'/'+res.data.quName,
|
||||
value3:res.data.companyName,
|
||||
markers:markers,
|
||||
scale:15,
|
||||
scale:12,
|
||||
initialLon:res.data.longitude,
|
||||
initialLat:res.data.latitude,
|
||||
projectCount:1,
|
||||
|
@ -471,7 +471,7 @@ Page({
|
|||
markers:res.data,
|
||||
projectCount:res.data.length,
|
||||
projectData:res.data,
|
||||
scale:5,
|
||||
scale:12,
|
||||
initialLon:res.data[0].longitude,
|
||||
initialLat:res.data[0].latitude,
|
||||
})
|
||||
|
@ -481,7 +481,7 @@ Page({
|
|||
markers:res.data,
|
||||
projectCount:res.data.length,
|
||||
projectData:res.data,
|
||||
scale:5,
|
||||
scale:12,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
<view>
|
||||
<map class="map" id="map" scale="{{scale}}" latitude="{{initialLat}}" longitude="{{initialLon}}" markers="{{markers}}" style="width: 100%; height: {{height}}px;" bindmarkertap="getProjectListById" bindcallouttap="controltap" bindtap="checkMap" subkey="A2GBZ-AGALG-MP2QK-IJGFW-MRU36-4SF4O"></map>
|
||||
<map class="map" id="map" scale="{{scale}}" latitude="{{initialLat}}" longitude="{{initialLon}}" markers="{{markers}}" style="width: 100%; height: {{height}}px;" bindmarkertap="getProjectListById" bindcallouttap="controltap" bindtap="checkMap" enable-building="{{true}}" enable-3D="{{true}}" subkey="YZOBZ-FI3KL-EMAP6-EQX5G-3M435-FBF75"></map>
|
||||
<!--不行subKey使用这个...A2GBZ-AGALG-MP2QK-IJGFW-MRU36-4SF4O-->
|
||||
</view>
|
||||
<!-- 当掏钱了就解开这个封印将下面的封印上 -->
|
||||
<!-- <view class="map_title">
|
||||
|
|
|
@ -0,0 +1,567 @@
|
|||
// pages/Progress-management/index.js
|
||||
import * as echarts from '../../ec-canvas/echarts';
|
||||
|
||||
const app = getApp()
|
||||
|
||||
let chart=null
|
||||
let chart1=null
|
||||
|
||||
function getOption(a1) {
|
||||
let that=this
|
||||
return {
|
||||
title: [
|
||||
{
|
||||
text: a1+'%',
|
||||
textAlign: "center",
|
||||
left: "48%",
|
||||
top: "30%",
|
||||
textStyle: {
|
||||
color: "#67abf2",
|
||||
fontSize: 23,
|
||||
},
|
||||
},
|
||||
{
|
||||
text: '实际产值进度',
|
||||
left: "48%",
|
||||
top: "80%",
|
||||
textAlign: "center",
|
||||
textStyle: {
|
||||
color: "#cdd7fa",
|
||||
fontWeight: "normal",
|
||||
fontSize: "16",
|
||||
textAlign: "center",
|
||||
},
|
||||
},
|
||||
],
|
||||
series: [
|
||||
{
|
||||
type: "pie",
|
||||
hoverAnimation: false,
|
||||
radius: ["60%", "59%"],
|
||||
center: ["50%", "40%"],
|
||||
labelLine: {
|
||||
normal: {
|
||||
show: false,
|
||||
},
|
||||
},
|
||||
label: {
|
||||
normal: {
|
||||
position: "center",
|
||||
},
|
||||
},
|
||||
data: [
|
||||
{
|
||||
value: 100,
|
||||
itemStyle: {
|
||||
normal: {
|
||||
color: "#255788",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
],
|
||||
},
|
||||
{
|
||||
type: "pie",
|
||||
hoverAnimation: false,
|
||||
radius: ["53%", "60%"],
|
||||
center: ["50%", "40%"],
|
||||
labelLine: {
|
||||
normal: {
|
||||
show: false,
|
||||
},
|
||||
},
|
||||
label: {
|
||||
normal: {
|
||||
position: "center",
|
||||
},
|
||||
},
|
||||
data: [
|
||||
{
|
||||
value: a1,
|
||||
itemStyle: {
|
||||
normal: {
|
||||
color: "#68a8f2",
|
||||
},
|
||||
},
|
||||
normal: {
|
||||
show: false,
|
||||
},
|
||||
},
|
||||
{
|
||||
value: 100-35,
|
||||
itemStyle: {
|
||||
normal: {
|
||||
label: {
|
||||
show: false,
|
||||
},
|
||||
labelLine: {
|
||||
show: false,
|
||||
},
|
||||
color: "rgba(0,0,0,0)",
|
||||
borderWidth: 0,
|
||||
},
|
||||
emphasis: {
|
||||
color: "rgba(0,0,0,0)",
|
||||
borderWidth: 0,
|
||||
},
|
||||
},
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
};
|
||||
}
|
||||
|
||||
function getOption1(a2) {
|
||||
let that=this
|
||||
return {
|
||||
title: [
|
||||
{
|
||||
text: a2+'%',
|
||||
textAlign: "center",
|
||||
left: "48%",
|
||||
top: "30%",
|
||||
textStyle: {
|
||||
color: "#67abf2",
|
||||
fontSize: 23,
|
||||
},
|
||||
},
|
||||
{
|
||||
text: '时间管理',
|
||||
left: "48%",
|
||||
top: "80%",
|
||||
textAlign: "center",
|
||||
textStyle: {
|
||||
color: "#cdd7fa",
|
||||
fontWeight: "normal",
|
||||
fontSize: "16",
|
||||
textAlign: "center",
|
||||
},
|
||||
},
|
||||
],
|
||||
series: [
|
||||
{
|
||||
type: "pie",
|
||||
hoverAnimation: false,
|
||||
radius: ["60%", "59%"],
|
||||
center: ["50%", "40%"],
|
||||
labelLine: {
|
||||
normal: {
|
||||
show: false,
|
||||
},
|
||||
},
|
||||
label: {
|
||||
normal: {
|
||||
position: "center",
|
||||
},
|
||||
},
|
||||
data: [
|
||||
{
|
||||
value: 100,
|
||||
itemStyle: {
|
||||
normal: {
|
||||
color: "#255788",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
],
|
||||
},
|
||||
{
|
||||
type: "pie",
|
||||
hoverAnimation: false,
|
||||
radius: ["53%", "60%"],
|
||||
center: ["50%", "40%"],
|
||||
labelLine: {
|
||||
normal: {
|
||||
show: false,
|
||||
},
|
||||
},
|
||||
label: {
|
||||
normal: {
|
||||
position: "center",
|
||||
},
|
||||
},
|
||||
data: [
|
||||
{
|
||||
value: a2,
|
||||
itemStyle: {
|
||||
normal: {
|
||||
color: "#68a8f2",
|
||||
},
|
||||
},
|
||||
normal: {
|
||||
show: false,
|
||||
},
|
||||
},
|
||||
{
|
||||
value: 100-22,
|
||||
itemStyle: {
|
||||
normal: {
|
||||
label: {
|
||||
show: false,
|
||||
},
|
||||
labelLine: {
|
||||
show: false,
|
||||
},
|
||||
color: "rgba(0,0,0,0)",
|
||||
borderWidth: 0,
|
||||
},
|
||||
emphasis: {
|
||||
color: "rgba(0,0,0,0)",
|
||||
borderWidth: 0,
|
||||
},
|
||||
},
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
};
|
||||
}
|
||||
|
||||
Page({
|
||||
|
||||
/**
|
||||
* 页面的初始数据
|
||||
*/
|
||||
data: {
|
||||
//查看图片
|
||||
picShow:false,
|
||||
progressList:[{text:'曲江御井路公租房项目EPC总承包工程',id:132}],
|
||||
progressName:'曲江御井路公租房项目EPC总承包工程',
|
||||
num:'0',
|
||||
startEnd:'',
|
||||
ec:{
|
||||
lazyLoad:true
|
||||
},
|
||||
ec1:{
|
||||
lazyLoad:true
|
||||
},
|
||||
tableList:[{name:'整体进度',value:'4#楼 12F层'},{name:'实时进度',value:'4#-12F-YBS7dM'},{name:'预制构件总数',value:'16811'},{name:'施工完成',value:'3130'},{name:'施工验收',value:'0'},{name:'构件吊装',value:'0'},{name:'扫码进场',value:'25'},{name:'未开始',value:'13656'}],
|
||||
contentShow:false,
|
||||
shigongList:[],
|
||||
timeStr:'',
|
||||
jinduStr:'',
|
||||
video:'',
|
||||
|
||||
show: false,
|
||||
projectId:'',
|
||||
projectName:'' ,
|
||||
loginName:'',
|
||||
userName:'',
|
||||
initData:{},
|
||||
projectData:{}
|
||||
},
|
||||
showPopup() {
|
||||
this.setData({ show: true });
|
||||
},
|
||||
onClose() {
|
||||
this.setData({ show: false });
|
||||
},
|
||||
|
||||
// 打开遮罩层
|
||||
showPic(e) {
|
||||
this.setData({
|
||||
picShow:true,
|
||||
imageUrl:e.currentTarget.dataset.id
|
||||
})
|
||||
},
|
||||
// 关闭遮罩层
|
||||
closePic() {
|
||||
this.setData({
|
||||
picShow:false,
|
||||
imageUrl:''
|
||||
|
||||
})
|
||||
},
|
||||
// 点击单选
|
||||
onSelectBtn(e){
|
||||
console.log(e.currentTarget.dataset.set);
|
||||
const m= this.data.shigongList.map(function (item,i) {
|
||||
console.log(item);
|
||||
if(e.currentTarget.dataset.set==i){
|
||||
item.select= item.select==false?true:false
|
||||
}
|
||||
return item
|
||||
})
|
||||
// console.log(e.currentTarget.dataset.set);
|
||||
this.setData({
|
||||
shigongList:m
|
||||
})
|
||||
},
|
||||
// 点击让模块隐藏
|
||||
onClick(e){
|
||||
console.log(e.currentTarget.dataset.set);
|
||||
const m= this.data.shigongList.map(function (item,i) {
|
||||
console.log(item);
|
||||
if(e.currentTarget.dataset.set==i){
|
||||
item.type= item.type==false?true:false
|
||||
}
|
||||
return item
|
||||
})
|
||||
// console.log(e.currentTarget.dataset.set);
|
||||
this.setData({
|
||||
shigongList:m
|
||||
})
|
||||
},
|
||||
|
||||
//项目切换 返回值
|
||||
onProjectSelect(e) {
|
||||
let projectId = e.detail.id;
|
||||
let projectName = e.detail.text;
|
||||
app.globalData.projectId = projectId;
|
||||
app.globalData.projectName = projectName;
|
||||
this.setData({
|
||||
projectId: projectId,
|
||||
projectName: projectName
|
||||
})
|
||||
this.onLoad()
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面加载
|
||||
*/
|
||||
onLoad(options) {
|
||||
var that = this
|
||||
//获取项目缓存数据
|
||||
wx.getStorage({
|
||||
key: 'userinfo',
|
||||
success:function(res){
|
||||
that.setData({
|
||||
loginName:res.data.loginName,
|
||||
userName:res.data.userName,
|
||||
projectId:app.globalData.projectId,
|
||||
projectName:app.globalData.projectName,
|
||||
initData:{text:app.globalData.projectName,id:app.globalData.projectId}
|
||||
})
|
||||
}
|
||||
})
|
||||
that.getProjectCorrespondence(app.globalData.projectId);
|
||||
|
||||
this.oneComponent = this.selectComponent('#mychart-dom');
|
||||
this.twoComponent = this.selectComponent('#mychart-dom1');
|
||||
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 项目对应关系
|
||||
*/
|
||||
getProjectCorrespondence(projectId) {
|
||||
var that = this;
|
||||
wx.request({
|
||||
url: app.globalData.reqUrl + '/weixin/training/getProjectCorrespondence',
|
||||
data: {
|
||||
"projectId": projectId,
|
||||
},
|
||||
method: "get",
|
||||
success: function (res) {
|
||||
that.setData({
|
||||
projectData: res.data
|
||||
})
|
||||
|
||||
that.gainProgressLog()
|
||||
that.gainVideoUrl()
|
||||
that.gainBaseInfo()
|
||||
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面初次渲染完成
|
||||
*/
|
||||
onReady() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面显示
|
||||
*/
|
||||
onShow() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面隐藏
|
||||
*/
|
||||
onHide() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面卸载
|
||||
*/
|
||||
onUnload() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 页面相关事件处理函数--监听用户下拉动作
|
||||
*/
|
||||
onPullDownRefresh() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 页面上拉触底事件的处理函数
|
||||
*/
|
||||
onReachBottom() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 用户点击右上角分享
|
||||
*/
|
||||
onShareAppMessage() {
|
||||
|
||||
},
|
||||
|
||||
gainProgressLog() {
|
||||
var that = this;
|
||||
//日志
|
||||
if(this.data.projectData.szh == '132') {
|
||||
wx.request({
|
||||
url: app.globalData.szhUrl+'/api/wei/gainWeiListFloorInfo',
|
||||
data:{
|
||||
"projectId":this.data.projectData.szh
|
||||
},
|
||||
method:"GET",
|
||||
success:function(res){
|
||||
that.setData({
|
||||
shigongList:res.data.data
|
||||
})
|
||||
}
|
||||
})
|
||||
} else {
|
||||
that.setData({
|
||||
shigongList:[]
|
||||
})
|
||||
}
|
||||
},
|
||||
|
||||
gainVideoUrl() {
|
||||
var that = this;
|
||||
if(this.data.projectData.szh == '132') {
|
||||
//视频
|
||||
wx.request({
|
||||
url: app.globalData.szhUrl+'/api/check/gainUrl',
|
||||
data:{
|
||||
"projectId":this.data.projectData.szh
|
||||
},
|
||||
method:"GET",
|
||||
success:function(res){
|
||||
that.setData({
|
||||
video:res.data.data.httpHlss
|
||||
})
|
||||
}
|
||||
|
||||
})
|
||||
} else {
|
||||
that.setData({
|
||||
video:''
|
||||
})
|
||||
}
|
||||
|
||||
},
|
||||
|
||||
getDateDiff(dateTime) { // 将年月日转换为几小时前,几天前等等
|
||||
let dateTimeStamp = new Date(dateTime).getTime();
|
||||
let result = '';
|
||||
let minute = 1000 * 60;
|
||||
let hour = minute * 60;
|
||||
let day = hour * 24;
|
||||
let halfamonth = day * 15;
|
||||
let month = day * 30;
|
||||
let year = day * 365;
|
||||
let now = new Date().getTime();
|
||||
let diffValue = now - dateTimeStamp;
|
||||
if (diffValue < 0) {
|
||||
return;
|
||||
}
|
||||
let monthEnd = diffValue / month;
|
||||
let weekEnd = diffValue / (7 * day);
|
||||
let dayEnd = diffValue / day;
|
||||
let hourEnd = diffValue / hour;
|
||||
let minEnd = diffValue / minute;
|
||||
let yearEnd = diffValue / year;
|
||||
if (yearEnd >= 1) {
|
||||
result = dateTime;
|
||||
} else if (monthEnd >= 1) {
|
||||
result = "" + parseInt(monthEnd) + "月前";
|
||||
} else if (weekEnd >= 1) {
|
||||
result = "" + parseInt(weekEnd) + "周前";
|
||||
} else if (dayEnd >= 1) {
|
||||
result = "" + parseInt(dayEnd) + "天前";
|
||||
} else if (hourEnd >= 1) {
|
||||
result = "" + parseInt(hourEnd) + "小时前";
|
||||
} else if (minEnd >= 1) {
|
||||
result = "" + parseInt(minEnd) + "分钟前";
|
||||
} else {
|
||||
result = "刚刚";
|
||||
}
|
||||
return result;
|
||||
},
|
||||
|
||||
initChartA(A1) {
|
||||
this.oneComponent.init((canvas, width, height, dpr) => {
|
||||
chart=echarts.init(canvas,null,{
|
||||
width:width,
|
||||
height:height,
|
||||
devicePixelRatio:dpr
|
||||
})
|
||||
canvas.setChart(chart)
|
||||
let option=getOption(A1)
|
||||
chart.setOption(option)
|
||||
return chart
|
||||
})
|
||||
|
||||
},
|
||||
|
||||
initChartB(A2) {
|
||||
this.twoComponent.init((canvas, width, height, dpr) => {
|
||||
chart1=echarts.init(canvas,null,{
|
||||
width:width,
|
||||
height:height,
|
||||
devicePixelRatio:dpr
|
||||
})
|
||||
canvas.setChart(chart1)
|
||||
let option1=getOption1(A2)
|
||||
chart1.setOption(option1)
|
||||
return chart1
|
||||
})
|
||||
|
||||
},
|
||||
|
||||
gainBaseInfo() {
|
||||
//基本进度百分比
|
||||
var that = this;
|
||||
wx.request({
|
||||
url: app.globalData.szhUrl+'/api/building/proBaseInfo',
|
||||
data:{
|
||||
"projectId":this.data.projectData.szh
|
||||
},
|
||||
method:"GET",
|
||||
success:function(res){
|
||||
that.setData({
|
||||
num:res.data.data.contract_monery,
|
||||
startEnd:(res.data.data.plan_start_date.split(" "))[0] + " 至 " + (res.data.data.plan_end_date.split(" "))[0],
|
||||
jinduStr:(res.data.data.kailei_money / 67640 * 100).toFixed(0),
|
||||
timeStr:(that.getDateDiff(res.data.data.actual_start_date) / 720 * 100).toFixed(0)
|
||||
})
|
||||
|
||||
that.initChartA((res.data.data.kailei_money / 67640 * 100).toFixed(0) )
|
||||
that.initChartB(((parseInt(new Date() - new Date(res.data.data.actual_start_date)) / (1000 * 60 * 60 * 24)).toFixed(0) / 720 * 100).toFixed(0) )
|
||||
}
|
||||
})
|
||||
|
||||
},
|
||||
|
||||
goGCLB:function(){
|
||||
wx.redirectTo({
|
||||
url: '../../pages/gengduogongneng/gengduogongneng'
|
||||
})
|
||||
},
|
||||
|
||||
})
|
|
@ -0,0 +1,8 @@
|
|||
{
|
||||
"usingComponents": {
|
||||
"van-row": "@vant/weapp/row",
|
||||
"van-col": "@vant/weapp/col",
|
||||
"van-popup": "@vant/weapp/popup/index"
|
||||
},
|
||||
"navigationBarTitleText": "进度管理"
|
||||
}
|
|
@ -0,0 +1,185 @@
|
|||
<!--pages/Progress-management/index.wxml-->
|
||||
<!-- 进度管理 -->
|
||||
|
||||
<view class="All-content">
|
||||
<!-- <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="4">
|
||||
<view class="header_img" bindtap="goGCLB">
|
||||
<image src="/images/left.png"></image>
|
||||
<text class="header_fh">返回</text>
|
||||
</view>
|
||||
</van-col>
|
||||
<van-col span="10">
|
||||
<view class="header_name">进度管理</view>
|
||||
</van-col>
|
||||
</van-row>
|
||||
</view>
|
||||
</view> -->
|
||||
<!--
|
||||
<van-popup show="{{ show }}" position="left" custom-style="width: 70%;height:100%;background:#191d28" bind:close="onClose" >
|
||||
<view class="left_max">
|
||||
<van-row class="demo clearfix">
|
||||
<van-col span="10">
|
||||
<view class="left_head"><image src="http://fileimg.makalu.cc/szgl/9015e824c5004e629049c4f72967cfdc.png"></image></view>
|
||||
</van-col>
|
||||
<van-col span="14">
|
||||
<view class="left_info">
|
||||
<view class="left_info_name">{{userName}}</view>
|
||||
<view class="left_info_name">{{loginName}}</view>
|
||||
</view>
|
||||
</van-col>
|
||||
</van-row>
|
||||
</view>
|
||||
</van-popup> -->
|
||||
<!-- 头部模块 -->
|
||||
<view class="max_new_content" style="width:100%;height: 105rpx;">
|
||||
<project-select width='640rpx' left='-30rpx' init="{{initData}}" bindchange="onProjectSelect"></project-select>
|
||||
<!-- 工期概括 -->
|
||||
<view class="gongqigaikuo" style="margin-top: 64rpx;">
|
||||
<view class="eharts_title">
|
||||
工期概况
|
||||
</view>
|
||||
<view class="gongqigaikuo-content">
|
||||
<!-- 合同工期 -->
|
||||
<view class="gongqigaikuo-content-hetong">
|
||||
<view class="gongqigaikuo-content-hetong-left">
|
||||
<view style="display: flex;font-size: 20rpx;justify-content: flex-start;align-items: center;">
|
||||
<view class="safety_inspect_title">合同工期</view>
|
||||
<safety-number number="{{num}}"></safety-number>
|
||||
</view>
|
||||
</view>
|
||||
<view class="gongqigaikuo-content-hetong-left" style="font-size: 22rpx;justify-content: flex-space-between;align-items: flex-end;">
|
||||
<view style="color: gray;margin-left: -20rpx;">
|
||||
天
|
||||
</view>
|
||||
<view style="color: #0a7bbd;">
|
||||
{{startEnd}}
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<!-- 时间进度数据图 -->
|
||||
<view class="gongqigaikuo-content-jindu">
|
||||
<view class="gongqigaikuo-content-jindu-box">
|
||||
<view class="gongqigaikuo-content-jindu-left">
|
||||
<ec-canvas id="mychart-dom1" canvas-id="mychart1" ec="{{ec1}}"></ec-canvas>
|
||||
</view>
|
||||
</view>
|
||||
<view class="gongqigaikuo-content-jindu-box">
|
||||
<view class="gongqigaikuo-content-jindu-left">
|
||||
<ec-canvas id="mychart-dom" canvas-id="mychart" ec="{{ec}}"></ec-canvas>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<!-- 施工日志 -->
|
||||
<view class="shigongrizhi">
|
||||
<!-- 头部施工日志 -->
|
||||
<view class="shigongrizhi-header">
|
||||
<view class="eharts_title" style="font-size: 26rpx;">
|
||||
施工日志
|
||||
</view>
|
||||
<!-- <view style="color:#6b7eb9;font-size: 26rpx;">
|
||||
查看详情>>
|
||||
</view> -->
|
||||
</view>
|
||||
<!-- 内容部分 -->
|
||||
<view class="shigongrizhi-content" wx:for="{{shigongList}}" wx:key="index" bindtap="onClick" data-set="{{index}}" >
|
||||
<view class="shigongrizhi-content-top">
|
||||
<view style="display: flex;justify-content: flex-start;align-items: center;">
|
||||
<!-- -->
|
||||
<radio color="#23aaf2" checked="{{!item.select}}" bindtap="onSelectBtn" data-set="{{index}}"/>
|
||||
<view style="margin-left: 18rpx;">
|
||||
{{item.name}}
|
||||
</view>
|
||||
</view>
|
||||
<view style="width: 30rpx;height: 30rpx;margin-right: 10rpx;" >
|
||||
<image wx:if="{{item.type==false}}" src="http://fileimg.makalu.cc/WEB_18FFE67D5A8E4077870F5E2AF9B4EE97.png" mode="" style="width: 100%;height: 100%;transform: scale(0.5);"/>
|
||||
<image wx:else="{{item.type==true}}" src="http://fileimg.makalu.cc/WEB_B394869CFAAA449D8DFE7BA549A19EB8.png" mode="" style="width: 100%;height: 100%;transform: scale(0.5)"/>
|
||||
</view>
|
||||
</view>
|
||||
<!-- 隐藏部分 -->
|
||||
<view style="padding-left: 20rpx;">
|
||||
<view wx:if="{{item.type}}" style="border-left: 1px dashed skyblue; padding-left: 40rpx;">
|
||||
<view style="color: gray;padding-left: 70rpx;margin: 8rpx 0;">
|
||||
设计楼层高{{item.design_floor_height}}m,设计施工高度{{item.design_elevation}}m
|
||||
</view>
|
||||
<view style="color: gray;padding-left: 70rpx;margin: 8rpx 0;">
|
||||
设计楼板厚度{{item.design_floor_thickness}}m
|
||||
</view>
|
||||
<view class="shigongrizhi-content-bottom">
|
||||
<!-- 模板铺设 -->
|
||||
<view class="shigongrizhi-content-bottom-left" wx:for="{{item.typtInfo}}" wx:for-item="itemType" wx:key="A">
|
||||
<view style="width: 78rpx;height: 78rpx;margin-right: 20rpx;">
|
||||
<image src="http://fileimg.makalu.cc/WEB_D9E0F9ADB3E3427A9100993F7AEC16CE.png" mode="" style="width: 100%;height: 100%;transform: scale(0.5);"/>
|
||||
</view>
|
||||
<view style="display: flex;flex-direction: column;justify-content: space-around;">
|
||||
<view>
|
||||
{{itemType.name}}
|
||||
</view>
|
||||
<view style="color: gray;">
|
||||
{{itemType.time}}
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<!-- 照片墙展示 -->
|
||||
<view class="shigongrizhi-content-top-bottom">
|
||||
<view class="shigongrizhi-content-top-bottom-Img" wx:for="{{item.photoInfo}}" wx:for-item="itemPhoto" wx:key="B">
|
||||
<image src="{{itemPhoto.images}}" mode="" bindtap="showPic" data-id="{{itemPhoto.images}}" style="width: 100%;height: 100%;"/>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<!-- 视频进度 -->
|
||||
<view class="shipinjindu">
|
||||
<view class="shipinjindu-top">
|
||||
<view class="eharts_title">
|
||||
视频进度
|
||||
</view>
|
||||
</view>
|
||||
<view class="shipinjindu-bottom">
|
||||
<view class="shipinjindu-bottom-insder">
|
||||
<video src="{{video}}" style="width: 100%;height: 100%;"/>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<!-- BIM进度 -->
|
||||
<!-- <view class="BIM">
|
||||
<view class="eharts_title">
|
||||
BIM进度
|
||||
</view>
|
||||
<view class="BIM-content">
|
||||
<view style="width:100%;height:300rpx;">
|
||||
<image src="http://fileimg.makalu.cc/WEB_607867FF7DBB4B088BD8D8E16661B3CE.jpg" mode="" style="width: 100%;height: 100%;"/>
|
||||
</view>
|
||||
<view class="BIM-content-table">
|
||||
<view class="BIM-content-tables" wx:for="{{tableList}}" wx:key="index">
|
||||
<view style="width: 40%;height: 48rpx;text-align: center;line-height: 48rpx;border-right: 1px solid skyblue;background-color: #1e324a;">
|
||||
{{item.name}}
|
||||
</view>
|
||||
<view style="width: 60%;height: 48rpx;text-align: center;line-height: 48rpx;color: skyblue;">
|
||||
{{item.value}}
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view> -->
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 遮罩层 -->
|
||||
<view>
|
||||
<van-popup show="{{ picShow }}" bind:before-enter="showPic" bind:close="closePic">
|
||||
<image src="{{imageUrl}}" mode="scaleToFill"></image>
|
||||
</van-popup>
|
||||
</view>
|
|
@ -0,0 +1,181 @@
|
|||
/* pages/Progress-management/index.wxss */
|
||||
/* 所有样式 */
|
||||
.All-content{
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
padding: 36rpx ;
|
||||
padding-top: 0rpx;
|
||||
}
|
||||
/* 头部样式 290+40*/
|
||||
.header-content{
|
||||
width: 100%;
|
||||
height: 100rpx;
|
||||
border-radius: 40rpx;
|
||||
margin-bottom: 40rpx;
|
||||
}
|
||||
/* 工期概括 +210*/
|
||||
.gongqigaikuo{
|
||||
width: 100%;
|
||||
height: 520rpx;
|
||||
border: 1px solid #1e2336;
|
||||
background-color: #1e2336;
|
||||
padding-top: 20rpx;
|
||||
margin-bottom: 40rpx;
|
||||
font-size: 26rpx;
|
||||
border-radius: 15rpx;
|
||||
}
|
||||
|
||||
.eharts_title{
|
||||
height: 40rpx;
|
||||
line-height: 40rpx;
|
||||
padding-left: 50rpx;
|
||||
margin-left: 20rpx;
|
||||
background: url("http://fileimg.makalu.cc/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx;
|
||||
}
|
||||
.gongqigaikuo-content{
|
||||
width: 100%;
|
||||
height: 484rpx;
|
||||
box-sizing: border-box;
|
||||
padding: 12rpx 20rpx 40rpx 40rpx;
|
||||
}
|
||||
.gongqigaikuo-content-hetong{
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
width: 100%;
|
||||
height: 76rpx;
|
||||
}
|
||||
.gongqigaikuo-content-hetong-left{
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
width: 50%;
|
||||
height: 76rpx;
|
||||
}
|
||||
.gongqigaikuo-content-jindu{
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
padding: 20rpx 40rpx 10rpx;
|
||||
height: 348rpx;
|
||||
}
|
||||
.gongqigaikuo-content-jindu-left{
|
||||
width: 320rpx;
|
||||
height: 320rpx;
|
||||
}
|
||||
.gongqigaikuo-content-jindu-box{
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
}
|
||||
/*施工日志 */
|
||||
.shigongrizhi{
|
||||
width: 100%;
|
||||
border: 1px solid #1e2336;
|
||||
background-color: #1e2336;
|
||||
padding-top: 20rpx;
|
||||
margin-bottom: 40rpx;
|
||||
font-size: 26rpx;
|
||||
border-radius: 15rpx;
|
||||
}
|
||||
.shigongrizhi-header{
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
}
|
||||
.shigongrizhi-content{
|
||||
width: 100%;
|
||||
padding: 30rpx 20rpx;
|
||||
box-sizing: border-box;
|
||||
font-size: 24rpx;
|
||||
}
|
||||
.shigongrizhi-content-top{
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
width: 100%;
|
||||
height: 50rpx;
|
||||
font-size: 28rpx;
|
||||
}
|
||||
.shigongrizhi-content-bottom{
|
||||
width: 100%;
|
||||
|
||||
margin: 30rpx 0;
|
||||
}
|
||||
/* 模板铺设 */
|
||||
.shigongrizhi-content-bottom-left{
|
||||
display: flex;
|
||||
justify-content: flex-start;
|
||||
width: 100%;
|
||||
height: 78rpx;
|
||||
}
|
||||
.shigongrizhi-content-top-bottom{
|
||||
display: flex;
|
||||
justify-content: flex-start;
|
||||
align-items: center;
|
||||
height: 130rpx;
|
||||
}
|
||||
.shigongrizhi-content-top-bottom-Img{
|
||||
width: 160rpx;
|
||||
height: 100rpx;
|
||||
margin: 10rpx;
|
||||
}
|
||||
/* 视频进度 */
|
||||
.shipinjindu{
|
||||
width: 100%;
|
||||
height: 520rpx;
|
||||
border: 1px solid #1e2336;
|
||||
background-color: #1e2336;
|
||||
padding-top: 20rpx;
|
||||
margin-bottom: 40rpx;
|
||||
font-size: 26rpx;
|
||||
border-radius: 15rpx;
|
||||
}
|
||||
.shipinjindu-top{
|
||||
display: flex;
|
||||
align-items: center;
|
||||
width: 100%;
|
||||
height: 60rpx;
|
||||
}
|
||||
.shipinjindu-bottom{
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
width: 100%;
|
||||
height: 460rpx;
|
||||
}
|
||||
.shipinjindu-bottom-insder{
|
||||
width: 90%;
|
||||
height: 400rpx;
|
||||
}
|
||||
/* BIM */
|
||||
.BIM{
|
||||
width: 100%;
|
||||
height: 900rpx;
|
||||
border: 1px solid #1e2336;
|
||||
background-color: #1e2336;
|
||||
padding-top: 20rpx;
|
||||
margin-bottom: 40rpx;
|
||||
font-size: 26rpx;
|
||||
}
|
||||
.BIM-content{
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
height: 768rpx;
|
||||
padding: 30rpx 40rpx;
|
||||
|
||||
}
|
||||
.BIM-content-table{
|
||||
width: 100%;
|
||||
height: 422rpx;
|
||||
}
|
||||
.BIM-content-tables{
|
||||
display: flex;
|
||||
height: 52rpx;
|
||||
border: 1px solid skyblue;
|
||||
}
|
|
@ -40,6 +40,8 @@ Page({
|
|||
materialSealStatistics:[{ name: "其它", value: 0, prop: 0}],
|
||||
todoDb:0,
|
||||
approveDb:0,
|
||||
aq:0,
|
||||
zl:0,
|
||||
qyfsDb:0,
|
||||
scslDb:0,
|
||||
jpysDb:0,
|
||||
|
@ -169,25 +171,28 @@ Page({
|
|||
if(res.code == 200 && res.data){
|
||||
//数据绑定
|
||||
res.data.forEach((it,idx)=>{
|
||||
if(!it.passTotal){
|
||||
it.passTotal = 0;
|
||||
}
|
||||
if(it.checkType=="1"){
|
||||
this.setData({
|
||||
"checkDetectionData.type1Value": it.total,
|
||||
"checkDetectionData.type1PassRate": (it.passTotal / it.checkTotal * 100).toFixed(2)
|
||||
"checkDetectionData.type1PassRate": (it.passTotal / it.total * 100).toFixed(2)
|
||||
});
|
||||
}else if(it.checkType=="2"){
|
||||
this.setData({
|
||||
"checkDetectionData.type2Value": it.total,
|
||||
"checkDetectionData.type2PassRate": (it.passTotal / it.checkTotal * 100).toFixed(2)
|
||||
"checkDetectionData.type2PassRate": (it.passTotal / it.total * 100).toFixed(2)
|
||||
});
|
||||
}else if(it.checkType=="3"){
|
||||
this.setData({
|
||||
"checkDetectionData.type3Value": it.total,
|
||||
"checkDetectionData.type3PassRate": (it.passTotal / it.checkTotal * 100).toFixed(2)
|
||||
"checkDetectionData.type3PassRate": (it.passTotal / it.total * 100).toFixed(2)
|
||||
});
|
||||
}else{
|
||||
this.setData({
|
||||
"checkDetectionData.type4Value": it.total,
|
||||
"checkDetectionData.type4PassRate": (it.passTotal / it.checkTotal * 100).toFixed(2)
|
||||
"checkDetectionData.type4PassRate": (it.passTotal / it.total * 100).toFixed(2)
|
||||
});
|
||||
}
|
||||
});
|
||||
|
@ -405,10 +410,10 @@ Page({
|
|||
},
|
||||
//跳转到进度管理
|
||||
JDGL:function(){
|
||||
app.toast("敬请期待!");
|
||||
//wx.redirectTo({
|
||||
// url:'../../pageage/Progress-management/index'
|
||||
//})
|
||||
//app.toast("敬请期待!");
|
||||
wx.redirectTo({
|
||||
url:'../../pageage/project_schedule/list/index'
|
||||
})
|
||||
},
|
||||
/**
|
||||
* 更多功能
|
||||
|
@ -444,7 +449,7 @@ Page({
|
|||
//查询当前登录人的代办任务
|
||||
awaitTask(minRoleId,deptId,loginName,userId) {
|
||||
let param = {
|
||||
//"businessKey":this.data.projectId,
|
||||
"businessKey":app.globalData.projectId,
|
||||
"nowRole":minRoleId,
|
||||
"nowDept":deptId,
|
||||
"nowUserName":loginName,
|
||||
|
@ -461,7 +466,9 @@ Page({
|
|||
if(res.code=="200"){
|
||||
that.setData({
|
||||
todoDb:res.data.todo,
|
||||
approveDb:res.data.approve,
|
||||
approveDb:res.data.approve+res.data.zlCount,
|
||||
aq:res.data.aqCount,
|
||||
zl:res.data.zlCount,
|
||||
qyfsDb:res.data.approveQYFS,
|
||||
scslDb:res.data.approveSCSL,
|
||||
jpysDb:res.data.approveJPYS,
|
||||
|
|
|
@ -61,6 +61,7 @@
|
|||
<span wx:if="{{item.menu_identi=='CLFYGL'}}"><span class="tabNum_active" wx:if="{{clfyDb>0}}">{{clfyDb}}</span></span>
|
||||
<span wx:if="{{item.menu_identi=='JPYSGL'}}"><span class="tabNum_active" wx:if="{{jpysDb>0}}">{{jpysDb}}</span></span>
|
||||
<span wx:if="{{item.menu_identi=='QYFS'}}"><span class="tabNum_active" wx:if="{{qyfsDb>0}}">{{qyfsDb}}</span></span>
|
||||
<span wx:if="{{item.menu_identi=='ZLYHPC'}}"><span class="tabNum_active" wx:if="{{zl>0}}">{{zl}}</span></span>
|
||||
<image src="{{item.menu_img}}"></image>
|
||||
<view>{{item.menu_name}}</view>
|
||||
</view>
|
||||
|
@ -430,6 +431,7 @@
|
|||
style="width:40rpx; height: 40rpx;"
|
||||
/>
|
||||
安全管理
|
||||
<span class="tabNum" wx:if="{{aq>0}}">{{aq}}</span>
|
||||
</van-tabbar-item>
|
||||
|
||||
<van-tabbar-item>
|
||||
|
|
|
@ -1,66 +0,0 @@
|
|||
// pages/ranyuanguanli-map/map.js
|
||||
Page({
|
||||
|
||||
/**
|
||||
* 页面的初始数据
|
||||
*/
|
||||
data: {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面加载
|
||||
*/
|
||||
onLoad(options) {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面初次渲染完成
|
||||
*/
|
||||
onReady() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面显示
|
||||
*/
|
||||
onShow() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面隐藏
|
||||
*/
|
||||
onHide() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面卸载
|
||||
*/
|
||||
onUnload() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 页面相关事件处理函数--监听用户下拉动作
|
||||
*/
|
||||
onPullDownRefresh() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 页面上拉触底事件的处理函数
|
||||
*/
|
||||
onReachBottom() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 用户点击右上角分享
|
||||
*/
|
||||
onShareAppMessage() {
|
||||
|
||||
}
|
||||
})
|
|
@ -1,2 +0,0 @@
|
|||
<!--pages/ranyuanguanli-map/map.wxml-->
|
||||
<text>pages/ranyuanguanli-map/map.wxml</text>
|
|
@ -39,6 +39,7 @@ Page({
|
|||
request:app.globalData.reqUrl,
|
||||
todoDb:0,
|
||||
approveDb:0,
|
||||
aq:0,
|
||||
},
|
||||
|
||||
//项目切换 返回值
|
||||
|
@ -419,10 +420,10 @@ Page({
|
|||
},
|
||||
//跳转到进度管理
|
||||
JDGL:function(){
|
||||
app.toast("敬请期待!");
|
||||
//wx.redirectTo({
|
||||
// url:'../../pageage/Progress-management/index'
|
||||
//})
|
||||
//app.toast("敬请期待!");
|
||||
wx.redirectTo({
|
||||
url:'../../pageage/project_schedule/list/index'
|
||||
})
|
||||
},
|
||||
/**
|
||||
* 更多功能
|
||||
|
@ -451,7 +452,7 @@ Page({
|
|||
//查询当前登录人的代办任务
|
||||
awaitTask(minRoleId,deptId,loginName,userId) {
|
||||
let param = {
|
||||
//"businessKey":this.data.projectId,
|
||||
"businessKey":app.globalData.projectId,
|
||||
"nowRole":minRoleId,
|
||||
"nowDept":deptId,
|
||||
"nowUserName":loginName,
|
||||
|
@ -468,7 +469,8 @@ Page({
|
|||
if(res.code=="200"){
|
||||
that.setData({
|
||||
todoDb:res.data.todo,
|
||||
approveDb:res.data.approve
|
||||
approveDb:res.data.approve+res.data.zlCount,
|
||||
aq:res.data.aqCount
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
|
@ -57,6 +57,7 @@
|
|||
<van-row class="demo clearfix">
|
||||
<van-col span="8" wx:for="{{menuList}}" wx:key="unique">
|
||||
<view class="gd_min" data-id="{{item.menu_identi}}" data-url="{{item.menu_url}}" bindtap="goMenu">
|
||||
<span wx:if="{{item.menu_identi=='AQYHPC'}}"><span class="tabNum_active" wx:if="{{aq>0}}">{{aq}}</span></span>
|
||||
<image src="{{item.menu_img}}"></image>
|
||||
<view>{{item.menu_name}}</view>
|
||||
</view>
|
||||
|
@ -212,6 +213,7 @@
|
|||
style="width:40rpx; height: 40rpx;"
|
||||
/>
|
||||
安全管理
|
||||
<span class="tabNum" wx:if="{{aq>0}}">{{aq}}</span>
|
||||
</van-tabbar-item>
|
||||
|
||||
<van-tabbar-item bindtap="ZLGL">
|
||||
|
|
|
@ -1,66 +0,0 @@
|
|||
// pages/saft-education-user-bind/index.js
|
||||
Page({
|
||||
|
||||
/**
|
||||
* 页面的初始数据
|
||||
*/
|
||||
data: {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面加载
|
||||
*/
|
||||
onLoad(options) {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面初次渲染完成
|
||||
*/
|
||||
onReady() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面显示
|
||||
*/
|
||||
onShow() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面隐藏
|
||||
*/
|
||||
onHide() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面卸载
|
||||
*/
|
||||
onUnload() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 页面相关事件处理函数--监听用户下拉动作
|
||||
*/
|
||||
onPullDownRefresh() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 页面上拉触底事件的处理函数
|
||||
*/
|
||||
onReachBottom() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 用户点击右上角分享
|
||||
*/
|
||||
onShareAppMessage() {
|
||||
|
||||
}
|
||||
})
|
|
@ -1,2 +0,0 @@
|
|||
<!--pages/saft-education-user-bind/index.wxml-->
|
||||
<text>pages/saft-education-user-bind/index.wxml</text>
|
|
@ -1,66 +0,0 @@
|
|||
// pages/shebeiguanli-map/jixiedingwei.js
|
||||
Page({
|
||||
|
||||
/**
|
||||
* 页面的初始数据
|
||||
*/
|
||||
data: {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面加载
|
||||
*/
|
||||
onLoad(options) {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面初次渲染完成
|
||||
*/
|
||||
onReady() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面显示
|
||||
*/
|
||||
onShow() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面隐藏
|
||||
*/
|
||||
onHide() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面卸载
|
||||
*/
|
||||
onUnload() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 页面相关事件处理函数--监听用户下拉动作
|
||||
*/
|
||||
onPullDownRefresh() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 页面上拉触底事件的处理函数
|
||||
*/
|
||||
onReachBottom() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 用户点击右上角分享
|
||||
*/
|
||||
onShareAppMessage() {
|
||||
|
||||
}
|
||||
})
|
|
@ -1,2 +0,0 @@
|
|||
<!--pages/shebeiguanli-map/jixiedingwei.wxml-->
|
||||
<text>pages/shebeiguanli-map/jixiedingwei.wxml</text>
|
|
@ -1,66 +0,0 @@
|
|||
// pages/shebieguanli-jxsb/shajiangguan.js
|
||||
Page({
|
||||
|
||||
/**
|
||||
* 页面的初始数据
|
||||
*/
|
||||
data: {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面加载
|
||||
*/
|
||||
onLoad(options) {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面初次渲染完成
|
||||
*/
|
||||
onReady() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面显示
|
||||
*/
|
||||
onShow() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面隐藏
|
||||
*/
|
||||
onHide() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面卸载
|
||||
*/
|
||||
onUnload() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 页面相关事件处理函数--监听用户下拉动作
|
||||
*/
|
||||
onPullDownRefresh() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 页面上拉触底事件的处理函数
|
||||
*/
|
||||
onReachBottom() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 用户点击右上角分享
|
||||
*/
|
||||
onShareAppMessage() {
|
||||
|
||||
}
|
||||
})
|
|
@ -1,2 +0,0 @@
|
|||
<!--pages/shebieguanli-jxsb/shajiangguan.wxml-->
|
||||
<text>pages/shebieguanli-jxsb/shajiangguan.wxml</text>
|
|
@ -1,66 +0,0 @@
|
|||
// pages/shebieguanli-tzsb/taji.js
|
||||
Page({
|
||||
|
||||
/**
|
||||
* 页面的初始数据
|
||||
*/
|
||||
data: {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面加载
|
||||
*/
|
||||
onLoad(options) {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面初次渲染完成
|
||||
*/
|
||||
onReady() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面显示
|
||||
*/
|
||||
onShow() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面隐藏
|
||||
*/
|
||||
onHide() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面卸载
|
||||
*/
|
||||
onUnload() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 页面相关事件处理函数--监听用户下拉动作
|
||||
*/
|
||||
onPullDownRefresh() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 页面上拉触底事件的处理函数
|
||||
*/
|
||||
onReachBottom() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 用户点击右上角分享
|
||||
*/
|
||||
onShareAppMessage() {
|
||||
|
||||
}
|
||||
})
|
|
@ -1,2 +0,0 @@
|
|||
<!--pages/shebieguanli-tzsb/taji.wxml-->
|
||||
<text>pages/shebieguanli-tzsb/taji.wxml</text>
|
|
@ -4,19 +4,21 @@ const app = getApp();
|
|||
|
||||
|
||||
//加载视频监控饼图
|
||||
let datas_1 = [];
|
||||
let formatNumber_1 = function(num) {
|
||||
let datas_1 = [];
|
||||
let formatNumber_1 = function (num) {
|
||||
let reg = /(?=(\B)(\d{3})+$)/g;
|
||||
return num.toString().replace(reg, ',');
|
||||
}
|
||||
function arrayobj_1 (array, key) {
|
||||
}
|
||||
|
||||
function arrayobj_1(array, key) {
|
||||
var resObj = {}
|
||||
for (var i = 0; i < array.length; i++) {
|
||||
resObj[array[i][key]] = array[i]
|
||||
}
|
||||
return resObj
|
||||
}
|
||||
function initChart_1(chart_1,datas_1) {
|
||||
}
|
||||
|
||||
function initChart_1(chart_1, datas_1) {
|
||||
//定义参数
|
||||
let objData_1 = arrayobj_1(datas_1, 'name');
|
||||
let total_1 = datas_1.reduce((a, b) => {
|
||||
|
@ -38,7 +40,7 @@ const app = getApp();
|
|||
padding: [10, 0]
|
||||
},
|
||||
val: {
|
||||
fontSize:25,
|
||||
fontSize: 25,
|
||||
fontWeight: 'bold',
|
||||
color: '#0ad7ec',
|
||||
padding: [0, 10]
|
||||
|
@ -86,21 +88,23 @@ const app = getApp();
|
|||
}]
|
||||
};
|
||||
chart_1.setOption(option_1);
|
||||
}
|
||||
}
|
||||
|
||||
//机械设备饼图
|
||||
let formatNumber_2 = function(num) {
|
||||
let formatNumber_2 = function (num) {
|
||||
let reg = /(?=(\B)(\d{3})+$)/g;
|
||||
return num.toString().replace(reg, ',');
|
||||
}
|
||||
function arrayobj_2 (Array, key) {
|
||||
}
|
||||
|
||||
function arrayobj_2(Array, key) {
|
||||
var resObj = {}
|
||||
for (var i = 0; i < Array.length; i++) {
|
||||
resObj[Array[i][key]] = Array[i]
|
||||
}
|
||||
return resObj
|
||||
}
|
||||
function initChart_2(chart_2,datas_2,datas_name) {
|
||||
}
|
||||
|
||||
function initChart_2(chart_2, datas_2, datas_name) {
|
||||
//定义参数
|
||||
let objData_2 = arrayobj_2(datas_2, 'name');
|
||||
let total_2 = datas_2.reduce((a, b) => {
|
||||
|
@ -123,7 +127,7 @@ function initChart_2(chart_2,datas_2,datas_name) {
|
|||
padding: [10, 0]
|
||||
},
|
||||
val: {
|
||||
fontSize:25,
|
||||
fontSize: 25,
|
||||
fontWeight: 'bold',
|
||||
color: '#0ad7ec',
|
||||
padding: [0, 10]
|
||||
|
@ -189,9 +193,9 @@ function initChart_3(chart_3, xData_3, yData_3) {
|
|||
containLabel: true
|
||||
},
|
||||
xAxis: [{
|
||||
type : 'category',
|
||||
boundaryGap : false,
|
||||
data : xData_3,
|
||||
type: 'category',
|
||||
boundaryGap: false,
|
||||
data: xData_3,
|
||||
axisTick: {
|
||||
show: false
|
||||
},
|
||||
|
@ -209,8 +213,8 @@ function initChart_3(chart_3, xData_3, yData_3) {
|
|||
},
|
||||
}],
|
||||
yAxis: {
|
||||
type : 'value',
|
||||
name:"单位:个",
|
||||
type: 'value',
|
||||
name: "单位:个",
|
||||
nameTextStyle: {
|
||||
color: "#008fe9",
|
||||
fontSize: 11
|
||||
|
@ -235,8 +239,7 @@ function initChart_3(chart_3, xData_3, yData_3) {
|
|||
}
|
||||
},
|
||||
},
|
||||
series: [
|
||||
{
|
||||
series: [{
|
||||
type: 'line',
|
||||
data: yData_3,
|
||||
symbol: 'circle',
|
||||
|
@ -245,8 +248,7 @@ function initChart_3(chart_3, xData_3, yData_3) {
|
|||
color: '#5a8df6',
|
||||
width: 2
|
||||
},
|
||||
}
|
||||
]
|
||||
}]
|
||||
}
|
||||
chart_3.setOption(option_3);
|
||||
return chart_3;
|
||||
|
@ -258,7 +260,7 @@ Page({
|
|||
* 页面的初始数据
|
||||
*/
|
||||
data: {
|
||||
active:0,
|
||||
active: 0,
|
||||
show: false,
|
||||
activeNames: ["1"],
|
||||
ec_1: {
|
||||
|
@ -272,54 +274,59 @@ Page({
|
|||
},
|
||||
//参数——————————————————————————————————————
|
||||
//组织架构id
|
||||
deptId:'',
|
||||
deptId: '',
|
||||
//项目的id
|
||||
projectId:'',
|
||||
projectId: '',
|
||||
//项目名称参数
|
||||
projectNameArgs:'',
|
||||
projectNameArgs: '',
|
||||
//项目信息
|
||||
projectInfo:{},
|
||||
projectUnitsList:[],
|
||||
projectInfo: {},
|
||||
projectUnitsList: [],
|
||||
//视频接入数
|
||||
videoNum:'',
|
||||
videoNum: '',
|
||||
//正常视频数
|
||||
videoOnline:'',
|
||||
videoOnline: '',
|
||||
//机械接入数
|
||||
machineryNum:'',
|
||||
machineryNum: '',
|
||||
//正常机械运行数
|
||||
machineryOnline:'',
|
||||
monthEarlyNum:'0',
|
||||
yangchenCount:'0',
|
||||
weather:'',
|
||||
weatherPic:'',
|
||||
temperature:'',
|
||||
machineryOnline: '',
|
||||
monthEarlyNum: '0',
|
||||
yangchenCount: '0',
|
||||
weather: '',
|
||||
weatherPic: '',
|
||||
temperature: '',
|
||||
//加载模板参数
|
||||
loadShow:false,
|
||||
initData:{},
|
||||
todoDb:0,
|
||||
approveDb:0,
|
||||
loadShow: false,
|
||||
initData: {},
|
||||
todoDb: 0,
|
||||
approveDb: 0,
|
||||
aq:0,
|
||||
},
|
||||
|
||||
//项目切换 返回值
|
||||
onProjectSelect(e){
|
||||
onProjectSelect(e) {
|
||||
this.onClickShow();
|
||||
let projectId = e.detail.id;
|
||||
let projectName = e.detail.text;
|
||||
app.globalData.projectId = projectId;
|
||||
app.globalData.projectName = projectName;
|
||||
this.setData({
|
||||
projectId:projectId,
|
||||
projectName:projectName
|
||||
projectId: projectId,
|
||||
projectName: projectName
|
||||
})
|
||||
this.onLoad();
|
||||
},
|
||||
|
||||
showPopup() {
|
||||
this.setData({ show: true });
|
||||
this.setData({
|
||||
show: true
|
||||
});
|
||||
},
|
||||
|
||||
onClosePopup() {
|
||||
this.setData({ show: false });
|
||||
this.setData({
|
||||
show: false
|
||||
});
|
||||
},
|
||||
|
||||
// 手风琴
|
||||
|
@ -328,12 +335,12 @@ Page({
|
|||
activeName: event.detail,
|
||||
});
|
||||
},
|
||||
onOpen(event){},
|
||||
onClose(event){},
|
||||
onOpen(event) {},
|
||||
onClose(event) {},
|
||||
|
||||
//初始化视频监控饼图数据
|
||||
init_one: function (datas_1) {
|
||||
this.oneComponent.init((canvas, width, height,dpr) => {
|
||||
this.oneComponent.init((canvas, width, height, dpr) => {
|
||||
const chart = echarts.init(canvas, null, {
|
||||
width: width,
|
||||
height: height,
|
||||
|
@ -346,39 +353,43 @@ Page({
|
|||
},
|
||||
|
||||
//初始化机械设备饼图数据
|
||||
init_two: function (datas_2,datas_name) {
|
||||
this.twoComponent.init((canvas, width, height,dpr) => {
|
||||
init_two: function (datas_2, datas_name) {
|
||||
this.twoComponent.init((canvas, width, height, dpr) => {
|
||||
const chart = echarts.init(canvas, null, {
|
||||
width: width,
|
||||
height: height,
|
||||
devicePixelRatio: dpr //解决小程序视图模糊的问题,必写
|
||||
});
|
||||
initChart_2(chart, datas_2,datas_name);
|
||||
initChart_2(chart, datas_2, datas_name);
|
||||
this.chart = chart;
|
||||
return chart;
|
||||
});
|
||||
},
|
||||
|
||||
//初始化劳务管理
|
||||
init_three: function (xData_1,yData_1) {
|
||||
this.threeComponent.init((canvas, width, height,dpr) => {
|
||||
init_three: function (xData_1, yData_1) {
|
||||
this.threeComponent.init((canvas, width, height, dpr) => {
|
||||
const chart = echarts.init(canvas, null, {
|
||||
width: width,
|
||||
height: height,
|
||||
devicePixelRatio: dpr //解决小程序视图模糊的问题,必写
|
||||
});
|
||||
initChart_3(chart, xData_1,yData_1);
|
||||
initChart_3(chart, xData_1, yData_1);
|
||||
this.chart = chart;
|
||||
return chart;
|
||||
});
|
||||
},
|
||||
|
||||
onClickShow() {
|
||||
this.setData({ loadShow: false });
|
||||
this.setData({
|
||||
loadShow: false
|
||||
});
|
||||
},
|
||||
|
||||
onClickHide() {
|
||||
this.setData({ loadShow: false });
|
||||
this.setData({
|
||||
loadShow: false
|
||||
});
|
||||
},
|
||||
|
||||
/**
|
||||
|
@ -393,17 +404,20 @@ Page({
|
|||
//获取缓存数据
|
||||
wx.getStorage({
|
||||
key: 'userinfo',
|
||||
success:function(res){
|
||||
success: function (res) {
|
||||
that.setData({
|
||||
loginName:res.data.loginName,
|
||||
nickName:res.data.nickName,
|
||||
deptName:res.data.deptName,
|
||||
roleName:res.data.roleName.split(',')[0],
|
||||
projectId:app.globalData.projectId,
|
||||
projectNameArgs:app.globalData.projectName,
|
||||
initData:{text:app.globalData.projectName,id:app.globalData.projectId}
|
||||
loginName: res.data.loginName,
|
||||
nickName: res.data.nickName,
|
||||
deptName: res.data.deptName,
|
||||
roleName: res.data.roleName.split(',')[0],
|
||||
projectId: app.globalData.projectId,
|
||||
projectNameArgs: app.globalData.projectName,
|
||||
initData: {
|
||||
text: app.globalData.projectName,
|
||||
id: app.globalData.projectId
|
||||
}
|
||||
})
|
||||
that.awaitTask(res.data.minRoleId,res.data.deptId,res.data.loginName,res.data.userId);
|
||||
that.awaitTask(res.data.minRoleId, res.data.deptId, res.data.loginName, res.data.userId);
|
||||
}
|
||||
})
|
||||
//根据id获取组件
|
||||
|
@ -428,21 +442,32 @@ Page({
|
|||
// 底部导航
|
||||
onChange(event) {
|
||||
// event.detail 的值为当前选中项的索引
|
||||
this.setData({ active: event.detail });
|
||||
this.setData({
|
||||
active: event.detail
|
||||
});
|
||||
},
|
||||
|
||||
//获取项目的基本数据
|
||||
getProjectBaseInfo:function(even) {
|
||||
getProjectBaseInfo: function (even) {
|
||||
wx.request({
|
||||
url: app.globalData.reqUrl+'/wechat/project/getProjectFoundation',
|
||||
method:'GET',
|
||||
data:{
|
||||
id:even
|
||||
url: app.globalData.reqUrl + '/wechat/project/getProjectFoundation',
|
||||
method: 'GET',
|
||||
data: {
|
||||
id: even
|
||||
},
|
||||
success:resData=> {
|
||||
success: resData => {
|
||||
this.onClickHide()
|
||||
if (resData.data.planStartTime) {
|
||||
resData.data.planStartTime = resData.data.planStartTime.split("T")[0];
|
||||
}
|
||||
if (resData.data.actualStartTime) {
|
||||
resData.data.actualStartTime = resData.data.actualStartTime.split("T")[0];
|
||||
}
|
||||
if (resData.data.planCompletedTime) {
|
||||
resData.data.planCompletedTime = resData.data.planCompletedTime.split("T")[0];
|
||||
}
|
||||
this.setData({
|
||||
projectInfo:resData.data
|
||||
projectInfo: resData.data
|
||||
})
|
||||
//环境监测
|
||||
//this.selectEnvirData(even);
|
||||
|
@ -453,90 +478,93 @@ Page({
|
|||
},
|
||||
|
||||
//加载天气数据
|
||||
getWeatherData:function(even1,even2){
|
||||
getWeatherData: function (even1, even2) {
|
||||
var that = this;
|
||||
wx.request({
|
||||
url: app.globalData.reqUrl+'/weixin/applets/selectWeather',
|
||||
method:"GET",
|
||||
data:{
|
||||
lng:even1,
|
||||
lat:even2,
|
||||
url: app.globalData.reqUrl + '/weixin/applets/selectWeather',
|
||||
method: "GET",
|
||||
data: {
|
||||
lng: even1,
|
||||
lat: even2,
|
||||
},
|
||||
success:function(weatherRes){
|
||||
success: function (weatherRes) {
|
||||
that.setData({
|
||||
weather:weatherRes.data.weather,
|
||||
weatherPic:weatherRes.data.weatherPic,
|
||||
temperature:weatherRes.data.temperature
|
||||
weather: weatherRes.data.weather,
|
||||
weatherPic: weatherRes.data.weatherPic,
|
||||
temperature: weatherRes.data.temperature
|
||||
})
|
||||
}
|
||||
})
|
||||
} ,
|
||||
},
|
||||
|
||||
//获取项目的管理信息
|
||||
getProjectUnitList:function(projectId) {
|
||||
getProjectUnitList: function (projectId) {
|
||||
var that = this;
|
||||
wx.request({
|
||||
url: app.globalData.reqUrl+'/wechat/project/getProjectUnitList',
|
||||
method:'GET',
|
||||
data:{
|
||||
projectId:projectId
|
||||
url: app.globalData.reqUrl + '/wechat/project/getProjectUnitList',
|
||||
method: 'GET',
|
||||
data: {
|
||||
projectId: projectId
|
||||
},
|
||||
success:resData=> {
|
||||
success: resData => {
|
||||
that.onClickHide()
|
||||
that.setData ({
|
||||
projectUnitsList:resData.data
|
||||
that.setData({
|
||||
projectUnitsList: resData.data
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
// 获取项目下的视频数
|
||||
getProjectVideoAll:function(even) {
|
||||
getProjectVideoAll: function (even) {
|
||||
wx.request({
|
||||
url: app.globalData.reqUrl+'/weixin/video/getProjectVideoNum',
|
||||
url: app.globalData.reqUrl + '/weixin/video/getProjectVideoNum',
|
||||
method: 'get',
|
||||
data: {
|
||||
projectName:even
|
||||
projectName: even
|
||||
},
|
||||
success: resData => {
|
||||
this.setData({
|
||||
videoNum:resData.data.videoAll,
|
||||
videoOnline:resData.data.videoOnline
|
||||
videoNum: resData.data.videoAll,
|
||||
videoOnline: resData.data.videoOnline
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
// 获取机械的数据
|
||||
getMachineryNum:function(event) {
|
||||
getMachineryNum: function (event) {
|
||||
wx.request({
|
||||
url: app.globalData.reqUrl+'/mkl/machinery/getMachineryDataWest',
|
||||
data:{
|
||||
"projectId":event
|
||||
url: app.globalData.reqUrl + '/mkl/machinery/getMachineryDataWest',
|
||||
data: {
|
||||
"projectId": event
|
||||
},
|
||||
method:'get',
|
||||
success:resData=> {
|
||||
method: 'get',
|
||||
success: resData => {
|
||||
this.setData({
|
||||
machineryNum:resData.data.allNum,
|
||||
machineryOnline:resData.data.onlineNum
|
||||
machineryNum: resData.data.allNum,
|
||||
machineryOnline: resData.data.onlineNum
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
//机械的列表,名称
|
||||
getMachineryList:function(event) {
|
||||
getMachineryList: function (event) {
|
||||
var that = this;
|
||||
wx.request({
|
||||
url: app.globalData.reqUrl+'/mkl/machinery/getMachineryListWest',
|
||||
data:{
|
||||
"projectId":event
|
||||
url: app.globalData.reqUrl + '/mkl/machinery/getMachineryListWest',
|
||||
data: {
|
||||
"projectId": event
|
||||
},
|
||||
method:'GET',
|
||||
success:resData=> {
|
||||
if(resData.data==''){
|
||||
that.init_two( [{"value":"0","name":""}]);
|
||||
}else{
|
||||
method: 'GET',
|
||||
success: resData => {
|
||||
if (resData.data == '') {
|
||||
that.init_two([{
|
||||
"value": "0",
|
||||
"name": ""
|
||||
}]);
|
||||
} else {
|
||||
that.init_two(resData.data);
|
||||
}
|
||||
}
|
||||
|
@ -544,17 +572,17 @@ Page({
|
|||
},
|
||||
|
||||
//获取视频的列表,名称
|
||||
getVideoList:function(even) {
|
||||
getVideoList: function (even) {
|
||||
var that = this;
|
||||
wx.request({
|
||||
url: app.globalData.reqUrl+'/weixin/video/getProjectVideoListEc',
|
||||
method:'GET',
|
||||
data:{
|
||||
projectName:even
|
||||
url: app.globalData.reqUrl + '/weixin/video/getProjectVideoListEc',
|
||||
method: 'GET',
|
||||
data: {
|
||||
projectName: even
|
||||
},
|
||||
success:resData=> {
|
||||
success: resData => {
|
||||
that.onClickHide();
|
||||
if(resData.data.length>0){
|
||||
if (resData.data.length > 0) {
|
||||
that.init_one(resData.data);
|
||||
}
|
||||
}
|
||||
|
@ -562,37 +590,37 @@ Page({
|
|||
},
|
||||
|
||||
//查询劳务人员出勤数据
|
||||
selectEnvirData:function(even){
|
||||
selectEnvirData: function (even) {
|
||||
var that = this;
|
||||
wx.request({
|
||||
url: app.globalData.reqUrl+'/weixin/userinfo/selectAttendanceNum',
|
||||
method:"GET",
|
||||
data:{
|
||||
projectId:even,
|
||||
url: app.globalData.reqUrl + '/weixin/userinfo/selectAttendanceNum',
|
||||
method: "GET",
|
||||
data: {
|
||||
projectId: even,
|
||||
},
|
||||
success:function(hjyj){
|
||||
success: function (hjyj) {
|
||||
that.setData({
|
||||
monthEarlyNum:hjyj.data.userCount,
|
||||
yangchenCount:hjyj.data.userCount
|
||||
monthEarlyNum: hjyj.data.userCount,
|
||||
yangchenCount: hjyj.data.userCount
|
||||
})
|
||||
}
|
||||
})
|
||||
|
||||
//查询出最近一周劳务人员考勤人数
|
||||
wx.request({
|
||||
url: app.globalData.reqUrl+'/weixin/userinfo/selectLabourDayByProjectId',
|
||||
method:"GET",
|
||||
data:{
|
||||
projectId:even
|
||||
url: app.globalData.reqUrl + '/weixin/userinfo/selectLabourDayByProjectId',
|
||||
method: "GET",
|
||||
data: {
|
||||
projectId: even
|
||||
},
|
||||
success:function(sspm){
|
||||
success: function (sspm) {
|
||||
var createTime = [];
|
||||
var userCount = [];
|
||||
for(var i=0;i<sspm.data.length;i++){
|
||||
for (var i = 0; i < sspm.data.length; i++) {
|
||||
createTime.push(sspm.data[i].createTime);
|
||||
userCount.push(sspm.data[i].userCount);
|
||||
}
|
||||
that.init_three(createTime,userCount);
|
||||
that.init_three(createTime, userCount);
|
||||
}
|
||||
})
|
||||
},
|
||||
|
@ -601,50 +629,49 @@ Page({
|
|||
* 拨打电话
|
||||
* @param {*} event
|
||||
*/
|
||||
calling:function(event){
|
||||
let callPhone=event.currentTarget.dataset.phone;
|
||||
calling: function (event) {
|
||||
let callPhone = event.currentTarget.dataset.phone;
|
||||
wx.makePhoneCall({
|
||||
phoneNumber: callPhone,
|
||||
success:function(){
|
||||
success: function () {
|
||||
console.log("拨打电话成功!")
|
||||
},
|
||||
fail:function(){
|
||||
fail: function () {
|
||||
console.log("拨打电话失败!")
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
//跳转到安全管控
|
||||
XMSP:function(){
|
||||
XMSP: function () {
|
||||
wx.redirectTo({
|
||||
url:'../safety_manage/index'
|
||||
url: '../safety_manage/index'
|
||||
})
|
||||
},
|
||||
|
||||
//跳转到质量管理
|
||||
ZLGL:function(){
|
||||
ZLGL: function () {
|
||||
wx.redirectTo({
|
||||
url:'../quality_manage/index'
|
||||
url: '../quality_manage/index'
|
||||
})
|
||||
},
|
||||
//跳转到进度管理
|
||||
JDGL2:function(){
|
||||
app.toast("敬请期待!");
|
||||
// wx.redirectTo({
|
||||
// //url: '../deepExcavation/index'
|
||||
// url:'../../pageage/Progress-management/index'
|
||||
// })
|
||||
JDGL2: function () {
|
||||
//app.toast("敬请期待!");
|
||||
wx.redirectTo({
|
||||
url: '../../pageage/project_schedule/list/index'
|
||||
})
|
||||
},
|
||||
|
||||
//跳转到更多功能
|
||||
GDGN:function(){
|
||||
GDGN: function () {
|
||||
wx.redirectTo({
|
||||
url: '../gengduogongneng/gengduogongneng'
|
||||
})
|
||||
},
|
||||
|
||||
//退出登录
|
||||
TCDL:function(){
|
||||
TCDL: function () {
|
||||
wx.clearStorageSync();
|
||||
wx.setStorageSync('isReload', "1")
|
||||
wx.redirectTo({
|
||||
|
@ -653,52 +680,51 @@ Page({
|
|||
},
|
||||
|
||||
//修改密码
|
||||
XGMM:function(){
|
||||
XGMM: function () {
|
||||
wx.setStorageSync('nav-menu', "gd");
|
||||
wx.redirectTo({
|
||||
url: '../updatePassword/updatePassword'
|
||||
})
|
||||
},
|
||||
//返回到地图页面
|
||||
GOMAP:function(){
|
||||
GOMAP: function () {
|
||||
wx.redirectTo({
|
||||
url: '../map/map',
|
||||
})
|
||||
},
|
||||
|
||||
//返回到工程列表页面
|
||||
goGCLB:function(){
|
||||
goGCLB: function () {
|
||||
wx.redirectTo({
|
||||
url: '../gongchengliebiao/gongchengliebiao'
|
||||
})
|
||||
},
|
||||
|
||||
//查询当前登录人的代办任务
|
||||
awaitTask(minRoleId,deptId,loginName,userId) {
|
||||
awaitTask(minRoleId, deptId, loginName, userId) {
|
||||
let param = {
|
||||
//"businessKey":this.data.projectId,
|
||||
"nowRole":minRoleId,
|
||||
"nowDept":deptId,
|
||||
"nowUserName":loginName,
|
||||
"nowUser":userId,
|
||||
"activeName":"await"
|
||||
"businessKey": app.globalData.projectId,
|
||||
"nowRole": minRoleId,
|
||||
"nowDept": deptId,
|
||||
"nowUserName": loginName,
|
||||
"nowUser": userId,
|
||||
"activeName": "await"
|
||||
}
|
||||
var that = this;
|
||||
wx.request({
|
||||
url: app.globalData.reqUrl + '/wechat/flowTask/myAwaitFlowTaskListCount',
|
||||
data:param,
|
||||
data: param,
|
||||
method: "post",
|
||||
success: function (res) {
|
||||
res = res.data;
|
||||
if(res.code=="200"){
|
||||
if (res.code == "200") {
|
||||
that.setData({
|
||||
todoDb:res.data.todo,
|
||||
approveDb:res.data.approve
|
||||
todoDb: res.data.todo,
|
||||
approveDb: res.data.approve+res.data.zlCount,
|
||||
aq:res.data.aqCount,
|
||||
})
|
||||
console.log("db"+that.data.approveDb);
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
})
|
||||
|
||||
|
|
|
@ -183,6 +183,7 @@
|
|||
style="width:40rpx; height: 40rpx;"
|
||||
/>
|
||||
安全管理
|
||||
<span class="tabNum" wx:if="{{aq>0}}">{{aq}}</span>
|
||||
</van-tabbar-item>
|
||||
|
||||
<van-tabbar-item bindtap="ZLGL">
|
||||
|
|
Loading…
Reference in New Issue