diff --git a/mock/deviceManage/deviceTypeDetail.js b/mock/deviceManage/deviceTypeDetail.js new file mode 100644 index 0000000..e763ece --- /dev/null +++ b/mock/deviceManage/deviceTypeDetail.js @@ -0,0 +1,39 @@ +const welldataList = [ + { + 'devcode': '井盖状态检测仪', + 'wellCode': 'testeq43', + 'descn': '', + 'status': '开启', + 'logtime': '2020/10/12' + }, + { + 'devcode': '井盖状态检测仪', + 'wellCode': 'testeq43', + 'descn': '', + 'status': '关闭', + 'logtime': '2020/12/22' + }, + { + 'devcode': '井盖状态检测仪', + 'wellCode': 'testeq43', + 'descn': '', + 'status': '开启', + 'logtime': '2020/12/27' + } +] + +module.exports = [ + // mock get all routes form server + { + url: '/welldata/listSimple', + type: 'get', + response: _ => { + return { + code: 200, + data: welldataList, + message: '请求成功', + success: true + } + } + } +] diff --git a/mock/deviceManage/deviceTypeDetail.js b/mock/deviceManage/deviceTypeDetail.js new file mode 100644 index 0000000..e763ece --- /dev/null +++ b/mock/deviceManage/deviceTypeDetail.js @@ -0,0 +1,39 @@ +const welldataList = [ + { + 'devcode': '井盖状态检测仪', + 'wellCode': 'testeq43', + 'descn': '', + 'status': '开启', + 'logtime': '2020/10/12' + }, + { + 'devcode': '井盖状态检测仪', + 'wellCode': 'testeq43', + 'descn': '', + 'status': '关闭', + 'logtime': '2020/12/22' + }, + { + 'devcode': '井盖状态检测仪', + 'wellCode': 'testeq43', + 'descn': '', + 'status': '开启', + 'logtime': '2020/12/27' + } +] + +module.exports = [ + // mock get all routes form server + { + url: '/welldata/listSimple', + type: 'get', + response: _ => { + return { + code: 200, + data: welldataList, + message: '请求成功', + success: true + } + } + } +] diff --git a/mock/index.js b/mock/index.js index 1c9930d..7f52923 100644 --- a/mock/index.js +++ b/mock/index.js @@ -16,6 +16,7 @@ const deviceType = require('./deviceManage/deviceType') const deviceModels = require('./deviceManage/deviceModels') const deviceImei = require('./deviceManage/deviceImei') +const deviceTypeDetail = require('./deviceManage/deviceTypeDetail') const alarmLevel = require('./systemConfig/alarmLevel') const alarmContent = require('./systemConfig/alarmContent') const tenantConfig = require('./systemConfig/tenantConfig') @@ -39,6 +40,7 @@ ...deviceType, ...deviceModels, ...deviceImei, + ...deviceTypeDetail, ...alarmLevel, ...alarmContent, ...tenantConfig, diff --git a/mock/deviceManage/deviceTypeDetail.js b/mock/deviceManage/deviceTypeDetail.js new file mode 100644 index 0000000..e763ece --- /dev/null +++ b/mock/deviceManage/deviceTypeDetail.js @@ -0,0 +1,39 @@ +const welldataList = [ + { + 'devcode': '井盖状态检测仪', + 'wellCode': 'testeq43', + 'descn': '', + 'status': '开启', + 'logtime': '2020/10/12' + }, + { + 'devcode': '井盖状态检测仪', + 'wellCode': 'testeq43', + 'descn': '', + 'status': '关闭', + 'logtime': '2020/12/22' + }, + { + 'devcode': '井盖状态检测仪', + 'wellCode': 'testeq43', + 'descn': '', + 'status': '开启', + 'logtime': '2020/12/27' + } +] + +module.exports = [ + // mock get all routes form server + { + url: '/welldata/listSimple', + type: 'get', + response: _ => { + return { + code: 200, + data: welldataList, + message: '请求成功', + success: true + } + } + } +] diff --git a/mock/index.js b/mock/index.js index 1c9930d..7f52923 100644 --- a/mock/index.js +++ b/mock/index.js @@ -16,6 +16,7 @@ const deviceType = require('./deviceManage/deviceType') const deviceModels = require('./deviceManage/deviceModels') const deviceImei = require('./deviceManage/deviceImei') +const deviceTypeDetail = require('./deviceManage/deviceTypeDetail') const alarmLevel = require('./systemConfig/alarmLevel') const alarmContent = require('./systemConfig/alarmContent') const tenantConfig = require('./systemConfig/tenantConfig') @@ -39,6 +40,7 @@ ...deviceType, ...deviceModels, ...deviceImei, + ...deviceTypeDetail, ...alarmLevel, ...alarmContent, ...tenantConfig, diff --git a/src/api/device/deviceTypeDetail.js b/src/api/device/deviceTypeDetail.js new file mode 100644 index 0000000..b9e6d8d --- /dev/null +++ b/src/api/device/deviceTypeDetail.js @@ -0,0 +1,14 @@ +/** + * 设备管理接口 + */ +import request from '@/utils/request' + +// 井盖状态监测仪查询 +export function welldataList(params) { + return request({ + url: 'welldata/listSimple', + method: 'get', + params + }) +} + diff --git a/mock/deviceManage/deviceTypeDetail.js b/mock/deviceManage/deviceTypeDetail.js new file mode 100644 index 0000000..e763ece --- /dev/null +++ b/mock/deviceManage/deviceTypeDetail.js @@ -0,0 +1,39 @@ +const welldataList = [ + { + 'devcode': '井盖状态检测仪', + 'wellCode': 'testeq43', + 'descn': '', + 'status': '开启', + 'logtime': '2020/10/12' + }, + { + 'devcode': '井盖状态检测仪', + 'wellCode': 'testeq43', + 'descn': '', + 'status': '关闭', + 'logtime': '2020/12/22' + }, + { + 'devcode': '井盖状态检测仪', + 'wellCode': 'testeq43', + 'descn': '', + 'status': '开启', + 'logtime': '2020/12/27' + } +] + +module.exports = [ + // mock get all routes form server + { + url: '/welldata/listSimple', + type: 'get', + response: _ => { + return { + code: 200, + data: welldataList, + message: '请求成功', + success: true + } + } + } +] diff --git a/mock/index.js b/mock/index.js index 1c9930d..7f52923 100644 --- a/mock/index.js +++ b/mock/index.js @@ -16,6 +16,7 @@ const deviceType = require('./deviceManage/deviceType') const deviceModels = require('./deviceManage/deviceModels') const deviceImei = require('./deviceManage/deviceImei') +const deviceTypeDetail = require('./deviceManage/deviceTypeDetail') const alarmLevel = require('./systemConfig/alarmLevel') const alarmContent = require('./systemConfig/alarmContent') const tenantConfig = require('./systemConfig/tenantConfig') @@ -39,6 +40,7 @@ ...deviceType, ...deviceModels, ...deviceImei, + ...deviceTypeDetail, ...alarmLevel, ...alarmContent, ...tenantConfig, diff --git a/src/api/device/deviceTypeDetail.js b/src/api/device/deviceTypeDetail.js new file mode 100644 index 0000000..b9e6d8d --- /dev/null +++ b/src/api/device/deviceTypeDetail.js @@ -0,0 +1,14 @@ +/** + * 设备管理接口 + */ +import request from '@/utils/request' + +// 井盖状态监测仪查询 +export function welldataList(params) { + return request({ + url: 'welldata/listSimple', + method: 'get', + params + }) +} + diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue index c5e65c9..da6c393 100644 --- a/src/views/alarmStatics/alarmStatics.vue +++ b/src/views/alarmStatics/alarmStatics.vue @@ -29,8 +29,6 @@ alarmStaticsByType, alarmHistoryByType, alarmStaticsByDept - }, - data() { } } diff --git a/mock/deviceManage/deviceTypeDetail.js b/mock/deviceManage/deviceTypeDetail.js new file mode 100644 index 0000000..e763ece --- /dev/null +++ b/mock/deviceManage/deviceTypeDetail.js @@ -0,0 +1,39 @@ +const welldataList = [ + { + 'devcode': '井盖状态检测仪', + 'wellCode': 'testeq43', + 'descn': '', + 'status': '开启', + 'logtime': '2020/10/12' + }, + { + 'devcode': '井盖状态检测仪', + 'wellCode': 'testeq43', + 'descn': '', + 'status': '关闭', + 'logtime': '2020/12/22' + }, + { + 'devcode': '井盖状态检测仪', + 'wellCode': 'testeq43', + 'descn': '', + 'status': '开启', + 'logtime': '2020/12/27' + } +] + +module.exports = [ + // mock get all routes form server + { + url: '/welldata/listSimple', + type: 'get', + response: _ => { + return { + code: 200, + data: welldataList, + message: '请求成功', + success: true + } + } + } +] diff --git a/mock/index.js b/mock/index.js index 1c9930d..7f52923 100644 --- a/mock/index.js +++ b/mock/index.js @@ -16,6 +16,7 @@ const deviceType = require('./deviceManage/deviceType') const deviceModels = require('./deviceManage/deviceModels') const deviceImei = require('./deviceManage/deviceImei') +const deviceTypeDetail = require('./deviceManage/deviceTypeDetail') const alarmLevel = require('./systemConfig/alarmLevel') const alarmContent = require('./systemConfig/alarmContent') const tenantConfig = require('./systemConfig/tenantConfig') @@ -39,6 +40,7 @@ ...deviceType, ...deviceModels, ...deviceImei, + ...deviceTypeDetail, ...alarmLevel, ...alarmContent, ...tenantConfig, diff --git a/src/api/device/deviceTypeDetail.js b/src/api/device/deviceTypeDetail.js new file mode 100644 index 0000000..b9e6d8d --- /dev/null +++ b/src/api/device/deviceTypeDetail.js @@ -0,0 +1,14 @@ +/** + * 设备管理接口 + */ +import request from '@/utils/request' + +// 井盖状态监测仪查询 +export function welldataList(params) { + return request({ + url: 'welldata/listSimple', + method: 'get', + params + }) +} + diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue index c5e65c9..da6c393 100644 --- a/src/views/alarmStatics/alarmStatics.vue +++ b/src/views/alarmStatics/alarmStatics.vue @@ -29,8 +29,6 @@ alarmStaticsByType, alarmHistoryByType, alarmStaticsByDept - }, - data() { } } diff --git a/src/views/alarmStatics/components/alarmHistoryByType.vue b/src/views/alarmStatics/components/alarmHistoryByType.vue index 9a69c7c..dfc4f0b 100644 --- a/src/views/alarmStatics/components/alarmHistoryByType.vue +++ b/src/views/alarmStatics/components/alarmHistoryByType.vue @@ -10,11 +10,11 @@ diff --git a/mock/deviceManage/deviceTypeDetail.js b/mock/deviceManage/deviceTypeDetail.js new file mode 100644 index 0000000..e763ece --- /dev/null +++ b/mock/deviceManage/deviceTypeDetail.js @@ -0,0 +1,39 @@ +const welldataList = [ + { + 'devcode': '井盖状态检测仪', + 'wellCode': 'testeq43', + 'descn': '', + 'status': '开启', + 'logtime': '2020/10/12' + }, + { + 'devcode': '井盖状态检测仪', + 'wellCode': 'testeq43', + 'descn': '', + 'status': '关闭', + 'logtime': '2020/12/22' + }, + { + 'devcode': '井盖状态检测仪', + 'wellCode': 'testeq43', + 'descn': '', + 'status': '开启', + 'logtime': '2020/12/27' + } +] + +module.exports = [ + // mock get all routes form server + { + url: '/welldata/listSimple', + type: 'get', + response: _ => { + return { + code: 200, + data: welldataList, + message: '请求成功', + success: true + } + } + } +] diff --git a/mock/index.js b/mock/index.js index 1c9930d..7f52923 100644 --- a/mock/index.js +++ b/mock/index.js @@ -16,6 +16,7 @@ const deviceType = require('./deviceManage/deviceType') const deviceModels = require('./deviceManage/deviceModels') const deviceImei = require('./deviceManage/deviceImei') +const deviceTypeDetail = require('./deviceManage/deviceTypeDetail') const alarmLevel = require('./systemConfig/alarmLevel') const alarmContent = require('./systemConfig/alarmContent') const tenantConfig = require('./systemConfig/tenantConfig') @@ -39,6 +40,7 @@ ...deviceType, ...deviceModels, ...deviceImei, + ...deviceTypeDetail, ...alarmLevel, ...alarmContent, ...tenantConfig, diff --git a/src/api/device/deviceTypeDetail.js b/src/api/device/deviceTypeDetail.js new file mode 100644 index 0000000..b9e6d8d --- /dev/null +++ b/src/api/device/deviceTypeDetail.js @@ -0,0 +1,14 @@ +/** + * 设备管理接口 + */ +import request from '@/utils/request' + +// 井盖状态监测仪查询 +export function welldataList(params) { + return request({ + url: 'welldata/listSimple', + method: 'get', + params + }) +} + diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue index c5e65c9..da6c393 100644 --- a/src/views/alarmStatics/alarmStatics.vue +++ b/src/views/alarmStatics/alarmStatics.vue @@ -29,8 +29,6 @@ alarmStaticsByType, alarmHistoryByType, alarmStaticsByDept - }, - data() { } } diff --git a/src/views/alarmStatics/components/alarmHistoryByType.vue b/src/views/alarmStatics/components/alarmHistoryByType.vue index 9a69c7c..dfc4f0b 100644 --- a/src/views/alarmStatics/components/alarmHistoryByType.vue +++ b/src/views/alarmStatics/components/alarmHistoryByType.vue @@ -10,11 +10,11 @@ diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue index 5280608..d0ffb42 100644 --- a/src/views/alarmStatics/components/alarmStaticsByDept.vue +++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue @@ -10,11 +10,11 @@ diff --git a/mock/deviceManage/deviceTypeDetail.js b/mock/deviceManage/deviceTypeDetail.js new file mode 100644 index 0000000..e763ece --- /dev/null +++ b/mock/deviceManage/deviceTypeDetail.js @@ -0,0 +1,39 @@ +const welldataList = [ + { + 'devcode': '井盖状态检测仪', + 'wellCode': 'testeq43', + 'descn': '', + 'status': '开启', + 'logtime': '2020/10/12' + }, + { + 'devcode': '井盖状态检测仪', + 'wellCode': 'testeq43', + 'descn': '', + 'status': '关闭', + 'logtime': '2020/12/22' + }, + { + 'devcode': '井盖状态检测仪', + 'wellCode': 'testeq43', + 'descn': '', + 'status': '开启', + 'logtime': '2020/12/27' + } +] + +module.exports = [ + // mock get all routes form server + { + url: '/welldata/listSimple', + type: 'get', + response: _ => { + return { + code: 200, + data: welldataList, + message: '请求成功', + success: true + } + } + } +] diff --git a/mock/index.js b/mock/index.js index 1c9930d..7f52923 100644 --- a/mock/index.js +++ b/mock/index.js @@ -16,6 +16,7 @@ const deviceType = require('./deviceManage/deviceType') const deviceModels = require('./deviceManage/deviceModels') const deviceImei = require('./deviceManage/deviceImei') +const deviceTypeDetail = require('./deviceManage/deviceTypeDetail') const alarmLevel = require('./systemConfig/alarmLevel') const alarmContent = require('./systemConfig/alarmContent') const tenantConfig = require('./systemConfig/tenantConfig') @@ -39,6 +40,7 @@ ...deviceType, ...deviceModels, ...deviceImei, + ...deviceTypeDetail, ...alarmLevel, ...alarmContent, ...tenantConfig, diff --git a/src/api/device/deviceTypeDetail.js b/src/api/device/deviceTypeDetail.js new file mode 100644 index 0000000..b9e6d8d --- /dev/null +++ b/src/api/device/deviceTypeDetail.js @@ -0,0 +1,14 @@ +/** + * 设备管理接口 + */ +import request from '@/utils/request' + +// 井盖状态监测仪查询 +export function welldataList(params) { + return request({ + url: 'welldata/listSimple', + method: 'get', + params + }) +} + diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue index c5e65c9..da6c393 100644 --- a/src/views/alarmStatics/alarmStatics.vue +++ b/src/views/alarmStatics/alarmStatics.vue @@ -29,8 +29,6 @@ alarmStaticsByType, alarmHistoryByType, alarmStaticsByDept - }, - data() { } } diff --git a/src/views/alarmStatics/components/alarmHistoryByType.vue b/src/views/alarmStatics/components/alarmHistoryByType.vue index 9a69c7c..dfc4f0b 100644 --- a/src/views/alarmStatics/components/alarmHistoryByType.vue +++ b/src/views/alarmStatics/components/alarmHistoryByType.vue @@ -10,11 +10,11 @@ diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue index 5280608..d0ffb42 100644 --- a/src/views/alarmStatics/components/alarmStaticsByDept.vue +++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue @@ -10,11 +10,11 @@ diff --git a/src/views/alarmStatics/components/alarmStaticsByType.vue b/src/views/alarmStatics/components/alarmStaticsByType.vue index e4f772b..c7f70e2 100644 --- a/src/views/alarmStatics/components/alarmStaticsByType.vue +++ b/src/views/alarmStatics/components/alarmStaticsByType.vue @@ -36,7 +36,7 @@ diff --git a/mock/deviceManage/deviceTypeDetail.js b/mock/deviceManage/deviceTypeDetail.js new file mode 100644 index 0000000..e763ece --- /dev/null +++ b/mock/deviceManage/deviceTypeDetail.js @@ -0,0 +1,39 @@ +const welldataList = [ + { + 'devcode': '井盖状态检测仪', + 'wellCode': 'testeq43', + 'descn': '', + 'status': '开启', + 'logtime': '2020/10/12' + }, + { + 'devcode': '井盖状态检测仪', + 'wellCode': 'testeq43', + 'descn': '', + 'status': '关闭', + 'logtime': '2020/12/22' + }, + { + 'devcode': '井盖状态检测仪', + 'wellCode': 'testeq43', + 'descn': '', + 'status': '开启', + 'logtime': '2020/12/27' + } +] + +module.exports = [ + // mock get all routes form server + { + url: '/welldata/listSimple', + type: 'get', + response: _ => { + return { + code: 200, + data: welldataList, + message: '请求成功', + success: true + } + } + } +] diff --git a/mock/index.js b/mock/index.js index 1c9930d..7f52923 100644 --- a/mock/index.js +++ b/mock/index.js @@ -16,6 +16,7 @@ const deviceType = require('./deviceManage/deviceType') const deviceModels = require('./deviceManage/deviceModels') const deviceImei = require('./deviceManage/deviceImei') +const deviceTypeDetail = require('./deviceManage/deviceTypeDetail') const alarmLevel = require('./systemConfig/alarmLevel') const alarmContent = require('./systemConfig/alarmContent') const tenantConfig = require('./systemConfig/tenantConfig') @@ -39,6 +40,7 @@ ...deviceType, ...deviceModels, ...deviceImei, + ...deviceTypeDetail, ...alarmLevel, ...alarmContent, ...tenantConfig, diff --git a/src/api/device/deviceTypeDetail.js b/src/api/device/deviceTypeDetail.js new file mode 100644 index 0000000..b9e6d8d --- /dev/null +++ b/src/api/device/deviceTypeDetail.js @@ -0,0 +1,14 @@ +/** + * 设备管理接口 + */ +import request from '@/utils/request' + +// 井盖状态监测仪查询 +export function welldataList(params) { + return request({ + url: 'welldata/listSimple', + method: 'get', + params + }) +} + diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue index c5e65c9..da6c393 100644 --- a/src/views/alarmStatics/alarmStatics.vue +++ b/src/views/alarmStatics/alarmStatics.vue @@ -29,8 +29,6 @@ alarmStaticsByType, alarmHistoryByType, alarmStaticsByDept - }, - data() { } } diff --git a/src/views/alarmStatics/components/alarmHistoryByType.vue b/src/views/alarmStatics/components/alarmHistoryByType.vue index 9a69c7c..dfc4f0b 100644 --- a/src/views/alarmStatics/components/alarmHistoryByType.vue +++ b/src/views/alarmStatics/components/alarmHistoryByType.vue @@ -10,11 +10,11 @@ diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue index 5280608..d0ffb42 100644 --- a/src/views/alarmStatics/components/alarmStaticsByDept.vue +++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue @@ -10,11 +10,11 @@ diff --git a/src/views/alarmStatics/components/alarmStaticsByType.vue b/src/views/alarmStatics/components/alarmStaticsByType.vue index e4f772b..c7f70e2 100644 --- a/src/views/alarmStatics/components/alarmStaticsByType.vue +++ b/src/views/alarmStatics/components/alarmStaticsByType.vue @@ -36,7 +36,7 @@ diff --git a/src/views/deviceManage/components/listWellData.vue b/src/views/deviceManage/components/listWellData.vue index 7a6436d..87639ed 100644 --- a/src/views/deviceManage/components/listWellData.vue +++ b/src/views/deviceManage/components/listWellData.vue @@ -1,18 +1,119 @@ + + + diff --git a/mock/deviceManage/deviceTypeDetail.js b/mock/deviceManage/deviceTypeDetail.js new file mode 100644 index 0000000..e763ece --- /dev/null +++ b/mock/deviceManage/deviceTypeDetail.js @@ -0,0 +1,39 @@ +const welldataList = [ + { + 'devcode': '井盖状态检测仪', + 'wellCode': 'testeq43', + 'descn': '', + 'status': '开启', + 'logtime': '2020/10/12' + }, + { + 'devcode': '井盖状态检测仪', + 'wellCode': 'testeq43', + 'descn': '', + 'status': '关闭', + 'logtime': '2020/12/22' + }, + { + 'devcode': '井盖状态检测仪', + 'wellCode': 'testeq43', + 'descn': '', + 'status': '开启', + 'logtime': '2020/12/27' + } +] + +module.exports = [ + // mock get all routes form server + { + url: '/welldata/listSimple', + type: 'get', + response: _ => { + return { + code: 200, + data: welldataList, + message: '请求成功', + success: true + } + } + } +] diff --git a/mock/index.js b/mock/index.js index 1c9930d..7f52923 100644 --- a/mock/index.js +++ b/mock/index.js @@ -16,6 +16,7 @@ const deviceType = require('./deviceManage/deviceType') const deviceModels = require('./deviceManage/deviceModels') const deviceImei = require('./deviceManage/deviceImei') +const deviceTypeDetail = require('./deviceManage/deviceTypeDetail') const alarmLevel = require('./systemConfig/alarmLevel') const alarmContent = require('./systemConfig/alarmContent') const tenantConfig = require('./systemConfig/tenantConfig') @@ -39,6 +40,7 @@ ...deviceType, ...deviceModels, ...deviceImei, + ...deviceTypeDetail, ...alarmLevel, ...alarmContent, ...tenantConfig, diff --git a/src/api/device/deviceTypeDetail.js b/src/api/device/deviceTypeDetail.js new file mode 100644 index 0000000..b9e6d8d --- /dev/null +++ b/src/api/device/deviceTypeDetail.js @@ -0,0 +1,14 @@ +/** + * 设备管理接口 + */ +import request from '@/utils/request' + +// 井盖状态监测仪查询 +export function welldataList(params) { + return request({ + url: 'welldata/listSimple', + method: 'get', + params + }) +} + diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue index c5e65c9..da6c393 100644 --- a/src/views/alarmStatics/alarmStatics.vue +++ b/src/views/alarmStatics/alarmStatics.vue @@ -29,8 +29,6 @@ alarmStaticsByType, alarmHistoryByType, alarmStaticsByDept - }, - data() { } } diff --git a/src/views/alarmStatics/components/alarmHistoryByType.vue b/src/views/alarmStatics/components/alarmHistoryByType.vue index 9a69c7c..dfc4f0b 100644 --- a/src/views/alarmStatics/components/alarmHistoryByType.vue +++ b/src/views/alarmStatics/components/alarmHistoryByType.vue @@ -10,11 +10,11 @@ diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue index 5280608..d0ffb42 100644 --- a/src/views/alarmStatics/components/alarmStaticsByDept.vue +++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue @@ -10,11 +10,11 @@ diff --git a/src/views/alarmStatics/components/alarmStaticsByType.vue b/src/views/alarmStatics/components/alarmStaticsByType.vue index e4f772b..c7f70e2 100644 --- a/src/views/alarmStatics/components/alarmStaticsByType.vue +++ b/src/views/alarmStatics/components/alarmStaticsByType.vue @@ -36,7 +36,7 @@ diff --git a/src/views/deviceManage/components/listWellData.vue b/src/views/deviceManage/components/listWellData.vue index 7a6436d..87639ed 100644 --- a/src/views/deviceManage/components/listWellData.vue +++ b/src/views/deviceManage/components/listWellData.vue @@ -1,18 +1,119 @@ + + + diff --git a/src/views/deviceStatics/deviceStatics.vue b/src/views/deviceStatics/deviceStatics.vue index 001410b..2071584 100644 --- a/src/views/deviceStatics/deviceStatics.vue +++ b/src/views/deviceStatics/deviceStatics.vue @@ -23,8 +23,6 @@ deviceCountByDept, deviceCountByOffline, listDeviceOffline - }, - data() { } } diff --git a/mock/deviceManage/deviceTypeDetail.js b/mock/deviceManage/deviceTypeDetail.js new file mode 100644 index 0000000..e763ece --- /dev/null +++ b/mock/deviceManage/deviceTypeDetail.js @@ -0,0 +1,39 @@ +const welldataList = [ + { + 'devcode': '井盖状态检测仪', + 'wellCode': 'testeq43', + 'descn': '', + 'status': '开启', + 'logtime': '2020/10/12' + }, + { + 'devcode': '井盖状态检测仪', + 'wellCode': 'testeq43', + 'descn': '', + 'status': '关闭', + 'logtime': '2020/12/22' + }, + { + 'devcode': '井盖状态检测仪', + 'wellCode': 'testeq43', + 'descn': '', + 'status': '开启', + 'logtime': '2020/12/27' + } +] + +module.exports = [ + // mock get all routes form server + { + url: '/welldata/listSimple', + type: 'get', + response: _ => { + return { + code: 200, + data: welldataList, + message: '请求成功', + success: true + } + } + } +] diff --git a/mock/index.js b/mock/index.js index 1c9930d..7f52923 100644 --- a/mock/index.js +++ b/mock/index.js @@ -16,6 +16,7 @@ const deviceType = require('./deviceManage/deviceType') const deviceModels = require('./deviceManage/deviceModels') const deviceImei = require('./deviceManage/deviceImei') +const deviceTypeDetail = require('./deviceManage/deviceTypeDetail') const alarmLevel = require('./systemConfig/alarmLevel') const alarmContent = require('./systemConfig/alarmContent') const tenantConfig = require('./systemConfig/tenantConfig') @@ -39,6 +40,7 @@ ...deviceType, ...deviceModels, ...deviceImei, + ...deviceTypeDetail, ...alarmLevel, ...alarmContent, ...tenantConfig, diff --git a/src/api/device/deviceTypeDetail.js b/src/api/device/deviceTypeDetail.js new file mode 100644 index 0000000..b9e6d8d --- /dev/null +++ b/src/api/device/deviceTypeDetail.js @@ -0,0 +1,14 @@ +/** + * 设备管理接口 + */ +import request from '@/utils/request' + +// 井盖状态监测仪查询 +export function welldataList(params) { + return request({ + url: 'welldata/listSimple', + method: 'get', + params + }) +} + diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue index c5e65c9..da6c393 100644 --- a/src/views/alarmStatics/alarmStatics.vue +++ b/src/views/alarmStatics/alarmStatics.vue @@ -29,8 +29,6 @@ alarmStaticsByType, alarmHistoryByType, alarmStaticsByDept - }, - data() { } } diff --git a/src/views/alarmStatics/components/alarmHistoryByType.vue b/src/views/alarmStatics/components/alarmHistoryByType.vue index 9a69c7c..dfc4f0b 100644 --- a/src/views/alarmStatics/components/alarmHistoryByType.vue +++ b/src/views/alarmStatics/components/alarmHistoryByType.vue @@ -10,11 +10,11 @@ diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue index 5280608..d0ffb42 100644 --- a/src/views/alarmStatics/components/alarmStaticsByDept.vue +++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue @@ -10,11 +10,11 @@ diff --git a/src/views/alarmStatics/components/alarmStaticsByType.vue b/src/views/alarmStatics/components/alarmStaticsByType.vue index e4f772b..c7f70e2 100644 --- a/src/views/alarmStatics/components/alarmStaticsByType.vue +++ b/src/views/alarmStatics/components/alarmStaticsByType.vue @@ -36,7 +36,7 @@ diff --git a/src/views/deviceManage/components/listWellData.vue b/src/views/deviceManage/components/listWellData.vue index 7a6436d..87639ed 100644 --- a/src/views/deviceManage/components/listWellData.vue +++ b/src/views/deviceManage/components/listWellData.vue @@ -1,18 +1,119 @@ + + + diff --git a/src/views/deviceStatics/deviceStatics.vue b/src/views/deviceStatics/deviceStatics.vue index 001410b..2071584 100644 --- a/src/views/deviceStatics/deviceStatics.vue +++ b/src/views/deviceStatics/deviceStatics.vue @@ -23,8 +23,6 @@ deviceCountByDept, deviceCountByOffline, listDeviceOffline - }, - data() { } } diff --git a/src/views/example/tableExample.vue b/src/views/example/tableExample.vue index a75a8dd..fa1e98b 100644 --- a/src/views/example/tableExample.vue +++ b/src/views/example/tableExample.vue @@ -45,7 +45,7 @@ - +