diff --git a/src/views/init-home/Menu/index.vue b/src/views/init-home/Menu/index.vue index 8247af86..d4270dde 100644 --- a/src/views/init-home/Menu/index.vue +++ b/src/views/init-home/Menu/index.vue @@ -16,7 +16,9 @@ import BaseMenu, { USER_CENTER_MENU_DATA } from '../data/baseMenu' import { getSystemPermission, updateMenus } from '@/api/initHome'; import { protocolList } from '@/utils/consts'; import { getProviders } from '@/api/data-collect/channel'; -import { isNoCommunity } from '@/utils/utils'; +import { + systemVersion, +} from '@/api/login' /** * 获取菜单数据 @@ -30,7 +32,12 @@ const menuDatas = reactive({ * 查询支持的协议 */ const getProvidersFn = async () => { - if (!isNoCommunity) { + let version = '' + const req:any =await systemVersion() + if(req.success && req.result){ + version = req.result.edition + } + if (version ==='community') { return undefined } else { const res: any = await getProviders(); diff --git a/src/views/rule-engine/Alarm/Config/index.vue b/src/views/rule-engine/Alarm/Config/index.vue index 18de1483..ada34673 100644 --- a/src/views/rule-engine/Alarm/Config/index.vue +++ b/src/views/rule-engine/Alarm/Config/index.vue @@ -86,7 +86,8 @@ import { getImage, onlyMessage } from '@/utils/comm'; import { queryLevel, saveLevel } from '@/api/rule-engine/config'; import { LevelItem } from './typing'; import Io from './Io/index.vue'; -const list = ref([ +import { isNoCommunity } from '@/utils/utils'; +const list = isNoCommunity ?[ { key: 'config', tab: '告警级别', @@ -95,7 +96,12 @@ const list = ref([ key: 'io', tab: '数据流转', }, -]); +] : [ + { + key: 'config', + tab: '告警级别', + } +] let levels = ref([]); let tab = ref<'io' | 'config' | string>('config'); const getAlarmLevel = () => { diff --git a/src/views/system/Menu/Setting/index.vue b/src/views/system/Menu/Setting/index.vue index b69842ba..f2cf0b1b 100644 --- a/src/views/system/Menu/Setting/index.vue +++ b/src/views/system/Menu/Setting/index.vue @@ -83,7 +83,7 @@ import { } from '@/utils/consts'; import { protocolList } from '@/utils/consts'; import { getProviders } from '@/api/data-collect/channel'; - +import { isNoCommunity } from '@/utils/utils'; const selectedKeys: any = ref([]); const treeData = ref([]); const systemMenu: any = ref([]); @@ -118,10 +118,14 @@ const params = { */ let filterProtocolList: any[] = []; const getProvidersFn = async () => { - const res: any = await getProviders(); - filterProtocolList = protocolList.filter((item) => { + if(!isNoCommunity){ + return + }else{ + const res: any = await getProviders(); + filterProtocolList = protocolList.filter((item) => { return res.result?.find((val: any) => item.alias == val.id); }) + } } getProvidersFn(); function filterTree(nodes: Array, selectedKeys: Array) { diff --git a/vite.config.ts b/vite.config.ts index f5403f0c..f58bbf87 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -97,6 +97,7 @@ export default defineConfig(({ mode}) => { // target: 'http://192.168.32.163:8844', //张季本地 // target: 'http://120.77.179.54:8844', // 120测试 target: 'http://192.168.33.46:8844', // 本地开发环境 + // target: 'http://192.168.32.5:8848', // 刘本地 ws: 'ws://192.168.33.46:8844', changeOrigin: true, rewrite: (path) => path.replace(/^\/api/, '')