diff --git a/src/views/link/AccessConfig/components/Channel/index.vue b/src/views/link/AccessConfig/components/Channel/index.vue index 557f3412..ba0bc455 100644 --- a/src/views/link/AccessConfig/components/Channel/index.vue +++ b/src/views/link/AccessConfig/components/Channel/index.vue @@ -64,7 +64,7 @@

{{ provider.description }}

-

消息协议:{{ provider.id }}

+

1、配置{{ provider.name }}通道

2、创建{{ provider.name }}设备接入网关

diff --git a/src/views/link/DashBoard/components/Cpu.vue b/src/views/link/DashBoard/components/Cpu.vue index f908ecdb..f029db0c 100644 --- a/src/views/link/DashBoard/components/Cpu.vue +++ b/src/views/link/DashBoard/components/Cpu.vue @@ -99,7 +99,7 @@ const pickerTimeChange = () => { }; const echartsOptions = computed(() => { - console.log(serverActive.value) + console.log(serverActive.value,'---') const series = serverActive.value.length ? serverActive.value.map((key) => setOptions(serverData.data, key)) : typeDataLine @@ -173,7 +173,7 @@ const getCPUEcharts = async (val: any) => { const setOptions = (optionsData: any, key: string) => ({ data: arrayReverse(optionsData[key]), - name: key, + name: key != 'undefined' ? key : '', type: 'line', smooth: true, symbol: 'none', diff --git a/src/views/link/DashBoard/components/Jvm.vue b/src/views/link/DashBoard/components/Jvm.vue index c65dd94a..a025485f 100644 --- a/src/views/link/DashBoard/components/Jvm.vue +++ b/src/views/link/DashBoard/components/Jvm.vue @@ -140,7 +140,7 @@ const getJVMEcharts = async (val: any) => { const setOptions = (optionsData: any, key: string) => ({ data: arrayReverse(optionsData[key]), - name: key, + // name: key!= 'undefined' ? key : '', type: 'line', smooth: true, symbol: 'none', diff --git a/src/views/system/User/components/EditUserDialog.vue b/src/views/system/User/components/EditUserDialog.vue index 4a3bd3df..be2119eb 100644 --- a/src/views/system/User/components/EditUserDialog.vue +++ b/src/views/system/User/components/EditUserDialog.vue @@ -111,7 +111,7 @@ @@ -207,11 +207,6 @@ import { AxiosResponse } from 'axios'; import { passwordRegEx } from '@/utils/validate'; import { filterSelectNode, onlyMessage } from '@/utils/comm'; import { uniqBy } from 'lodash-es'; -import { useUserInfo } from '@/store/userInfo'; -import { storeToRefs } from 'pinia'; - -const userInfoStore = useUserInfo() -const { userInfos } = storeToRefs(userInfoStore) const admin = computed(() => { return userInfos.value?.username === 'admin'; diff --git a/vite.config.ts b/vite.config.ts index 80ead348..0986ae20 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -96,8 +96,8 @@ export default defineConfig(({ mode}) => { // target: 'http://192.168.32.244:8881', // 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.33.1:8845', // 社区版开发环境 + // target: 'http://192.168.33.46:8844', // 本地开发环境 + target: 'http://192.168.33.1:8845', // 社区版开发环境 // target: 'http://192.168.32.5:8848', // 刘本地 ws: 'ws://192.168.33.46:8844', changeOrigin: true,