From 345be95d1d2c89c0906bcc192c00e243b4106b8b Mon Sep 17 00:00:00 2001
From: XieYongHong <18010623010@163.com>
Date: Tue, 14 Nov 2023 13:55:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20bug#19771=E3=80=8120134=E3=80=8120211?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: bug#19771

* fix: bug#20134

* fix: bug#20211
---
 src/views/link/AccessConfig/components/Channel/index.vue | 2 +-
 src/views/link/DashBoard/components/Cpu.vue              | 4 ++--
 src/views/link/DashBoard/components/Jvm.vue              | 2 +-
 src/views/system/User/components/EditUserDialog.vue      | 7 +------
 vite.config.ts                                           | 4 ++--
 5 files changed, 7 insertions(+), 12 deletions(-)

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 @@
                     <p>
                         {{ provider.description }}
                     </p>
-                    <p>消息协议：{{ provider.id }}</p>
+                    <!-- <p>消息协议：{{ provider.id }}</p> -->
                     <TitleComponent data="设备接入指引" />
                     <p>1、配置{{ provider.name }}通道</p>
                     <p>2、创建{{ provider.name }}设备接入网关</p>
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 @@
                         <PermissionButton
                             :hasPermission="`${rolePermission}:add`"
                             @click="form.clickAddItem('roleIdList', 'Role')"
-                            v-if="!admin"
+                            v-if="form.data.username !== 'admin'"
                         >
                             <AIcon type="PlusOutlined" />
                         </PermissionButton>
@@ -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,