diff --git a/src/api/mes/application.js b/src/api/mes/application.js new file mode 100644 index 0000000..50a84e8 --- /dev/null +++ b/src/api/mes/application.js @@ -0,0 +1,54 @@ +import request from '@/utils/request' + + +// 查询能源设备列表 +export function getEnergyDevice(params) { + return request({ + url: '/admin-api/mes/energy-device/page', + method: 'get', + params: params + }) +} + +// 修改能源设备 +export function updateEnergyDeviceCheckRecord(data) { + return request({ + url: '/admin-api/mes/energy-device/update', + method: 'put', + data: data + }) +} + +// 删除能源设备 +export function deleteEnergyDevice(id) { + return request({ + url: '/admin-api/mes/energy-device/delete?id='+id, + method: 'delete' + }) +} + +// 查询抄表记录 +export function getEnergyDeviceCheckRecord(params) { + return request({ + url: '/admin-api/mes/energy-device/energy-device-check-record/page', + method: 'get', + params + }) +} + +// 新增抄表记录 +export function createEnergyDeviceCheckRecord(data) { + return request({ + url: '/admin-api/mes/energy-device/energy-device-check-record/create', + method: 'post', + data: data + }) +} + +// 删除抄表记录 +export function deleteEnergyDeviceCheckRecordById(id) { + return request({ + url: '/admin-api/mes/energy-device/energy-device-check-record/delete?id='+id, + method: 'delete' + }) +} diff --git a/src/api/mes/product.js b/src/api/mes/product.js index b12af00..a6093ee 100644 --- a/src/api/mes/product.js +++ b/src/api/mes/product.js @@ -1,4 +1,3 @@ - import request from '@/utils/request' diff --git a/src/page_report/reportForm.vue b/src/page_report/reportForm.vue index 390df6e..1b80699 100644 --- a/src/page_report/reportForm.vue +++ b/src/page_report/reportForm.vue @@ -331,7 +331,6 @@ export default { } .u-button { height: 35px; - width: auto; } .uni-group-title{ height: 55px; diff --git a/src/pages.json b/src/pages.json index 12cbe5c..45d8db9 100644 --- a/src/pages.json +++ b/src/pages.json @@ -13,16 +13,23 @@ }, "pages": [ { - "path": "pages/index", + "path": "pages/login", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/application/index", "style": { "navigationStyle": "custom", "enablePullDownRefresh": true } }, { - "path": "pages/login", + "path": "pages/plan", "style": { - "navigationStyle": "custom" + "navigationStyle": "custom", + "enablePullDownRefresh": true } }, { @@ -32,7 +39,13 @@ "enablePullDownRefresh": true } }, - + { + "path": "pages/report", + "style": { + "navigationStyle": "custom", + "enablePullDownRefresh": true + } + }, { "path": "pages/mine", "style": { @@ -52,10 +65,34 @@ } }, { - "path": "pages/report", + "path": "pages/application/components/deskArrangement", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/application/components/energyEquipment", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/application/components/energyEquipmentDetail", "style": { "navigationStyle": "custom", - "enablePullDownRefresh": true + "onReachBottomDistance": 50 + } + }, + { + "path": "pages/application/components/energyEquipmentForm", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/application/components/energyEquipmentFormReset", + "style": { + "navigationStyle": "custom" } } ], @@ -292,7 +329,13 @@ "backgroundColor": "#ffffff", "list": [ { - "pagePath": "pages/index", + "pagePath": "pages/application/index", + "iconPath": "static/images/tabbar/app.png", + "selectedIconPath": "static/images/tabbar/app_.png", + "text": "我的应用" + }, + { + "pagePath": "pages/plan", "iconPath": "static/images/tabbar/home.png", "selectedIconPath": "static/images/tabbar/home_.png", "text": "计划" diff --git a/src/pages/application/components/deskArrangement.vue b/src/pages/application/components/deskArrangement.vue new file mode 100644 index 0000000..7f5cff5 --- /dev/null +++ b/src/pages/application/components/deskArrangement.vue @@ -0,0 +1,25 @@ + + + diff --git a/src/pages/application/components/energyEquipment.vue b/src/pages/application/components/energyEquipment.vue new file mode 100644 index 0000000..f29ee1b --- /dev/null +++ b/src/pages/application/components/energyEquipment.vue @@ -0,0 +1,188 @@ + + + + + \ No newline at end of file diff --git a/src/pages/application/components/energyEquipmentDetail.vue b/src/pages/application/components/energyEquipmentDetail.vue new file mode 100644 index 0000000..2be117d --- /dev/null +++ b/src/pages/application/components/energyEquipmentDetail.vue @@ -0,0 +1,132 @@ + + + + + \ No newline at end of file diff --git a/src/pages/application/components/energyEquipmentForm.vue b/src/pages/application/components/energyEquipmentForm.vue new file mode 100644 index 0000000..9352cb5 --- /dev/null +++ b/src/pages/application/components/energyEquipmentForm.vue @@ -0,0 +1,114 @@ + + + + + \ No newline at end of file diff --git a/src/pages/application/components/energyEquipmentFormReset.vue b/src/pages/application/components/energyEquipmentFormReset.vue new file mode 100644 index 0000000..ee25b21 --- /dev/null +++ b/src/pages/application/components/energyEquipmentFormReset.vue @@ -0,0 +1,89 @@ + + + + + \ No newline at end of file diff --git a/src/pages/application/index.vue b/src/pages/application/index.vue new file mode 100644 index 0000000..e9dae8e --- /dev/null +++ b/src/pages/application/index.vue @@ -0,0 +1,119 @@ + + + + + diff --git a/src/pages/login.vue b/src/pages/login.vue index 3a70b77..16f4ae7 100644 --- a/src/pages/login.vue +++ b/src/pages/login.vue @@ -95,7 +95,7 @@ function loginSuccess(result) { // 设置用户信息 userStore.getInfo().then(res => { uni.switchTab({ - url: '/pages/index' + url: '/pages/application/index' }); }) } diff --git a/src/pages/index.vue b/src/pages/plan.vue similarity index 100% rename from src/pages/index.vue rename to src/pages/plan.vue diff --git a/src/static/images/icon/arrangement.png b/src/static/images/icon/arrangement.png new file mode 100644 index 0000000..191004d Binary files /dev/null and b/src/static/images/icon/arrangement.png differ diff --git a/src/static/images/icon/energy.png b/src/static/images/icon/energy.png new file mode 100644 index 0000000..5777596 Binary files /dev/null and b/src/static/images/icon/energy.png differ diff --git a/src/static/images/tabbar/app.png b/src/static/images/tabbar/app.png new file mode 100644 index 0000000..c740126 Binary files /dev/null and b/src/static/images/tabbar/app.png differ diff --git a/src/static/images/tabbar/app_.png b/src/static/images/tabbar/app_.png new file mode 100644 index 0000000..8a861de Binary files /dev/null and b/src/static/images/tabbar/app_.png differ