diff --git a/manifest.json b/manifest.json index e88aa8c..ef90f11 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { - "name" : "秦港相关方", - "appid" : "__UNI__97E1400", - "description" : "秦港相关方", + "name" : "秦港相关方测试", + "appid" : "__UNI__2AFFD9C", + "description" : "秦港相关方测试", "versionName" : "1.0.42", "versionCode" : 42, "transformPx" : false, @@ -34,29 +34,22 @@ /* android打包配置 */ "android" : { "permissions" : [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" ] }, /* ios打包配置 */ @@ -130,5 +123,10 @@ "uniStatistics" : { "enable" : false }, - "vueVersion" : "2" + "vueVersion" : "2", + "h5" : { + "sdkConfigs" : { + "maps" : {} + } + } } diff --git a/pages/eight_assignments/blind_board/apply.vue b/pages/eight_assignments/blind_board/apply.vue index de97ee5..ba9fef5 100644 --- a/pages/eight_assignments/blind_board/apply.vue +++ b/pages/eight_assignments/blind_board/apply.vue @@ -175,8 +175,8 @@ export default { BOARD_INSTALL_TIME: '', WORK_END_DATE: '', WORK_USER: '', - WORK_LONGITUDE: '', - WORK_LATITUDE: '', + WORK_LONGITUDE: '1', + WORK_LATITUDE: '1', MEDIUM: '', TEMPERATURE: '', PRESSURE: '', diff --git a/pages/eight_assignments/break_ground/apply.vue b/pages/eight_assignments/break_ground/apply.vue index 1a7d4dc..3298be7 100644 --- a/pages/eight_assignments/break_ground/apply.vue +++ b/pages/eight_assignments/break_ground/apply.vue @@ -128,8 +128,8 @@ export default { CORP_NAME: '', WORK_START_DATE: '', WORK_END_DATE: '', - WORK_LONGITUDE: '', - WORK_LATITUDE: '', + WORK_LONGITUDE: '1', + WORK_LATITUDE: '1', WORK_PLACE: '', JOB_CONTENT: '', WORK_CONTENT: '', diff --git a/pages/eight_assignments/confined_space/apply.vue b/pages/eight_assignments/confined_space/apply.vue index f9534c1..165e4d9 100644 --- a/pages/eight_assignments/confined_space/apply.vue +++ b/pages/eight_assignments/confined_space/apply.vue @@ -119,8 +119,8 @@ export default { WORK_CONTENT: '', WORK_START_DATE: '', WORK_END_DATE: '', - WORK_LONGITUDE: '', - WORK_LATITUDE: '', + WORK_LONGITUDE: '1', + WORK_LATITUDE: '1', WORK_USER: '', SPECIAL_WORK: '', RISK_IDENTIFICATION: '', diff --git a/pages/eight_assignments/cut_road/apply.vue b/pages/eight_assignments/cut_road/apply.vue index c6a4411..031ea98 100644 --- a/pages/eight_assignments/cut_road/apply.vue +++ b/pages/eight_assignments/cut_road/apply.vue @@ -128,8 +128,8 @@ export default { CORP_NAME: '', WORK_START_DATE: '', WORK_END_DATE: '', - WORK_LONGITUDE: '', - WORK_LATITUDE: '', + WORK_LONGITUDE: '1', + WORK_LATITUDE: '1', OTHER_DEPT: '', WORK_REASON: '', WORK_CONTENT: '', diff --git a/pages/eight_assignments/electricity/apply.vue b/pages/eight_assignments/electricity/apply.vue index 191a851..77a2d28 100644 --- a/pages/eight_assignments/electricity/apply.vue +++ b/pages/eight_assignments/electricity/apply.vue @@ -132,8 +132,8 @@ export default { CORP_NAME: '', WORK_START_DATE: '', WORK_END_DATE: '', - WORK_LONGITUDE: '', - WORK_LATITUDE: '', + WORK_LONGITUDE: '1', + WORK_LATITUDE: '1', WORK_PLACE: '', WORK_CONTENT: '', WORK_USER: '', diff --git a/pages/eight_assignments/high_work/apply.vue b/pages/eight_assignments/high_work/apply.vue index 0c714bc..e9a2a79 100644 --- a/pages/eight_assignments/high_work/apply.vue +++ b/pages/eight_assignments/high_work/apply.vue @@ -121,8 +121,8 @@ export default { WORK_CONTENT: '', WORK_START_DATE: '', WORK_END_DATE: '', - WORK_LONGITUDE: '', - WORK_LATITUDE: '', + WORK_LONGITUDE: '1', + WORK_LATITUDE: '1', SPECIAL_WORK: '', RISK_IDENTIFICATION: '', }, diff --git a/pages/eight_assignments/hoisting/apply.vue b/pages/eight_assignments/hoisting/apply.vue index 9475250..8c8277c 100644 --- a/pages/eight_assignments/hoisting/apply.vue +++ b/pages/eight_assignments/hoisting/apply.vue @@ -136,8 +136,8 @@ export default { WORK_CONTENT: '', WORK_START_DATE: '', WORK_END_DATE: '', - WORK_LONGITUDE: '', - WORK_LATITUDE: '', + WORK_LONGITUDE: '1', + WORK_LATITUDE: '1', SPECIAL_WORK: '', RISK_IDENTIFICATION: '', }, diff --git a/pages/eight_assignments/hot_work/select_position.vue b/pages/eight_assignments/hot_work/select_position.vue index 113915e..8b6396a 100644 --- a/pages/eight_assignments/hot_work/select_position.vue +++ b/pages/eight_assignments/hot_work/select_position.vue @@ -42,7 +42,7 @@ export default { ], form: { WORK_LONGITUDE: '1', - WORK_LATITUDE: '2' + WORK_LATITUDE: '1' }, rules: { WORK_LONGITUDE: [{type: 'string', required: true, message: '请输入经度', trigger: ['blur', 'change']}], diff --git a/pages/related_party_units/add.vue b/pages/related_party_units/add.vue index ecd9302..9729108 100644 --- a/pages/related_party_units/add.vue +++ b/pages/related_party_units/add.vue @@ -994,33 +994,33 @@ export default { fnInjuriesPayTiemAttachmentsDelete(event) { this.form.injuriesPayTiemFile.splice(event.index, 1) }, - // fnAdaptToTheJobPositionConfirm(e) { - // this.form.IS_BODY_ADAPT = e.value[0].id - // this.form.IS_BODY_ADAPT_NAME = e.value[0].name - // this.fnShowAdaptToTheJobPosition() - // }, + fnAdaptToTheJobPositionConfirm(e) { + this.form.IS_BODY_ADAPT = e.value[0].id + this.form.IS_BODY_ADAPT_NAME = e.value[0].name + this.fnShowAdaptToTheJobPosition() + }, fnShowSpecialTypeOfWork() { this.showSpecialTypeOfWork = !this.showSpecialTypeOfWork }, - // fnSpecialTypeOfWorkConfirm(e) { - // this.form.IS_SPECIAL_JOB = e.value[0].id - // this.form.IS_SPECIAL_JOB_NAME = e.value[0].name - // this.fnShowSpecialTypeOfWork() - // if (e.value[0].id === '1' && this.certificateInformationLength === 0) { - // uni.showModal({ - // title: '提示', - // content: '当前没有证书信息，请完善证书信息', - // showCancel: false, - // success: (res) => { - // if (res.confirm) { - // uni.$u.route({ - // url: '/pages/certificate_information/index', - // }) - // } - // } - // }) - // } - // }, + fnSpecialTypeOfWorkConfirm(e) { + this.form.IS_SPECIAL_JOB = e.value[0].id + this.form.IS_SPECIAL_JOB_NAME = e.value[0].name + this.fnShowSpecialTypeOfWork() + if (e.value[0].id === '1' && this.certificateInformationLength === 0) { + uni.showModal({ + title: '提示', + content: '当前没有证书信息，请完善证书信息', + showCancel: false, + success: (res) => { + if (res.confirm) { + uni.$u.route({ + url: '/pages/certificate_information/index', + }) + } + } + }) + } + }, fnShowFloatingPersonnel() { this.showFloatingPersonnel = !this.showFloatingPersonnel }, diff --git a/utils/request.js b/utils/request.js index 41e0046..62d0e9c 100644 --- a/utils/request.js +++ b/utils/request.js @@ -1,4 +1,4 @@ -let requestPath = 'http://192.168.0.127:8199/'; // 后台请求地址 +let requestPath = 'https://qggf.qhdsafety.com/xgfApi/'; // 后台请求地址 // let requestPath = 'https://skqhdg.porthebei.com:9006/qa-prevention-xgf/'; // 后台请求地址 // let requestPath = 'https://qgxgf.qhdsafety.com/qa-prevention-xgf/'; // 外网地址 import store from '../store/index' diff --git a/utils/tools.js b/utils/tools.js index ca73414..7290a38 100644 --- a/utils/tools.js +++ b/utils/tools.js @@ -22,9 +22,9 @@ export function formatDate(date, fmt) { } } -export const filePath = 'http://192.168.192.201:8991/file/' +//export const filePath = 'http://192.168.192.201:8991/file/' //export const filePath = 'https://qgqy.qhdsafety.com/file/' -//export const filePath = 'https://wwag.qhdsafety.com/file/' +export const filePath = 'https://wwag.qhdsafety.com/file/' function padLeftZero(str) { return ('00' + str).substr(str.length)