diff --git a/src/components/BigData/TimeButtons.vue b/src/components/BigData/TimeButtons.vue index 32c6f0b..6120bdd 100644 --- a/src/components/BigData/TimeButtons.vue +++ b/src/components/BigData/TimeButtons.vue @@ -82,11 +82,15 @@ timeRange = getSearchLastWeekTime() break } + this.timeRange = timeRange this.$emit('change', timeRange) }, // 强制触发 initTime() { this.changeTime(this.defaultChecked) + }, + getTime() { + return this.timeRange } } } diff --git a/src/components/BigData/TimeButtons.vue b/src/components/BigData/TimeButtons.vue index 32c6f0b..6120bdd 100644 --- a/src/components/BigData/TimeButtons.vue +++ b/src/components/BigData/TimeButtons.vue @@ -82,11 +82,15 @@ timeRange = getSearchLastWeekTime() break } + this.timeRange = timeRange this.$emit('change', timeRange) }, // 强制触发 initTime() { this.changeTime(this.defaultChecked) + }, + getTime() { + return this.timeRange } } } diff --git a/src/main.js b/src/main.js index 8e07b0e..3782b05 100644 --- a/src/main.js +++ b/src/main.js @@ -5,7 +5,7 @@ import router from './router' import store from './store' import ElementUI from 'element-ui' -import 'element-ui/lib/theme-chalk/index.css' +// import 'element-ui/lib/theme-chalk/index.css' import '@/styles/element-variables.scss' import locale from 'element-ui/lib/locale/lang/zh-CN' // lang i18n Vue.use(ElementUI, { locale }) @@ -73,10 +73,10 @@ import SearchItem from '@/components/SearchArea/SearchItem' import AppContainer from '@/components/layout/AppContainer' -Vue.component('app-container', AppContainer) -Vue.component('normal-table', NormalTable) -Vue.component('search-area', SearchArea) -Vue.component('search-item', SearchItem) +Vue.component('AppContainer', AppContainer) +Vue.component('NormalTable', NormalTable) +Vue.component('SearchArea', SearchArea) +Vue.component('SearchItem', SearchItem) import resize from '@/directive/resize/resize' // resize directive Vue.directive('resize', resize) @@ -94,7 +94,6 @@ import axios from 'axios' import service from '@/utils/request' - import * as Cesium from 'mars3d-cesium' import 'mars3d/dist/mars3d.css' import 'mars3d-cesium/Build/Cesium/Widgets/widgets.css' diff --git a/src/components/BigData/TimeButtons.vue b/src/components/BigData/TimeButtons.vue index 32c6f0b..6120bdd 100644 --- a/src/components/BigData/TimeButtons.vue +++ b/src/components/BigData/TimeButtons.vue @@ -82,11 +82,15 @@ timeRange = getSearchLastWeekTime() break } + this.timeRange = timeRange this.$emit('change', timeRange) }, // 强制触发 initTime() { this.changeTime(this.defaultChecked) + }, + getTime() { + return this.timeRange } } } diff --git a/src/main.js b/src/main.js index 8e07b0e..3782b05 100644 --- a/src/main.js +++ b/src/main.js @@ -5,7 +5,7 @@ import router from './router' import store from './store' import ElementUI from 'element-ui' -import 'element-ui/lib/theme-chalk/index.css' +// import 'element-ui/lib/theme-chalk/index.css' import '@/styles/element-variables.scss' import locale from 'element-ui/lib/locale/lang/zh-CN' // lang i18n Vue.use(ElementUI, { locale }) @@ -73,10 +73,10 @@ import SearchItem from '@/components/SearchArea/SearchItem' import AppContainer from '@/components/layout/AppContainer' -Vue.component('app-container', AppContainer) -Vue.component('normal-table', NormalTable) -Vue.component('search-area', SearchArea) -Vue.component('search-item', SearchItem) +Vue.component('AppContainer', AppContainer) +Vue.component('NormalTable', NormalTable) +Vue.component('SearchArea', SearchArea) +Vue.component('SearchItem', SearchItem) import resize from '@/directive/resize/resize' // resize directive Vue.directive('resize', resize) @@ -94,7 +94,6 @@ import axios from 'axios' import service from '@/utils/request' - import * as Cesium from 'mars3d-cesium' import 'mars3d/dist/mars3d.css' import 'mars3d-cesium/Build/Cesium/Widgets/widgets.css' diff --git a/src/styles/element-variables.scss b/src/styles/element-variables.scss index 823cd76..9e2a64c 100644 --- a/src/styles/element-variables.scss +++ b/src/styles/element-variables.scss @@ -1,6 +1,5 @@ @use "sass:math"; /* Element Chalk Variables */ - // Special comment for theme configurator // type|skipAutoTranslation|Category|Order // skipAutoTranslation 1 @@ -993,3 +992,7 @@ 'lg-and-down': (max-width: $--xl - 1), 'xl-only' : (min-width: $--xl), ); + +/* 改变 icon 字体路径变量，必需 */ +$--font-path: '~element-ui/lib/theme-chalk/fonts'; +@import "~element-ui/packages/theme-chalk/src/index"; diff --git a/src/components/BigData/TimeButtons.vue b/src/components/BigData/TimeButtons.vue index 32c6f0b..6120bdd 100644 --- a/src/components/BigData/TimeButtons.vue +++ b/src/components/BigData/TimeButtons.vue @@ -82,11 +82,15 @@ timeRange = getSearchLastWeekTime() break } + this.timeRange = timeRange this.$emit('change', timeRange) }, // 强制触发 initTime() { this.changeTime(this.defaultChecked) + }, + getTime() { + return this.timeRange } } } diff --git a/src/main.js b/src/main.js index 8e07b0e..3782b05 100644 --- a/src/main.js +++ b/src/main.js @@ -5,7 +5,7 @@ import router from './router' import store from './store' import ElementUI from 'element-ui' -import 'element-ui/lib/theme-chalk/index.css' +// import 'element-ui/lib/theme-chalk/index.css' import '@/styles/element-variables.scss' import locale from 'element-ui/lib/locale/lang/zh-CN' // lang i18n Vue.use(ElementUI, { locale }) @@ -73,10 +73,10 @@ import SearchItem from '@/components/SearchArea/SearchItem' import AppContainer from '@/components/layout/AppContainer' -Vue.component('app-container', AppContainer) -Vue.component('normal-table', NormalTable) -Vue.component('search-area', SearchArea) -Vue.component('search-item', SearchItem) +Vue.component('AppContainer', AppContainer) +Vue.component('NormalTable', NormalTable) +Vue.component('SearchArea', SearchArea) +Vue.component('SearchItem', SearchItem) import resize from '@/directive/resize/resize' // resize directive Vue.directive('resize', resize) @@ -94,7 +94,6 @@ import axios from 'axios' import service from '@/utils/request' - import * as Cesium from 'mars3d-cesium' import 'mars3d/dist/mars3d.css' import 'mars3d-cesium/Build/Cesium/Widgets/widgets.css' diff --git a/src/styles/element-variables.scss b/src/styles/element-variables.scss index 823cd76..9e2a64c 100644 --- a/src/styles/element-variables.scss +++ b/src/styles/element-variables.scss @@ -1,6 +1,5 @@ @use "sass:math"; /* Element Chalk Variables */ - // Special comment for theme configurator // type|skipAutoTranslation|Category|Order // skipAutoTranslation 1 @@ -993,3 +992,7 @@ 'lg-and-down': (max-width: $--xl - 1), 'xl-only' : (min-width: $--xl), ); + +/* 改变 icon 字体路径变量，必需 */ +$--font-path: '~element-ui/lib/theme-chalk/fonts'; +@import "~element-ui/packages/theme-chalk/src/index"; diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue index c0d1cb5..476347a 100644 --- a/src/views/alarmStatics/components/alarmStaticsByDept.vue +++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue @@ -11,6 +11,7 @@ value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始时间" end-placeholder="结束时间" + :clearable="false" @change="fetchData" /> @@ -88,13 +89,13 @@ } }, created() { - this.fetchData() }, mounted() { const bodyWidth = this.$refs.alarmStaticByDept.$el.clientWidth if (bodyWidth < 566) { this.timeButtonSize = 'small' } + this.$refs.timeButtons.initTime() }, methods: { // 时间切换 diff --git a/src/components/BigData/TimeButtons.vue b/src/components/BigData/TimeButtons.vue index 32c6f0b..6120bdd 100644 --- a/src/components/BigData/TimeButtons.vue +++ b/src/components/BigData/TimeButtons.vue @@ -82,11 +82,15 @@ timeRange = getSearchLastWeekTime() break } + this.timeRange = timeRange this.$emit('change', timeRange) }, // 强制触发 initTime() { this.changeTime(this.defaultChecked) + }, + getTime() { + return this.timeRange } } } diff --git a/src/main.js b/src/main.js index 8e07b0e..3782b05 100644 --- a/src/main.js +++ b/src/main.js @@ -5,7 +5,7 @@ import router from './router' import store from './store' import ElementUI from 'element-ui' -import 'element-ui/lib/theme-chalk/index.css' +// import 'element-ui/lib/theme-chalk/index.css' import '@/styles/element-variables.scss' import locale from 'element-ui/lib/locale/lang/zh-CN' // lang i18n Vue.use(ElementUI, { locale }) @@ -73,10 +73,10 @@ import SearchItem from '@/components/SearchArea/SearchItem' import AppContainer from '@/components/layout/AppContainer' -Vue.component('app-container', AppContainer) -Vue.component('normal-table', NormalTable) -Vue.component('search-area', SearchArea) -Vue.component('search-item', SearchItem) +Vue.component('AppContainer', AppContainer) +Vue.component('NormalTable', NormalTable) +Vue.component('SearchArea', SearchArea) +Vue.component('SearchItem', SearchItem) import resize from '@/directive/resize/resize' // resize directive Vue.directive('resize', resize) @@ -94,7 +94,6 @@ import axios from 'axios' import service from '@/utils/request' - import * as Cesium from 'mars3d-cesium' import 'mars3d/dist/mars3d.css' import 'mars3d-cesium/Build/Cesium/Widgets/widgets.css' diff --git a/src/styles/element-variables.scss b/src/styles/element-variables.scss index 823cd76..9e2a64c 100644 --- a/src/styles/element-variables.scss +++ b/src/styles/element-variables.scss @@ -1,6 +1,5 @@ @use "sass:math"; /* Element Chalk Variables */ - // Special comment for theme configurator // type|skipAutoTranslation|Category|Order // skipAutoTranslation 1 @@ -993,3 +992,7 @@ 'lg-and-down': (max-width: $--xl - 1), 'xl-only' : (min-width: $--xl), ); + +/* 改变 icon 字体路径变量，必需 */ +$--font-path: '~element-ui/lib/theme-chalk/fonts'; +@import "~element-ui/packages/theme-chalk/src/index"; diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue index c0d1cb5..476347a 100644 --- a/src/views/alarmStatics/components/alarmStaticsByDept.vue +++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue @@ -11,6 +11,7 @@ value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始时间" end-placeholder="结束时间" + :clearable="false" @change="fetchData" /> @@ -88,13 +89,13 @@ } }, created() { - this.fetchData() }, mounted() { const bodyWidth = this.$refs.alarmStaticByDept.$el.clientWidth if (bodyWidth < 566) { this.timeButtonSize = 'small' } + this.$refs.timeButtons.initTime() }, methods: { // 时间切换 diff --git a/src/views/dataView/components/alarmAnalysis.vue b/src/views/dataView/components/alarmAnalysis.vue index 28aa602..3ac21d8 100644 --- a/src/views/dataView/components/alarmAnalysis.vue +++ b/src/views/dataView/components/alarmAnalysis.vue @@ -97,13 +97,11 @@ }, // 处理时间 handleDateTime() { - if (this.timeRange && this.timeRange.length > 0) { - this.listQuery.beginTime = this.timeRange[0] - this.listQuery.endTime = this.timeRange[1] - } else { - this.listQuery.beginTime = '' - this.listQuery.endTime = '' + if (!this.timeRange) { + this.timeRange = getSearchLastWeekTime() } + this.listQuery.beginTime = this.timeRange[0] + this.listQuery.endTime = this.timeRange[1] } } } diff --git a/src/components/BigData/TimeButtons.vue b/src/components/BigData/TimeButtons.vue index 32c6f0b..6120bdd 100644 --- a/src/components/BigData/TimeButtons.vue +++ b/src/components/BigData/TimeButtons.vue @@ -82,11 +82,15 @@ timeRange = getSearchLastWeekTime() break } + this.timeRange = timeRange this.$emit('change', timeRange) }, // 强制触发 initTime() { this.changeTime(this.defaultChecked) + }, + getTime() { + return this.timeRange } } } diff --git a/src/main.js b/src/main.js index 8e07b0e..3782b05 100644 --- a/src/main.js +++ b/src/main.js @@ -5,7 +5,7 @@ import router from './router' import store from './store' import ElementUI from 'element-ui' -import 'element-ui/lib/theme-chalk/index.css' +// import 'element-ui/lib/theme-chalk/index.css' import '@/styles/element-variables.scss' import locale from 'element-ui/lib/locale/lang/zh-CN' // lang i18n Vue.use(ElementUI, { locale }) @@ -73,10 +73,10 @@ import SearchItem from '@/components/SearchArea/SearchItem' import AppContainer from '@/components/layout/AppContainer' -Vue.component('app-container', AppContainer) -Vue.component('normal-table', NormalTable) -Vue.component('search-area', SearchArea) -Vue.component('search-item', SearchItem) +Vue.component('AppContainer', AppContainer) +Vue.component('NormalTable', NormalTable) +Vue.component('SearchArea', SearchArea) +Vue.component('SearchItem', SearchItem) import resize from '@/directive/resize/resize' // resize directive Vue.directive('resize', resize) @@ -94,7 +94,6 @@ import axios from 'axios' import service from '@/utils/request' - import * as Cesium from 'mars3d-cesium' import 'mars3d/dist/mars3d.css' import 'mars3d-cesium/Build/Cesium/Widgets/widgets.css' diff --git a/src/styles/element-variables.scss b/src/styles/element-variables.scss index 823cd76..9e2a64c 100644 --- a/src/styles/element-variables.scss +++ b/src/styles/element-variables.scss @@ -1,6 +1,5 @@ @use "sass:math"; /* Element Chalk Variables */ - // Special comment for theme configurator // type|skipAutoTranslation|Category|Order // skipAutoTranslation 1 @@ -993,3 +992,7 @@ 'lg-and-down': (max-width: $--xl - 1), 'xl-only' : (min-width: $--xl), ); + +/* 改变 icon 字体路径变量，必需 */ +$--font-path: '~element-ui/lib/theme-chalk/fonts'; +@import "~element-ui/packages/theme-chalk/src/index"; diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue index c0d1cb5..476347a 100644 --- a/src/views/alarmStatics/components/alarmStaticsByDept.vue +++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue @@ -11,6 +11,7 @@ value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始时间" end-placeholder="结束时间" + :clearable="false" @change="fetchData" /> @@ -88,13 +89,13 @@ } }, created() { - this.fetchData() }, mounted() { const bodyWidth = this.$refs.alarmStaticByDept.$el.clientWidth if (bodyWidth < 566) { this.timeButtonSize = 'small' } + this.$refs.timeButtons.initTime() }, methods: { // 时间切换 diff --git a/src/views/dataView/components/alarmAnalysis.vue b/src/views/dataView/components/alarmAnalysis.vue index 28aa602..3ac21d8 100644 --- a/src/views/dataView/components/alarmAnalysis.vue +++ b/src/views/dataView/components/alarmAnalysis.vue @@ -97,13 +97,11 @@ }, // 处理时间 handleDateTime() { - if (this.timeRange && this.timeRange.length > 0) { - this.listQuery.beginTime = this.timeRange[0] - this.listQuery.endTime = this.timeRange[1] - } else { - this.listQuery.beginTime = '' - this.listQuery.endTime = '' + if (!this.timeRange) { + this.timeRange = getSearchLastWeekTime() } + this.listQuery.beginTime = this.timeRange[0] + this.listQuery.endTime = this.timeRange[1] } } } diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue index 2134258..fc61332 100644 --- a/src/views/deviceManage/listDevice.vue +++ b/src/views/deviceManage/listDevice.vue @@ -30,42 +30,47 @@ -
- - -
- 数据列表 -
- - - - 导出记录 + + + + + @@ -214,6 +205,10 @@ { value: '1', name: '在线' }, { value: '0', name: '离线' } ], // 在线情况 + options: { + needIndex: true, // 是否需要序号列 + border: true // 是否需要上方边框 + }, wellShow: false } }, @@ -385,17 +380,14 @@ this.wellShow = true this.$refs.wellInfo.initDialog(row.wellId) }, - indexMethod(index) { - return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1 - }, - // 改变页容量 - handleSizeChange(val) { - this.listQuery.limit = val - this.fetchData() - }, - // 改变当前页 - handleCurrentChange(val) { - this.listQuery.offset = val + // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写 + changePage(val) { + if (val && val.size) { + this.listQuery.limit = val.size + } + if (val && val.page) { + this.listQuery.offset = val.page + } this.fetchData() }, // 多选触发方法 @@ -407,30 +399,5 @@ diff --git a/src/components/BigData/TimeButtons.vue b/src/components/BigData/TimeButtons.vue index 32c6f0b..6120bdd 100644 --- a/src/components/BigData/TimeButtons.vue +++ b/src/components/BigData/TimeButtons.vue @@ -82,11 +82,15 @@ timeRange = getSearchLastWeekTime() break } + this.timeRange = timeRange this.$emit('change', timeRange) }, // 强制触发 initTime() { this.changeTime(this.defaultChecked) + }, + getTime() { + return this.timeRange } } } diff --git a/src/main.js b/src/main.js index 8e07b0e..3782b05 100644 --- a/src/main.js +++ b/src/main.js @@ -5,7 +5,7 @@ import router from './router' import store from './store' import ElementUI from 'element-ui' -import 'element-ui/lib/theme-chalk/index.css' +// import 'element-ui/lib/theme-chalk/index.css' import '@/styles/element-variables.scss' import locale from 'element-ui/lib/locale/lang/zh-CN' // lang i18n Vue.use(ElementUI, { locale }) @@ -73,10 +73,10 @@ import SearchItem from '@/components/SearchArea/SearchItem' import AppContainer from '@/components/layout/AppContainer' -Vue.component('app-container', AppContainer) -Vue.component('normal-table', NormalTable) -Vue.component('search-area', SearchArea) -Vue.component('search-item', SearchItem) +Vue.component('AppContainer', AppContainer) +Vue.component('NormalTable', NormalTable) +Vue.component('SearchArea', SearchArea) +Vue.component('SearchItem', SearchItem) import resize from '@/directive/resize/resize' // resize directive Vue.directive('resize', resize) @@ -94,7 +94,6 @@ import axios from 'axios' import service from '@/utils/request' - import * as Cesium from 'mars3d-cesium' import 'mars3d/dist/mars3d.css' import 'mars3d-cesium/Build/Cesium/Widgets/widgets.css' diff --git a/src/styles/element-variables.scss b/src/styles/element-variables.scss index 823cd76..9e2a64c 100644 --- a/src/styles/element-variables.scss +++ b/src/styles/element-variables.scss @@ -1,6 +1,5 @@ @use "sass:math"; /* Element Chalk Variables */ - // Special comment for theme configurator // type|skipAutoTranslation|Category|Order // skipAutoTranslation 1 @@ -993,3 +992,7 @@ 'lg-and-down': (max-width: $--xl - 1), 'xl-only' : (min-width: $--xl), ); + +/* 改变 icon 字体路径变量，必需 */ +$--font-path: '~element-ui/lib/theme-chalk/fonts'; +@import "~element-ui/packages/theme-chalk/src/index"; diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue index c0d1cb5..476347a 100644 --- a/src/views/alarmStatics/components/alarmStaticsByDept.vue +++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue @@ -11,6 +11,7 @@ value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始时间" end-placeholder="结束时间" + :clearable="false" @change="fetchData" />
@@ -88,13 +89,13 @@ } }, created() { - this.fetchData() }, mounted() { const bodyWidth = this.$refs.alarmStaticByDept.$el.clientWidth if (bodyWidth < 566) { this.timeButtonSize = 'small' } + this.$refs.timeButtons.initTime() }, methods: { // 时间切换 diff --git a/src/views/dataView/components/alarmAnalysis.vue b/src/views/dataView/components/alarmAnalysis.vue index 28aa602..3ac21d8 100644 --- a/src/views/dataView/components/alarmAnalysis.vue +++ b/src/views/dataView/components/alarmAnalysis.vue @@ -97,13 +97,11 @@ }, // 处理时间 handleDateTime() { - if (this.timeRange && this.timeRange.length > 0) { - this.listQuery.beginTime = this.timeRange[0] - this.listQuery.endTime = this.timeRange[1] - } else { - this.listQuery.beginTime = '' - this.listQuery.endTime = '' + if (!this.timeRange) { + this.timeRange = getSearchLastWeekTime() } + this.listQuery.beginTime = this.timeRange[0] + this.listQuery.endTime = this.timeRange[1] } } } diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue index 2134258..fc61332 100644 --- a/src/views/deviceManage/listDevice.vue +++ b/src/views/deviceManage/listDevice.vue @@ -30,42 +30,47 @@ -
- - -
- 数据列表 -
- - - - 导出记录 + + + + + @@ -214,6 +205,10 @@ { value: '1', name: '在线' }, { value: '0', name: '离线' } ], // 在线情况 + options: { + needIndex: true, // 是否需要序号列 + border: true // 是否需要上方边框 + }, wellShow: false } }, @@ -385,17 +380,14 @@ this.wellShow = true this.$refs.wellInfo.initDialog(row.wellId) }, - indexMethod(index) { - return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1 - }, - // 改变页容量 - handleSizeChange(val) { - this.listQuery.limit = val - this.fetchData() - }, - // 改变当前页 - handleCurrentChange(val) { - this.listQuery.offset = val + // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写 + changePage(val) { + if (val && val.size) { + this.listQuery.limit = val.size + } + if (val && val.page) { + this.listQuery.offset = val.page + } this.fetchData() }, // 多选触发方法 @@ -407,30 +399,5 @@ diff --git a/src/views/overview/overviewAmap.vue b/src/views/overview/overviewAmap.vue index 133de90..cd3a3b9 100644 --- a/src/views/overview/overviewAmap.vue +++ b/src/views/overview/overviewAmap.vue @@ -675,6 +675,9 @@ setCenter(position) { const { searchResultOffset, searchResultIcon, searchResultSize } = this this.center = position + if (this.tempMarker) { + this.map.remove(this.tempMarker) + } const icon = new window.AMap.Icon({ size: toSize(searchResultSize), // 图标尺寸 image: searchResultIcon, // Icon的图像 @@ -691,6 +694,9 @@ // 坐标拾取， 在地图上绘点 pickerPosition() { const { searchResultOffset, searchResultIcon, searchResultSize, center } = this + if (this.tempMarker) { + this.map.remove(this.tempMarker) + } const icon = new window.AMap.Icon({ size: toSize(searchResultSize), // 图标尺寸 image: searchResultIcon, // Icon的图像