diff --git a/src/api/mobile/1 b/src/api/mobile/1 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/api/mobile/1 diff --git a/src/api/mobile/1 b/src/api/mobile/1 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/api/mobile/1 diff --git a/src/api/mobile/record.ts b/src/api/mobile/record.ts new file mode 100644 index 0000000..42113c8 --- /dev/null +++ b/src/api/mobile/record.ts @@ -0,0 +1,23 @@ +/** + * 运维记录 + */ +import request from '@/api/index' + +// 基础列表 +export function getOperationListPage(data: any) { + return request({ + url: `/device/busRepairLog/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +export function exportOperationList(data: any) { + return request({ + url: '/device/busRepairLog/batchExport', + method: 'get', + params: { + ...data, + }, + responseType: 'blob', + }) +} diff --git a/src/api/mobile/1 b/src/api/mobile/1 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/api/mobile/1 diff --git a/src/api/mobile/record.ts b/src/api/mobile/record.ts new file mode 100644 index 0000000..42113c8 --- /dev/null +++ b/src/api/mobile/record.ts @@ -0,0 +1,23 @@ +/** + * 运维记录 + */ +import request from '@/api/index' + +// 基础列表 +export function getOperationListPage(data: any) { + return request({ + url: `/device/busRepairLog/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +export function exportOperationList(data: any) { + return request({ + url: '/device/busRepairLog/batchExport', + method: 'get', + params: { + ...data, + }, + responseType: 'blob', + }) +} diff --git a/src/assets/icons/icon-temporary.svg b/src/assets/icons/icon-temporary.svg new file mode 100644 index 0000000..6ec2646 --- /dev/null +++ b/src/assets/icons/icon-temporary.svg @@ -0,0 +1 @@ + diff --git a/src/api/mobile/1 b/src/api/mobile/1 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/api/mobile/1 diff --git a/src/api/mobile/record.ts b/src/api/mobile/record.ts new file mode 100644 index 0000000..42113c8 --- /dev/null +++ b/src/api/mobile/record.ts @@ -0,0 +1,23 @@ +/** + * 运维记录 + */ +import request from '@/api/index' + +// 基础列表 +export function getOperationListPage(data: any) { + return request({ + url: `/device/busRepairLog/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +export function exportOperationList(data: any) { + return request({ + url: '/device/busRepairLog/batchExport', + method: 'get', + params: { + ...data, + }, + responseType: 'blob', + }) +} diff --git a/src/assets/icons/icon-temporary.svg b/src/assets/icons/icon-temporary.svg new file mode 100644 index 0000000..6ec2646 --- /dev/null +++ b/src/assets/icons/icon-temporary.svg @@ -0,0 +1 @@ + diff --git a/src/components.d.ts b/src/components.d.ts index 96289e9..be57c9b 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -74,10 +74,12 @@ SystemInfo: typeof import('./components/SystemInfo/index.vue')['default'] TableContainer: typeof import('./components/TableContainer/index.vue')['default'] Trend: typeof import('./components/Trend/index.vue')['default'] + VanBackTop: typeof import('vant/es')['BackTop'] VanCell: typeof import('vant/es')['Cell'] VanCellGroup: typeof import('vant/es')['CellGroup'] VanDatePicker: typeof import('vant/es')['DatePicker'] VanDialog: typeof import('vant/es')['Dialog'] + VanEmpty: typeof import('vant/es')['Empty'] VanField: typeof import('vant/es')['Field'] VanForm: typeof import('vant/es')['Form'] VanIcon: typeof import('vant/es')['Icon'] diff --git a/src/api/mobile/1 b/src/api/mobile/1 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/api/mobile/1 diff --git a/src/api/mobile/record.ts b/src/api/mobile/record.ts new file mode 100644 index 0000000..42113c8 --- /dev/null +++ b/src/api/mobile/record.ts @@ -0,0 +1,23 @@ +/** + * 运维记录 + */ +import request from '@/api/index' + +// 基础列表 +export function getOperationListPage(data: any) { + return request({ + url: `/device/busRepairLog/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +export function exportOperationList(data: any) { + return request({ + url: '/device/busRepairLog/batchExport', + method: 'get', + params: { + ...data, + }, + responseType: 'blob', + }) +} diff --git a/src/assets/icons/icon-temporary.svg b/src/assets/icons/icon-temporary.svg new file mode 100644 index 0000000..6ec2646 --- /dev/null +++ b/src/assets/icons/icon-temporary.svg @@ -0,0 +1 @@ + diff --git a/src/components.d.ts b/src/components.d.ts index 96289e9..be57c9b 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -74,10 +74,12 @@ SystemInfo: typeof import('./components/SystemInfo/index.vue')['default'] TableContainer: typeof import('./components/TableContainer/index.vue')['default'] Trend: typeof import('./components/Trend/index.vue')['default'] + VanBackTop: typeof import('vant/es')['BackTop'] VanCell: typeof import('vant/es')['Cell'] VanCellGroup: typeof import('vant/es')['CellGroup'] VanDatePicker: typeof import('vant/es')['DatePicker'] VanDialog: typeof import('vant/es')['Dialog'] + VanEmpty: typeof import('vant/es')['Empty'] VanField: typeof import('vant/es')['Field'] VanForm: typeof import('vant/es')['Form'] VanIcon: typeof import('vant/es')['Icon'] diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 0a381f4..c9e7d50 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -106,7 +106,7 @@ show: boolean } watch(() => props.data, (newVal) => { - console.log(newVal, '表格接受的数据') + // console.log(newVal, '表格接受的数据') }, { immediate: true, deep: true, diff --git a/src/api/mobile/1 b/src/api/mobile/1 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/api/mobile/1 diff --git a/src/api/mobile/record.ts b/src/api/mobile/record.ts new file mode 100644 index 0000000..42113c8 --- /dev/null +++ b/src/api/mobile/record.ts @@ -0,0 +1,23 @@ +/** + * 运维记录 + */ +import request from '@/api/index' + +// 基础列表 +export function getOperationListPage(data: any) { + return request({ + url: `/device/busRepairLog/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +export function exportOperationList(data: any) { + return request({ + url: '/device/busRepairLog/batchExport', + method: 'get', + params: { + ...data, + }, + responseType: 'blob', + }) +} diff --git a/src/assets/icons/icon-temporary.svg b/src/assets/icons/icon-temporary.svg new file mode 100644 index 0000000..6ec2646 --- /dev/null +++ b/src/assets/icons/icon-temporary.svg @@ -0,0 +1 @@ + diff --git a/src/components.d.ts b/src/components.d.ts index 96289e9..be57c9b 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -74,10 +74,12 @@ SystemInfo: typeof import('./components/SystemInfo/index.vue')['default'] TableContainer: typeof import('./components/TableContainer/index.vue')['default'] Trend: typeof import('./components/Trend/index.vue')['default'] + VanBackTop: typeof import('vant/es')['BackTop'] VanCell: typeof import('vant/es')['Cell'] VanCellGroup: typeof import('vant/es')['CellGroup'] VanDatePicker: typeof import('vant/es')['DatePicker'] VanDialog: typeof import('vant/es')['Dialog'] + VanEmpty: typeof import('vant/es')['Empty'] VanField: typeof import('vant/es')['Field'] VanForm: typeof import('vant/es')['Form'] VanIcon: typeof import('vant/es')['Icon'] diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 0a381f4..c9e7d50 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -106,7 +106,7 @@ show: boolean } watch(() => props.data, (newVal) => { - console.log(newVal, '表格接受的数据') + // console.log(newVal, '表格接受的数据') }, { immediate: true, deep: true, diff --git a/src/components/map/index.vue b/src/components/map/index.vue index e5dfdb4..21f93d6 100644 --- a/src/components/map/index.vue +++ b/src/components/map/index.vue @@ -45,7 +45,7 @@ geocoder.getAddress(lnglat, (status: any, result: any) => { if (status === 'complete' && result.info === 'OK') { // result为对应的地理位置详细信息 - console.log(result.regeocode.formattedAddress) + // console.log(result.regeocode.formattedAddress) position = result.regeocode.formattedAddress resultFun(position) } @@ -103,7 +103,7 @@ plugins: ['AMap.Scale', 'AMap.MouseTool', 'AMap.Geocoder', 'AMap.MarkerClusterer'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等 }) .then((AMap1: any) => { - console.log($props.center, '$props.center') + // console.log($props.center, '$props.center') console.log($props.center && $props.center?.length === 2 && !isNaN($props.center[0]) && !isNaN($props.center[1]) ? $props.center : [116.397428, 39.90923]) AMap.value = AMap1 // 初始化地图 @@ -161,7 +161,7 @@ const flag = '00000000' const zz = c const z = `L${String(zz).length === 1 ? `0${zz}` : zz}` - console.log(zz, 'zz') + // console.log(zz, 'zz') const xx = a.toString(16) const x = `C${flag.substring(0, 8 - xx.length)}${xx}` const yy = b.toString(16) @@ -452,7 +452,7 @@ ...data.style, }) polyline.on('click', (e) => { - console.log('点击了线') + // console.log('点击了线') $emits('lineClick', { event: e, map: map.value, data, polyline }) }) // console.log(polyline, 'polyline') @@ -532,7 +532,7 @@ const MarkerAllCluster = ref([]) // 点聚合数组 const cluster = ref() // 添加点聚合 -const addCluster = (points) => { +const addCluster = (points,styleList) => { // console.log(points.map((item: any) => ({ ...item, city: '北京' })), 'points') var count = points.length var _renderClusterMarker = function (context) { @@ -563,8 +563,7 @@ } const _renderMarker = (context: any) => { const data = context.data[0] - // console.log(data, 'data') - const style = [ + let style = [ { url: `${publicPath}/image/well/well-normal.png`, // 图标地址 }, @@ -578,6 +577,9 @@ url: `${publicPath}/image/well/well-will.png`, // 图标地址 }, ] + if(styleList) { + style = styleList + } const markerHtml = `` var offset = new AMap.value.Pixel(-9, -9) context.marker.setContent(markerHtml) @@ -630,7 +632,7 @@ xunteng.value = null } if (map.value) { - console.log('销毁') + console.log('销毁地图') map.value.destroy() map.value = null AMap.value = null @@ -644,7 +646,7 @@ xunteng.value = null } if (map.value) { - console.log('销毁') + console.log('销毁地图') map.value.destroy() map.value = null AMap.value = null diff --git a/src/api/mobile/1 b/src/api/mobile/1 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/api/mobile/1 diff --git a/src/api/mobile/record.ts b/src/api/mobile/record.ts new file mode 100644 index 0000000..42113c8 --- /dev/null +++ b/src/api/mobile/record.ts @@ -0,0 +1,23 @@ +/** + * 运维记录 + */ +import request from '@/api/index' + +// 基础列表 +export function getOperationListPage(data: any) { + return request({ + url: `/device/busRepairLog/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +export function exportOperationList(data: any) { + return request({ + url: '/device/busRepairLog/batchExport', + method: 'get', + params: { + ...data, + }, + responseType: 'blob', + }) +} diff --git a/src/assets/icons/icon-temporary.svg b/src/assets/icons/icon-temporary.svg new file mode 100644 index 0000000..6ec2646 --- /dev/null +++ b/src/assets/icons/icon-temporary.svg @@ -0,0 +1 @@ + diff --git a/src/components.d.ts b/src/components.d.ts index 96289e9..be57c9b 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -74,10 +74,12 @@ SystemInfo: typeof import('./components/SystemInfo/index.vue')['default'] TableContainer: typeof import('./components/TableContainer/index.vue')['default'] Trend: typeof import('./components/Trend/index.vue')['default'] + VanBackTop: typeof import('vant/es')['BackTop'] VanCell: typeof import('vant/es')['Cell'] VanCellGroup: typeof import('vant/es')['CellGroup'] VanDatePicker: typeof import('vant/es')['DatePicker'] VanDialog: typeof import('vant/es')['Dialog'] + VanEmpty: typeof import('vant/es')['Empty'] VanField: typeof import('vant/es')['Field'] VanForm: typeof import('vant/es')['Form'] VanIcon: typeof import('vant/es')['Icon'] diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 0a381f4..c9e7d50 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -106,7 +106,7 @@ show: boolean } watch(() => props.data, (newVal) => { - console.log(newVal, '表格接受的数据') + // console.log(newVal, '表格接受的数据') }, { immediate: true, deep: true, diff --git a/src/components/map/index.vue b/src/components/map/index.vue index e5dfdb4..21f93d6 100644 --- a/src/components/map/index.vue +++ b/src/components/map/index.vue @@ -45,7 +45,7 @@ geocoder.getAddress(lnglat, (status: any, result: any) => { if (status === 'complete' && result.info === 'OK') { // result为对应的地理位置详细信息 - console.log(result.regeocode.formattedAddress) + // console.log(result.regeocode.formattedAddress) position = result.regeocode.formattedAddress resultFun(position) } @@ -103,7 +103,7 @@ plugins: ['AMap.Scale', 'AMap.MouseTool', 'AMap.Geocoder', 'AMap.MarkerClusterer'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等 }) .then((AMap1: any) => { - console.log($props.center, '$props.center') + // console.log($props.center, '$props.center') console.log($props.center && $props.center?.length === 2 && !isNaN($props.center[0]) && !isNaN($props.center[1]) ? $props.center : [116.397428, 39.90923]) AMap.value = AMap1 // 初始化地图 @@ -161,7 +161,7 @@ const flag = '00000000' const zz = c const z = `L${String(zz).length === 1 ? `0${zz}` : zz}` - console.log(zz, 'zz') + // console.log(zz, 'zz') const xx = a.toString(16) const x = `C${flag.substring(0, 8 - xx.length)}${xx}` const yy = b.toString(16) @@ -452,7 +452,7 @@ ...data.style, }) polyline.on('click', (e) => { - console.log('点击了线') + // console.log('点击了线') $emits('lineClick', { event: e, map: map.value, data, polyline }) }) // console.log(polyline, 'polyline') @@ -532,7 +532,7 @@ const MarkerAllCluster = ref([]) // 点聚合数组 const cluster = ref() // 添加点聚合 -const addCluster = (points) => { +const addCluster = (points,styleList) => { // console.log(points.map((item: any) => ({ ...item, city: '北京' })), 'points') var count = points.length var _renderClusterMarker = function (context) { @@ -563,8 +563,7 @@ } const _renderMarker = (context: any) => { const data = context.data[0] - // console.log(data, 'data') - const style = [ + let style = [ { url: `${publicPath}/image/well/well-normal.png`, // 图标地址 }, @@ -578,6 +577,9 @@ url: `${publicPath}/image/well/well-will.png`, // 图标地址 }, ] + if(styleList) { + style = styleList + } const markerHtml = `` var offset = new AMap.value.Pixel(-9, -9) context.marker.setContent(markerHtml) @@ -630,7 +632,7 @@ xunteng.value = null } if (map.value) { - console.log('销毁') + console.log('销毁地图') map.value.destroy() map.value = null AMap.value = null @@ -644,7 +646,7 @@ xunteng.value = null } if (map.value) { - console.log('销毁') + console.log('销毁地图') map.value.destroy() map.value = null AMap.value = null diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue index d85779c..c748666 100644 --- a/src/layouts/components/Tools/alarmDialog.vue +++ b/src/layouts/components/Tools/alarmDialog.vue @@ -1,4 +1,5 @@