diff --git a/src/api/eqInspection.js b/src/api/eqInspection.js index 5a39de3..4c5e5b3 100644 --- a/src/api/eqInspection.js +++ b/src/api/eqInspection.js @@ -2,13 +2,13 @@ * @Author: gtz * @Date: 2022-07-25 14:18:00 * @LastEditors: gtz - * @LastEditTime: 2022-07-26 17:02:01 + * @LastEditTime: 2022-07-29 13:31:29 * @Description: file content - * @FilePath: \xbapp\src\api\eqInspection.js + * @FilePath: \hf-pda\src\api\eqInspection.js */ import request from '@/util/request' -// 获取在线库存列表 +// 获取巡检记录列表 export const list = data => { return request({ url: '/api/equipment/inspectionLog/page', @@ -17,6 +17,15 @@ export const list = data => { }) } +// 获取巡检记录详情 +export const detail = data => { + return request({ + url: '/api/equipment/inspectionLog/get', + method: 'POST', + data + }) +} + // 获取设备列表 export const eqList = data => { return request({ @@ -25,3 +34,22 @@ export const eqList = data => { data }) } + +// 获取设备信息 +export const getEqInfo = data => { + return request({ + url: '/api/basic/equipment/PDAget', + method: 'POST', + formState: true, + data + }) +} + +// 获取巡检记录下巡检项目列表 +export const getEqInsItemList = data => { + return request({ + url: '/api/equipment/equipmentinspection-inspectionitem/list', + method: 'POST', + data + }) +} diff --git a/src/assets/img/back.png b/src/assets/img/back.png new file mode 100644 index 0000000..08dda0c Binary files /dev/null and b/src/assets/img/back.png differ diff --git a/src/assets/img/logo.png b/src/assets/img/logo.png deleted file mode 100644 index d1da041..0000000 Binary files a/src/assets/img/logo.png and /dev/null differ diff --git a/src/main.js b/src/main.js index 6c5e2a4..68b7640 100644 --- a/src/main.js +++ b/src/main.js @@ -2,7 +2,7 @@ * @Author: gtz * @Date: 2022-07-25 14:18:00 * @LastEditors: gtz - * @LastEditTime: 2022-07-28 10:26:05 + * @LastEditTime: 2022-07-29 16:55:08 * @Description: file content * @FilePath: \hf-pda\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 } 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 } 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) +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.config.productionTip = false fastClick.attach(document.body) diff --git a/src/pages/eqInspection/components/eqItem.vue b/src/pages/eqInspection/components/eqItem.vue index 8c15334..dc2d775 100644 --- a/src/pages/eqInspection/components/eqItem.vue +++ b/src/pages/eqInspection/components/eqItem.vue @@ -2,7 +2,7 @@ * @Author: gtz * @Date: 2022-07-28 10:22:30 * @LastEditors: gtz - * @LastEditTime: 2022-07-28 17:22:14 + * @LastEditTime: 2022-07-29 13:26:58 * @Description: file content * @FilePath: \hf-pda\src\pages\eqInspection\components\eqItem.vue --> @@ -59,7 +59,15 @@ export default { } }, methods: { - toDetail () {} + toDetail () { + this.$router.push({ + name: 'eqInspectionEdit', + query: { + equipmentId: this.injectData.equipmentId, + id: this.injectData.id + } + }) + } } } diff --git a/src/pages/eqInspection/eqInspection-add.vue b/src/pages/eqInspection/eqInspection-add.vue new file mode 100644 index 0000000..9a7cc47 --- /dev/null +++ b/src/pages/eqInspection/eqInspection-add.vue @@ -0,0 +1,155 @@ + + + + + + diff --git a/src/pages/eqInspection/eqInspection-edit.vue b/src/pages/eqInspection/eqInspection-edit.vue new file mode 100644 index 0000000..bea97f9 --- /dev/null +++ b/src/pages/eqInspection/eqInspection-edit.vue @@ -0,0 +1,252 @@ + + + + + + diff --git a/src/pages/eqInspection/eqInspection.vue b/src/pages/eqInspection/eqInspection.vue index 1d2446d..6561fb4 100644 --- a/src/pages/eqInspection/eqInspection.vue +++ b/src/pages/eqInspection/eqInspection.vue @@ -44,7 +44,7 @@ - 扫描新增 + 扫描新增 查 询 @@ -179,6 +179,12 @@ export default { name: 'index' }) }, + // 扫描新增 + toAdd () { + this.$router.push({ + name: 'eqInspectionAdd' + }) + }, // 重置筛选项 resetQuery () { this.queryList = { @@ -245,14 +251,14 @@ export default { background: #4271FF; .van-icon { color: #fff; - font-size: .5rem; + font-size: .4375rem; } .van-nav-bar__content { height: 1.5rem; line-height: 1.5rem; .van-nav-bar__title { color: #fff; - font-size: .5rem; + font-size: .4375rem; } } } @@ -288,19 +294,15 @@ export default { background: #fff; box-shadow: .02rem .02rem .1rem rgba($color: #000000, $alpha: .2); input::-webkit-input-placeholder { - color: #131415; font-size: .375rem; } input:-moz-placeholder { - color: #131415; font-size: .375rem; } input::-moz-placeholder { - color: #131415; font-size: .375rem; } input:-ms-input-placeholder { - color: #131415; font-size: .375rem; } } diff --git a/src/router/index.js b/src/router/index.js index 5e06544..1a1984e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2,9 +2,9 @@ * @Author: gtz * @Date: 2022-07-25 14:18:00 * @LastEditors: gtz - * @LastEditTime: 2022-07-25 15:12:22 + * @LastEditTime: 2022-07-29 13:24:07 * @Description: file content - * @FilePath: \xbapp\src\router\index.js + * @FilePath: \hf-pda\src\router\index.js */ import Vue from 'vue' import Router from 'vue-router' @@ -12,6 +12,8 @@ import login from '@/pages/common/login' import notFound from '@/pages/common/404' import index from '@/pages/index/index' import eqInspection from '@/pages/eqInspection/eqInspection' +import eqInspectionAdd from '@/pages/eqInspection/eqInspection-add' +import eqInspectionEdit from '@/pages/eqInspection/eqInspection-edit' import material from '@/pages/material/material' Vue.use(Router) @@ -35,6 +37,18 @@ const router = new Router({ meta: {requireAuth: true}, component: eqInspection }, + { + path: '/eqInspection-add', + name: 'eqInspectionAdd', + meta: {requireAuth: true}, + component: eqInspectionAdd + }, + { + path: '/eqInspection-edit', + name: 'eqInspectionEdit', + meta: {requireAuth: true}, + component: eqInspectionEdit + }, { path: '/material', name: 'material', diff --git a/src/util/request.js b/src/util/request.js index c11a91c..8f7cb5b 100644 --- a/src/util/request.js +++ b/src/util/request.js @@ -2,9 +2,9 @@ * @Author: gtz * @Date: 2022-07-25 14:18:00 * @LastEditors: gtz - * @LastEditTime: 2022-07-25 14:31:03 + * @LastEditTime: 2022-07-29 13:18:34 * @Description: file content - * @FilePath: \xbapp\src\util\request.js + * @FilePath: \hf-pda\src\util\request.js */ import axios from 'axios' import { Toast, Notify } from 'vant' @@ -59,11 +59,11 @@ service.interceptors.response.use( pagetotal: response.data.pagetotal } } else { - Notify(response.data.message) + Notify(response.data.msg) return { success: false, data: response.data, - msg: response.data.message + msg: response.data.msg } } // return response