diff --git a/src/api/eqInspection.js b/src/api/eqInspection.js index 4c5e5b3..95f7af1 100644 --- a/src/api/eqInspection.js +++ b/src/api/eqInspection.js @@ -53,3 +53,30 @@ export const getEqInsItemList = data => { data }) } + +// 获取巡检内容列表 +export const getInsList = data => { + return request({ + url: '/api/equipment/equipmentinspection-inspectionitem/list', + method: 'POST', + data + }) +} + +// 根据设备获取巡检内容列表 +export const getEqInsList = data => { + return request({ + url: '/api/equipment/inspectionItem/list-WithEQ', + method: 'POST', + data + }) +} + +// 更新巡检内容完成状态 +export const updateInsStatus = data => { + return request({ + url: '/api/equipment/equipmentinspection-inspectionitem/update', + method: 'POST', + data + }) +} diff --git a/src/api/file.js b/src/api/file.js new file mode 100644 index 0000000..fc39fab --- /dev/null +++ b/src/api/file.js @@ -0,0 +1,11 @@ +import request from '@/util/request' + +// 文件上传 +export const uploadFile = data => { + return request({ + url: '/api/common/attachment/uploadFileFormData', + method: 'POST', + file: true, + data + }) +} \ No newline at end of file diff --git a/src/main.js b/src/main.js index 68b7640..494b766 100644 --- a/src/main.js +++ b/src/main.js @@ -19,9 +19,9 @@ import './assets/css/iconfont.css' import './components/' import store from '@/store' -import { Button, Field, Icon, Dialog, Grid, GridItem, NavBar, Popup, Row, Col, Stepper, Picker, DatetimePicker, PullRefresh, Cell, CellGroup, Tag, Checkbox, CheckboxGroup, Tab, Tabs, Sticky, Calendar, Uploader } from 'vant' +import { Button, Field, Icon, Dialog, Grid, GridItem, NavBar, Popup, Row, Col, Stepper, Picker, DatetimePicker, PullRefresh, Cell, CellGroup, Tag, Checkbox, CheckboxGroup, Tab, Tabs, Sticky, Calendar, Uploader, SwipeCell, Radio, RadioGroup } from 'vant' -Vue.use(Button).use(Field).use(Icon).use(Dialog).use(Grid).use(GridItem).use(NavBar).use(Popup).use(Row).use(Col).use(Stepper).use(Picker).use(DatetimePicker).use(PullRefresh).use(Cell).use(CellGroup).use(Tag).use(Checkbox).use(CheckboxGroup).use(Tab).use(Tabs).use(Sticky).use(Calendar).use(Uploader) +Vue.use(Button).use(Field).use(Icon).use(Dialog).use(Grid).use(GridItem).use(NavBar).use(Popup).use(Row).use(Col).use(Stepper).use(Picker).use(DatetimePicker).use(PullRefresh).use(Cell).use(CellGroup).use(Tag).use(Checkbox).use(CheckboxGroup).use(Tab).use(Tabs).use(Sticky).use(Calendar).use(Uploader).use(SwipeCell).use(Radio).use(RadioGroup) Vue.config.productionTip = false fastClick.attach(document.body) diff --git a/src/pages/eqInspection/eqInspection-add.vue b/src/pages/eqInspection/eqInspection-add.vue index 9a7cc47..8ada31d 100644 --- a/src/pages/eqInspection/eqInspection-add.vue +++ b/src/pages/eqInspection/eqInspection-add.vue @@ -73,7 +73,8 @@ export default { this.$router.push({ name: 'eqInspectionEdit', query: { - equipmentId: result.data.id + equipmentId: result.data.id, + equipmentName: result.data.name } }) } diff --git a/src/pages/eqInspection/eqInspection-edit.vue b/src/pages/eqInspection/eqInspection-edit.vue index bea97f9..bec0f6f 100644 --- a/src/pages/eqInspection/eqInspection-edit.vue +++ b/src/pages/eqInspection/eqInspection-edit.vue @@ -28,7 +28,7 @@ @@ -65,6 +65,30 @@ +
+ + + + 巡检内容 + + + + + + + + + + + +
@@ -92,7 +116,7 @@ v-model="fileList" :max-count="1" accept=".doc,.docx,.xls,.xlsx,.pdf,image/*" - :after-read="uploadFile" + :after-read="upload" /> @@ -102,9 +126,10 @@