diff --git a/mock/system/user.js b/mock/system/user.js index abd593d..747ef61 100644 --- a/mock/system/user.js +++ b/mock/system/user.js @@ -195,6 +195,7 @@ { 'code': 'well_bfcf', 'icon': '', 'id': '1138616121200189442', 'ismenu': '0', 'levels': 11, 'name': '布防撤防', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '04', 'url': '/well/bfcf' }, { 'code': 'alarms_by_well', 'icon': '', 'id': '1138702100355313665', 'ismenu': '0', 'levels': 11, 'name': '获取某闸井告警信息', 'num': 0, 'parentId': '1138701347507105794', 'resourceType': '04', 'url': '/overview/alarmsByWell' }, { 'code': 'alarm_statics', 'icon': '', 'id': '1138703677266817025', 'ismenu': '1', 'levels': 11, 'name': '报警统计', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '03', 'url': '/alarm/statics' }, + { 'code': 'alarm_statics', 'icon': '', 'id': '1138703677266817005', 'ismenu': '1', 'levels': 11, 'name': '数据概览', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '03', 'url': '/dataView/statics' }, { 'code': 'alarm_static_by_dept', 'icon': '', 'id': '1139376799592734721', 'ismenu': '0', 'levels': 11, 'name': '根据部门统计报警', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/statics/alarmsByDept' }, { 'code': 'concentrator_add', 'icon': '', 'id': '1138693099123077122', 'ismenu': '0', 'levels': 11, 'name': '新增集中器', 'num': 0, 'parentId': '1138692702442582017', 'resourceType': '04', 'url': '/concentrator/add' }, { 'code': 'job_export', 'icon': '', 'id': '1138699769542832130', 'ismenu': '0', 'levels': 11, 'name': '导出工单列表', 'num': 0, 'parentId': '1138699051712868353', 'resourceType': '04', 'url': '/job/export' }, diff --git a/mock/system/user.js b/mock/system/user.js index abd593d..747ef61 100644 --- a/mock/system/user.js +++ b/mock/system/user.js @@ -195,6 +195,7 @@ { 'code': 'well_bfcf', 'icon': '', 'id': '1138616121200189442', 'ismenu': '0', 'levels': 11, 'name': '布防撤防', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '04', 'url': '/well/bfcf' }, { 'code': 'alarms_by_well', 'icon': '', 'id': '1138702100355313665', 'ismenu': '0', 'levels': 11, 'name': '获取某闸井告警信息', 'num': 0, 'parentId': '1138701347507105794', 'resourceType': '04', 'url': '/overview/alarmsByWell' }, { 'code': 'alarm_statics', 'icon': '', 'id': '1138703677266817025', 'ismenu': '1', 'levels': 11, 'name': '报警统计', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '03', 'url': '/alarm/statics' }, + { 'code': 'alarm_statics', 'icon': '', 'id': '1138703677266817005', 'ismenu': '1', 'levels': 11, 'name': '数据概览', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '03', 'url': '/dataView/statics' }, { 'code': 'alarm_static_by_dept', 'icon': '', 'id': '1139376799592734721', 'ismenu': '0', 'levels': 11, 'name': '根据部门统计报警', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/statics/alarmsByDept' }, { 'code': 'concentrator_add', 'icon': '', 'id': '1138693099123077122', 'ismenu': '0', 'levels': 11, 'name': '新增集中器', 'num': 0, 'parentId': '1138692702442582017', 'resourceType': '04', 'url': '/concentrator/add' }, { 'code': 'job_export', 'icon': '', 'id': '1138699769542832130', 'ismenu': '0', 'levels': 11, 'name': '导出工单列表', 'num': 0, 'parentId': '1138699051712868353', 'resourceType': '04', 'url': '/job/export' }, diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue index 07ee165..b9e5ee6 100644 --- a/src/components/BigData/Card/index.vue +++ b/src/components/BigData/Card/index.vue @@ -8,8 +8,9 @@
{{ title }}
-
- {{ context }} +
+ {{ context }} + {{ flags }}
@@ -24,6 +25,10 @@ type: String, default: '标题' }, + flags: { + type: String, + default: '单位' + }, subtitle: { type: String, default: '' diff --git a/mock/system/user.js b/mock/system/user.js index abd593d..747ef61 100644 --- a/mock/system/user.js +++ b/mock/system/user.js @@ -195,6 +195,7 @@ { 'code': 'well_bfcf', 'icon': '', 'id': '1138616121200189442', 'ismenu': '0', 'levels': 11, 'name': '布防撤防', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '04', 'url': '/well/bfcf' }, { 'code': 'alarms_by_well', 'icon': '', 'id': '1138702100355313665', 'ismenu': '0', 'levels': 11, 'name': '获取某闸井告警信息', 'num': 0, 'parentId': '1138701347507105794', 'resourceType': '04', 'url': '/overview/alarmsByWell' }, { 'code': 'alarm_statics', 'icon': '', 'id': '1138703677266817025', 'ismenu': '1', 'levels': 11, 'name': '报警统计', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '03', 'url': '/alarm/statics' }, + { 'code': 'alarm_statics', 'icon': '', 'id': '1138703677266817005', 'ismenu': '1', 'levels': 11, 'name': '数据概览', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '03', 'url': '/dataView/statics' }, { 'code': 'alarm_static_by_dept', 'icon': '', 'id': '1139376799592734721', 'ismenu': '0', 'levels': 11, 'name': '根据部门统计报警', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/statics/alarmsByDept' }, { 'code': 'concentrator_add', 'icon': '', 'id': '1138693099123077122', 'ismenu': '0', 'levels': 11, 'name': '新增集中器', 'num': 0, 'parentId': '1138692702442582017', 'resourceType': '04', 'url': '/concentrator/add' }, { 'code': 'job_export', 'icon': '', 'id': '1138699769542832130', 'ismenu': '0', 'levels': 11, 'name': '导出工单列表', 'num': 0, 'parentId': '1138699051712868353', 'resourceType': '04', 'url': '/job/export' }, diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue index 07ee165..b9e5ee6 100644 --- a/src/components/BigData/Card/index.vue +++ b/src/components/BigData/Card/index.vue @@ -8,8 +8,9 @@
{{ title }}
-
- {{ context }} +
+ {{ context }} + {{ flags }}
@@ -24,6 +25,10 @@ type: String, default: '标题' }, + flags: { + type: String, + default: '单位' + }, subtitle: { type: String, default: '' diff --git a/src/components/Hamburger/index.vue b/src/components/Hamburger/index.vue index 7c358e2..6a9236c 100644 --- a/src/components/Hamburger/index.vue +++ b/src/components/Hamburger/index.vue @@ -36,6 +36,7 @@ vertical-align: middle; width: 20px; height: 20px; + cursor: pointer; } .hamburger.is-active { diff --git a/mock/system/user.js b/mock/system/user.js index abd593d..747ef61 100644 --- a/mock/system/user.js +++ b/mock/system/user.js @@ -195,6 +195,7 @@ { 'code': 'well_bfcf', 'icon': '', 'id': '1138616121200189442', 'ismenu': '0', 'levels': 11, 'name': '布防撤防', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '04', 'url': '/well/bfcf' }, { 'code': 'alarms_by_well', 'icon': '', 'id': '1138702100355313665', 'ismenu': '0', 'levels': 11, 'name': '获取某闸井告警信息', 'num': 0, 'parentId': '1138701347507105794', 'resourceType': '04', 'url': '/overview/alarmsByWell' }, { 'code': 'alarm_statics', 'icon': '', 'id': '1138703677266817025', 'ismenu': '1', 'levels': 11, 'name': '报警统计', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '03', 'url': '/alarm/statics' }, + { 'code': 'alarm_statics', 'icon': '', 'id': '1138703677266817005', 'ismenu': '1', 'levels': 11, 'name': '数据概览', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '03', 'url': '/dataView/statics' }, { 'code': 'alarm_static_by_dept', 'icon': '', 'id': '1139376799592734721', 'ismenu': '0', 'levels': 11, 'name': '根据部门统计报警', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/statics/alarmsByDept' }, { 'code': 'concentrator_add', 'icon': '', 'id': '1138693099123077122', 'ismenu': '0', 'levels': 11, 'name': '新增集中器', 'num': 0, 'parentId': '1138692702442582017', 'resourceType': '04', 'url': '/concentrator/add' }, { 'code': 'job_export', 'icon': '', 'id': '1138699769542832130', 'ismenu': '0', 'levels': 11, 'name': '导出工单列表', 'num': 0, 'parentId': '1138699051712868353', 'resourceType': '04', 'url': '/job/export' }, diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue index 07ee165..b9e5ee6 100644 --- a/src/components/BigData/Card/index.vue +++ b/src/components/BigData/Card/index.vue @@ -8,8 +8,9 @@
{{ title }}
-
- {{ context }} +
+ {{ context }} + {{ flags }}
@@ -24,6 +25,10 @@ type: String, default: '标题' }, + flags: { + type: String, + default: '单位' + }, subtitle: { type: String, default: '' diff --git a/src/components/Hamburger/index.vue b/src/components/Hamburger/index.vue index 7c358e2..6a9236c 100644 --- a/src/components/Hamburger/index.vue +++ b/src/components/Hamburger/index.vue @@ -36,6 +36,7 @@ vertical-align: middle; width: 20px; height: 20px; + cursor: pointer; } .hamburger.is-active { diff --git a/src/router/modules/well.js b/src/router/modules/well.js index b5b6e82..a92ff3c 100644 --- a/src/router/modules/well.js +++ b/src/router/modules/well.js @@ -179,16 +179,22 @@ }, children: [ { + path: '/dataView', + name: 'DataView', + component: () => import('@/views/dataView/dataView'), + meta: { title: '数据概览', icon: 'icon-config', permission: ['/dataView/statics'] } + }, + { path: '/dataManage', name: 'DataManage', component: () => import('@/views/dataManage/dataManage'), - meta: { title: '历史数据', icon: 'icon-config', permission: ['/datalist'] } + meta: { title: '数据列表', icon: 'icon-config', permission: ['/datalist'] } }, { path: '/dataAnalyse', name: 'DataAnalyse', component: () => import('@/views/dataStatics/dataStatics'), - meta: { title: '数据分析', icon: 'icon-config', permission: ['/dataAnalyse'] } + meta: { title: '数据曲线', icon: 'icon-config', permission: ['/dataAnalyse'] } }, { path: '/deviceStatics', diff --git a/mock/system/user.js b/mock/system/user.js index abd593d..747ef61 100644 --- a/mock/system/user.js +++ b/mock/system/user.js @@ -195,6 +195,7 @@ { 'code': 'well_bfcf', 'icon': '', 'id': '1138616121200189442', 'ismenu': '0', 'levels': 11, 'name': '布防撤防', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '04', 'url': '/well/bfcf' }, { 'code': 'alarms_by_well', 'icon': '', 'id': '1138702100355313665', 'ismenu': '0', 'levels': 11, 'name': '获取某闸井告警信息', 'num': 0, 'parentId': '1138701347507105794', 'resourceType': '04', 'url': '/overview/alarmsByWell' }, { 'code': 'alarm_statics', 'icon': '', 'id': '1138703677266817025', 'ismenu': '1', 'levels': 11, 'name': '报警统计', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '03', 'url': '/alarm/statics' }, + { 'code': 'alarm_statics', 'icon': '', 'id': '1138703677266817005', 'ismenu': '1', 'levels': 11, 'name': '数据概览', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '03', 'url': '/dataView/statics' }, { 'code': 'alarm_static_by_dept', 'icon': '', 'id': '1139376799592734721', 'ismenu': '0', 'levels': 11, 'name': '根据部门统计报警', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/statics/alarmsByDept' }, { 'code': 'concentrator_add', 'icon': '', 'id': '1138693099123077122', 'ismenu': '0', 'levels': 11, 'name': '新增集中器', 'num': 0, 'parentId': '1138692702442582017', 'resourceType': '04', 'url': '/concentrator/add' }, { 'code': 'job_export', 'icon': '', 'id': '1138699769542832130', 'ismenu': '0', 'levels': 11, 'name': '导出工单列表', 'num': 0, 'parentId': '1138699051712868353', 'resourceType': '04', 'url': '/job/export' }, diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue index 07ee165..b9e5ee6 100644 --- a/src/components/BigData/Card/index.vue +++ b/src/components/BigData/Card/index.vue @@ -8,8 +8,9 @@
{{ title }}
-
- {{ context }} +
+ {{ context }} + {{ flags }}
@@ -24,6 +25,10 @@ type: String, default: '标题' }, + flags: { + type: String, + default: '单位' + }, subtitle: { type: String, default: '' diff --git a/src/components/Hamburger/index.vue b/src/components/Hamburger/index.vue index 7c358e2..6a9236c 100644 --- a/src/components/Hamburger/index.vue +++ b/src/components/Hamburger/index.vue @@ -36,6 +36,7 @@ vertical-align: middle; width: 20px; height: 20px; + cursor: pointer; } .hamburger.is-active { diff --git a/src/router/modules/well.js b/src/router/modules/well.js index b5b6e82..a92ff3c 100644 --- a/src/router/modules/well.js +++ b/src/router/modules/well.js @@ -179,16 +179,22 @@ }, children: [ { + path: '/dataView', + name: 'DataView', + component: () => import('@/views/dataView/dataView'), + meta: { title: '数据概览', icon: 'icon-config', permission: ['/dataView/statics'] } + }, + { path: '/dataManage', name: 'DataManage', component: () => import('@/views/dataManage/dataManage'), - meta: { title: '历史数据', icon: 'icon-config', permission: ['/datalist'] } + meta: { title: '数据列表', icon: 'icon-config', permission: ['/datalist'] } }, { path: '/dataAnalyse', name: 'DataAnalyse', component: () => import('@/views/dataStatics/dataStatics'), - meta: { title: '数据分析', icon: 'icon-config', permission: ['/dataAnalyse'] } + meta: { title: '数据曲线', icon: 'icon-config', permission: ['/dataAnalyse'] } }, { path: '/deviceStatics', diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js index 856b38a..421e31b 100644 --- a/src/store/modules/settings.js +++ b/src/store/modules/settings.js @@ -1,12 +1,13 @@ import variables from '@/styles/element-variables.scss' import defaultSettings from '@/settings' -const { showSettings, tagsView, breadcrumb, fixedHeader, sidebarLogo } = defaultSettings +// const { showSettings, tagsView, breadcrumb, fixedHeader, sidebarLogo } = defaultSettings +const { showSettings, tagsView, fixedHeader, sidebarLogo } = defaultSettings const state = { theme: variables.theme, // 主题 showSettings: showSettings, // 是否显示设置按钮 - breadcrumb: breadcrumb, // 是否显示面包屑 + breadcrumb: true, // 是否显示面包屑 tagsView: tagsView, // 是否显示tagsView fixedHeader: fixedHeader, // 是否固定面包屑 sidebarLogo: sidebarLogo, // 是否显示logo diff --git a/mock/system/user.js b/mock/system/user.js index abd593d..747ef61 100644 --- a/mock/system/user.js +++ b/mock/system/user.js @@ -195,6 +195,7 @@ { 'code': 'well_bfcf', 'icon': '', 'id': '1138616121200189442', 'ismenu': '0', 'levels': 11, 'name': '布防撤防', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '04', 'url': '/well/bfcf' }, { 'code': 'alarms_by_well', 'icon': '', 'id': '1138702100355313665', 'ismenu': '0', 'levels': 11, 'name': '获取某闸井告警信息', 'num': 0, 'parentId': '1138701347507105794', 'resourceType': '04', 'url': '/overview/alarmsByWell' }, { 'code': 'alarm_statics', 'icon': '', 'id': '1138703677266817025', 'ismenu': '1', 'levels': 11, 'name': '报警统计', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '03', 'url': '/alarm/statics' }, + { 'code': 'alarm_statics', 'icon': '', 'id': '1138703677266817005', 'ismenu': '1', 'levels': 11, 'name': '数据概览', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '03', 'url': '/dataView/statics' }, { 'code': 'alarm_static_by_dept', 'icon': '', 'id': '1139376799592734721', 'ismenu': '0', 'levels': 11, 'name': '根据部门统计报警', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/statics/alarmsByDept' }, { 'code': 'concentrator_add', 'icon': '', 'id': '1138693099123077122', 'ismenu': '0', 'levels': 11, 'name': '新增集中器', 'num': 0, 'parentId': '1138692702442582017', 'resourceType': '04', 'url': '/concentrator/add' }, { 'code': 'job_export', 'icon': '', 'id': '1138699769542832130', 'ismenu': '0', 'levels': 11, 'name': '导出工单列表', 'num': 0, 'parentId': '1138699051712868353', 'resourceType': '04', 'url': '/job/export' }, diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue index 07ee165..b9e5ee6 100644 --- a/src/components/BigData/Card/index.vue +++ b/src/components/BigData/Card/index.vue @@ -8,8 +8,9 @@
{{ title }}
-
- {{ context }} +
+ {{ context }} + {{ flags }}
@@ -24,6 +25,10 @@ type: String, default: '标题' }, + flags: { + type: String, + default: '单位' + }, subtitle: { type: String, default: '' diff --git a/src/components/Hamburger/index.vue b/src/components/Hamburger/index.vue index 7c358e2..6a9236c 100644 --- a/src/components/Hamburger/index.vue +++ b/src/components/Hamburger/index.vue @@ -36,6 +36,7 @@ vertical-align: middle; width: 20px; height: 20px; + cursor: pointer; } .hamburger.is-active { diff --git a/src/router/modules/well.js b/src/router/modules/well.js index b5b6e82..a92ff3c 100644 --- a/src/router/modules/well.js +++ b/src/router/modules/well.js @@ -179,16 +179,22 @@ }, children: [ { + path: '/dataView', + name: 'DataView', + component: () => import('@/views/dataView/dataView'), + meta: { title: '数据概览', icon: 'icon-config', permission: ['/dataView/statics'] } + }, + { path: '/dataManage', name: 'DataManage', component: () => import('@/views/dataManage/dataManage'), - meta: { title: '历史数据', icon: 'icon-config', permission: ['/datalist'] } + meta: { title: '数据列表', icon: 'icon-config', permission: ['/datalist'] } }, { path: '/dataAnalyse', name: 'DataAnalyse', component: () => import('@/views/dataStatics/dataStatics'), - meta: { title: '数据分析', icon: 'icon-config', permission: ['/dataAnalyse'] } + meta: { title: '数据曲线', icon: 'icon-config', permission: ['/dataAnalyse'] } }, { path: '/deviceStatics', diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js index 856b38a..421e31b 100644 --- a/src/store/modules/settings.js +++ b/src/store/modules/settings.js @@ -1,12 +1,13 @@ import variables from '@/styles/element-variables.scss' import defaultSettings from '@/settings' -const { showSettings, tagsView, breadcrumb, fixedHeader, sidebarLogo } = defaultSettings +// const { showSettings, tagsView, breadcrumb, fixedHeader, sidebarLogo } = defaultSettings +const { showSettings, tagsView, fixedHeader, sidebarLogo } = defaultSettings const state = { theme: variables.theme, // 主题 showSettings: showSettings, // 是否显示设置按钮 - breadcrumb: breadcrumb, // 是否显示面包屑 + breadcrumb: true, // 是否显示面包屑 tagsView: tagsView, // 是否显示tagsView fixedHeader: fixedHeader, // 是否固定面包屑 sidebarLogo: sidebarLogo, // 是否显示logo diff --git a/src/views/dataView/components/alarmStatus.vue b/src/views/dataView/components/alarmStatus.vue new file mode 100644 index 0000000..94f7410 --- /dev/null +++ b/src/views/dataView/components/alarmStatus.vue @@ -0,0 +1,264 @@ + + + + + diff --git a/mock/system/user.js b/mock/system/user.js index abd593d..747ef61 100644 --- a/mock/system/user.js +++ b/mock/system/user.js @@ -195,6 +195,7 @@ { 'code': 'well_bfcf', 'icon': '', 'id': '1138616121200189442', 'ismenu': '0', 'levels': 11, 'name': '布防撤防', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '04', 'url': '/well/bfcf' }, { 'code': 'alarms_by_well', 'icon': '', 'id': '1138702100355313665', 'ismenu': '0', 'levels': 11, 'name': '获取某闸井告警信息', 'num': 0, 'parentId': '1138701347507105794', 'resourceType': '04', 'url': '/overview/alarmsByWell' }, { 'code': 'alarm_statics', 'icon': '', 'id': '1138703677266817025', 'ismenu': '1', 'levels': 11, 'name': '报警统计', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '03', 'url': '/alarm/statics' }, + { 'code': 'alarm_statics', 'icon': '', 'id': '1138703677266817005', 'ismenu': '1', 'levels': 11, 'name': '数据概览', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '03', 'url': '/dataView/statics' }, { 'code': 'alarm_static_by_dept', 'icon': '', 'id': '1139376799592734721', 'ismenu': '0', 'levels': 11, 'name': '根据部门统计报警', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/statics/alarmsByDept' }, { 'code': 'concentrator_add', 'icon': '', 'id': '1138693099123077122', 'ismenu': '0', 'levels': 11, 'name': '新增集中器', 'num': 0, 'parentId': '1138692702442582017', 'resourceType': '04', 'url': '/concentrator/add' }, { 'code': 'job_export', 'icon': '', 'id': '1138699769542832130', 'ismenu': '0', 'levels': 11, 'name': '导出工单列表', 'num': 0, 'parentId': '1138699051712868353', 'resourceType': '04', 'url': '/job/export' }, diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue index 07ee165..b9e5ee6 100644 --- a/src/components/BigData/Card/index.vue +++ b/src/components/BigData/Card/index.vue @@ -8,8 +8,9 @@
{{ title }}
-
- {{ context }} +
+ {{ context }} + {{ flags }}
@@ -24,6 +25,10 @@ type: String, default: '标题' }, + flags: { + type: String, + default: '单位' + }, subtitle: { type: String, default: '' diff --git a/src/components/Hamburger/index.vue b/src/components/Hamburger/index.vue index 7c358e2..6a9236c 100644 --- a/src/components/Hamburger/index.vue +++ b/src/components/Hamburger/index.vue @@ -36,6 +36,7 @@ vertical-align: middle; width: 20px; height: 20px; + cursor: pointer; } .hamburger.is-active { diff --git a/src/router/modules/well.js b/src/router/modules/well.js index b5b6e82..a92ff3c 100644 --- a/src/router/modules/well.js +++ b/src/router/modules/well.js @@ -179,16 +179,22 @@ }, children: [ { + path: '/dataView', + name: 'DataView', + component: () => import('@/views/dataView/dataView'), + meta: { title: '数据概览', icon: 'icon-config', permission: ['/dataView/statics'] } + }, + { path: '/dataManage', name: 'DataManage', component: () => import('@/views/dataManage/dataManage'), - meta: { title: '历史数据', icon: 'icon-config', permission: ['/datalist'] } + meta: { title: '数据列表', icon: 'icon-config', permission: ['/datalist'] } }, { path: '/dataAnalyse', name: 'DataAnalyse', component: () => import('@/views/dataStatics/dataStatics'), - meta: { title: '数据分析', icon: 'icon-config', permission: ['/dataAnalyse'] } + meta: { title: '数据曲线', icon: 'icon-config', permission: ['/dataAnalyse'] } }, { path: '/deviceStatics', diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js index 856b38a..421e31b 100644 --- a/src/store/modules/settings.js +++ b/src/store/modules/settings.js @@ -1,12 +1,13 @@ import variables from '@/styles/element-variables.scss' import defaultSettings from '@/settings' -const { showSettings, tagsView, breadcrumb, fixedHeader, sidebarLogo } = defaultSettings +// const { showSettings, tagsView, breadcrumb, fixedHeader, sidebarLogo } = defaultSettings +const { showSettings, tagsView, fixedHeader, sidebarLogo } = defaultSettings const state = { theme: variables.theme, // 主题 showSettings: showSettings, // 是否显示设置按钮 - breadcrumb: breadcrumb, // 是否显示面包屑 + breadcrumb: true, // 是否显示面包屑 tagsView: tagsView, // 是否显示tagsView fixedHeader: fixedHeader, // 是否固定面包屑 sidebarLogo: sidebarLogo, // 是否显示logo diff --git a/src/views/dataView/components/alarmStatus.vue b/src/views/dataView/components/alarmStatus.vue new file mode 100644 index 0000000..94f7410 --- /dev/null +++ b/src/views/dataView/components/alarmStatus.vue @@ -0,0 +1,264 @@ + + + + + diff --git a/src/views/dataView/components/alarmView.vue b/src/views/dataView/components/alarmView.vue new file mode 100644 index 0000000..60650e9 --- /dev/null +++ b/src/views/dataView/components/alarmView.vue @@ -0,0 +1,106 @@ + + + + + diff --git a/mock/system/user.js b/mock/system/user.js index abd593d..747ef61 100644 --- a/mock/system/user.js +++ b/mock/system/user.js @@ -195,6 +195,7 @@ { 'code': 'well_bfcf', 'icon': '', 'id': '1138616121200189442', 'ismenu': '0', 'levels': 11, 'name': '布防撤防', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '04', 'url': '/well/bfcf' }, { 'code': 'alarms_by_well', 'icon': '', 'id': '1138702100355313665', 'ismenu': '0', 'levels': 11, 'name': '获取某闸井告警信息', 'num': 0, 'parentId': '1138701347507105794', 'resourceType': '04', 'url': '/overview/alarmsByWell' }, { 'code': 'alarm_statics', 'icon': '', 'id': '1138703677266817025', 'ismenu': '1', 'levels': 11, 'name': '报警统计', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '03', 'url': '/alarm/statics' }, + { 'code': 'alarm_statics', 'icon': '', 'id': '1138703677266817005', 'ismenu': '1', 'levels': 11, 'name': '数据概览', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '03', 'url': '/dataView/statics' }, { 'code': 'alarm_static_by_dept', 'icon': '', 'id': '1139376799592734721', 'ismenu': '0', 'levels': 11, 'name': '根据部门统计报警', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/statics/alarmsByDept' }, { 'code': 'concentrator_add', 'icon': '', 'id': '1138693099123077122', 'ismenu': '0', 'levels': 11, 'name': '新增集中器', 'num': 0, 'parentId': '1138692702442582017', 'resourceType': '04', 'url': '/concentrator/add' }, { 'code': 'job_export', 'icon': '', 'id': '1138699769542832130', 'ismenu': '0', 'levels': 11, 'name': '导出工单列表', 'num': 0, 'parentId': '1138699051712868353', 'resourceType': '04', 'url': '/job/export' }, diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue index 07ee165..b9e5ee6 100644 --- a/src/components/BigData/Card/index.vue +++ b/src/components/BigData/Card/index.vue @@ -8,8 +8,9 @@
{{ title }}
-
- {{ context }} +
+ {{ context }} + {{ flags }}
@@ -24,6 +25,10 @@ type: String, default: '标题' }, + flags: { + type: String, + default: '单位' + }, subtitle: { type: String, default: '' diff --git a/src/components/Hamburger/index.vue b/src/components/Hamburger/index.vue index 7c358e2..6a9236c 100644 --- a/src/components/Hamburger/index.vue +++ b/src/components/Hamburger/index.vue @@ -36,6 +36,7 @@ vertical-align: middle; width: 20px; height: 20px; + cursor: pointer; } .hamburger.is-active { diff --git a/src/router/modules/well.js b/src/router/modules/well.js index b5b6e82..a92ff3c 100644 --- a/src/router/modules/well.js +++ b/src/router/modules/well.js @@ -179,16 +179,22 @@ }, children: [ { + path: '/dataView', + name: 'DataView', + component: () => import('@/views/dataView/dataView'), + meta: { title: '数据概览', icon: 'icon-config', permission: ['/dataView/statics'] } + }, + { path: '/dataManage', name: 'DataManage', component: () => import('@/views/dataManage/dataManage'), - meta: { title: '历史数据', icon: 'icon-config', permission: ['/datalist'] } + meta: { title: '数据列表', icon: 'icon-config', permission: ['/datalist'] } }, { path: '/dataAnalyse', name: 'DataAnalyse', component: () => import('@/views/dataStatics/dataStatics'), - meta: { title: '数据分析', icon: 'icon-config', permission: ['/dataAnalyse'] } + meta: { title: '数据曲线', icon: 'icon-config', permission: ['/dataAnalyse'] } }, { path: '/deviceStatics', diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js index 856b38a..421e31b 100644 --- a/src/store/modules/settings.js +++ b/src/store/modules/settings.js @@ -1,12 +1,13 @@ import variables from '@/styles/element-variables.scss' import defaultSettings from '@/settings' -const { showSettings, tagsView, breadcrumb, fixedHeader, sidebarLogo } = defaultSettings +// const { showSettings, tagsView, breadcrumb, fixedHeader, sidebarLogo } = defaultSettings +const { showSettings, tagsView, fixedHeader, sidebarLogo } = defaultSettings const state = { theme: variables.theme, // 主题 showSettings: showSettings, // 是否显示设置按钮 - breadcrumb: breadcrumb, // 是否显示面包屑 + breadcrumb: true, // 是否显示面包屑 tagsView: tagsView, // 是否显示tagsView fixedHeader: fixedHeader, // 是否固定面包屑 sidebarLogo: sidebarLogo, // 是否显示logo diff --git a/src/views/dataView/components/alarmStatus.vue b/src/views/dataView/components/alarmStatus.vue new file mode 100644 index 0000000..94f7410 --- /dev/null +++ b/src/views/dataView/components/alarmStatus.vue @@ -0,0 +1,264 @@ + + + + + diff --git a/src/views/dataView/components/alarmView.vue b/src/views/dataView/components/alarmView.vue new file mode 100644 index 0000000..60650e9 --- /dev/null +++ b/src/views/dataView/components/alarmView.vue @@ -0,0 +1,106 @@ + + + + + diff --git a/src/views/dataView/components/deviceCountView.vue b/src/views/dataView/components/deviceCountView.vue new file mode 100644 index 0000000..b657e8d --- /dev/null +++ b/src/views/dataView/components/deviceCountView.vue @@ -0,0 +1,119 @@ + + + + + diff --git a/mock/system/user.js b/mock/system/user.js index abd593d..747ef61 100644 --- a/mock/system/user.js +++ b/mock/system/user.js @@ -195,6 +195,7 @@ { 'code': 'well_bfcf', 'icon': '', 'id': '1138616121200189442', 'ismenu': '0', 'levels': 11, 'name': '布防撤防', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '04', 'url': '/well/bfcf' }, { 'code': 'alarms_by_well', 'icon': '', 'id': '1138702100355313665', 'ismenu': '0', 'levels': 11, 'name': '获取某闸井告警信息', 'num': 0, 'parentId': '1138701347507105794', 'resourceType': '04', 'url': '/overview/alarmsByWell' }, { 'code': 'alarm_statics', 'icon': '', 'id': '1138703677266817025', 'ismenu': '1', 'levels': 11, 'name': '报警统计', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '03', 'url': '/alarm/statics' }, + { 'code': 'alarm_statics', 'icon': '', 'id': '1138703677266817005', 'ismenu': '1', 'levels': 11, 'name': '数据概览', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '03', 'url': '/dataView/statics' }, { 'code': 'alarm_static_by_dept', 'icon': '', 'id': '1139376799592734721', 'ismenu': '0', 'levels': 11, 'name': '根据部门统计报警', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/statics/alarmsByDept' }, { 'code': 'concentrator_add', 'icon': '', 'id': '1138693099123077122', 'ismenu': '0', 'levels': 11, 'name': '新增集中器', 'num': 0, 'parentId': '1138692702442582017', 'resourceType': '04', 'url': '/concentrator/add' }, { 'code': 'job_export', 'icon': '', 'id': '1138699769542832130', 'ismenu': '0', 'levels': 11, 'name': '导出工单列表', 'num': 0, 'parentId': '1138699051712868353', 'resourceType': '04', 'url': '/job/export' }, diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue index 07ee165..b9e5ee6 100644 --- a/src/components/BigData/Card/index.vue +++ b/src/components/BigData/Card/index.vue @@ -8,8 +8,9 @@
{{ title }}
-
- {{ context }} +
+ {{ context }} + {{ flags }}
@@ -24,6 +25,10 @@ type: String, default: '标题' }, + flags: { + type: String, + default: '单位' + }, subtitle: { type: String, default: '' diff --git a/src/components/Hamburger/index.vue b/src/components/Hamburger/index.vue index 7c358e2..6a9236c 100644 --- a/src/components/Hamburger/index.vue +++ b/src/components/Hamburger/index.vue @@ -36,6 +36,7 @@ vertical-align: middle; width: 20px; height: 20px; + cursor: pointer; } .hamburger.is-active { diff --git a/src/router/modules/well.js b/src/router/modules/well.js index b5b6e82..a92ff3c 100644 --- a/src/router/modules/well.js +++ b/src/router/modules/well.js @@ -179,16 +179,22 @@ }, children: [ { + path: '/dataView', + name: 'DataView', + component: () => import('@/views/dataView/dataView'), + meta: { title: '数据概览', icon: 'icon-config', permission: ['/dataView/statics'] } + }, + { path: '/dataManage', name: 'DataManage', component: () => import('@/views/dataManage/dataManage'), - meta: { title: '历史数据', icon: 'icon-config', permission: ['/datalist'] } + meta: { title: '数据列表', icon: 'icon-config', permission: ['/datalist'] } }, { path: '/dataAnalyse', name: 'DataAnalyse', component: () => import('@/views/dataStatics/dataStatics'), - meta: { title: '数据分析', icon: 'icon-config', permission: ['/dataAnalyse'] } + meta: { title: '数据曲线', icon: 'icon-config', permission: ['/dataAnalyse'] } }, { path: '/deviceStatics', diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js index 856b38a..421e31b 100644 --- a/src/store/modules/settings.js +++ b/src/store/modules/settings.js @@ -1,12 +1,13 @@ import variables from '@/styles/element-variables.scss' import defaultSettings from '@/settings' -const { showSettings, tagsView, breadcrumb, fixedHeader, sidebarLogo } = defaultSettings +// const { showSettings, tagsView, breadcrumb, fixedHeader, sidebarLogo } = defaultSettings +const { showSettings, tagsView, fixedHeader, sidebarLogo } = defaultSettings const state = { theme: variables.theme, // 主题 showSettings: showSettings, // 是否显示设置按钮 - breadcrumb: breadcrumb, // 是否显示面包屑 + breadcrumb: true, // 是否显示面包屑 tagsView: tagsView, // 是否显示tagsView fixedHeader: fixedHeader, // 是否固定面包屑 sidebarLogo: sidebarLogo, // 是否显示logo diff --git a/src/views/dataView/components/alarmStatus.vue b/src/views/dataView/components/alarmStatus.vue new file mode 100644 index 0000000..94f7410 --- /dev/null +++ b/src/views/dataView/components/alarmStatus.vue @@ -0,0 +1,264 @@ + + + + + diff --git a/src/views/dataView/components/alarmView.vue b/src/views/dataView/components/alarmView.vue new file mode 100644 index 0000000..60650e9 --- /dev/null +++ b/src/views/dataView/components/alarmView.vue @@ -0,0 +1,106 @@ + + + + + diff --git a/src/views/dataView/components/deviceCountView.vue b/src/views/dataView/components/deviceCountView.vue new file mode 100644 index 0000000..b657e8d --- /dev/null +++ b/src/views/dataView/components/deviceCountView.vue @@ -0,0 +1,119 @@ + + + + + diff --git a/src/views/dataView/components/jobView.vue b/src/views/dataView/components/jobView.vue new file mode 100644 index 0000000..d0be0dd --- /dev/null +++ b/src/views/dataView/components/jobView.vue @@ -0,0 +1,92 @@ + + + + + diff --git a/mock/system/user.js b/mock/system/user.js index abd593d..747ef61 100644 --- a/mock/system/user.js +++ b/mock/system/user.js @@ -195,6 +195,7 @@ { 'code': 'well_bfcf', 'icon': '', 'id': '1138616121200189442', 'ismenu': '0', 'levels': 11, 'name': '布防撤防', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '04', 'url': '/well/bfcf' }, { 'code': 'alarms_by_well', 'icon': '', 'id': '1138702100355313665', 'ismenu': '0', 'levels': 11, 'name': '获取某闸井告警信息', 'num': 0, 'parentId': '1138701347507105794', 'resourceType': '04', 'url': '/overview/alarmsByWell' }, { 'code': 'alarm_statics', 'icon': '', 'id': '1138703677266817025', 'ismenu': '1', 'levels': 11, 'name': '报警统计', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '03', 'url': '/alarm/statics' }, + { 'code': 'alarm_statics', 'icon': '', 'id': '1138703677266817005', 'ismenu': '1', 'levels': 11, 'name': '数据概览', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '03', 'url': '/dataView/statics' }, { 'code': 'alarm_static_by_dept', 'icon': '', 'id': '1139376799592734721', 'ismenu': '0', 'levels': 11, 'name': '根据部门统计报警', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/statics/alarmsByDept' }, { 'code': 'concentrator_add', 'icon': '', 'id': '1138693099123077122', 'ismenu': '0', 'levels': 11, 'name': '新增集中器', 'num': 0, 'parentId': '1138692702442582017', 'resourceType': '04', 'url': '/concentrator/add' }, { 'code': 'job_export', 'icon': '', 'id': '1138699769542832130', 'ismenu': '0', 'levels': 11, 'name': '导出工单列表', 'num': 0, 'parentId': '1138699051712868353', 'resourceType': '04', 'url': '/job/export' }, diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue index 07ee165..b9e5ee6 100644 --- a/src/components/BigData/Card/index.vue +++ b/src/components/BigData/Card/index.vue @@ -8,8 +8,9 @@
{{ title }}
-
- {{ context }} +
+ {{ context }} + {{ flags }}
@@ -24,6 +25,10 @@ type: String, default: '标题' }, + flags: { + type: String, + default: '单位' + }, subtitle: { type: String, default: '' diff --git a/src/components/Hamburger/index.vue b/src/components/Hamburger/index.vue index 7c358e2..6a9236c 100644 --- a/src/components/Hamburger/index.vue +++ b/src/components/Hamburger/index.vue @@ -36,6 +36,7 @@ vertical-align: middle; width: 20px; height: 20px; + cursor: pointer; } .hamburger.is-active { diff --git a/src/router/modules/well.js b/src/router/modules/well.js index b5b6e82..a92ff3c 100644 --- a/src/router/modules/well.js +++ b/src/router/modules/well.js @@ -179,16 +179,22 @@ }, children: [ { + path: '/dataView', + name: 'DataView', + component: () => import('@/views/dataView/dataView'), + meta: { title: '数据概览', icon: 'icon-config', permission: ['/dataView/statics'] } + }, + { path: '/dataManage', name: 'DataManage', component: () => import('@/views/dataManage/dataManage'), - meta: { title: '历史数据', icon: 'icon-config', permission: ['/datalist'] } + meta: { title: '数据列表', icon: 'icon-config', permission: ['/datalist'] } }, { path: '/dataAnalyse', name: 'DataAnalyse', component: () => import('@/views/dataStatics/dataStatics'), - meta: { title: '数据分析', icon: 'icon-config', permission: ['/dataAnalyse'] } + meta: { title: '数据曲线', icon: 'icon-config', permission: ['/dataAnalyse'] } }, { path: '/deviceStatics', diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js index 856b38a..421e31b 100644 --- a/src/store/modules/settings.js +++ b/src/store/modules/settings.js @@ -1,12 +1,13 @@ import variables from '@/styles/element-variables.scss' import defaultSettings from '@/settings' -const { showSettings, tagsView, breadcrumb, fixedHeader, sidebarLogo } = defaultSettings +// const { showSettings, tagsView, breadcrumb, fixedHeader, sidebarLogo } = defaultSettings +const { showSettings, tagsView, fixedHeader, sidebarLogo } = defaultSettings const state = { theme: variables.theme, // 主题 showSettings: showSettings, // 是否显示设置按钮 - breadcrumb: breadcrumb, // 是否显示面包屑 + breadcrumb: true, // 是否显示面包屑 tagsView: tagsView, // 是否显示tagsView fixedHeader: fixedHeader, // 是否固定面包屑 sidebarLogo: sidebarLogo, // 是否显示logo diff --git a/src/views/dataView/components/alarmStatus.vue b/src/views/dataView/components/alarmStatus.vue new file mode 100644 index 0000000..94f7410 --- /dev/null +++ b/src/views/dataView/components/alarmStatus.vue @@ -0,0 +1,264 @@ + + + + + diff --git a/src/views/dataView/components/alarmView.vue b/src/views/dataView/components/alarmView.vue new file mode 100644 index 0000000..60650e9 --- /dev/null +++ b/src/views/dataView/components/alarmView.vue @@ -0,0 +1,106 @@ + + + + + diff --git a/src/views/dataView/components/deviceCountView.vue b/src/views/dataView/components/deviceCountView.vue new file mode 100644 index 0000000..b657e8d --- /dev/null +++ b/src/views/dataView/components/deviceCountView.vue @@ -0,0 +1,119 @@ + + + + + diff --git a/src/views/dataView/components/jobView.vue b/src/views/dataView/components/jobView.vue new file mode 100644 index 0000000..d0be0dd --- /dev/null +++ b/src/views/dataView/components/jobView.vue @@ -0,0 +1,92 @@ + + + + + diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue new file mode 100644 index 0000000..9172cc9 --- /dev/null +++ b/src/views/dataView/components/panelGroup.vue @@ -0,0 +1,250 @@ + + + + + diff --git a/mock/system/user.js b/mock/system/user.js index abd593d..747ef61 100644 --- a/mock/system/user.js +++ b/mock/system/user.js @@ -195,6 +195,7 @@ { 'code': 'well_bfcf', 'icon': '', 'id': '1138616121200189442', 'ismenu': '0', 'levels': 11, 'name': '布防撤防', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '04', 'url': '/well/bfcf' }, { 'code': 'alarms_by_well', 'icon': '', 'id': '1138702100355313665', 'ismenu': '0', 'levels': 11, 'name': '获取某闸井告警信息', 'num': 0, 'parentId': '1138701347507105794', 'resourceType': '04', 'url': '/overview/alarmsByWell' }, { 'code': 'alarm_statics', 'icon': '', 'id': '1138703677266817025', 'ismenu': '1', 'levels': 11, 'name': '报警统计', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '03', 'url': '/alarm/statics' }, + { 'code': 'alarm_statics', 'icon': '', 'id': '1138703677266817005', 'ismenu': '1', 'levels': 11, 'name': '数据概览', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '03', 'url': '/dataView/statics' }, { 'code': 'alarm_static_by_dept', 'icon': '', 'id': '1139376799592734721', 'ismenu': '0', 'levels': 11, 'name': '根据部门统计报警', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/statics/alarmsByDept' }, { 'code': 'concentrator_add', 'icon': '', 'id': '1138693099123077122', 'ismenu': '0', 'levels': 11, 'name': '新增集中器', 'num': 0, 'parentId': '1138692702442582017', 'resourceType': '04', 'url': '/concentrator/add' }, { 'code': 'job_export', 'icon': '', 'id': '1138699769542832130', 'ismenu': '0', 'levels': 11, 'name': '导出工单列表', 'num': 0, 'parentId': '1138699051712868353', 'resourceType': '04', 'url': '/job/export' }, diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue index 07ee165..b9e5ee6 100644 --- a/src/components/BigData/Card/index.vue +++ b/src/components/BigData/Card/index.vue @@ -8,8 +8,9 @@
{{ title }}
-
- {{ context }} +
+ {{ context }} + {{ flags }}
@@ -24,6 +25,10 @@ type: String, default: '标题' }, + flags: { + type: String, + default: '单位' + }, subtitle: { type: String, default: '' diff --git a/src/components/Hamburger/index.vue b/src/components/Hamburger/index.vue index 7c358e2..6a9236c 100644 --- a/src/components/Hamburger/index.vue +++ b/src/components/Hamburger/index.vue @@ -36,6 +36,7 @@ vertical-align: middle; width: 20px; height: 20px; + cursor: pointer; } .hamburger.is-active { diff --git a/src/router/modules/well.js b/src/router/modules/well.js index b5b6e82..a92ff3c 100644 --- a/src/router/modules/well.js +++ b/src/router/modules/well.js @@ -179,16 +179,22 @@ }, children: [ { + path: '/dataView', + name: 'DataView', + component: () => import('@/views/dataView/dataView'), + meta: { title: '数据概览', icon: 'icon-config', permission: ['/dataView/statics'] } + }, + { path: '/dataManage', name: 'DataManage', component: () => import('@/views/dataManage/dataManage'), - meta: { title: '历史数据', icon: 'icon-config', permission: ['/datalist'] } + meta: { title: '数据列表', icon: 'icon-config', permission: ['/datalist'] } }, { path: '/dataAnalyse', name: 'DataAnalyse', component: () => import('@/views/dataStatics/dataStatics'), - meta: { title: '数据分析', icon: 'icon-config', permission: ['/dataAnalyse'] } + meta: { title: '数据曲线', icon: 'icon-config', permission: ['/dataAnalyse'] } }, { path: '/deviceStatics', diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js index 856b38a..421e31b 100644 --- a/src/store/modules/settings.js +++ b/src/store/modules/settings.js @@ -1,12 +1,13 @@ import variables from '@/styles/element-variables.scss' import defaultSettings from '@/settings' -const { showSettings, tagsView, breadcrumb, fixedHeader, sidebarLogo } = defaultSettings +// const { showSettings, tagsView, breadcrumb, fixedHeader, sidebarLogo } = defaultSettings +const { showSettings, tagsView, fixedHeader, sidebarLogo } = defaultSettings const state = { theme: variables.theme, // 主题 showSettings: showSettings, // 是否显示设置按钮 - breadcrumb: breadcrumb, // 是否显示面包屑 + breadcrumb: true, // 是否显示面包屑 tagsView: tagsView, // 是否显示tagsView fixedHeader: fixedHeader, // 是否固定面包屑 sidebarLogo: sidebarLogo, // 是否显示logo diff --git a/src/views/dataView/components/alarmStatus.vue b/src/views/dataView/components/alarmStatus.vue new file mode 100644 index 0000000..94f7410 --- /dev/null +++ b/src/views/dataView/components/alarmStatus.vue @@ -0,0 +1,264 @@ + + + + + diff --git a/src/views/dataView/components/alarmView.vue b/src/views/dataView/components/alarmView.vue new file mode 100644 index 0000000..60650e9 --- /dev/null +++ b/src/views/dataView/components/alarmView.vue @@ -0,0 +1,106 @@ + + + + + diff --git a/src/views/dataView/components/deviceCountView.vue b/src/views/dataView/components/deviceCountView.vue new file mode 100644 index 0000000..b657e8d --- /dev/null +++ b/src/views/dataView/components/deviceCountView.vue @@ -0,0 +1,119 @@ + + + + + diff --git a/src/views/dataView/components/jobView.vue b/src/views/dataView/components/jobView.vue new file mode 100644 index 0000000..d0be0dd --- /dev/null +++ b/src/views/dataView/components/jobView.vue @@ -0,0 +1,92 @@ + + + + + diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue new file mode 100644 index 0000000..9172cc9 --- /dev/null +++ b/src/views/dataView/components/panelGroup.vue @@ -0,0 +1,250 @@ + + + + + diff --git a/src/views/dataView/components/wellCountView.vue b/src/views/dataView/components/wellCountView.vue new file mode 100644 index 0000000..5d87b28 --- /dev/null +++ b/src/views/dataView/components/wellCountView.vue @@ -0,0 +1,119 @@ + + + + + diff --git a/mock/system/user.js b/mock/system/user.js index abd593d..747ef61 100644 --- a/mock/system/user.js +++ b/mock/system/user.js @@ -195,6 +195,7 @@ { 'code': 'well_bfcf', 'icon': '', 'id': '1138616121200189442', 'ismenu': '0', 'levels': 11, 'name': '布防撤防', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '04', 'url': '/well/bfcf' }, { 'code': 'alarms_by_well', 'icon': '', 'id': '1138702100355313665', 'ismenu': '0', 'levels': 11, 'name': '获取某闸井告警信息', 'num': 0, 'parentId': '1138701347507105794', 'resourceType': '04', 'url': '/overview/alarmsByWell' }, { 'code': 'alarm_statics', 'icon': '', 'id': '1138703677266817025', 'ismenu': '1', 'levels': 11, 'name': '报警统计', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '03', 'url': '/alarm/statics' }, + { 'code': 'alarm_statics', 'icon': '', 'id': '1138703677266817005', 'ismenu': '1', 'levels': 11, 'name': '数据概览', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '03', 'url': '/dataView/statics' }, { 'code': 'alarm_static_by_dept', 'icon': '', 'id': '1139376799592734721', 'ismenu': '0', 'levels': 11, 'name': '根据部门统计报警', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/statics/alarmsByDept' }, { 'code': 'concentrator_add', 'icon': '', 'id': '1138693099123077122', 'ismenu': '0', 'levels': 11, 'name': '新增集中器', 'num': 0, 'parentId': '1138692702442582017', 'resourceType': '04', 'url': '/concentrator/add' }, { 'code': 'job_export', 'icon': '', 'id': '1138699769542832130', 'ismenu': '0', 'levels': 11, 'name': '导出工单列表', 'num': 0, 'parentId': '1138699051712868353', 'resourceType': '04', 'url': '/job/export' }, diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue index 07ee165..b9e5ee6 100644 --- a/src/components/BigData/Card/index.vue +++ b/src/components/BigData/Card/index.vue @@ -8,8 +8,9 @@
{{ title }}
-
- {{ context }} +
+ {{ context }} + {{ flags }}
@@ -24,6 +25,10 @@ type: String, default: '标题' }, + flags: { + type: String, + default: '单位' + }, subtitle: { type: String, default: '' diff --git a/src/components/Hamburger/index.vue b/src/components/Hamburger/index.vue index 7c358e2..6a9236c 100644 --- a/src/components/Hamburger/index.vue +++ b/src/components/Hamburger/index.vue @@ -36,6 +36,7 @@ vertical-align: middle; width: 20px; height: 20px; + cursor: pointer; } .hamburger.is-active { diff --git a/src/router/modules/well.js b/src/router/modules/well.js index b5b6e82..a92ff3c 100644 --- a/src/router/modules/well.js +++ b/src/router/modules/well.js @@ -179,16 +179,22 @@ }, children: [ { + path: '/dataView', + name: 'DataView', + component: () => import('@/views/dataView/dataView'), + meta: { title: '数据概览', icon: 'icon-config', permission: ['/dataView/statics'] } + }, + { path: '/dataManage', name: 'DataManage', component: () => import('@/views/dataManage/dataManage'), - meta: { title: '历史数据', icon: 'icon-config', permission: ['/datalist'] } + meta: { title: '数据列表', icon: 'icon-config', permission: ['/datalist'] } }, { path: '/dataAnalyse', name: 'DataAnalyse', component: () => import('@/views/dataStatics/dataStatics'), - meta: { title: '数据分析', icon: 'icon-config', permission: ['/dataAnalyse'] } + meta: { title: '数据曲线', icon: 'icon-config', permission: ['/dataAnalyse'] } }, { path: '/deviceStatics', diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js index 856b38a..421e31b 100644 --- a/src/store/modules/settings.js +++ b/src/store/modules/settings.js @@ -1,12 +1,13 @@ import variables from '@/styles/element-variables.scss' import defaultSettings from '@/settings' -const { showSettings, tagsView, breadcrumb, fixedHeader, sidebarLogo } = defaultSettings +// const { showSettings, tagsView, breadcrumb, fixedHeader, sidebarLogo } = defaultSettings +const { showSettings, tagsView, fixedHeader, sidebarLogo } = defaultSettings const state = { theme: variables.theme, // 主题 showSettings: showSettings, // 是否显示设置按钮 - breadcrumb: breadcrumb, // 是否显示面包屑 + breadcrumb: true, // 是否显示面包屑 tagsView: tagsView, // 是否显示tagsView fixedHeader: fixedHeader, // 是否固定面包屑 sidebarLogo: sidebarLogo, // 是否显示logo diff --git a/src/views/dataView/components/alarmStatus.vue b/src/views/dataView/components/alarmStatus.vue new file mode 100644 index 0000000..94f7410 --- /dev/null +++ b/src/views/dataView/components/alarmStatus.vue @@ -0,0 +1,264 @@ + + + + + diff --git a/src/views/dataView/components/alarmView.vue b/src/views/dataView/components/alarmView.vue new file mode 100644 index 0000000..60650e9 --- /dev/null +++ b/src/views/dataView/components/alarmView.vue @@ -0,0 +1,106 @@ + + + + + diff --git a/src/views/dataView/components/deviceCountView.vue b/src/views/dataView/components/deviceCountView.vue new file mode 100644 index 0000000..b657e8d --- /dev/null +++ b/src/views/dataView/components/deviceCountView.vue @@ -0,0 +1,119 @@ + + + + + diff --git a/src/views/dataView/components/jobView.vue b/src/views/dataView/components/jobView.vue new file mode 100644 index 0000000..d0be0dd --- /dev/null +++ b/src/views/dataView/components/jobView.vue @@ -0,0 +1,92 @@ + + + + + diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue new file mode 100644 index 0000000..9172cc9 --- /dev/null +++ b/src/views/dataView/components/panelGroup.vue @@ -0,0 +1,250 @@ + + + + + diff --git a/src/views/dataView/components/wellCountView.vue b/src/views/dataView/components/wellCountView.vue new file mode 100644 index 0000000..5d87b28 --- /dev/null +++ b/src/views/dataView/components/wellCountView.vue @@ -0,0 +1,119 @@ + + + + + diff --git a/src/views/dataView/dataView.vue b/src/views/dataView/dataView.vue new file mode 100644 index 0000000..e1e9977 --- /dev/null +++ b/src/views/dataView/dataView.vue @@ -0,0 +1,70 @@ + + + + + diff --git a/mock/system/user.js b/mock/system/user.js index abd593d..747ef61 100644 --- a/mock/system/user.js +++ b/mock/system/user.js @@ -195,6 +195,7 @@ { 'code': 'well_bfcf', 'icon': '', 'id': '1138616121200189442', 'ismenu': '0', 'levels': 11, 'name': '布防撤防', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '04', 'url': '/well/bfcf' }, { 'code': 'alarms_by_well', 'icon': '', 'id': '1138702100355313665', 'ismenu': '0', 'levels': 11, 'name': '获取某闸井告警信息', 'num': 0, 'parentId': '1138701347507105794', 'resourceType': '04', 'url': '/overview/alarmsByWell' }, { 'code': 'alarm_statics', 'icon': '', 'id': '1138703677266817025', 'ismenu': '1', 'levels': 11, 'name': '报警统计', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '03', 'url': '/alarm/statics' }, + { 'code': 'alarm_statics', 'icon': '', 'id': '1138703677266817005', 'ismenu': '1', 'levels': 11, 'name': '数据概览', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '03', 'url': '/dataView/statics' }, { 'code': 'alarm_static_by_dept', 'icon': '', 'id': '1139376799592734721', 'ismenu': '0', 'levels': 11, 'name': '根据部门统计报警', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/statics/alarmsByDept' }, { 'code': 'concentrator_add', 'icon': '', 'id': '1138693099123077122', 'ismenu': '0', 'levels': 11, 'name': '新增集中器', 'num': 0, 'parentId': '1138692702442582017', 'resourceType': '04', 'url': '/concentrator/add' }, { 'code': 'job_export', 'icon': '', 'id': '1138699769542832130', 'ismenu': '0', 'levels': 11, 'name': '导出工单列表', 'num': 0, 'parentId': '1138699051712868353', 'resourceType': '04', 'url': '/job/export' }, diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue index 07ee165..b9e5ee6 100644 --- a/src/components/BigData/Card/index.vue +++ b/src/components/BigData/Card/index.vue @@ -8,8 +8,9 @@
{{ title }}
-
- {{ context }} +
+ {{ context }} + {{ flags }}
@@ -24,6 +25,10 @@ type: String, default: '标题' }, + flags: { + type: String, + default: '单位' + }, subtitle: { type: String, default: '' diff --git a/src/components/Hamburger/index.vue b/src/components/Hamburger/index.vue index 7c358e2..6a9236c 100644 --- a/src/components/Hamburger/index.vue +++ b/src/components/Hamburger/index.vue @@ -36,6 +36,7 @@ vertical-align: middle; width: 20px; height: 20px; + cursor: pointer; } .hamburger.is-active { diff --git a/src/router/modules/well.js b/src/router/modules/well.js index b5b6e82..a92ff3c 100644 --- a/src/router/modules/well.js +++ b/src/router/modules/well.js @@ -179,16 +179,22 @@ }, children: [ { + path: '/dataView', + name: 'DataView', + component: () => import('@/views/dataView/dataView'), + meta: { title: '数据概览', icon: 'icon-config', permission: ['/dataView/statics'] } + }, + { path: '/dataManage', name: 'DataManage', component: () => import('@/views/dataManage/dataManage'), - meta: { title: '历史数据', icon: 'icon-config', permission: ['/datalist'] } + meta: { title: '数据列表', icon: 'icon-config', permission: ['/datalist'] } }, { path: '/dataAnalyse', name: 'DataAnalyse', component: () => import('@/views/dataStatics/dataStatics'), - meta: { title: '数据分析', icon: 'icon-config', permission: ['/dataAnalyse'] } + meta: { title: '数据曲线', icon: 'icon-config', permission: ['/dataAnalyse'] } }, { path: '/deviceStatics', diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js index 856b38a..421e31b 100644 --- a/src/store/modules/settings.js +++ b/src/store/modules/settings.js @@ -1,12 +1,13 @@ import variables from '@/styles/element-variables.scss' import defaultSettings from '@/settings' -const { showSettings, tagsView, breadcrumb, fixedHeader, sidebarLogo } = defaultSettings +// const { showSettings, tagsView, breadcrumb, fixedHeader, sidebarLogo } = defaultSettings +const { showSettings, tagsView, fixedHeader, sidebarLogo } = defaultSettings const state = { theme: variables.theme, // 主题 showSettings: showSettings, // 是否显示设置按钮 - breadcrumb: breadcrumb, // 是否显示面包屑 + breadcrumb: true, // 是否显示面包屑 tagsView: tagsView, // 是否显示tagsView fixedHeader: fixedHeader, // 是否固定面包屑 sidebarLogo: sidebarLogo, // 是否显示logo diff --git a/src/views/dataView/components/alarmStatus.vue b/src/views/dataView/components/alarmStatus.vue new file mode 100644 index 0000000..94f7410 --- /dev/null +++ b/src/views/dataView/components/alarmStatus.vue @@ -0,0 +1,264 @@ + + + + + diff --git a/src/views/dataView/components/alarmView.vue b/src/views/dataView/components/alarmView.vue new file mode 100644 index 0000000..60650e9 --- /dev/null +++ b/src/views/dataView/components/alarmView.vue @@ -0,0 +1,106 @@ + + + + + diff --git a/src/views/dataView/components/deviceCountView.vue b/src/views/dataView/components/deviceCountView.vue new file mode 100644 index 0000000..b657e8d --- /dev/null +++ b/src/views/dataView/components/deviceCountView.vue @@ -0,0 +1,119 @@ + + + + + diff --git a/src/views/dataView/components/jobView.vue b/src/views/dataView/components/jobView.vue new file mode 100644 index 0000000..d0be0dd --- /dev/null +++ b/src/views/dataView/components/jobView.vue @@ -0,0 +1,92 @@ + + + + + diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue new file mode 100644 index 0000000..9172cc9 --- /dev/null +++ b/src/views/dataView/components/panelGroup.vue @@ -0,0 +1,250 @@ + + + + + diff --git a/src/views/dataView/components/wellCountView.vue b/src/views/dataView/components/wellCountView.vue new file mode 100644 index 0000000..5d87b28 --- /dev/null +++ b/src/views/dataView/components/wellCountView.vue @@ -0,0 +1,119 @@ + + + + + diff --git a/src/views/dataView/dataView.vue b/src/views/dataView/dataView.vue new file mode 100644 index 0000000..e1e9977 --- /dev/null +++ b/src/views/dataView/dataView.vue @@ -0,0 +1,70 @@ + + + + + diff --git a/src/views/overview/overviewAmap.vue b/src/views/overview/overviewAmap.vue index fa1f599..a2963a2 100644 --- a/src/views/overview/overviewAmap.vue +++ b/src/views/overview/overviewAmap.vue @@ -3,7 +3,7 @@
- + diff --git a/mock/system/user.js b/mock/system/user.js index abd593d..747ef61 100644 --- a/mock/system/user.js +++ b/mock/system/user.js @@ -195,6 +195,7 @@ { 'code': 'well_bfcf', 'icon': '', 'id': '1138616121200189442', 'ismenu': '0', 'levels': 11, 'name': '布防撤防', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '04', 'url': '/well/bfcf' }, { 'code': 'alarms_by_well', 'icon': '', 'id': '1138702100355313665', 'ismenu': '0', 'levels': 11, 'name': '获取某闸井告警信息', 'num': 0, 'parentId': '1138701347507105794', 'resourceType': '04', 'url': '/overview/alarmsByWell' }, { 'code': 'alarm_statics', 'icon': '', 'id': '1138703677266817025', 'ismenu': '1', 'levels': 11, 'name': '报警统计', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '03', 'url': '/alarm/statics' }, + { 'code': 'alarm_statics', 'icon': '', 'id': '1138703677266817005', 'ismenu': '1', 'levels': 11, 'name': '数据概览', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '03', 'url': '/dataView/statics' }, { 'code': 'alarm_static_by_dept', 'icon': '', 'id': '1139376799592734721', 'ismenu': '0', 'levels': 11, 'name': '根据部门统计报警', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/statics/alarmsByDept' }, { 'code': 'concentrator_add', 'icon': '', 'id': '1138693099123077122', 'ismenu': '0', 'levels': 11, 'name': '新增集中器', 'num': 0, 'parentId': '1138692702442582017', 'resourceType': '04', 'url': '/concentrator/add' }, { 'code': 'job_export', 'icon': '', 'id': '1138699769542832130', 'ismenu': '0', 'levels': 11, 'name': '导出工单列表', 'num': 0, 'parentId': '1138699051712868353', 'resourceType': '04', 'url': '/job/export' }, diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue index 07ee165..b9e5ee6 100644 --- a/src/components/BigData/Card/index.vue +++ b/src/components/BigData/Card/index.vue @@ -8,8 +8,9 @@
{{ title }}
-
- {{ context }} +
+ {{ context }} + {{ flags }}
@@ -24,6 +25,10 @@ type: String, default: '标题' }, + flags: { + type: String, + default: '单位' + }, subtitle: { type: String, default: '' diff --git a/src/components/Hamburger/index.vue b/src/components/Hamburger/index.vue index 7c358e2..6a9236c 100644 --- a/src/components/Hamburger/index.vue +++ b/src/components/Hamburger/index.vue @@ -36,6 +36,7 @@ vertical-align: middle; width: 20px; height: 20px; + cursor: pointer; } .hamburger.is-active { diff --git a/src/router/modules/well.js b/src/router/modules/well.js index b5b6e82..a92ff3c 100644 --- a/src/router/modules/well.js +++ b/src/router/modules/well.js @@ -179,16 +179,22 @@ }, children: [ { + path: '/dataView', + name: 'DataView', + component: () => import('@/views/dataView/dataView'), + meta: { title: '数据概览', icon: 'icon-config', permission: ['/dataView/statics'] } + }, + { path: '/dataManage', name: 'DataManage', component: () => import('@/views/dataManage/dataManage'), - meta: { title: '历史数据', icon: 'icon-config', permission: ['/datalist'] } + meta: { title: '数据列表', icon: 'icon-config', permission: ['/datalist'] } }, { path: '/dataAnalyse', name: 'DataAnalyse', component: () => import('@/views/dataStatics/dataStatics'), - meta: { title: '数据分析', icon: 'icon-config', permission: ['/dataAnalyse'] } + meta: { title: '数据曲线', icon: 'icon-config', permission: ['/dataAnalyse'] } }, { path: '/deviceStatics', diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js index 856b38a..421e31b 100644 --- a/src/store/modules/settings.js +++ b/src/store/modules/settings.js @@ -1,12 +1,13 @@ import variables from '@/styles/element-variables.scss' import defaultSettings from '@/settings' -const { showSettings, tagsView, breadcrumb, fixedHeader, sidebarLogo } = defaultSettings +// const { showSettings, tagsView, breadcrumb, fixedHeader, sidebarLogo } = defaultSettings +const { showSettings, tagsView, fixedHeader, sidebarLogo } = defaultSettings const state = { theme: variables.theme, // 主题 showSettings: showSettings, // 是否显示设置按钮 - breadcrumb: breadcrumb, // 是否显示面包屑 + breadcrumb: true, // 是否显示面包屑 tagsView: tagsView, // 是否显示tagsView fixedHeader: fixedHeader, // 是否固定面包屑 sidebarLogo: sidebarLogo, // 是否显示logo diff --git a/src/views/dataView/components/alarmStatus.vue b/src/views/dataView/components/alarmStatus.vue new file mode 100644 index 0000000..94f7410 --- /dev/null +++ b/src/views/dataView/components/alarmStatus.vue @@ -0,0 +1,264 @@ + + + + + diff --git a/src/views/dataView/components/alarmView.vue b/src/views/dataView/components/alarmView.vue new file mode 100644 index 0000000..60650e9 --- /dev/null +++ b/src/views/dataView/components/alarmView.vue @@ -0,0 +1,106 @@ + + + + + diff --git a/src/views/dataView/components/deviceCountView.vue b/src/views/dataView/components/deviceCountView.vue new file mode 100644 index 0000000..b657e8d --- /dev/null +++ b/src/views/dataView/components/deviceCountView.vue @@ -0,0 +1,119 @@ + + + + + diff --git a/src/views/dataView/components/jobView.vue b/src/views/dataView/components/jobView.vue new file mode 100644 index 0000000..d0be0dd --- /dev/null +++ b/src/views/dataView/components/jobView.vue @@ -0,0 +1,92 @@ + + + + + diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue new file mode 100644 index 0000000..9172cc9 --- /dev/null +++ b/src/views/dataView/components/panelGroup.vue @@ -0,0 +1,250 @@ + + + + + diff --git a/src/views/dataView/components/wellCountView.vue b/src/views/dataView/components/wellCountView.vue new file mode 100644 index 0000000..5d87b28 --- /dev/null +++ b/src/views/dataView/components/wellCountView.vue @@ -0,0 +1,119 @@ + + + + + diff --git a/src/views/dataView/dataView.vue b/src/views/dataView/dataView.vue new file mode 100644 index 0000000..e1e9977 --- /dev/null +++ b/src/views/dataView/dataView.vue @@ -0,0 +1,70 @@ + + + + + diff --git a/src/views/overview/overviewAmap.vue b/src/views/overview/overviewAmap.vue index fa1f599..a2963a2 100644 --- a/src/views/overview/overviewAmap.vue +++ b/src/views/overview/overviewAmap.vue @@ -3,7 +3,7 @@
- + diff --git a/src/views/wellManage/postionCorrectWell.vue b/src/views/wellManage/postionCorrectWell.vue index 7a0448b..154c63b 100644 --- a/src/views/wellManage/postionCorrectWell.vue +++ b/src/views/wellManage/postionCorrectWell.vue @@ -7,7 +7,7 @@ :center="center" :zoom="zoom" :base-layer="baseLayer" - :style="{height:(bodyHeight-20)+'px'}" + :style="{height:(bodyHeight-70)+'px'}" vid="overview" class="map-demo" @ready="mapReady" @@ -55,7 +55,6 @@ @@ -156,7 +155,7 @@ this.layerWindowShow = false this.locationWindowShow = true - const { searchResultOffset, searchResultIcon, searchResultSize } = this + const { searchResultIcon, searchResultSize } = this const icon = new window.AMap.Icon({ size: toSize(searchResultSize), // 图标尺寸 image: searchResultIcon, // Icon的图像 @@ -165,7 +164,6 @@ this.locationMarker = new window.AMap.Marker({ icon: icon, position: this.locationCoordinates, - offset: toPixel(searchResultOffset), draggable: true, cursor: 'move' }) @@ -177,6 +175,8 @@ }) }, closePopupLay() { + this.clearInfoWindow() + this.clearSearch() this.layerWindowShow = false this.fetchWellList() }, @@ -221,7 +221,6 @@ // 过滤海量点,给markers赋visible值 filterMassMarker(listQuery, showMessage = false) { const hideWellIds = []// 要隐藏的井编号 - let center = [] // 待移动到的地图中心 // 2. 整理查询条件 const keywords = listQuery.keywords // 关键字 const wellTypes = listQuery.wellTypes ? listQuery.wellTypes : listQuery.wellType ? [listQuery.wellType] : [] // 井类型 @@ -248,7 +247,7 @@ if (show === false) { hideWellIds.push(marker.wellId) } else { - center = marker.lnglat + this.center = marker.lnglat } marker.visible = show } @@ -268,7 +267,6 @@ }, // 加载聚合点 mountClusters() { - const self = this // 聚合点数据应该是一组包含经纬度信息的数组。lnglat 为经纬度信息字段,weight 字段为可选数据,表示权重值,以权重高的点为中心进行聚合。 var points = this.markers const markers = [] @@ -284,12 +282,6 @@ offset: toPixel(-10, 0) })) } - // 添加聚合组件 - const map = aMapManager.getMap() - const cluster = new window.AMap.MarkerClusterer(map, markers, { - gridSize: 80, - renderCluserMarker: self._renderCluserMarker, - maxZoom: 16 }) }, _renderCluserMarker(context) { console.log(context)