diff --git a/.gitignore b/.gitignore index d4631ae..bf93573 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,2 @@ -/.hbuilderx/ /.idea/ -/node_modules/ -/unpackage/ -/package-lock.json -/integrated_traffic_uniapp.iml +/.hbuilderx/ diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..12f99ca --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +QA-UniApp \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..ebe0173 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..df6e75c --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/common/tool.js b/common/tool.js index a635c08..bdea8aa 100644 --- a/common/tool.js +++ b/common/tool.js @@ -1,8 +1,6 @@ - -// export var basePath = "http://192.168.0.16:7082/"; -// export var basePath = "http://192.168.0.30:7082/"; -// export var basePath = "http://192.168.20.240:8412/integrated_traffic/"; -export var basePath = "http://39.101.166.211:8073/integrated_traffic/"; +// export var basePath = "http://192.168.0.42:8099/"; +export var basePath = "http://192.168.0.49:8099/"; +// export var basePath = "https://gateway.qhdsafety.com/"; export const baseImgPath = "https://file.zcloudchina.com/YTHFile"; export const adminPath = "http://192.168.0.18:8085"; export const projectManagerUrl = 'https://pm.qhdsafety.com/zy-projectManage/'; @@ -14,7 +12,7 @@ export var corpinfoId = ''; // export var loginUserId = ''; export var loginUser = ''; export function loginSession() { - if ('' == loginUserId || undefined == loginUserId || + if ('' == corpinfoId || undefined == corpinfoId || '' == loginUserId || undefined == loginUserId || '' == loginUser || undefined == loginUser) { uni.navigateTo({ url: '/pages/login/home', @@ -112,76 +110,6 @@ function noMultipleClicks(methods, e) { console.log("请稍后点击") } } - -/** - * 验证身份证号码 - */ -export function validateIdCard(value) { - return /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[0-2])(([0-2][1-9])|10|20|30|31)\d{3}(\d|X|x)$/.test( - value - ) -} - -/** - * 验证手机格式 - */ -export function validateMobile(value) { - return /^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[189]))\d{8}$/.test(value) -} - - -//获取数据字典数据 -export async function getLevel(dataParams) { - const list = await sendPost(dataParams, '/dictionaries/getDictList') - return list -} -//获取数据字典数据（3级字典） -export async function getLevelCustom(dataParams) { - const list = await sendPost(dataParams, '/dictionaries/getLevelCustom') - return list -} - -export async function listCorpAll(dataParams) { - const list = await sendPost(dataParams, '/app/corpinfo/listAll') - return list -} - -/** - * 获取字典 - */ -async function sendPost(dataParams, url) { - let resData = await uni.request({ - method: 'POST', - dataType: 'json', - header: { - 'Content-type': 'application/x-www-form-urlencoded' - }, - url: basePath + url, - data: dataParams - }) - return resData[1].data.list -} - -export async function checkIdCard(dataParams) { - const data = await getData(dataParams, '/app/user/hasUserIdCard') - return data -} - -/** - * 获取字典 - */ -async function getData(dataParams, url) { - let resData = await uni.request({ - method: 'POST', - dataType: 'json', - header: { - 'Content-type': 'application/x-www-form-urlencoded' - }, - url: basePath + url, - data: dataParams - }) - return resData[1].data -} //导出 export default { noMultipleClicks, //禁止多次点击 diff --git a/package-lock.json b/package-lock.json index 78d8b2a..2e812fd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,162 +1,117 @@ { - "name": "integrated_traffic_uniapp", - "lockfileVersion": 3, "requires": true, - "packages": { - "": { - "dependencies": { - "@dcloudio/uni-ui": "^1.5.0", - "moment": "^2.29.4", - "vue-aliplayer": "^1.0.0" - }, - "devDependencies": { - "@types/html5plus": "^1.0.2", - "@types/uni-app": "^1.4.4" - } - }, - "node_modules/@babel/parser": { + "lockfileVersion": 1, + "dependencies": { + "@babel/parser": { "version": "7.23.6", "resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.23.6.tgz", "integrity": "sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==", - "dev": true, - "bin": { - "parser": "bin/babel-parser.js" - }, - "engines": { - "node": ">=6.0.0" - } + "dev": true }, - "node_modules/@dcloudio/uni-ui": { + "@dcloudio/uni-ui": { "version": "1.5.0", "resolved": "https://registry.npmmirror.com/@dcloudio/uni-ui/-/uni-ui-1.5.0.tgz", "integrity": "sha512-E7D37VbRZeh1E2yzrIie8psBckIrErdkUbUA751rlG8zdioGovW3zOuUsKgY+Gh7csMvi6XMEoSacvboe8o4Gw==" }, - "node_modules/@types/html5plus": { + "@types/html5plus": { "version": "1.0.5", "resolved": "https://registry.npmmirror.com/@types/html5plus/-/html5plus-1.0.5.tgz", "integrity": "sha512-qt5z+3WYkARL/rWnJRcB2fCDOZLKa/hEOkse9sjA6FFkXZtKb+OPxKqo8bDgix4+ufahOff0adarVfaUaK1mfw==", "dev": true }, - "node_modules/@types/uni-app": { + "@types/uni-app": { "version": "1.4.8", "resolved": "https://registry.npmmirror.com/@types/uni-app/-/uni-app-1.4.8.tgz", "integrity": "sha512-plxwi9MvGDrekCsDKuNlCN3ZXIv9zkqHsKZJOsc8FQqLSHveDBOm11qOaswe4QyNWVHpvwZMViii/Ni1/d40LA==", "dev": true, - "dependencies": { + "requires": { "vue": "^2.6.8" } }, - "node_modules/@vue/compiler-sfc": { + "@vue/compiler-sfc": { "version": "2.7.16", "resolved": "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-2.7.16.tgz", "integrity": "sha512-KWhJ9k5nXuNtygPU7+t1rX6baZeqOYLEforUPjgNDBnLicfHCoi48H87Q8XyLZOrNNsmhuwKqtpDQWjEFe6Ekg==", "dev": true, - "dependencies": { + "requires": { "@babel/parser": "^7.23.5", "postcss": "^8.4.14", + "prettier": "^1.18.2 || ^2.0.0", "source-map": "^0.6.1" - }, - "optionalDependencies": { - "prettier": "^1.18.2 || ^2.0.0" } }, - "node_modules/csstype": { + "csstype": { "version": "3.1.3", "resolved": "https://registry.npmmirror.com/csstype/-/csstype-3.1.3.tgz", "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==", "dev": true }, - "node_modules/moment": { + "moment": { "version": "2.30.1", "resolved": "https://registry.npmmirror.com/moment/-/moment-2.30.1.tgz", - "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==", - "engines": { - "node": "*" - } + "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==" }, - "node_modules/nanoid": { + "nanoid": { "version": "3.3.7", "resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.7.tgz", "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", - "dev": true, - "bin": { - "nanoid": "bin/nanoid.cjs" - }, - "engines": { - "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" - } + "dev": true }, - "node_modules/picocolors": { + "picocolors": { "version": "1.0.0", "resolved": "https://registry.npmmirror.com/picocolors/-/picocolors-1.0.0.tgz", "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", "dev": true }, - "node_modules/postcss": { + "postcss": { "version": "8.4.33", "resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.4.33.tgz", "integrity": "sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==", "dev": true, - "dependencies": { + "requires": { "nanoid": "^3.3.7", "picocolors": "^1.0.0", "source-map-js": "^1.0.2" - }, - "engines": { - "node": "^10 || ^12 || >=14" } }, - "node_modules/prettier": { + "prettier": { "version": "2.8.8", "resolved": "https://registry.npmmirror.com/prettier/-/prettier-2.8.8.tgz", "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", "dev": true, - "optional": true, - "bin": { - "prettier": "bin-prettier.js" - }, - "engines": { - "node": ">=10.13.0" - } + "optional": true }, - "node_modules/source-map": { + "source-map": { "version": "0.6.1", "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } + "dev": true }, - "node_modules/source-map-js": { + "source-map-js": { "version": "1.0.2", "resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.0.2.tgz", "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } + "dev": true }, - "node_modules/vue": { + "vue": { "version": "2.7.16", "resolved": "https://registry.npmmirror.com/vue/-/vue-2.7.16.tgz", "integrity": "sha512-4gCtFXaAA3zYZdTp5s4Hl2sozuySsgz4jy1EnpBHNfpMa9dK1ZCG7viqBPCwXtmgc8nHqUsAu3G4gtmXkkY3Sw==", - "deprecated": "Vue 2 has reached EOL and is no longer actively maintained. See https://v2.vuejs.org/eol/ for more details.", "dev": true, - "dependencies": { + "requires": { "@vue/compiler-sfc": "2.7.16", "csstype": "^3.1.0" } }, - "node_modules/vue-aliplayer": { + "vue-aliplayer": { "version": "1.0.0", "resolved": "https://registry.npmmirror.com/vue-aliplayer/-/vue-aliplayer-1.0.0.tgz", "integrity": "sha512-z29s38hlNJDckGSPtuTsYwMdjj70SsvJ5VzbEoBoV2BTrg3ucvodM2CW7BWstrG9WaQqz4F8nVGLSON05RrmJw==", - "dependencies": { + "requires": { "vue-github-badge": "^1.0.0" } }, - "node_modules/vue-github-badge": { + "vue-github-badge": { "version": "1.0.1", "resolved": "https://registry.npmmirror.com/vue-github-badge/-/vue-github-badge-1.0.1.tgz", "integrity": "sha512-8X+FUWapnnDfs6cRUg3mCfHUf2r5arUfCSRdvbIn860oj9us3Rz3VOtioUgmfzh6EhaaYTs0Oh78EzJ+Z6uqAA==" diff --git a/pages.json b/pages.json index bea55c6..7564802 100644 --- a/pages.json +++ b/pages.json @@ -27,66 +27,10 @@ "path": "pages/login/forget/forget-reset", "style": {} }, - { - "path": "pages/login/register/index", - "style": {} - }, - { - "path": "pages/login/register/account", - "style": {} - }, - { - "path": "pages/login/register/baseInfo", - "style": {} - }, - { - "path": "pages/login/register/certificate", - "style": {} - }, - { - "path": "pages/login/register/apply", - "style": {} - }, { "path": "pages/basics/basic-info/basic-info", "style": {} }, - { - "path": "pages/basics/basic-info/home", - "style": {} - }, - { - "path": "pages/basics/basic-info/user-info", - "style": {} - }, - { - "path": "pages/basics/basic-info/components/account", - "style": {} - }, - { - "path": "pages/basics/basic-info/components/baseInfo", - "style": {} - }, - { - "path": "pages/basics/basic-info/components/certificate", - "style": {} - }, - { - "path": "pages/basics/basic-info/components/apply", - "style": {} - }, - { - "path": "pages/basics/basic-info/resignation", - "style": {} - }, - { - "path": "pages/basics/basic-info/entry", - "style": {} - }, - { - "path": "pages/basics/basic-info/confirm", - "style": {} - }, { "path": "pages/basics/home", "style": { @@ -104,30 +48,6 @@ "path": "pages/basics/documentation/documentation", "style": {} }, - { - "path": "pages/application/safetymeeting/home", - "style": {} - }, - { - "path": "pages/application/driving-inspections/dirving-inspections-list", - "style": {} - }, - { - "path": "pages/application/driving-inspections/driving-item-list", - "style": {} - }, - { - "path": "pages/application/driving-inspections/driving-item-detail", - "style": {} - }, - { - "path": "pages/application/driving-inspections/driving-item-check-list", - "style": {} - }, - { - "path": "pages/application/safetymeeting/safetymeeting-detail", - "style": {} - }, { "path": "pages/basics/risk-distribution/risk-distribution", "style": {} @@ -163,14 +83,6 @@ "path": "pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-detail", "style": {} }, - { - "path": "pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-risk-detail", - "style": {} - }, - { - "path": "pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-standard-detail", - "style": {} - }, { "path": "pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue", "style": {} @@ -179,14 +91,6 @@ "path": "pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue-detail", "style": {} }, - { - "path": "pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue-risk-detail", - "style": {} - }, - { - "path": "pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue-standard-detail", - "style": {} - }, { "path": "pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record", "style": {} @@ -195,14 +99,6 @@ "path": "pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-detail", "style": {} }, - { - "path": "pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-risk-detail", - "style": {} - }, - { - "path": "pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-standard-detail", - "style": {} - }, { "path": "pages/application/hidden-danger-management/hidden-danger-review/hidden-danger-review", "style": {} @@ -235,14 +131,6 @@ "path": "pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-detail", "style": {} }, - { - "path": "pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-risk-detail", - "style": {} - }, - { - "path": "pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-standard-detail", - "style": {} - }, { "path": "pages/application/hidden-danger-management/hidden-danger-unqualified/hidden-danger-unqualified", "style": {} @@ -251,10 +139,6 @@ "path": "pages/application/hidden-danger-management/hidden-danger-unqualified/hidden-danger-unqualified-detail", "style": {} }, - { - "path": "pages/application/hidden-trouble-investigation/hidden-trouble-app/hidden-trouble-uncheck", - "style": {} - }, { "path": "pages/application/hidden-trouble-investigation/hidden-trouble-app/hidden-trouble-app", "style": {} @@ -316,10 +200,6 @@ "path": "pages/news/news-list-detail", "style": {} }, - { - "path": "pages/news/notice-list-detail", - "style": {} - }, { "path": "pages/application/other-apps/videos/videos", "style": {} @@ -392,48 +272,6 @@ "path": "pages/application/check-record/imgs_details", "style": {} }, - // 隐患排查清单 Begin - { - "path": "pages/application/hidden-danger-check-standard/custom/list", - "style": {} - }, - { - "path": "pages/application/hidden-danger-check-standard/custom/list-item", - "style": {} - }, - { - "path": "pages/application/hidden-danger-check-standard/custom/list-item-check-list", - "style": {} - }, - { - "path": "pages/application/hidden-danger-check-standard/custom/list-item-check-hidden-form", - "style": {} - }, - { - "path": "pages/application/hidden-danger-check-standard/custom/list-item-check-imgs", - "style": {} - }, - { - "path": "pages/application/hidden-danger-check-standard/custom/list-item-check-next", - "style": {} - }, - { - "path": "pages/application/hidden-danger-check-standard/custom/other-hidden-add", - "style": {} - }, - { - "path": "pages/application/hidden-danger-check-standard/record/custom-list", - "style": {} - }, - { - "path": "pages/application/hidden-danger-check-standard/record/record-list", - "style": {} - }, - { - "path": "pages/application/hidden-danger-check-standard/record/record-info", - "style": {} - }, - // 隐患排查清单 End { "path": "pages/my/offduty/index", "style": {} @@ -490,141 +328,456 @@ "path": "pages/application/equipment-overhaul/equipment-overhaul-approve/equipment-overhaul-approve-detail", "style": {} }, - - { - "path": "pages/application/confinedspace/home", + "path": "pages/application/blind-board/home", "style": {} }, { - "path": "pages/application/confinedspace/confinedspace-list/index", + "path": "pages/application/blind-board/blind-board-apply/blind-board-apply-list", "style": {} }, { - "path": "pages/application/confinedspace/confinedspace-apply/confinedspace-apply-detail", + "path": "pages/application/blind-board/blind-board-apply/blind-board-apply-detail", "style": {} }, { - "path": "pages/application/confinedspace/confinedspace-measures/confinedspace-measures-detail", + "path": "pages/application/blind-board/blind-board-construction/blind-board-construction-list", "style": {} }, { - "path": "pages/application/confinedspace/confinedspace-measures-confirm/confinedspace-measures-confirm-detail", + "path": "pages/application/blind-board/blind-board-construction/blind-board-construction-detail", + "style": {} + }, + { + "path": "pages/application/blind-board/blind-board-construction/blind-board-construction-alldetail", + "style": {} + }, + { + "path": "pages/application/blind-board/blind-board-production/blind-board-production-list", "style": {} }, { - "path": "pages/application/confinedspace/confinedspace-guardian/confinedspace-guardian-detail", + "path": "pages/application/blind-board/blind-board-production/blind-board-production-detail", "style": {} }, { - "path": "pages/application/confinedspace/confinedspace-confess/confinedspace-confess-detail", + "path": "pages/application/blind-board/blind-board-guardian/blind-board-guardian-list", "style": {} }, { - "path": "pages/application/confinedspace/confinedspace-acceptconfess/confinedspace-acceptconfess-detail", + "path": "pages/application/blind-board/blind-board-guardian/blind-board-guardian-detail", "style": {} }, { - "path": "pages/application/confinedspace/confinedspace-confirm/confinedspace-confirm-detail", + "path": "pages/application/blind-board/blind-board-confess/blind-board-confess-list", "style": {} }, { - "path": "pages/application/confinedspace/confinedspace-workuser/confinedspace-workuser-detail", + "path": "pages/application/blind-board/blind-board-confess/blind-board-confess-detail", "style": {} }, { - "path": "pages/application/confinedspace/confinedspace-leader/confinedspace-leader-detail", + "path": "pages/application/blind-board/blind-board-acceptconfess/blind-board-acceptconfess-list", "style": {} }, { - "path": "pages/application/confinedspace/confinedspace-startwork/confinedspace-startwork-detail", + "path": "pages/application/blind-board/blind-board-acceptconfess/blind-board-acceptconfess-detail", "style": {} }, { - "path": "pages/application/confinedspace/confinedspace-endwork/confinedspace-endwork-detail", + "path": "pages/application/blind-board/blind-board-safety/blind-board-safety-list", "style": {} }, { - "path": "pages/application/confinedspace/confinedspace-accept/confinedspace-accept-detail", + "path": "pages/application/blind-board/blind-board-safety/blind-board-safety-detail", "style": {} }, { - "path": "pages/application/confinedspace/confinedspace-gas/gas-list", + "path": "pages/application/blind-board/blind-board-leader/blind-board-leader-list", "style": {} }, { - "path": "pages/application/confinedspace/confinedspace-gas/gas-detail", + "path": "pages/application/blind-board/blind-board-leader/blind-board-leader-detail", + "style": {} + }, + { + "path": "pages/application/blind-board/blind-board-leader/blind-board-leader-alldetail", + "style": {} + }, + { + "path": "pages/application/blind-board/blind-board-accept/blind-board-accept-list", "style": {} }, { - "path": "pages/application/confinedspace/confinedspace-gas/gas-name", + "path": "pages/application/blind-board/blind-board-accept/blind-board-accept-detail", "style": {} }, - + { + "path": "pages/application/blind-board/blind-board-accept/blind-board-accept-alldetail", + "style": {} + }, { - "path": "pages/application/highwork/home", + "path": "pages/application/break-ground/home", "style": {} }, { - "path": "pages/application/highwork/highwork-list/index", + "path": "pages/application/break-ground/break-ground-apply/break-ground-apply-list", "style": {} }, { - "path": "pages/application/highwork/highwork-apply/highwork-apply-detail", + "path": "pages/application/break-ground/break-ground-apply/break-ground-apply-detail", "style": {} }, { - "path": "pages/application/highwork/highwork-measures/highwork-measures-detail", + "path": "pages/application/break-ground/break-ground-construction/break-ground-construction-list", "style": {} }, { - "path": "pages/application/highwork/highwork-measures-confirm/highwork-measures-confirm-detail", + "path": "pages/application/break-ground/break-ground-construction/break-ground-construction-detail", + "style": {} + }, + { + "path": "pages/application/break-ground/break-ground-construction/break-ground-construction-alldetail", + "style": {} + }, + { + "path": "pages/application/break-ground/break-ground-production/break-ground-production-list", "style": {} }, { - "path": "pages/application/highwork/highwork-guardian/highwork-guardian-detail", + "path": "pages/application/break-ground/break-ground-production/break-ground-production-detail", + "style": {} + }, + { + "path": "pages/application/break-ground/break-ground-production/break-ground-production-alldetail", + "style": {} + }, + { + "path": "pages/application/break-ground/break-ground-safety/break-ground-safety-list", "style": {} }, { - "path": "pages/application/highwork/highwork-confess/highwork-confess-detail", + "path": "pages/application/break-ground/break-ground-safety/break-ground-safety-detail", + "style": {} + }, + { + "path": "pages/application/break-ground/break-ground-safety/break-ground-safety-alldetail", + "style": {} + }, + { + "path": "pages/application/break-ground/break-ground-leader/break-ground-leader-list", "style": {} }, { - "path": "pages/application/highwork/highwork-confirm/highwork-confirm-detail", + "path": "pages/application/break-ground/break-ground-leader/break-ground-leader-detail", + "style": {} + }, + { + "path": "pages/application/break-ground/break-ground-leader/break-ground-leader-alldetail", + "style": {} + }, + { + "path": "pages/application/break-ground/break-ground-accept/break-ground-accept-list", "style": {} }, { - "path": "pages/application/highwork/highwork-acceptconfess/highwork-acceptconfess-detail", + "path": "pages/application/break-ground/break-ground-accept/break-ground-accept-detail", + "style": {} + }, + { + "path": "pages/application/break-ground/break-ground-accept/break-ground-accept-alldetail", + "style": {} + }, + { + "path": "pages/application/break-ground/break-ground-guardian/break-ground-guardian-list", "style": {} }, { - "path": "pages/application/highwork/highwork-workuser/highwork-workuser-detail", - "style": {} - }, - - { - "path": "pages/application/highwork/highwork-leader/highwork-leader-detail", + "path": "pages/application/break-ground/break-ground-guardian/break-ground-guardian-detail", "style": {} }, { - "path": "pages/application/highwork/highwork-audit/highwork-audit-detail", - "style": {} - }, - - { - "path": "pages/application/highwork/highwork-approve/highwork-approve-detail", + "path": "pages/application/break-ground/break-ground-confess/break-ground-confess-list", "style": {} }, { - "path": "pages/application/highwork/highwork-startwork/highwork-startwork-detail", + "path": "pages/application/break-ground/break-ground-confess/break-ground-confess-detail", "style": {} }, { - "path": "pages/application/highwork/highwork-endwork/highwork-endwork-detail", + "path": "pages/application/break-ground/break-ground-acceptconfess/break-ground-acceptconfess-list", "style": {} }, { - "path": "pages/application/highwork/highwork-accept/highwork-accept-detail", + "path": "pages/application/break-ground/break-ground-acceptconfess/break-ground-acceptconfess-detail", + "style": {} + }, + { + "path": "pages/application/open-circuit/home", + "style": {} + }, + { + "path": "pages/application/open-circuit/open-circuit-apply/open-circuit-apply-list", + "style": {} + }, + { + "path": "pages/application/open-circuit/open-circuit-apply/open-circuit-apply-detail", + "style": {} + }, + { + "path": "pages/application/open-circuit/open-circuit-construction/open-circuit-construction-list", + "style": {} + }, + { + "path": "pages/application/open-circuit/open-circuit-construction/open-circuit-construction-detail", + "style": {} + }, + { + "path": "pages/application/open-circuit/open-circuit-production/open-circuit-production-list", + "style": {} + }, + { + "path": "pages/application/open-circuit/open-circuit-production/open-circuit-production-detail", + "style": {} + }, + { + "path": "pages/application/open-circuit/open-circuit-safety/open-circuit-safety-list", + "style": {} + }, + { + "path": "pages/application/open-circuit/open-circuit-safety/open-circuit-safety-detail", + "style": {} + }, + { + "path": "pages/application/open-circuit/open-circuit-leader/open-circuit-leader-list", + "style": {} + }, + { + "path": "pages/application/open-circuit/open-circuit-leader/open-circuit-leader-detail", + "style": {} + }, + { + "path": "pages/application/open-circuit/open-circuit-accept/open-circuit-accept-list", + "style": {} + }, + { + "path": "pages/application/open-circuit/open-circuit-accept/open-circuit-accept-detail", + "style": {} + }, + { + "path": "pages/application/high-work/home", + "style": {} + }, + { + "path": "pages/application/high-work/high-work-apply/high-work-apply-list", + "style": {} + }, + { + "path": "pages/application/high-work/high-work-apply/high-work-apply-detail", + "style": {} + }, + { + "path": "pages/application/high-work/high-work-confirm/high-work-confirm-list", + "style": {} + }, + { + "path": "pages/application/high-work/high-work-confirm/high-work-confirm-detail", + "style": {} + }, + { + "path": "pages/application/high-work/high-work-leader/high-work-leader-list", + "style": {} + }, + { + "path": "pages/application/high-work/high-work-leader/high-work-leader-detail", + "style": {} + }, + { + "path": "pages/application/high-work/high-work-confirm/high-work-confirm-alldetail", + "style": {} + }, + { + "path": "pages/application/high-work/high-work-leader/high-work-leader-list", + "style": {} + }, + { + "path": "pages/application/high-work/high-work-leader/high-work-leader-detail", + "style": {} + }, + { + "path": "pages/application/high-work/high-work-leader/high-work-leader-alldetail", + "style": {} + }, + { + "path": "pages/application/high-work/high-work-audit/high-work-audit-list", + "style": {} + }, + { + "path": "pages/application/high-work/high-work-audit/high-work-audit-detail", + "style": {} + }, + { + "path": "pages/application/high-work/high-work-audit/high-work-audit-alldetail", + "style": {} + }, + { + "path": "pages/application/high-work/high-work-approve/high-work-approve-list", + "style": {} + }, + { + "path": "pages/application/high-work/high-work-approve/high-work-approve-detail", + "style": {} + }, + { + "path": "pages/application/high-work/high-work-approve/high-work-approve-alldetail", + "style": {} + }, + { + "path": "pages/application/high-work/high-work-accept/high-work-accept-list", + "style": {} + }, + { + "path": "pages/application/high-work/high-work-accept/high-work-accept-detail", + "style": {} + }, + { + "path": "pages/application/high-work/high-work-accept/high-work-accept-alldetail", + "style": {} + }, + { + "path": "pages/application/high-work/high-work-guardian/high-work-guardian-list", + "style": {} + }, + { + "path": "pages/application/high-work/high-work-guardian/high-work-guardian-detail", + "style": {} + }, + { + "path": "pages/application/high-work/high-work-confess/high-work-confess-list", + "style": {} + }, + { + "path": "pages/application/high-work/high-work-confess/high-work-confess-detail", + "style": {} + }, + { + "path": "pages/application/high-work/high-work-acceptconfess/high-work-acceptconfess-list", + "style": {} + }, + { + "path": "pages/application/high-work/high-work-acceptconfess/high-work-acceptconfess-detail", + "style": {} + }, + { + "path": "pages/application/hoisting/home", + "style": {} + }, + { + "path": "pages/application/hoisting/hoisting-apply/hoisting-apply-list", + "style": {} + }, + { + "path": "pages/application/hoisting/hoisting-apply/hoisting-apply-detail", + "style": {} + }, + { + "path": "pages/application/hoisting/hoisting-leader/hoisting-leader-list", + "style": {} + }, + { + "path": "pages/application/hoisting/hoisting-leader/hoisting-leader-detail", + "style": {} + }, + { + "path": "pages/application/hoisting/hoisting-leader/hoisting-leader-alldetail", + "style": {} + }, + { + "path": "pages/application/hoisting/hoisting-leader/hoisting-leader-list", + "style": {} + }, + { + "path": "pages/application/hoisting/hoisting-leader/hoisting-leader-detail", + "style": {} + }, + { + "path": "pages/application/hoisting/hoisting-confirm/hoisting-confirm-list", + "style": {} + }, + { + "path": "pages/application/hoisting/hoisting-confirm/hoisting-confirm-detail", + "style": {} + }, + { + "path": "pages/application/hoisting/hoisting-confirm/hoisting-confirm-alldetail", + "style": {} + }, + { + "path": "pages/application/hoisting/hoisting-audit/hoisting-audit-list", + "style": {} + }, + { + "path": "pages/application/hoisting/hoisting-audit/hoisting-audit-detail", + "style": {} + }, + { + "path": "pages/application/hoisting/hoisting-audit/hoisting-audit-alldetail", + "style": {} + }, + { + "path": "pages/application/hoisting/hoisting-approve/hoisting-approve-list", + "style": {} + }, + { + "path": "pages/application/hoisting/hoisting-approve/hoisting-approve-detail", + "style": {} + }, + { + "path": "pages/application/hoisting/hoisting-approve/hoisting-approve-alldetail", + "style": {} + }, + { + "path": "pages/application/hoisting/hoisting-accept/hoisting-accept-list", + "style": {} + }, + { + "path": "pages/application/hoisting/hoisting-accept/hoisting-accept-detail", + "style": {} + }, + { + "path": "pages/application/hoisting/hoisting-accept/hoisting-accept-alldetail", + "style": {} + }, + { + "path": "pages/application/hoisting/hoisting-accept/hoisting-accept-list", + "style": {} + }, + { + "path": "pages/application/hoisting/hoisting-accept/hoisting-accept-detail", + "style": {} + }, + { + "path": "pages/application/hoisting/hoisting-guardian/hoisting-guardian-list", + "style": {} + }, + { + "path": "pages/application/hoisting/hoisting-guardian/hoisting-guardian-detail", + "style": {} + }, + { + "path": "pages/application/hoisting/hoisting-confess/hoisting-confess-list", + "style": {} + }, + { + "path": "pages/application/hoisting/hoisting-confess/hoisting-confess-detail", + "style": {} + }, + { + "path": "pages/application/hoisting/hoisting-acceptconfess/hoisting-acceptconfess-list", + "style": {} + }, + { + "path": "pages/application/hoisting/hoisting-acceptconfess/hoisting-acceptconfess-detail", "style": {} }, { @@ -632,13 +785,53 @@ "style": {} }, { - "path": "pages/application/electricity/electricity-list/index", + "path": "pages/application/electricity/electricity-apply/electricity-apply-list", "style": {} }, { "path": "pages/application/electricity/electricity-apply/electricity-apply-detail", "style": {} }, + { + "path": "pages/application/electricity/electricity-confirm/electricity-confirm-list", + "style": {} + }, + { + "path": "pages/application/electricity/electricity-confirm/electricity-confirm-detail", + "style": {} + }, + { + "path": "pages/application/electricity/electricity-confirm/electricity-confirm-alldetail", + "style": {} + }, + { + "path": "pages/application/electricity/electricity-audit/electricity-audit-list", + "style": {} + }, + { + "path": "pages/application/electricity/electricity-audit/electricity-audit-detail", + "style": {} + }, + { + "path": "pages/application/electricity/electricity-audit/electricity-audit-alldetail", + "style": {} + }, + { + "path": "pages/application/electricity/electricity-approve/electricity-approve-list", + "style": {} + }, + { + "path": "pages/application/electricity/electricity-approve/electricity-approve-detail", + "style": {} + }, + { + "path": "pages/application/electricity/electricity-approve/electricity-approve-alldetail", + "style": {} + }, + { + "path": "pages/application/electricity/electricity-gas/electricity-gas-list", + "style": {} + }, { "path": "pages/application/electricity/electricity-gas/gas-list", "style": {} @@ -648,11 +841,19 @@ "style": {} }, { - "path": "pages/application/electricity/electricity-measures/electricity-measures-detail", + "path": "pages/application/electricity/electricity-accept/electricity-accept-list", "style": {} }, { - "path": "pages/application/electricity/electricity-measures-confirm/electricity-measures-confirm-detail", + "path": "pages/application/electricity/electricity-accept/electricity-accept-detail", + "style": {} + }, + { + "path": "pages/application/electricity/electricity-accept/electricity-accept-alldetail", + "style": {} + }, + { + "path": "pages/application/electricity/electricity-guardian/electricity-guardian-list", "style": {} }, { @@ -660,7 +861,7 @@ "style": {} }, { - "path": "pages/application/electricity/electricity-user/electricity-user-detail", + "path": "pages/application/electricity/electricity-confess/electricity-confess-list", "style": {} }, { @@ -668,7 +869,7 @@ "style": {} }, { - "path": "pages/application/electricity/electricity-confirm/electricity-confirm-detail", + "path": "pages/application/electricity/electricity-acceptconfess/electricity-acceptconfess-list", "style": {} }, { @@ -676,286 +877,106 @@ "style": {} }, { - "path": "pages/application/electricity/electricity-workuser/electricity-workuser-detail", + "path": "pages/application/confinedspace/home", "style": {} }, { - "path": "pages/application/electricity/electricity-audit/electricity-audit-detail", + "path": "pages/application/confinedspace/confinedspace-apply/confinedspace-apply-list", "style": {} }, { - "path": "pages/application/electricity/electricity-approve/electricity-approve-detail", + "path": "pages/application/confinedspace/confinedspace-apply/confinedspace-apply-detail", "style": {} }, { - "path": "pages/application/electricity/electricity-startwork/electricity-startwork-detail", + "path": "pages/application/confinedspace/confinedspace-confess/confinedspace-confess-list", "style": {} }, { - "path": "pages/application/electricity/electricity-endwork/electricity-endwork-detail", - "style": {} - }, - { - "path": "pages/application/electricity/electricity-accept/electricity-accept-detail", - "style": {} - }, - { - "path": "pages/application/blindboard/home", - "style": {} - }, - { - "path": "pages/application/blindboard/blindboard-list/index", - "style": {} - }, - { - "path": "pages/application/blindboard/blindboard-apply/blindboard-apply-detail", - "style": {} - }, - { - "path": "pages/application/blindboard/blindboard-workshop/blindboard-workshop-detail", - "style": {} - }, - { - "path": "pages/application/blindboard/blindboard-measures/blindboard-measures-detail", - "style": {} - }, - { - "path": "pages/application/blindboard/blindboard-measures-confirm/blindboard-measures-confirm-detail", - "style": {} - }, - { - "path": "pages/application/blindboard/blindboard-guardian/blindboard-guardian-detail", - "style": {} - }, - { - "path": "pages/application/blindboard/blindboard-confess/blindboard-confess-detail", - "style": {} - }, - { - "path": "pages/application/blindboard/blindboard-acceptconfess/blindboard-acceptconfess-detail", - "style": {} - }, - { - "path": "pages/application/blindboard/blindboard-workuser/blindboard-workuser-detail", - "style": {} - }, - { - "path": "pages/application/blindboard/blindboard-confirm/blindboard-confirm-detail", - "style": {} - }, - { - "path": "pages/application/blindboard/blindboard-leader/blindboard-leader-detail", - "style": {} - }, - { - "path": "pages/application/blindboard/blindboard-startwork/blindboard-startwork-detail", - "style": {} - }, - { - "path": "pages/application/blindboard/blindboard-accept/blindboard-accept-detail", - "style": {} - }, - { - "path": "pages/application/breakground/home", - "style": {} - }, - { - "path": "pages/application/breakground/breakground-list/index", - "style": {} - }, - { - "path": "pages/application/breakground/breakground-apply/breakground-apply-detail", - "style": {} - }, - { - "path": "pages/application/breakground/breakground-workuser/breakground-workuser-detail", - "style": {} - }, - { - "path": "pages/application/breakground/breakground-measures/breakground-measures-detail", - "style": {} - }, - { - "path": "pages/application/breakground/breakground-measures-confirm/breakground-measures-confirm-detail", - "style": {} - }, - { - "path": "pages/application/breakground/breakground-guardian/breakground-guardian-detail", - "style": {} - }, - { - "path": "pages/application/breakground/breakground-confess/breakground-confess-detail", - "style": {} - }, - { - "path": "pages/application/breakground/breakground-confirm/breakground-confirm-detail", - "style": {} - }, - { - "path": "pages/application/breakground/breakground-acceptconfess/breakground-acceptconfess-detail", - "style": {} - }, - { - "path": "pages/application/breakground/breakground-leader/breakground-leader-detail", - "style": {} - }, - { - "path": "pages/application/breakground/breakground-safety/breakground-safety-detail", - "style": {} - }, - { - "path": "pages/application/breakground/breakground-approve/breakground-approve-detail", - "style": {} - }, - { - "path": "pages/application/breakground/breakground-startwork/breakground-startwork-detail", - "style": {} - }, - { - "path": "pages/application/breakground/breakground-endwork/breakground-endwork-detail", - "style": {} - }, - { - "path": "pages/application/breakground/breakground-accept/breakground-accept-detail", - "style": {} - }, - { - "path": "pages/application/hoisting/home", - "style": {} - }, - { - "path": "pages/application/hoisting/hoisting-list/index", - "style": {} - }, - { - "path": "pages/application/hoisting/hoisting-apply/hoisting-apply-detail", - "style": {} - }, - { - "path": "pages/application/hoisting/hoisting-sisuo/hoisting-sisuo-detail", - "style": {} - }, - { - "path": "pages/application/hoisting/hoisting-measures/hoisting-measures-detail", - "style": {} - }, - { - "path": "pages/application/hoisting/hoisting-measures-confirm/hoisting-measures-confirm-detail", - "style": {} - }, - { - "path": "pages/application/hoisting/hoisting-guardian/hoisting-guardian-detail", - "style": {} - }, - { - "path": "pages/application/hoisting/hoisting-confess/hoisting-confess-detail", - "style": {} - }, - { - "path": "pages/application/hoisting/hoisting-acceptconfess/hoisting-acceptconfess-detail", - "style": {} - }, - { - "path": "pages/application/hoisting/hoisting-workuser/hoisting-workuser-detail", - "style": {} - }, - { - "path": "pages/application/hoisting/hoisting-confirm/hoisting-confirm-detail", - "style": {} - }, - { - "path": "pages/application/hoisting/hoisting-projectmanager/hoisting-projectmanager-detail", - "style": {} - }, - { - "path": "pages/application/hoisting/hoisting-leader/hoisting-leader-detail", - "style": {} - }, - { - "path": "pages/application/hoisting/hoisting-audit/hoisting-audit-detail", + "path": "pages/application/confinedspace/confinedspace-confess/confinedspace-confess-detail", "style": {} }, { - "path": "pages/application/hoisting/hoisting-approve/hoisting-approve-detail", + "path": "pages/application/confinedspace/confinedspace-acceptconfess/confinedspace-acceptconfess-list", "style": {} }, { - "path": "pages/application/hoisting/hoisting-startwork/hoisting-startwork-detail", - "style": {} - }, - { - "path": "pages/application/hoisting/hoisting-endwork/hoisting-endwork-detail", - "style": {} - }, - { - "path": "pages/application/hoisting/hoisting-accept/hoisting-accept-detail", - "style": {} - }, - { - "path": "pages/application/cutroad/home", - "style": {} - }, - { - "path": "pages/application/cutroad/cutroad-list/index", - "style": {} - }, - { - "path": "pages/application/cutroad/cutroad-apply/cutroad-apply-detail", - "style": {} - }, - { - "path": "pages/application/cutroad/cutroad-projectmanager/cutroad-projectmanager-detail", - "style": {} - }, - { - "path": "pages/application/cutroad/cutroad-measures/cutroad-measures-detail", - "style": {} - }, - { - "path": "pages/application/cutroad/cutroad-measures-confirm/cutroad-measures-confirm-detail", - "style": {} - }, - { - "path": "pages/application/cutroad/cutroad-guardian/cutroad-guardian-detail", - "style": {} - }, - { - "path": "pages/application/cutroad/cutroad-confess/cutroad-confess-detail", - "style": {} - }, - { - "path": "pages/application/cutroad/cutroad-confirm/cutroad-confirm-detail", - "style": {} - }, - { - "path": "pages/application/cutroad/cutroad-acceptconfess/cutroad-acceptconfess-detail", - "style": {} - }, - { - "path": "pages/application/cutroad/cutroad-leader/cutroad-leader-detail", - "style": {} - }, - { - "path": "pages/application/cutroad/cutroad-audit/cutroad-audit-detail", + "path": "pages/application/confinedspace/confinedspace-acceptconfess/confinedspace-acceptconfess-detail", "style": {} }, { - "path": "pages/application/cutroad/cutroad-approve/cutroad-approve-detail", + "path": "pages/application/confinedspace/confinedspace-confirm/confinedspace-confirm-list", + "style": {} + }, + { + "path": "pages/application/confinedspace/confinedspace-confirm/confinedspace-confirm-alldetail", + "style": {} + }, + { + "path": "pages/application/confinedspace/confinedspace-confirm/confinedspace-confirm-detail", + "style": {} + }, + { + "path": "pages/application/confinedspace/confinedspace-guardian/confinedspace-guardian-list", + "style": {} + }, + { + "path": "pages/application/confinedspace/confinedspace-guardian/confinedspace-guardian-detail", "style": {} }, { - "path": "pages/application/cutroad/cutroad-startwork/cutroad-startwork-detail", + "path": "pages/application/confinedspace/confinedspace-audit/confinedspace-audit-list", "style": {} }, { - "path": "pages/application/cutroad/cutroad-endwork/cutroad-endwork-detail", + "path": "pages/application/confinedspace/confinedspace-audit/confinedspace-audit-detail", "style": {} }, { - "path": "pages/application/cutroad/cutroad-accept/cutroad-accept-detail", + "path": "pages/application/confinedspace/confinedspace-approve/confinedspace-approve-list", + "style": {} + }, + { + "path": "pages/application/confinedspace/confinedspace-approve/confinedspace-approve-detail", + "style": {} + }, + { + "path": "pages/application/confinedspace/confinedspace-approve/confinedspace-approve-alldetail", + "style": {} + }, + { + "path": "pages/application/confinedspace/confinedspace-accept/confinedspace-accept-list", + "style": {} + }, + { + "path": "pages/application/confinedspace/confinedspace-accept/confinedspace-accept-detail", + "style": {} + }, + { + "path": "pages/application/confinedspace/confinedspace-accept/confinedspace-accept-alldetail", + "style": {} + }, + { + "path": "pages/application/confinedspace/confinedspace-gas/confinedspace-gas-list", + "style": {} + }, + { + "path": "pages/application/confinedspace/confinedspace-gas/gas-name", + "style": {} + }, + { + "path": "pages/application/confinedspace/confinedspace-gas/gas-name", + "style": {} + }, + { + "path": "pages/application/confinedspace/confinedspace-gas/gas-list", + "style": {} + }, + { + "path": "pages/application/confinedspace/confinedspace-gas/gas-detail", "style": {} }, { @@ -971,11 +992,19 @@ "style": {} }, { - "path": "pages/application/hotwork/hotwork-measures/hotwork-measures-detail", + "path": "pages/application/hotwork/hotwork-confirm/hotwork-confirm-list", "style": {} }, { - "path": "pages/application/hotwork/hotwork-measures-confirm/hotwork-measures-confirm-detail", + "path": "pages/application/hotwork/hotwork-confirm/hotwork-confirm-detail", + "style": {} + }, + { + "path": "pages/application/hotwork/hotwork-confirm/hotwork-confirm-alldetail", + "style": {} + }, + { + "path": "pages/application/hotwork/hotwork-guardian/hotwork-guardian-list", "style": {} }, { @@ -983,45 +1012,68 @@ "style": {} }, { - "path": "pages/application/hotwork/hotwork-confess/hotwork-confess-detail", - "style": {} - }, - { - "path": "pages/application/hotwork/hotwork-confirm/hotwork-confirm-detail", - "style": {} - }, - { - "path": "pages/application/hotwork/hotwork-acceptconfess/hotwork-acceptconfess-detail", + "path": "pages/application/hotwork/hotwork-leader/hotwork-leader-list", "style": {} }, { "path": "pages/application/hotwork/hotwork-leader/hotwork-leader-detail", "style": {} + }, + { + "path": "pages/application/hotwork/hotwork-leader/hotwork-leader-alldetail", + "style": {} + }, + { + "path": "pages/application/hotwork/hotwork-audit/hotwork-audit-list", + "style": {} }, { "path": "pages/application/hotwork/hotwork-audit/hotwork-audit-detail", "style": {} }, - + { + "path": "pages/application/hotwork/hotwork-audit/hotwork-audit-alldetail", + "style": {} + }, + { + "path": "pages/application/hotwork/hotwork-approve/hotwork-approve-list", + "style": {} + }, { "path": "pages/application/hotwork/hotwork-approve/hotwork-approve-detail", "style": {} + }, + { + "path": "pages/application/hotwork/hotwork-approve/hotwork-approve-alldetail", + "style": {} + }, + { + "path": "pages/application/hotwork/hotwork-monitor/hotwork-monitor-list", + "style": {} }, { "path": "pages/application/hotwork/hotwork-monitor/hotwork-monitor-detail", "style": {} }, + { + "path": "pages/application/hotwork/hotwork-monitor/hotwork-monitor-alldetail", + "style": {} + }, { - "path": "pages/application/hotwork/hotwork-startwork/hotwork-startwork-detail", - "style": {} - }, - { - "path": "pages/application/hotwork/hotwork-endwork/hotwork-endwork-detail", + "path": "pages/application/hotwork/hotwork-accept/hotwork-accept-list", "style": {} }, { "path": "pages/application/hotwork/hotwork-accept/hotwork-accept-detail", "style": {} + }, + { + "path": "pages/application/hotwork/hotwork-accept/hotwork-accept-alldetail", + "style": {} + }, + { + "path": "pages/application/hotwork/hotwork-gas/hotwork-gas-list", + "style": {} }, { "path": "pages/application/hotwork/hotwork-gas/gas-list", @@ -1031,6 +1083,30 @@ "path": "pages/application/hotwork/hotwork-gas/gas-detail", "style": {} }, + { + "path": "pages/application/hotwork/hotwork-guardian/hotwork-guardian-list", + "style": {} + }, + { + "path": "pages/application/hotwork/hotwork-guardian/hotwork-guardian-detail", + "style": {} + }, + { + "path": "pages/application/hotwork/hotwork-confess/hotwork-confess-list", + "style": {} + }, + { + "path": "pages/application/hotwork/hotwork-confess/hotwork-confess-detail", + "style": {} + }, + { + "path": "pages/application/hotwork/hotwork-acceptconfess/hotwork-acceptconfess-list", + "style": {} + }, + { + "path": "pages/application/hotwork/hotwork-acceptconfess/hotwork-acceptconfess-detail", + "style": {} + }, { "path": "pages/application/commitment-company/commitment-company-list", @@ -1044,6 +1120,108 @@ "path": "pages/application/commitment-company/commitment-company-detail", "style": {} }, + { + "path": "pages/application/hotwork/hotwork-gas/gas-detail", + "style": {} + }, + + { + "path": "pages/application/open-circuit/home", + "style": {} + }, + { + "path": "pages/application/open-circuit/open-circuit-accept/open-circuit-accept-detail", + "style": {} + }, + { + "path": "pages/application/open-circuit/open-circuit-accept/open-circuit-accept-list", + "style": {} + }, + { + "path": "pages/application/open-circuit/open-circuit-accept/open-circuit-accept-alldetail", + "style": {} + }, + { + "path": "pages/application/open-circuit/open-circuit-apply/open-circuit-apply-detail", + "style": {} + }, + + { + "path": "pages/application/open-circuit/open-circuit-apply/open-circuit-apply-list", + "style": {} + }, + { + "path": "pages/application/open-circuit/open-circuit-construction/open-circuit-construction-detail", + "style": {} + }, + { + "path": "pages/application/open-circuit/open-circuit-construction/open-circuit-construction-list", + "style": {} + }, + { + "path": "pages/application/open-circuit/open-circuit-construction/open-circuit-construction-alldetail", + "style": {} + }, + { + "path": "pages/application/open-circuit/open-circuit-leader/open-circuit-leader-detail", + "style": {} + }, + { + "path": "pages/application/open-circuit/open-circuit-leader/open-circuit-leader-list", + "style": {} + }, + { + "path": "pages/application/open-circuit/open-circuit-leader/open-circuit-leader-alldetail", + "style": {} + }, + { + "path": "pages/application/open-circuit/open-circuit-production/open-circuit-production-detail", + "style": {} + }, + { + "path": "pages/application/open-circuit/open-circuit-production/open-circuit-production-list", + "style": {} + }, + { + "path": "pages/application/open-circuit/open-circuit-production/open-circuit-production-alldetail", + "style": {} + }, + { + "path": "pages/application/open-circuit/open-circuit-safety/open-circuit-safety-detail", + "style": {} + }, + { + "path": "pages/application/open-circuit/open-circuit-safety/open-circuit-safety-list", + "style": {} + }, + { + "path": "pages/application/open-circuit/open-circuit-safety/open-circuit-safety-alldetail", + "style": {} + }, + + { + "path": "pages/application/open-circuit/open-circuit-guardian/open-circuit-guardian-detail", + "style": {} + }, + { + "path": "pages/application/open-circuit/open-circuit-guardian/open-circuit-guardian-list", + "style": {} + }, { + "path": "pages/application/open-circuit/open-circuit-confess/open-circuit-confess-detail", + "style": {} + }, + { + "path": "pages/application/open-circuit/open-circuit-confess/open-circuit-confess-list", + "style": {} + }, { + "path": "pages/application/open-circuit/open-circuit-acceptconfess/open-circuit-acceptconfess-detail", + "style": {} + }, + { + "path": "pages/application/open-circuit/open-circuit-acceptconfess/open-circuit-acceptconfess-list", + "style": {} + }, + { @@ -1082,6 +1260,50 @@ "path": "pages/application/onlinexxks/home", "style": {} }, + { + "path": "pages/application/onlinexxks/my-curriculum", + "style": {} + }, + { + "path": "pages/application/onlinexxks/my-study", + "style": {} + }, + { + "path": "pages/application/onlinexxks/my-study-detail", + "style": {} + }, + { + "path": "pages/application/onlinexxks/my-exam-curriculum", + "style": {} + }, + { + "path": "pages/application/onlinexxks/my-stage", + "style": {} + }, + { + "path": "pages/application/onlinexxks/my-tasks", + "style": {} + }, + { + "path": "pages/application/onlinexxks/courseware-list", + "style": {} + }, + { + "path": "pages/application/onlinexxks/my-exam-stage", + "style": {} + }, + { + "path": "pages/application/onlinexxks/my-exam-detail", + "style": {} + }, + { + "path": "pages/application/onlinexxks/temp-study-video", + "style": {} + }, + { + "path": "pages/application/onlinexxks/temp-study-data", + "style": {} + }, { "path": "pages/application/eight-assignments", "style": {} @@ -1101,70 +1323,6 @@ "enablePullDownRefresh": false } }, - { - "path": "pages/application/key-project-management/index/index", - "style": {} - }, - { - "path": "pages/application/key-project-management/safety-environmental-inspection/list", - "style": {} - }, - { - "path": "pages/application/key-project-management/positioning_management/index", - "style": {} - }, - { - "path": "pages/application/key-project-management/positioning_management/keyProjectApply", - "style": {} - }, - { - "path": "pages/application/key-project-management/positioning_management/list", - "style": {} - }, - { - "path": "pages/application/key-project-management/positioning_management/videoView", - "style": {} - }, - { - "path": "pages/application/key-project-management/safety-environmental-inspection/detail-list", - "style": {} - }, - { - "path": "pages/application/key-project-management/safety-environmental-inspection/detail", - "style": {} - }, - { - "path": "pages/application/key-project-management/hidden-management/list", - "style": {} - }, - { - "path": "pages/application/key-project-management/hidden-management/detail-list", - "style": {} - }, - { - "path": "pages/application/key-project-management/hidden-management/detail", - "style": {} - }, - { - "path": "pages/application/key-project-management/penalty-management/list", - "style": {} - }, - { - "path": "pages/application/key-project-management/penalty-management/detail-list", - "style": {} - }, - { - "path": "pages/application/key-project-management/penalty-management/detail", - "style": {} - }, - { - "path": "pages/application/key-project-management/AI-warning/list", - "style": {} - }, - { - "path": "pages/application/key-project-management/AI-warning/detail", - "style": {} - }, { "path" : "pages/my/face/index", "style" : @@ -1243,14 +1401,6 @@ "style": {} }, - { - "path": "pages/application/safetymeeting/index", - "style": {} - }, - { - "path": "pages/application/safetymeeting/info", - "style": {} - }, { "path" : "pages/my/updateSignature/index", "style" : {} @@ -1314,49 +1464,6 @@ { "path": "pages/my/promise/detail", "style": {} - }, - { - "path": "pages/application/dangerous_options/index" - }, - { - "path": "pages/application/onlinexxks/score_inquiry", - "style": {} - }, - { - "path": "pages/application/onlinexxks/exam_details", - "style": {} - }, - { - "path": "pages/application/onlinexxks/my_learning", - "style": {} - }, - { - "path": "pages/application/onlinexxks/curriculum_schedule", - "style": {} - }, - { - "path": "pages/application/onlinexxks/video_study", - "style": { - "navigationStyle": "default", - "navigationBarTitleText": "学习详情", - "navigationBarBackgroundColor": "#1c61cf" - } - }, - { - "path": "pages/application/onlinexxks/exercises", - "style": {} - }, - { - "path": "pages/application/onlinexxks/course_exam", - "style": {} - }, - { - "path": "pages/application/onlinexxks/strengthen_video_study", - "style": { - "navigationStyle": "default", - "navigationBarTitleText": "加强学习", - "navigationBarBackgroundColor": "#1c61cf" - } } ], diff --git a/pages/application/blind-board/home.vue b/pages/application/blind-board/home.vue new file mode 100644 index 0000000..e11a3d8 --- /dev/null +++ b/pages/application/blind-board/home.vue @@ -0,0 +1,264 @@ + + + + + diff --git a/pages/application/confinedspace/home.vue b/pages/application/confinedspace/home.vue index a8a8137..8319873 100644 --- a/pages/application/confinedspace/home.vue +++ b/pages/application/confinedspace/home.vue @@ -2,7 +2,7 @@ 返回 - 受限空间 + 受限空间作业 @@ -26,137 +26,121 @@ - 受限空间审批管理 + 受限空间作业审批管理 - + - {{count.CREATE}} + {{count.COUNTBACK}} - 受限空间 + 受限空间作业 申请 - - - - {{count.ANALYZE}} - - - 气体分析 - - - + - {{count.MEASURES_SET}} + {{count.COUNTCONFIRM}} - 设置安全 - 措施确认人 - - - - - - {{count.MEASURES_CONFIRM}} - - - 安全措施确认 - - - - - - {{count.GUARDIAN}} - - - 监护人 - 意见 - - - - - - {{count.CONFESS}} - - - 安全交底人 - 意见 - - - - - - {{count.ACCEPT_CONFESS}} - - - 接受交底人 - 意见 - - - - - - {{count.WORK_USER}} - - - 作业人 - 意见 - - - - - - {{count.CONFIRM}} - - 作业负责人 意见 - - + + + + + + + + + + + + + + + + + + + + + - - {{count.LEADER}} + + {{count.COUNTAPPROVE}} 所在单位 意见 - + + + + {{count.COUNTACCEPT}} + + + 完工验收 + + + + + + {{count.COUNTANALYZE}} + + + 气体检测 + + + + + + {{count.COUNTGUARDIAN}} + + + 监护人 + + + - {{count.WORK_START}} + {{count.COUNTCONFESS}} - 开始作业时间 + 安全交底人 - + - {{count.WORK_END}} + {{count.COUNTACCEPTCONFESS}} - 结束作业时间 - - - - - - {{count.ACCEPT}} - - - 验收归档 + 接受交底人 + + @@ -201,32 +185,32 @@ } }) }, - getData(){ - var _this = this; - uni.showLoading({ - title:"加载中..." - });//加载中动画 - uni.request({ - url: basePath +'/app/confinedspace/checkWorkCount', - method: 'POST', - dataType: 'json', - header: { - 'Content-type':'application/x-www-form-urlencoded' - }, - data: { - tm:new Date().getTime(), - CORPINFO_ID:loginUser.CORPINFO_ID, - USER_ID:loginUser.USER_ID, - }, - success: (res) => { - uni.hideLoading();//结束加载中动画 - if ("success" == res.data.result) { - _this.count = res.data.count; - } - - } - }) - }, + // getData(){ + // var _this = this; + // uni.showLoading({ + // title:"加载中..." + // });//加载中动画 + // uni.request({ + // url: basePath +'/app/confinedspace/countCheck', + // method: 'POST', + // dataType: 'json', + // header: { + // 'Content-type':'application/x-www-form-urlencoded' + // }, + // data: { + // tm:new Date().getTime(), + // CORPINFO_ID:loginUser.CORPINFO_ID, + // USER_ID:loginUser.USER_ID, + // }, + // success: (res) => { + // uni.hideLoading();//结束加载中动画 + // if ("success" == res.data.result) { + // _this.count = res.data.count; + // } + // + // } + // }) + // }, } } diff --git a/pages/application/eight-assignments.vue b/pages/application/eight-assignments.vue index 0c91119..0191293 100644 --- a/pages/application/eight-assignments.vue +++ b/pages/application/eight-assignments.vue @@ -2,7 +2,7 @@ 返回 - 特殊作业 + 高危作业 @@ -12,85 +12,89 @@ 八项作业 --> - - - - - {{eight_work_count.HOTWORK_COUNT}} - - - 动火作业 - - - - - - {{eight_work_count.HIGHWORK_COUNT}} - - - 高处作业 - - - + - {{eight_work_count.CONFINEDSPACE_COUNT}} + {{confinedspace_count}} 受限空间 安全作业 - - - - {{eight_work_count.HOISTING_COUNT}} - - - 吊装作业 - - - - - - - - - - {{eight_work_count.BREAKGROUND_COUNT}} - - - 动土作业 - - - - - - {{eight_work_count.ELECTRICITY_COUNT}} - - - 临时用电作业 - - - - - - - {{eight_work_count.OPEN_CIRCUIT_COUNT}} - - - 断路作业 - - - + + + + + + + + + - {{eight_work_count.BLIND_BOARD_COUNT}} + {{blind_board_count}} 盲板抽堵作业 + + + + {{break_ground_count}} + + + 动土作业 + + + + + + {{high_work_count}} + + + 高处作业 + + + + + + + + {{hoisting_count}} + + + 吊装作业 + + + + + + {{electricity_count}} + + + 临时用电作业 + + + + + + {{hotwork_count}} + + + 动火作业 + + + + + + {{open_circuit_count}} + + + 断路作业 + + @@ -123,7 +127,7 @@ setCorpinfoId, setloginUser, setDeptId, - premission, + premission, isRest } from '@/common/tool.js'; export default { @@ -131,7 +135,14 @@ return { premission: {}, isRest :'', - eight_work_count: {}, + confinedspace_count:0, + blind_board_count:0, + break_ground_count:0, + high_work_count:0, + hoisting_count:0, + electricity_count:0, + hotwork_count:0, + open_circuit_count:0, }; }, mounted(){ @@ -139,8 +150,15 @@ }, onShow() { this.premission = Object.assign({}, premission) - console.log(this.premission) - this.eight_work_count = {} + console.info( this.premission) + this. confinedspace_count = 0 + this.blind_board_count = 0 + this.break_ground_count = 0 + this.high_work_count = 0 + this.hoisting_count = 0 + this.electricity_count = 0 + this.hotwork_count = 0 + this.open_circuit_count = 0 this.getRedPoint(); }, methods: { @@ -157,22 +175,173 @@ }, getRedPoint(){ - uni.request({ - url: basePath + '/app/eightwork/checkWork', - method: 'POST', - dataType: 'json', - header: { - 'Content-type': 'application/x-www-form-urlencoded' - }, - data: { - USER_ID: loginUser.USER_ID, - }, - success: (res) => { - if ("success" == res.data.result) { - this.eight_work_count = res.data.count - } - } - }) + // uni.request({ + // url: basePath +'/app/confinedspace/countCheck', + // method: 'POST', + // dataType: 'json', + // header: { + // 'Content-type':'application/x-www-form-urlencoded' + // }, + // data: { + // tm:new Date().getTime(), + // CORPINFO_ID:loginUser.CORPINFO_ID, + // USER_ID:loginUser.USER_ID, + // }, + // success: (res) => { + // if ("success" == res.data.result) { + // Object.values(res.data.count).forEach(item=>{ + // this.confinedspace_count += (item || 0) + // }) + // } + // } + // }) + + // uni.request({ + // url: basePath +'/app/blindboard/countCheck', + // method: 'POST', + // dataType: 'json', + // header: { + // 'Content-type':'application/x-www-form-urlencoded' + // }, + // data: { + // tm:new Date().getTime(), + // CORPINFO_ID:loginUser.CORPINFO_ID, + // USER_ID:loginUser.USER_ID, + // }, + // success: (res) => { + // if ("success" == res.data.result) { + // Object.values(res.data.count).forEach(item=>{ + // this.blind_board_count += (item || 0) + // }) + // } + // } + // }) + + // uni.request({ + // url: basePath +'/app/breakground/countCheck', + // method: 'POST', + // dataType: 'json', + // header: { + // 'Content-type':'application/x-www-form-urlencoded' + // }, + // data: { + // tm:new Date().getTime(), + // CORPINFO_ID:loginUser.CORPINFO_ID, + // USER_ID:loginUser.USER_ID, + // }, + // success: (res) => { + // if ("success" == res.data.result) { + // Object.values(res.data.count).forEach(item=>{ + // this.break_ground_count += (item || 0) + // }) + // } + // } + // }) + + // uni.request({ + // url: basePath +'/app/highwork/countCheck', + // method: 'POST', + // dataType: 'json', + // header: { + // 'Content-type':'application/x-www-form-urlencoded' + // }, + // data: { + // tm:new Date().getTime(), + // CORPINFO_ID:loginUser.CORPINFO_ID, + // USER_ID:loginUser.USER_ID, + // }, + // success: (res) => { + // if ("success" == res.data.result) { + // Object.values(res.data.count).forEach(item=>{ + // this.high_work_count += (item || 0) + // }) + // } + // } + // }) + + // uni.request({ + // url: basePath +'/app/hoisting/countCheck', + // method: 'POST', + // dataType: 'json', + // header: { + // 'Content-type':'application/x-www-form-urlencoded' + // }, + // data: { + // tm:new Date().getTime(), + // CORPINFO_ID:loginUser.CORPINFO_ID, + // USER_ID:loginUser.USER_ID, + // }, + // success: (res) => { + // if ("success" == res.data.result) { + // Object.values(res.data.count).forEach(item=>{ + // this.hoisting_count += (item || 0) + // }) + // } + // } + // }) + + // uni.request({ + // url: basePath +'/app/electricity/countCheck', + // method: 'POST', + // dataType: 'json', + // header: { + // 'Content-type':'application/x-www-form-urlencoded' + // }, + // data: { + // tm:new Date().getTime(), + // CORPINFO_ID:loginUser.CORPINFO_ID, + // USER_ID:loginUser.USER_ID, + // }, + // success: (res) => { + // if ("success" == res.data.result) { + // Object.values(res.data.count).forEach(item=>{ + // this.electricity_count += (item || 0) + // }) + // } + // } + // }) + + // uni.request({ + // url: basePath +'/app/hotwork/countCheck', + // method: 'POST', + // dataType: 'json', + // header: { + // 'Content-type':'application/x-www-form-urlencoded' + // }, + // data: { + // tm:new Date().getTime(), + // CORPINFO_ID:loginUser.CORPINFO_ID, + // USER_ID:loginUser.USER_ID, + // }, + // success: (res) => { + // if ("success" == res.data.result) { + // Object.values(res.data.count).forEach(item=>{ + // this.hotwork_count += (item || 0) + // }) + // } + // } + // }) + + // uni.request({ + // url: basePath +'/app/cutroad/countCheck', + // method: 'POST', + // dataType: 'json', + // header: { + // 'Content-type':'application/x-www-form-urlencoded' + // }, + // data: { + // tm:new Date().getTime(), + // CORPINFO_ID:loginUser.CORPINFO_ID, + // USER_ID:loginUser.USER_ID, + // }, + // success: (res) => { + // if ("success" == res.data.result) { + // Object.values(res.data.count).forEach(item=>{ + // this.open_circuit_count += (item || 0) + // }) + // } + // } + // }) } } } diff --git a/pages/application/electricity/home.vue b/pages/application/electricity/home.vue index 68b6c34..c8612bb 100644 --- a/pages/application/electricity/home.vue +++ b/pages/application/electricity/home.vue @@ -2,164 +2,118 @@ 返回 - 临时用电 + 临时用电作业 - - 临时用电审批管理 + 临时用电作业审批管理 - + - {{count.CREATE}} + {{count.COUNTBACK}} 临时用电 - 申请 + 作业申请 - - - - {{count.ANALYZE}} - - - 气体分析 - - - + - {{count.MEASURES_SET}} + {{count.COUNTCONFIRM}} - 设置安全 - 措施确认人 - - - - - - {{count.MEASURES_CONFIRM}} - - - 安全措施确认 - - - - - - {{count.GUARDIAN}} - - - 监护人 - 意见 - - - - - - {{count.ELECTRICITY}} - - - 用电人意见 - - - - - - {{count.CONFESS}} - - - 安全交底人 - 意见 - - - - - - {{count.ACCEPT_CONFESS}} - - - 接受交底人 - 意见 - - - - - - {{count.WORK_USER}} - - - 作业人 - 意见 - - - - - - {{count.CONFIRM}} - - 作业负责人 意见 - - + - - {{count.AUDIT}} + + {{count.COUNTAUDIT}} - + 用电单位 意见 - + - - {{count.APPROVE}} + + {{count.COUNTAPPROVE}} 配送电单位 意见 - + + + + {{count.COUNTACCEPT}} + + + 完工验收 + + + + + + {{count.COUNTANALYZE}} + + + 气体检测 + + + + + + {{count.COUNTGUARDIAN}} + + + 监护人 + + + - {{count.WORK_START}} + {{count.COUNTCONFESS}} - 开始作业时间 + 安全交底人 - + - {{count.WORK_END}} + {{count.COUNTACCEPTCONFESS}} - 结束作业时间 - - - - - - {{count.ACCEPT}} - - - 验收归档 + 接受交底人 + + @@ -204,32 +158,32 @@ } }) }, - getData(){ - var _this = this; - uni.showLoading({ - title:"加载中..." - });//加载中动画 - uni.request({ - url: basePath +'/app/electricity/checkWorkCount', - method: 'POST', - dataType: 'json', - header: { - 'Content-type':'application/x-www-form-urlencoded' - }, - data: { - tm:new Date().getTime(), - CORPINFO_ID:loginUser.CORPINFO_ID, - USER_ID:loginUser.USER_ID, - }, - success: (res) => { - uni.hideLoading();//结束加载中动画 - if ("success" == res.data.result) { - _this.count = res.data.count; - } - - } - }) - }, + // getData(){ + // var _this = this; + // uni.showLoading({ + // title:"加载中..." + // });//加载中动画 + // uni.request({ + // url: basePath +'/app/electricity/countCheck', + // method: 'POST', + // dataType: 'json', + // header: { + // 'Content-type':'application/x-www-form-urlencoded' + // }, + // data: { + // tm:new Date().getTime(), + // CORPINFO_ID:loginUser.CORPINFO_ID, + // USER_ID:loginUser.USER_ID, + // }, + // success: (res) => { + // uni.hideLoading();//结束加载中动画 + // if ("success" == res.data.result) { + // _this.count = res.data.count; + // } + // + // } + // }) + // }, } } diff --git a/pages/application/highwork/home.vue b/pages/application/highwork/home.vue index 20b8cb6..39c5314 100644 --- a/pages/application/highwork/home.vue +++ b/pages/application/highwork/home.vue @@ -12,143 +12,90 @@ 高处作业审批管理 - + - {{count.CREATE}} + {{count.COUNTBACK}} 高处作业 申请 - - - - - {{count.MEASURES_SET}} - - - 设置安全 - 措施确认人 - - - - - - {{count.MEASURES_CONFIRM}} - - - 安全措施确认 - - - - - - {{count.GUARDIAN}} - - - 监护人 - 意见 - - - - - - {{count.CONFESS}} - - - 安全交底人 - 意见 - - - + - {{count.ACCEPT_CONFESS}} + {{count.COUNTCONSTRUCTION}} - - 接受交底人 - 意见 - - - - - - {{count.WORK_USER}} - - - 作业人 - 意见 - - - - - - {{count.CONFIRM}} - - + 作业负责人 意见 - - + - - {{count.LEADER}} + + {{count.COUNTLEADER}} - + 所在单位 意见 - + - - {{count.AUDIT}} + + {{count.COUNTAUDIT}} - + 审核部门 意见 - + - - {{count.APPROVE}} + + {{count.COUNTAPPROVE}} 审批部门 意见 - - + + + + {{count.COUNTACCEPT}} + + + 完工验收 + + + + + + {{count.COUNTGUARDIAN}} + + + 监护人 + + + - {{count.WORK_START}} + {{count.COUNTCONFESS}} - 开始作业时间 + 安全交底人 - + - {{count.WORK_END}} + {{count.COUNTACCEPTCONFESS}} - 结束作业时间 - - - - - - {{count.ACCEPT}} - - - 验收归档 + 接受交底人 @@ -212,32 +159,32 @@ } }) }, - getData(){ - var _this = this; - uni.showLoading({ - title:"加载中..." - });//加载中动画 - uni.request({ - url: basePath +'/app/highwork/checkWorkCount', - method: 'POST', - dataType: 'json', - header: { - 'Content-type':'application/x-www-form-urlencoded' - }, - data: { - tm:new Date().getTime(), - CORPINFO_ID:loginUser.CORPINFO_ID, - USER_ID:loginUser.USER_ID, - }, - success: (res) => { - uni.hideLoading();//结束加载中动画 - if ("success" == res.data.result) { - _this.count = res.data.count; - } - - } - }) - }, + // getData(){ + // var _this = this; + // uni.showLoading({ + // title:"加载中..." + // });//加载中动画 + // uni.request({ + // url: basePath +'/app/highwork/countCheck', + // method: 'POST', + // dataType: 'json', + // header: { + // 'Content-type':'application/x-www-form-urlencoded' + // }, + // data: { + // tm:new Date().getTime(), + // CORPINFO_ID:loginUser.CORPINFO_ID, + // USER_ID:loginUser.USER_ID, + // }, + // success: (res) => { + // uni.hideLoading();//结束加载中动画 + // if ("success" == res.data.result) { + // _this.count = res.data.count; + // } + // + // } + // }) + // }, } } diff --git a/pages/application/hoisting/home.vue b/pages/application/hoisting/home.vue index d476a18..2181334 100644 --- a/pages/application/hoisting/home.vue +++ b/pages/application/hoisting/home.vue @@ -1,332 +1,260 @@ diff --git a/pages/application/hotwork/home.vue b/pages/application/hotwork/home.vue index 512d4fb..f98c2ee 100644 --- a/pages/application/hotwork/home.vue +++ b/pages/application/hotwork/home.vue @@ -12,150 +12,119 @@ 动火作业审批管理 - + - {{count.CREATE}} + {{count.COUNTBACK}} 动火作业 申请 - - - - {{count.ANALYZE}} - - - 气体分析 - - - + + + + {{count.COUNTANALYZE}} + + + 气体分析 + + + - {{count.MEASURES_SET}} + {{count.COUNTCONFIRM}} - 设置安全 - 措施确认人 - - - - - - {{count.MEASURES_CONFIRM}} - - - 安全措施确认 - - - - - - {{count.GUARDIAN}} - - - 监护人 - 意见 - - - - - - {{count.CONFESS}} - - - 安全交底人 - 意见 - - - - - - {{count.ACCEPT_CONFESS}} - - - 接受交底人 - 意见 - - - - - - {{count.CONFIRM}} - - 作业负责人 意见 - + + + + + + + + + + + - - {{count.LEADER}} + + {{count.COUNTLEADER}} - + 所在单位 意见 - + - - {{count.AUDIT}} + + {{count.COUNTAUDIT}} 安全管理部门 意见 - - + - - {{count.APPROVE}} + + {{count.COUNTAPPROVE}} 动火审批人 意见 + + + + {{count.COUNTMONITOR}} + + + 班长验票 + + + + + + {{count.COUNTACCEPT}} + + + 完工验收 + + - + - {{count.MONITOR}} + {{count.COUNTGUARDIAN}} - 当班班长验票 + 监护人 - + - {{count.WORK_START}} + {{count.COUNTCONFESS}} - 开始作业时间 + 安全交底人 - + - {{count.WORK_END}} + {{count.COUNTACCEPTCONFESS}} - 结束作业时间 - - - - - - {{count.ACCEPT}} - - - 验收归档 + 接受交底人 @@ -219,32 +188,32 @@ } }) }, - getData(){ - var _this = this; - uni.showLoading({ - title:"加载中..." - });//加载中动画 - uni.request({ - url: basePath +'/app/hotwork/checkWorkCount', - method: 'POST', - dataType: 'json', - header: { - 'Content-type':'application/x-www-form-urlencoded' - }, - data: { - tm:new Date().getTime(), - CORPINFO_ID:loginUser.CORPINFO_ID, - USER_ID:loginUser.USER_ID, - }, - success: (res) => { - uni.hideLoading();//结束加载中动画 - if ("success" == res.data.result) { - _this.count = res.data.count; - } - - } - }) - }, + // getData(){ + // var _this = this; + // uni.showLoading({ + // title:"加载中..." + // });//加载中动画 + // uni.request({ + // url: basePath +'/app/hotwork/countCheck', + // method: 'POST', + // dataType: 'json', + // header: { + // 'Content-type':'application/x-www-form-urlencoded' + // }, + // data: { + // tm:new Date().getTime(), + // CORPINFO_ID:loginUser.CORPINFO_ID, + // USER_ID:loginUser.USER_ID, + // }, + // success: (res) => { + // uni.hideLoading();//结束加载中动画 + // if ("success" == res.data.result) { + // _this.count = res.data.count; + // } + // + // } + // }) + // }, } } diff --git a/pages/application/open-circuit/home.vue b/pages/application/open-circuit/home.vue new file mode 100644 index 0000000..06b9e8d --- /dev/null +++ b/pages/application/open-circuit/home.vue @@ -0,0 +1,263 @@ + + + + + diff --git a/pages/application/safety-environmental-inspection/apply/detail-plead.vue b/pages/application/safety-environmental-inspection/apply/detail-plead.vue index 6867107..af5dfc1 100644 --- a/pages/application/safety-environmental-inspection/apply/detail-plead.vue +++ b/pages/application/safety-environmental-inspection/apply/detail-plead.vue @@ -47,7 +47,7 @@ - 申辩是否成立 + 申辩是否成立 @@ -62,7 +62,7 @@ - 不成立理由 + 不成立理由内容 @@ -122,7 +122,7 @@ import { basePath,loginUserId,loginSession,baseImgPath,formatDate,loginUser } from '@/common/tool.js'; - + import sign from '@/components/sign/sign.vue'; export default { components: { @@ -263,7 +263,7 @@ }, delImg(e) { uni.showModal({ - title: '温馨提示', + title: '双控平台', content: '确定要删除这张图片吗？', cancelColor: "#000000", cancelText: '取消', @@ -399,11 +399,14 @@ }); }, ViewShowImage2(e) { - let fullPath = this.baseImgPath + this.form.INSPECTED_SITEUSER_SIGN_IMG; - uni.previewImage({ - urls: [fullPath], // 确保这里是一个数组，即使只有一个图片路径 - current: fullPath // 当前显示图片的http链接 - }); + let files = []; + for (var i = 0; i < this.files2.length; i++) { + files.push(baseImgPath+this.files2[i].FILEPATH) + } + uni.previewImage({ + urls: files, + current: e.currentTarget.dataset.index + }); }, ViewShowImage4(e) { diff --git a/pages/application/safety-environmental-inspection/apply/detail.vue b/pages/application/safety-environmental-inspection/apply/detail.vue index da0150e..55a42b9 100644 --- a/pages/application/safety-environmental-inspection/apply/detail.vue +++ b/pages/application/safety-environmental-inspection/apply/detail.vue @@ -229,25 +229,26 @@ - - 被检查单位现场负责人意见： - {{ form.INSPECTED_EXPLAIN }} - + + 被检查单位现场负责人意见： + {{ validStr(form.INSPECTED_EXPLAIN) ? '申辩' : '同意' }} + 申辩说明 - - 被检查单位现场负责人签字： - - - - - {{ form.INSPECTED_SITEUSER_SIGN_TIME }} - - + + 被检查单位现场负责人签字： + + + + + {{ form.INSPECTED_SITEUSER_SIGN_TIME }} + + @@ -321,12 +322,10 @@ 隐患部位 - - - - - - {{ + + {{ hiddenForm.HIDDENPART_NAME ? hiddenForm.HIDDENPART_NAME : hiddenForm.HIDDENPART || '请选择' }} + + {{ hiddenForm.HIDDENPART_NAME ? hiddenForm.HIDDENPART_NAME : hiddenForm.HIDDENPART }} @@ -343,76 +342,63 @@ {{ hiddenForm.HIDDENLEVEL_NAME }} --> + :value="hiddenForm.HIDDENLEVEL_INDEX" :range="hiddenLevelTreeList" range-key="label"> {{ hiddenForm.HIDDENLEVEL_NAME || '请选择' }} - - - - - - - - - - - - - - 隐患类型 - - {{hiddenForm.HIDDENTYPENAME?hiddenForm.HIDDENTYPENAME:'请选择'}} - - - - - - - - - - - - - - - - - - + + 隐患类型 + + + {{hiddenForm.HIDDENTYPE_NAME || '请选择'}} + + {{ hiddenForm.HIDDENTYPE_NAME }} + + + + + + 是否相关方 + + + + 是 + + 否 + + + {{ hiddenForm.ISRELEVANT=='1'?'是':'否' }} + 隐患发现时间 + :value="hiddenForm.DISCOVERYTIME || '请选择'" @change="changeDiscoverDate"> + + + 隐患上报位置： + + + + 经度： + {{hiddenForm.LONGITUDE}} + + + 纬度： + {{hiddenForm.LATITUDE}} + + + 隐患位置描述： + + - - - - - - - - - - - - - - - - - - - 隐患发现人 { - console.log(`隐患项 ${index + 1} 的 POSITIONDESC 字段的值:`, hidden.POSITIONDESC); - }); this.submit(hiddenList) }, @@ -993,15 +950,15 @@ // this.hiddenForm.HIDDENLEVEL = e[0].id // this.hiddenForm.HIDDENLEVEL_NAME = e[0].name // } - if (list === 'hiddenTypeTreeList') { // 隐患类型 + if (list === 'hiddenTypeTreeList') { // 隐患级别 this.hiddenForm.HIDDENTYPE = e[0].id this.hiddenForm.HIDDENTYPE_NAME = e[0].name } - if (list === 'hiddenType2TreeList') { // 隐患类型 + if (list === 'hiddenType2TreeList') { // 隐患级别 this.hiddenForm.HIDDENTYPE2 = e[0].id this.hiddenForm.HIDDENTYPE2_NAME = e[0].name } - if (list === 'creatorList') { // 隐患发现人 + if (list === 'creatorList') { // 隐患级别 this.hiddenForm.HIDDENFINDDEPT = e[0].id this.hiddenForm.HIDDENFINDDEPT_NAME = e[0].name this.hiddenForm.CREATOR_INDEX = '' @@ -1082,7 +1039,7 @@ content: '确定移除发现问题吗？', success: function(res) { if (res.cancel) { - console.info(_this.form,'打印数据2'); + console.info(_this.form) _this.form.hiddenList.splice(index, 1); if (item.HIDDEN_ID) { _this.delHiddens.push(item.HIDDEN_ID) @@ -1127,71 +1084,52 @@ } }) this.hiddenForm = item - this.hiddenForm.HIDDENTYPENAME = item.HIDDENTYPE_NAME || this.hiddenForm.HIDDENTYPENAME; this.$refs['showHiddenWindow'].open() this.showHiddenWindow = true this.hiddenIsEdit = false }, // 保存隐患 - saveHidden() { - let required = true; - - // 检查隐患图片 - if (this.hiddenForm.hiddenImgs.length <= 0) { - uni.showToast({ - icon: 'none', - title: '请上传隐患图片', - duration: 1500 - }); - return; - } - - // 检查隐患部位是否输入 - if (!this.hiddenForm.HIDDENPART) { - uni.showToast({ - icon: 'none', - title: '请输入隐患部位', - duration: 1500 - }); - required = false; - } - - // 检查其他必填项 - this.hiddenRules.forEach(({ name, message }) => { - if (!this.hiddenForm[name] || this.hiddenForm[name] === '请选择' || this.hiddenForm[name] === '请输入') { - uni.showToast({ - icon: 'none', - title: message, - duration: 1500 - }); - required = false; - } - }); - - if (!required) { - return; - } - - uni.showLoading({ - title: '请稍候' - }); - - // 检查并设置发现人相关信息 - this.form.inspectorList.forEach(item => { - if (item.INSPECTION_USER_ID === this.hiddenForm.CREATOR) { - this.hiddenForm.HIDDENFINDDEPT = item.INSPECTION_DEPARTMENT_ID; - } - }); - - // 将当前隐患信息添加到列表中 - this.form.hiddenList.push(this.hiddenForm); - - // 关闭并重置隐患信息输入窗口 - this.cancelHidden(); - - uni.hideLoading(); - }, + saveHidden() { + let required = true + if (this.hiddenForm.hiddenImgs.length <= 0) { + uni.showToast({ + icon: 'none', + title: '请上传隐患图片', + duration: 1500 + }); + return; + } + this.hiddenRules.map(({ + name, + message + }) => { + if (!this.hiddenForm[name] || this.hiddenForm[name] === '请选择' || this.hiddenForm[name] === + '请输入') { + uni.showToast({ + icon: 'none', + title: message, + duration: 1500 + }); + required = false + } + }) + if (!required) { + return + } + uni.showLoading({ + title: '请稍候' + }) + this.form.inspectorList.forEach(item => { + if (item.INSPECTION_USER_ID === this.hiddenForm.CREATOR) { + this.hiddenForm.HIDDENFINDDEPT = item.INSPECTION_DEPARTMENT_ID + } + }) + console.info(this.hiddenForm) + this.form.hiddenList.push(this.hiddenForm) + this.cancelHidden() + uni.hideLoading(); + }, // 取消添加隐患 cancelHidden() { this.$refs['showHiddenWindow'].close() @@ -1252,6 +1190,7 @@ var _this = this; let i = e.currentTarget.dataset.index uni.showModal({ + title: '秦港-双基双控', content: '确定要删除这张图片吗？', cancelColor: "#000000", cancelText: '取消', @@ -1308,6 +1247,7 @@ var _this = this; let i = e.currentTarget.dataset.index uni.showModal({ + title: '秦港-双基双控', content: '确定要删除这张图片吗？', cancelColor: "#000000", cancelText: '取消', @@ -1350,6 +1290,7 @@ }, DelVideo(e) { uni.showModal({ + title: '秦港-双基双控', content: '确定要删除这个视频吗？', cancelColor: "#000000", cancelText: '取消', @@ -1393,7 +1334,7 @@ this.modalShow = true }, changeDiscoverDate(e) { - this.hiddenForm.CREATTIME = e + this.hiddenForm.DISCOVERYTIME = e this.$forceUpdate(); //强制刷新 }, creatorChange(e) { @@ -1403,8 +1344,8 @@ }, hiddenLevelChange(e) { this.hiddenForm.HIDDENLEVEL_INDEX = e.detail.value; - this.hiddenForm.HIDDENLEVEL = this.hiddenLevelTreeList[e.detail.value].BIANMA; - this.hiddenForm.HIDDENLEVEL_NAME = this.hiddenLevelTreeList[e.detail.value].NAME; + this.hiddenForm.HIDDENLEVEL = this.hiddenLevelTreeList[e.detail.value].value; + this.hiddenForm.HIDDENLEVEL_NAME = this.hiddenLevelTreeList[e.detail.value].label; }, /** 坐标定位 */ showMapModal() { @@ -1479,54 +1420,6 @@ } }) }, - filterHiddenLevels(){ - this.hiddenLevelTreeList = this.hiddenLevelTreeList.filter(item => item.NAME != '重大隐患' && item.NAME !='轻微隐患'); - }, - getHiddenType: function () { - var _this = this; - uni.request({ - method: 'POST', - dataType: 'json', - header: { - 'Content-type': 'application/x-www-form-urlencoded' - }, - url: basePath + '/dictionaries/getLevels', - data: { - DICTIONARIES_ID: '3babc15144444bdc8d763d0af2bdfff8', - CORPINFO_ID:loginUser.CORPINFO_ID, - USER_ID:loginUser.USER_ID, - }, - success: function ({data}) { - for (let i = 0; i < data.list.length; i++) { - if (data.list[i].BIANMA.indexOf(loginUser.PROVINCE) > -1) { - _this.getTrainDicList(data.list[i].DICTIONARIES_ID) - break - } - } - } - }); - }, - getTrainDicList(parentId) { // trainDicList - var _this = this; - uni.request({ - method: 'POST', - dataType: 'json', - header: { - 'Content-type': 'application/x-www-form-urlencoded' - }, - url: basePath + '/dictionaries/listAllDictToParId', - data: { - parentId, - CORPINFO_ID:loginUser.CORPINFO_ID, - USER_ID:loginUser.USER_ID, - }, - success: function ({data}) { - let zTreeNodes = data.zTreeNodes - zTreeNodes = zTreeNodes.replace(/"nodes":\[/g, '"children":[') - _this.hiddenTypeList = JSON.parse(zTreeNodes) - } - }); - }, //获取数据字典数据 getDict() { var _this = this; @@ -1570,22 +1463,32 @@ } }) - uni.request({ - method: 'POST', - dataType: 'json', - header: { - 'Content-type': 'application/x-www-form-urlencoded' - }, - url: basePath + '/dictionaries/getLevels?tm=' + new Date().getTime(), - data: { - DICTIONARIES_ID: '5e7cf8620ba54ad89719d0be62133c7a', - }, - success: function (res) { - _this.hiddenLevelTreeList = res.data.list; - _this.filterHiddenLevels(); - } - }); - + // uni.request({ + // method: 'POST', + // dataType: 'json', + // header: { + // 'Content-type': 'application/x-www-form-urlencoded' + // }, + // url: basePath + '/dictionaries/listSelectTreeByTkiTree?tm=' + new Date().getTime(), + // data: { + // DICTIONARIES_ID: '5e7cf8620ba54ad89719d0be62133c7a' + // }, + // success: function(res) { + // var data = JSON.parse(res.data.zTreeNodes); + // for (let i = 0; i < data.length; i++) { + // for (let j = 0; j < data[i].children.length; j++) { + // if (data[i].children[j].id == 'jdyh001' || data[i].children[j].id == + // 'hiddenLevel1001') { + // data[i].children.splice(j, 1) + // } + // } + // if (data[i].id == 'hiddenLevel0002') { + // data.splice(i, 1) + // } + // } + // _this.hiddenLevelTreeList = data + // } + // }) uni.request({ method: 'POST', @@ -1595,7 +1498,7 @@ }, url: basePath + '/dictionaries/listSelectTreeByTkiTree?tm=' + new Date().getTime(), data: { - DICTIONARIES_ID: 'b4a7325f96af40808ec64c85c162933d' + DICTIONARIES_ID: '3babc15144444bdc8d763d0af2bdfff6' }, success: function(res) { var jons = res.data.zTreeNodes; @@ -1656,7 +1559,7 @@ HIDDENTYPE2_NAME: '', LONGITUDE: '', // 隐患位置经度 LATITUDE: '', // 隐患位置纬度 - CREATTIME: '', // 隐患发现时间 + DISCOVERYTIME: '', // 隐患发现时间 HIDDENFINDDEPT: '', // 隐患发现部门（隐患责任人部门） HIDDENFINDDEPT_NAME: '', CREATOR: '', // 发现人（隐患责任人） diff --git a/pages/application/safety-environmental-inspection/apply/flowChart.vue b/pages/application/safety-environmental-inspection/apply/flowChart.vue index d4f9ff7..db9153b 100644 --- a/pages/application/safety-environmental-inspection/apply/flowChart.vue +++ b/pages/application/safety-environmental-inspection/apply/flowChart.vue @@ -11,6 +11,7 @@ + diff --git a/pages/application/safety-environmental-inspection/apply/list.vue b/pages/application/safety-environmental-inspection/apply/list.vue index e93f76f..d5a3a5a 100644 --- a/pages/application/safety-environmental-inspection/apply/list.vue +++ b/pages/application/safety-environmental-inspection/apply/list.vue @@ -17,7 +17,7 @@ - diff --git a/pages/application/safety-environmental-inspection/apply/show.vue b/pages/application/safety-environmental-inspection/apply/show.vue index 6daecd0..496a22d 100644 --- a/pages/application/safety-environmental-inspection/apply/show.vue +++ b/pages/application/safety-environmental-inspection/apply/show.vue @@ -245,7 +245,7 @@ {{hiddenForm.HIDDENPART_NAME || '请选择'}} - {{ hiddenForm.HIDDENPART }} + {{ hiddenForm.HIDDENPART_NAME }} @@ -274,31 +274,31 @@ @cancel="zgtreeCancel"> - - - - - - - - + + 是否相关方 + {{ hiddenForm.ISRELEVANT=='1'?'是':'否' }} + + + 隐患部位描述 + {{ hiddenForm.POSITIONDESC }} + 隐患发现时间 - - - - - - - - - - - - - + + 隐患上报位置： + + + + 经度： + {{hiddenForm.LONGITUDE}} + + + 纬度： + {{hiddenForm.LATITUDE}} + 隐患发现人 - - - 隐患描述 - - - {{pd.HIDDENDESCR}} - - + + {{pd.HIDDENDESCR}} + @@ -24,8 +19,8 @@ 隐患快报 清单排查 - 安全环保检查 - 安全环保检查 + 安全环保检查（监管端） + 安全环保检查（企业端） 消防检查 @@ -53,16 +48,16 @@ {{pd.RISK_DESCR}} - - - - - - - - - - + + + 隐患上报位置（经纬度） + + + + {{ pd.LONGITUDE && pd.LONGITUDE.length>6?pd.LONGITUDE.substr(0,6):pd.LONGITUDE}},{{pd.LATITUDE && pd.LATITUDE.length>6?pd.LATITUDE.substr(0,6):pd.LATITUDE}} + + + 风险分级 @@ -87,14 +82,14 @@ {{pd.HIDDENDESCR}} --> - - - - - - - - + + + 隐患部位 + + + {{pd.hregionName}} + + 隐患发现人 @@ -116,7 +111,7 @@ 隐患类型 - {{pd.HIDDENTYPE_NAME}} + {{pd.HIDDENTYPENAME}} - - - + + 整改期限 + {{form.RECTIFICATIONDEADLINE}} + 隐患照片 - - 隐患视频 @@ -70,26 +68,26 @@ 发现时间 {{form.CREATTIME}} - - - - - - - - - - - - - - - + + 是否相关方 + {{form.ISRELEVANT =="1"?"是":"否"}} + + + 隐患上报位置 + + 经度:{{form.LATITUDE&&form.LATITUDE}} + 纬度:{{form.LATITUDE&&form.LONGITUDE}} + + + + 隐患位置描述 + {{ form.POSITIONDESC }} + - - - - + + 隐患确认信息 + 查看 + @@ -102,17 +100,11 @@ 隐患级别 - + {{item.editLevelName}} - 整改负责人 @@ -290,59 +282,21 @@ - - + - 安全环保检查隐患指派整改人 + 安全环保检查隐患指派确认人 - - - - 整改负责人部门 - - - - - - - - {{ form.RECTIFICATIONDEPTNAME || '请选择' }} - - - - - - 整改负责人： - - - - - - - - {{ form.RECTIFICATIONORNAME || '请选择' }} - + + 隐患确认人 + + + {{form.conUserName?form.conUserName:'请选择'}} + - - - 整改期限 - - - {{ form.RECTIFICATIONDEADLINE ? form.RECTIFICATIONDEADLINE : '请选择' }} - - - - - - - - - + {{form.conUserName}} + @@ -391,42 +345,39 @@ baseImgPath: baseImgPath, isUps: false, noClick: true, - levelList: [], treeNode: [],//部门下拉数据 INSPECTION_ID: '', // 检查ID HIDDEN_ID: '', // 检查ID HIDDEN_STATUS: '', // 检查ID - principalList: [], form: { - RECTIFICATIONORNAME:'', HIDDENDESCR: '', // 隐患描述 CREATORNAME: '', // 隐患责任人 HIDDENLEVELNAME: '', // 隐患级别 DISCOVERYTIME: '', // 隐患发现时间 hregionName: '', // 隐患部位 HIDDENPART: '', // 隐患部位 - HIDDENTYPE_NAME: '', // 隐患类型1 + HIDDENTYPENAME: '', // 隐患类型1 HIDDENTYPENAME2: '', // 隐患类型2 LONGITUDE: '', // 隐患坐标经度 LATITUDE: '', // 隐患坐标纬度 hiddenImgs: [], // 隐患图片 hiddenVideos: [], // 隐患视频 - PRINCIPAL_INDEX: '', + RECTIFICATIONTYPE: '2', // 隐患处置 conUserIndex: '', CONFIRM_USER: '', // 隐患确认人 conUserName: '', HIDDEN_ID: '', - POSITIONDESC: '',//隐患位置描述 + POSITIONDESC: '', },// 数据 files: [], hiddenVideo: [], + confirmUserAllList: [], // 隐患确认人下拉数据 videoSrc: '', todayDate: '', modalShow: false, seeHiddenConfirm: '2', - hiddenExamineList:[], - rectifyPlanCompletionStartTime: '', + hiddenExamineList:[] } }, @@ -439,82 +390,14 @@ this.HIDDEN_ID = event.HIDDEN_ID; this.HIDDEN_STATUS = event.HIDDEN_STATUS; this.getData(); + // 初始化现场作业负责人 this.getDept() + this.getDict() loginSession(); - this.rectifyPlanCompletionStartTime = formatDate(tomorrow, 'yyyy-MM-dd'); }, methods: { - changeDate(e) { - this.form.RECTIFICATIONDEADLINE = e.detail.value - this.$forceUpdate();//强制刷新 - }, - showZgTree(ref) { - this.$refs[ref]._show(); - }, - principalChange(e) { - this.$set(this.form, 'RECTIFICATIONOR', this.principalList[e.detail.value].USER_ID) - this.$set(this.form, 'RECTIFICATIONORNAME', this.principalList[e.detail.value].NAME) - }, - zgtreeConfirm(e, list) { - if (list === "principalList") { - this.$set(this.form, 'RECTIFICATIONDEPT', e[0].id) - this.$set(this.form, 'RECTIFICATIONDEPTNAME', e[0].name) - this.$set(this.form, 'RECTIFICATIONORNAME', '') - } - this.getUserList(list, e[0].id); - }, - zgtreeCancel(e) { - this.isUps = false; - }, - hiddenLevenConfirm(e) { - this.isUps = false; - this.pd.HIDDENLEVEL = e[0].id; - this.pd.HIDDENLEVELNAME = e[0].name; - - if (e[0].id == 'hiddenLevel1001') { - this.showStatus = false - } else { - this.showStatus = true - } - }, - // 取消回调事件 - hiddentreeCancel(e) { - this.isUps = false; - }, - showHiddenLevenTreeTree() { - var _this = this; - uni.request({ - method: 'POST', - dataType: 'json', - header: { - 'Content-type': 'application/x-www-form-urlencoded' - }, - url: basePath + '/dictionaries/listSelectTreeByTkiTree?tm=' + new Date().getTime(), - data: {DICTIONARIES_ID: '5e7cf8620ba54ad89719d0be62133c7a'}, - success: function (res) { - // _this.levelList = JSON.parse(data.zTreeNodes) res.data.zTreeNodes; - var jons = res.data.zTreeNodes; - // var json2 = jons.replace('nodes', 'children'); - // console.info(json2) - var data = JSON.parse(jons); - for (let i = 0; i < data.length; i++) { - for (let j = 0; j < data[i].children.length; j++) { - if (data[i].children[j].id == 'jdyh001') { - data[i].children.splice(j, 1) - } - } - if (data[i].id == 'hiddenLevel0002') { - data.splice(i, 1) - } - } - _this.levelList = data - } - }); - this.isUps = true - _this.$refs.hiddenLevenTree._show(); - }, getData() { var _this = this; uni.showLoading({ @@ -533,9 +416,7 @@ if ("success" == res.data.result) { uni.hideLoading(); _this.form = Object.assign(this.form, res.data.pd) //参数map - console.info( _this.form,'打印数据') - console.log("隐患位置描述:", _this.form.POSITIONDESC); - console.log("图片:", res.data.hImgs); + console.info( _this.form.conUserName) _this.files = res.data.hImgs; _this.hiddenVideo = res.data.hiddenVideo _this.hiddenExamineList = res.data.hiddenExa @@ -551,7 +432,7 @@ ViewShowImage(e) { let files = []; for (var i = 0; i < this.files.length; i++) { - files.push(baseImgPath + this.files[i].FILEPATH) + files.push(baseImgPath + '/' + this.files[i].FILEPATH) } uni.previewImage({ urls: files, @@ -562,109 +443,58 @@ this.videoSrc = e.currentTarget.dataset.src this.modalShow = true }, - submit() { - var _this = this; - // 在发送请求之前进行非空校验 - if (!_this.form.RECTIFICATIONDEPT) { - uni.showToast({ - icon: 'none', - title: '整改负责人部门不能为空', - duration: 2000 - }); - return; - } - if (!_this.form.RECTIFICATIONOR) { - uni.showToast({ - icon: 'none', - title: '整改负责人不能为空', - duration: 2000 - }); - return; - } - if (!_this.form.RECTIFICATIONDEADLINE) { - uni.showToast({ - icon: 'none', - title: '整改期限不能为空', - duration: 2000 - }); - return; - } - uni.showLoading({ - title: '数据保存中' - }); - uni.request({ - url: basePath + "/app/hidden/confirm", - method: 'POST', - dataType: 'json', - header: { - 'Content-type': 'application/x-www-form-urlencoded' - }, - data: { - ..._this.form, - CORPINFO_ID: corpinfoId, - USER_ID: loginUser.USER_ID, - USERNAME: loginUser.NAME, - HIDDEN_ID: _this.form.HIDDEN_ID, - HIDDENLEVEL: _this.form.HIDDENLEVEL, - RECTIFICATIONDEPT: _this.form.RECTIFICATIONDEPT, - RECTIFICATIONDEADLINE: _this.form.RECTIFICATIONDEADLINE, - RECTIFICATIONOR: _this.form.RECTIFICATIONOR, - OPERATOR: loginUser.USER_ID, - NAME: loginUser.NAME, - HIDDEN_STATUS: this.HIDDEN_STATUS, - INSPECTION_ID: this.INSPECTION_ID, - HIDDENDESCR: this.form.HIDDENDESCR - }, - success: (res) => { - if ("success" == res.data.result) { - uni.hideLoading(); - _this.goback() - } else { - uni.showToast({ - title: res.data.msaesge, - duration: 2000 - }); + setConUser(e) { + this.form.conUserIndex = e.detail.value; + this.form.CONFIRM_USER = this.confirmUserAllList[e.detail.value].USER_ID; + this.form.conUserName = this.confirmUserAllList[e.detail.value].NAME; + this.$forceUpdate();//强制刷新 + }, + submit() { + var _this = this; + let required = true + uni.showLoading({ + title: '数据保存中' + }) + if(_this.form.CONFIRM_USER == ""){ + uni.showToast({ + icon: 'none', + title: '请选择确认人', + duration: 1500 + }); + required = false } - }, - fail: (err) => { - uni.hideLoading(); - uni.showModal({ - content: err.errMsg, - showCancel: false + if (!required) { + return + } + uni.request({ + url: basePath + '/app/hidden/assign', + method: 'POST', + dataType: 'json', + header: { + 'Content-type': 'application/x-www-form-urlencoded' + }, + data: { + ..._this.form, + OPERATOR: loginUser.USER_ID, + NAME: loginUser.NAME, + CORPINFO_ID: corpinfoId, + HIDDEN_STATUS: this.HIDDEN_STATUS, + INSPECTION_ID: this.INSPECTION_ID, + HIDDENDESCR: this.form.HIDDENDESCR + }, + success: (res) => { + if ("success" == res.data.result) { + uni.hideLoading(); + _this.goback() + } else { + uni.showToast({ + title: res.data.msaesge, + duration: 2000 + }); + } + } }); - } - }); - - // // 提交请求 - // uni.request({ - // url: basePath + '/app/hidden/assign', - // method: 'POST', - // dataType: 'json', - // header: { - // 'Content-type': 'application/x-www-form-urlencoded' - // }, - // data: { - // ..._this.form, - // OPERATOR: loginUser.USER_ID, - // NAME: loginUser.NAME, - // CORPINFO_ID: corpinfoId, - // HIDDEN_STATUS: this.HIDDEN_STATUS, - // INSPECTION_ID: this.INSPECTION_ID, - // HIDDENDESCR: this.form.HIDDENDESCR - // }, - // success: (res) => { - // if ("success" == res.data.result) { - // uni.hideLoading(); - // _this.goback() - // } else { - // uni.showToast({ - // title: res.data.msaesge, - // duration: 2000 - // }); - // } - // } - // }); - }, + }, getDept() { var _this = this; @@ -721,6 +551,35 @@ } }) }, + //获取数据字典数据 + getDict() { + var _this = this; + + uni.request({ + method: 'POST', + dataType: 'json', + header: { + 'Content-type': 'application/x-www-form-urlencoded' + }, + url: basePath + '/app/user/getHiddenConfirm', + data: { + corpinfoId: corpinfoId, + IS_HAZARDCONFIRMER: '1', + tm: new Date().getTime() + }, + success: function (res) { + if ("success" == res.data.result) { + _this.confirmUserAllList = res.data.userList; + _this.$forceUpdate();//强制刷新 + } else { + uni.showToast({ + title: res.data.message, + duration: 2000 + }); + } + } + }) + }, goback() { var pages = getCurrentPages(); // 获取当前页面栈 @@ -757,6 +616,7 @@ }, downloadAppendix(DISPOSAL_FILE) { plus.runtime.openURL(this.baseImgPath + DISPOSAL_FILE, function (res) { + console.log(res); }); }, } @@ -766,12 +626,12 @@ diff --git a/pages/application/safety-environmental-inspection/archive/detail.vue b/pages/application/safety-environmental-inspection/archive/detail.vue index ffc77b9..a23e01f 100644 --- a/pages/application/safety-environmental-inspection/archive/detail.vue +++ b/pages/application/safety-environmental-inspection/archive/detail.vue @@ -176,7 +176,7 @@ - + @@ -204,10 +204,10 @@ 隐患部位 {{ hiddenForm.HIDDENPART_NAME?hiddenForm.HIDDENPART_NAME:hiddenForm.HIDDENPART }} - - - - + + 隐患位置描述 + + 隐患级别 @@ -223,29 +223,29 @@ 隐患类型2 {{ hiddenForm.HIDDENTYPE2_NAME }} --> - - + + 是否相关方 - - - - - + + 是 + 否 + + 隐患发现时间 - {{ hiddenForm.CREATTIME }} + {{ hiddenForm.DISCOVERYTIME }} + + + 隐患上报位置： + + + 经度： + {{hiddenForm.LONGITUDE}} + + + 纬度： + {{hiddenForm.LATITUDE}} - - - - - - - - - - - 隐患发现人 @@ -375,7 +375,7 @@ export default { HIDDENTYPE2_NAME: '', LONGITUDE: '', // 隐患位置经度 LATITUDE: '', // 隐患位置纬度 - CREATTIME: '', // 隐患发现时间 + DISCOVERYTIME: '', // 隐患发现时间 HIDDENFINDDEPT: '', // 隐患发现部门（隐患责任人部门） HIDDENFINDDEPT_NAME: '', CREATOR: '', // 发现人（隐患责任人） @@ -395,7 +395,7 @@ export default { /*{name:'HIDDENTYPE2',message:'请选择隐患类型2'},*/ {name:'LONGITUDE',message:'请选择隐患位置'}, {name:'LATITUDE',message:'请选择隐患位置'}, - {name:'CREATTIME',message:'请选择隐患发现时间'}, + {name:'DISCOVERYTIME',message:'请选择隐患发现时间'}, // {name:'HIDDENFINDDEPT',message:'请选择隐患责任人部门'}, {name:'CREATOR',message:'请选择隐患责任人'} ], @@ -457,6 +457,17 @@ export default { uni.navigateBack({delta: 1}); uni.hideLoading(); }, + + + + + + + + + + + uploadImg(hiddenList){ return new Promise((resolve, reject) => { var _this = this; @@ -882,7 +893,7 @@ export default { HIDDENTYPE2_NAME: '', LONGITUDE: '', // 隐患位置经度 LATITUDE: '', // 隐患位置纬度 - CREATTIME: '', // 隐患发现时间 + DISCOVERYTIME: '', // 隐患发现时间 HIDDENFINDDEPT: '', // 隐患发现部门（隐患责任人部门） HIDDENFINDDEPT_NAME: '', CREATOR: '', // 发现人（隐患责任人） diff --git a/pages/application/safety-environmental-inspection/archive/list-hidden.vue b/pages/application/safety-environmental-inspection/archive/list-hidden.vue index abbab8c..2e295ff 100644 --- a/pages/application/safety-environmental-inspection/archive/list-hidden.vue +++ b/pages/application/safety-environmental-inspection/archive/list-hidden.vue @@ -79,7 +79,7 @@ { ID: '', NAME: '请选择' }, { ID: '1', NAME: '待整改' }, { ID: '2', NAME: '待验收' }, - { ID: '3', NAME: '已整改' }, + { ID: '3', NAME: '已复查' }, { ID: '4', NAME: '已验收' }, { ID: '5', NAME: '忽略隐患' }, { ID: '6', NAME: '重大隐患' }, @@ -94,7 +94,7 @@ { ID: '16', NAME: '确认打回' }, { ID: '100', NAME: '安全环保检查暂存的隐患' }, { ID: '100', NAME: '检查已归档，待指派' }, - { ID: '101', NAME: '待指派整改人' }, + { ID: '101', NAME: '待指派确认人' }, { ID: '-1', NAME: '已过期' }, { ID: '-2', NAME: '待确认' } ], diff --git a/pages/application/safety-environmental-inspection/defense-record/list.vue b/pages/application/safety-environmental-inspection/defense-record/list.vue index 8251f7e..be4720a 100644 --- a/pages/application/safety-environmental-inspection/defense-record/list.vue +++ b/pages/application/safety-environmental-inspection/defense-record/list.vue @@ -8,7 +8,7 @@ - diff --git a/pages/application/safety-environmental-inspection/home.vue b/pages/application/safety-environmental-inspection/home.vue index 9d77a37..99e91bf 100644 --- a/pages/application/safety-environmental-inspection/home.vue +++ b/pages/application/safety-environmental-inspection/home.vue @@ -125,6 +125,7 @@ } }) }, +<<<<<<<< HEAD:pages/application/safety-environmental-inspection/home.vue getData(){ var _this = this; uni.showLoading({ @@ -156,6 +157,35 @@ } }) }, +======== + // getData(){ + // var _this = this; + // uni.showLoading({ + // title:"加载中..." + // });//加载中动画 + // uni.request({ + // url: basePath +'/app/breakground/countCheck', + // method: 'POST', + // dataType: 'json', + // header: { + // 'Content-type':'application/x-www-form-urlencoded' + // }, + // data: { + // tm:new Date().getTime(), + // CORPINFO_ID:loginUser.CORPINFO_ID, + // USER_ID:loginUser.USER_ID, + // }, + // success: (res) => { + // uni.hideLoading();//结束加载中动画 + // if ("success" == res.data.result) { + // _this.count = res.data.count; + // _this.$forceUpdate() + // } + // + // } + // }) + // }, +>>>>>>>> origin/master:pages/application/break-ground/home.vue } } diff --git a/pages/application/safety-environmental-inspection/inspected/detail.vue b/pages/application/safety-environmental-inspection/inspected/detail.vue index 920455c..68dcac4 100644 --- a/pages/application/safety-environmental-inspection/inspected/detail.vue +++ b/pages/application/safety-environmental-inspection/inspected/detail.vue @@ -125,7 +125,7 @@ 检查人签字： - + {{item.INSPECTION_USER_SIGN_TIME}} @@ -220,10 +220,10 @@ {{ hiddenForm.HIDDENPART_NAME?hiddenForm.HIDDENPART_NAME:hiddenForm.HIDDENPART }} - - - - + + 隐患位置描述 + {{ hiddenForm.POSITIONDESC }} + 隐患级别 @@ -235,10 +235,10 @@ {{ hiddenForm.HIDDENTYPE_NAME }} - - - - + + 是否相关方 + {{ hiddenForm.ISRELEVANT == '1'?'是':'否' }} + 隐患发现时间 - {{ hiddenForm.CREATTIME }} + {{ hiddenForm.DISCOVERYTIME }} + + + 隐患上报位置： + + + 经度： + {{hiddenForm.LONGITUDE}} + + + 纬度： + {{hiddenForm.LATITUDE}} - - - - - - - - - - - 隐患发现人 @@ -347,8 +347,7 @@ INSPECTION_DEPARTMENT_NAME: '', INSPECTION_USER_ID: '', //检查人员ID INSPECTION_USER_INDEX: '', - INSPECTION_USER_NAME: '', - INSPECTION_USER_SIGN_IMG: '', + INSPECTION_USER_NAME: '' }], // 检查人员 inspectorVerifyList: [], situationList: @@ -391,7 +390,7 @@ HIDDENTYPE2_NAME: '', LONGITUDE: '', // 隐患位置经度 LATITUDE: '', // 隐患位置纬度 - CREATTIME: '', // 隐患发现时间 + DISCOVERYTIME: '', // 隐患发现时间 HIDDENFINDDEPT: '', // 隐患发现部门（隐患责任人部门） HIDDENFINDDEPT_NAME: '', CREATOR: '', // 发现人（隐患责任人） @@ -414,7 +413,7 @@ /*{name:'HIDDENTYPE2',message:'请选择隐患类型2'},*/ {name:'LONGITUDE',message:'请选择隐患位置'}, {name:'LATITUDE',message:'请选择隐患位置'}, - {name:'CREATTIME',message:'请选择隐患发现时间'}, + {name:'DISCOVERYTIME',message:'请选择隐患发现时间'}, // {name:'HIDDENFINDDEPT',message:'请选择隐患责任人部门'}, {name:'CREATOR',message:'请选择隐患发现人'} ], @@ -468,10 +467,6 @@ if ("success" == res.data.result) { uni.hideLoading(); _this.form = res.data.pd; //参数map - console.log("打印后端响应数据:",res.data.pd) - _this.form.inspectorList.forEach((inspector, index) => { - console.log(`检查人员${index + 1}签字信息:`, inspector); - }); for (let i = 0; i < _this.form.inspectorList.length; i++) { _this.inspectorList.push([]) _this.getUserList('inspectorList', _this.form.inspectorList[i].INSPECTION_DEPARTMENT_ID, i) @@ -502,6 +497,7 @@ var _this = this; let i = e.currentTarget.dataset.index uni.showModal({ + title: '秦港-双基双控', content: '确定要删除这张图片吗？', cancelColor: "#000000", cancelText: '取消', @@ -842,7 +838,7 @@ this.modalShow1 = true }, changeDiscoverDate(e) { - this.hiddenForm.CREATTIME = e + this.hiddenForm.DISCOVERYTIME = e this.$forceUpdate();//强制刷新 }, creatorChange(e) { @@ -1018,7 +1014,7 @@ HIDDENTYPE2_NAME: '', LONGITUDE: '', // 隐患位置经度 LATITUDE: '', // 隐患位置纬度 - CREATTIME: '', // 隐患发现时间 + DISCOVERYTIME: '', // 隐患发现时间 HIDDENFINDDEPT: '', // 隐患发现部门（隐患责任人部门） HIDDENFINDDEPT_NAME: '', CREATOR: '', // 发现人（隐患责任人） diff --git a/pages/application/safety-environmental-inspection/inspector/detail.vue b/pages/application/safety-environmental-inspection/inspector/detail.vue index 1168752..f096046 100644 --- a/pages/application/safety-environmental-inspection/inspector/detail.vue +++ b/pages/application/safety-environmental-inspection/inspector/detail.vue @@ -137,6 +137,7 @@ + 核实结果： @@ -220,10 +221,10 @@ 隐患部位 {{ hiddenForm.HIDDENPART_NAME?hiddenForm.HIDDENPART_NAME:hiddenForm.HIDDENPART }} - - - - + + 隐患部位描述 + {{ hiddenForm.POSITIONDESC }} + 隐患级别 @@ -232,27 +233,27 @@ 隐患类型 - {{ hiddenForm.HIDDENTYPE_NAME || hiddenForm.HIDDENTYPE2_NAME }} + {{ hiddenForm.HIDDENTYPE_NAME }} - - - - + + 是否相关方 + {{ hiddenForm.ISRELEVANT == '1'?'是':'否' }} + 隐患发现时间 - {{ hiddenForm.CREATTIME }} + {{ hiddenForm.DISCOVERYTIME }} + + + 隐患上报位置： + + + 经度： + {{hiddenForm.LONGITUDE}} + + + 纬度： + {{hiddenForm.LATITUDE}} - - - - - - - - - - - 隐患发现人 @@ -382,7 +383,7 @@ HIDDENTYPE2_NAME: '', LONGITUDE: '', // 隐患位置经度 LATITUDE: '', // 隐患位置纬度 - CREATTIME: '', // 隐患发现时间 + DISCOVERYTIME: '', // 隐患发现时间 HIDDENFINDDEPT: '', // 隐患发现部门（隐患责任人部门） HIDDENFINDDEPT_NAME: '', CREATOR: '', // 发现人（隐患责任人） @@ -404,7 +405,7 @@ /*{name:'HIDDENTYPE2',message:'请选择隐患类型2'},*/ {name:'LONGITUDE',message:'请选择隐患位置'}, {name:'LATITUDE',message:'请选择隐患位置'}, - {name:'CREATTIME',message:'请选择隐患发现时间'}, + {name:'DISCOVERYTIME',message:'请选择隐患发现时间'}, // {name:'HIDDENFINDDEPT',message:'请选择隐患责任人部门'}, {name:'CREATOR',message:'请选择隐患责任人'} ], @@ -464,7 +465,6 @@ if ("success" == res.data.result) { uni.hideLoading(); _this.form = res.data.pd; //参数map - _this.form.hiddenForm = res.data.pd.hiddenList[0]; for (let i = 0; i < _this.form.inspectorList.length; i++) { _this.inspectorList.push([]) _this.getUserList('inspectorList', _this.form.inspectorList[i].INSPECTION_DEPARTMENT_ID, i) @@ -489,7 +489,6 @@ subCanvas (e) { this.signImgList.splice(0, this.signImgList.length); this.signImgList.push(e); - this.inspectorForm.INSPECTION_USER_SIGN_IMG = e.filePath; this.$set(this.inspectorForm, 'INSPECTION_USER_SIGN_TIME', formatDate(new Date(), 'yyyy-MM-dd hh:mm')) this.modalShow = false; }, @@ -497,6 +496,7 @@ var _this = this; let i = e.currentTarget.dataset.index uni.showModal({ + title: '秦港-双基双控', content: '确定要删除这张图片吗？', cancelColor: "#000000", cancelText: '取消', @@ -571,6 +571,7 @@ } }) }, + changeStartDate(e) { this.form.INSPECTION_TIME_START = e this.$forceUpdate();//强制刷新 @@ -615,19 +616,19 @@ this.hiddenForm.HIDDENPART = e[0].id this.hiddenForm.HIDDENPART_NAME = e[0].name } - if (list === 'hiddenLevelTreeList') { + if (list === 'hiddenLevelTreeList') { // 隐患级别 this.hiddenForm.HIDDENLEVEL = e[0].id this.hiddenForm.HIDDENLEVEL_NAME = e[0].name } - if (list === 'hiddenTypeTreeList') { + if (list === 'hiddenTypeTreeList') { // 隐患级别 this.hiddenForm.HIDDENTYPE = e[0].id this.hiddenForm.HIDDENTYPE_NAME = e[0].name } - if (list === 'hiddenType2TreeList') { + if (list === 'hiddenType2TreeList') { // 隐患级别 this.hiddenForm.HIDDENTYPE2 = e[0].id this.hiddenForm.HIDDENTYPE2_NAME = e[0].name } - if (list === 'creatorList') { + if (list === 'creatorList') { // 隐患级别 this.hiddenForm.HIDDENFINDDEPT = e[0].id this.hiddenForm.HIDDENFINDDEPT_NAME = e[0].name this.hiddenForm.CREATOR_INDEX = '' @@ -725,6 +726,7 @@ }, ViewImage(e) { if(e.currentTarget.dataset.type==0) { + console.info(33333) let files =[]; for(var i=0;i - 交运安全首页 + 秦安安全首页 @@ -54,7 +54,7 @@ --> @@ -64,7 +64,8 @@ --> - + + @@ -72,7 +73,7 @@ 人员信息 - + @@ -80,8 +81,7 @@ 工作安排 - - @@ -90,7 +90,7 @@ 风险分布 - + @@ -99,8 +99,9 @@ - - - - - - - - - - 安全例会 - - - - - - - - 行车三检 - + v-show="premission.education"> @@ -154,20 +130,18 @@ 学习园地 - - - + {{ safetyEnvironmentalInspection }} + - + + + @@ -356,7 +338,7 @@ - + @@ -457,7 +439,7 @@ - + @@ -589,181 +571,312 @@ import { updateInfo } from '@/common/tool.js'; - import MescrollMixin from "@/components/mescroll-uni/mescroll-mixins.js"; - import maoScroll from '@/components/mao-scroll/mao-scroll.vue'; - import ykAuthpup from "@/components/yk-authpup/yk-authpup"; - export default { - components: { - maoScroll, - ykAuthpup - }, - mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件) - data() { - return { - keyProjectManagement: '', - safetyEnvironmentalInspection: 0, //安全环保总数 - permissionID: '', - premission: {}, - noClick: true, - StatusBar: this.StatusBar, - StatusBarb: this.StatusBar + 50, - hidCount: [], - hdCount: {}, - userCount: { - check_count: 0, - hidden_count: 0, - rectify_count: 0 - }, - deptCount: { - check_count: 0, - hidden_count: 0, - rectify_count: 0 - }, - superviseDeptCount: { - check_count: 0, - hidden_count: 0, - rectify_count: 0 - }, - today: '', - triggered: false, - count: {}, - totalList: [], - hiddenList: [], - SURVEY_ID: '', - IS_PUBLISH: '', - isGoodsEdit: false, // 是否加载编辑后的数据 - downOption: { - mustToTop: true, - }, - upOption: { - use: false, // 禁止上拉 - toTop: { - src: '' // 不显示回到顶部按钮 - } - }, - isRest: '', - showNum: 4, - lineHeight: 60, - animationScroll: 180, - animation: 3000, - rollData: [], - eight_work_count: 0, - updataPd: {}, - modalName: '', - loginCorpId: '' - }; - }, - mounted() { - loginSession() - this.getUpdateInfo() - let now = new Date(); - var today = formatDate(now, 'yyyy-MM-dd'); - - this.loginCorpId = loginUser.CORPINFO_ID - if (loginUser.CORPINFO_ID) { - this.getSafetyEnvironmentalInspectionCount(); - this.getIsRest(); - this.getData(); - // this.getSurveyData(); - this.getListData(); - // 获取隐患播报滚动 - this.getHiddenRoll(); - } - // this.getUserId(); - // this._freshing = false; - // setTimeout(() => { - // this.triggered = true; - // }, 1000) +import MescrollMixin from "@/components/mescroll-uni/mescroll-mixins.js"; +import maoScroll from '@/components/mao-scroll/mao-scroll.vue'; +import ykAuthpup from "@/components/yk-authpup/yk-authpup"; +export default { + components: { + maoScroll,ykAuthpup + }, + mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件) + data() { + return { + safetyEnvironmentalInspection:0,//安全环保总数 + permissionID:'', + premission: {}, + noClick: true, + StatusBar: this.StatusBar, + StatusBarb: this.StatusBar + 50, + hidCount: [], + hdCount: {}, + userCount: {}, + deptCount: {}, + superviseDeptCount: {}, + today: '', + triggered: false, + count: {}, + totalList: [], + SURVEY_ID: '', + IS_PUBLISH: '', + isGoodsEdit: false, // 是否加载编辑后的数据 + downOption: { + mustToTop: true, + }, + upOption: { + use: false, // 禁止上拉 + toTop: { + src: '' // 不显示回到顶部按钮 + } + }, + isRest: '', + showNum: 4, + lineHeight: 60, + animationScroll: 180, + animation: 3000, + rollData: [], + eight_work_count: 0, + updataPd: {}, + modalName:'' + }; + }, + mounted() { + loginSession() + this.getSafetyEnvironmentalInspectionCount(); + this.getUpdateInfo() + this.premission = Object.assign({}, premission) + let now = new Date(); + var today = formatDate(now, 'yyyy-MM-dd'); + if (!this.premission || JSON.stringify(this.premission) === '{}') { + this.getMenu(); + } + this.getIsRest(); + this.getData(); + this.getSurveyData(); + // this.getUserId(); + this.getListData(); + // 获取隐患播报滚动 + this.getHiddenRoll(); + // this._freshing = false; + // setTimeout(() => { + // this.triggered = true; + // }, 1000) this.eight_work_count = 0 this.getRedPoint() - }, - // onPullDownRefresh() { - // console.log('refresh'); - // setTimeout(function () { - // uni.stopPullDownRefresh(); - // }, 1000); - // }, - methods: { - getSafetyEnvironmentalInspectionCount() { - var _this = this; - return new Promise((resolve, reject) => { - uni.request({ - url: basePath + '/app/safetyenvironmental/countCheck', - method: 'POST', - dataType: 'json', - header: { - 'Content-type': 'application/x-www-form-urlencoded' - }, - data: { - CORPINFO_ID: corpinfoId, - INSPECTION_USER_ID: loginUser.USER_ID, - INSPECTED_SITEUSER_ID: loginUser.USER_ID, - INSPECTION_ORIGINATOR_ID: loginUser.USER_ID, - tm: new Date().getTime() - }, - success: (res) => { - if ("success" == res.data.result) { - _this.safetyEnvironmentalInspection = res.data.confirmCount - .confirmCount + - res.data.checkedCount.checkedCount + res.data.repulseCount - .repulseCount + - res.data.repulseAndCheckCount.repulseAndCheckCount - resolve(); - } - } - }); - }) - }, - getUpdateInfo() { - // console.info(updateInfo) - if (!updateInfo) { - var _this = this; - uni.request({ - url: projectManagerUrl + 'projectDetails/findUpdate?code=cloud&type=APP', - method: 'POST', - dataType: 'json', - header: { - 'Content-type': 'application/x-www-form-urlencoded' - }, - data: {}, - success: (res) => { - // console.info(res) - if (res.data.pd) { - // console.info(res.data.pd) - _this.modalName = 'Modal' - _this.updataPd = res.data.pd - } - } - }); - } - }, - IKnow() { - this.modalName = '' - setUpdateInfo(true) - // console.info(updateInfo) - }, - getRedPoint() { - uni.request({ - url: basePath + '/app/eightwork/checkWork', - method: 'POST', - dataType: 'json', - header: { - 'Content-type': 'application/x-www-form-urlencoded' - }, - data: { - USER_ID: loginUser.USER_ID, - }, - success: (res) => { - if ("success" == res.data.result) { - Object.values(res.data.count).forEach(item => { - this.eight_work_count += (item) - }) - } - } - }) - }, + }, + // onPullDownRefresh() { + // console.log('refresh'); + // setTimeout(function () { + // uni.stopPullDownRefresh(); + // }, 1000); + // }, + methods: { + getSafetyEnvironmentalInspectionCount(){ + var _this = this; + return new Promise((resolve, reject) => { + uni.request({ + url: basePath +'/app/safetyenvironmental/countCheck', + method: 'POST', + dataType: 'json', + header:{ + 'Content-type':'application/x-www-form-urlencoded' + }, + data: { + CORPINFO_ID:corpinfoId, + INSPECTION_USER_ID:loginUser.USER_ID, + INSPECTED_SITEUSER_ID: loginUser.USER_ID, + INSPECTION_ORIGINATOR_ID: loginUser.USER_ID, + tm:new Date().getTime() + }, + success: (res) => { + if ("success" == res.data.result) { + _this.safetyEnvironmentalInspection = res.data.confirmCount.confirmCount + + res.data.checkedCount.checkedCount+ res.data.repulseCount.repulseCount + +res.data.repulseAndCheckCount.repulseAndCheckCount + resolve(); + } + } + }); + }) + }, + getUpdateInfo() { + // console.info(updateInfo) + if (!updateInfo) { + var _this = this; + uni.request({ + url: projectManagerUrl + 'projectDetails/findUpdate?code=cloud&type=APP', + method: 'POST', + dataType: 'json', + header: { + 'Content-type': 'application/x-www-form-urlencoded' + }, + data: {}, + success: (res) => { + // console.info(res) + if (res.data.pd) { + // console.info(res.data.pd) + _this.modalName = 'Modal' + _this.updataPd = res.data.pd + } + } + }); + } + }, + IKnow(){ + this.modalName = '' + setUpdateInfo(true) + // console.info(updateInfo) + }, + getRedPoint() { + // uni.request({ + // url: basePath + '/app/confinedspace/countCheck', + // method: 'POST', + // dataType: 'json', + // header: { + // 'Content-type': 'application/x-www-form-urlencoded' + // }, + // data: { + // tm: new Date().getTime(), + // CORPINFO_ID: loginUser.CORPINFO_ID, + // USER_ID: loginUser.USER_ID, + // }, + // success: (res) => { + // if ("success" == res.data.result) { + // Object.values(res.data.count).forEach(item => { + // this.eight_work_count += (item || 0) + // }) + // } + // } + // }) + + // uni.request({ + // url: basePath + '/app/blindboard/countCheck', + // method: 'POST', + // dataType: 'json', + // header: { + // 'Content-type': 'application/x-www-form-urlencoded' + // }, + // data: { + // tm: new Date().getTime(), + // CORPINFO_ID: loginUser.CORPINFO_ID, + // USER_ID: loginUser.USER_ID, + // }, + // success: (res) => { + // if ("success" == res.data.result) { + // Object.values(res.data.count).forEach(item => { + // this.eight_work_count += (item || 0) + // }) + // } + // } + // }) + + // uni.request({ + // url: basePath + '/app/breakground/countCheck', + // method: 'POST', + // dataType: 'json', + // header: { + // 'Content-type': 'application/x-www-form-urlencoded' + // }, + // data: { + // tm: new Date().getTime(), + // CORPINFO_ID: loginUser.CORPINFO_ID, + // USER_ID: loginUser.USER_ID, + // }, + // success: (res) => { + // if ("success" == res.data.result) { + // Object.values(res.data.count).forEach(item => { + // this.eight_work_count += (item || 0) + // }) + // } + // } + // }) + + // uni.request({ + // url: basePath + '/app/highwork/countCheck', + // method: 'POST', + // dataType: 'json', + // header: { + // 'Content-type': 'application/x-www-form-urlencoded' + // }, + // data: { + // tm: new Date().getTime(), + // CORPINFO_ID: loginUser.CORPINFO_ID, + // USER_ID: loginUser.USER_ID, + // }, + // success: (res) => { + // if ("success" == res.data.result) { + // Object.values(res.data.count).forEach(item => { + // this.eight_work_count += (item || 0) + // }) + // } + // } + // }) + + // uni.request({ + // url: basePath + '/app/hoisting/countCheck', + // method: 'POST', + // dataType: 'json', + // header: { + // 'Content-type': 'application/x-www-form-urlencoded' + // }, + // data: { + // tm: new Date().getTime(), + // CORPINFO_ID: loginUser.CORPINFO_ID, + // USER_ID: loginUser.USER_ID, + // }, + // success: (res) => { + // if ("success" == res.data.result) { + // Object.values(res.data.count).forEach(item => { + // this.eight_work_count += (item || 0) + // }) + // } + // } + // }) + + // uni.request({ + // url: basePath + '/app/electricity/countCheck', + // method: 'POST', + // dataType: 'json', + // header: { + // 'Content-type': 'application/x-www-form-urlencoded' + // }, + // data: { + // tm: new Date().getTime(), + // CORPINFO_ID: loginUser.CORPINFO_ID, + // USER_ID: loginUser.USER_ID, + // }, + // success: (res) => { + // if ("success" == res.data.result) { + // Object.values(res.data.count).forEach(item => { + // this.eight_work_count += (item || 0) + // }) + // } + // } + // }) + + // uni.request({ + // url: basePath + '/app/hotwork/countCheck', + // method: 'POST', + // dataType: 'json', + // header: { + // 'Content-type': 'application/x-www-form-urlencoded' + // }, + // data: { + // tm: new Date().getTime(), + // CORPINFO_ID: loginUser.CORPINFO_ID, + // USER_ID: loginUser.USER_ID, + // }, + // success: (res) => { + // if ("success" == res.data.result) { + // Object.values(res.data.count).forEach(item => { + // this.eight_work_count += (item || 0) + // }) + // } + // } + // }) + + // uni.request({ + // url: basePath + '/app/cutroad/countCheck', + // method: 'POST', + // dataType: 'json', + // header: { + // 'Content-type': 'application/x-www-form-urlencoded' + // }, + // data: { + // tm: new Date().getTime(), + // CORPINFO_ID: loginUser.CORPINFO_ID, + // USER_ID: loginUser.USER_ID, + // }, + // success: (res) => { + // if ("success" == res.data.result) { + // Object.values(res.data.count).forEach(item => { + // this.eight_work_count += (item || 0) + // }) + // } + // } + // }) + }, getMenu() { var _this = this; @@ -873,12 +986,10 @@ import { }); }, async downCallback(page) { - if (loginUser.CORPINFO_ID) { - await this.getWork(); - await this.getUserData(); - await this.getDeptData(); - await this.getSuperviseDeptData(); - } + await this.getWork(); + await this.getUserData(); + await this.getDeptData(); + await this.getSuperviseDeptData(); // await this.getMonth(); // await this.getYear(); await this.mescroll.endSuccess(); @@ -888,7 +999,7 @@ import { return new Promise((resolve, reject) => { var _this = this; uni.request({ - url: basePath + '/app/hidden/getCountByUserId', // /app/hidden/getCountByUserId + url: basePath + '/app/hidden/getCountByUserId', method: 'POST', dataType: 'json', header: { @@ -1038,126 +1149,124 @@ import { this.$forceUpdate(); resolve(); - } - } - }); - }) - }, - getYear() { - return new Promise((resolve, reject) => { - var _this = this; - //年隐患数 - uni.request({ - url: basePath + '/app/hidden/getIndexCount', - method: 'POST', - dataType: 'json', - header: { - 'Content-type': 'application/x-www-form-urlencoded' - }, - data: { - userId: loginUserId, - IS_YEAR: '1', - CORPINFO_ID: loginUser.CORPINFO_ID, - USER_ID: loginUser.USER_ID, - }, - success: (res) => { - if (res.data != null) { - _this.hdCount.yearTotal = res.data.total; - _this.hdCount.yearChecked = res.data.checked; - _this.hdCount.yearUncheck = res.data.uncheck; - this.$forceUpdate(); - resolve(); - } - } - }); - }) - }, - getSurveyData() { - if (loginUser.CORPINFO_ID) { - var _this = this; - uni.showLoading({ - title: '请稍候' - }) - uni.request({ - url: basePath + '/app/survey/goEdit', - method: 'POST', - dataType: 'json', - header: { - 'Content-type': 'application/x-www-form-urlencoded' - }, - data: { - CORPINFO_ID: loginUser.CORPINFO_ID, - USER_ID: loginUser.USER_ID, - }, - success: (res) => { - if ("success" == res.data.result) { - uni.hideLoading(); - _this.SURVEY_ID = res.data.pd.SURVEY_ID - _this.IS_PUBLISH = res.data.pd.IS_PUBLISH - console.log(res.data) - // console.log(_this.SURVEY_ID) - console.log(_this.IS_PUBLISH) - } else if ("exception" == data.result) { - uni.showToast({ - title: '错误', - duration: 2000 - }); - } } - }); + } + }); + }) + }, + getYear() { + return new Promise((resolve, reject) => { + var _this = this; + //年隐患数 + uni.request({ + url: basePath + '/app/hidden/getIndexCount', + method: 'POST', + dataType: 'json', + header: { + 'Content-type': 'application/x-www-form-urlencoded' + }, + data: { + userId: loginUserId, + IS_YEAR: '1', + CORPINFO_ID: loginUser.CORPINFO_ID, + USER_ID: loginUser.USER_ID, + }, + success: (res) => { + if (res.data != null) { + _this.hdCount.yearTotal = res.data.total; + _this.hdCount.yearChecked = res.data.checked; + _this.hdCount.yearUncheck = res.data.uncheck; + this.$forceUpdate(); + resolve(); + } + } + }); + }) + }, + getSurveyData() { + var _this = this; + uni.showLoading({ + title: '请稍候' + }) + uni.request({ + url: basePath + '/app/survey/goEdit', + method: 'POST', + dataType: 'json', + header: { + 'Content-type': 'application/x-www-form-urlencoded' + }, + data: { + CORPINFO_ID:loginUser.CORPINFO_ID, + USER_ID:loginUser.USER_ID, + }, + success: (res) => { + if ("success" == res.data.result) { + uni.hideLoading(); + _this.SURVEY_ID = res.data.pd.SURVEY_ID + _this.IS_PUBLISH = res.data.pd.IS_PUBLISH + console.log(res.data) + // console.log(_this.SURVEY_ID) + console.log(_this.IS_PUBLISH) + } else if ("exception" == data.result) { + uni.showToast({ + title: '错误', + duration: 2000 + }); + } } - }, - getUserId() { - var _this = this; - uni.showLoading({ - title: '请稍候' - }) - uni.request({ - url: basePath + '/app/surveyanswer/getUserId', - method: 'POST', - dataType: 'json', - header: { - 'Content-type': 'application/x-www-form-urlencoded' - }, - data: { - CORPINFO_ID: loginUser.CORPINFO_ID, - USER_ID: loginUser.USER_ID - }, - success: (res) => { - if ("success" == res.data.result) { - uni.hideLoading(); - _this.count = res.data.count.count - // console.log(_this.count) - // console.log(res.data.count.count) - } else if ("exception" == data.result) { - uni.showToast({ - title: '错误', - duration: 2000 - }); - } - } - }); - }, - getData() { - var _this = this; - let now = new Date(); - _this.today = formatDate(now, 'yyyy-MM-dd'); - uni.request({ - url: basePath + '/app/hidden/getCountByUserId', - method: 'POST', - dataType: 'json', - header: { - 'Content-type': 'application/x-www-form-urlencoded' - }, - data: { - userId: loginUserId, - USER_NAME: loginUser.NAME, - CHECK_DEPARTMENT_ID: loginUser.DEPARTMENT_ID, - IS_MAIN: loginUser.ISMAIN, - CORPINFO_ID: loginUser.CORPINFO_ID, - USER_ID: loginUser.USER_ID, - }, - success: (res) => { + }); + }, + getUserId() { + var _this = this; + uni.showLoading({ + title: '请稍候' + }) + uni.request({ + url: basePath + '/app/surveyanswer/getUserId', + method: 'POST', + dataType: 'json', + header: { + 'Content-type': 'application/x-www-form-urlencoded' + }, + data: { + CORPINFO_ID:loginUser.CORPINFO_ID, + USER_ID:loginUser.USER_ID + }, + success: (res) => { + if ("success" == res.data.result) { + uni.hideLoading(); + _this.count = res.data.count.count + // console.log(_this.count) + // console.log(res.data.count.count) + } else if ("exception" == data.result) { + uni.showToast({ + title: '错误', + duration: 2000 + }); + } + } + }); + }, + getData() { + var _this = this; + let now = new Date(); + _this.today = formatDate(now, 'yyyy-MM-dd'); + uni.request({ + url: basePath + '/app/hidden/getCountByUserId', + method: 'POST', + dataType: 'json', + header: { + 'Content-type': 'application/x-www-form-urlencoded' + }, + data: { + userId: loginUserId, + USER_NAME: loginUser.NAME, + CHECK_DEPARTMENT_ID: loginUser.DEPARTMENT_ID, + IS_MAIN: loginUser.ISMAIN, + CORPINFO_ID: loginUser.CORPINFO_ID, + USER_ID: loginUser.USER_ID, + }, + success: (res) => { if (res.data != null) { _this.hidCount = res.data.hidCount; @@ -1284,52 +1393,6 @@ import { }, 2000); } }) - - uni.request({ - - url: basePath + '/app/hiddenDangerCheckStandardCustom/checkList', - method: 'POST', - dataType: 'json', - header: { - 'Content-type': 'application/x-www-form-urlencoded' - }, - data: { - USER_NAME: loginUser.NAME, - CHECK_DEPARTMENT_ID: loginUser.DEPARTMENT_ID, - IS_MAIN: loginUser.ISMAIN, - CORPINFO_ID: loginUser.CORPINFO_ID, - USER_ID: loginUser.USER_ID, - }, - success: (res) => { - if ("success" == res.data.result) { - uni.hideLoading(); - var content = res.data.varList; - for (var i = 0; i < content.length; i++) { - if (content[i].checkCount == 0) { - this.totalList.push(content[i]); - } else { - this.totalList.push(content[i]); - } - } - } else { - uni.showToast({ - icon: 'none', - title: '系统异常', - duration: 2000 - }); - } - }, - fail: (res) => { - uni.showToast({ - icon: 'none', - title: "服务器正在升级，请稍后再试。", - duration: 2000 - }); - setTimeout(function () { - plus.runtime.quit(); - }, 2000); - } - }) }, // 获得滚动隐患 getHiddenRoll() { @@ -1446,13 +1509,7 @@ import { for (var i = 0; i < _this.totalList.length; i++) { if (_this.totalList[i].LISTMANAGER_ID == listId) { flag = true; - if(_this.totalList[i].PERIOD) { - _this.goToList({listId: _this.totalList[i].LISTMANAGER_ID, listName: _this.totalList[i].NAME}); - break; - } - } else if (_this.totalList[i].CUSTOM_ID == listId) { - flag = true; - _this.goTohidden({listId: _this.totalList[i].CUSTOM_ID, listName: _this.totalList[i].NAME}); + _this.goToList({listId: _this.totalList[i].LISTMANAGER_ID, listName: _this.totalList[i].NAME}); break; } } @@ -1507,45 +1564,40 @@ import { // }); // // _this.goToList({listId:_this.totalList[i].LISTMANAGER_ID,listName:_this.totalList[i].NAME}); // } - // }); - // }, - //跳转事件 - goToexclude(e) { - this.$emit('setInit', true); - uni.navigateTo({ - url: '/pages/basics/hidden-danger-exclude/exclude-list', - }); - }, - goToDanger(e) { - this.$emit('setInit', true); - uni.navigateTo({ - url: '/pages/basics/danger-exclude/danger-exclude-list', - }); - }, - toSetinit(e) { - this.$emit('setInit', true); - }, - //跳转事件 - goToList(e) { - uni.navigateTo({ - url: '/pages/application/hidden-trouble-investigation/hidden-trouble-app/hidden-trouble-spot?listId=' + e.listId + '&listName=' + e.listName - }); - // uni.navigateTo({ - // url: '/pages/application/hidden-trouble-investigation/hidden-trouble-app/check-items-list?listId='+e.listId+'&listName='+e.listName - // }); - }, - goTohidden(e) { - uni.navigateTo({ - url: '/pages/application/hidden-danger-check-standard/custom/list-item?listId=' + e.listId + '&listName=' + e.listName - }); - }, - goToFace(userId) { - uni.navigateTo({ - url: '/pages/basics/recognitionFace/index?userId=' + userId - }); - } + // }); + // }, + //跳转事件 + goToexclude(e) { + this.$emit('setInit', true); + uni.navigateTo({ + url: '/pages/basics/hidden-danger-exclude/exclude-list', + }); + }, + goToDanger(e) { + this.$emit('setInit', true); + uni.navigateTo({ + url: '/pages/basics/danger-exclude/danger-exclude-list', + }); + }, + toSetinit(e) { + this.$emit('setInit', true); + }, + //跳转事件 + goToList(e) { + uni.navigateTo({ + url: '/pages/application/hidden-trouble-investigation/hidden-trouble-app/hidden-trouble-spot?listId=' + e.listId + '&listName=' + e.listName + }); + // uni.navigateTo({ + // url: '/pages/application/hidden-trouble-investigation/hidden-trouble-app/check-items-list?listId='+e.listId+'&listName='+e.listName + // }); + }, + goToFace(userId) { + uni.navigateTo({ + url: '/pages/basics/recognitionFace/index?userId=' + userId + }); } } +} diff --git a/pages/login/home.vue b/pages/login/home.vue index b6ac662..afc77bf 100644 --- a/pages/login/home.vue +++ b/pages/login/home.vue @@ -1,6 +1,5 @@ @@ -79,37 +76,51 @@ setIsRest, isRest, loginUser, - setPremission, - publicKey + setPremission, + publicKey } from '@/common/tool.js'; - import JSEncrypt from '../../static/js/jsencrypt.min' + import JSEncrypt from '../../static/js/jsencrypt.min' export default { data() { return { - noClick: true, - userName: '', + noClick:true, + userName : '', userPwd: '', - radio: '' + push_clientid:'', + radio:'' } }, async onLoad() { - this.getRemember() - this.getLoginUser() + this.getRemember() + uni.getPushClientId({ + success: (res) => { + this.push_clientid = res.cid + this.getLoginUser() + console.log('客户端推送标识:',res.cid) + }, + fail(err) { + uni.showToast({ + icon: 'none', + title: "获取用户标识失败,请重新登录", + duration: 2000 + }); + } + }); // this.getLoginUser() //this.getUrlVersion(); }, methods: { - getRemember() { - uni.getStorage({ - key: 'remember', - success: async (res) => { - if (res.data && res.data.username) { - this.userName = res.data.username - this.userPwd = res.data.userPwd - } - } - }); - }, + getRemember(){ + uni.getStorage({ + key: 'remember', + success: async (res) => { + if (res.data && res.data.username) { + this.userName = res.data.username + this.userPwd = res.data.userPwd + } + } + }); + }, getLoginUser() { uni.getStorage({ key: 'USER', @@ -122,24 +133,18 @@ setDeptLevel(res.data.DEPARTMENT_LEVEL); setloginUser(res.data); - if (loginUser.CORPINFO_ID) { - // 查看是否离岗 - this.handleLoginCheck(res.data.USER_ID).then(() => { - uni.navigateTo({ - url: '/pages/index/index', - }); - }) - } else { - uni.navigateTo({ - url: '/pages/index/index', - }); - } + // 查看是否离岗 + this.handleLoginCheck(res.data.USER_ID).then(()=>{ + uni.navigateTo({ + url: '/pages/index/index', + }); + }) } } }); }, - handleLoginCheck(USER_ID) { - return new Promise((resolve, reject) => { + handleLoginCheck(USER_ID){ + return new Promise((resolve,reject)=>{ uni.request({ url: basePath + '/app/offduty/isRest', method: 'POST', @@ -152,6 +157,7 @@ USER_ID: loginUser.USER_ID, }, success: (res1) => { + this.updatePushCid(USER_ID, this.push_clientid) if ("success" == res1.data.result) { if (res1.data.ISREST != null) { setIsRest(res1.data.ISREST); @@ -159,14 +165,14 @@ setIsRest(res.data.ISREST); } resolve() - } else if ("usercorperror" == res1.data.result) { + }else if ("usercorperror" == res1.data.result) { uni.showToast({ icon: 'none', title: "您的企业已停用，请联系管理员", duration: 2000 }); reject() - } else if ("userUSEerror" == res1.data.result) { + }else if ("userUSEerror" == res1.data.result) { uni.showToast({ icon: 'none', title: "您的企业已到使用期限，请联系管理员", @@ -199,13 +205,13 @@ this.userPwd = e.detail.value }, login() { - /*if (this.radio !== '1') { + if (this.radio !== '1') { uni.showToast({ title: '请先阅读并同意《服务协议》和《隐私政策》', icon: 'none' }) return; - }*/ + } var _this = this; var userName = _this.userName; var userPwd = _this.userPwd; @@ -215,7 +221,7 @@ // var keydataVal = 'zcloudchina' + userName + ',zy,' + userPwd; - var myreg = /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[0-2])(([0-2][1-9])|10|20|30|31)\d{3}(\d|X|x)$/; + var myreg = /^(((13[0-9]{1})|159)+\d{8})$/; if (userName == '') { uni.showToast({ @@ -227,7 +233,7 @@ } else if (userName.length != 11 && !myreg.test(userName)) { uni.showToast({ icon: 'none', - title: '身份证号格式不正确', + title: '手机号格式不正确', duration: 2000 }); return; @@ -247,7 +253,7 @@ title: '请稍候' }) uni.request({ - url: basePath + '/admin/checkPractitioner', + url: basePath + '/admin/check', method: 'POST', dataType: 'json', header: { @@ -265,32 +271,35 @@ title: res.data.msg, duration: 2000 }); - if ("success" == result) { + if ("success" === result) { setloginUserId(res.data.USER_ID); setCorpinfoId(res.data.CORPINFO_ID); setDeptId(res.data.DEPARTMENT_ID); setDeptLevel(res.data.DEPARTMENT_LEVEL); setIsRest(res.data.ISREST); setloginUser(res.data); - uni.setStorage({ - key: 'USER', - data: res.data - }); - const remember = {} - remember.username = userName - remember.userPwd = userPwd - uni.setStorage({ - key: 'remember', - data: remember - }); - uni.hideLoading(); - uni.showToast({ - title: "登录成功", - duration: 1000 - }); - uni.redirectTo({ - url: '/pages/index/index' - }); + if(res.data.passwordType === '0'){ + uni.showToast({ + icon: 'none', + title: "登录的密码强度为弱，请修改密码！", + duration: 2000 // 显示2秒 + }); + + // 延迟2000ms后再执行页面跳转 + setTimeout(() => { + uni.navigateTo({ + url: '/pages/login/forget/forget-reset' + }); + }, 2000); // 延迟时间必须大于等于toast的duration + return + } + uni.setStorage({key: 'USER', data: res.data}); + const remember = {} + remember.username = userName + remember.userPwd = userPwd + uni.setStorage({key: 'remember', data: remember}); + this.getMenu() + this.updatePushCid(res.data.USER_ID, this.push_clientid) } else if ("usererror" == result) { uni.showToast({ icon: 'none', @@ -321,13 +330,13 @@ title: res.data.msg, duration: 2000 }); - } else if ("maintainDeactivateError" == result) { + }else if ("maintainDeactivateError" == result) { uni.showToast({ icon: 'none', title: "企业处于维护停用阶段，暂时无法登录", duration: 2000 }); - } else if ("exception" == result) { + }else if ("exception" == result) { uni.showToast({ icon: 'none', title: res.data.exception, @@ -343,10 +352,115 @@ duration: 2000 }); } + }) + }, + getMenu() { + var _this = this; + uni.showLoading({ + title: '请稍候' + }) + uni.request({ + url: basePath + '/app/main/index', + method: 'POST', + dataType: 'json', + header: { + 'Content-type': 'application/x-www-form-urlencoded' + }, + data: { + USER_ID: loginUser.USER_ID, + }, + success: (res) => { + + if ("success" == res.data.result) { + + var menuList = res.data.menuList + var premissionList = new Map() + + menuList.map(item => { + if (item.menu_NAME == '安全承诺' && item.hasMenu) { + premissionList.set('commitment', true) + if (item.subMenu && item.subMenu.length > 0) { + item.subMenu.map(child => { + if (child.menu_NAME == '公司级承诺公告' && child.hasMenu) { + premissionList.set('commitment-company', true) + } + if (child.menu_NAME == '车间级承诺公告' && child.hasMenu) { + premissionList.set('commitment-workshop', true) + } + if (child.menu_NAME == '班组级承诺公告' && child.hasMenu) { + premissionList.set('commitment-team', true) + } + }) + } + } + + if (item.menu_NAME == '受限空间作业管理' && item.hasMenu) { + premissionList.set('eightWork', true) + premissionList.set('confinedspace', true) + } + if (item.menu_NAME == '动火作业管理' && item.hasMenu) { + premissionList.set('eightWork', true) + premissionList.set('hotwork', true) + } + if (item.menu_NAME == '高处作业管理' && item.hasMenu) { + premissionList.set('eightWork', true) + premissionList.set('high-work', true) + } + if (item.menu_NAME == '吊装作业管理' && item.hasMenu) { + premissionList.set('eightWork', true) + premissionList.set('hoisting', true) + } + if (item.menu_NAME == '盲板抽堵作业管理' && item.hasMenu) { + premissionList.set('eightWork', true) + premissionList.set('blind-board', true) + } + if (item.menu_NAME == '动土作业管理' && item.hasMenu) { + premissionList.set('eightWork', true) + premissionList.set('break-ground', true) + } + if (item.menu_NAME == '临时用电作业管理' && item.hasMenu) { + premissionList.set('eightWork', true) + premissionList.set('electricity', true) + } + if (item.menu_NAME == '断路作业管理' && item.hasMenu) { + premissionList.set('eightWork', true) + premissionList.set('open-circuit', true) + } + if (item.menu_NAME == '在线学习与考试' && item.hasMenu) { + premissionList.set('education', true) + } + + if (item.menu_NAME == '设备设施管理' && item.hasMenu) { + premissionList.set('speEquip', true) + } + }) + setPremission(Object.fromEntries(premissionList)); + uni.hideLoading(); + uni.showToast({ + title: "登录成功", + duration: 1000 + }); + uni.redirectTo({ + url: '/pages/index/index' + }); + } else { + uni.showToast({ + title: res.data.message, + duration: 2000 + }); + } + }, + fail: (res) => { + uni.showToast({ + icon: 'none', + title: "服务器正在升级，请稍后再试。", + duration: 2000 + }); + } }); }, getUrlVersion() { - plus.runtime.getProperty(plus.runtime.appid, function(inf) { + plus.runtime.getProperty(plus.runtime.appid, function (inf) { var _this = this; // 路径 uni.request({ @@ -375,23 +489,35 @@ }); }); }, + updatePushCid(userId, pushCid) { + uni.request({ + url: basePath + '/app/user/updatePushCid', + method: 'POST', + dataType: 'json', + header: { + 'Content-type': 'application/x-www-form-urlencoded' + }, + data: { + USER_ID: userId, + PUSH_CID: pushCid + }, + }); + } } }