diff --git a/XLJCYJ/config/project.config.json b/XLJCYJ/config/project.config.json index 267ead3..c91bd64 100644 --- a/XLJCYJ/config/project.config.json +++ b/XLJCYJ/config/project.config.json @@ -3,7 +3,7 @@ "subtitle": "", "theme":"blue", "baseUrl": "http://111.198.10.15:11314/", - "wsUrl": "ws://111.198.10.15:11415/websocket/", + "wsUrl": "ws://111.198.10.15:11314/websocket/", "page": "http://10.80.106.217:9527/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", diff --git a/XLJCYJ/config/project.config.json b/XLJCYJ/config/project.config.json index 267ead3..c91bd64 100644 --- a/XLJCYJ/config/project.config.json +++ b/XLJCYJ/config/project.config.json @@ -3,7 +3,7 @@ "subtitle": "", "theme":"blue", "baseUrl": "http://111.198.10.15:11314/", - "wsUrl": "ws://111.198.10.15:11415/websocket/", + "wsUrl": "ws://111.198.10.15:11314/websocket/", "page": "http://10.80.106.217:9527/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", diff --git a/XLJCYJ/index.html b/XLJCYJ/index.html index 345d89d..39796be 100644 --- a/XLJCYJ/index.html +++ b/XLJCYJ/index.html @@ -1 +1 @@ -newfront
\ No newline at end of file +newfront
\ No newline at end of file diff --git a/XLJCYJ/config/project.config.json b/XLJCYJ/config/project.config.json index 267ead3..c91bd64 100644 --- a/XLJCYJ/config/project.config.json +++ b/XLJCYJ/config/project.config.json @@ -3,7 +3,7 @@ "subtitle": "", "theme":"blue", "baseUrl": "http://111.198.10.15:11314/", - "wsUrl": "ws://111.198.10.15:11415/websocket/", + "wsUrl": "ws://111.198.10.15:11314/websocket/", "page": "http://10.80.106.217:9527/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", diff --git a/XLJCYJ/index.html b/XLJCYJ/index.html index 345d89d..39796be 100644 --- a/XLJCYJ/index.html +++ b/XLJCYJ/index.html @@ -1 +1 @@ -newfront
\ No newline at end of file +newfront
\ No newline at end of file diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index 1eedbd2..f263990 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -91,7 +91,7 @@ import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm/alarm' import HandlePrompt from './components/HandlePrompt' import { isOperation } from '@/utils/permission' -import { getToday } from '@/utils/dateutils' + export default { name: 'ListAlarmNow', @@ -225,7 +225,6 @@ } }, created() { - this.timeRange = [`${new Date().getFullYear()}-${new Date().getMonth() + 1}-01 00:00:00`, getToday('yyyy-MM-dd hh:mm:ss')] setTimeout(() => { console.log('now created') this.fetchAlarmType() diff --git a/XLJCYJ/config/project.config.json b/XLJCYJ/config/project.config.json index 267ead3..c91bd64 100644 --- a/XLJCYJ/config/project.config.json +++ b/XLJCYJ/config/project.config.json @@ -3,7 +3,7 @@ "subtitle": "", "theme":"blue", "baseUrl": "http://111.198.10.15:11314/", - "wsUrl": "ws://111.198.10.15:11415/websocket/", + "wsUrl": "ws://111.198.10.15:11314/websocket/", "page": "http://10.80.106.217:9527/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", diff --git a/XLJCYJ/index.html b/XLJCYJ/index.html index 345d89d..39796be 100644 --- a/XLJCYJ/index.html +++ b/XLJCYJ/index.html @@ -1 +1 @@ -newfront
\ No newline at end of file +newfront
\ No newline at end of file diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index 1eedbd2..f263990 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -91,7 +91,7 @@ import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm/alarm' import HandlePrompt from './components/HandlePrompt' import { isOperation } from '@/utils/permission' -import { getToday } from '@/utils/dateutils' + export default { name: 'ListAlarmNow', @@ -225,7 +225,6 @@ } }, created() { - this.timeRange = [`${new Date().getFullYear()}-${new Date().getMonth() + 1}-01 00:00:00`, getToday('yyyy-MM-dd hh:mm:ss')] setTimeout(() => { console.log('now created') this.fetchAlarmType() diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue index 5b660ca..38c1b00 100644 --- a/src/views/alarmManage/listAlarmRecords.vue +++ b/src/views/alarmManage/listAlarmRecords.vue @@ -2,54 +2,32 @@ - + - - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + @@ -61,44 +39,41 @@ - + 导出记录 - + - + - - - - - - - + + + + + + +
- +
@@ -109,6 +84,7 @@ import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm/alarm' let isFromDetail = false import { isOperation } from '@/utils/permission' +import { getSearchLastMonthTime } from '@/utils/dateutils' export default { name: 'ListAlarmRecords', @@ -226,17 +202,23 @@ this.alarmContentTypeList = [] } }, - timeRange(val) { - if (val && val.length > 0) { - this.listQuery.beginTime = val[0] - this.listQuery.endTime = val[1] - } else { - this.listQuery.beginTime = '' - this.listQuery.endTime = '' - } + timeRange: { + handler(val) { + console.log(val, 'val') + if (val && val.length > 0) { + this.listQuery.beginTime = val[0] + this.listQuery.endTime = val[1] + } else { + this.listQuery.beginTime = '' + this.listQuery.endTime = '' + } + }, + deep: true, + immediate: true, } }, created() { + // this.timeRange = getSearchLastMonthTime() this.fetchAlarmType() // 报警类型下拉菜单 if (isOperation() === false) { this.listQuery.alarmType = '1' @@ -248,31 +230,38 @@ this.listQuery.keywords = this.$route.query.wellCode this.fetchData(false) } else { + this.timeRange = getSearchLastMonthTime() this.listQuery.keywords = '' this.listQuery.alarmType = '' this.listQuery.alarmContentType = '' - this.listQuery.beginTime = '' - this.listQuery.endTime = '' - this.timeRange = [] - this.fetchData(false) + // this.listQuery.beginTime = '' + // this.listQuery.endTime = '' + // this.timeRange = [] + setTimeout(() => { + this.fetchData(false) + }) } }, activated() { + console.log('activated') if (!isFromDetail) { if (this.$route.query && this.$route.query.wellCode) { this.listQuery.keywords = this.$route.query.wellCode this.fetchData(false) } else { + this.timeRange = getSearchLastMonthTime() this.listQuery.keywords = '' this.listQuery.alarmType = '' this.listQuery.alarmContentType = '' - this.listQuery.beginTime = '' - this.listQuery.endTime = '' - this.timeRange = [] + // this.listQuery.beginTime = '' + // this.listQuery.endTime = '' + // this.timeRange = [] if (!isOperation()) { this.listQuery.alarmType = '1' } - this.fetchData(false) + setTimeout(() => { + this.fetchData(false) + }) } } }, @@ -296,7 +285,7 @@ // 工单 showJob(row) { const jobId = row.jobId - this.$router.push({ path: '/detailJob/' + jobId, query: { jobId: jobId }}) + this.$router.push({ path: '/detailJob/' + jobId, query: { jobId: jobId } }) }, // 批量导出 batchExport() { @@ -385,33 +374,40 @@ diff --git a/XLJCYJ/config/project.config.json b/XLJCYJ/config/project.config.json index 267ead3..c91bd64 100644 --- a/XLJCYJ/config/project.config.json +++ b/XLJCYJ/config/project.config.json @@ -3,7 +3,7 @@ "subtitle": "", "theme":"blue", "baseUrl": "http://111.198.10.15:11314/", - "wsUrl": "ws://111.198.10.15:11415/websocket/", + "wsUrl": "ws://111.198.10.15:11314/websocket/", "page": "http://10.80.106.217:9527/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", diff --git a/XLJCYJ/index.html b/XLJCYJ/index.html index 345d89d..39796be 100644 --- a/XLJCYJ/index.html +++ b/XLJCYJ/index.html @@ -1 +1 @@ -newfront
\ No newline at end of file +newfront
\ No newline at end of file diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index 1eedbd2..f263990 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -91,7 +91,7 @@ import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm/alarm' import HandlePrompt from './components/HandlePrompt' import { isOperation } from '@/utils/permission' -import { getToday } from '@/utils/dateutils' + export default { name: 'ListAlarmNow', @@ -225,7 +225,6 @@ } }, created() { - this.timeRange = [`${new Date().getFullYear()}-${new Date().getMonth() + 1}-01 00:00:00`, getToday('yyyy-MM-dd hh:mm:ss')] setTimeout(() => { console.log('now created') this.fetchAlarmType() diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue index 5b660ca..38c1b00 100644 --- a/src/views/alarmManage/listAlarmRecords.vue +++ b/src/views/alarmManage/listAlarmRecords.vue @@ -2,54 +2,32 @@ - + - - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + @@ -61,44 +39,41 @@ - + 导出记录 - + - + - - - - - - - + + + + + + +
- +
@@ -109,6 +84,7 @@ import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm/alarm' let isFromDetail = false import { isOperation } from '@/utils/permission' +import { getSearchLastMonthTime } from '@/utils/dateutils' export default { name: 'ListAlarmRecords', @@ -226,17 +202,23 @@ this.alarmContentTypeList = [] } }, - timeRange(val) { - if (val && val.length > 0) { - this.listQuery.beginTime = val[0] - this.listQuery.endTime = val[1] - } else { - this.listQuery.beginTime = '' - this.listQuery.endTime = '' - } + timeRange: { + handler(val) { + console.log(val, 'val') + if (val && val.length > 0) { + this.listQuery.beginTime = val[0] + this.listQuery.endTime = val[1] + } else { + this.listQuery.beginTime = '' + this.listQuery.endTime = '' + } + }, + deep: true, + immediate: true, } }, created() { + // this.timeRange = getSearchLastMonthTime() this.fetchAlarmType() // 报警类型下拉菜单 if (isOperation() === false) { this.listQuery.alarmType = '1' @@ -248,31 +230,38 @@ this.listQuery.keywords = this.$route.query.wellCode this.fetchData(false) } else { + this.timeRange = getSearchLastMonthTime() this.listQuery.keywords = '' this.listQuery.alarmType = '' this.listQuery.alarmContentType = '' - this.listQuery.beginTime = '' - this.listQuery.endTime = '' - this.timeRange = [] - this.fetchData(false) + // this.listQuery.beginTime = '' + // this.listQuery.endTime = '' + // this.timeRange = [] + setTimeout(() => { + this.fetchData(false) + }) } }, activated() { + console.log('activated') if (!isFromDetail) { if (this.$route.query && this.$route.query.wellCode) { this.listQuery.keywords = this.$route.query.wellCode this.fetchData(false) } else { + this.timeRange = getSearchLastMonthTime() this.listQuery.keywords = '' this.listQuery.alarmType = '' this.listQuery.alarmContentType = '' - this.listQuery.beginTime = '' - this.listQuery.endTime = '' - this.timeRange = [] + // this.listQuery.beginTime = '' + // this.listQuery.endTime = '' + // this.timeRange = [] if (!isOperation()) { this.listQuery.alarmType = '1' } - this.fetchData(false) + setTimeout(() => { + this.fetchData(false) + }) } } }, @@ -296,7 +285,7 @@ // 工单 showJob(row) { const jobId = row.jobId - this.$router.push({ path: '/detailJob/' + jobId, query: { jobId: jobId }}) + this.$router.push({ path: '/detailJob/' + jobId, query: { jobId: jobId } }) }, // 批量导出 batchExport() { @@ -385,33 +374,40 @@ diff --git a/src/views/overview/components/refreshTimer.vue b/src/views/overview/components/refreshTimer.vue index 9b4b606..af8b7ba 100644 --- a/src/views/overview/components/refreshTimer.vue +++ b/src/views/overview/components/refreshTimer.vue @@ -42,7 +42,7 @@ .refreshtimer { z-index: 11111111; position: absolute; - right: 2px; + left: 2px; top: 10px; color: #2f2f2f; border-radius: 5px; diff --git a/XLJCYJ/config/project.config.json b/XLJCYJ/config/project.config.json index 267ead3..c91bd64 100644 --- a/XLJCYJ/config/project.config.json +++ b/XLJCYJ/config/project.config.json @@ -3,7 +3,7 @@ "subtitle": "", "theme":"blue", "baseUrl": "http://111.198.10.15:11314/", - "wsUrl": "ws://111.198.10.15:11415/websocket/", + "wsUrl": "ws://111.198.10.15:11314/websocket/", "page": "http://10.80.106.217:9527/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", diff --git a/XLJCYJ/index.html b/XLJCYJ/index.html index 345d89d..39796be 100644 --- a/XLJCYJ/index.html +++ b/XLJCYJ/index.html @@ -1 +1 @@ -newfront
\ No newline at end of file +newfront
\ No newline at end of file diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index 1eedbd2..f263990 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -91,7 +91,7 @@ import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm/alarm' import HandlePrompt from './components/HandlePrompt' import { isOperation } from '@/utils/permission' -import { getToday } from '@/utils/dateutils' + export default { name: 'ListAlarmNow', @@ -225,7 +225,6 @@ } }, created() { - this.timeRange = [`${new Date().getFullYear()}-${new Date().getMonth() + 1}-01 00:00:00`, getToday('yyyy-MM-dd hh:mm:ss')] setTimeout(() => { console.log('now created') this.fetchAlarmType() diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue index 5b660ca..38c1b00 100644 --- a/src/views/alarmManage/listAlarmRecords.vue +++ b/src/views/alarmManage/listAlarmRecords.vue @@ -2,54 +2,32 @@ - + - - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + @@ -61,44 +39,41 @@ - + 导出记录 - + - + - - - - - - - + + + + + + +
- +
@@ -109,6 +84,7 @@ import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm/alarm' let isFromDetail = false import { isOperation } from '@/utils/permission' +import { getSearchLastMonthTime } from '@/utils/dateutils' export default { name: 'ListAlarmRecords', @@ -226,17 +202,23 @@ this.alarmContentTypeList = [] } }, - timeRange(val) { - if (val && val.length > 0) { - this.listQuery.beginTime = val[0] - this.listQuery.endTime = val[1] - } else { - this.listQuery.beginTime = '' - this.listQuery.endTime = '' - } + timeRange: { + handler(val) { + console.log(val, 'val') + if (val && val.length > 0) { + this.listQuery.beginTime = val[0] + this.listQuery.endTime = val[1] + } else { + this.listQuery.beginTime = '' + this.listQuery.endTime = '' + } + }, + deep: true, + immediate: true, } }, created() { + // this.timeRange = getSearchLastMonthTime() this.fetchAlarmType() // 报警类型下拉菜单 if (isOperation() === false) { this.listQuery.alarmType = '1' @@ -248,31 +230,38 @@ this.listQuery.keywords = this.$route.query.wellCode this.fetchData(false) } else { + this.timeRange = getSearchLastMonthTime() this.listQuery.keywords = '' this.listQuery.alarmType = '' this.listQuery.alarmContentType = '' - this.listQuery.beginTime = '' - this.listQuery.endTime = '' - this.timeRange = [] - this.fetchData(false) + // this.listQuery.beginTime = '' + // this.listQuery.endTime = '' + // this.timeRange = [] + setTimeout(() => { + this.fetchData(false) + }) } }, activated() { + console.log('activated') if (!isFromDetail) { if (this.$route.query && this.$route.query.wellCode) { this.listQuery.keywords = this.$route.query.wellCode this.fetchData(false) } else { + this.timeRange = getSearchLastMonthTime() this.listQuery.keywords = '' this.listQuery.alarmType = '' this.listQuery.alarmContentType = '' - this.listQuery.beginTime = '' - this.listQuery.endTime = '' - this.timeRange = [] + // this.listQuery.beginTime = '' + // this.listQuery.endTime = '' + // this.timeRange = [] if (!isOperation()) { this.listQuery.alarmType = '1' } - this.fetchData(false) + setTimeout(() => { + this.fetchData(false) + }) } } }, @@ -296,7 +285,7 @@ // 工单 showJob(row) { const jobId = row.jobId - this.$router.push({ path: '/detailJob/' + jobId, query: { jobId: jobId }}) + this.$router.push({ path: '/detailJob/' + jobId, query: { jobId: jobId } }) }, // 批量导出 batchExport() { @@ -385,33 +374,40 @@ diff --git a/src/views/overview/components/refreshTimer.vue b/src/views/overview/components/refreshTimer.vue index 9b4b606..af8b7ba 100644 --- a/src/views/overview/components/refreshTimer.vue +++ b/src/views/overview/components/refreshTimer.vue @@ -42,7 +42,7 @@ .refreshtimer { z-index: 11111111; position: absolute; - right: 2px; + left: 2px; top: 10px; color: #2f2f2f; border-radius: 5px; diff --git a/src/views/overview/overview3ddz.vue b/src/views/overview/overview3ddz.vue index 23573af..90ca1d6 100644 --- a/src/views/overview/overview3ddz.vue +++ b/src/views/overview/overview3ddz.vue @@ -23,7 +23,7 @@
- +
diff --git a/XLJCYJ/config/project.config.json b/XLJCYJ/config/project.config.json index 267ead3..c91bd64 100644 --- a/XLJCYJ/config/project.config.json +++ b/XLJCYJ/config/project.config.json @@ -3,7 +3,7 @@ "subtitle": "", "theme":"blue", "baseUrl": "http://111.198.10.15:11314/", - "wsUrl": "ws://111.198.10.15:11415/websocket/", + "wsUrl": "ws://111.198.10.15:11314/websocket/", "page": "http://10.80.106.217:9527/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", diff --git a/XLJCYJ/index.html b/XLJCYJ/index.html index 345d89d..39796be 100644 --- a/XLJCYJ/index.html +++ b/XLJCYJ/index.html @@ -1 +1 @@ -newfront
\ No newline at end of file +newfront
\ No newline at end of file diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index 1eedbd2..f263990 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -91,7 +91,7 @@ import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm/alarm' import HandlePrompt from './components/HandlePrompt' import { isOperation } from '@/utils/permission' -import { getToday } from '@/utils/dateutils' + export default { name: 'ListAlarmNow', @@ -225,7 +225,6 @@ } }, created() { - this.timeRange = [`${new Date().getFullYear()}-${new Date().getMonth() + 1}-01 00:00:00`, getToday('yyyy-MM-dd hh:mm:ss')] setTimeout(() => { console.log('now created') this.fetchAlarmType() diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue index 5b660ca..38c1b00 100644 --- a/src/views/alarmManage/listAlarmRecords.vue +++ b/src/views/alarmManage/listAlarmRecords.vue @@ -2,54 +2,32 @@ - + - - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + @@ -61,44 +39,41 @@ - + 导出记录 - + - + - - - - - - - + + + + + + +
- +
@@ -109,6 +84,7 @@ import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm/alarm' let isFromDetail = false import { isOperation } from '@/utils/permission' +import { getSearchLastMonthTime } from '@/utils/dateutils' export default { name: 'ListAlarmRecords', @@ -226,17 +202,23 @@ this.alarmContentTypeList = [] } }, - timeRange(val) { - if (val && val.length > 0) { - this.listQuery.beginTime = val[0] - this.listQuery.endTime = val[1] - } else { - this.listQuery.beginTime = '' - this.listQuery.endTime = '' - } + timeRange: { + handler(val) { + console.log(val, 'val') + if (val && val.length > 0) { + this.listQuery.beginTime = val[0] + this.listQuery.endTime = val[1] + } else { + this.listQuery.beginTime = '' + this.listQuery.endTime = '' + } + }, + deep: true, + immediate: true, } }, created() { + // this.timeRange = getSearchLastMonthTime() this.fetchAlarmType() // 报警类型下拉菜单 if (isOperation() === false) { this.listQuery.alarmType = '1' @@ -248,31 +230,38 @@ this.listQuery.keywords = this.$route.query.wellCode this.fetchData(false) } else { + this.timeRange = getSearchLastMonthTime() this.listQuery.keywords = '' this.listQuery.alarmType = '' this.listQuery.alarmContentType = '' - this.listQuery.beginTime = '' - this.listQuery.endTime = '' - this.timeRange = [] - this.fetchData(false) + // this.listQuery.beginTime = '' + // this.listQuery.endTime = '' + // this.timeRange = [] + setTimeout(() => { + this.fetchData(false) + }) } }, activated() { + console.log('activated') if (!isFromDetail) { if (this.$route.query && this.$route.query.wellCode) { this.listQuery.keywords = this.$route.query.wellCode this.fetchData(false) } else { + this.timeRange = getSearchLastMonthTime() this.listQuery.keywords = '' this.listQuery.alarmType = '' this.listQuery.alarmContentType = '' - this.listQuery.beginTime = '' - this.listQuery.endTime = '' - this.timeRange = [] + // this.listQuery.beginTime = '' + // this.listQuery.endTime = '' + // this.timeRange = [] if (!isOperation()) { this.listQuery.alarmType = '1' } - this.fetchData(false) + setTimeout(() => { + this.fetchData(false) + }) } } }, @@ -296,7 +285,7 @@ // 工单 showJob(row) { const jobId = row.jobId - this.$router.push({ path: '/detailJob/' + jobId, query: { jobId: jobId }}) + this.$router.push({ path: '/detailJob/' + jobId, query: { jobId: jobId } }) }, // 批量导出 batchExport() { @@ -385,33 +374,40 @@ diff --git a/src/views/overview/components/refreshTimer.vue b/src/views/overview/components/refreshTimer.vue index 9b4b606..af8b7ba 100644 --- a/src/views/overview/components/refreshTimer.vue +++ b/src/views/overview/components/refreshTimer.vue @@ -42,7 +42,7 @@ .refreshtimer { z-index: 11111111; position: absolute; - right: 2px; + left: 2px; top: 10px; color: #2f2f2f; border-radius: 5px; diff --git a/src/views/overview/overview3ddz.vue b/src/views/overview/overview3ddz.vue index 23573af..90ca1d6 100644 --- a/src/views/overview/overview3ddz.vue +++ b/src/views/overview/overview3ddz.vue @@ -23,7 +23,7 @@
- +
diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue index 4b21ecd..d6dd6d7 100644 --- a/src/views/wellManage/editWell.vue +++ b/src/views/wellManage/editWell.vue @@ -184,6 +184,7 @@ import AMapContainer from '@/components/Amap/AMapContainer' import AMapLoader from '@amap/amap-jsapi-loader' import { convertLnglat, reverseLnglat, toSize } from '@/components/Amap/utils/convert-helper' +import { validateisPhone } from '@/utils/validate' export default { name: 'EditWell',