From 75b77056cdbf0387baa48194936cb2e4b17bb5b4 Mon Sep 17 00:00:00 2001 From: wyw <571921741@qq.com> Date: Wed, 17 Sep 2025 16:00:44 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=B7=BB=E5=8A=A0=20=E5=8D=B1?= =?UTF-8?q?=E9=99=A9=E6=9F=A5=E7=9C=8B=202=E3=80=81IP=E6=9B=BF=E6=8D=A2=20?= =?UTF-8?q?3=E3=80=81=E9=A3=8E=E9=99=A9=E3=80=81=E9=9A=90=E6=82=A3=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/common.js | 24 +- package.json | 2 +- pages.json | 6 + pages/apply/viewDangerJob.vue | 483 +++++++++++++++++++++++++++++++++ pages/apply/viewEvaluation.vue | 41 ++- pages/apply/viewRisk.vue | 81 +++++- services/apply.js | 9 + 7 files changed, 615 insertions(+), 31 deletions(-) create mode 100644 pages/apply/viewDangerJob.vue diff --git a/config/common.js b/config/common.js index 75f8efc..c2eba87 100644 --- a/config/common.js +++ b/config/common.js @@ -100,8 +100,8 @@ if (process.env.CUSTOM_PLATFORM === "dev") { uni_app_web_api_url: "http://localhost", // 请求接口的地址 uni_app_web_source_url: "http://localhost:3199", // 资源地址 uni_app_web_local_api_url: "http://localhost", // 请求接口的地址 - uni_app_url: "http://47.122.43.22:9100", - qrcode_url: "http://47.122.43.22:9201" + uni_app_url: "http121.41.2.71:9100", + qrcode_url: "http://121.41.2.71:9201" } } else if (process.env.CUSTOM_PLATFORM === "beta") { //测试环境 @@ -112,11 +112,11 @@ if (process.env.CUSTOM_PLATFORM === "dev") { return `${this.uni_app_web_api_url}:${apis}` //测试环境 }, uni_app_web_url: "", // - uni_app_web_api_url: "http://47.122.43.22", // 请求接口的地址 - uni_app_web_source_url: "http://47.122.43.22:3199", // 资源地址 - uni_app_web_local_api_url: "http://47.122.43.22", // 请求接口的地址 - uni_app_url: "http://47.122.43.22:9100", - qrcode_url: "http://47.122.43.22:9201" + uni_app_web_api_url: "http://121.41.2.71", // 请求接口的地址 + uni_app_web_source_url: "http://121.41.2.71:3199", // 资源地址 + uni_app_web_local_api_url: "http://121.41.2.71", // 请求接口的地址 + uni_app_url: "http://121.41.2.71:9100", + qrcode_url: "http://121.41.2.71:9201" } } else if (process.env.CUSTOM_PLATFORM === "release") { //正式环境 @@ -142,11 +142,11 @@ if (process.env.CUSTOM_PLATFORM === "dev") { return `${this.uni_app_web_local_api_url}:${apis}` }, uni_app_web_url: "", - uni_app_web_api_url: "http://47.122.43.22", - uni_app_web_source_url: "http://47.122.43.22:3199", //附件 - qrcode_url: "http://47.122.43.22:9201", //生成二维码 - uni_app_url: "http://47.122.43.22:9100", //跳转进入app - uni_app_web_local_api_url: "http://localhost" //打包测试： 47.122.43.22 开发可 localhost + uni_app_web_api_url: "http://121.41.2.71", + uni_app_web_source_url: "http://121.41.2.71:3199", //附件 + qrcode_url: "http://121.41.2.71:9201", //生成二维码 + uni_app_url: "http://121.41.2.71:9100", //跳转进入app + uni_app_web_local_api_url: "http://localhost" //打包测试： 121.41.2.71 开发可 localhost } } diff --git a/package.json b/package.json index 3e9d5fd..fcd6156 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ }, "repository": { "type": "git", - "url": "http://47.122.43.22:3000/ykx/qrcode-app.git" + "url": "http://121.41.2.71:3000/ykx/qrcode-app.git" }, "keywords": [], "author": "", diff --git a/pages.json b/pages.json index 6e4c965..5aa860a 100644 --- a/pages.json +++ b/pages.json @@ -61,6 +61,12 @@ "navigationBarTitleText": "风险查看" } }, + { + "path": "pages/apply/viewDangerJob", + "style": { + "navigationBarTitleText": "危险作业查看" + } + }, { "path": "pages/apply/viewVideo", "style": { diff --git a/pages/apply/viewDangerJob.vue b/pages/apply/viewDangerJob.vue new file mode 100644 index 0000000..6f83af2 --- /dev/null +++ b/pages/apply/viewDangerJob.vue @@ -0,0 +1,483 @@ + + + + + \ No newline at end of file diff --git a/pages/apply/viewEvaluation.vue b/pages/apply/viewEvaluation.vue index b1f539b..2875951 100644 --- a/pages/apply/viewEvaluation.vue +++ b/pages/apply/viewEvaluation.vue @@ -37,6 +37,11 @@ v-model="item.Nav_RiskName.NAME" border="none" inputAlign="right" autoHeight> + + + @@ -46,6 +51,16 @@ v-model="item.EVALUATE_LEVEL_SHOW" border="none" inputAlign="right"> + + + + + + + @@ -146,23 +161,30 @@ this.model.ISDOWN == '否' || this.model.ISDOWN == '') ? false : true)) json.IgnoreDataRule = true json.Limit = this.pageSize - json.SelectField = ["Nav_RiskName.NAME", 'EVALUATE_LEVEL', 'Nav_Type.NAME'] + json.SelectField = ["Nav_RiskName.NAME", 'EVALUATE_LEVEL', 'Nav_Type.NAME', 'EMERGENCY', + 'RISK_DESCRIPTION', 'Nav_Details.MEASURES_NAME' + ] PagedEvaluateRisk(json).then(res => { if (res.IsSuccessful) { this.total = res.TotalCount - // this.model.ListShow = res.Data + res.Data.forEach(e=>{ + e.MEASURES_NAME=this.showProp(e.Nav_Details, 'MEASURES_NAME') + }) if (paginate) { this.model.ListShow = this.model.ListShow.concat(res.Data) } else { this.model.ListShow = res.Data } - + if (res.TotalCount == 0) uni.$showMsg("未获取到数据", 'none') } else { this.model.ListShow = [{ CHECKCONTENT: '', - DESCREPTION: '' + DESCREPTION: '', + MEASURES_NAME: '', + EMERGENCY: '', + RISK_DESCRIPTION: '' }] } }) @@ -190,7 +212,16 @@ this.selectorInfo.title = '班组名称' this.handleSearch() }, - + showProp(Details, prop) { + //Nav_Details.MEASURES_NAME + var Show = '' + if (Details != null && Details.length > 0) { + Details.forEach(e => { + Show += (Show.length > 0 ? ' ' : '') + e[prop] + }) + } + return Show + }, //数据加载 handleSearch(val, pageIndex) { var p = { diff --git a/pages/apply/viewRisk.vue b/pages/apply/viewRisk.vue index 10369c4..a0a43cc 100644 --- a/pages/apply/viewRisk.vue +++ b/pages/apply/viewRisk.vue @@ -31,12 +31,9 @@ - - - + + @@ -46,7 +43,7 @@ - + @@ -54,6 +51,39 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -75,6 +105,7 @@ OrderPagedRiskArea, PagedRisk } from '../../services/apply' + import config from '../../config/common' import { initFilter, extendRule @@ -86,6 +117,7 @@ pageIndex: 0, pageSize: 20, total: 0, + baseUrl: config.uni_app_web_source_url, model: { RISK_AREA_NAME: '请选择区域', RISK_AREA_ID: '', @@ -154,21 +186,43 @@ this.model.ISDOWN == '否' || this.model.ISDOWN == '') ? false : true)) json.IgnoreDataRule = true json.Limit = 20 - json.SelectField = ["Nav_Contents.CHECKCONTENT", "HIDDEN_PLACE", "CREATE_TIME", "Nav_RiskArea.NAME"] + json.SelectField = ['HIDDEN_DESCRIPTION', 'RECTIFICATION_MEASURES', + 'Nav_RectifyPhotoas.Nav_ImgFile.FILE_PATH', 'Nav_Contents.CHECKCONTENT', 'RECITIFY_TIME', + 'HIDDEN_LEVEL', 'HIDDEN_PLACE', 'CREATE_TIME', 'Nav_RiskArea.NAME', 'Nav_RecitifyUser.NAME', + 'Nav_AcceptUser.NAME', 'Nav_ImplementUser.NAME' + ] + PagedRisk(json).then(res => { if (res.IsSuccessful) { - // this.model.ListShow = res.Data this.total = res.TotalCount + var FILE_PATH = '' res.Data.forEach(e => { - if (e.Nav_Contents && e.Nav_Contents.CHECKCONTENT) { - if (e.Nav_Contents.CHECKCONTENT.length > 15) { - e.CHECKCONTENT = e.Nav_Contents.CHECKCONTENT.substring(0, 15)+'...' + if (e.HIDDEN_DESCRIPTION != null && e.HIDDEN_DESCRIPTION != undefined) { + if (e.HIDDEN_DESCRIPTION.length > 15) { + e.HIDDEN_DESCRIPTION = e.HIDDEN_DESCRIPTION.substring(0, 15) + '...' } else { - e.CHECKCONTENT = e.Nav_Contents.CHECKCONTENT + e.HIDDEN_DESCRIPTION = e.HIDDEN_DESCRIPTION } } else { - e.CHECKCONTENT = '' + e.HIDDEN_DESCRIPTION = '' } + if (e.HIDDEN_LEVEL == null) { + e.HIDDEN_LEVELSHOW = "" + } else if (e.HIDDEN_LEVEL == 10) { + e.HIDDEN_LEVELSHOW = "重大" + } else { + e.HIDDEN_LEVELSHOW = "一般" + } + + FILE_PATH = '' + if (e.Nav_RectifyPhotoas != null && e.Nav_RectifyPhotoas.length > 0) { + FILE_PATH = e.Nav_RectifyPhotoas[0].Nav_ImgFile.FILE_PATH + if (FILE_PATH.length > 0) { + FILE_PATH = config.uni_app_web_source_url + FILE_PATH + } + } + e.FILE_PATH = FILE_PATH + }) if (paginate) { this.model.ListShow = this.model.ListShow.concat(res.Data) @@ -180,6 +234,7 @@ uni.$showMsg("未获取到数据", 'none') } else { this.model.ListShow = [{ + HIDDEN_DESCRIPTION: '', CHECKCONTENT: '', ADDRESS: '', CREATE_TIME: '' diff --git a/services/apply.js b/services/apply.js index 3cad504..5ef770c 100644 --- a/services/apply.js +++ b/services/apply.js @@ -78,4 +78,13 @@ export const PagedVideo = (params) => { method: 'post', data: params, }) +} + +//危险作业查看 +export const PagedDangerJob = (params) => { + return request.send({ + url: '/BI/H5Controller/PagedDangerJob', + method: 'post', + data: params, + }) } \ No newline at end of file