diff --git a/yanzhu-ui-app/miniprogram/api/project.js b/yanzhu-ui-app/miniprogram/api/project.js
index 4fc3dd1e..b9b0ea49 100644
--- a/yanzhu-ui-app/miniprogram/api/project.js
+++ b/yanzhu-ui-app/miniprogram/api/project.js
@@ -1,397 +1,431 @@
-import {
- request
-} from '../utils/request'
+import { request } from "../utils/request";
// 查询项目信息详细
export function findProjectInfo(id) {
return request({
- url: '/manage/wxApi/findProject/' + id,
- method: 'get'
- })
+ url: "/manage/wxApi/findProject/" + id,
+ method: "get",
+ });
}
// 新增项目参建单位信息
export function registerSubDepts(data) {
return request({
- url: '/manage/wxApi/registerSubDepts',
- method: 'post',
- data: data
- })
+ url: "/manage/wxApi/registerSubDepts",
+ method: "post",
+ data: data,
+ });
}
// 查询项目参建单位信息
export function findProSubDeptsInfo(proId, phoneNumber) {
return request({
- url: '/manage/wxApi/findProSubDeptsInfo?proId=' + proId + '&phoneNumber=' + phoneNumber,
- method: 'get'
- })
+ url:
+ "/manage/wxApi/findProSubDeptsInfo?proId=" +
+ proId +
+ "&phoneNumber=" +
+ phoneNumber,
+ method: "get",
+ });
}
// 查询项目参建单位信息
export function findProSubDeptsInfoById(id) {
return request({
- url: '/manage/proProjectInfoSubdepts/' + id,
- method: 'get'
- })
+ url: "/manage/proProjectInfoSubdepts/" + id,
+ method: "get",
+ });
}
// 查询项目参建人员信息
export function findProSubDeptsUser(proId, phoneNumber) {
return request({
- url: '/manage/wxApi/findProSubDeptsUser?proId=' + proId + '&phoneNumber=' + phoneNumber,
- method: 'get'
- })
+ url:
+ "/manage/wxApi/findProSubDeptsUser?proId=" +
+ proId +
+ "&phoneNumber=" +
+ phoneNumber,
+ method: "get",
+ });
}
// 查询项目参建单位人员
export function findProSubDeptsUserInfo(proId) {
return request({
- url: '/manage/wxApi/findProSubDeptsUserInfo/' + proId,
- method: 'get'
- })
+ url: "/manage/wxApi/findProSubDeptsUserInfo/" + proId,
+ method: "get",
+ });
}
// 查询项目参建单位人员
export function findProSubDeptsUserById(id) {
return request({
- url: '/manage/wxApi/findProSubDeptsUser/' + id,
- method: 'get'
- })
+ url: "/manage/wxApi/findProSubDeptsUser/" + id,
+ method: "get",
+ });
}
// 查询项目参建单位人员
export function findProSubDeptsUserInfoById(id) {
return request({
- url: '/manage/proProjectInfoSubdeptsUsers/' + id,
- method: 'get'
- })
+ url: "/manage/proProjectInfoSubdeptsUsers/" + id,
+ method: "get",
+ });
}
// 查询项目参建单位人员
export function findProSubDeptsUserByParams(proId) {
return request({
- url: '/manage/proProjectInfoSubdeptsUsers/findProSubDeptsUser/' + proId,
- method: 'get'
- })
+ url: "/manage/proProjectInfoSubdeptsUsers/findProSubDeptsUser/" + proId,
+ method: "get",
+ });
}
// 新增项目参建单位人员
export function registerSubDeptsUsers(data) {
return request({
- url: '/manage/wxApi/registerSubDeptsUsers',
- method: 'post',
- data: data
- })
+ url: "/manage/wxApi/registerSubDeptsUsers",
+ method: "post",
+ data: data,
+ });
}
// 查询我的项目信息
export function findMyProjectList() {
return request({
- url: '/manage/proProjectInfo/findMyProjectList',
- method: 'get'
- })
+ url: "/manage/proProjectInfo/findMyProjectList",
+ method: "get",
+ });
}
// 查询项目参建单位
export function findProjectDepts(proId) {
return request({
- url: '/manage/proProjectInfoDepts/findAllDepts/' + proId,
- method: 'get'
- })
+ url: "/manage/proProjectInfoDepts/findAllDepts/" + proId,
+ method: "get",
+ });
}
// 查询项目参建单位
export function findProjectDeptUsers(proId) {
return request({
- url: '/manage/proProjectInfoSubdeptsUsers/findAllSendUsers/' + proId,
- method: 'get'
- })
+ url: "/manage/proProjectInfoSubdeptsUsers/findAllSendUsers/" + proId,
+ method: "get",
+ });
}
// 修改人员审核状态
export function editApproveStatus(proUserId) {
return request({
- url: '/manage/proProjectInfoSubdeptsUsers/editApproveStatus/' + proUserId,
- method: 'post',
- data: {}
- })
+ url: "/manage/proProjectInfoSubdeptsUsers/editApproveStatus/" + proUserId,
+ method: "post",
+ data: {},
+ });
}
// 查询参建单位列表
export function subdeptsList(query) {
return request({
- url: '/manage/proProjectInfoSubdepts/list',
- method: 'get',
- params: query
- })
+ url: "/manage/proProjectInfoSubdepts/list",
+ method: "get",
+ params: query,
+ });
}
// 统计参建单位信息
export function subdeptsCount(query) {
return request({
- url: '/manage/proProjectInfoSubdepts/findWxCount',
- method: 'get',
- params: query
- })
+ url: "/manage/proProjectInfoSubdepts/findWxCount",
+ method: "get",
+ params: query,
+ });
}
// 管理人员新增参建单位信息
export function registerSubDeptsGL(data) {
return request({
- url: '/manage/proProjectInfoSubdepts/registerSubDepts',
- method: 'post',
- data: data
- })
+ url: "/manage/proProjectInfoSubdepts/registerSubDepts",
+ method: "post",
+ data: data,
+ });
}
// 修改参建单位入场状态
export function editSubDeptsUseStatus(id, status) {
return request({
- url: '/manage/proProjectInfoSubdepts/editUseStatus/' + id + '?status=' + status,
- method: 'get'
- })
+ url:
+ "/manage/proProjectInfoSubdepts/editUseStatus/" +
+ id +
+ "?status=" +
+ status,
+ method: "get",
+ });
}
// 查询单位班组列表
export function findSubGroupsList(query) {
return request({
- url: '/manage/proProjectInfoSubdeptsGroup/list',
- method: 'get',
- params: query
- })
+ url: "/manage/proProjectInfoSubdeptsGroup/list",
+ method: "get",
+ params: query,
+ });
}
// 查询单位班组列表
export function subgroupsList(query) {
return request({
- url: '/manage/proProjectInfoSubdeptsGroup/findWxList',
- method: 'get',
- params: query
- })
+ url: "/manage/proProjectInfoSubdeptsGroup/findWxList",
+ method: "get",
+ params: query,
+ });
}
// 统计单位班组信息
export function subgroupsCount(query) {
return request({
- url: '/manage/proProjectInfoSubdeptsGroup/findWxCount',
- method: 'get',
- params: query
- })
+ url: "/manage/proProjectInfoSubdeptsGroup/findWxCount",
+ method: "get",
+ params: query,
+ });
}
// 查看单位班组详情
export function findSubdeptsGroupById(id) {
return request({
- url: '/manage/proProjectInfoSubdeptsGroup/' + id,
- method: 'get'
- })
+ url: "/manage/proProjectInfoSubdeptsGroup/" + id,
+ method: "get",
+ });
}
// 修改单位班组入场状态
export function editSubGroupsUseStatus(id, status) {
return request({
- url: '/manage/proProjectInfoSubdeptsGroup/editUseStatus/' + id + '?status=' + status,
- method: 'get'
- })
+ url:
+ "/manage/proProjectInfoSubdeptsGroup/editUseStatus/" +
+ id +
+ "?status=" +
+ status,
+ method: "get",
+ });
}
// 查看可选班组长列表
export function fileGroupLeaderUsers(subDeptId, craftPost) {
return request({
- url: '/manage/proProjectInfoSubdeptsUsers/fileGroupLeaderUsers/' + subDeptId + '?craftPost=' + craftPost,
- method: 'get'
- })
+ url:
+ "/manage/proProjectInfoSubdeptsUsers/fileGroupLeaderUsers/" +
+ subDeptId +
+ "?craftPost=" +
+ craftPost,
+ method: "get",
+ });
}
// 确认变更班组长信息
export function updateGroupLeader(data) {
return request({
- url: '/manage/proProjectInfoSubdeptsGroup/updateGroupLeader',
- method: 'post',
- data: data
- })
+ url: "/manage/proProjectInfoSubdeptsGroup/updateGroupLeader",
+ method: "post",
+ data: data,
+ });
}
// 管理人员新增单位班组信息
export function registerSubDeptsGroupGL(data) {
return request({
- url: '/manage/proProjectInfoSubdeptsGroup/registerSubDeptsGroup',
- method: 'post',
- data: data
- })
+ url: "/manage/proProjectInfoSubdeptsGroup/registerSubDeptsGroup",
+ method: "post",
+ data: data,
+ });
}
// 查询班组人员列表
export function subusersList(query) {
return request({
- url: '/manage/proProjectInfoSubdeptsUsers/findWxList',
- method: 'get',
- params: query
- })
+ url: "/manage/proProjectInfoSubdeptsUsers/findWxList",
+ method: "get",
+ params: query,
+ });
}
// 统计班组人员信息
export function subusersCount(query) {
return request({
- url: '/manage/proProjectInfoSubdeptsUsers/findWxCount',
- method: 'get',
- params: query
- })
+ url: "/manage/proProjectInfoSubdeptsUsers/findWxCount",
+ method: "get",
+ params: query,
+ });
}
// 管理人员新增班组人员信息
export function registerSubUsersGL(data) {
return request({
- url: '/manage/proProjectInfoSubdeptsUsers/registerSubDeptsUsers',
- method: 'post',
- data: data
- })
+ url: "/manage/proProjectInfoSubdeptsUsers/registerSubDeptsUsers",
+ method: "post",
+ data: data,
+ });
}
// 查询班组人员详情
export function findProSubUsersInfoById(id) {
return request({
- url: '/manage/proProjectInfoSubdeptsUsers/' + id,
- method: 'get'
- })
+ url: "/manage/proProjectInfoSubdeptsUsers/" + id,
+ method: "get",
+ });
}
// 修改班组人员入场状态
export function editSubUsersUseStatus(id, status) {
return request({
- url: '/manage/proProjectInfoSubdeptsUsers/editUseStatus/' + id + '?status=' + status,
- method: 'get'
- })
+ url:
+ "/manage/proProjectInfoSubdeptsUsers/editUseStatus/" +
+ id +
+ "?status=" +
+ status,
+ method: "get",
+ });
}
// 修改班组人员手机号码
export function editSubUsersPhone(data) {
return request({
- url: '/manage/proProjectInfoSubdeptsUsers/editPhone',
- method: 'post',
- data: data
- })
+ url: "/manage/proProjectInfoSubdeptsUsers/editPhone",
+ method: "post",
+ data: data,
+ });
}
// 查询进度计划管理列表
export function planScheduleList(query) {
return request({
- url: '/manage/schedule/list',
- method: 'get',
- params: query
- })
+ url: "/manage/schedule/list",
+ method: "get",
+ params: query,
+ });
}
// 查询进度计划管理详情
export function planScheduleInfo(id) {
return request({
- url: '/manage/schedule/' + id,
- method: 'get'
- })
+ url: "/manage/schedule/" + id,
+ method: "get",
+ });
}
// 查询之前项目进度
export function findPreviousSchedule(planId) {
return request({
- url: '/manage/schedule/findPreviousSchedule/' + planId,
- method: 'get'
- })
+ url: "/manage/schedule/findPreviousSchedule/" + planId,
+ method: "get",
+ });
}
// 查询计划管理
export function findPlanDatas(proId) {
return request({
- url: '/manage/plan/findPlanDatas/' + proId,
- method: 'get'
- })
+ url: "/manage/plan/findPlanDatas/" + proId,
+ method: "get",
+ });
}
// 递归查询计划
export function findRecursionPlan(planId) {
return request({
- url: '/manage/plan/findRecursionPlan/' + planId,
- method: 'get'
- })
+ url: "/manage/plan/findRecursionPlan/" + planId,
+ method: "get",
+ });
}
// 保存计划进度
export function submitPlanSchedule(data) {
return request({
- url: '/manage/schedule',
- method: 'post',
- data: data
- })
+ url: "/manage/schedule",
+ method: "post",
+ data: data,
+ });
}
// 视频监控管理
export function proVideoList(query) {
return request({
- url: '/manage/videoMonitor/list',
- method: 'get',
- params: query
- })
+ url: "/manage/videoMonitor/list",
+ method: "get",
+ params: query,
+ });
}
export function getYsToken(id) {
return request({
- url: '/manage/videoMonitor/getYsToken/' + id,
- method: 'get'
- })
+ url: "/manage/videoMonitor/getYsToken/" + id,
+ method: "get",
+ });
}
-
// 举牌验收管理
export function projectCheckedList(query) {
return request({
- url: '/manage/projectChecked/list',
- method: 'get',
- params: query
- })
+ url: "/manage/projectChecked/list",
+ method: "get",
+ params: query,
+ });
}
// 举牌验收管理
export function projectCheckedListCount(query) {
return request({
- url: '/manage/projectChecked/listCount',
- method: 'get',
- params: query
- })
+ url: "/manage/projectChecked/listCount",
+ method: "get",
+ params: query,
+ });
}
-
// 查询分包单位工人列表
export function listProProjectInfoSubdeptsUsers(query) {
return request({
- url: '/manage/proProjectInfoSubdeptsUsers/list',
- method: 'get',
- data: query
- })
+ url: "/manage/proProjectInfoSubdeptsUsers/list",
+ method: "get",
+ data: query,
+ });
}
// 新增项目举牌验收
export function addProjectChecked(data) {
return request({
- url: '/manage/projectChecked',
- method: 'post',
- data: data
- })
+ url: "/manage/projectChecked",
+ method: "post",
+ data: data,
+ });
}
// 修改项目举牌验收
export function updateProjectChecked(data) {
return request({
- url: '/manage/projectChecked',
- method: 'put',
- data: data
- })
+ url: "/manage/projectChecked",
+ method: "put",
+ data: data,
+ });
}
-
// 获取项目举牌验收
export function getProjectChecked(id) {
return request({
- url: '/manage/projectChecked/' + id,
- method: 'get'
- })
+ url: "/manage/projectChecked/" + id,
+ method: "get",
+ });
}
+//获取班组人员未审核的举牌数量
+export function countGroupByStatus(query) {
+ return request({
+ url: `/manage/api/bgscreen/projectChecked/countGroupByStatus?projectId=${query.projectId}&user=${query.phoneNumber}`,
+ method: "get",
+ });
+}
+
+//获取技术人员未审核的举牌数量
+export function countTechByStatus(query) {
+ return request({
+ url: `/manage/api/bgscreen/projectChecked/countTechByStatus?projectId=${query.projectId}&user=${query.phoneNumber}`,
+ method: "get",
+ });
+}
diff --git a/yanzhu-ui-app/miniprogram/pageage/project_more/index.js b/yanzhu-ui-app/miniprogram/pageage/project_more/index.js
index 2013b8a8..c6749d00 100644
--- a/yanzhu-ui-app/miniprogram/pageage/project_more/index.js
+++ b/yanzhu-ui-app/miniprogram/pageage/project_more/index.js
@@ -1,23 +1,16 @@
-import {
- getToken,
- getUserInfo
-} from '../../utils/auth'
-import {
- findUserMenuList
-} from '../../api/publics'
-import {
- findMyTask
-} from '../api/flowable'
-const app = getApp()
+import { getToken, getUserInfo } from "../../utils/auth";
+import { findUserMenuList } from "../../api/publics";
+import { findMyTask } from "../api/flowable";
+import { countGroupByStatus, countTechByStatus } from "../../api/project";
+const app = getApp();
Page({
-
/**
* 页面的初始数据
*/
data: {
active: 1,
- projectId: '',
- projectName: '',
+ projectId: "",
+ projectName: "",
subDeptUserInfo: {},
menuList: [],
initData: {},
@@ -27,10 +20,11 @@ Page({
fbdwDB: 0,
fbrtDB: 0,
aqyhDB: 0,
- zlyhDB: 0
+ zlyhDB: 0,
+ checkDB: 0, //举牌验收数量
+ isGroup: false, //是否是班组
},
-
//项目切换 返回值
onProjectSelect(e) {
let projectId = e.detail.id;
@@ -46,8 +40,8 @@ Page({
onLoad: function (options) {
if (!getToken()) {
wx.redirectTo({
- url: '../../pages/login/login',
- })
+ url: "../../pages/login/login",
+ });
}
const proUserInfo = getUserInfo();
this.setData({
@@ -57,25 +51,25 @@ Page({
id: app.globalData.useProjectId,
text: app.globalData.useProjectName,
},
- active: proUserInfo.projectUserInfo.subDeptType == '1' ? 4 : 1,
+ active: proUserInfo.projectUserInfo.subDeptType == "1" ? 4 : 1,
+ isGroup: proUserInfo.projectUserInfo.userPost == "3",
subDeptUserInfo: proUserInfo.projectUserInfo,
});
//用户权限菜单
this.getUserMenuList(app.globalData.useProjectId);
this.awaitTask();
-
},
/**
* 查询功能菜单
- * @param {*} proId
+ * @param {*} proId
*/
getUserMenuList: function (proId) {
- findUserMenuList(proId, this.data.active == 1 ? "" : 'gdgn').then(res => {
+ findUserMenuList(proId, this.data.active == 1 ? "" : "gdgn").then((res) => {
if (res.code == 200) {
this.setData({
- menuList: res.data
- })
+ menuList: res.data,
+ });
}
});
},
@@ -83,13 +77,13 @@ Page({
goMenu: function (event) {
let _url = event.currentTarget.dataset.url;
if (!_url) {
- app.toast("正在建设中...")
+ app.toast("正在建设中...");
return false;
}
- wx.setStorageSync('nav-menu', "xmgl");
+ wx.setStorageSync("nav-menu", "xmgl");
wx.redirectTo({
- url: _url
- })
+ url: _url,
+ });
//跳转到其它小程序
//wx.navigateToMiniProgram({
// appId: 'wx7c39a25db91228f7',
@@ -101,40 +95,40 @@ Page({
onChange(event) {
// event.detail 的值为当前选中项的索引
this.setData({
- active: event.detail
+ active: event.detail,
});
},
//跳转到项目概况
XMGK: function () {
- wx.setStorageSync('nav-menu', "xmgk");
+ wx.setStorageSync("nav-menu", "xmgk");
wx.redirectTo({
- url: '../project_info/index'
- })
+ url: "../project_info/index",
+ });
},
//跳转到安全管理
AQGL: function () {
- wx.setStorageSync('nav-menu', "aqgl");
+ wx.setStorageSync("nav-menu", "aqgl");
wx.redirectTo({
- url: '../project_safety/index'
- })
+ url: "../project_safety/index",
+ });
},
//跳转到质量管理
ZLGL: function () {
- wx.setStorageSync('nav-menu', "zlgl");
+ wx.setStorageSync("nav-menu", "zlgl");
wx.redirectTo({
- url: '../project_quality/index'
- })
+ url: "../project_quality/index",
+ });
},
//跳转到进度管理
JDGL: function () {
- wx.setStorageSync('nav-menu', "xmgl");
+ wx.setStorageSync("nav-menu", "xmgl");
wx.redirectTo({
- url: '../project_schedule/list/index'
- })
+ url: "../project_schedule/list/index",
+ });
},
/**
@@ -142,20 +136,39 @@ Page({
*/
awaitTask() {
let param = "proId=" + app.globalData.useProjectId;
- findMyTask(param).then(res => {
+ findMyTask(param).then((res) => {
if (res.code == 200) {
let proUserInfo = this.data.subDeptUserInfo;
this.setData({
- todoDb: proUserInfo.subDeptType == "1" ? (res.data.dwsh + res.data.rysh) : res.data.todo,
+ todoDb:
+ proUserInfo.subDeptType == "1"
+ ? res.data.dwsh + res.data.rysh
+ : res.data.todo,
fbdwDB: res.data.dwsh,
fbrtDB: res.data.rysh,
aqglDb: proUserInfo.subDeptType == "1" ? res.data.aqgl : 0,
zlglDb: proUserInfo.subDeptType == "1" ? res.data.zlgl : 0,
aqyhDB: res.data.aqgl,
zlyhDB: res.data.zlgl,
- })
+ });
}
});
+ param = {
+ projectId: app.globalData.useProjectId,
+ phoneNumber: app.globalData.userData.phonenumber,
+ };
+ let ajax = null;
+ if (this.data.isGroup) {
+ ajax = countGroupByStatus(param);
+ }
+ if (ajax) {
+ ajax.then((res) => {
+ if (res.success) {
+ this.setData({
+ checkDB: res.data.cnt || 0,
+ });
+ }
+ });
+ }
},
-
-})
\ No newline at end of file
+});
diff --git a/yanzhu-ui-app/miniprogram/pageage/project_more/index.wxml b/yanzhu-ui-app/miniprogram/pageage/project_more/index.wxml
index 1f107353..36c48c80 100644
--- a/yanzhu-ui-app/miniprogram/pageage/project_more/index.wxml
+++ b/yanzhu-ui-app/miniprogram/pageage/project_more/index.wxml
@@ -28,6 +28,7 @@
{{fbrtDB}}
{{aqyhDB}}
{{zlyhDB}}
+ {{checkDB}}
{{item.menuName}}
@@ -36,7 +37,8 @@
-
+
@@ -71,7 +73,9 @@
-
+
diff --git a/yanzhu-ui-app/miniprogram/pageage/project_quality/index.js b/yanzhu-ui-app/miniprogram/pageage/project_quality/index.js
index 1a598b3e..b9ee76c4 100644
--- a/yanzhu-ui-app/miniprogram/pageage/project_quality/index.js
+++ b/yanzhu-ui-app/miniprogram/pageage/project_quality/index.js
@@ -1,26 +1,17 @@
-import {
- getToken,
- getUserInfo
-} from '../../utils/auth'
-import {
- findUserMenuList
-} from '../../api/publics'
-import {
- findMyTask
-} from '../api/flowable'
-import {
- findGroupCountView
-} from '../api/problemmodify'
-const app = getApp()
+import { getToken, getUserInfo } from "../../utils/auth";
+import { findUserMenuList } from "../../api/publics";
+import { findMyTask } from "../api/flowable";
+import { findGroupCountView } from "../api/problemmodify";
+import { countGroupByStatus, countTechByStatus } from "../../api/project";
+const app = getApp();
Page({
-
/**
* 页面的初始数据
*/
data: {
active: 2,
- projectId: '',
- projectName: '',
+ projectId: "",
+ projectName: "",
subDeptUserInfo: {},
menuList: [],
initData: {},
@@ -28,35 +19,40 @@ Page({
zlyhDB: 0,
zlglDb: 0,
todoDB: 0,
- checkList: [{
- id: 1,
- name: "日常巡检问题",
- rate: 0, //整改率
- total: 0, //问题总数
- number: 0, //检查次数
- }, {
- id: 2,
- name: "周检隐患问题",
- rate: 0, //整改率
- total: 0, //问题总数
- number: 0, //检查次数
- }, {
- id: 3,
- name: "月检隐患问题",
- rate: 0, //整改率
- total: 0, //问题总数
- number: 0, //检查次数
- }, {
- id: 4,
- name: "专项检查问题",
- rate: 0, //整改率
- total: 0, //问题总数
- number: 0, //检查次数
- }],
- showZlyhpcDetail: false
+ checkDB: 0, //举牌验收数量
+ checkList: [
+ {
+ id: 1,
+ name: "日常巡检问题",
+ rate: 0, //整改率
+ total: 0, //问题总数
+ number: 0, //检查次数
+ },
+ {
+ id: 2,
+ name: "周检隐患问题",
+ rate: 0, //整改率
+ total: 0, //问题总数
+ number: 0, //检查次数
+ },
+ {
+ id: 3,
+ name: "月检隐患问题",
+ rate: 0, //整改率
+ total: 0, //问题总数
+ number: 0, //检查次数
+ },
+ {
+ id: 4,
+ name: "专项检查问题",
+ rate: 0, //整改率
+ total: 0, //问题总数
+ number: 0, //检查次数
+ },
+ ],
+ showZlyhpcDetail: false,
},
-
//项目切换 返回值
onProjectSelect(e) {
let projectId = e.detail.id;
@@ -72,8 +68,8 @@ Page({
onLoad: function (options) {
if (!getToken()) {
wx.redirectTo({
- url: '../../pages/login/login',
- })
+ url: "../../pages/login/login",
+ });
}
const proUserInfo = getUserInfo();
this.setData({
@@ -93,104 +89,106 @@ Page({
/**
* 查询功能菜单
- * @param {*} proId
+ * @param {*} proId
*/
getUserMenuList: function (proId) {
- findUserMenuList(proId, 'zlgl').then(res => {
+ findUserMenuList(proId, "zlgl").then((res) => {
if (res.code == 200) {
- res.data.forEach(item => {
- if (item.menuIdenti == 'ZLYHPC') {
+ res.data.forEach((item) => {
+ if (item.menuIdenti == "ZLYHPC") {
this.setData({
- showZlyhpcDetail: true
- })
+ showZlyhpcDetail: true,
+ });
}
});
this.setData({
- menuList: res.data
- })
+ menuList: res.data,
+ });
}
});
},
/**
* 项目分组查询统计
- * @param {*} proId
- * @param {*} type
+ * @param {*} proId
+ * @param {*} type
*/
getGroupCountView(proId, type) {
- findGroupCountView(proId, type).then(res => {
+ findGroupCountView(proId, type).then((res) => {
let _checkList = this.data.checkList;
//隐患统计数据
res.data.forEach((item, idx) => {
let _index = parseInt(item.problemType - 1);
- _checkList[_index].rate = (item.comTotal / item.total * 100).toFixed(2);
+ _checkList[_index].rate = ((item.comTotal / item.total) * 100).toFixed(
+ 2
+ );
_checkList[_index].total = item.comTotal;
_checkList[_index].number = item.total;
});
this.setData({
- checkList: _checkList
- })
+ checkList: _checkList,
+ });
});
},
goMenu: function (event) {
let _url = event.currentTarget.dataset.url;
if (!_url) {
- app.toast("正在建设中...")
+ app.toast("正在建设中...");
return false;
}
- wx.setStorageSync('nav-menu', "zlgl");
+ wx.setStorageSync("nav-menu", "zlgl");
wx.redirectTo({
- url: _url
- })
+ url: _url,
+ });
},
// 底部导航
onChange(event) {
// event.detail 的值为当前选中项的索引
this.setData({
- active: event.detail
+ active: event.detail,
});
},
//跳转到项目概况
XMGK: function () {
- wx.setStorageSync('nav-menu', "xmgk");
+ wx.setStorageSync("nav-menu", "xmgk");
wx.redirectTo({
- url: '../project_info/index'
- })
+ url: "../project_info/index",
+ });
},
//跳转到安全管理
AQGL: function () {
- wx.setStorageSync('nav-menu', "aqgl");
+ wx.setStorageSync("nav-menu", "aqgl");
wx.redirectTo({
- url: '../project_safety/index'
- })
+ url: "../project_safety/index",
+ });
},
//跳转到进度管理
JDGL: function () {
- wx.setStorageSync('nav-menu', "zlgl");
+ wx.setStorageSync("nav-menu", "zlgl");
wx.redirectTo({
- url: '../project_schedule/list/index'
- })
+ url: "../project_schedule/list/index",
+ });
},
//跳转到项目管理
XMGL: function () {
- wx.setStorageSync('nav-menu', "xmgl");
+ wx.setStorageSync("nav-menu", "xmgl");
wx.redirectTo({
- url: '../project_more/index'
- })
+ url: "../project_more/index",
+ });
},
//质量隐患详情跳转
goZLYH: function () {
- wx.setStorageSync('nav-menu', "zlgl");
+ wx.setStorageSync("nav-menu", "zlgl");
wx.redirectTo({
- url: '../project_problemmodify/list/index?type=1'
- })
+ url: "../project_problemmodify/list/index?type=1",
+ });
},
/**
@@ -198,17 +196,36 @@ Page({
*/
awaitTask() {
let param = "proId=" + app.globalData.useProjectId;
- findMyTask(param).then(res => {
+ let proUserInfo = this.data.subDeptUserInfo;
+ findMyTask(param).then((res) => {
if (res.code == 200) {
- let proUserInfo = this.data.subDeptUserInfo;
this.setData({
aqglDb: proUserInfo.subDeptType == "1" ? res.data.aqgl : 0,
zlyhDB: res.data.zlyl,
zlglDb: proUserInfo.subDeptType == "1" ? res.data.zlgl : 0,
- todoDb: proUserInfo.subDeptType == "1" ? (res.data.dwsh + res.data.rysh) : res.data.todo
- })
+ todoDb:
+ proUserInfo.subDeptType == "1"
+ ? res.data.dwsh + res.data.rysh
+ : res.data.todo,
+ });
}
});
+ let ajax = null;
+ param = {
+ projectId: app.globalData.useProjectId,
+ phoneNumber: app.globalData.userData.phonenumber,
+ };
+ if (proUserInfo.subDeptType == "1") {
+ ajax = countTechByStatus(param);
+ }
+ if (ajax) {
+ ajax.then((res) => {
+ if (res.success) {
+ this.setData({
+ checkDB: res.data.cnt || 0,
+ });
+ }
+ });
+ }
},
-
-})
\ No newline at end of file
+});
diff --git a/yanzhu-ui-app/miniprogram/pageage/project_quality/index.wxml b/yanzhu-ui-app/miniprogram/pageage/project_quality/index.wxml
index 8e4c1937..ad04b755 100644
--- a/yanzhu-ui-app/miniprogram/pageage/project_quality/index.wxml
+++ b/yanzhu-ui-app/miniprogram/pageage/project_quality/index.wxml
@@ -1,113 +1,117 @@
-
-
-
-
-
- {{zlyhDB}}
-
- {{item.menuName}}
-
-
-
-
+
+
+
+
+
+ {{zlyhDB}}
+ {{checkDB}}
+
+ {{item.menuName}}
+
+
+
+
-
-
- 质量隐患统计
- 查看详情
-
-
-
-
-
-
- {{item.name}}
-
-
- 整改率
- {{item.rate}} %
-
-
-
- 已整改问题数
- {{item.total}}
-
-
-
-
+
+
+ 质量隐患统计
+ 查看详情
+
+
+
+
+ {{item.name}}
+
+
+ 整改率
+ {{item.rate}} %
+
+
+
+ 已整改问题数
+ {{item.total}}
+
+
+
+
+
+
-
-
-
-
- 项目概况
-
+
+
+
+
+ 项目概况
+
-
-
-
- 安全管理
- {{aqglDB}}
-
+
+
+
+ 安全管理
+ {{aqglDB}}
+
-
-
-
- 质量管理
- {{zlglDB}}
-
+
+
+
+ 质量管理
+ {{zlglDB}}
+
-
-
-
- 进度管理
-
+
+
+
+ 进度管理
+
-
-
-
- 项目管理
- {{todoDb}}
-
+
+
+
+ 项目管理
+ {{todoDb}}
+
-
-
-
-
- 项目概况
-
+
+
+
+
+ 项目概况
+
-
-
-
- 项目管理
- {{todoDb}}
-
+
+
+
+ 项目管理
+ {{todoDb}}
+
\ No newline at end of file