diff --git a/index.html b/index.html index 96ad6f4..ce72319 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - 智能闸井监测管理系统 + 智能窨井监测管理系统
diff --git a/index.html b/index.html index 96ad6f4..ce72319 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - 智能闸井监测管理系统 + 智能窨井监测管理系统
diff --git a/src/api/overview.js b/src/api/overview.js index e786862..8b15aeb 100644 --- a/src/api/overview.js +++ b/src/api/overview.js @@ -1,8 +1,8 @@ /** - * 闸井总览模块接口 + * 窨井总览模块接口 */ import request from '@/utils/request' -// 闸井查询 +// 窨井查询 export function getWellList(params) { return request({ url: 'overview/wellList', @@ -10,7 +10,7 @@ params }) } -// 获取闸井详情 +// 获取窨井详情 export function getWellInfo(id) { return request({ url: 'overview/wellInfo', diff --git a/index.html b/index.html index 96ad6f4..ce72319 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - 智能闸井监测管理系统 + 智能窨井监测管理系统
diff --git a/src/api/overview.js b/src/api/overview.js index e786862..8b15aeb 100644 --- a/src/api/overview.js +++ b/src/api/overview.js @@ -1,8 +1,8 @@ /** - * 闸井总览模块接口 + * 窨井总览模块接口 */ import request from '@/utils/request' -// 闸井查询 +// 窨井查询 export function getWellList(params) { return request({ url: 'overview/wellList', @@ -10,7 +10,7 @@ params }) } -// 获取闸井详情 +// 获取窨井详情 export function getWellInfo(id) { return request({ url: 'overview/wellInfo', diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index eed1be4..7563fbb 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -5,7 +5,7 @@ - + @@ -49,7 +49,7 @@ - + @@ -176,7 +176,7 @@ showAlarmType: true, // 是否显示告警类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 - wellShow: false, // 是否显示闸井详情 + wellShow: false, // 是否显示窨井详情 detailShow: false, // 是否显示编辑框 cancelShow: false // 是否显示取消报警原因弹窗 } @@ -238,7 +238,7 @@ return cellValue } }, - // 显示闸井详情 + // 显示窨井详情 showWellDetail(row) { this.wellShow = true this.$refs.wellInfo.initDialog(row.wellId) diff --git a/index.html b/index.html index 96ad6f4..ce72319 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - 智能闸井监测管理系统 + 智能窨井监测管理系统
diff --git a/src/api/overview.js b/src/api/overview.js index e786862..8b15aeb 100644 --- a/src/api/overview.js +++ b/src/api/overview.js @@ -1,8 +1,8 @@ /** - * 闸井总览模块接口 + * 窨井总览模块接口 */ import request from '@/utils/request' -// 闸井查询 +// 窨井查询 export function getWellList(params) { return request({ url: 'overview/wellList', @@ -10,7 +10,7 @@ params }) } -// 获取闸井详情 +// 获取窨井详情 export function getWellInfo(id) { return request({ url: 'overview/wellInfo', diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index eed1be4..7563fbb 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -5,7 +5,7 @@ - + @@ -49,7 +49,7 @@ - + @@ -176,7 +176,7 @@ showAlarmType: true, // 是否显示告警类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 - wellShow: false, // 是否显示闸井详情 + wellShow: false, // 是否显示窨井详情 detailShow: false, // 是否显示编辑框 cancelShow: false // 是否显示取消报警原因弹窗 } @@ -238,7 +238,7 @@ return cellValue } }, - // 显示闸井详情 + // 显示窨井详情 showWellDetail(row) { this.wellShow = true this.$refs.wellInfo.initDialog(row.wellId) diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue index 64cb232..8b6b90e 100644 --- a/src/views/alarmManage/listAlarmRecords.vue +++ b/src/views/alarmManage/listAlarmRecords.vue @@ -200,8 +200,8 @@ next() }, mounted() { - if (this.$route.query && this.$route.query.wellCode) { - this.listQuery.keywords = this.$route.query.wellCode + if (this.$route.窨井 && this.$route.窨井.wellCode) { + this.listQuery.keywords = this.$route.窨井.wellCode this.fetchData(false) } else { this.listQuery.keywords = '' @@ -216,8 +216,8 @@ activated() { console.log('alarmRecored actived') if (!isFromDetail) { - if (this.$route.query && this.$route.query.wellCode) { - this.listQuery.keywords = this.$route.query.wellCode + if (this.$route.窨井 && this.$route.窨井.wellCode) { + this.listQuery.keywords = this.$route.窨井.wellCode this.fetchData(false) } else { this.listQuery.keywords = '' @@ -239,8 +239,8 @@ // 工单 showJob(row) { const jobId = row.jobId - this.$router.push({ path: '/detailJob/' + jobId, query: { jobId: jobId }}) - //this.$router.push({ name: 'DetailJob', query: { jobId: row.jobId }}) + this.$router.push({ path: '/detailJob/' + jobId, 窨井: { jobId: jobId }}) + //this.$router.push({ name: 'DetailJob', 窨井: { jobId: row.jobId }}) }, // 批量导出 batchExport() { diff --git a/index.html b/index.html index 96ad6f4..ce72319 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - 智能闸井监测管理系统 + 智能窨井监测管理系统
diff --git a/src/api/overview.js b/src/api/overview.js index e786862..8b15aeb 100644 --- a/src/api/overview.js +++ b/src/api/overview.js @@ -1,8 +1,8 @@ /** - * 闸井总览模块接口 + * 窨井总览模块接口 */ import request from '@/utils/request' -// 闸井查询 +// 窨井查询 export function getWellList(params) { return request({ url: 'overview/wellList', @@ -10,7 +10,7 @@ params }) } -// 获取闸井详情 +// 获取窨井详情 export function getWellInfo(id) { return request({ url: 'overview/wellInfo', diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index eed1be4..7563fbb 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -5,7 +5,7 @@ - + @@ -49,7 +49,7 @@ - + @@ -176,7 +176,7 @@ showAlarmType: true, // 是否显示告警类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 - wellShow: false, // 是否显示闸井详情 + wellShow: false, // 是否显示窨井详情 detailShow: false, // 是否显示编辑框 cancelShow: false // 是否显示取消报警原因弹窗 } @@ -238,7 +238,7 @@ return cellValue } }, - // 显示闸井详情 + // 显示窨井详情 showWellDetail(row) { this.wellShow = true this.$refs.wellInfo.initDialog(row.wellId) diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue index 64cb232..8b6b90e 100644 --- a/src/views/alarmManage/listAlarmRecords.vue +++ b/src/views/alarmManage/listAlarmRecords.vue @@ -200,8 +200,8 @@ next() }, mounted() { - if (this.$route.query && this.$route.query.wellCode) { - this.listQuery.keywords = this.$route.query.wellCode + if (this.$route.窨井 && this.$route.窨井.wellCode) { + this.listQuery.keywords = this.$route.窨井.wellCode this.fetchData(false) } else { this.listQuery.keywords = '' @@ -216,8 +216,8 @@ activated() { console.log('alarmRecored actived') if (!isFromDetail) { - if (this.$route.query && this.$route.query.wellCode) { - this.listQuery.keywords = this.$route.query.wellCode + if (this.$route.窨井 && this.$route.窨井.wellCode) { + this.listQuery.keywords = this.$route.窨井.wellCode this.fetchData(false) } else { this.listQuery.keywords = '' @@ -239,8 +239,8 @@ // 工单 showJob(row) { const jobId = row.jobId - this.$router.push({ path: '/detailJob/' + jobId, query: { jobId: jobId }}) - //this.$router.push({ name: 'DetailJob', query: { jobId: row.jobId }}) + this.$router.push({ path: '/detailJob/' + jobId, 窨井: { jobId: jobId }}) + //this.$router.push({ name: 'DetailJob', 窨井: { jobId: row.jobId }}) }, // 批量导出 batchExport() { diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue index 7420ef1..dc61a71 100644 --- a/src/views/alarmRule/editRule.vue +++ b/src/views/alarmRule/editRule.vue @@ -3,7 +3,7 @@ - + @@ -77,8 +77,8 @@ dialogFormVisible: false, // 对话框是否显示 dialogStatus: '', // 对话框类型：create,update baseInfo: { - wellCode: '', // 闸井编号 - wellName: '', // 闸井名称 + wellCode: '', // 窨井编号 + wellName: '', // 窨井名称 deep: '', // 井深 deviceType: '', // 设备类别 deviceTypeName: '', // 设备类别 diff --git a/index.html b/index.html index 96ad6f4..ce72319 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - 智能闸井监测管理系统 + 智能窨井监测管理系统
diff --git a/src/api/overview.js b/src/api/overview.js index e786862..8b15aeb 100644 --- a/src/api/overview.js +++ b/src/api/overview.js @@ -1,8 +1,8 @@ /** - * 闸井总览模块接口 + * 窨井总览模块接口 */ import request from '@/utils/request' -// 闸井查询 +// 窨井查询 export function getWellList(params) { return request({ url: 'overview/wellList', @@ -10,7 +10,7 @@ params }) } -// 获取闸井详情 +// 获取窨井详情 export function getWellInfo(id) { return request({ url: 'overview/wellInfo', diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index eed1be4..7563fbb 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -5,7 +5,7 @@ - + @@ -49,7 +49,7 @@ - + @@ -176,7 +176,7 @@ showAlarmType: true, // 是否显示告警类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 - wellShow: false, // 是否显示闸井详情 + wellShow: false, // 是否显示窨井详情 detailShow: false, // 是否显示编辑框 cancelShow: false // 是否显示取消报警原因弹窗 } @@ -238,7 +238,7 @@ return cellValue } }, - // 显示闸井详情 + // 显示窨井详情 showWellDetail(row) { this.wellShow = true this.$refs.wellInfo.initDialog(row.wellId) diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue index 64cb232..8b6b90e 100644 --- a/src/views/alarmManage/listAlarmRecords.vue +++ b/src/views/alarmManage/listAlarmRecords.vue @@ -200,8 +200,8 @@ next() }, mounted() { - if (this.$route.query && this.$route.query.wellCode) { - this.listQuery.keywords = this.$route.query.wellCode + if (this.$route.窨井 && this.$route.窨井.wellCode) { + this.listQuery.keywords = this.$route.窨井.wellCode this.fetchData(false) } else { this.listQuery.keywords = '' @@ -216,8 +216,8 @@ activated() { console.log('alarmRecored actived') if (!isFromDetail) { - if (this.$route.query && this.$route.query.wellCode) { - this.listQuery.keywords = this.$route.query.wellCode + if (this.$route.窨井 && this.$route.窨井.wellCode) { + this.listQuery.keywords = this.$route.窨井.wellCode this.fetchData(false) } else { this.listQuery.keywords = '' @@ -239,8 +239,8 @@ // 工单 showJob(row) { const jobId = row.jobId - this.$router.push({ path: '/detailJob/' + jobId, query: { jobId: jobId }}) - //this.$router.push({ name: 'DetailJob', query: { jobId: row.jobId }}) + this.$router.push({ path: '/detailJob/' + jobId, 窨井: { jobId: jobId }}) + //this.$router.push({ name: 'DetailJob', 窨井: { jobId: row.jobId }}) }, // 批量导出 batchExport() { diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue index 7420ef1..dc61a71 100644 --- a/src/views/alarmRule/editRule.vue +++ b/src/views/alarmRule/editRule.vue @@ -3,7 +3,7 @@ - + @@ -77,8 +77,8 @@ dialogFormVisible: false, // 对话框是否显示 dialogStatus: '', // 对话框类型：create,update baseInfo: { - wellCode: '', // 闸井编号 - wellName: '', // 闸井名称 + wellCode: '', // 窨井编号 + wellName: '', // 窨井名称 deep: '', // 井深 deviceType: '', // 设备类别 deviceTypeName: '', // 设备类别 diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue index 04b93fb..77ce5c9 100644 --- a/src/views/alarmRule/listRule.vue +++ b/src/views/alarmRule/listRule.vue @@ -5,7 +5,7 @@ - + @@ -82,13 +82,13 @@ }, // 筛选条件 columns: [ { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center', type: 'Button' }, { - text: '闸井名称', + text: '窨井名称', value: 'wellName', align: 'center' }, @@ -126,7 +126,7 @@ showDeviceType: true, listLoading: true, // 加载动画 editShow: false, // 是否显示编辑框 - wellShow: false // 是否显示闸井详情 + wellShow: false // 是否显示窨井详情 } }, created() { @@ -134,7 +134,7 @@ this.fetchData()// 获取数据 }, methods: { - // 显示闸井详情 + // 显示窨井详情 showWellDetail(row) { this.wellShow = true this.$refs.wellInfo.initDialog(row.wellId) diff --git a/index.html b/index.html index 96ad6f4..ce72319 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - 智能闸井监测管理系统 + 智能窨井监测管理系统
diff --git a/src/api/overview.js b/src/api/overview.js index e786862..8b15aeb 100644 --- a/src/api/overview.js +++ b/src/api/overview.js @@ -1,8 +1,8 @@ /** - * 闸井总览模块接口 + * 窨井总览模块接口 */ import request from '@/utils/request' -// 闸井查询 +// 窨井查询 export function getWellList(params) { return request({ url: 'overview/wellList', @@ -10,7 +10,7 @@ params }) } -// 获取闸井详情 +// 获取窨井详情 export function getWellInfo(id) { return request({ url: 'overview/wellInfo', diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index eed1be4..7563fbb 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -5,7 +5,7 @@ - + @@ -49,7 +49,7 @@ - + @@ -176,7 +176,7 @@ showAlarmType: true, // 是否显示告警类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 - wellShow: false, // 是否显示闸井详情 + wellShow: false, // 是否显示窨井详情 detailShow: false, // 是否显示编辑框 cancelShow: false // 是否显示取消报警原因弹窗 } @@ -238,7 +238,7 @@ return cellValue } }, - // 显示闸井详情 + // 显示窨井详情 showWellDetail(row) { this.wellShow = true this.$refs.wellInfo.initDialog(row.wellId) diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue index 64cb232..8b6b90e 100644 --- a/src/views/alarmManage/listAlarmRecords.vue +++ b/src/views/alarmManage/listAlarmRecords.vue @@ -200,8 +200,8 @@ next() }, mounted() { - if (this.$route.query && this.$route.query.wellCode) { - this.listQuery.keywords = this.$route.query.wellCode + if (this.$route.窨井 && this.$route.窨井.wellCode) { + this.listQuery.keywords = this.$route.窨井.wellCode this.fetchData(false) } else { this.listQuery.keywords = '' @@ -216,8 +216,8 @@ activated() { console.log('alarmRecored actived') if (!isFromDetail) { - if (this.$route.query && this.$route.query.wellCode) { - this.listQuery.keywords = this.$route.query.wellCode + if (this.$route.窨井 && this.$route.窨井.wellCode) { + this.listQuery.keywords = this.$route.窨井.wellCode this.fetchData(false) } else { this.listQuery.keywords = '' @@ -239,8 +239,8 @@ // 工单 showJob(row) { const jobId = row.jobId - this.$router.push({ path: '/detailJob/' + jobId, query: { jobId: jobId }}) - //this.$router.push({ name: 'DetailJob', query: { jobId: row.jobId }}) + this.$router.push({ path: '/detailJob/' + jobId, 窨井: { jobId: jobId }}) + //this.$router.push({ name: 'DetailJob', 窨井: { jobId: row.jobId }}) }, // 批量导出 batchExport() { diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue index 7420ef1..dc61a71 100644 --- a/src/views/alarmRule/editRule.vue +++ b/src/views/alarmRule/editRule.vue @@ -3,7 +3,7 @@ - + @@ -77,8 +77,8 @@ dialogFormVisible: false, // 对话框是否显示 dialogStatus: '', // 对话框类型：create,update baseInfo: { - wellCode: '', // 闸井编号 - wellName: '', // 闸井名称 + wellCode: '', // 窨井编号 + wellName: '', // 窨井名称 deep: '', // 井深 deviceType: '', // 设备类别 deviceTypeName: '', // 设备类别 diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue index 04b93fb..77ce5c9 100644 --- a/src/views/alarmRule/listRule.vue +++ b/src/views/alarmRule/listRule.vue @@ -5,7 +5,7 @@ - + @@ -82,13 +82,13 @@ }, // 筛选条件 columns: [ { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center', type: 'Button' }, { - text: '闸井名称', + text: '窨井名称', value: 'wellName', align: 'center' }, @@ -126,7 +126,7 @@ showDeviceType: true, listLoading: true, // 加载动画 editShow: false, // 是否显示编辑框 - wellShow: false // 是否显示闸井详情 + wellShow: false // 是否显示窨井详情 } }, created() { @@ -134,7 +134,7 @@ this.fetchData()// 获取数据 }, methods: { - // 显示闸井详情 + // 显示窨井详情 showWellDetail(row) { this.wellShow = true this.$refs.wellInfo.initDialog(row.wellId) diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue index cdcb8bb..85cd370 100644 --- a/src/views/dataManage/deviceData/listDigData.vue +++ b/src/views/dataManage/deviceData/listDigData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/index.html b/index.html index 96ad6f4..ce72319 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - 智能闸井监测管理系统 + 智能窨井监测管理系统
diff --git a/src/api/overview.js b/src/api/overview.js index e786862..8b15aeb 100644 --- a/src/api/overview.js +++ b/src/api/overview.js @@ -1,8 +1,8 @@ /** - * 闸井总览模块接口 + * 窨井总览模块接口 */ import request from '@/utils/request' -// 闸井查询 +// 窨井查询 export function getWellList(params) { return request({ url: 'overview/wellList', @@ -10,7 +10,7 @@ params }) } -// 获取闸井详情 +// 获取窨井详情 export function getWellInfo(id) { return request({ url: 'overview/wellInfo', diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index eed1be4..7563fbb 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -5,7 +5,7 @@ - + @@ -49,7 +49,7 @@ - + @@ -176,7 +176,7 @@ showAlarmType: true, // 是否显示告警类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 - wellShow: false, // 是否显示闸井详情 + wellShow: false, // 是否显示窨井详情 detailShow: false, // 是否显示编辑框 cancelShow: false // 是否显示取消报警原因弹窗 } @@ -238,7 +238,7 @@ return cellValue } }, - // 显示闸井详情 + // 显示窨井详情 showWellDetail(row) { this.wellShow = true this.$refs.wellInfo.initDialog(row.wellId) diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue index 64cb232..8b6b90e 100644 --- a/src/views/alarmManage/listAlarmRecords.vue +++ b/src/views/alarmManage/listAlarmRecords.vue @@ -200,8 +200,8 @@ next() }, mounted() { - if (this.$route.query && this.$route.query.wellCode) { - this.listQuery.keywords = this.$route.query.wellCode + if (this.$route.窨井 && this.$route.窨井.wellCode) { + this.listQuery.keywords = this.$route.窨井.wellCode this.fetchData(false) } else { this.listQuery.keywords = '' @@ -216,8 +216,8 @@ activated() { console.log('alarmRecored actived') if (!isFromDetail) { - if (this.$route.query && this.$route.query.wellCode) { - this.listQuery.keywords = this.$route.query.wellCode + if (this.$route.窨井 && this.$route.窨井.wellCode) { + this.listQuery.keywords = this.$route.窨井.wellCode this.fetchData(false) } else { this.listQuery.keywords = '' @@ -239,8 +239,8 @@ // 工单 showJob(row) { const jobId = row.jobId - this.$router.push({ path: '/detailJob/' + jobId, query: { jobId: jobId }}) - //this.$router.push({ name: 'DetailJob', query: { jobId: row.jobId }}) + this.$router.push({ path: '/detailJob/' + jobId, 窨井: { jobId: jobId }}) + //this.$router.push({ name: 'DetailJob', 窨井: { jobId: row.jobId }}) }, // 批量导出 batchExport() { diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue index 7420ef1..dc61a71 100644 --- a/src/views/alarmRule/editRule.vue +++ b/src/views/alarmRule/editRule.vue @@ -3,7 +3,7 @@ - + @@ -77,8 +77,8 @@ dialogFormVisible: false, // 对话框是否显示 dialogStatus: '', // 对话框类型：create,update baseInfo: { - wellCode: '', // 闸井编号 - wellName: '', // 闸井名称 + wellCode: '', // 窨井编号 + wellName: '', // 窨井名称 deep: '', // 井深 deviceType: '', // 设备类别 deviceTypeName: '', // 设备类别 diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue index 04b93fb..77ce5c9 100644 --- a/src/views/alarmRule/listRule.vue +++ b/src/views/alarmRule/listRule.vue @@ -5,7 +5,7 @@ - + @@ -82,13 +82,13 @@ }, // 筛选条件 columns: [ { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center', type: 'Button' }, { - text: '闸井名称', + text: '窨井名称', value: 'wellName', align: 'center' }, @@ -126,7 +126,7 @@ showDeviceType: true, listLoading: true, // 加载动画 editShow: false, // 是否显示编辑框 - wellShow: false // 是否显示闸井详情 + wellShow: false // 是否显示窨井详情 } }, created() { @@ -134,7 +134,7 @@ this.fetchData()// 获取数据 }, methods: { - // 显示闸井详情 + // 显示窨井详情 showWellDetail(row) { this.wellShow = true this.$refs.wellInfo.initDialog(row.wellId) diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue index cdcb8bb..85cd370 100644 --- a/src/views/dataManage/deviceData/listDigData.vue +++ b/src/views/dataManage/deviceData/listDigData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue index 32ecfdf..1be1da7 100644 --- a/src/views/dataManage/deviceData/listGasData.vue +++ b/src/views/dataManage/deviceData/listGasData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/index.html b/index.html index 96ad6f4..ce72319 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - 智能闸井监测管理系统 + 智能窨井监测管理系统
diff --git a/src/api/overview.js b/src/api/overview.js index e786862..8b15aeb 100644 --- a/src/api/overview.js +++ b/src/api/overview.js @@ -1,8 +1,8 @@ /** - * 闸井总览模块接口 + * 窨井总览模块接口 */ import request from '@/utils/request' -// 闸井查询 +// 窨井查询 export function getWellList(params) { return request({ url: 'overview/wellList', @@ -10,7 +10,7 @@ params }) } -// 获取闸井详情 +// 获取窨井详情 export function getWellInfo(id) { return request({ url: 'overview/wellInfo', diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index eed1be4..7563fbb 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -5,7 +5,7 @@ - + @@ -49,7 +49,7 @@ - + @@ -176,7 +176,7 @@ showAlarmType: true, // 是否显示告警类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 - wellShow: false, // 是否显示闸井详情 + wellShow: false, // 是否显示窨井详情 detailShow: false, // 是否显示编辑框 cancelShow: false // 是否显示取消报警原因弹窗 } @@ -238,7 +238,7 @@ return cellValue } }, - // 显示闸井详情 + // 显示窨井详情 showWellDetail(row) { this.wellShow = true this.$refs.wellInfo.initDialog(row.wellId) diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue index 64cb232..8b6b90e 100644 --- a/src/views/alarmManage/listAlarmRecords.vue +++ b/src/views/alarmManage/listAlarmRecords.vue @@ -200,8 +200,8 @@ next() }, mounted() { - if (this.$route.query && this.$route.query.wellCode) { - this.listQuery.keywords = this.$route.query.wellCode + if (this.$route.窨井 && this.$route.窨井.wellCode) { + this.listQuery.keywords = this.$route.窨井.wellCode this.fetchData(false) } else { this.listQuery.keywords = '' @@ -216,8 +216,8 @@ activated() { console.log('alarmRecored actived') if (!isFromDetail) { - if (this.$route.query && this.$route.query.wellCode) { - this.listQuery.keywords = this.$route.query.wellCode + if (this.$route.窨井 && this.$route.窨井.wellCode) { + this.listQuery.keywords = this.$route.窨井.wellCode this.fetchData(false) } else { this.listQuery.keywords = '' @@ -239,8 +239,8 @@ // 工单 showJob(row) { const jobId = row.jobId - this.$router.push({ path: '/detailJob/' + jobId, query: { jobId: jobId }}) - //this.$router.push({ name: 'DetailJob', query: { jobId: row.jobId }}) + this.$router.push({ path: '/detailJob/' + jobId, 窨井: { jobId: jobId }}) + //this.$router.push({ name: 'DetailJob', 窨井: { jobId: row.jobId }}) }, // 批量导出 batchExport() { diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue index 7420ef1..dc61a71 100644 --- a/src/views/alarmRule/editRule.vue +++ b/src/views/alarmRule/editRule.vue @@ -3,7 +3,7 @@ - + @@ -77,8 +77,8 @@ dialogFormVisible: false, // 对话框是否显示 dialogStatus: '', // 对话框类型：create,update baseInfo: { - wellCode: '', // 闸井编号 - wellName: '', // 闸井名称 + wellCode: '', // 窨井编号 + wellName: '', // 窨井名称 deep: '', // 井深 deviceType: '', // 设备类别 deviceTypeName: '', // 设备类别 diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue index 04b93fb..77ce5c9 100644 --- a/src/views/alarmRule/listRule.vue +++ b/src/views/alarmRule/listRule.vue @@ -5,7 +5,7 @@ - + @@ -82,13 +82,13 @@ }, // 筛选条件 columns: [ { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center', type: 'Button' }, { - text: '闸井名称', + text: '窨井名称', value: 'wellName', align: 'center' }, @@ -126,7 +126,7 @@ showDeviceType: true, listLoading: true, // 加载动画 editShow: false, // 是否显示编辑框 - wellShow: false // 是否显示闸井详情 + wellShow: false // 是否显示窨井详情 } }, created() { @@ -134,7 +134,7 @@ this.fetchData()// 获取数据 }, methods: { - // 显示闸井详情 + // 显示窨井详情 showWellDetail(row) { this.wellShow = true this.$refs.wellInfo.initDialog(row.wellId) diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue index cdcb8bb..85cd370 100644 --- a/src/views/dataManage/deviceData/listDigData.vue +++ b/src/views/dataManage/deviceData/listDigData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue index 32ecfdf..1be1da7 100644 --- a/src/views/dataManage/deviceData/listGasData.vue +++ b/src/views/dataManage/deviceData/listGasData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue index 2fbdd8c..fa80fb1 100644 --- a/src/views/dataManage/deviceData/listHarmfulData.vue +++ b/src/views/dataManage/deviceData/listHarmfulData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/index.html b/index.html index 96ad6f4..ce72319 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - 智能闸井监测管理系统 + 智能窨井监测管理系统
diff --git a/src/api/overview.js b/src/api/overview.js index e786862..8b15aeb 100644 --- a/src/api/overview.js +++ b/src/api/overview.js @@ -1,8 +1,8 @@ /** - * 闸井总览模块接口 + * 窨井总览模块接口 */ import request from '@/utils/request' -// 闸井查询 +// 窨井查询 export function getWellList(params) { return request({ url: 'overview/wellList', @@ -10,7 +10,7 @@ params }) } -// 获取闸井详情 +// 获取窨井详情 export function getWellInfo(id) { return request({ url: 'overview/wellInfo', diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index eed1be4..7563fbb 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -5,7 +5,7 @@ - + @@ -49,7 +49,7 @@ - + @@ -176,7 +176,7 @@ showAlarmType: true, // 是否显示告警类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 - wellShow: false, // 是否显示闸井详情 + wellShow: false, // 是否显示窨井详情 detailShow: false, // 是否显示编辑框 cancelShow: false // 是否显示取消报警原因弹窗 } @@ -238,7 +238,7 @@ return cellValue } }, - // 显示闸井详情 + // 显示窨井详情 showWellDetail(row) { this.wellShow = true this.$refs.wellInfo.initDialog(row.wellId) diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue index 64cb232..8b6b90e 100644 --- a/src/views/alarmManage/listAlarmRecords.vue +++ b/src/views/alarmManage/listAlarmRecords.vue @@ -200,8 +200,8 @@ next() }, mounted() { - if (this.$route.query && this.$route.query.wellCode) { - this.listQuery.keywords = this.$route.query.wellCode + if (this.$route.窨井 && this.$route.窨井.wellCode) { + this.listQuery.keywords = this.$route.窨井.wellCode this.fetchData(false) } else { this.listQuery.keywords = '' @@ -216,8 +216,8 @@ activated() { console.log('alarmRecored actived') if (!isFromDetail) { - if (this.$route.query && this.$route.query.wellCode) { - this.listQuery.keywords = this.$route.query.wellCode + if (this.$route.窨井 && this.$route.窨井.wellCode) { + this.listQuery.keywords = this.$route.窨井.wellCode this.fetchData(false) } else { this.listQuery.keywords = '' @@ -239,8 +239,8 @@ // 工单 showJob(row) { const jobId = row.jobId - this.$router.push({ path: '/detailJob/' + jobId, query: { jobId: jobId }}) - //this.$router.push({ name: 'DetailJob', query: { jobId: row.jobId }}) + this.$router.push({ path: '/detailJob/' + jobId, 窨井: { jobId: jobId }}) + //this.$router.push({ name: 'DetailJob', 窨井: { jobId: row.jobId }}) }, // 批量导出 batchExport() { diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue index 7420ef1..dc61a71 100644 --- a/src/views/alarmRule/editRule.vue +++ b/src/views/alarmRule/editRule.vue @@ -3,7 +3,7 @@ - + @@ -77,8 +77,8 @@ dialogFormVisible: false, // 对话框是否显示 dialogStatus: '', // 对话框类型：create,update baseInfo: { - wellCode: '', // 闸井编号 - wellName: '', // 闸井名称 + wellCode: '', // 窨井编号 + wellName: '', // 窨井名称 deep: '', // 井深 deviceType: '', // 设备类别 deviceTypeName: '', // 设备类别 diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue index 04b93fb..77ce5c9 100644 --- a/src/views/alarmRule/listRule.vue +++ b/src/views/alarmRule/listRule.vue @@ -5,7 +5,7 @@ - + @@ -82,13 +82,13 @@ }, // 筛选条件 columns: [ { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center', type: 'Button' }, { - text: '闸井名称', + text: '窨井名称', value: 'wellName', align: 'center' }, @@ -126,7 +126,7 @@ showDeviceType: true, listLoading: true, // 加载动画 editShow: false, // 是否显示编辑框 - wellShow: false // 是否显示闸井详情 + wellShow: false // 是否显示窨井详情 } }, created() { @@ -134,7 +134,7 @@ this.fetchData()// 获取数据 }, methods: { - // 显示闸井详情 + // 显示窨井详情 showWellDetail(row) { this.wellShow = true this.$refs.wellInfo.initDialog(row.wellId) diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue index cdcb8bb..85cd370 100644 --- a/src/views/dataManage/deviceData/listDigData.vue +++ b/src/views/dataManage/deviceData/listDigData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue index 32ecfdf..1be1da7 100644 --- a/src/views/dataManage/deviceData/listGasData.vue +++ b/src/views/dataManage/deviceData/listGasData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue index 2fbdd8c..fa80fb1 100644 --- a/src/views/dataManage/deviceData/listHarmfulData.vue +++ b/src/views/dataManage/deviceData/listHarmfulData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue index af4c365..c36e471 100644 --- a/src/views/dataManage/deviceData/listLiquidData.vue +++ b/src/views/dataManage/deviceData/listLiquidData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/index.html b/index.html index 96ad6f4..ce72319 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - 智能闸井监测管理系统 + 智能窨井监测管理系统
diff --git a/src/api/overview.js b/src/api/overview.js index e786862..8b15aeb 100644 --- a/src/api/overview.js +++ b/src/api/overview.js @@ -1,8 +1,8 @@ /** - * 闸井总览模块接口 + * 窨井总览模块接口 */ import request from '@/utils/request' -// 闸井查询 +// 窨井查询 export function getWellList(params) { return request({ url: 'overview/wellList', @@ -10,7 +10,7 @@ params }) } -// 获取闸井详情 +// 获取窨井详情 export function getWellInfo(id) { return request({ url: 'overview/wellInfo', diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index eed1be4..7563fbb 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -5,7 +5,7 @@ - + @@ -49,7 +49,7 @@ - + @@ -176,7 +176,7 @@ showAlarmType: true, // 是否显示告警类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 - wellShow: false, // 是否显示闸井详情 + wellShow: false, // 是否显示窨井详情 detailShow: false, // 是否显示编辑框 cancelShow: false // 是否显示取消报警原因弹窗 } @@ -238,7 +238,7 @@ return cellValue } }, - // 显示闸井详情 + // 显示窨井详情 showWellDetail(row) { this.wellShow = true this.$refs.wellInfo.initDialog(row.wellId) diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue index 64cb232..8b6b90e 100644 --- a/src/views/alarmManage/listAlarmRecords.vue +++ b/src/views/alarmManage/listAlarmRecords.vue @@ -200,8 +200,8 @@ next() }, mounted() { - if (this.$route.query && this.$route.query.wellCode) { - this.listQuery.keywords = this.$route.query.wellCode + if (this.$route.窨井 && this.$route.窨井.wellCode) { + this.listQuery.keywords = this.$route.窨井.wellCode this.fetchData(false) } else { this.listQuery.keywords = '' @@ -216,8 +216,8 @@ activated() { console.log('alarmRecored actived') if (!isFromDetail) { - if (this.$route.query && this.$route.query.wellCode) { - this.listQuery.keywords = this.$route.query.wellCode + if (this.$route.窨井 && this.$route.窨井.wellCode) { + this.listQuery.keywords = this.$route.窨井.wellCode this.fetchData(false) } else { this.listQuery.keywords = '' @@ -239,8 +239,8 @@ // 工单 showJob(row) { const jobId = row.jobId - this.$router.push({ path: '/detailJob/' + jobId, query: { jobId: jobId }}) - //this.$router.push({ name: 'DetailJob', query: { jobId: row.jobId }}) + this.$router.push({ path: '/detailJob/' + jobId, 窨井: { jobId: jobId }}) + //this.$router.push({ name: 'DetailJob', 窨井: { jobId: row.jobId }}) }, // 批量导出 batchExport() { diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue index 7420ef1..dc61a71 100644 --- a/src/views/alarmRule/editRule.vue +++ b/src/views/alarmRule/editRule.vue @@ -3,7 +3,7 @@ - + @@ -77,8 +77,8 @@ dialogFormVisible: false, // 对话框是否显示 dialogStatus: '', // 对话框类型：create,update baseInfo: { - wellCode: '', // 闸井编号 - wellName: '', // 闸井名称 + wellCode: '', // 窨井编号 + wellName: '', // 窨井名称 deep: '', // 井深 deviceType: '', // 设备类别 deviceTypeName: '', // 设备类别 diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue index 04b93fb..77ce5c9 100644 --- a/src/views/alarmRule/listRule.vue +++ b/src/views/alarmRule/listRule.vue @@ -5,7 +5,7 @@ - + @@ -82,13 +82,13 @@ }, // 筛选条件 columns: [ { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center', type: 'Button' }, { - text: '闸井名称', + text: '窨井名称', value: 'wellName', align: 'center' }, @@ -126,7 +126,7 @@ showDeviceType: true, listLoading: true, // 加载动画 editShow: false, // 是否显示编辑框 - wellShow: false // 是否显示闸井详情 + wellShow: false // 是否显示窨井详情 } }, created() { @@ -134,7 +134,7 @@ this.fetchData()// 获取数据 }, methods: { - // 显示闸井详情 + // 显示窨井详情 showWellDetail(row) { this.wellShow = true this.$refs.wellInfo.initDialog(row.wellId) diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue index cdcb8bb..85cd370 100644 --- a/src/views/dataManage/deviceData/listDigData.vue +++ b/src/views/dataManage/deviceData/listDigData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue index 32ecfdf..1be1da7 100644 --- a/src/views/dataManage/deviceData/listGasData.vue +++ b/src/views/dataManage/deviceData/listGasData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue index 2fbdd8c..fa80fb1 100644 --- a/src/views/dataManage/deviceData/listHarmfulData.vue +++ b/src/views/dataManage/deviceData/listHarmfulData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue index af4c365..c36e471 100644 --- a/src/views/dataManage/deviceData/listLiquidData.vue +++ b/src/views/dataManage/deviceData/listLiquidData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue index 3708b1f..279c1a4 100644 --- a/src/views/dataManage/deviceData/listTempData.vue +++ b/src/views/dataManage/deviceData/listTempData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/index.html b/index.html index 96ad6f4..ce72319 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - 智能闸井监测管理系统 + 智能窨井监测管理系统
diff --git a/src/api/overview.js b/src/api/overview.js index e786862..8b15aeb 100644 --- a/src/api/overview.js +++ b/src/api/overview.js @@ -1,8 +1,8 @@ /** - * 闸井总览模块接口 + * 窨井总览模块接口 */ import request from '@/utils/request' -// 闸井查询 +// 窨井查询 export function getWellList(params) { return request({ url: 'overview/wellList', @@ -10,7 +10,7 @@ params }) } -// 获取闸井详情 +// 获取窨井详情 export function getWellInfo(id) { return request({ url: 'overview/wellInfo', diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index eed1be4..7563fbb 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -5,7 +5,7 @@ - + @@ -49,7 +49,7 @@ - + @@ -176,7 +176,7 @@ showAlarmType: true, // 是否显示告警类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 - wellShow: false, // 是否显示闸井详情 + wellShow: false, // 是否显示窨井详情 detailShow: false, // 是否显示编辑框 cancelShow: false // 是否显示取消报警原因弹窗 } @@ -238,7 +238,7 @@ return cellValue } }, - // 显示闸井详情 + // 显示窨井详情 showWellDetail(row) { this.wellShow = true this.$refs.wellInfo.initDialog(row.wellId) diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue index 64cb232..8b6b90e 100644 --- a/src/views/alarmManage/listAlarmRecords.vue +++ b/src/views/alarmManage/listAlarmRecords.vue @@ -200,8 +200,8 @@ next() }, mounted() { - if (this.$route.query && this.$route.query.wellCode) { - this.listQuery.keywords = this.$route.query.wellCode + if (this.$route.窨井 && this.$route.窨井.wellCode) { + this.listQuery.keywords = this.$route.窨井.wellCode this.fetchData(false) } else { this.listQuery.keywords = '' @@ -216,8 +216,8 @@ activated() { console.log('alarmRecored actived') if (!isFromDetail) { - if (this.$route.query && this.$route.query.wellCode) { - this.listQuery.keywords = this.$route.query.wellCode + if (this.$route.窨井 && this.$route.窨井.wellCode) { + this.listQuery.keywords = this.$route.窨井.wellCode this.fetchData(false) } else { this.listQuery.keywords = '' @@ -239,8 +239,8 @@ // 工单 showJob(row) { const jobId = row.jobId - this.$router.push({ path: '/detailJob/' + jobId, query: { jobId: jobId }}) - //this.$router.push({ name: 'DetailJob', query: { jobId: row.jobId }}) + this.$router.push({ path: '/detailJob/' + jobId, 窨井: { jobId: jobId }}) + //this.$router.push({ name: 'DetailJob', 窨井: { jobId: row.jobId }}) }, // 批量导出 batchExport() { diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue index 7420ef1..dc61a71 100644 --- a/src/views/alarmRule/editRule.vue +++ b/src/views/alarmRule/editRule.vue @@ -3,7 +3,7 @@ - + @@ -77,8 +77,8 @@ dialogFormVisible: false, // 对话框是否显示 dialogStatus: '', // 对话框类型：create,update baseInfo: { - wellCode: '', // 闸井编号 - wellName: '', // 闸井名称 + wellCode: '', // 窨井编号 + wellName: '', // 窨井名称 deep: '', // 井深 deviceType: '', // 设备类别 deviceTypeName: '', // 设备类别 diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue index 04b93fb..77ce5c9 100644 --- a/src/views/alarmRule/listRule.vue +++ b/src/views/alarmRule/listRule.vue @@ -5,7 +5,7 @@ - + @@ -82,13 +82,13 @@ }, // 筛选条件 columns: [ { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center', type: 'Button' }, { - text: '闸井名称', + text: '窨井名称', value: 'wellName', align: 'center' }, @@ -126,7 +126,7 @@ showDeviceType: true, listLoading: true, // 加载动画 editShow: false, // 是否显示编辑框 - wellShow: false // 是否显示闸井详情 + wellShow: false // 是否显示窨井详情 } }, created() { @@ -134,7 +134,7 @@ this.fetchData()// 获取数据 }, methods: { - // 显示闸井详情 + // 显示窨井详情 showWellDetail(row) { this.wellShow = true this.$refs.wellInfo.initDialog(row.wellId) diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue index cdcb8bb..85cd370 100644 --- a/src/views/dataManage/deviceData/listDigData.vue +++ b/src/views/dataManage/deviceData/listDigData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue index 32ecfdf..1be1da7 100644 --- a/src/views/dataManage/deviceData/listGasData.vue +++ b/src/views/dataManage/deviceData/listGasData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue index 2fbdd8c..fa80fb1 100644 --- a/src/views/dataManage/deviceData/listHarmfulData.vue +++ b/src/views/dataManage/deviceData/listHarmfulData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue index af4c365..c36e471 100644 --- a/src/views/dataManage/deviceData/listLiquidData.vue +++ b/src/views/dataManage/deviceData/listLiquidData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue index 3708b1f..279c1a4 100644 --- a/src/views/dataManage/deviceData/listTempData.vue +++ b/src/views/dataManage/deviceData/listTempData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue index 4f841c8..5ef5bdd 100644 --- a/src/views/dataManage/deviceData/listWellCoverData.vue +++ b/src/views/dataManage/deviceData/listWellCoverData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/index.html b/index.html index 96ad6f4..ce72319 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - 智能闸井监测管理系统 + 智能窨井监测管理系统
diff --git a/src/api/overview.js b/src/api/overview.js index e786862..8b15aeb 100644 --- a/src/api/overview.js +++ b/src/api/overview.js @@ -1,8 +1,8 @@ /** - * 闸井总览模块接口 + * 窨井总览模块接口 */ import request from '@/utils/request' -// 闸井查询 +// 窨井查询 export function getWellList(params) { return request({ url: 'overview/wellList', @@ -10,7 +10,7 @@ params }) } -// 获取闸井详情 +// 获取窨井详情 export function getWellInfo(id) { return request({ url: 'overview/wellInfo', diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index eed1be4..7563fbb 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -5,7 +5,7 @@ - + @@ -49,7 +49,7 @@ - + @@ -176,7 +176,7 @@ showAlarmType: true, // 是否显示告警类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 - wellShow: false, // 是否显示闸井详情 + wellShow: false, // 是否显示窨井详情 detailShow: false, // 是否显示编辑框 cancelShow: false // 是否显示取消报警原因弹窗 } @@ -238,7 +238,7 @@ return cellValue } }, - // 显示闸井详情 + // 显示窨井详情 showWellDetail(row) { this.wellShow = true this.$refs.wellInfo.initDialog(row.wellId) diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue index 64cb232..8b6b90e 100644 --- a/src/views/alarmManage/listAlarmRecords.vue +++ b/src/views/alarmManage/listAlarmRecords.vue @@ -200,8 +200,8 @@ next() }, mounted() { - if (this.$route.query && this.$route.query.wellCode) { - this.listQuery.keywords = this.$route.query.wellCode + if (this.$route.窨井 && this.$route.窨井.wellCode) { + this.listQuery.keywords = this.$route.窨井.wellCode this.fetchData(false) } else { this.listQuery.keywords = '' @@ -216,8 +216,8 @@ activated() { console.log('alarmRecored actived') if (!isFromDetail) { - if (this.$route.query && this.$route.query.wellCode) { - this.listQuery.keywords = this.$route.query.wellCode + if (this.$route.窨井 && this.$route.窨井.wellCode) { + this.listQuery.keywords = this.$route.窨井.wellCode this.fetchData(false) } else { this.listQuery.keywords = '' @@ -239,8 +239,8 @@ // 工单 showJob(row) { const jobId = row.jobId - this.$router.push({ path: '/detailJob/' + jobId, query: { jobId: jobId }}) - //this.$router.push({ name: 'DetailJob', query: { jobId: row.jobId }}) + this.$router.push({ path: '/detailJob/' + jobId, 窨井: { jobId: jobId }}) + //this.$router.push({ name: 'DetailJob', 窨井: { jobId: row.jobId }}) }, // 批量导出 batchExport() { diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue index 7420ef1..dc61a71 100644 --- a/src/views/alarmRule/editRule.vue +++ b/src/views/alarmRule/editRule.vue @@ -3,7 +3,7 @@ - + @@ -77,8 +77,8 @@ dialogFormVisible: false, // 对话框是否显示 dialogStatus: '', // 对话框类型：create,update baseInfo: { - wellCode: '', // 闸井编号 - wellName: '', // 闸井名称 + wellCode: '', // 窨井编号 + wellName: '', // 窨井名称 deep: '', // 井深 deviceType: '', // 设备类别 deviceTypeName: '', // 设备类别 diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue index 04b93fb..77ce5c9 100644 --- a/src/views/alarmRule/listRule.vue +++ b/src/views/alarmRule/listRule.vue @@ -5,7 +5,7 @@ - + @@ -82,13 +82,13 @@ }, // 筛选条件 columns: [ { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center', type: 'Button' }, { - text: '闸井名称', + text: '窨井名称', value: 'wellName', align: 'center' }, @@ -126,7 +126,7 @@ showDeviceType: true, listLoading: true, // 加载动画 editShow: false, // 是否显示编辑框 - wellShow: false // 是否显示闸井详情 + wellShow: false // 是否显示窨井详情 } }, created() { @@ -134,7 +134,7 @@ this.fetchData()// 获取数据 }, methods: { - // 显示闸井详情 + // 显示窨井详情 showWellDetail(row) { this.wellShow = true this.$refs.wellInfo.initDialog(row.wellId) diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue index cdcb8bb..85cd370 100644 --- a/src/views/dataManage/deviceData/listDigData.vue +++ b/src/views/dataManage/deviceData/listDigData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue index 32ecfdf..1be1da7 100644 --- a/src/views/dataManage/deviceData/listGasData.vue +++ b/src/views/dataManage/deviceData/listGasData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue index 2fbdd8c..fa80fb1 100644 --- a/src/views/dataManage/deviceData/listHarmfulData.vue +++ b/src/views/dataManage/deviceData/listHarmfulData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue index af4c365..c36e471 100644 --- a/src/views/dataManage/deviceData/listLiquidData.vue +++ b/src/views/dataManage/deviceData/listLiquidData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue index 3708b1f..279c1a4 100644 --- a/src/views/dataManage/deviceData/listTempData.vue +++ b/src/views/dataManage/deviceData/listTempData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue index 4f841c8..5ef5bdd 100644 --- a/src/views/dataManage/deviceData/listWellCoverData.vue +++ b/src/views/dataManage/deviceData/listWellCoverData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue index a60077a..4bef89e 100644 --- a/src/views/dataManage/deviceData/listWellLocaData.vue +++ b/src/views/dataManage/deviceData/listWellLocaData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/index.html b/index.html index 96ad6f4..ce72319 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - 智能闸井监测管理系统 + 智能窨井监测管理系统
diff --git a/src/api/overview.js b/src/api/overview.js index e786862..8b15aeb 100644 --- a/src/api/overview.js +++ b/src/api/overview.js @@ -1,8 +1,8 @@ /** - * 闸井总览模块接口 + * 窨井总览模块接口 */ import request from '@/utils/request' -// 闸井查询 +// 窨井查询 export function getWellList(params) { return request({ url: 'overview/wellList', @@ -10,7 +10,7 @@ params }) } -// 获取闸井详情 +// 获取窨井详情 export function getWellInfo(id) { return request({ url: 'overview/wellInfo', diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index eed1be4..7563fbb 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -5,7 +5,7 @@ - + @@ -49,7 +49,7 @@ - + @@ -176,7 +176,7 @@ showAlarmType: true, // 是否显示告警类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 - wellShow: false, // 是否显示闸井详情 + wellShow: false, // 是否显示窨井详情 detailShow: false, // 是否显示编辑框 cancelShow: false // 是否显示取消报警原因弹窗 } @@ -238,7 +238,7 @@ return cellValue } }, - // 显示闸井详情 + // 显示窨井详情 showWellDetail(row) { this.wellShow = true this.$refs.wellInfo.initDialog(row.wellId) diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue index 64cb232..8b6b90e 100644 --- a/src/views/alarmManage/listAlarmRecords.vue +++ b/src/views/alarmManage/listAlarmRecords.vue @@ -200,8 +200,8 @@ next() }, mounted() { - if (this.$route.query && this.$route.query.wellCode) { - this.listQuery.keywords = this.$route.query.wellCode + if (this.$route.窨井 && this.$route.窨井.wellCode) { + this.listQuery.keywords = this.$route.窨井.wellCode this.fetchData(false) } else { this.listQuery.keywords = '' @@ -216,8 +216,8 @@ activated() { console.log('alarmRecored actived') if (!isFromDetail) { - if (this.$route.query && this.$route.query.wellCode) { - this.listQuery.keywords = this.$route.query.wellCode + if (this.$route.窨井 && this.$route.窨井.wellCode) { + this.listQuery.keywords = this.$route.窨井.wellCode this.fetchData(false) } else { this.listQuery.keywords = '' @@ -239,8 +239,8 @@ // 工单 showJob(row) { const jobId = row.jobId - this.$router.push({ path: '/detailJob/' + jobId, query: { jobId: jobId }}) - //this.$router.push({ name: 'DetailJob', query: { jobId: row.jobId }}) + this.$router.push({ path: '/detailJob/' + jobId, 窨井: { jobId: jobId }}) + //this.$router.push({ name: 'DetailJob', 窨井: { jobId: row.jobId }}) }, // 批量导出 batchExport() { diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue index 7420ef1..dc61a71 100644 --- a/src/views/alarmRule/editRule.vue +++ b/src/views/alarmRule/editRule.vue @@ -3,7 +3,7 @@ - + @@ -77,8 +77,8 @@ dialogFormVisible: false, // 对话框是否显示 dialogStatus: '', // 对话框类型：create,update baseInfo: { - wellCode: '', // 闸井编号 - wellName: '', // 闸井名称 + wellCode: '', // 窨井编号 + wellName: '', // 窨井名称 deep: '', // 井深 deviceType: '', // 设备类别 deviceTypeName: '', // 设备类别 diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue index 04b93fb..77ce5c9 100644 --- a/src/views/alarmRule/listRule.vue +++ b/src/views/alarmRule/listRule.vue @@ -5,7 +5,7 @@ - + @@ -82,13 +82,13 @@ }, // 筛选条件 columns: [ { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center', type: 'Button' }, { - text: '闸井名称', + text: '窨井名称', value: 'wellName', align: 'center' }, @@ -126,7 +126,7 @@ showDeviceType: true, listLoading: true, // 加载动画 editShow: false, // 是否显示编辑框 - wellShow: false // 是否显示闸井详情 + wellShow: false // 是否显示窨井详情 } }, created() { @@ -134,7 +134,7 @@ this.fetchData()// 获取数据 }, methods: { - // 显示闸井详情 + // 显示窨井详情 showWellDetail(row) { this.wellShow = true this.$refs.wellInfo.initDialog(row.wellId) diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue index cdcb8bb..85cd370 100644 --- a/src/views/dataManage/deviceData/listDigData.vue +++ b/src/views/dataManage/deviceData/listDigData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue index 32ecfdf..1be1da7 100644 --- a/src/views/dataManage/deviceData/listGasData.vue +++ b/src/views/dataManage/deviceData/listGasData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue index 2fbdd8c..fa80fb1 100644 --- a/src/views/dataManage/deviceData/listHarmfulData.vue +++ b/src/views/dataManage/deviceData/listHarmfulData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue index af4c365..c36e471 100644 --- a/src/views/dataManage/deviceData/listLiquidData.vue +++ b/src/views/dataManage/deviceData/listLiquidData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue index 3708b1f..279c1a4 100644 --- a/src/views/dataManage/deviceData/listTempData.vue +++ b/src/views/dataManage/deviceData/listTempData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue index 4f841c8..5ef5bdd 100644 --- a/src/views/dataManage/deviceData/listWellCoverData.vue +++ b/src/views/dataManage/deviceData/listWellCoverData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue index a60077a..4bef89e 100644 --- a/src/views/dataManage/deviceData/listWellLocaData.vue +++ b/src/views/dataManage/deviceData/listWellLocaData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue index 6f9d5b3..de8c382 100644 --- a/src/views/jobManage/detailJob.vue +++ b/src/views/jobManage/detailJob.vue @@ -8,7 +8,7 @@ - + @@ -136,7 +136,7 @@ dialogStatus: '', // 对话框类型：create,update jobForm: { jobCode: '', // 工单编号 - wellCode: '', // 闸井编号 + wellCode: '', // 窨井编号 devcode: '', // 设备编号 position: '', // 详细地址 coordinateX: '', diff --git a/index.html b/index.html index 96ad6f4..ce72319 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - 智能闸井监测管理系统 + 智能窨井监测管理系统
diff --git a/src/api/overview.js b/src/api/overview.js index e786862..8b15aeb 100644 --- a/src/api/overview.js +++ b/src/api/overview.js @@ -1,8 +1,8 @@ /** - * 闸井总览模块接口 + * 窨井总览模块接口 */ import request from '@/utils/request' -// 闸井查询 +// 窨井查询 export function getWellList(params) { return request({ url: 'overview/wellList', @@ -10,7 +10,7 @@ params }) } -// 获取闸井详情 +// 获取窨井详情 export function getWellInfo(id) { return request({ url: 'overview/wellInfo', diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index eed1be4..7563fbb 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -5,7 +5,7 @@ - + @@ -49,7 +49,7 @@ - + @@ -176,7 +176,7 @@ showAlarmType: true, // 是否显示告警类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 - wellShow: false, // 是否显示闸井详情 + wellShow: false, // 是否显示窨井详情 detailShow: false, // 是否显示编辑框 cancelShow: false // 是否显示取消报警原因弹窗 } @@ -238,7 +238,7 @@ return cellValue } }, - // 显示闸井详情 + // 显示窨井详情 showWellDetail(row) { this.wellShow = true this.$refs.wellInfo.initDialog(row.wellId) diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue index 64cb232..8b6b90e 100644 --- a/src/views/alarmManage/listAlarmRecords.vue +++ b/src/views/alarmManage/listAlarmRecords.vue @@ -200,8 +200,8 @@ next() }, mounted() { - if (this.$route.query && this.$route.query.wellCode) { - this.listQuery.keywords = this.$route.query.wellCode + if (this.$route.窨井 && this.$route.窨井.wellCode) { + this.listQuery.keywords = this.$route.窨井.wellCode this.fetchData(false) } else { this.listQuery.keywords = '' @@ -216,8 +216,8 @@ activated() { console.log('alarmRecored actived') if (!isFromDetail) { - if (this.$route.query && this.$route.query.wellCode) { - this.listQuery.keywords = this.$route.query.wellCode + if (this.$route.窨井 && this.$route.窨井.wellCode) { + this.listQuery.keywords = this.$route.窨井.wellCode this.fetchData(false) } else { this.listQuery.keywords = '' @@ -239,8 +239,8 @@ // 工单 showJob(row) { const jobId = row.jobId - this.$router.push({ path: '/detailJob/' + jobId, query: { jobId: jobId }}) - //this.$router.push({ name: 'DetailJob', query: { jobId: row.jobId }}) + this.$router.push({ path: '/detailJob/' + jobId, 窨井: { jobId: jobId }}) + //this.$router.push({ name: 'DetailJob', 窨井: { jobId: row.jobId }}) }, // 批量导出 batchExport() { diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue index 7420ef1..dc61a71 100644 --- a/src/views/alarmRule/editRule.vue +++ b/src/views/alarmRule/editRule.vue @@ -3,7 +3,7 @@ - + @@ -77,8 +77,8 @@ dialogFormVisible: false, // 对话框是否显示 dialogStatus: '', // 对话框类型：create,update baseInfo: { - wellCode: '', // 闸井编号 - wellName: '', // 闸井名称 + wellCode: '', // 窨井编号 + wellName: '', // 窨井名称 deep: '', // 井深 deviceType: '', // 设备类别 deviceTypeName: '', // 设备类别 diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue index 04b93fb..77ce5c9 100644 --- a/src/views/alarmRule/listRule.vue +++ b/src/views/alarmRule/listRule.vue @@ -5,7 +5,7 @@ - + @@ -82,13 +82,13 @@ }, // 筛选条件 columns: [ { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center', type: 'Button' }, { - text: '闸井名称', + text: '窨井名称', value: 'wellName', align: 'center' }, @@ -126,7 +126,7 @@ showDeviceType: true, listLoading: true, // 加载动画 editShow: false, // 是否显示编辑框 - wellShow: false // 是否显示闸井详情 + wellShow: false // 是否显示窨井详情 } }, created() { @@ -134,7 +134,7 @@ this.fetchData()// 获取数据 }, methods: { - // 显示闸井详情 + // 显示窨井详情 showWellDetail(row) { this.wellShow = true this.$refs.wellInfo.initDialog(row.wellId) diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue index cdcb8bb..85cd370 100644 --- a/src/views/dataManage/deviceData/listDigData.vue +++ b/src/views/dataManage/deviceData/listDigData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue index 32ecfdf..1be1da7 100644 --- a/src/views/dataManage/deviceData/listGasData.vue +++ b/src/views/dataManage/deviceData/listGasData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue index 2fbdd8c..fa80fb1 100644 --- a/src/views/dataManage/deviceData/listHarmfulData.vue +++ b/src/views/dataManage/deviceData/listHarmfulData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue index af4c365..c36e471 100644 --- a/src/views/dataManage/deviceData/listLiquidData.vue +++ b/src/views/dataManage/deviceData/listLiquidData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue index 3708b1f..279c1a4 100644 --- a/src/views/dataManage/deviceData/listTempData.vue +++ b/src/views/dataManage/deviceData/listTempData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue index 4f841c8..5ef5bdd 100644 --- a/src/views/dataManage/deviceData/listWellCoverData.vue +++ b/src/views/dataManage/deviceData/listWellCoverData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue index a60077a..4bef89e 100644 --- a/src/views/dataManage/deviceData/listWellLocaData.vue +++ b/src/views/dataManage/deviceData/listWellLocaData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue index 6f9d5b3..de8c382 100644 --- a/src/views/jobManage/detailJob.vue +++ b/src/views/jobManage/detailJob.vue @@ -8,7 +8,7 @@ - + @@ -136,7 +136,7 @@ dialogStatus: '', // 对话框类型：create,update jobForm: { jobCode: '', // 工单编号 - wellCode: '', // 闸井编号 + wellCode: '', // 窨井编号 devcode: '', // 设备编号 position: '', // 详细地址 coordinateX: '', diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue index a105203..0cfbd31 100644 --- a/src/views/jobManage/listJobs.vue +++ b/src/views/jobManage/listJobs.vue @@ -7,7 +7,7 @@ - + @@ -130,7 +130,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center', type: 'Button' @@ -276,7 +276,7 @@ return false } }, - // 显示闸井详情 + // 显示窨井详情 showWellDetail(row) { this.wellShow = true this.$refs.wellInfo.initDialog(row.wellId) diff --git a/index.html b/index.html index 96ad6f4..ce72319 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - 智能闸井监测管理系统 + 智能窨井监测管理系统
diff --git a/src/api/overview.js b/src/api/overview.js index e786862..8b15aeb 100644 --- a/src/api/overview.js +++ b/src/api/overview.js @@ -1,8 +1,8 @@ /** - * 闸井总览模块接口 + * 窨井总览模块接口 */ import request from '@/utils/request' -// 闸井查询 +// 窨井查询 export function getWellList(params) { return request({ url: 'overview/wellList', @@ -10,7 +10,7 @@ params }) } -// 获取闸井详情 +// 获取窨井详情 export function getWellInfo(id) { return request({ url: 'overview/wellInfo', diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index eed1be4..7563fbb 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -5,7 +5,7 @@ - + @@ -49,7 +49,7 @@ - + @@ -176,7 +176,7 @@ showAlarmType: true, // 是否显示告警类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 - wellShow: false, // 是否显示闸井详情 + wellShow: false, // 是否显示窨井详情 detailShow: false, // 是否显示编辑框 cancelShow: false // 是否显示取消报警原因弹窗 } @@ -238,7 +238,7 @@ return cellValue } }, - // 显示闸井详情 + // 显示窨井详情 showWellDetail(row) { this.wellShow = true this.$refs.wellInfo.initDialog(row.wellId) diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue index 64cb232..8b6b90e 100644 --- a/src/views/alarmManage/listAlarmRecords.vue +++ b/src/views/alarmManage/listAlarmRecords.vue @@ -200,8 +200,8 @@ next() }, mounted() { - if (this.$route.query && this.$route.query.wellCode) { - this.listQuery.keywords = this.$route.query.wellCode + if (this.$route.窨井 && this.$route.窨井.wellCode) { + this.listQuery.keywords = this.$route.窨井.wellCode this.fetchData(false) } else { this.listQuery.keywords = '' @@ -216,8 +216,8 @@ activated() { console.log('alarmRecored actived') if (!isFromDetail) { - if (this.$route.query && this.$route.query.wellCode) { - this.listQuery.keywords = this.$route.query.wellCode + if (this.$route.窨井 && this.$route.窨井.wellCode) { + this.listQuery.keywords = this.$route.窨井.wellCode this.fetchData(false) } else { this.listQuery.keywords = '' @@ -239,8 +239,8 @@ // 工单 showJob(row) { const jobId = row.jobId - this.$router.push({ path: '/detailJob/' + jobId, query: { jobId: jobId }}) - //this.$router.push({ name: 'DetailJob', query: { jobId: row.jobId }}) + this.$router.push({ path: '/detailJob/' + jobId, 窨井: { jobId: jobId }}) + //this.$router.push({ name: 'DetailJob', 窨井: { jobId: row.jobId }}) }, // 批量导出 batchExport() { diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue index 7420ef1..dc61a71 100644 --- a/src/views/alarmRule/editRule.vue +++ b/src/views/alarmRule/editRule.vue @@ -3,7 +3,7 @@ - + @@ -77,8 +77,8 @@ dialogFormVisible: false, // 对话框是否显示 dialogStatus: '', // 对话框类型：create,update baseInfo: { - wellCode: '', // 闸井编号 - wellName: '', // 闸井名称 + wellCode: '', // 窨井编号 + wellName: '', // 窨井名称 deep: '', // 井深 deviceType: '', // 设备类别 deviceTypeName: '', // 设备类别 diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue index 04b93fb..77ce5c9 100644 --- a/src/views/alarmRule/listRule.vue +++ b/src/views/alarmRule/listRule.vue @@ -5,7 +5,7 @@ - + @@ -82,13 +82,13 @@ }, // 筛选条件 columns: [ { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center', type: 'Button' }, { - text: '闸井名称', + text: '窨井名称', value: 'wellName', align: 'center' }, @@ -126,7 +126,7 @@ showDeviceType: true, listLoading: true, // 加载动画 editShow: false, // 是否显示编辑框 - wellShow: false // 是否显示闸井详情 + wellShow: false // 是否显示窨井详情 } }, created() { @@ -134,7 +134,7 @@ this.fetchData()// 获取数据 }, methods: { - // 显示闸井详情 + // 显示窨井详情 showWellDetail(row) { this.wellShow = true this.$refs.wellInfo.initDialog(row.wellId) diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue index cdcb8bb..85cd370 100644 --- a/src/views/dataManage/deviceData/listDigData.vue +++ b/src/views/dataManage/deviceData/listDigData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue index 32ecfdf..1be1da7 100644 --- a/src/views/dataManage/deviceData/listGasData.vue +++ b/src/views/dataManage/deviceData/listGasData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue index 2fbdd8c..fa80fb1 100644 --- a/src/views/dataManage/deviceData/listHarmfulData.vue +++ b/src/views/dataManage/deviceData/listHarmfulData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue index af4c365..c36e471 100644 --- a/src/views/dataManage/deviceData/listLiquidData.vue +++ b/src/views/dataManage/deviceData/listLiquidData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue index 3708b1f..279c1a4 100644 --- a/src/views/dataManage/deviceData/listTempData.vue +++ b/src/views/dataManage/deviceData/listTempData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue index 4f841c8..5ef5bdd 100644 --- a/src/views/dataManage/deviceData/listWellCoverData.vue +++ b/src/views/dataManage/deviceData/listWellCoverData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue index a60077a..4bef89e 100644 --- a/src/views/dataManage/deviceData/listWellLocaData.vue +++ b/src/views/dataManage/deviceData/listWellLocaData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue index 6f9d5b3..de8c382 100644 --- a/src/views/jobManage/detailJob.vue +++ b/src/views/jobManage/detailJob.vue @@ -8,7 +8,7 @@ - + @@ -136,7 +136,7 @@ dialogStatus: '', // 对话框类型：create,update jobForm: { jobCode: '', // 工单编号 - wellCode: '', // 闸井编号 + wellCode: '', // 窨井编号 devcode: '', // 设备编号 position: '', // 详细地址 coordinateX: '', diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue index a105203..0cfbd31 100644 --- a/src/views/jobManage/listJobs.vue +++ b/src/views/jobManage/listJobs.vue @@ -7,7 +7,7 @@ - + @@ -130,7 +130,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center', type: 'Button' @@ -276,7 +276,7 @@ return false } }, - // 显示闸井详情 + // 显示窨井详情 showWellDetail(row) { this.wellShow = true this.$refs.wellInfo.initDialog(row.wellId) diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue index fe3b53e..daac0d3 100644 --- a/src/views/jobManage/listJobsOverTimeGet.vue +++ b/src/views/jobManage/listJobsOverTimeGet.vue @@ -5,7 +5,7 @@ - + @@ -108,7 +108,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center', type: 'Button' @@ -251,7 +251,7 @@ return false } }, - // 显示闸井详情 + // 显示窨井详情 showWellDetail(row) { this.wellShow = true this.$refs.wellInfo.initDialog(row.wellId) diff --git a/index.html b/index.html index 96ad6f4..ce72319 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - 智能闸井监测管理系统 + 智能窨井监测管理系统
diff --git a/src/api/overview.js b/src/api/overview.js index e786862..8b15aeb 100644 --- a/src/api/overview.js +++ b/src/api/overview.js @@ -1,8 +1,8 @@ /** - * 闸井总览模块接口 + * 窨井总览模块接口 */ import request from '@/utils/request' -// 闸井查询 +// 窨井查询 export function getWellList(params) { return request({ url: 'overview/wellList', @@ -10,7 +10,7 @@ params }) } -// 获取闸井详情 +// 获取窨井详情 export function getWellInfo(id) { return request({ url: 'overview/wellInfo', diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index eed1be4..7563fbb 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -5,7 +5,7 @@ - + @@ -49,7 +49,7 @@ - + @@ -176,7 +176,7 @@ showAlarmType: true, // 是否显示告警类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 - wellShow: false, // 是否显示闸井详情 + wellShow: false, // 是否显示窨井详情 detailShow: false, // 是否显示编辑框 cancelShow: false // 是否显示取消报警原因弹窗 } @@ -238,7 +238,7 @@ return cellValue } }, - // 显示闸井详情 + // 显示窨井详情 showWellDetail(row) { this.wellShow = true this.$refs.wellInfo.initDialog(row.wellId) diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue index 64cb232..8b6b90e 100644 --- a/src/views/alarmManage/listAlarmRecords.vue +++ b/src/views/alarmManage/listAlarmRecords.vue @@ -200,8 +200,8 @@ next() }, mounted() { - if (this.$route.query && this.$route.query.wellCode) { - this.listQuery.keywords = this.$route.query.wellCode + if (this.$route.窨井 && this.$route.窨井.wellCode) { + this.listQuery.keywords = this.$route.窨井.wellCode this.fetchData(false) } else { this.listQuery.keywords = '' @@ -216,8 +216,8 @@ activated() { console.log('alarmRecored actived') if (!isFromDetail) { - if (this.$route.query && this.$route.query.wellCode) { - this.listQuery.keywords = this.$route.query.wellCode + if (this.$route.窨井 && this.$route.窨井.wellCode) { + this.listQuery.keywords = this.$route.窨井.wellCode this.fetchData(false) } else { this.listQuery.keywords = '' @@ -239,8 +239,8 @@ // 工单 showJob(row) { const jobId = row.jobId - this.$router.push({ path: '/detailJob/' + jobId, query: { jobId: jobId }}) - //this.$router.push({ name: 'DetailJob', query: { jobId: row.jobId }}) + this.$router.push({ path: '/detailJob/' + jobId, 窨井: { jobId: jobId }}) + //this.$router.push({ name: 'DetailJob', 窨井: { jobId: row.jobId }}) }, // 批量导出 batchExport() { diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue index 7420ef1..dc61a71 100644 --- a/src/views/alarmRule/editRule.vue +++ b/src/views/alarmRule/editRule.vue @@ -3,7 +3,7 @@ - + @@ -77,8 +77,8 @@ dialogFormVisible: false, // 对话框是否显示 dialogStatus: '', // 对话框类型：create,update baseInfo: { - wellCode: '', // 闸井编号 - wellName: '', // 闸井名称 + wellCode: '', // 窨井编号 + wellName: '', // 窨井名称 deep: '', // 井深 deviceType: '', // 设备类别 deviceTypeName: '', // 设备类别 diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue index 04b93fb..77ce5c9 100644 --- a/src/views/alarmRule/listRule.vue +++ b/src/views/alarmRule/listRule.vue @@ -5,7 +5,7 @@ - + @@ -82,13 +82,13 @@ }, // 筛选条件 columns: [ { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center', type: 'Button' }, { - text: '闸井名称', + text: '窨井名称', value: 'wellName', align: 'center' }, @@ -126,7 +126,7 @@ showDeviceType: true, listLoading: true, // 加载动画 editShow: false, // 是否显示编辑框 - wellShow: false // 是否显示闸井详情 + wellShow: false // 是否显示窨井详情 } }, created() { @@ -134,7 +134,7 @@ this.fetchData()// 获取数据 }, methods: { - // 显示闸井详情 + // 显示窨井详情 showWellDetail(row) { this.wellShow = true this.$refs.wellInfo.initDialog(row.wellId) diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue index cdcb8bb..85cd370 100644 --- a/src/views/dataManage/deviceData/listDigData.vue +++ b/src/views/dataManage/deviceData/listDigData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue index 32ecfdf..1be1da7 100644 --- a/src/views/dataManage/deviceData/listGasData.vue +++ b/src/views/dataManage/deviceData/listGasData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue index 2fbdd8c..fa80fb1 100644 --- a/src/views/dataManage/deviceData/listHarmfulData.vue +++ b/src/views/dataManage/deviceData/listHarmfulData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue index af4c365..c36e471 100644 --- a/src/views/dataManage/deviceData/listLiquidData.vue +++ b/src/views/dataManage/deviceData/listLiquidData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue index 3708b1f..279c1a4 100644 --- a/src/views/dataManage/deviceData/listTempData.vue +++ b/src/views/dataManage/deviceData/listTempData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue index 4f841c8..5ef5bdd 100644 --- a/src/views/dataManage/deviceData/listWellCoverData.vue +++ b/src/views/dataManage/deviceData/listWellCoverData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue index a60077a..4bef89e 100644 --- a/src/views/dataManage/deviceData/listWellLocaData.vue +++ b/src/views/dataManage/deviceData/listWellLocaData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue index 6f9d5b3..de8c382 100644 --- a/src/views/jobManage/detailJob.vue +++ b/src/views/jobManage/detailJob.vue @@ -8,7 +8,7 @@ - + @@ -136,7 +136,7 @@ dialogStatus: '', // 对话框类型：create,update jobForm: { jobCode: '', // 工单编号 - wellCode: '', // 闸井编号 + wellCode: '', // 窨井编号 devcode: '', // 设备编号 position: '', // 详细地址 coordinateX: '', diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue index a105203..0cfbd31 100644 --- a/src/views/jobManage/listJobs.vue +++ b/src/views/jobManage/listJobs.vue @@ -7,7 +7,7 @@ - + @@ -130,7 +130,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center', type: 'Button' @@ -276,7 +276,7 @@ return false } }, - // 显示闸井详情 + // 显示窨井详情 showWellDetail(row) { this.wellShow = true this.$refs.wellInfo.initDialog(row.wellId) diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue index fe3b53e..daac0d3 100644 --- a/src/views/jobManage/listJobsOverTimeGet.vue +++ b/src/views/jobManage/listJobsOverTimeGet.vue @@ -5,7 +5,7 @@ - + @@ -108,7 +108,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center', type: 'Button' @@ -251,7 +251,7 @@ return false } }, - // 显示闸井详情 + // 显示窨井详情 showWellDetail(row) { this.wellShow = true this.$refs.wellInfo.initDialog(row.wellId) diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue index 337c3e6..493bcae 100644 --- a/src/views/jobManage/listJobsOverTimeHandle.vue +++ b/src/views/jobManage/listJobsOverTimeHandle.vue @@ -5,7 +5,7 @@ - + @@ -108,7 +108,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center', type: 'Button' @@ -251,7 +251,7 @@ return false } }, - // 显示闸井详情 + // 显示窨井详情 showWellDetail(row) { this.wellShow = true this.$refs.wellInfo.initDialog(row.wellId) diff --git a/index.html b/index.html index 96ad6f4..ce72319 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - 智能闸井监测管理系统 + 智能窨井监测管理系统
diff --git a/src/api/overview.js b/src/api/overview.js index e786862..8b15aeb 100644 --- a/src/api/overview.js +++ b/src/api/overview.js @@ -1,8 +1,8 @@ /** - * 闸井总览模块接口 + * 窨井总览模块接口 */ import request from '@/utils/request' -// 闸井查询 +// 窨井查询 export function getWellList(params) { return request({ url: 'overview/wellList', @@ -10,7 +10,7 @@ params }) } -// 获取闸井详情 +// 获取窨井详情 export function getWellInfo(id) { return request({ url: 'overview/wellInfo', diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index eed1be4..7563fbb 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -5,7 +5,7 @@ - + @@ -49,7 +49,7 @@ - + @@ -176,7 +176,7 @@ showAlarmType: true, // 是否显示告警类型下拉 listLoading: true, // 加载动画 fullscreenLoading: false, // 全屏加载动画 - wellShow: false, // 是否显示闸井详情 + wellShow: false, // 是否显示窨井详情 detailShow: false, // 是否显示编辑框 cancelShow: false // 是否显示取消报警原因弹窗 } @@ -238,7 +238,7 @@ return cellValue } }, - // 显示闸井详情 + // 显示窨井详情 showWellDetail(row) { this.wellShow = true this.$refs.wellInfo.initDialog(row.wellId) diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue index 64cb232..8b6b90e 100644 --- a/src/views/alarmManage/listAlarmRecords.vue +++ b/src/views/alarmManage/listAlarmRecords.vue @@ -200,8 +200,8 @@ next() }, mounted() { - if (this.$route.query && this.$route.query.wellCode) { - this.listQuery.keywords = this.$route.query.wellCode + if (this.$route.窨井 && this.$route.窨井.wellCode) { + this.listQuery.keywords = this.$route.窨井.wellCode this.fetchData(false) } else { this.listQuery.keywords = '' @@ -216,8 +216,8 @@ activated() { console.log('alarmRecored actived') if (!isFromDetail) { - if (this.$route.query && this.$route.query.wellCode) { - this.listQuery.keywords = this.$route.query.wellCode + if (this.$route.窨井 && this.$route.窨井.wellCode) { + this.listQuery.keywords = this.$route.窨井.wellCode this.fetchData(false) } else { this.listQuery.keywords = '' @@ -239,8 +239,8 @@ // 工单 showJob(row) { const jobId = row.jobId - this.$router.push({ path: '/detailJob/' + jobId, query: { jobId: jobId }}) - //this.$router.push({ name: 'DetailJob', query: { jobId: row.jobId }}) + this.$router.push({ path: '/detailJob/' + jobId, 窨井: { jobId: jobId }}) + //this.$router.push({ name: 'DetailJob', 窨井: { jobId: row.jobId }}) }, // 批量导出 batchExport() { diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue index 7420ef1..dc61a71 100644 --- a/src/views/alarmRule/editRule.vue +++ b/src/views/alarmRule/editRule.vue @@ -3,7 +3,7 @@ - + @@ -77,8 +77,8 @@ dialogFormVisible: false, // 对话框是否显示 dialogStatus: '', // 对话框类型：create,update baseInfo: { - wellCode: '', // 闸井编号 - wellName: '', // 闸井名称 + wellCode: '', // 窨井编号 + wellName: '', // 窨井名称 deep: '', // 井深 deviceType: '', // 设备类别 deviceTypeName: '', // 设备类别 diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue index 04b93fb..77ce5c9 100644 --- a/src/views/alarmRule/listRule.vue +++ b/src/views/alarmRule/listRule.vue @@ -5,7 +5,7 @@ - + @@ -82,13 +82,13 @@ }, // 筛选条件 columns: [ { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center', type: 'Button' }, { - text: '闸井名称', + text: '窨井名称', value: 'wellName', align: 'center' }, @@ -126,7 +126,7 @@ showDeviceType: true, listLoading: true, // 加载动画 editShow: false, // 是否显示编辑框 - wellShow: false // 是否显示闸井详情 + wellShow: false // 是否显示窨井详情 } }, created() { @@ -134,7 +134,7 @@ this.fetchData()// 获取数据 }, methods: { - // 显示闸井详情 + // 显示窨井详情 showWellDetail(row) { this.wellShow = true this.$refs.wellInfo.initDialog(row.wellId) diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue index cdcb8bb..85cd370 100644 --- a/src/views/dataManage/deviceData/listDigData.vue +++ b/src/views/dataManage/deviceData/listDigData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue index 32ecfdf..1be1da7 100644 --- a/src/views/dataManage/deviceData/listGasData.vue +++ b/src/views/dataManage/deviceData/listGasData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue index 2fbdd8c..fa80fb1 100644 --- a/src/views/dataManage/deviceData/listHarmfulData.vue +++ b/src/views/dataManage/deviceData/listHarmfulData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue index af4c365..c36e471 100644 --- a/src/views/dataManage/deviceData/listLiquidData.vue +++ b/src/views/dataManage/deviceData/listLiquidData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue index 3708b1f..279c1a4 100644 --- a/src/views/dataManage/deviceData/listTempData.vue +++ b/src/views/dataManage/deviceData/listTempData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue index 4f841c8..5ef5bdd 100644 --- a/src/views/dataManage/deviceData/listWellCoverData.vue +++ b/src/views/dataManage/deviceData/listWellCoverData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue index a60077a..4bef89e 100644 --- a/src/views/dataManage/deviceData/listWellLocaData.vue +++ b/src/views/dataManage/deviceData/listWellLocaData.vue @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center' }, diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue index 6f9d5b3..de8c382 100644 --- a/src/views/jobManage/detailJob.vue +++ b/src/views/jobManage/detailJob.vue @@ -8,7 +8,7 @@ - + @@ -136,7 +136,7 @@ dialogStatus: '', // 对话框类型：create,update jobForm: { jobCode: '', // 工单编号 - wellCode: '', // 闸井编号 + wellCode: '', // 窨井编号 devcode: '', // 设备编号 position: '', // 详细地址 coordinateX: '', diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue index a105203..0cfbd31 100644 --- a/src/views/jobManage/listJobs.vue +++ b/src/views/jobManage/listJobs.vue @@ -7,7 +7,7 @@ - + @@ -130,7 +130,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center', type: 'Button' @@ -276,7 +276,7 @@ return false } }, - // 显示闸井详情 + // 显示窨井详情 showWellDetail(row) { this.wellShow = true this.$refs.wellInfo.initDialog(row.wellId) diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue index fe3b53e..daac0d3 100644 --- a/src/views/jobManage/listJobsOverTimeGet.vue +++ b/src/views/jobManage/listJobsOverTimeGet.vue @@ -5,7 +5,7 @@ - + @@ -108,7 +108,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center', type: 'Button' @@ -251,7 +251,7 @@ return false } }, - // 显示闸井详情 + // 显示窨井详情 showWellDetail(row) { this.wellShow = true this.$refs.wellInfo.initDialog(row.wellId) diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue index 337c3e6..493bcae 100644 --- a/src/views/jobManage/listJobsOverTimeHandle.vue +++ b/src/views/jobManage/listJobsOverTimeHandle.vue @@ -5,7 +5,7 @@ - + @@ -108,7 +108,7 @@ align: 'center' }, { - text: '闸井编号', + text: '窨井编号', value: 'wellCode', align: 'center', type: 'Button' @@ -251,7 +251,7 @@ return false } }, - // 显示闸井详情 + // 显示窨井详情 showWellDetail(row) { this.wellShow = true this.$refs.wellInfo.initDialog(row.wellId) diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue index 949edb6..96c2ffd 100644 --- a/src/views/layout/components/AppHeader.vue +++ b/src/views/layout/components/AppHeader.vue @@ -1,6 +1,6 @@