diff --git a/.gitignore b/.gitignore index 78a0ead..9bcc0c5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .DS_Store node_modules/ dist/ +dist.zip npm-debug.log* yarn-debug.log* yarn-error.log* diff --git a/.gitignore b/.gitignore index 78a0ead..9bcc0c5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .DS_Store node_modules/ dist/ +dist.zip npm-debug.log* yarn-debug.log* yarn-error.log* diff --git a/config/dev.env.js b/config/dev.env.js index 251ba26..3b87ed5 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -10,7 +10,9 @@ // BASE_API: '"http://106.74.146.218:2031"' // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.8.201:8083/smartwell"' - BASE_API: '"http://111.198.10.15:11707/smartwell"' + // BASE_API: '"http://111.198.10.15:11707/smartwell"' + BASE_API: '"http://192.168.165.39:8083"' + // BASE_API: '"http://139.198.16.38:8095/smartcity"' // BASE_API: '"http://10.9.39.8:8083"' // BASE_API: '"http://192.168.0.244:8083"' diff --git a/.gitignore b/.gitignore index 78a0ead..9bcc0c5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .DS_Store node_modules/ dist/ +dist.zip npm-debug.log* yarn-debug.log* yarn-error.log* diff --git a/config/dev.env.js b/config/dev.env.js index 251ba26..3b87ed5 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -10,7 +10,9 @@ // BASE_API: '"http://106.74.146.218:2031"' // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.8.201:8083/smartwell"' - BASE_API: '"http://111.198.10.15:11707/smartwell"' + // BASE_API: '"http://111.198.10.15:11707/smartwell"' + BASE_API: '"http://192.168.165.39:8083"' + // BASE_API: '"http://139.198.16.38:8095/smartcity"' // BASE_API: '"http://10.9.39.8:8083"' // BASE_API: '"http://192.168.0.244:8083"' diff --git a/package.json b/package.json index c72f9bb..7c07e4f 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "dependencies": { "axios": "0.18.0", "babel-polyfill": "^6.26.0", + "dayjs": "^1.11.13", "echarts": "^4.2.1", "element-ui": "2.12.0", "event-source-polyfill": "^1.0.5", @@ -33,6 +34,7 @@ "vuex": "3.0.1" }, "devDependencies": { + "@webpack-cli/serve": "^3.0.1", "autoprefixer": "8.5.0", "babel-core": "6.26.0", "babel-eslint": "8.2.6", @@ -81,7 +83,7 @@ "vue-template-compiler": "2.5.17", "webpack": "4.16.5", "webpack-bundle-analyzer": "2.13.1", - "webpack-cli": "3.1.0", + "webpack-cli": "^3.1.0", "webpack-dev-server": "3.1.14", "webpack-merge": "4.1.4" }, diff --git a/.gitignore b/.gitignore index 78a0ead..9bcc0c5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .DS_Store node_modules/ dist/ +dist.zip npm-debug.log* yarn-debug.log* yarn-error.log* diff --git a/config/dev.env.js b/config/dev.env.js index 251ba26..3b87ed5 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -10,7 +10,9 @@ // BASE_API: '"http://106.74.146.218:2031"' // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.8.201:8083/smartwell"' - BASE_API: '"http://111.198.10.15:11707/smartwell"' + // BASE_API: '"http://111.198.10.15:11707/smartwell"' + BASE_API: '"http://192.168.165.39:8083"' + // BASE_API: '"http://139.198.16.38:8095/smartcity"' // BASE_API: '"http://10.9.39.8:8083"' // BASE_API: '"http://192.168.0.244:8083"' diff --git a/package.json b/package.json index c72f9bb..7c07e4f 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "dependencies": { "axios": "0.18.0", "babel-polyfill": "^6.26.0", + "dayjs": "^1.11.13", "echarts": "^4.2.1", "element-ui": "2.12.0", "event-source-polyfill": "^1.0.5", @@ -33,6 +34,7 @@ "vuex": "3.0.1" }, "devDependencies": { + "@webpack-cli/serve": "^3.0.1", "autoprefixer": "8.5.0", "babel-core": "6.26.0", "babel-eslint": "8.2.6", @@ -81,7 +83,7 @@ "vue-template-compiler": "2.5.17", "webpack": "4.16.5", "webpack-bundle-analyzer": "2.13.1", - "webpack-cli": "3.1.0", + "webpack-cli": "^3.1.0", "webpack-dev-server": "3.1.14", "webpack-merge": "4.1.4" }, diff --git a/src/api/overview.js b/src/api/overview.js index e786862..2840937 100644 --- a/src/api/overview.js +++ b/src/api/overview.js @@ -20,6 +20,28 @@ } }) } +// 获取闸井摄像头 +export function getWellVideo(id) { + return request({ + url: '/device/getVideoUrl', + method: 'post', + params: { + wellId: id + } + }) +} +// 获取闸井历史摄像头 +export function getWellHistoryVideo(id, begTime, endTime) { + return request({ + url: '/device/getHistoryVideoUrl', + method: 'post', + params: { + wellId: id, + begTime, + endTime + } + }) +} // 获取报警列表 export function getAlarmsNow(params) { return request({ diff --git a/.gitignore b/.gitignore index 78a0ead..9bcc0c5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .DS_Store node_modules/ dist/ +dist.zip npm-debug.log* yarn-debug.log* yarn-error.log* diff --git a/config/dev.env.js b/config/dev.env.js index 251ba26..3b87ed5 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -10,7 +10,9 @@ // BASE_API: '"http://106.74.146.218:2031"' // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.8.201:8083/smartwell"' - BASE_API: '"http://111.198.10.15:11707/smartwell"' + // BASE_API: '"http://111.198.10.15:11707/smartwell"' + BASE_API: '"http://192.168.165.39:8083"' + // BASE_API: '"http://139.198.16.38:8095/smartcity"' // BASE_API: '"http://10.9.39.8:8083"' // BASE_API: '"http://192.168.0.244:8083"' diff --git a/package.json b/package.json index c72f9bb..7c07e4f 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "dependencies": { "axios": "0.18.0", "babel-polyfill": "^6.26.0", + "dayjs": "^1.11.13", "echarts": "^4.2.1", "element-ui": "2.12.0", "event-source-polyfill": "^1.0.5", @@ -33,6 +34,7 @@ "vuex": "3.0.1" }, "devDependencies": { + "@webpack-cli/serve": "^3.0.1", "autoprefixer": "8.5.0", "babel-core": "6.26.0", "babel-eslint": "8.2.6", @@ -81,7 +83,7 @@ "vue-template-compiler": "2.5.17", "webpack": "4.16.5", "webpack-bundle-analyzer": "2.13.1", - "webpack-cli": "3.1.0", + "webpack-cli": "^3.1.0", "webpack-dev-server": "3.1.14", "webpack-merge": "4.1.4" }, diff --git a/src/api/overview.js b/src/api/overview.js index e786862..2840937 100644 --- a/src/api/overview.js +++ b/src/api/overview.js @@ -20,6 +20,28 @@ } }) } +// 获取闸井摄像头 +export function getWellVideo(id) { + return request({ + url: '/device/getVideoUrl', + method: 'post', + params: { + wellId: id + } + }) +} +// 获取闸井历史摄像头 +export function getWellHistoryVideo(id, begTime, endTime) { + return request({ + url: '/device/getHistoryVideoUrl', + method: 'post', + params: { + wellId: id, + begTime, + endTime + } + }) +} // 获取报警列表 export function getAlarmsNow(params) { return request({ diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index f3cb650..fb9f8a3 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -150,7 +150,7 @@ // 显示闸井详情 showWellDetail(row) { this.wellShow = true - this.$refs.wellInfo.initDialog(row.wellId) + this.$refs.wellInfo.initDialog(row.wellId, row) }, // 批量导出 batchExport() { diff --git a/.gitignore b/.gitignore index 78a0ead..9bcc0c5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .DS_Store node_modules/ dist/ +dist.zip npm-debug.log* yarn-debug.log* yarn-error.log* diff --git a/config/dev.env.js b/config/dev.env.js index 251ba26..3b87ed5 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -10,7 +10,9 @@ // BASE_API: '"http://106.74.146.218:2031"' // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.8.201:8083/smartwell"' - BASE_API: '"http://111.198.10.15:11707/smartwell"' + // BASE_API: '"http://111.198.10.15:11707/smartwell"' + BASE_API: '"http://192.168.165.39:8083"' + // BASE_API: '"http://139.198.16.38:8095/smartcity"' // BASE_API: '"http://10.9.39.8:8083"' // BASE_API: '"http://192.168.0.244:8083"' diff --git a/package.json b/package.json index c72f9bb..7c07e4f 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "dependencies": { "axios": "0.18.0", "babel-polyfill": "^6.26.0", + "dayjs": "^1.11.13", "echarts": "^4.2.1", "element-ui": "2.12.0", "event-source-polyfill": "^1.0.5", @@ -33,6 +34,7 @@ "vuex": "3.0.1" }, "devDependencies": { + "@webpack-cli/serve": "^3.0.1", "autoprefixer": "8.5.0", "babel-core": "6.26.0", "babel-eslint": "8.2.6", @@ -81,7 +83,7 @@ "vue-template-compiler": "2.5.17", "webpack": "4.16.5", "webpack-bundle-analyzer": "2.13.1", - "webpack-cli": "3.1.0", + "webpack-cli": "^3.1.0", "webpack-dev-server": "3.1.14", "webpack-merge": "4.1.4" }, diff --git a/src/api/overview.js b/src/api/overview.js index e786862..2840937 100644 --- a/src/api/overview.js +++ b/src/api/overview.js @@ -20,6 +20,28 @@ } }) } +// 获取闸井摄像头 +export function getWellVideo(id) { + return request({ + url: '/device/getVideoUrl', + method: 'post', + params: { + wellId: id + } + }) +} +// 获取闸井历史摄像头 +export function getWellHistoryVideo(id, begTime, endTime) { + return request({ + url: '/device/getHistoryVideoUrl', + method: 'post', + params: { + wellId: id, + begTime, + endTime + } + }) +} // 获取报警列表 export function getAlarmsNow(params) { return request({ diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index f3cb650..fb9f8a3 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -150,7 +150,7 @@ // 显示闸井详情 showWellDetail(row) { this.wellShow = true - this.$refs.wellInfo.initDialog(row.wellId) + this.$refs.wellInfo.initDialog(row.wellId, row) }, // 批量导出 batchExport() { diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue index e6846b8..3d22eac 100644 --- a/src/views/alarmManage/listAlarmRecords.vue +++ b/src/views/alarmManage/listAlarmRecords.vue @@ -241,7 +241,7 @@ // 显示闸井详情 showWellDetail(row) { this.wellShow = true - this.$refs.wellInfo.initDialog(row.wellId) + this.$refs.wellInfo.initDialog(row.wellId, row) }, // 工单 showJob(row) { diff --git a/.gitignore b/.gitignore index 78a0ead..9bcc0c5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .DS_Store node_modules/ dist/ +dist.zip npm-debug.log* yarn-debug.log* yarn-error.log* diff --git a/config/dev.env.js b/config/dev.env.js index 251ba26..3b87ed5 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -10,7 +10,9 @@ // BASE_API: '"http://106.74.146.218:2031"' // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.8.201:8083/smartwell"' - BASE_API: '"http://111.198.10.15:11707/smartwell"' + // BASE_API: '"http://111.198.10.15:11707/smartwell"' + BASE_API: '"http://192.168.165.39:8083"' + // BASE_API: '"http://139.198.16.38:8095/smartcity"' // BASE_API: '"http://10.9.39.8:8083"' // BASE_API: '"http://192.168.0.244:8083"' diff --git a/package.json b/package.json index c72f9bb..7c07e4f 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "dependencies": { "axios": "0.18.0", "babel-polyfill": "^6.26.0", + "dayjs": "^1.11.13", "echarts": "^4.2.1", "element-ui": "2.12.0", "event-source-polyfill": "^1.0.5", @@ -33,6 +34,7 @@ "vuex": "3.0.1" }, "devDependencies": { + "@webpack-cli/serve": "^3.0.1", "autoprefixer": "8.5.0", "babel-core": "6.26.0", "babel-eslint": "8.2.6", @@ -81,7 +83,7 @@ "vue-template-compiler": "2.5.17", "webpack": "4.16.5", "webpack-bundle-analyzer": "2.13.1", - "webpack-cli": "3.1.0", + "webpack-cli": "^3.1.0", "webpack-dev-server": "3.1.14", "webpack-merge": "4.1.4" }, diff --git a/src/api/overview.js b/src/api/overview.js index e786862..2840937 100644 --- a/src/api/overview.js +++ b/src/api/overview.js @@ -20,6 +20,28 @@ } }) } +// 获取闸井摄像头 +export function getWellVideo(id) { + return request({ + url: '/device/getVideoUrl', + method: 'post', + params: { + wellId: id + } + }) +} +// 获取闸井历史摄像头 +export function getWellHistoryVideo(id, begTime, endTime) { + return request({ + url: '/device/getHistoryVideoUrl', + method: 'post', + params: { + wellId: id, + begTime, + endTime + } + }) +} // 获取报警列表 export function getAlarmsNow(params) { return request({ diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index f3cb650..fb9f8a3 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -150,7 +150,7 @@ // 显示闸井详情 showWellDetail(row) { this.wellShow = true - this.$refs.wellInfo.initDialog(row.wellId) + this.$refs.wellInfo.initDialog(row.wellId, row) }, // 批量导出 batchExport() { diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue index e6846b8..3d22eac 100644 --- a/src/views/alarmManage/listAlarmRecords.vue +++ b/src/views/alarmManage/listAlarmRecords.vue @@ -241,7 +241,7 @@ // 显示闸井详情 showWellDetail(row) { this.wellShow = true - this.$refs.wellInfo.initDialog(row.wellId) + this.$refs.wellInfo.initDialog(row.wellId, row) }, // 工单 showJob(row) { diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue index b26c5f8..31708fe 100644 --- a/src/views/alarmRule/listRule.vue +++ b/src/views/alarmRule/listRule.vue @@ -66,6 +66,7 @@ import editRule from '@/views/alarmRule/editRule' import { getDeviceType } from '@/api/device' import { getAlarmRuleList } from '@/api/alarmRule' +import dayjs from 'dayjs'; export default { name: 'ListRule', @@ -137,7 +138,7 @@ // 显示闸井详情 showWellDetail(row) { this.wellShow = true - this.$refs.wellInfo.initDialog(row.wellId) + this.$refs.wellInfo.initDialog(row.wellId, { currentTime: dayjs().format('YYYY-MM-DD HH:mm:ss')}) }, checkSelection() { if (this.multipleSelection.length === 0) { diff --git a/.gitignore b/.gitignore index 78a0ead..9bcc0c5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .DS_Store node_modules/ dist/ +dist.zip npm-debug.log* yarn-debug.log* yarn-error.log* diff --git a/config/dev.env.js b/config/dev.env.js index 251ba26..3b87ed5 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -10,7 +10,9 @@ // BASE_API: '"http://106.74.146.218:2031"' // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.8.201:8083/smartwell"' - BASE_API: '"http://111.198.10.15:11707/smartwell"' + // BASE_API: '"http://111.198.10.15:11707/smartwell"' + BASE_API: '"http://192.168.165.39:8083"' + // BASE_API: '"http://139.198.16.38:8095/smartcity"' // BASE_API: '"http://10.9.39.8:8083"' // BASE_API: '"http://192.168.0.244:8083"' diff --git a/package.json b/package.json index c72f9bb..7c07e4f 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "dependencies": { "axios": "0.18.0", "babel-polyfill": "^6.26.0", + "dayjs": "^1.11.13", "echarts": "^4.2.1", "element-ui": "2.12.0", "event-source-polyfill": "^1.0.5", @@ -33,6 +34,7 @@ "vuex": "3.0.1" }, "devDependencies": { + "@webpack-cli/serve": "^3.0.1", "autoprefixer": "8.5.0", "babel-core": "6.26.0", "babel-eslint": "8.2.6", @@ -81,7 +83,7 @@ "vue-template-compiler": "2.5.17", "webpack": "4.16.5", "webpack-bundle-analyzer": "2.13.1", - "webpack-cli": "3.1.0", + "webpack-cli": "^3.1.0", "webpack-dev-server": "3.1.14", "webpack-merge": "4.1.4" }, diff --git a/src/api/overview.js b/src/api/overview.js index e786862..2840937 100644 --- a/src/api/overview.js +++ b/src/api/overview.js @@ -20,6 +20,28 @@ } }) } +// 获取闸井摄像头 +export function getWellVideo(id) { + return request({ + url: '/device/getVideoUrl', + method: 'post', + params: { + wellId: id + } + }) +} +// 获取闸井历史摄像头 +export function getWellHistoryVideo(id, begTime, endTime) { + return request({ + url: '/device/getHistoryVideoUrl', + method: 'post', + params: { + wellId: id, + begTime, + endTime + } + }) +} // 获取报警列表 export function getAlarmsNow(params) { return request({ diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index f3cb650..fb9f8a3 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -150,7 +150,7 @@ // 显示闸井详情 showWellDetail(row) { this.wellShow = true - this.$refs.wellInfo.initDialog(row.wellId) + this.$refs.wellInfo.initDialog(row.wellId, row) }, // 批量导出 batchExport() { diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue index e6846b8..3d22eac 100644 --- a/src/views/alarmManage/listAlarmRecords.vue +++ b/src/views/alarmManage/listAlarmRecords.vue @@ -241,7 +241,7 @@ // 显示闸井详情 showWellDetail(row) { this.wellShow = true - this.$refs.wellInfo.initDialog(row.wellId) + this.$refs.wellInfo.initDialog(row.wellId, row) }, // 工单 showJob(row) { diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue index b26c5f8..31708fe 100644 --- a/src/views/alarmRule/listRule.vue +++ b/src/views/alarmRule/listRule.vue @@ -66,6 +66,7 @@ import editRule from '@/views/alarmRule/editRule' import { getDeviceType } from '@/api/device' import { getAlarmRuleList } from '@/api/alarmRule' +import dayjs from 'dayjs'; export default { name: 'ListRule', @@ -137,7 +138,7 @@ // 显示闸井详情 showWellDetail(row) { this.wellShow = true - this.$refs.wellInfo.initDialog(row.wellId) + this.$refs.wellInfo.initDialog(row.wellId, { currentTime: dayjs().format('YYYY-MM-DD HH:mm:ss')}) }, checkSelection() { if (this.multipleSelection.length === 0) { diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue index 51aa3ec..f2e3ff9 100644 --- a/src/views/deviceManage/listDevice.vue +++ b/src/views/deviceManage/listDevice.vue @@ -95,6 +95,7 @@ import DeptSelect from '@/components/DeptSelect/index' import InfoWell from '@/views/wellManage/infoWellBdOffline' import { notContainConcentrator } from '@/utils/permission' +import dayjs from 'dayjs'; export default { name: 'ListDevice', @@ -349,7 +350,7 @@ }, showWellDetail(row) { this.wellShow = true - this.$refs.wellInfo.initDialog(row.wellId) + this.$refs.wellInfo.initDialog(row.wellId, { currentTime: dayjs().format('YYYY-MM-DD HH:mm:ss')}) }, indexMethod(index) { return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1 diff --git a/.gitignore b/.gitignore index 78a0ead..9bcc0c5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .DS_Store node_modules/ dist/ +dist.zip npm-debug.log* yarn-debug.log* yarn-error.log* diff --git a/config/dev.env.js b/config/dev.env.js index 251ba26..3b87ed5 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -10,7 +10,9 @@ // BASE_API: '"http://106.74.146.218:2031"' // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.8.201:8083/smartwell"' - BASE_API: '"http://111.198.10.15:11707/smartwell"' + // BASE_API: '"http://111.198.10.15:11707/smartwell"' + BASE_API: '"http://192.168.165.39:8083"' + // BASE_API: '"http://139.198.16.38:8095/smartcity"' // BASE_API: '"http://10.9.39.8:8083"' // BASE_API: '"http://192.168.0.244:8083"' diff --git a/package.json b/package.json index c72f9bb..7c07e4f 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "dependencies": { "axios": "0.18.0", "babel-polyfill": "^6.26.0", + "dayjs": "^1.11.13", "echarts": "^4.2.1", "element-ui": "2.12.0", "event-source-polyfill": "^1.0.5", @@ -33,6 +34,7 @@ "vuex": "3.0.1" }, "devDependencies": { + "@webpack-cli/serve": "^3.0.1", "autoprefixer": "8.5.0", "babel-core": "6.26.0", "babel-eslint": "8.2.6", @@ -81,7 +83,7 @@ "vue-template-compiler": "2.5.17", "webpack": "4.16.5", "webpack-bundle-analyzer": "2.13.1", - "webpack-cli": "3.1.0", + "webpack-cli": "^3.1.0", "webpack-dev-server": "3.1.14", "webpack-merge": "4.1.4" }, diff --git a/src/api/overview.js b/src/api/overview.js index e786862..2840937 100644 --- a/src/api/overview.js +++ b/src/api/overview.js @@ -20,6 +20,28 @@ } }) } +// 获取闸井摄像头 +export function getWellVideo(id) { + return request({ + url: '/device/getVideoUrl', + method: 'post', + params: { + wellId: id + } + }) +} +// 获取闸井历史摄像头 +export function getWellHistoryVideo(id, begTime, endTime) { + return request({ + url: '/device/getHistoryVideoUrl', + method: 'post', + params: { + wellId: id, + begTime, + endTime + } + }) +} // 获取报警列表 export function getAlarmsNow(params) { return request({ diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index f3cb650..fb9f8a3 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -150,7 +150,7 @@ // 显示闸井详情 showWellDetail(row) { this.wellShow = true - this.$refs.wellInfo.initDialog(row.wellId) + this.$refs.wellInfo.initDialog(row.wellId, row) }, // 批量导出 batchExport() { diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue index e6846b8..3d22eac 100644 --- a/src/views/alarmManage/listAlarmRecords.vue +++ b/src/views/alarmManage/listAlarmRecords.vue @@ -241,7 +241,7 @@ // 显示闸井详情 showWellDetail(row) { this.wellShow = true - this.$refs.wellInfo.initDialog(row.wellId) + this.$refs.wellInfo.initDialog(row.wellId, row) }, // 工单 showJob(row) { diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue index b26c5f8..31708fe 100644 --- a/src/views/alarmRule/listRule.vue +++ b/src/views/alarmRule/listRule.vue @@ -66,6 +66,7 @@ import editRule from '@/views/alarmRule/editRule' import { getDeviceType } from '@/api/device' import { getAlarmRuleList } from '@/api/alarmRule' +import dayjs from 'dayjs'; export default { name: 'ListRule', @@ -137,7 +138,7 @@ // 显示闸井详情 showWellDetail(row) { this.wellShow = true - this.$refs.wellInfo.initDialog(row.wellId) + this.$refs.wellInfo.initDialog(row.wellId, { currentTime: dayjs().format('YYYY-MM-DD HH:mm:ss')}) }, checkSelection() { if (this.multipleSelection.length === 0) { diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue index 51aa3ec..f2e3ff9 100644 --- a/src/views/deviceManage/listDevice.vue +++ b/src/views/deviceManage/listDevice.vue @@ -95,6 +95,7 @@ import DeptSelect from '@/components/DeptSelect/index' import InfoWell from '@/views/wellManage/infoWellBdOffline' import { notContainConcentrator } from '@/utils/permission' +import dayjs from 'dayjs'; export default { name: 'ListDevice', @@ -349,7 +350,7 @@ }, showWellDetail(row) { this.wellShow = true - this.$refs.wellInfo.initDialog(row.wellId) + this.$refs.wellInfo.initDialog(row.wellId, { currentTime: dayjs().format('YYYY-MM-DD HH:mm:ss')}) }, indexMethod(index) { return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1 diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue index 9dd6546..014d67e 100644 --- a/src/views/jobManage/listJobs.vue +++ b/src/views/jobManage/listJobs.vue @@ -254,8 +254,9 @@ }, // 显示闸井详情 showWellDetail(row) { + // console.log(row, 'row') this.wellShow = true - this.$refs.wellInfo.initDialog(row.wellId) + this.$refs.wellInfo.initDialog(row.wellId, row) }, // 工单 showJob(jobId) { diff --git a/.gitignore b/.gitignore index 78a0ead..9bcc0c5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .DS_Store node_modules/ dist/ +dist.zip npm-debug.log* yarn-debug.log* yarn-error.log* diff --git a/config/dev.env.js b/config/dev.env.js index 251ba26..3b87ed5 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -10,7 +10,9 @@ // BASE_API: '"http://106.74.146.218:2031"' // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.8.201:8083/smartwell"' - BASE_API: '"http://111.198.10.15:11707/smartwell"' + // BASE_API: '"http://111.198.10.15:11707/smartwell"' + BASE_API: '"http://192.168.165.39:8083"' + // BASE_API: '"http://139.198.16.38:8095/smartcity"' // BASE_API: '"http://10.9.39.8:8083"' // BASE_API: '"http://192.168.0.244:8083"' diff --git a/package.json b/package.json index c72f9bb..7c07e4f 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "dependencies": { "axios": "0.18.0", "babel-polyfill": "^6.26.0", + "dayjs": "^1.11.13", "echarts": "^4.2.1", "element-ui": "2.12.0", "event-source-polyfill": "^1.0.5", @@ -33,6 +34,7 @@ "vuex": "3.0.1" }, "devDependencies": { + "@webpack-cli/serve": "^3.0.1", "autoprefixer": "8.5.0", "babel-core": "6.26.0", "babel-eslint": "8.2.6", @@ -81,7 +83,7 @@ "vue-template-compiler": "2.5.17", "webpack": "4.16.5", "webpack-bundle-analyzer": "2.13.1", - "webpack-cli": "3.1.0", + "webpack-cli": "^3.1.0", "webpack-dev-server": "3.1.14", "webpack-merge": "4.1.4" }, diff --git a/src/api/overview.js b/src/api/overview.js index e786862..2840937 100644 --- a/src/api/overview.js +++ b/src/api/overview.js @@ -20,6 +20,28 @@ } }) } +// 获取闸井摄像头 +export function getWellVideo(id) { + return request({ + url: '/device/getVideoUrl', + method: 'post', + params: { + wellId: id + } + }) +} +// 获取闸井历史摄像头 +export function getWellHistoryVideo(id, begTime, endTime) { + return request({ + url: '/device/getHistoryVideoUrl', + method: 'post', + params: { + wellId: id, + begTime, + endTime + } + }) +} // 获取报警列表 export function getAlarmsNow(params) { return request({ diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index f3cb650..fb9f8a3 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -150,7 +150,7 @@ // 显示闸井详情 showWellDetail(row) { this.wellShow = true - this.$refs.wellInfo.initDialog(row.wellId) + this.$refs.wellInfo.initDialog(row.wellId, row) }, // 批量导出 batchExport() { diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue index e6846b8..3d22eac 100644 --- a/src/views/alarmManage/listAlarmRecords.vue +++ b/src/views/alarmManage/listAlarmRecords.vue @@ -241,7 +241,7 @@ // 显示闸井详情 showWellDetail(row) { this.wellShow = true - this.$refs.wellInfo.initDialog(row.wellId) + this.$refs.wellInfo.initDialog(row.wellId, row) }, // 工单 showJob(row) { diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue index b26c5f8..31708fe 100644 --- a/src/views/alarmRule/listRule.vue +++ b/src/views/alarmRule/listRule.vue @@ -66,6 +66,7 @@ import editRule from '@/views/alarmRule/editRule' import { getDeviceType } from '@/api/device' import { getAlarmRuleList } from '@/api/alarmRule' +import dayjs from 'dayjs'; export default { name: 'ListRule', @@ -137,7 +138,7 @@ // 显示闸井详情 showWellDetail(row) { this.wellShow = true - this.$refs.wellInfo.initDialog(row.wellId) + this.$refs.wellInfo.initDialog(row.wellId, { currentTime: dayjs().format('YYYY-MM-DD HH:mm:ss')}) }, checkSelection() { if (this.multipleSelection.length === 0) { diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue index 51aa3ec..f2e3ff9 100644 --- a/src/views/deviceManage/listDevice.vue +++ b/src/views/deviceManage/listDevice.vue @@ -95,6 +95,7 @@ import DeptSelect from '@/components/DeptSelect/index' import InfoWell from '@/views/wellManage/infoWellBdOffline' import { notContainConcentrator } from '@/utils/permission' +import dayjs from 'dayjs'; export default { name: 'ListDevice', @@ -349,7 +350,7 @@ }, showWellDetail(row) { this.wellShow = true - this.$refs.wellInfo.initDialog(row.wellId) + this.$refs.wellInfo.initDialog(row.wellId, { currentTime: dayjs().format('YYYY-MM-DD HH:mm:ss')}) }, indexMethod(index) { return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1 diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue index 9dd6546..014d67e 100644 --- a/src/views/jobManage/listJobs.vue +++ b/src/views/jobManage/listJobs.vue @@ -254,8 +254,9 @@ }, // 显示闸井详情 showWellDetail(row) { + // console.log(row, 'row') this.wellShow = true - this.$refs.wellInfo.initDialog(row.wellId) + this.$refs.wellInfo.initDialog(row.wellId, row) }, // 工单 showJob(jobId) { diff --git a/src/views/overview/overviewBdOffline.vue b/src/views/overview/overviewBdOffline.vue index 23ef513..9573fab 100644 --- a/src/views/overview/overviewBdOffline.vue +++ b/src/views/overview/overviewBdOffline.vue @@ -2,33 +2,58 @@
- + - - 搜索 + + 搜索
- 共找到 {{ searchWells.length }} 个符合条件的井 -
-
-
{{ index+1 }}
-
{{ well.wellCode }}
+ trigger="click" + > + 共找到 {{ searchWells.length }} 个符合条件的井 +
+
+
{{ index + 1 }}
+
+
{{ well.wellCode }}
{{ well.positionInfo }}
-
+
+ @current-change="handleCurrentChange" + />
- + - +
- + trigger="manual" + > +
+ :class="{ moredatascollor: alarmList.length > 6 }" + :native="false" + > - + :header-row-style="{ background: '#F3F4F7' }" + @row-click="alarmRowClick" + > + @@ -77,47 +120,66 @@
- - -
+ + +
+ @click="openInfoWindow" + /> + @click="openInfoWindow" + />
+ :label-style="{ + color: 'white', + background: 'rgba(0,0,0,0.0)', + border: 'none', + fontSize: '12px' + }" + :offset="{ width: 5, height: 4 }" + :content="'' + (index + 1)" + /> -
+
闸井类型：{{ wellInfo.wellTypeName }}
@@ -145,24 +216,58 @@
详细地址：{{ wellInfo.position }}
-
+
{{ alarmInfo.wellCode }}
-
告警原因：{{ alarm.alarmContent }}
-
设备编号：{{ alarm.devcode }}
-
告警时间：{{ alarm.alarmTime }}
+
+ 告警原因：{{ + alarm.alarmContent + }} +
+
+ 设备编号：{{ alarm.devcode }} +
+
+ 告警时间：{{ alarm.alarmTime }} +
- +
所属分局：{{ alarmInfo.pidName }}
所属派出所：{{ alarmInfo.deptName }}
产权单位：{{ alarmInfo.owner }}
详细地址：{{ alarmInfo.position }}
+
+
+ 视频{{ index + 1 }} +
+
+
+ +
@@ -171,10 +276,22 @@ placement="bottom-end" title="数据筛选" width="250" - trigger="click"> - + trigger="click" + > +
- + + clearable + /> - - + + + :value="item.value" + /> - 筛选 - 清除 -
- + 筛选 + 清除 +
+ - 显示全部闸井 - 显示未装设备闸井 - 显示已装设备闸井 + 显示全部闸井 + 显示未装设备闸井 + 显示已装设备闸井
@@ -210,42 +352,60 @@ diff --git a/.gitignore b/.gitignore index 78a0ead..9bcc0c5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .DS_Store node_modules/ dist/ +dist.zip npm-debug.log* yarn-debug.log* yarn-error.log* diff --git a/config/dev.env.js b/config/dev.env.js index 251ba26..3b87ed5 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -10,7 +10,9 @@ // BASE_API: '"http://106.74.146.218:2031"' // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.8.201:8083/smartwell"' - BASE_API: '"http://111.198.10.15:11707/smartwell"' + // BASE_API: '"http://111.198.10.15:11707/smartwell"' + BASE_API: '"http://192.168.165.39:8083"' + // BASE_API: '"http://139.198.16.38:8095/smartcity"' // BASE_API: '"http://10.9.39.8:8083"' // BASE_API: '"http://192.168.0.244:8083"' diff --git a/package.json b/package.json index c72f9bb..7c07e4f 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "dependencies": { "axios": "0.18.0", "babel-polyfill": "^6.26.0", + "dayjs": "^1.11.13", "echarts": "^4.2.1", "element-ui": "2.12.0", "event-source-polyfill": "^1.0.5", @@ -33,6 +34,7 @@ "vuex": "3.0.1" }, "devDependencies": { + "@webpack-cli/serve": "^3.0.1", "autoprefixer": "8.5.0", "babel-core": "6.26.0", "babel-eslint": "8.2.6", @@ -81,7 +83,7 @@ "vue-template-compiler": "2.5.17", "webpack": "4.16.5", "webpack-bundle-analyzer": "2.13.1", - "webpack-cli": "3.1.0", + "webpack-cli": "^3.1.0", "webpack-dev-server": "3.1.14", "webpack-merge": "4.1.4" }, diff --git a/src/api/overview.js b/src/api/overview.js index e786862..2840937 100644 --- a/src/api/overview.js +++ b/src/api/overview.js @@ -20,6 +20,28 @@ } }) } +// 获取闸井摄像头 +export function getWellVideo(id) { + return request({ + url: '/device/getVideoUrl', + method: 'post', + params: { + wellId: id + } + }) +} +// 获取闸井历史摄像头 +export function getWellHistoryVideo(id, begTime, endTime) { + return request({ + url: '/device/getHistoryVideoUrl', + method: 'post', + params: { + wellId: id, + begTime, + endTime + } + }) +} // 获取报警列表 export function getAlarmsNow(params) { return request({ diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index f3cb650..fb9f8a3 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -150,7 +150,7 @@ // 显示闸井详情 showWellDetail(row) { this.wellShow = true - this.$refs.wellInfo.initDialog(row.wellId) + this.$refs.wellInfo.initDialog(row.wellId, row) }, // 批量导出 batchExport() { diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue index e6846b8..3d22eac 100644 --- a/src/views/alarmManage/listAlarmRecords.vue +++ b/src/views/alarmManage/listAlarmRecords.vue @@ -241,7 +241,7 @@ // 显示闸井详情 showWellDetail(row) { this.wellShow = true - this.$refs.wellInfo.initDialog(row.wellId) + this.$refs.wellInfo.initDialog(row.wellId, row) }, // 工单 showJob(row) { diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue index b26c5f8..31708fe 100644 --- a/src/views/alarmRule/listRule.vue +++ b/src/views/alarmRule/listRule.vue @@ -66,6 +66,7 @@ import editRule from '@/views/alarmRule/editRule' import { getDeviceType } from '@/api/device' import { getAlarmRuleList } from '@/api/alarmRule' +import dayjs from 'dayjs'; export default { name: 'ListRule', @@ -137,7 +138,7 @@ // 显示闸井详情 showWellDetail(row) { this.wellShow = true - this.$refs.wellInfo.initDialog(row.wellId) + this.$refs.wellInfo.initDialog(row.wellId, { currentTime: dayjs().format('YYYY-MM-DD HH:mm:ss')}) }, checkSelection() { if (this.multipleSelection.length === 0) { diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue index 51aa3ec..f2e3ff9 100644 --- a/src/views/deviceManage/listDevice.vue +++ b/src/views/deviceManage/listDevice.vue @@ -95,6 +95,7 @@ import DeptSelect from '@/components/DeptSelect/index' import InfoWell from '@/views/wellManage/infoWellBdOffline' import { notContainConcentrator } from '@/utils/permission' +import dayjs from 'dayjs'; export default { name: 'ListDevice', @@ -349,7 +350,7 @@ }, showWellDetail(row) { this.wellShow = true - this.$refs.wellInfo.initDialog(row.wellId) + this.$refs.wellInfo.initDialog(row.wellId, { currentTime: dayjs().format('YYYY-MM-DD HH:mm:ss')}) }, indexMethod(index) { return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1 diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue index 9dd6546..014d67e 100644 --- a/src/views/jobManage/listJobs.vue +++ b/src/views/jobManage/listJobs.vue @@ -254,8 +254,9 @@ }, // 显示闸井详情 showWellDetail(row) { + // console.log(row, 'row') this.wellShow = true - this.$refs.wellInfo.initDialog(row.wellId) + this.$refs.wellInfo.initDialog(row.wellId, row) }, // 工单 showJob(jobId) { diff --git a/src/views/overview/overviewBdOffline.vue b/src/views/overview/overviewBdOffline.vue index 23ef513..9573fab 100644 --- a/src/views/overview/overviewBdOffline.vue +++ b/src/views/overview/overviewBdOffline.vue @@ -2,33 +2,58 @@
- + - - 搜索 + + 搜索
- 共找到 {{ searchWells.length }} 个符合条件的井 -
-
-
{{ index+1 }}
-
{{ well.wellCode }}
+ trigger="click" + > + 共找到 {{ searchWells.length }} 个符合条件的井 +
+
+
{{ index + 1 }}
+
+
{{ well.wellCode }}
{{ well.positionInfo }}
-
+
+ @current-change="handleCurrentChange" + />
- + - +
- + trigger="manual" + > +
+ :class="{ moredatascollor: alarmList.length > 6 }" + :native="false" + > - + :header-row-style="{ background: '#F3F4F7' }" + @row-click="alarmRowClick" + > + @@ -77,47 +120,66 @@
- - -
+ + +
+ @click="openInfoWindow" + /> + @click="openInfoWindow" + />
+ :label-style="{ + color: 'white', + background: 'rgba(0,0,0,0.0)', + border: 'none', + fontSize: '12px' + }" + :offset="{ width: 5, height: 4 }" + :content="'' + (index + 1)" + /> -
+
闸井类型：{{ wellInfo.wellTypeName }}
@@ -145,24 +216,58 @@
详细地址：{{ wellInfo.position }}
-
+
{{ alarmInfo.wellCode }}
-
告警原因：{{ alarm.alarmContent }}
-
设备编号：{{ alarm.devcode }}
-
告警时间：{{ alarm.alarmTime }}
+
+ 告警原因：{{ + alarm.alarmContent + }} +
+
+ 设备编号：{{ alarm.devcode }} +
+
+ 告警时间：{{ alarm.alarmTime }} +
- +
所属分局：{{ alarmInfo.pidName }}
所属派出所：{{ alarmInfo.deptName }}
产权单位：{{ alarmInfo.owner }}
详细地址：{{ alarmInfo.position }}
+
+
+ 视频{{ index + 1 }} +
+
+
+ +
@@ -171,10 +276,22 @@ placement="bottom-end" title="数据筛选" width="250" - trigger="click"> - + trigger="click" + > +
- + + clearable + /> - - + + + :value="item.value" + /> - 筛选 - 清除 -
- + 筛选 + 清除 +
+ - 显示全部闸井 - 显示未装设备闸井 - 显示已装设备闸井 + 显示全部闸井 + 显示未装设备闸井 + 显示已装设备闸井
@@ -210,42 +352,60 @@ diff --git a/src/views/wellManage/infoWellBdOffline.vue b/src/views/wellManage/infoWellBdOffline.vue index ea66437..3060037 100644 --- a/src/views/wellManage/infoWellBdOffline.vue +++ b/src/views/wellManage/infoWellBdOffline.vue @@ -85,7 +85,28 @@ :position="marker.position" :offset="offset" :visible="marker.visible" + @click="openInfo" /> + + +
+
视频{{ index + 1 }}
+
+
+ +
+
@@ -96,16 +117,22 @@