diff --git a/config/common.js b/config/common.js index 76900fb..75f8efc 100644 --- a/config/common.js +++ b/config/common.js @@ -86,9 +86,8 @@ const getServiceHost = api => { } // 发行APP前先确定,要发布的版本 -let APP_ENV = 'beta' // beta: 测试版,release: 发行版 +let APP_ENV = 'beta' // release: 发行版 debug:开发环境 beta: 测试版 let configURL - if (process.env.CUSTOM_PLATFORM === "dev") { //本地环境 configURL = { @@ -104,7 +103,7 @@ if (process.env.CUSTOM_PLATFORM === "dev") { uni_app_url: "http://47.122.43.22:9100", qrcode_url: "http://47.122.43.22:9201" } -} else if (process.env.CUSTOM_PLATFORM === "test") { +} else if (process.env.CUSTOM_PLATFORM === "beta") { //测试环境 configURL = { web_name: "", @@ -119,8 +118,8 @@ if (process.env.CUSTOM_PLATFORM === "dev") { uni_app_url: "http://47.122.43.22:9100", qrcode_url: "http://47.122.43.22:9201" } -} else - //生产环境 发布等 +} else if (process.env.CUSTOM_PLATFORM === "release") { + //正式环境 configURL = { web_name: "", serviceHost(api) { @@ -128,13 +127,27 @@ if (process.env.CUSTOM_PLATFORM === "dev") { return `${this.uni_app_web_local_api_url}:${apis}` }, uni_app_web_url: "", - uni_app_web_api_url: APP_ENV === 'release' ? "http://xmmhe.com" : "http://47.122.43.22", - uni_app_web_source_url: APP_ENV === 'release' ? "http://xmmhe.com:3199" : "http://47.122.43.22:3199", - qrcode_url: APP_ENV === 'release' ? "http://xmmhe.com:9201" : "http://47.122.43.22:9201", - uni_app_url: APP_ENV === 'release' ? "http://xmmhe.com:9100" : - "http://47.122.43.22:9100", //打包测试: 47.122.43.22 开发可 localhost - uni_app_web_local_api_url: APP_ENV === 'release' ? "http://xmmhe.com" : - "http://47.122.43.22" //打包测试: 47.122.43.22 开发可 localhost + uni_app_web_api_url: "http://xmmhe.com", + uni_app_web_source_url: "http://xmmhe.com:3199", + qrcode_url: "http://xmmhe.com:9201", + uni_app_url: "http://xmmhe.com:9100", + uni_app_web_local_api_url: "http://xmmhe.com" } +} else { + //开发 debug + configURL = { + web_name: "", + serviceHost(api) { + const apis = getServiceHost(api) + 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 + } +} export default configURL \ No newline at end of file diff --git a/pages/apply/viewEvaluation.vue b/pages/apply/viewEvaluation.vue index 98bd4c8..852f331 100644 --- a/pages/apply/viewEvaluation.vue +++ b/pages/apply/viewEvaluation.vue @@ -5,7 +5,7 @@ - 隐患信息 + 风险信息 - + @@ -31,18 +31,18 @@ - - - + + - - - - + @@ -64,7 +64,7 @@ diff --git a/pages/index/index.vue b/pages/index/index.vue index e788319..04b8ba5 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -148,9 +148,14 @@ // }, menuClick(menuInfo) { + var urlTo = menuInfo.url + '?OrgId=' + menuInfo.ORG_ID + if (this.RISK_AREA_ID && this.RISK_AREA_ID != undefined && this.RISK_AREA_ID.length > 1) + urlTo += '&RISK_AREA_ID=' + this.RISK_AREA_ID + if (this.DEPARTMENT_ID && this.DEPARTMENT_ID != undefined && this.DEPARTMENT_ID.length > 1) + urlTo += '&DEPARTMENT_ID=' + this.DEPARTMENT_ID + uni.navigateTo({ - url: menuInfo.url + '?OrgId=' + menuInfo.ORG_ID + - '&RISK_AREA_ID=' + this.RISK_AREA_ID + '&DEPARTMENT_ID=' + this.DEPARTMENT_ID + url: urlTo }) }, // goCamera() { diff --git a/services/apply.js b/services/apply.js index e87fcfa..02b96fe 100644 --- a/services/apply.js +++ b/services/apply.js @@ -54,7 +54,7 @@ export const PagedRisk = (params) => { }) } -//隐患查看 +//检查查看 export const PagedCheckMain = (params) => { return request.send({ url: '/BI/H5Controller/PagedCheckMain', @@ -62,3 +62,12 @@ export const PagedCheckMain = (params) => { data: params, }) } + +//风险查看 +export const PagedEvaluateRisk = (params) => { + return request.send({ + url: '/BI/H5Controller/PagedEvaluateRisk', + method: 'post', + data: params, + }) +} \ No newline at end of file