diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 13566b8..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/.idea/construction.iml b/.idea/construction.iml deleted file mode 100644 index d6ebd48..0000000 --- a/.idea/construction.iml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 22b3b03..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/cloudfunctions/callback/config.json b/cloudfunctions/callback/config.json deleted file mode 100644 index 43aa5fc..0000000 --- a/cloudfunctions/callback/config.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "permissions": { - "openapi": [ - "customerServiceMessage.send" - ] - } -} \ No newline at end of file diff --git a/cloudfunctions/callback/index.js b/cloudfunctions/callback/index.js deleted file mode 100644 index c80f887..0000000 --- a/cloudfunctions/callback/index.js +++ /dev/null @@ -1,26 +0,0 @@ -const cloud = require('wx-server-sdk') - -cloud.init({ - // API 调用都保持和云函数当前所在环境一致 - env: cloud.DYNAMIC_CURRENT_ENV -}) - -// 云函数入口函数 -exports.main = async (event, context) => { - - console.log(event) - - const { OPENID } = cloud.getWXContext() - - const result = await cloud.openapi.customerServiceMessage.send({ - touser: OPENID, - msgtype: 'text', - text: { - content: '收到：' + event.Content, - } - }) - - console.log(result) - - return result -} diff --git a/cloudfunctions/callback/package.json b/cloudfunctions/callback/package.json deleted file mode 100644 index dd8f14a..0000000 --- a/cloudfunctions/callback/package.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "callback", - "version": "1.0.0", - "description": "", - "main": "index.js", - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, - "author": "", - "license": "ISC", - "dependencies": { - "wx-server-sdk": "~2.1.2" - } -} \ No newline at end of file diff --git a/cloudfunctions/echo/config.json b/cloudfunctions/echo/config.json deleted file mode 100644 index 16348ce..0000000 --- a/cloudfunctions/echo/config.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "permissions": { - "openapi": [] - } -} diff --git a/cloudfunctions/echo/index.js b/cloudfunctions/echo/index.js deleted file mode 100644 index 4f83878..0000000 --- a/cloudfunctions/echo/index.js +++ /dev/null @@ -1,8 +0,0 @@ -const cloud = require('wx-server-sdk') - -exports.main = async (event, context) => { - // event.userInfo 是已废弃的保留字段，在此不做展示 - // 获取 OPENID 等微信上下文请使用 cloud.getWXContext() - delete event.userInfo - return event -} diff --git a/cloudfunctions/echo/package.json b/cloudfunctions/echo/package.json deleted file mode 100644 index 1e62da3..0000000 --- a/cloudfunctions/echo/package.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "echo", - "version": "1.0.0", - "description": "", - "main": "index.js", - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, - "author": "", - "license": "ISC", - "dependencies": { - "wx-server-sdk": "~2.1.2" - } -} \ No newline at end of file diff --git a/cloudfunctions/login/config.json b/cloudfunctions/login/config.json deleted file mode 100644 index 16348ce..0000000 --- a/cloudfunctions/login/config.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "permissions": { - "openapi": [] - } -} diff --git a/cloudfunctions/login/index.js b/cloudfunctions/login/index.js deleted file mode 100644 index 46c44aa..0000000 --- a/cloudfunctions/login/index.js +++ /dev/null @@ -1,36 +0,0 @@ -// 云函数模板 -// 部署：在 cloud-functions/login 文件夹右击选择 “上传并部署” - -const cloud = require('wx-server-sdk') - -// 初始化 cloud -cloud.init({ - // API 调用都保持和云函数当前所在环境一致 - env: cloud.DYNAMIC_CURRENT_ENV -}) - -/** - * 这个示例将经自动鉴权过的小程序用户 openid 返回给小程序端 - * - * event 参数包含小程序端调用传入的 data - * - */ -exports.main = async (event, context) => { - console.log(event) - console.log(context) - - // 可执行其他自定义逻辑 - // console.log 的内容可以在云开发云函数调用日志查看 - - // 获取 WX Context (微信调用上下文)，包括 OPENID、APPID、及 UNIONID（需满足 UNIONID 获取条件）等信息 - const wxContext = cloud.getWXContext() - - return { - event, - openid: wxContext.OPENID, - appid: wxContext.APPID, - unionid: wxContext.UNIONID, - env: wxContext.ENV, - } -} - diff --git a/cloudfunctions/login/package.json b/cloudfunctions/login/package.json deleted file mode 100644 index 3c5d61a..0000000 --- a/cloudfunctions/login/package.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "login", - "version": "1.0.0", - "description": "", - "main": "index.js", - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, - "author": "", - "license": "ISC", - "dependencies": { - "wx-server-sdk": "~2.1.2" - } -} diff --git a/cloudfunctions/openapi/config.json b/cloudfunctions/openapi/config.json deleted file mode 100644 index 0074569..0000000 --- a/cloudfunctions/openapi/config.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "permissions": { - "openapi": [ - "wxacode.get", - "subscribeMessage.send", - "subscribeMessage.addTemplate", - "templateMessage.send", - "templateMessage.addTemplate", - "templateMessage.deleteTemplate", - "templateMessage.getTemplateList", - "templateMessage.getTemplateLibraryById", - "templateMessage.getTemplateLibraryList" - ] - } -} \ No newline at end of file diff --git a/cloudfunctions/openapi/index.js b/cloudfunctions/openapi/index.js deleted file mode 100644 index 1ae21a4..0000000 --- a/cloudfunctions/openapi/index.js +++ /dev/null @@ -1,87 +0,0 @@ -// 云函数入口文件 -const cloud = require('wx-server-sdk') - -cloud.init() - -// 云函数入口函数 -exports.main = async (event, context) => { - console.log(event) - switch (event.action) { - case 'requestSubscribeMessage': { - return requestSubscribeMessage(event) - } - case 'sendSubscribeMessage': { - return sendSubscribeMessage(event) - } - case 'getWXACode': { - return getWXACode(event) - } - case 'getOpenData': { - return getOpenData(event) - } - default: { - return - } - } -} - -async function requestSubscribeMessage(event) { - // 此处为模板 ID，开发者需要到小程序管理后台 - 订阅消息 - 公共模板库中添加模板， - // 然后在我的模板中找到对应模板的 ID，填入此处 - return '请到管理后台申请模板 ID 然后在此替换' // 如 'N_J6F05_bjhqd6zh2h1LHJ9TAv9IpkCiAJEpSw0PrmQ' -} - -async function sendSubscribeMessage(event) { - const { OPENID } = cloud.getWXContext() - - const { templateId } = event - - const sendResult = await cloud.openapi.subscribeMessage.send({ - touser: OPENID, - templateId, - miniprogram_state: 'developer', - page: 'pages/openapi/openapi', - // 此处字段应修改为所申请模板所要求的字段 - data: { - thing1: { - value: '咖啡', - }, - time3: { - value: '2020-01-01 00:00', - }, - } - }) - - return sendResult -} - -async function getWXACode(event) { - - // 此处将获取永久有效的小程序码，并将其保存在云文件存储中，最后返回云文件 ID 给前端使用 - - const wxacodeResult = await cloud.openapi.wxacode.get({ - path: 'pages/openapi/openapi', - }) - - const fileExtensionMatches = wxacodeResult.contentType.match(/\/([^\/]+)/) - const fileExtension = (fileExtensionMatches && fileExtensionMatches[1]) || 'jpg' - - const uploadResult = await cloud.uploadFile({ - // 云文件路径，此处为演示采用一个固定名称 - cloudPath: `wxacode_default_openapi_page.${fileExtension}`, - // 要上传的文件内容可直接传入图片 Buffer - fileContent: wxacodeResult.buffer, - }) - - if (!uploadResult.fileID) { - throw new Error(`upload failed with empty fileID and storage server status code ${uploadResult.statusCode}`) - } - - return uploadResult.fileID -} - -async function getOpenData(event) { - return cloud.getOpenData({ - list: event.openData.list, - }) -} diff --git a/cloudfunctions/openapi/package.json b/cloudfunctions/openapi/package.json deleted file mode 100644 index fc486e1..0000000 --- a/cloudfunctions/openapi/package.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "openapi", - "version": "1.0.0", - "description": "", - "main": "index.js", - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, - "author": "", - "license": "ISC", - "dependencies": { - "wx-server-sdk": "~2.1.2" - } -} diff --git a/miniprogram/api/flowable.js b/miniprogram/api/flowable.js new file mode 100644 index 0000000..d9750ee --- /dev/null +++ b/miniprogram/api/flowable.js @@ -0,0 +1,161 @@ +import {request} from '../utils/request' + +// 获取流程申请类型 +export function myDefinitionList(data) { + return request({ + url: '/wxApi/flowTask/myDefinitionList', + method: 'get', + data: data + }) +} + +// 启动流程实例 +export function startProcessInstance(data) { + return request({ + url: '/wxApi/flowTask/startProcessInstance', + method: 'post', + data: data + }) +} + +// 查询流程节点 +export function readDeployNotes(deployId) { + return request({ + url: '/wxApi/flowTask/readNotes/'+deployId, + method: 'get' + }) +} + +// 取消流程申请 +export function stopProcess(data) { + return request({ + url: '/wxApi/flowTask/stopProcess', + method: 'post', + data: data + }) +} + +// 撤回流程办理 +export function revokeProcess(data) { + return request({ + url: '/wxApi/flowTask/revokeProcess', + method: 'post', + data: data + }) +} + +// 审批任务流程 +export function complete(data) { + return request({ + url: '/wxApi/flowTask/complete', + method: 'post', + data: data + }) +} + +// 驳回任务流程 +export function reject(data) { + return request({ + url: '/wxApi/flowTask/reject', + method: 'post', + data: data + }) +} + +// 退回任务流程 +export function returnTask(data) { + return request({ + url: '/wxApi/flowTask/return', + method: 'post', + data: data + }) +} + +// 委派任务流程 +export function delegateTask(data) { + return request({ + url: '/wxApi/flowTask/delegateTask', + method: 'post', + data: data + }) +} + +// 转办任务流程 +export function assignTask(data) { + return request({ + url: '/wxApi/flowTask/assignTask', + method: 'post', + data: data + }) +} + +// 删除流程实例 +export function deleteInstance(instanceId) { + return request({ + url: '/wxApi/flowTask/delete/'+instanceId, + method: 'get' + }) +} + +// 获取所有可回退的节点 +export function returnList(data) { + return request({ + url: '/wxApi/flowTask/returnList', + method: 'post', + data: data + }) +} + +// 根据流程Id查询操作日志 +export function findCommentByProcInsId(data) { + return request({ + url: '/wxApi/flowTask/findCommentByProcInsId', + method: 'get', + data: data + }) +} + +// 根据条件查询我的代办任务 +export function myAwaitFlowTaskList(data) { + return request({ + url: '/wxApi/flowTask/myAwaitFlowTaskList', + method: 'post', + data: data + }) +} + +// 根据条件查询我的已办任务 +export function myFinishedFlowTaskList(data) { + return request({ + url: '/wxApi/flowTask/myFinishedFlowTaskList', + method: 'get', + data: data + }) +} + +// 根据条件查询所有流申请 +export function allInstanceList(data) { + return request({ + url: '/wxApi/flowTask/allList', + method: 'get', + data: data + }) +} + +// 根据条件统计所有流程任务 +export function queryTaskCount(data) { + return request({ + url: '/wxApi/flowTask/queryCount', + method: 'get', + data: data + }) +} + +// 根据条件统计分类流程任务 +export function queryTaskCountByCategory(data){ + return request({ + url: '/wechat/flowTask/findAwaitCountGroupByCategory', + method: 'post', + data: data + }) +} \ No newline at end of file diff --git a/miniprogram/api/login.js b/miniprogram/api/login.js new file mode 100644 index 0000000..9e00f76 --- /dev/null +++ b/miniprogram/api/login.js @@ -0,0 +1,35 @@ +import {request} from '../utils/request' + +// 获取验证码 +export function getCodeImg() { + return request({ + url: '/wechat/captchaImage', + method: 'get', + }) +} + +// 登录方法 +export function login(data) { + return request({ + url: '/wxApi/login', + method: 'post', + data: data, + }) +} + +// 登录方法 +export function updatePwd(data) { + return request({ + url: '/wxApi/updatePwd', + method: 'post', + data: data, + }) +} + +// 用户退出方法 +export function loginOut() { + return request({ + 'url': '/wxApi/loginOut', + 'method': 'get' + }) +} diff --git a/miniprogram/api/projectStandard.js b/miniprogram/api/projectStandard.js new file mode 100644 index 0000000..fab6c01 --- /dev/null +++ b/miniprogram/api/projectStandard.js @@ -0,0 +1,10 @@ +import {request} from '../utils/request' + +// 根据条件统计项目标准化类型 +export function queryCountByType(data){ + return request({ + url: '/wechat/projectStandard/findCountByType', + method: 'get', + data: data + }) +} diff --git a/miniprogram/api/publics.js b/miniprogram/api/publics.js new file mode 100644 index 0000000..ba00d99 --- /dev/null +++ b/miniprogram/api/publics.js @@ -0,0 +1,59 @@ +import {request} from '../utils/request' + +// 获取用户详细信息 +export function getUserInfo() { + return request({ + url: '/wxApi/publics/user/info', + method: 'get' + }) +} + +// 查询用户菜单信息 +export function selectRoleMenuList(data) { + return request({ + url: '/wxApi/publics/v1/selectRoleMenuList', + method: 'get', + data: data + }) +} + +// 查询用户待办信息 +export function findMyTask(data) { + return request({ + url: '/wxApi/flowTask/myAwaitFlowTaskListCount', + method: 'post', + data:data + }) +} + +// 查询用户部门信息 +export function findMyDeptList(){ + return request({ + url: '/wxApi/publics/v1/findMyDeptList', + method: 'get' + }) +} + +// 查询用户项目信息 +export function findMyProjectList(){ + return request({ + url: '/wxApi/publics/v1/findMyProjectList', + method: 'get' + }) +} + +// 查询部门资产列表信息 +export function findAllByCategory(category){ + return request({ + url: '/wxApi/publics/v1/findAllByCategory/'+category, + method: 'get' + }) +} + +// 获取项目申请详细信息 +export function findProjectApplyData(id){ + return request({ + url: '/wxApi/publics/projectApply/'+id, + method: 'get' + }) +} \ No newline at end of file diff --git a/miniprogram/app.js b/miniprogram/app.js index 3802ede..dadc49d 100644 --- a/miniprogram/app.js +++ b/miniprogram/app.js @@ -23,17 +23,16 @@ App({ globalData: { + category:'', + standard:'', paramDeptId:'', userProjectId:'', - appId: "wxc44b5d588f599758", + appId: "wx9997d071b4996f23", // 智慧工地后台接口访问域名 - // reqUrl:"http://wxw.ngrok.makalu.cc", - //reqUrl:'https://jaapplets.makalu.cc', - //reqUrl:'https://sxyanzhu.com/jhwxapp', - reqUrl:'https://cf.makalu.cc', - //reqUrl:'http://127.0.0.1:8091', - uploadUrl:"https://cf.makalu.cc/wechat", - //uploadUrl:'http://127.0.0.1:8091/wechat', + //reqUrl:'https://szgcwx.jhncidg.com', + reqUrl:'http://127.0.0.1:8091', + //uploadUrl:"https://szgcwx.jhncidg.com/wechat", + uploadUrl:'http://192.168.43.53:8091/wechat', //御景路数字化集成管控平台接口访问域名 szhUrl:'https://szh.makalu.cc', diff --git a/miniprogram/app.wxss b/miniprogram/app.wxss index eecc1ed..3408813 100644 --- a/miniprogram/app.wxss +++ b/miniprogram/app.wxss @@ -1462,6 +1462,14 @@ swiper-item video{ align-items: center; } +.module_see_info_switct{ + font-size: 26rpx; + font-weight: 600; + color: greenyellow; + display: flex; + align-items: center; +} + .inspect_new_issues_max{ padding: 30rpx 0; } @@ -1630,6 +1638,20 @@ swiper-item video{ margin-left: 110rpx; margin-top: 16rpx; } +.tabNum_defalut{ + position: absolute; + background-color: blueviolet; + border-radius: 10px; + color: #fff; + display: inline-block; + font-size: 12px; + height: 18px; + line-height: 18px; + padding: 0 6px; + text-align: center; + white-space: nowrap; + margin-left: 110rpx; +} .van-col--18{ word-wrap:break-word; } diff --git a/miniprogram/config.js b/miniprogram/config.js new file mode 100644 index 0000000..17e3de7 --- /dev/null +++ b/miniprogram/config.js @@ -0,0 +1,8 @@ +// 应用全局配置 +module.exports = { + timeout: 60000, + appId: "wx9997d071b4996f23", + //baseUrl: 'https://szgcwx.jhncidg.com', + baseUrl: 'http://127.0.0.1:8091', + noSecuritys:['/wechat/captchaImage','/wxApi/login'] +}; \ No newline at end of file diff --git a/miniprogram/images/dingwei.png b/miniprogram/images/dingwei.png deleted file mode 100644 index 9fb08c3..0000000 Binary files a/miniprogram/images/dingwei.png and /dev/null differ diff --git a/miniprogram/images/i_location.png b/miniprogram/images/i_location.png deleted file mode 100644 index 5ef39fe..0000000 Binary files a/miniprogram/images/i_location.png and /dev/null differ diff --git a/miniprogram/images/i_mechanics.png b/miniprogram/images/i_mechanics.png deleted file mode 100644 index 957fa4a..0000000 Binary files a/miniprogram/images/i_mechanics.png and /dev/null differ diff --git a/miniprogram/images/i_personnel.png b/miniprogram/images/i_personnel.png deleted file mode 100644 index 216695b..0000000 Binary files a/miniprogram/images/i_personnel.png and /dev/null differ diff --git a/miniprogram/images/icon_1.png b/miniprogram/images/icon_1.png deleted file mode 100644 index 17a6290..0000000 Binary files a/miniprogram/images/icon_1.png and /dev/null differ diff --git a/miniprogram/images/icon_2.png b/miniprogram/images/icon_2.png deleted file mode 100644 index d46f8f4..0000000 Binary files a/miniprogram/images/icon_2.png and /dev/null differ diff --git a/miniprogram/images/icon_3.png b/miniprogram/images/icon_3.png deleted file mode 100644 index 7b59453..0000000 Binary files a/miniprogram/images/icon_3.png and /dev/null differ diff --git a/miniprogram/images/icon_4.png b/miniprogram/images/icon_4.png deleted file mode 100644 index c682c6e..0000000 Binary files a/miniprogram/images/icon_4.png and /dev/null differ diff --git a/miniprogram/images/icon_5.png b/miniprogram/images/icon_5.png deleted file mode 100644 index f701503..0000000 Binary files a/miniprogram/images/icon_5.png and /dev/null differ diff --git a/miniprogram/images/icons_1.png b/miniprogram/images/icons_1.png deleted file mode 100644 index 4a01a1e..0000000 Binary files a/miniprogram/images/icons_1.png and /dev/null differ diff --git a/miniprogram/images/icons_2.png b/miniprogram/images/icons_2.png deleted file mode 100644 index 22f8ff2..0000000 Binary files a/miniprogram/images/icons_2.png and /dev/null differ diff --git a/miniprogram/images/icons_3.png b/miniprogram/images/icons_3.png deleted file mode 100644 index 81e04f9..0000000 Binary files a/miniprogram/images/icons_3.png and /dev/null differ diff --git a/miniprogram/images/icons_4.png b/miniprogram/images/icons_4.png deleted file mode 100644 index e71a750..0000000 Binary files a/miniprogram/images/icons_4.png and /dev/null differ diff --git a/miniprogram/images/icons_5.png b/miniprogram/images/icons_5.png deleted file mode 100644 index cd75a41..0000000 Binary files a/miniprogram/images/icons_5.png and /dev/null differ diff --git a/miniprogram/images/nodata.png b/miniprogram/images/nodata.png deleted file mode 100644 index 17d832c..0000000 Binary files a/miniprogram/images/nodata.png and /dev/null differ diff --git a/miniprogram/images/user_3.png b/miniprogram/images/user_3.png deleted file mode 100644 index cc37d23..0000000 Binary files a/miniprogram/images/user_3.png and /dev/null differ diff --git a/miniprogram/images/wl_fg.png b/miniprogram/images/wl_fg.png deleted file mode 100644 index 9d4e45c..0000000 Binary files a/miniprogram/images/wl_fg.png and /dev/null differ diff --git a/miniprogram/newComponents/select-group-person/index.wxss b/miniprogram/newComponents/select-group-person/index.wxss index 3c4d8af..3e7240e 100644 --- a/miniprogram/newComponents/select-group-person/index.wxss +++ b/miniprogram/newComponents/select-group-person/index.wxss @@ -1,7 +1,3 @@ -/* newComponents/select-person/index.wxss */ -page{ - height:100% -} .rectifier_add_to{ width: 100rpx; height: 100rpx; @@ -16,10 +12,11 @@ page{ } .rectifier_max{ width: 100%; + height: 100%; background: #232a44; border-radius: 15rpx; position: relative; - height: 100%; + margin-bottom: -57rpx; } .rectifier_title{ position: relative; diff --git a/miniprogram/pageage/project_checkDetection/list/index.wxml b/miniprogram/pageage/project_checkDetection/list/index.wxml index 61cf213..f13a709 100644 --- a/miniprogram/pageage/project_checkDetection/list/index.wxml +++ b/miniprogram/pageage/project_checkDetection/list/index.wxml @@ -43,7 +43,7 @@ - + 暂无数据 diff --git a/miniprogram/pageage/project_checking/add/index.wxml b/miniprogram/pageage/project_checking/add/index.wxml index 1821840..870c7c4 100644 --- a/miniprogram/pageage/project_checking/add/index.wxml +++ b/miniprogram/pageage/project_checking/add/index.wxml @@ -82,7 +82,7 @@ - + 数据加载中！请稍后... diff --git a/miniprogram/pageage/project_checking/edit/index.wxml b/miniprogram/pageage/project_checking/edit/index.wxml index 9553155..7ded209 100644 --- a/miniprogram/pageage/project_checking/edit/index.wxml +++ b/miniprogram/pageage/project_checking/edit/index.wxml @@ -106,7 +106,7 @@ - + 数据加载中！请稍后... diff --git a/miniprogram/pageage/project_checking/list/index.wxml b/miniprogram/pageage/project_checking/list/index.wxml index 123c1e9..698225c 100644 --- a/miniprogram/pageage/project_checking/list/index.wxml +++ b/miniprogram/pageage/project_checking/list/index.wxml @@ -50,7 +50,7 @@ - + 暂无数据 @@ -58,7 +58,7 @@ - + 新增 diff --git a/miniprogram/pageage/project_deptWorks/add/index.wxml b/miniprogram/pageage/project_deptWorks/add/index.wxml index f02015b..2fc675d 100644 --- a/miniprogram/pageage/project_deptWorks/add/index.wxml +++ b/miniprogram/pageage/project_deptWorks/add/index.wxml @@ -42,7 +42,7 @@ - + 数据加载中！请稍后... diff --git a/miniprogram/pageage/project_deptWorks/list/index.wxml b/miniprogram/pageage/project_deptWorks/list/index.wxml index eb621ce..3674d63 100644 --- a/miniprogram/pageage/project_deptWorks/list/index.wxml +++ b/miniprogram/pageage/project_deptWorks/list/index.wxml @@ -41,7 +41,7 @@ - + 暂无数据 @@ -49,7 +49,7 @@ - + 变更 diff --git a/miniprogram/pageage/project_insurance/add/index.wxml b/miniprogram/pageage/project_insurance/add/index.wxml index cec967c..9686428 100644 --- a/miniprogram/pageage/project_insurance/add/index.wxml +++ b/miniprogram/pageage/project_insurance/add/index.wxml @@ -50,7 +50,7 @@ - + 数据加载中！请稍后... diff --git a/miniprogram/pageage/project_insurance/list/index.wxml b/miniprogram/pageage/project_insurance/list/index.wxml index 06f5d6d..2f80a0e 100644 --- a/miniprogram/pageage/project_insurance/list/index.wxml +++ b/miniprogram/pageage/project_insurance/list/index.wxml @@ -39,7 +39,7 @@ - + 暂无数据 @@ -47,7 +47,7 @@ - + 新增 diff --git a/miniprogram/pageage/project_materialSeal/add/index.wxml b/miniprogram/pageage/project_materialSeal/add/index.wxml index e5d2203..a64c2dd 100644 --- a/miniprogram/pageage/project_materialSeal/add/index.wxml +++ b/miniprogram/pageage/project_materialSeal/add/index.wxml @@ -83,7 +83,7 @@ - + 数据加载中！请稍后... diff --git a/miniprogram/pageage/project_materialSeal/edit/index.wxml b/miniprogram/pageage/project_materialSeal/edit/index.wxml index 0332861..9df6b1b 100644 --- a/miniprogram/pageage/project_materialSeal/edit/index.wxml +++ b/miniprogram/pageage/project_materialSeal/edit/index.wxml @@ -112,7 +112,7 @@ - + 数据加载中！请稍后... diff --git a/miniprogram/pageage/project_materialSeal/list/index.wxml b/miniprogram/pageage/project_materialSeal/list/index.wxml index 42bc58c..dae8cb6 100644 --- a/miniprogram/pageage/project_materialSeal/list/index.wxml +++ b/miniprogram/pageage/project_materialSeal/list/index.wxml @@ -46,7 +46,7 @@ - + 暂无数据 @@ -54,7 +54,7 @@ - + 新增 diff --git a/miniprogram/pageage/project_measure/add/index.wxml b/miniprogram/pageage/project_measure/add/index.wxml index c7637e7..a0f8329 100644 --- a/miniprogram/pageage/project_measure/add/index.wxml +++ b/miniprogram/pageage/project_measure/add/index.wxml @@ -84,7 +84,7 @@ - + 数据加载中！请稍后... diff --git a/miniprogram/pageage/project_measure/edit/index.wxml b/miniprogram/pageage/project_measure/edit/index.wxml index be3b819..7fb925a 100644 --- a/miniprogram/pageage/project_measure/edit/index.wxml +++ b/miniprogram/pageage/project_measure/edit/index.wxml @@ -105,7 +105,7 @@ - + 数据加载中！请稍后... diff --git a/miniprogram/pageage/project_measure/list/index.wxml b/miniprogram/pageage/project_measure/list/index.wxml index c3cebcc..5c10e66 100644 --- a/miniprogram/pageage/project_measure/list/index.wxml +++ b/miniprogram/pageage/project_measure/list/index.wxml @@ -46,7 +46,7 @@ - + 暂无数据 @@ -54,7 +54,7 @@ - + 新增 diff --git a/miniprogram/pageage/project_problemmodify/quality/add/index.wxml b/miniprogram/pageage/project_problemmodify/quality/add/index.wxml index cee4f47..d6e4bd0 100644 --- a/miniprogram/pageage/project_problemmodify/quality/add/index.wxml +++ b/miniprogram/pageage/project_problemmodify/quality/add/index.wxml @@ -87,7 +87,7 @@ - + 数据加载中！请稍后... diff --git a/miniprogram/pageage/project_problemmodify/quality/check/index.wxml b/miniprogram/pageage/project_problemmodify/quality/check/index.wxml index 5305cdd..87efd61 100644 --- a/miniprogram/pageage/project_problemmodify/quality/check/index.wxml +++ b/miniprogram/pageage/project_problemmodify/quality/check/index.wxml @@ -152,7 +152,7 @@ - + 数据加载中！请稍后... \ No newline at end of file diff --git a/miniprogram/pageage/project_problemmodify/quality/draft/index.wxml b/miniprogram/pageage/project_problemmodify/quality/draft/index.wxml index 3a01b16..f51ab9e 100644 --- a/miniprogram/pageage/project_problemmodify/quality/draft/index.wxml +++ b/miniprogram/pageage/project_problemmodify/quality/draft/index.wxml @@ -53,7 +53,7 @@ - + 数据加载中！请稍后... diff --git a/miniprogram/pageage/project_problemmodify/quality/list/index.wxml b/miniprogram/pageage/project_problemmodify/quality/list/index.wxml index 9755e08..8cc9618 100644 --- a/miniprogram/pageage/project_problemmodify/quality/list/index.wxml +++ b/miniprogram/pageage/project_problemmodify/quality/list/index.wxml @@ -57,19 +57,19 @@ - + 暂无数据 - + 草稿 - + 新增 diff --git a/miniprogram/pageage/project_problemmodify/quality/modify/index.wxml b/miniprogram/pageage/project_problemmodify/quality/modify/index.wxml index 765246b..a0d3b94 100644 --- a/miniprogram/pageage/project_problemmodify/quality/modify/index.wxml +++ b/miniprogram/pageage/project_problemmodify/quality/modify/index.wxml @@ -148,7 +148,7 @@ - + 数据加载中！请稍后... \ No newline at end of file diff --git a/miniprogram/pageage/project_problemmodify/security/add/index.wxml b/miniprogram/pageage/project_problemmodify/security/add/index.wxml index 26a7047..a357cfb 100644 --- a/miniprogram/pageage/project_problemmodify/security/add/index.wxml +++ b/miniprogram/pageage/project_problemmodify/security/add/index.wxml @@ -87,7 +87,7 @@ - + 数据加载中！请稍后... diff --git a/miniprogram/pageage/project_problemmodify/security/check/index.wxml b/miniprogram/pageage/project_problemmodify/security/check/index.wxml index bfe9101..37104ee 100644 --- a/miniprogram/pageage/project_problemmodify/security/check/index.wxml +++ b/miniprogram/pageage/project_problemmodify/security/check/index.wxml @@ -152,7 +152,7 @@ - + 数据加载中！请稍后... \ No newline at end of file diff --git a/miniprogram/pageage/project_problemmodify/security/draft/index.wxml b/miniprogram/pageage/project_problemmodify/security/draft/index.wxml index 379ba42..d9cf564 100644 --- a/miniprogram/pageage/project_problemmodify/security/draft/index.wxml +++ b/miniprogram/pageage/project_problemmodify/security/draft/index.wxml @@ -53,7 +53,7 @@ - + 数据加载中！请稍后... diff --git a/miniprogram/pageage/project_problemmodify/security/list/index.wxml b/miniprogram/pageage/project_problemmodify/security/list/index.wxml index 8d5874a..0c6436c 100644 --- a/miniprogram/pageage/project_problemmodify/security/list/index.wxml +++ b/miniprogram/pageage/project_problemmodify/security/list/index.wxml @@ -56,19 +56,19 @@ - + 暂无数据 - + 草稿 - + 新增 diff --git a/miniprogram/pageage/project_problemmodify/security/modify/index.wxml b/miniprogram/pageage/project_problemmodify/security/modify/index.wxml index 649e892..358c622 100644 --- a/miniprogram/pageage/project_problemmodify/security/modify/index.wxml +++ b/miniprogram/pageage/project_problemmodify/security/modify/index.wxml @@ -147,7 +147,7 @@ - + 数据加载中！请稍后... \ No newline at end of file diff --git a/miniprogram/pageage/project_schedule/add/index.wxml b/miniprogram/pageage/project_schedule/add/index.wxml index b1f3ca4..d62ca5e 100644 --- a/miniprogram/pageage/project_schedule/add/index.wxml +++ b/miniprogram/pageage/project_schedule/add/index.wxml @@ -112,7 +112,7 @@ - + 数据加载中！请稍后... diff --git a/miniprogram/pageage/project_schedule/list/index.wxml b/miniprogram/pageage/project_schedule/list/index.wxml index bd5887a..7e54e99 100644 --- a/miniprogram/pageage/project_schedule/list/index.wxml +++ b/miniprogram/pageage/project_schedule/list/index.wxml @@ -39,7 +39,7 @@ - + 暂无数据 @@ -47,7 +47,7 @@ - + 新增 diff --git a/miniprogram/pageage/project_special/add/index.wxml b/miniprogram/pageage/project_special/add/index.wxml index 725d460..be8348a 100644 --- a/miniprogram/pageage/project_special/add/index.wxml +++ b/miniprogram/pageage/project_special/add/index.wxml @@ -68,7 +68,7 @@ - + 数据加载中！请稍后... diff --git a/miniprogram/pageage/project_special/list/index.wxml b/miniprogram/pageage/project_special/list/index.wxml index 4e5fb9c..f194b25 100644 --- a/miniprogram/pageage/project_special/list/index.wxml +++ b/miniprogram/pageage/project_special/list/index.wxml @@ -40,7 +40,7 @@ - + 暂无数据 @@ -48,7 +48,7 @@ - + 新增 diff --git a/miniprogram/pageage/project_standard/add/index.wxml b/miniprogram/pageage/project_standard/add/index.wxml index 8373cc4..dc6f4bf 100644 --- a/miniprogram/pageage/project_standard/add/index.wxml +++ b/miniprogram/pageage/project_standard/add/index.wxml @@ -47,7 +47,7 @@ - + 数据加载中！请稍后... diff --git a/miniprogram/pageage/project_standard/list/index.js b/miniprogram/pageage/project_standard/list/index.js index 231ee47..47c946b 100644 --- a/miniprogram/pageage/project_standard/list/index.js +++ b/miniprogram/pageage/project_standard/list/index.js @@ -1,143 +1,238 @@ -// pageage/safetyManagement/securityCheckGR/index.js +import config from '../../../config' +import { + queryCountByType +} from '../../../api/projectStandard' const app = getApp() Page({ - /** - * 页面的初始数据 - */ - data: { - deptId:"", - loginName:"", - projectId:"", - minRoleId:"", - projectData:{}, - initData: {}, - show:false, - listData:[], - request:app.globalData.reqUrl - }, + /** + * 页面的初始数据 + */ + data: { + deptId: "", + loginName: "", + projectId: "", + minRoleId: "", + projectData: {}, + initData: {}, + show: false, + listData: [], + standard: null, + standardName: '', + standardActive: '', + typeList: [{ + id: 1, + name: '作业标准化', + icon: config.baseUrl + '/staticFiles/img/zybzh.png', + count: 0, + }, { + id: 2, + name: '现场管理标准', + icon: config.baseUrl + '/staticFiles/img/xcglbzh.png', + count: 0, + }, + { + id: 3, + name: '安全技术标准', + icon: config.baseUrl + '/staticFiles/img/aqjsbzh.png', + count: 0, + }, { + id: 4, + name: '设备管理标准', + icon: config.baseUrl + '/staticFiles/img/sbglbzh.png', + count: 0, + }, { + id: 5, + name: '文明施工标准', + icon: config.baseUrl + '/staticFiles/img/wmsgbzh.png', + count: 0, + }, { + id: 6, + name: '环境保护标准', + icon: config.baseUrl + '/staticFiles/img/hjbhbzh.png', + count: 0, + } + ], + }, - skipAdd(){ - wx.redirectTo({ - url: `../add/index?projectId=${this.data.initData.id}&projectName=`+this.data.initData.text, - }) - }, + skipAdd() { + wx.redirectTo({ + url: `../add/index?projectId=${this.data.initData.id}&projectName=` + this.data.initData.text, + }) + }, - getInfo(e){ - let {id} = e.currentTarget.dataset.set - wx.redirectTo({ - url: `../info/index?id=${id}` - }) - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad(options) { - //获取缓存数据 - wx.getStorage({ - key: 'userinfo', - success:res=>{ - this.setData({ - deptId:res.data.deptId, - loginName:res.data.loginName, - userName:res.data.userName, - projectId:app.globalData.projectId, - minRoleId:res.data.minRoleId, - initData:{text:app.globalData.projectName,id:app.globalData.projectId} - }) - this.getListData(app.globalData.projectId,res.data.deptId,res.data.minRoleId); - } - }) - }, + getInfo(e) { + let { + id + } = e.currentTarget.dataset.set + wx.redirectTo({ + url: `../info/index?id=${id}` + }) + }, /** - * 查询项目举牌验收数据 - */ - getListData(projectId,deptId,minRoleId) { + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + let standard; + if (options && options.standard) { + standard = options.standard; + app.globalData.standard = options.standard; + } else { + standard = app.globalData.standard; + } + //获取缓存数据 + wx.getStorage({ + key: 'userinfo', + success: res => { + this.setData({ + deptId: res.data.deptId, + loginName: res.data.loginName, + userName: res.data.userName, + projectId: app.globalData.projectId, + minRoleId: res.data.minRoleId, + initData: { + text: app.globalData.projectName, + id: app.globalData.projectId + }, + standard: standard, + standardName: this.data.typeList[standard - 1].name, + standardActive: this.data.typeList[standard - 1].id, + listData: [], + }) + this.getListData(app.globalData.projectId, res.data.deptId, res.data.minRoleId); + } + }) + }, + + /** + * 切换页签 + * @param {*} e + */ + standardActive: function (e) { + let { + id, + name + } = e.currentTarget.dataset.set + this.setData({ + standard: id, + standardName: name, + standardActive: id + }) + app.globalData.standard = id; + this.onLoad() + }, + + /** + * 查询项目举牌验收数据 + */ + getListData(projectId, deptId, minRoleId) { var that = this; - //判断角色， - if(minRoleId==2||minRoleId==3||minRoleId==4){ - deptId=0; + //判断角色， + if (minRoleId == 2 || minRoleId == 3 || minRoleId == 4) { + deptId = 0; } let param = { - "projectId": projectId, - "deptId":deptId, + "standardType": this.data.standard, + "projectId": projectId, + "deptId": deptId, } + this.queryCountByType(param); wx.request({ url: app.globalData.reqUrl + '/wechat/projectStandard/list', - data:param, + data: param, method: "get", success: function (res) { that.setData({ - listData:res.data.data + listData: res.data.data }) } }); - }, + }, - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady() { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow() { - - }, - - returnToPage: function () { - /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/ - wx.redirectTo({ - url: '../../../pages/gengduogongneng/gengduogongneng', + /** + * 根据条件查询类型数量统计 + */ + queryCountByType: function (data) { + queryCountByType(data).then(res => { + let typeList = this.data.typeList; + typeList.forEach(type => { + res.data.forEach(item => { + if (type.id == item.standardType) { + if (item.total) { + type.count = item.total; + } + } + }) + }); + this.setData({ + typeList }) - }, + }); + }, - //项目切换 返回值 - onProjectSelect(e){ + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + returnToPage: function () { + /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/ + wx.redirectTo({ + url: '../../../pages/gengduogongneng/gengduogongneng', + }) + }, + + //项目切换 返回值 + onProjectSelect(e) { let projectId = e.detail.id; let projectName = e.detail.text; app.globalData.projectId = projectId; - app.globalData.projectName = projectName; + app.globalData.projectName = projectName; this.onLoad(); }, - /** - * 生命周期函数--监听页面隐藏 - */ - onHide() { + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { - }, + }, - /** - * 生命周期函数--监听页面卸载 - */ - onUnload() { + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { - }, + }, - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh() { + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { - }, + }, - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom() { + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { - }, + }, - /** - * 用户点击右上角分享 - */ - onShareAppMessage() { + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { - } + } }) \ No newline at end of file diff --git a/miniprogram/pageage/project_standard/list/index.json b/miniprogram/pageage/project_standard/list/index.json index c38e268..11580d5 100644 --- a/miniprogram/pageage/project_standard/list/index.json +++ b/miniprogram/pageage/project_standard/list/index.json @@ -1,7 +1,8 @@ { "usingComponents": { "van-overlay": "@vant/weapp/overlay/index" , - "van-popup": "@vant/weapp/popup/index" + "van-popup": "@vant/weapp/popup/index", + "van-divider":"@vant/weapp/divider/index" }, "navigationStyle":"custom" } \ No newline at end of file diff --git a/miniprogram/pageage/project_standard/list/index.wxml b/miniprogram/pageage/project_standard/list/index.wxml index 9313471..ce56779 100644 --- a/miniprogram/pageage/project_standard/list/index.wxml +++ b/miniprogram/pageage/project_standard/list/index.wxml @@ -12,6 +12,20 @@ + + + + + {{item.count}} + + {{item.name}} + + + + + + {{standardName}} + @@ -19,24 +33,17 @@ {{index < 9 ?'0'+(index+1):(index+1)}} - {{item.standardTypeName}} + {{item.standardDesc}} - - - - - - {{item.standardDesc}} - - + - + 暂无数据 @@ -44,7 +51,7 @@ - + 新增 diff --git a/miniprogram/pageage/project_standard/list/index.wxss b/miniprogram/pageage/project_standard/list/index.wxss index f370194..e393717 100644 --- a/miniprogram/pageage/project_standard/list/index.wxss +++ b/miniprogram/pageage/project_standard/list/index.wxss @@ -1 +1,36 @@ /* pageage/project_checking_list/project_checking_list.wxss */ +.inspect_list_info_imgs{ + width: 100%; + height: 250rpx; +} +.gd_max{ + padding:10rpx 50rpx 0; + } + .gd_min{ + padding: 30rpx 0; + text-align: center; + } + .gd_min image{ + width: 150rpx; + height: 150rpx; + } + .gd_min view{ + padding: 10rpx; + color: #89a4eb; + } + .van-divider--left{ + padding: 0 35rpx !important; + color: #866cff !important; + border-color: #89a4eb !important; + } + .gd_img{ + width: 100rpx !important; + height: 100rpx !important; + } + .gd_min_active image{ + background: #513abdb0; + border-radius: 80rpx; + } + .gd_min_active view{ + color: #866cff; + } \ No newline at end of file diff --git a/miniprogram/pageage/project_train/add/index.wxml b/miniprogram/pageage/project_train/add/index.wxml index b8b0258..7a2fb16 100644 --- a/miniprogram/pageage/project_train/add/index.wxml +++ b/miniprogram/pageage/project_train/add/index.wxml @@ -85,7 +85,7 @@ - + 数据加载中！请稍后... diff --git a/miniprogram/pageage/project_train/list/index.wxml b/miniprogram/pageage/project_train/list/index.wxml index 7bbc491..798201e 100644 --- a/miniprogram/pageage/project_train/list/index.wxml +++ b/miniprogram/pageage/project_train/list/index.wxml @@ -41,7 +41,7 @@ - + 暂无数据 @@ -49,7 +49,7 @@ - + 新增 diff --git a/miniprogram/pageage/safetyManagement/addSafetyInspect/index.wxml b/miniprogram/pageage/safetyManagement/addSafetyInspect/index.wxml index 9bc7186..09c9c15 100644 --- a/miniprogram/pageage/safetyManagement/addSafetyInspect/index.wxml +++ b/miniprogram/pageage/safetyManagement/addSafetyInspect/index.wxml @@ -79,7 +79,7 @@ - + 数据加载中！请稍后... diff --git a/miniprogram/pageage/safetyManagement/problemRectificationGR/index.wxml b/miniprogram/pageage/safetyManagement/problemRectificationGR/index.wxml index 54b0c3f..7bd6498 100644 --- a/miniprogram/pageage/safetyManagement/problemRectificationGR/index.wxml +++ b/miniprogram/pageage/safetyManagement/problemRectificationGR/index.wxml @@ -116,7 +116,7 @@ - + 数据加载中！请稍后... diff --git a/miniprogram/pages/components/file-uploader-all/index.js b/miniprogram/pages/components/file-uploader-all/index.js index bda7132..4b84d0e 100644 --- a/miniprogram/pages/components/file-uploader-all/index.js +++ b/miniprogram/pages/components/file-uploader-all/index.js @@ -5,6 +5,10 @@ Component({ * 组件的属性列表 */ properties: { + fileType:{ + type:String, + value:"all", + }, fileUrlArray:{ type:Array }, @@ -63,6 +67,7 @@ Component({ } var that = this; wx.chooseMessageFile({ + type:that.data.fileType, count: that.data.quantity - that.data.uploaderNum, // 默认9 success: function(res) { // 返回选定照片的本地文件路径列表，tempFilePath可以作为img标签的src属性显示图片 diff --git a/miniprogram/pages/components/voucher-date/index.wxml b/miniprogram/pages/components/voucher-date/index.wxml index 5f5d7a5..6961baf 100644 --- a/miniprogram/pages/components/voucher-date/index.wxml +++ b/miniprogram/pages/components/voucher-date/index.wxml @@ -5,7 +5,7 @@ - + diff --git a/miniprogram/pages/components/voucher-date/index.wxss b/miniprogram/pages/components/voucher-date/index.wxss index 0a6d8ec..90cfa54 100644 --- a/miniprogram/pages/components/voucher-date/index.wxss +++ b/miniprogram/pages/components/voucher-date/index.wxss @@ -65,4 +65,3 @@ - diff --git a/miniprogram/pages/components/voucher-datetime/index.wxml b/miniprogram/pages/components/voucher-datetime/index.wxml index 50fee91..f0c0c0e 100644 --- a/miniprogram/pages/components/voucher-datetime/index.wxml +++ b/miniprogram/pages/components/voucher-datetime/index.wxml @@ -5,7 +5,7 @@ - + diff --git a/miniprogram/pages/gengduogongneng/gengduogongneng.wxml b/miniprogram/pages/gengduogongneng/gengduogongneng.wxml index ba0f552..19294aa 100644 --- a/miniprogram/pages/gengduogongneng/gengduogongneng.wxml +++ b/miniprogram/pages/gengduogongneng/gengduogongneng.wxml @@ -26,7 +26,7 @@ {{deptName}} - + diff --git a/miniprogram/pages/login/login.js b/miniprogram/pages/login/login.js index 8b8c17f..b6ab980 100644 --- a/miniprogram/pages/login/login.js +++ b/miniprogram/pages/login/login.js @@ -1,4 +1,12 @@ -// pages/login/login.js +import { + getToken, + setToken +} from '../../utils/auth' +import { + login, + getCodeImg, +} from '../../api/login' + const app = getApp(); Page({ @@ -6,89 +14,104 @@ Page({ * 页面的初始数据 */ data: { - username:'', - password:'', - show:false, - openId:'', + username: '', + password: '', + show: false, + openId: '', + code: '', + uuid: '', + usercode: '', }, //获取填写的账号信息 - name:function(even){ + name: function (even) { this.setData({ - username:even.detail.value + username: even.detail.value }) }, //获取填写的密码信息 - psw:function(even){ + pass: function (even) { this.setData({ - password:even.detail.value + password: even.detail.value + }) + }, + + //获取填写的密码信息 + code: function (even) { + this.setData({ + usercode: even.detail.value }) }, onClickShow() { - this.setData({ show: true }); + this.setData({ + show: true + }); }, onClickHide() { - this.setData({ show: false }); + this.setData({ + show: false + }); }, onLoad: function (option) { - this.getOPenId(); + this.loadCodeImage(); + this.getOPenId(); }, /** * 获取用户openid */ - getOPenId:function () { + getOPenId: function () { wx.login({ - success :res=>{ - //启动蒙版 - let oid = wx.getStorageSync("openId"); - if(!oid){ - this.onClickShow(); - wx.request({ - url: app.globalData.reqUrl+'/wechat/getOpenId', - data:{ - "code": res.code, - "appId": app.globalData.appId, - }, - success:(res)=>{ - res = res.data; - this.onClickHide(); - this.setData({ - openId:res.data.openid, - }) - wx.setStorageSync('openId', res.data.openid) - //验证登录用户 - this.selectUserInfoByOpenId(res.data.openid); - } + success: res => { + //启动蒙版 + let oid = wx.getStorageSync("openId"); + if (!oid) { + this.onClickShow(); + wx.request({ + url: app.globalData.reqUrl + '/wechat/getOpenId', + data: { + "code": res.code, + "appId": app.globalData.appId, + }, + success: (res) => { + res = res.data; + this.onClickHide(); + this.setData({ + openId: res.data.openid, + }) + wx.setStorageSync('openId', res.data.openid) + //验证登录用户 + this.selectUserInfoByOpenId(res.data.openid); + } }) - }else{ - //验证登录用户 - this.selectUserInfoByOpenId(oid); - } + } else { + //验证登录用户 + this.selectUserInfoByOpenId(oid); + } } }) -}, - + }, + //验证用户是否是第一次登陆 - selectUserInfoByOpenId:function(openId){ + selectUserInfoByOpenId: function (openId) { //跳转页面 - let isRelogin=wx.getStorageSync("isReload"); - if(isRelogin){ + let isRelogin = wx.getStorageSync("isReload"); + if (isRelogin) { return; } this.onClickShow(); var that = this; wx.request({ - url: app.globalData.reqUrl+'/wechat/openIdLogin', - data:{ - "openId":openId + url: app.globalData.reqUrl + '/wechat/openIdLogin', + data: { + "openId": openId }, - method:"POST", - success:function(res){ - if(res.data.code == '200'){ + method: "POST", + success: function (res) { + if (res.data.code == '200') { //把数据存到缓存中 wx.setStorage({ key: 'userinfo', @@ -101,48 +124,68 @@ Page({ that.onClickHide(); let rd = res.data.data; //只有一个项目时直接跳转详情页 - if(rd.projectInfo!=null || rd.projectInfo!=undefined){ + if (rd.projectInfo != null || rd.projectInfo != undefined) { //赋值到公共参数 app.globalData.projectId = rd.projectInfo.projectId; app.globalData.projectName = rd.projectInfo.projectName; app.globalData.projectInfoList = []; app.globalData.projectInfoList.push(rd.projectInfo); app.globalData.value1 = rd.projectInfo.shengName; - app.globalData.value2 = rd.projectInfo.shiName+'/'+rd.projectInfo.quName; + app.globalData.value2 = rd.projectInfo.shiName + '/' + rd.projectInfo.quName; app.globalData.value3 = rd.projectInfo.logCompanyName; wx.redirectTo({ url: '../xiangmugaikuang/xiangmugaikuang', }) - }else{ + } else { //跳转页面 wx.redirectTo({ url: '../map/map', }) } - }else{ + } else { that.onClickHide(); } } }) - }, - + }, + + /** + * 获取验证码 + */ + loadCodeImage: function () { + getCodeImg().then(res => { + let captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled + if (captchaEnabled) { + this.setData({ + code: 'data:image/gif;base64,' + res.img, + uuid: res.uuid + }) + } + }); + }, + //登录 - userLogin:function(openid){ + userLogin: function (openid) { var that = this; var username = that.data.username; var password = that.data.password; - if(username == ""){ + var usercode = this.data.usercode; + if (username == "") { app.toast("账号不能为空"); return; } - if(password == ""){ + if (password == "") { app.toast("密码不能为空"); return; } + if (usercode == "") { + app.toast("验证码不能为空"); + return; + } let openId = that.data.openId - if(openId==""){ + if (openId == "") { openId = wx.getStorageSync("openId"); - if(openId==""){ + if (openId == "") { app.toast("获取微信授权失败，请卸载后重新进入应用！！"); return; } @@ -151,50 +194,50 @@ Page({ that.onClickShow(); //发送请求 wx.request({ - url: app.globalData.reqUrl+'/wechat/login', - data:{ - "username":username, - "password":password, - "openId":openId, + url: app.globalData.reqUrl + '/wechat/login', + data: { + "username": username, + "password": password, + "openId": openId, + "code": usercode, + "uuid": this.data.uuid, }, - method:"POST", - success(res){ - //关闭蒙版 - that.onClickHide(); - if(res.data.code=='200'){ - //把数据存到缓存中 - wx.setStorage({ - key: 'userinfo', - data: res.data.data.userinfo - }); - // wx.setStorageSync({ - // key: 'token', - // data: res.data.token - // }); - wx.setStorageSync('isReload', ""); - let rd = res.data.data; - //只有一个项目时直接跳转详情页 - if(rd.projectInfo!=null || rd.projectInfo!=undefined){ - //赋值到公共参数 - app.globalData.projectId = rd.projectInfo.projectId; - app.globalData.projectName = rd.projectInfo.projectName; - app.globalData.projectInfoList = []; - app.globalData.projectInfoList.push(rd.projectInfo); - app.globalData.value1 = rd.projectInfo.shengName; - app.globalData.value2 = rd.projectInfo.shiName+'/'+rd.projectInfo.quName; - app.globalData.value3 = rd.projectInfo.logCompanyName; - wx.redirectTo({ - url: '../xiangmugaikuang/xiangmugaikuang', - }) - }else{ - //跳转页面 - wx.redirectTo({ - url: '../map/map', - }) - } - }else{ - app.toast(res.data.msg); + method: "POST", + success(res) { + //关闭蒙版 + that.onClickHide(); + if (res.data.code == '200') { + //把数据存到缓存中 + wx.setStorage({ + key: 'userinfo', + data: res.data.data.userinfo + }); + setToken(res.data.token); + let rd = res.data.data; + wx.setStorageSync('isReload', ""); + //只有一个项目时直接跳转详情页 + if (rd.projectInfo != null || rd.projectInfo != undefined) { + //赋值到公共参数 + app.globalData.projectId = rd.projectInfo.projectId; + app.globalData.projectName = rd.projectInfo.projectName; + app.globalData.projectInfoList = []; + app.globalData.projectInfoList.push(rd.projectInfo); + app.globalData.value1 = rd.projectInfo.shengName; + app.globalData.value2 = rd.projectInfo.shiName + '/' + rd.projectInfo.quName; + app.globalData.value3 = rd.projectInfo.logCompanyName; + wx.redirectTo({ + url: '../xiangmugaikuang/xiangmugaikuang', + }) + } else { + //跳转页面 + wx.redirectTo({ + url: '../map/map', + }) } + } else { + that.loadCodeImage(); + app.toast(res.data.msg); + } } }) }, diff --git a/miniprogram/pages/login/login.wxml b/miniprogram/pages/login/login.wxml index c4b6255..f8f0656 100644 --- a/miniprogram/pages/login/login.wxml +++ b/miniprogram/pages/login/login.wxml @@ -2,60 +2,39 @@ - diff --git a/miniprogram/pages/project_approve/index.wxml b/miniprogram/pages/project_approve/index.wxml index e827220..79cdddd 100644 --- a/miniprogram/pages/project_approve/index.wxml +++ b/miniprogram/pages/project_approve/index.wxml @@ -43,7 +43,7 @@ - + 暂无数据 diff --git a/miniprogram/pages/project_flowable/approveLeaveTask/index.wxml b/miniprogram/pages/project_flowable/approveLeaveTask/index.wxml index 03c9c85..00fd2f6 100644 --- a/miniprogram/pages/project_flowable/approveLeaveTask/index.wxml +++ b/miniprogram/pages/project_flowable/approveLeaveTask/index.wxml @@ -113,7 +113,7 @@ - + 数据加载中！请稍后... diff --git a/miniprogram/pages/project_flowable/approveTask/index.js b/miniprogram/pages/project_flowable/approveTask/index.js index f11044a..1ab2128 100644 --- a/miniprogram/pages/project_flowable/approveTask/index.js +++ b/miniprogram/pages/project_flowable/approveTask/index.js @@ -1,4 +1,4 @@ -// pageage/safetyManagement/addSafetyInspect/index.js +import config from '../../../config' const app = getApp() Page({ @@ -20,8 +20,8 @@ Page({ activeName:"", flowNodeList:[], flowNodes:[], - fileNames:[], - fileUrls:[], + imageList:[], + filesData:[], comment:"", taskId:"", procInsId:"", @@ -31,6 +31,8 @@ Page({ taskName:"", passState:true, backName:"", + imageType:["png","jpg","jpeg"], + fileType:["pdf"], }, /** @@ -177,19 +179,23 @@ Page({ that.setData({ infoData:res.data }) - let fileNames = []; - let fileUrls = []; + let filesData = []; + let imageList = []; //判断附件 if(res.data.files){ res.data.files.split(',').forEach(element => { - let it = element.split('/'); - fileNames.push(it[it.length-1]); - fileUrls.push(element); + let ft = element.split('.'); + if(that.data.imageType.indexOf(ft[ft.length-1].toLowerCase())>-1){ + imageList.push({minPath:config.baseUrl+element,path:element}); + }else{ + let it = element.split('/'); + filesData.push({name:it[it.length-1],path:element}); + } }); } that.setData({ - fileNames, - fileUrls + filesData, + imageList }) }else{ app.toast(res.msg); @@ -521,12 +527,24 @@ Page({ }) }, + //展示图片详细 + showImg:function(e){ + let {path} = e.currentTarget.dataset.set + wx.previewImage({ + urls: this.data.imageList, + current: path + }) + }, + + /** + * 下载并打开文档 + * @param {*} e + */ downFile:function(e){ - let idx = e.currentTarget.dataset['index']; - let that = this; + let {path} = e.currentTarget.dataset.set wx.downloadFile({ // 示例 url，并非真实存在 - url: app.globalData.uploadUrl+'/common/download/resource?resource='+that.data.fileUrls[idx], + url: app.globalData.uploadUrl+'/common/download/resource?resource='+path, success: function (res) { const filePath = res.tempFilePath wx.openDocument({ diff --git a/miniprogram/pages/project_flowable/approveTask/index.wxml b/miniprogram/pages/project_flowable/approveTask/index.wxml index ae54f26..4651115 100644 --- a/miniprogram/pages/project_flowable/approveTask/index.wxml +++ b/miniprogram/pages/project_flowable/approveTask/index.wxml @@ -1,162 +1,138 @@ - - - - - - - 审批流程申请 - - - - - - - - {{projectName}} - - - - - - {{item.name}} - - - - - - - - - {{(flowRecordList.length-index) < 9 ?'0'+(flowRecordList.length-index):(flowRecordList.length-index)}} - {{item.taskName}}{{item.commentResult}} - {{item.commentResult}} - {{item.commentResult}} - - - - - 办理用户：{{item.assigneeName}} - 办理单位：{{item.deptName}} - 候选办理：{{item.candidate}} - 驳回节点：{{item.deleteReason}} - 接收时间：{{item.startTime}} - 处理时间：{{item.endTime}} - 处理耗时：{{item.duration}} - 处理意见：{{item.message}} - - - - - - - - - - 发起单位 - {{deptName}} - - - - - 发起用户 - {{nickName}} - - - - - 审批事项 - {{procDefName}} - - - - - 审批内容 - - - {{item}} + + + + + + + 审批流程申请 + - - - 申请说明 - {{infoData.remark}} - - - - 审批意见 - -