diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index 9814a1a..2a99cd5 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -143,3 +143,12 @@ data, }) } + +// 根据设备编号查询设备报警阈值 -- 浓度类 +export function getAlarmThresholdByCode(data: any) { + return request({ + url: '/system/alarmRule/getAlarmThresholdByCode', + method: 'post', + data, + }) +} diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index 9814a1a..2a99cd5 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -143,3 +143,12 @@ data, }) } + +// 根据设备编号查询设备报警阈值 -- 浓度类 +export function getAlarmThresholdByCode(data: any) { + return request({ + url: '/system/alarmRule/getAlarmThresholdByCode', + method: 'post', + data, + }) +} diff --git a/src/assets/fullscren/163418a45798ab9cbd349053b880fc2.png b/src/assets/fullscren/163418a45798ab9cbd349053b880fc2.png new file mode 100644 index 0000000..c775cec --- /dev/null +++ b/src/assets/fullscren/163418a45798ab9cbd349053b880fc2.png Binary files differ diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index 9814a1a..2a99cd5 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -143,3 +143,12 @@ data, }) } + +// 根据设备编号查询设备报警阈值 -- 浓度类 +export function getAlarmThresholdByCode(data: any) { + return request({ + url: '/system/alarmRule/getAlarmThresholdByCode', + method: 'post', + data, + }) +} diff --git a/src/assets/fullscren/163418a45798ab9cbd349053b880fc2.png b/src/assets/fullscren/163418a45798ab9cbd349053b880fc2.png new file mode 100644 index 0000000..c775cec --- /dev/null +++ b/src/assets/fullscren/163418a45798ab9cbd349053b880fc2.png Binary files differ diff --git a/src/assets/fullscren/border.webm b/src/assets/fullscren/border.webm new file mode 100644 index 0000000..59d9b51 --- /dev/null +++ b/src/assets/fullscren/border.webm Binary files differ diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index 9814a1a..2a99cd5 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -143,3 +143,12 @@ data, }) } + +// 根据设备编号查询设备报警阈值 -- 浓度类 +export function getAlarmThresholdByCode(data: any) { + return request({ + url: '/system/alarmRule/getAlarmThresholdByCode', + method: 'post', + data, + }) +} diff --git a/src/assets/fullscren/163418a45798ab9cbd349053b880fc2.png b/src/assets/fullscren/163418a45798ab9cbd349053b880fc2.png new file mode 100644 index 0000000..c775cec --- /dev/null +++ b/src/assets/fullscren/163418a45798ab9cbd349053b880fc2.png Binary files differ diff --git a/src/assets/fullscren/border.webm b/src/assets/fullscren/border.webm new file mode 100644 index 0000000..59d9b51 --- /dev/null +++ b/src/assets/fullscren/border.webm Binary files differ diff --git a/src/assets/fullscren/item-bg.png b/src/assets/fullscren/item-bg.png new file mode 100644 index 0000000..c775cec --- /dev/null +++ b/src/assets/fullscren/item-bg.png Binary files differ diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index 9814a1a..2a99cd5 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -143,3 +143,12 @@ data, }) } + +// 根据设备编号查询设备报警阈值 -- 浓度类 +export function getAlarmThresholdByCode(data: any) { + return request({ + url: '/system/alarmRule/getAlarmThresholdByCode', + method: 'post', + data, + }) +} diff --git a/src/assets/fullscren/163418a45798ab9cbd349053b880fc2.png b/src/assets/fullscren/163418a45798ab9cbd349053b880fc2.png new file mode 100644 index 0000000..c775cec --- /dev/null +++ b/src/assets/fullscren/163418a45798ab9cbd349053b880fc2.png Binary files differ diff --git a/src/assets/fullscren/border.webm b/src/assets/fullscren/border.webm new file mode 100644 index 0000000..59d9b51 --- /dev/null +++ b/src/assets/fullscren/border.webm Binary files differ diff --git a/src/assets/fullscren/item-bg.png b/src/assets/fullscren/item-bg.png new file mode 100644 index 0000000..c775cec --- /dev/null +++ b/src/assets/fullscren/item-bg.png Binary files differ diff --git a/src/assets/fullscren/title.png b/src/assets/fullscren/title.png new file mode 100644 index 0000000..88ede7f --- /dev/null +++ b/src/assets/fullscren/title.png Binary files differ diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index 9814a1a..2a99cd5 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -143,3 +143,12 @@ data, }) } + +// 根据设备编号查询设备报警阈值 -- 浓度类 +export function getAlarmThresholdByCode(data: any) { + return request({ + url: '/system/alarmRule/getAlarmThresholdByCode', + method: 'post', + data, + }) +} diff --git a/src/assets/fullscren/163418a45798ab9cbd349053b880fc2.png b/src/assets/fullscren/163418a45798ab9cbd349053b880fc2.png new file mode 100644 index 0000000..c775cec --- /dev/null +++ b/src/assets/fullscren/163418a45798ab9cbd349053b880fc2.png Binary files differ diff --git a/src/assets/fullscren/border.webm b/src/assets/fullscren/border.webm new file mode 100644 index 0000000..59d9b51 --- /dev/null +++ b/src/assets/fullscren/border.webm Binary files differ diff --git a/src/assets/fullscren/item-bg.png b/src/assets/fullscren/item-bg.png new file mode 100644 index 0000000..c775cec --- /dev/null +++ b/src/assets/fullscren/item-bg.png Binary files differ diff --git a/src/assets/fullscren/title.png b/src/assets/fullscren/title.png new file mode 100644 index 0000000..88ede7f --- /dev/null +++ b/src/assets/fullscren/title.png Binary files differ diff --git a/src/assets/images/success.png b/src/assets/images/success.png new file mode 100644 index 0000000..6dae752 --- /dev/null +++ b/src/assets/images/success.png Binary files differ diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index 9814a1a..2a99cd5 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -143,3 +143,12 @@ data, }) } + +// 根据设备编号查询设备报警阈值 -- 浓度类 +export function getAlarmThresholdByCode(data: any) { + return request({ + url: '/system/alarmRule/getAlarmThresholdByCode', + method: 'post', + data, + }) +} diff --git a/src/assets/fullscren/163418a45798ab9cbd349053b880fc2.png b/src/assets/fullscren/163418a45798ab9cbd349053b880fc2.png new file mode 100644 index 0000000..c775cec --- /dev/null +++ b/src/assets/fullscren/163418a45798ab9cbd349053b880fc2.png Binary files differ diff --git a/src/assets/fullscren/border.webm b/src/assets/fullscren/border.webm new file mode 100644 index 0000000..59d9b51 --- /dev/null +++ b/src/assets/fullscren/border.webm Binary files differ diff --git a/src/assets/fullscren/item-bg.png b/src/assets/fullscren/item-bg.png new file mode 100644 index 0000000..c775cec --- /dev/null +++ b/src/assets/fullscren/item-bg.png Binary files differ diff --git a/src/assets/fullscren/title.png b/src/assets/fullscren/title.png new file mode 100644 index 0000000..88ede7f --- /dev/null +++ b/src/assets/fullscren/title.png Binary files differ diff --git a/src/assets/images/success.png b/src/assets/images/success.png new file mode 100644 index 0000000..6dae752 --- /dev/null +++ b/src/assets/images/success.png Binary files differ diff --git a/src/components.d.ts b/src/components.d.ts index c64a2d4..6dadea7 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -52,6 +52,7 @@ NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default'] NormalTable: typeof import('./components/NormalTable/index.vue')['default'] + offline: typeof import('./components/map/index offline.vue')['default'] PageHeader: typeof import('./components/PageHeader/index.vue')['default'] PageMain: typeof import('./components/PageMain/index.vue')['default'] PcasCascader: typeof import('./components/PcasCascader/index.vue')['default'] @@ -83,5 +84,6 @@ VanPickerGroup: typeof import('vant/es')['PickerGroup'] VanPopup: typeof import('vant/es')['Popup'] VanTextEllipsis: typeof import('vant/es')['TextEllipsis'] + VanTimePicker: typeof import('vant/es')['TimePicker'] } } diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index 9814a1a..2a99cd5 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -143,3 +143,12 @@ data, }) } + +// 根据设备编号查询设备报警阈值 -- 浓度类 +export function getAlarmThresholdByCode(data: any) { + return request({ + url: '/system/alarmRule/getAlarmThresholdByCode', + method: 'post', + data, + }) +} diff --git a/src/assets/fullscren/163418a45798ab9cbd349053b880fc2.png b/src/assets/fullscren/163418a45798ab9cbd349053b880fc2.png new file mode 100644 index 0000000..c775cec --- /dev/null +++ b/src/assets/fullscren/163418a45798ab9cbd349053b880fc2.png Binary files differ diff --git a/src/assets/fullscren/border.webm b/src/assets/fullscren/border.webm new file mode 100644 index 0000000..59d9b51 --- /dev/null +++ b/src/assets/fullscren/border.webm Binary files differ diff --git a/src/assets/fullscren/item-bg.png b/src/assets/fullscren/item-bg.png new file mode 100644 index 0000000..c775cec --- /dev/null +++ b/src/assets/fullscren/item-bg.png Binary files differ diff --git a/src/assets/fullscren/title.png b/src/assets/fullscren/title.png new file mode 100644 index 0000000..88ede7f --- /dev/null +++ b/src/assets/fullscren/title.png Binary files differ diff --git a/src/assets/images/success.png b/src/assets/images/success.png new file mode 100644 index 0000000..6dae752 --- /dev/null +++ b/src/assets/images/success.png Binary files differ diff --git a/src/components.d.ts b/src/components.d.ts index c64a2d4..6dadea7 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -52,6 +52,7 @@ NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default'] NormalTable: typeof import('./components/NormalTable/index.vue')['default'] + offline: typeof import('./components/map/index offline.vue')['default'] PageHeader: typeof import('./components/PageHeader/index.vue')['default'] PageMain: typeof import('./components/PageMain/index.vue')['default'] PcasCascader: typeof import('./components/PcasCascader/index.vue')['default'] @@ -83,5 +84,6 @@ VanPickerGroup: typeof import('vant/es')['PickerGroup'] VanPopup: typeof import('vant/es')['Popup'] VanTextEllipsis: typeof import('vant/es')['TextEllipsis'] + VanTimePicker: typeof import('vant/es')['TimePicker'] } } diff --git a/src/components/map/index.vue b/src/components/map/index.vue index 20f17a1..7fe6052 100644 --- a/src/components/map/index.vue +++ b/src/components/map/index.vue @@ -108,7 +108,7 @@ map.value = new AMap1.Map('map', { viewMode: '3D', // 是否为3D地图模式 zoom: $props.zoom, // 初始化地图级别 - zooms:[10,18], + zooms: [10, 18], resizeEnable: true, center: $props.center, }) @@ -192,7 +192,7 @@ // loading.value = false }) .catch((e) => { - console.log(document.getElementById('map')) + console.log(e, '地图加载失败') loading.value = false }) @@ -532,7 +532,7 @@ const cluster = ref() // 添加点聚合 const addCluster = (points) => { - console.log(points.map((item: any) => ({ ...item, city: '北京' })), 'points') + // console.log(points.map((item: any) => ({ ...item, city: '北京' })), 'points') var count = points.length var _renderClusterMarker = function (context) { var factor = (context.count / count) ** (1 / 18) @@ -606,8 +606,11 @@ // ------------------------------------------------------------------------------------------------ onMounted(() => { + console.log(document.getElementById('map'), '地图容器') + // setTimeout(() => { loading.value = true initMap() + // }) }) onUnmounted(() => { if (xunteng.value) { diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index 9814a1a..2a99cd5 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -143,3 +143,12 @@ data, }) } + +// 根据设备编号查询设备报警阈值 -- 浓度类 +export function getAlarmThresholdByCode(data: any) { + return request({ + url: '/system/alarmRule/getAlarmThresholdByCode', + method: 'post', + data, + }) +} diff --git a/src/assets/fullscren/163418a45798ab9cbd349053b880fc2.png b/src/assets/fullscren/163418a45798ab9cbd349053b880fc2.png new file mode 100644 index 0000000..c775cec --- /dev/null +++ b/src/assets/fullscren/163418a45798ab9cbd349053b880fc2.png Binary files differ diff --git a/src/assets/fullscren/border.webm b/src/assets/fullscren/border.webm new file mode 100644 index 0000000..59d9b51 --- /dev/null +++ b/src/assets/fullscren/border.webm Binary files differ diff --git a/src/assets/fullscren/item-bg.png b/src/assets/fullscren/item-bg.png new file mode 100644 index 0000000..c775cec --- /dev/null +++ b/src/assets/fullscren/item-bg.png Binary files differ diff --git a/src/assets/fullscren/title.png b/src/assets/fullscren/title.png new file mode 100644 index 0000000..88ede7f --- /dev/null +++ b/src/assets/fullscren/title.png Binary files differ diff --git a/src/assets/images/success.png b/src/assets/images/success.png new file mode 100644 index 0000000..6dae752 --- /dev/null +++ b/src/assets/images/success.png Binary files differ diff --git a/src/components.d.ts b/src/components.d.ts index c64a2d4..6dadea7 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -52,6 +52,7 @@ NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default'] NormalTable: typeof import('./components/NormalTable/index.vue')['default'] + offline: typeof import('./components/map/index offline.vue')['default'] PageHeader: typeof import('./components/PageHeader/index.vue')['default'] PageMain: typeof import('./components/PageMain/index.vue')['default'] PcasCascader: typeof import('./components/PcasCascader/index.vue')['default'] @@ -83,5 +84,6 @@ VanPickerGroup: typeof import('vant/es')['PickerGroup'] VanPopup: typeof import('vant/es')['Popup'] VanTextEllipsis: typeof import('vant/es')['TextEllipsis'] + VanTimePicker: typeof import('vant/es')['TimePicker'] } } diff --git a/src/components/map/index.vue b/src/components/map/index.vue index 20f17a1..7fe6052 100644 --- a/src/components/map/index.vue +++ b/src/components/map/index.vue @@ -108,7 +108,7 @@ map.value = new AMap1.Map('map', { viewMode: '3D', // 是否为3D地图模式 zoom: $props.zoom, // 初始化地图级别 - zooms:[10,18], + zooms: [10, 18], resizeEnable: true, center: $props.center, }) @@ -192,7 +192,7 @@ // loading.value = false }) .catch((e) => { - console.log(document.getElementById('map')) + console.log(e, '地图加载失败') loading.value = false }) @@ -532,7 +532,7 @@ const cluster = ref() // 添加点聚合 const addCluster = (points) => { - console.log(points.map((item: any) => ({ ...item, city: '北京' })), 'points') + // console.log(points.map((item: any) => ({ ...item, city: '北京' })), 'points') var count = points.length var _renderClusterMarker = function (context) { var factor = (context.count / count) ** (1 / 18) @@ -606,8 +606,11 @@ // ------------------------------------------------------------------------------------------------ onMounted(() => { + console.log(document.getElementById('map'), '地图容器') + // setTimeout(() => { loading.value = true initMap() + // }) }) onUnmounted(() => { if (xunteng.value) { diff --git a/src/directives/drag-width/index.ts b/src/directives/drag-width/index.ts index 8a7a9e7..99fc242 100644 --- a/src/directives/drag-width/index.ts +++ b/src/directives/drag-width/index.ts @@ -1,9 +1,9 @@ // 拖拽元素 改变宽度 自定义指令 export const dragWidth = (el: any, binding: any) => { - console.log(el, binding) + // console.log(el, binding) el.style.position = 'relative' let isPress = false - console.log(binding, 'binding') + // console.log(binding, 'binding') // 最小宽度 let minWidth = 50 // 获取 drag-min-width 的值 diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index 9814a1a..2a99cd5 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -143,3 +143,12 @@ data, }) } + +// 根据设备编号查询设备报警阈值 -- 浓度类 +export function getAlarmThresholdByCode(data: any) { + return request({ + url: '/system/alarmRule/getAlarmThresholdByCode', + method: 'post', + data, + }) +} diff --git a/src/assets/fullscren/163418a45798ab9cbd349053b880fc2.png b/src/assets/fullscren/163418a45798ab9cbd349053b880fc2.png new file mode 100644 index 0000000..c775cec --- /dev/null +++ b/src/assets/fullscren/163418a45798ab9cbd349053b880fc2.png Binary files differ diff --git a/src/assets/fullscren/border.webm b/src/assets/fullscren/border.webm new file mode 100644 index 0000000..59d9b51 --- /dev/null +++ b/src/assets/fullscren/border.webm Binary files differ diff --git a/src/assets/fullscren/item-bg.png b/src/assets/fullscren/item-bg.png new file mode 100644 index 0000000..c775cec --- /dev/null +++ b/src/assets/fullscren/item-bg.png Binary files differ diff --git a/src/assets/fullscren/title.png b/src/assets/fullscren/title.png new file mode 100644 index 0000000..88ede7f --- /dev/null +++ b/src/assets/fullscren/title.png Binary files differ diff --git a/src/assets/images/success.png b/src/assets/images/success.png new file mode 100644 index 0000000..6dae752 --- /dev/null +++ b/src/assets/images/success.png Binary files differ diff --git a/src/components.d.ts b/src/components.d.ts index c64a2d4..6dadea7 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -52,6 +52,7 @@ NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default'] NormalTable: typeof import('./components/NormalTable/index.vue')['default'] + offline: typeof import('./components/map/index offline.vue')['default'] PageHeader: typeof import('./components/PageHeader/index.vue')['default'] PageMain: typeof import('./components/PageMain/index.vue')['default'] PcasCascader: typeof import('./components/PcasCascader/index.vue')['default'] @@ -83,5 +84,6 @@ VanPickerGroup: typeof import('vant/es')['PickerGroup'] VanPopup: typeof import('vant/es')['Popup'] VanTextEllipsis: typeof import('vant/es')['TextEllipsis'] + VanTimePicker: typeof import('vant/es')['TimePicker'] } } diff --git a/src/components/map/index.vue b/src/components/map/index.vue index 20f17a1..7fe6052 100644 --- a/src/components/map/index.vue +++ b/src/components/map/index.vue @@ -108,7 +108,7 @@ map.value = new AMap1.Map('map', { viewMode: '3D', // 是否为3D地图模式 zoom: $props.zoom, // 初始化地图级别 - zooms:[10,18], + zooms: [10, 18], resizeEnable: true, center: $props.center, }) @@ -192,7 +192,7 @@ // loading.value = false }) .catch((e) => { - console.log(document.getElementById('map')) + console.log(e, '地图加载失败') loading.value = false }) @@ -532,7 +532,7 @@ const cluster = ref() // 添加点聚合 const addCluster = (points) => { - console.log(points.map((item: any) => ({ ...item, city: '北京' })), 'points') + // console.log(points.map((item: any) => ({ ...item, city: '北京' })), 'points') var count = points.length var _renderClusterMarker = function (context) { var factor = (context.count / count) ** (1 / 18) @@ -606,8 +606,11 @@ // ------------------------------------------------------------------------------------------------ onMounted(() => { + console.log(document.getElementById('map'), '地图容器') + // setTimeout(() => { loading.value = true initMap() + // }) }) onUnmounted(() => { if (xunteng.value) { diff --git a/src/directives/drag-width/index.ts b/src/directives/drag-width/index.ts index 8a7a9e7..99fc242 100644 --- a/src/directives/drag-width/index.ts +++ b/src/directives/drag-width/index.ts @@ -1,9 +1,9 @@ // 拖拽元素 改变宽度 自定义指令 export const dragWidth = (el: any, binding: any) => { - console.log(el, binding) + // console.log(el, binding) el.style.position = 'relative' let isPress = false - console.log(binding, 'binding') + // console.log(binding, 'binding') // 最小宽度 let minWidth = 50 // 获取 drag-min-width 的值 diff --git a/src/main.ts b/src/main.ts index 6b4dcdb..6ebf4d6 100644 --- a/src/main.ts +++ b/src/main.ts @@ -27,6 +27,7 @@ import { hasPermission } from '@/utils/composables/permission' import buttonPerm from '@/utils/buttonPerm' import Vant from 'vant' +import { Lazyload } from 'vant' // 2. 引入组件样式 import 'vant/lib/index.css' // import TDesign from 'tdesign-mobile-vue' @@ -103,12 +104,13 @@ audio.pause() } } - // app.use(print) app.use(ElementPlus) app.use(Vant) app.use(pinia) app.use(router) - // app.use(Vant) + app.use(Lazyload, { + lazyComponent: true, + }) for (const [key, component] of Object.entries(ElementPlusIconsVue)) { app.component(key, component) } diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index 9814a1a..2a99cd5 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -143,3 +143,12 @@ data, }) } + +// 根据设备编号查询设备报警阈值 -- 浓度类 +export function getAlarmThresholdByCode(data: any) { + return request({ + url: '/system/alarmRule/getAlarmThresholdByCode', + method: 'post', + data, + }) +} diff --git a/src/assets/fullscren/163418a45798ab9cbd349053b880fc2.png b/src/assets/fullscren/163418a45798ab9cbd349053b880fc2.png new file mode 100644 index 0000000..c775cec --- /dev/null +++ b/src/assets/fullscren/163418a45798ab9cbd349053b880fc2.png Binary files differ diff --git a/src/assets/fullscren/border.webm b/src/assets/fullscren/border.webm new file mode 100644 index 0000000..59d9b51 --- /dev/null +++ b/src/assets/fullscren/border.webm Binary files differ diff --git a/src/assets/fullscren/item-bg.png b/src/assets/fullscren/item-bg.png new file mode 100644 index 0000000..c775cec --- /dev/null +++ b/src/assets/fullscren/item-bg.png Binary files differ diff --git a/src/assets/fullscren/title.png b/src/assets/fullscren/title.png new file mode 100644 index 0000000..88ede7f --- /dev/null +++ b/src/assets/fullscren/title.png Binary files differ diff --git a/src/assets/images/success.png b/src/assets/images/success.png new file mode 100644 index 0000000..6dae752 --- /dev/null +++ b/src/assets/images/success.png Binary files differ diff --git a/src/components.d.ts b/src/components.d.ts index c64a2d4..6dadea7 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -52,6 +52,7 @@ NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default'] NormalTable: typeof import('./components/NormalTable/index.vue')['default'] + offline: typeof import('./components/map/index offline.vue')['default'] PageHeader: typeof import('./components/PageHeader/index.vue')['default'] PageMain: typeof import('./components/PageMain/index.vue')['default'] PcasCascader: typeof import('./components/PcasCascader/index.vue')['default'] @@ -83,5 +84,6 @@ VanPickerGroup: typeof import('vant/es')['PickerGroup'] VanPopup: typeof import('vant/es')['Popup'] VanTextEllipsis: typeof import('vant/es')['TextEllipsis'] + VanTimePicker: typeof import('vant/es')['TimePicker'] } } diff --git a/src/components/map/index.vue b/src/components/map/index.vue index 20f17a1..7fe6052 100644 --- a/src/components/map/index.vue +++ b/src/components/map/index.vue @@ -108,7 +108,7 @@ map.value = new AMap1.Map('map', { viewMode: '3D', // 是否为3D地图模式 zoom: $props.zoom, // 初始化地图级别 - zooms:[10,18], + zooms: [10, 18], resizeEnable: true, center: $props.center, }) @@ -192,7 +192,7 @@ // loading.value = false }) .catch((e) => { - console.log(document.getElementById('map')) + console.log(e, '地图加载失败') loading.value = false }) @@ -532,7 +532,7 @@ const cluster = ref() // 添加点聚合 const addCluster = (points) => { - console.log(points.map((item: any) => ({ ...item, city: '北京' })), 'points') + // console.log(points.map((item: any) => ({ ...item, city: '北京' })), 'points') var count = points.length var _renderClusterMarker = function (context) { var factor = (context.count / count) ** (1 / 18) @@ -606,8 +606,11 @@ // ------------------------------------------------------------------------------------------------ onMounted(() => { + console.log(document.getElementById('map'), '地图容器') + // setTimeout(() => { loading.value = true initMap() + // }) }) onUnmounted(() => { if (xunteng.value) { diff --git a/src/directives/drag-width/index.ts b/src/directives/drag-width/index.ts index 8a7a9e7..99fc242 100644 --- a/src/directives/drag-width/index.ts +++ b/src/directives/drag-width/index.ts @@ -1,9 +1,9 @@ // 拖拽元素 改变宽度 自定义指令 export const dragWidth = (el: any, binding: any) => { - console.log(el, binding) + // console.log(el, binding) el.style.position = 'relative' let isPress = false - console.log(binding, 'binding') + // console.log(binding, 'binding') // 最小宽度 let minWidth = 50 // 获取 drag-min-width 的值 diff --git a/src/main.ts b/src/main.ts index 6b4dcdb..6ebf4d6 100644 --- a/src/main.ts +++ b/src/main.ts @@ -27,6 +27,7 @@ import { hasPermission } from '@/utils/composables/permission' import buttonPerm from '@/utils/buttonPerm' import Vant from 'vant' +import { Lazyload } from 'vant' // 2. 引入组件样式 import 'vant/lib/index.css' // import TDesign from 'tdesign-mobile-vue' @@ -103,12 +104,13 @@ audio.pause() } } - // app.use(print) app.use(ElementPlus) app.use(Vant) app.use(pinia) app.use(router) - // app.use(Vant) + app.use(Lazyload, { + lazyComponent: true, + }) for (const [key, component] of Object.entries(ElementPlusIconsVue)) { app.component(key, component) } diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts index 61e827e..17f7f9c 100644 --- a/src/router/modules/mobile.ts +++ b/src/router/modules/mobile.ts @@ -86,6 +86,18 @@ auth: '/mobile/operation', }, }, + { + path: 'success', + component: () => import('@/views/mobile/operation/success.vue'), + name: 'OperationDataSuccess', + meta: { + title: '设备运维', + isHeader: true, // 是否需要头部 + isBack: true, // 是否需要返回按钮 + isHome: false, // 是否需要回到首页按钮 + auth: '/mobile/operation', + }, + }, ], }, { diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts index 9814a1a..2a99cd5 100644 --- a/src/api/home/device/device.ts +++ b/src/api/home/device/device.ts @@ -143,3 +143,12 @@ data, }) } + +// 根据设备编号查询设备报警阈值 -- 浓度类 +export function getAlarmThresholdByCode(data: any) { + return request({ + url: '/system/alarmRule/getAlarmThresholdByCode', + method: 'post', + data, + }) +} diff --git a/src/assets/fullscren/163418a45798ab9cbd349053b880fc2.png b/src/assets/fullscren/163418a45798ab9cbd349053b880fc2.png new file mode 100644 index 0000000..c775cec --- /dev/null +++ b/src/assets/fullscren/163418a45798ab9cbd349053b880fc2.png Binary files differ diff --git a/src/assets/fullscren/border.webm b/src/assets/fullscren/border.webm new file mode 100644 index 0000000..59d9b51 --- /dev/null +++ b/src/assets/fullscren/border.webm Binary files differ diff --git a/src/assets/fullscren/item-bg.png b/src/assets/fullscren/item-bg.png new file mode 100644 index 0000000..c775cec --- /dev/null +++ b/src/assets/fullscren/item-bg.png Binary files differ diff --git a/src/assets/fullscren/title.png b/src/assets/fullscren/title.png new file mode 100644 index 0000000..88ede7f --- /dev/null +++ b/src/assets/fullscren/title.png Binary files differ diff --git a/src/assets/images/success.png b/src/assets/images/success.png new file mode 100644 index 0000000..6dae752 --- /dev/null +++ b/src/assets/images/success.png Binary files differ diff --git a/src/components.d.ts b/src/components.d.ts index c64a2d4..6dadea7 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -52,6 +52,7 @@ NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default'] NormalTable: typeof import('./components/NormalTable/index.vue')['default'] + offline: typeof import('./components/map/index offline.vue')['default'] PageHeader: typeof import('./components/PageHeader/index.vue')['default'] PageMain: typeof import('./components/PageMain/index.vue')['default'] PcasCascader: typeof import('./components/PcasCascader/index.vue')['default'] @@ -83,5 +84,6 @@ VanPickerGroup: typeof import('vant/es')['PickerGroup'] VanPopup: typeof import('vant/es')['Popup'] VanTextEllipsis: typeof import('vant/es')['TextEllipsis'] + VanTimePicker: typeof import('vant/es')['TimePicker'] } } diff --git a/src/components/map/index.vue b/src/components/map/index.vue index 20f17a1..7fe6052 100644 --- a/src/components/map/index.vue +++ b/src/components/map/index.vue @@ -108,7 +108,7 @@ map.value = new AMap1.Map('map', { viewMode: '3D', // 是否为3D地图模式 zoom: $props.zoom, // 初始化地图级别 - zooms:[10,18], + zooms: [10, 18], resizeEnable: true, center: $props.center, }) @@ -192,7 +192,7 @@ // loading.value = false }) .catch((e) => { - console.log(document.getElementById('map')) + console.log(e, '地图加载失败') loading.value = false }) @@ -532,7 +532,7 @@ const cluster = ref() // 添加点聚合 const addCluster = (points) => { - console.log(points.map((item: any) => ({ ...item, city: '北京' })), 'points') + // console.log(points.map((item: any) => ({ ...item, city: '北京' })), 'points') var count = points.length var _renderClusterMarker = function (context) { var factor = (context.count / count) ** (1 / 18) @@ -606,8 +606,11 @@ // ------------------------------------------------------------------------------------------------ onMounted(() => { + console.log(document.getElementById('map'), '地图容器') + // setTimeout(() => { loading.value = true initMap() + // }) }) onUnmounted(() => { if (xunteng.value) { diff --git a/src/directives/drag-width/index.ts b/src/directives/drag-width/index.ts index 8a7a9e7..99fc242 100644 --- a/src/directives/drag-width/index.ts +++ b/src/directives/drag-width/index.ts @@ -1,9 +1,9 @@ // 拖拽元素 改变宽度 自定义指令 export const dragWidth = (el: any, binding: any) => { - console.log(el, binding) + // console.log(el, binding) el.style.position = 'relative' let isPress = false - console.log(binding, 'binding') + // console.log(binding, 'binding') // 最小宽度 let minWidth = 50 // 获取 drag-min-width 的值 diff --git a/src/main.ts b/src/main.ts index 6b4dcdb..6ebf4d6 100644 --- a/src/main.ts +++ b/src/main.ts @@ -27,6 +27,7 @@ import { hasPermission } from '@/utils/composables/permission' import buttonPerm from '@/utils/buttonPerm' import Vant from 'vant' +import { Lazyload } from 'vant' // 2. 引入组件样式 import 'vant/lib/index.css' // import TDesign from 'tdesign-mobile-vue' @@ -103,12 +104,13 @@ audio.pause() } } - // app.use(print) app.use(ElementPlus) app.use(Vant) app.use(pinia) app.use(router) - // app.use(Vant) + app.use(Lazyload, { + lazyComponent: true, + }) for (const [key, component] of Object.entries(ElementPlusIconsVue)) { app.component(key, component) } diff --git a/src/router/modules/mobile.ts b/src/router/modules/mobile.ts index 61e827e..17f7f9c 100644 --- a/src/router/modules/mobile.ts +++ b/src/router/modules/mobile.ts @@ -86,6 +86,18 @@ auth: '/mobile/operation', }, }, + { + path: 'success', + component: () => import('@/views/mobile/operation/success.vue'), + name: 'OperationDataSuccess', + meta: { + title: '设备运维', + isHeader: true, // 是否需要头部 + isBack: true, // 是否需要返回按钮 + isHome: false, // 是否需要回到首页按钮 + auth: '/mobile/operation', + }, + }, ], }, { diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue index d26b3b9..fe782bc 100644 --- a/src/views/home/alarm/current/components/gasDataDialog.vue +++ b/src/views/home/alarm/current/components/gasDataDialog.vue @@ -6,7 +6,7 @@