diff --git a/api/index.js b/api/index.js index 5c4ad15..58d22f3 100644 --- a/api/index.js +++ b/api/index.js @@ -38,3 +38,5 @@ export const getConfinedSpaceSelectList = (params) => post("/app/gfLimitSpace/li loading: false, ...params }) //获取受限空间名称选择列表 +export const getOtherAssignmentsSelectList = (params) => post("/app/eightwork/list", params) //关联的其他特殊作业及安全作业票编号选择列表 +export const getRiskIdentificationResultsSelectList = (params) => post("/app/eightwork/getInfo", params) //风险辨识结果选择列表 diff --git a/pages.json b/pages.json index e0f2dff..8a9df44 100644 --- a/pages.json +++ b/pages.json @@ -191,6 +191,12 @@ "style": { "navigationBarTitleText": "受限空间安全作业申请" } + }, + { + "path": "pages/map/index", + "style": { + "navigationBarTitleText": "位置定位" + } } ], "globalStyle": { diff --git a/pages/eight_assignments/confined_space/apply.vue b/pages/eight_assignments/confined_space/apply.vue index c343bcc..0d79121 100644 --- a/pages/eight_assignments/confined_space/apply.vue +++ b/pages/eight_assignments/confined_space/apply.vue @@ -21,7 +21,7 @@ - + + + + + + + + + + + + + + + + + + + + + - + + :minDate="datetimePicker.min" :key="datetimePicker.type" @confirm="fnDateTimePickerConfirm" + @cancel="fnDateTimePickerCancel" /> + + @@ -45,8 +75,12 @@ import { getConfinedSpaceSelectList } from '../../../api/index' + import OtherSelect from '@/components/other-select/index.vue'; export default { + components: { + OtherSelect + }, data() { return { form: { @@ -59,8 +93,12 @@ LIMITSPACE_ID: '', MEDIUM_NAME: '', WORK_CONTENT: '', - WORK_START_DATE:'', - WORK_END_DATE:'', + WORK_START_DATE: '', + WORK_END_DATE: '', + WORK_LONGITUDE: '', + WORK_LATITUDE: '', + WORK_USER: '', + SPECIAL_WORK: '', }, rules: {}, picker: { @@ -75,7 +113,9 @@ min: new Date().getTime(), mode: 'datetime', type: '' - } + }, + otherAssignmentsShow: false, + otherIdentificationShow: false, } }, onLoad(options) { @@ -114,6 +154,17 @@ fnDateTimePickerCancel() { this.datetimePicker.show = false }, + fnLocation() { + uni.navigateTo({ + url: '/pages/map/index', + events: { + acceptLocationData: (event) => { + this.form.WORK_LONGITUDE = event.data.longitue; + this.form.WORK_LATITUDE = event.data.latitude; + } + }, + }) + } } } diff --git a/utils/request.js b/utils/request.js index f42525a..dc97da5 100644 --- a/utils/request.js +++ b/utils/request.js @@ -14,6 +14,7 @@ function post(url, data) { url: requestPath + url, data: { USER_ID: store.state.userInfo.USER_ID || '', + CORPINFO_ID: store.state.userInfo.CORPINFO_ID || '', ...data }, method: 'POST',