diff --git a/src/utils/menu.ts b/src/utils/menu.ts index 74fb9892..2a08cba4 100644 --- a/src/utils/menu.ts +++ b/src/utils/menu.ts @@ -148,6 +148,9 @@ const extraRouteObj = { 'edge/Device': { children: [{ code: 'Remote', name: '远程控制' }], }, + 'rule-engine/Alarm/Log': { + children: [{ code: 'Record', name: '处理记录' }] + } }; @@ -206,7 +209,7 @@ const findDetailRoutes = (routes: any[]): any[] => { export const findCodeRoute = (asyncRouterMap: any[]) => { const routeMeta = {} - function getDetail( code: string, url: string) { + function getDetail(code: string, url: string) { const detail = findDetailRouteItem(code, url) if (!detail) return routeMeta[(detail as MenuItem).code] = { @@ -217,7 +220,7 @@ export const findCodeRoute = (asyncRouterMap: any[]) => { } } - function findChildren (data: any[], code: string = '') { + function findChildren(data: any[], code: string = '') { data.forEach(route => { routeMeta[route.code] = { path: route.url || route.path, @@ -254,7 +257,7 @@ export const findCodeRoute = (asyncRouterMap: any[]) => { return routeMeta } -export function filterAsyncRouter(asyncRouterMap: any, parentCode = '', level = 1): { menusData: any, silderMenus: any} { +export function filterAsyncRouter(asyncRouterMap: any, parentCode = '', level = 1): { menusData: any, silderMenus: any } { const _asyncRouterMap = cloneDeep(asyncRouterMap) const menusData: any[] = [] const silderMenus: any[] = [] @@ -270,7 +273,7 @@ export function filterAsyncRouter(asyncRouterMap: any, parentCode = '', level = }, } - const silder = {..._route} + const silder = { ..._route } // 查看是否有隐藏子路由 route.children = findChildrenRoute(route.code, route.url, route.children) diff --git a/src/views/device/Instance/Detail/EdgeMap/index.vue b/src/views/device/Instance/Detail/EdgeMap/index.vue index 4d680514..97d24fed 100644 --- a/src/views/device/Instance/Detail/EdgeMap/index.vue +++ b/src/views/device/Instance/Detail/EdgeMap/index.vue @@ -162,7 +162,7 @@ import { } from '@/api/device/instance'; import MSelect from './MSelect.vue'; import PatchMapping from './PatchMapping.vue'; -import { message } from 'ant-design-vue/es'; +import { onlyMessage } from '@/utils/comm'; const columns = [ { @@ -280,7 +280,7 @@ const unbind = async (id: string) => { }, ); if (resp.status === 200) { - message.success('操作成功!'); + onlyMessage('操作成功!', 'success'); handleSearch(); } } @@ -313,7 +313,7 @@ const onSave = () => { submitData, ); if (resp.status === 200) { - message.success('操作成功!'); + onlyMessage('操作成功!', 'success'); handleSearch(); } } @@ -342,7 +342,7 @@ const onAction = async (record: any) => { submitData, ); if (resp.status === 200) { - message.success('操作成功!'); + onlyMessage('操作成功!', 'success'); handleSearch(); } }; diff --git a/src/views/device/Instance/Detail/Running/Property/ValueDetail.vue b/src/views/device/Instance/Detail/Running/Property/ValueDetail.vue index 51e4bbeb..0c8539da 100644 --- a/src/views/device/Instance/Detail/Running/Property/ValueDetail.vue +++ b/src/views/device/Instance/Detail/Running/Property/ValueDetail.vue @@ -13,6 +13,7 @@ + import JsonViewer from 'vue-json-viewer'; +import LivePlayer from '@/components/Player/index.vue'; const _data = defineProps({ type: { diff --git a/src/views/device/Instance/Process/index.vue b/src/views/device/Instance/Process/index.vue index 1f203be8..64fe7266 100644 --- a/src/views/device/Instance/Process/index.vue +++ b/src/views/device/Instance/Process/index.vue @@ -13,7 +13,7 @@ {{ type === 'active' ? '启用' : '同步' }}成功:{{ count }}条 - 启用失败:{{ errCount }}条 + 启用失败:{{ errCount }}条 @@ -56,13 +56,13 @@ const getData = (api: string) => { source.value = _source; _source.onmessage = (e: any) => { const res = JSON.parse(e.data); - // console.log(res) switch (props.type) { case 'active': if (res.success) { _source.close(); dt += res.total; count.value = dt; + flag.value = false; } else { if (res.source) { errCount.value = 1 @@ -76,6 +76,7 @@ const getData = (api: string) => { case 'sync': dt += res; count.value = dt; + flag.value = false; break; default: break; diff --git a/src/views/device/Instance/index.vue b/src/views/device/Instance/index.vue index 30270b39..2d3b82b7 100644 --- a/src/views/device/Instance/index.vue +++ b/src/views/device/Instance/index.vue @@ -328,6 +328,7 @@ const columns = [ title: 'ID', dataIndex: 'id', key: 'id', + ellipsis: true, search: { type: 'string', defaultTermType: 'eq', @@ -337,6 +338,7 @@ const columns = [ title: '设备名称', dataIndex: 'name', key: 'name', + ellipsis: true, search: { type: 'string', first: true, @@ -346,6 +348,7 @@ const columns = [ title: '产品名称', dataIndex: 'productName', key: 'productName', + ellipsis: true, search: { type: 'select', rename: 'productId', @@ -367,6 +370,7 @@ const columns = [ dataIndex: 'createTime', key: 'createTime', scopedSlots: true, + width: 200, search: { type: 'date', }, diff --git a/src/views/device/Product/Detail/DeviceAccess/index.vue b/src/views/device/Product/Detail/DeviceAccess/index.vue index 42f4bb65..fa7b465c 100644 --- a/src/views/device/Product/Detail/DeviceAccess/index.vue +++ b/src/views/device/Product/Detail/DeviceAccess/index.vue @@ -33,7 +33,7 @@ " > - {{ productStore.current?.count ? productStore.current?.count @@ -62,18 +71,6 @@ - {{ item.title }} - - new Promise((resolve) => { - queryGatewayList({}).then((resp: any) => { - resolve( - resp.result.map((item: any) => ({ - label: item.name, - value: `accessId is ${item.id}`, - })), - ); - }); - }), - }, - }, + // { + // key: 'productId$product-info', + // dataIndex: 'productId$product-info', + // title: '接入方式', + // hideInTable: true, + // search: { + // type: 'select', + // options: () => + // new Promise((resolve) => { + // queryGatewayList({}).then((resp: any) => { + // resolve( + // resp.result.map((item: any) => ({ + // label: item.name, + // value: `accessId is ${item.id}`, + // })), + // ); + // }); + // }), + // }, + // }, { dataIndex: 'deviceType', title: '设备类型', diff --git a/src/views/edge/Resource/Issue/Result.vue b/src/views/edge/Resource/Issue/Result.vue index 52589e13..339ddb2d 100644 --- a/src/views/edge/Resource/Issue/Result.vue +++ b/src/views/edge/Resource/Issue/Result.vue @@ -20,7 +20,7 @@ 已下发数量:{{ countErr + count }} - + @@ -86,7 +86,7 @@ const getData = () => { et += 1; countErr.value = et; flag.value = false; - if (errMessages.length <= 5) { + if (errMessages.length < 5) { errMessages.push({ ...res }); errMessage.value = [...errMessages]; } diff --git a/src/views/edge/Resource/Issue/index.vue b/src/views/edge/Resource/Issue/index.vue index 5bab28ac..b12f7554 100644 --- a/src/views/edge/Resource/Issue/index.vue +++ b/src/views/edge/Resource/Issue/index.vue @@ -169,7 +169,8 @@ const onCancel = () => {
{{ type === 'active' ? '启用' : '同步' }}成功:{{ count }}条
启用失败:{{ errCount }}条