Merge branch 'local_dev_ft' into 'main'

pref:优化饼图颜色

See merge request huang/yun-teng-iot-front!450

@@ -298,10 +298,10 @@
           name: o === 'directConnection' ? '直连设备' : o === 'gateWay' ? '网关设备' : '网关子设备',
           name: o === 'directConnection' ? '直连设备' : o === 'gateWay' ? '网关设备' : '网关子设备',
           itemStyle:
           itemStyle:
             o === 'directConnection'
             o === 'directConnection'
-              ? { color: '#5AEEED' }
+              ? { color: '#5C7BD9' }
               : o === 'gateWay'
               : o === 'gateWay'
-              ? { color: '#0B55F1' }
-              : { color: '#00C678' },
+              ? { color: '#91CC75' }
+              : { color: '#FAC859' },
         });
         });
       }
       }
       if (o === 'inActive' || o === 'onLine' || o === 'offLine') {
       if (o === 'inActive' || o === 'onLine' || o === 'offLine') {
@@ -311,10 +311,10 @@
           name: o === 'inActive' ? '待激活' : o === 'onLine' ? '在线' : '离线',
           name: o === 'inActive' ? '待激活' : o === 'onLine' ? '在线' : '离线',
           itemStyle:
           itemStyle:
             o === 'inActive'
             o === 'inActive'
-              ? { color: '#F9C900' }
+              ? { color: '#5C7BD9' }
               : o === 'onLine'
               : o === 'onLine'
-              ? { color: '#5AEEED' }
-              : { color: '#FF9C4A' },
+              ? { color: '#91CC75' }
+              : { color: '#FAC859' },
         });
         });
       }
       }
     }
     }

@@ -158,7 +158,9 @@
   const { send, close } = useWebSocket(state.server, {
   const { send, close } = useWebSocket(state.server, {
     async onConnected() {
     async onConnected() {
       if (isAdmin(props.role)) return;
       if (isAdmin(props.role)) return;
-      let content = JSON.parse(window.localStorage.getItem('entityId'));
+      let content =
+        JSON.parse(window.localStorage.getItem('entityId')) ||
+        JSON.parse(window.sessionStorage.getItem('entityId'));
       entityId = content;
       entityId = content;
       const sendValue = JSON.stringify({
       const sendValue = JSON.stringify({
         entityDataCmds: [
         entityDataCmds: [

@@ -157,7 +157,9 @@
   const { send, close } = useWebSocket(state.server, {
   const { send, close } = useWebSocket(state.server, {
     async onConnected() {
     async onConnected() {
       if (isAdmin(props.role)) return;
       if (isAdmin(props.role)) return;
-      let content = JSON.parse(window.localStorage.getItem('entityId'));
+      let content =
+        JSON.parse(window.localStorage.getItem('entityId')) ||
+        JSON.parse(window.sessionStorage.getItem('entityId'));
       entityId = content;
       entityId = content;
       const sendValue = JSON.stringify({
       const sendValue = JSON.stringify({
         entityDataCmds: [
         entityDataCmds: [

@@ -49,8 +49,11 @@
   const entityId = ref({});
   const entityId = ref({});
 
 
   onMounted(async () => {
   onMounted(async () => {
-    const res = await getEntitiesId();
-    entityId.value = res.data[0]?.entityId;
-    window.localStorage.setItem('entityId', JSON.stringify(entityId.value));
+    if (role === 'TENANT_ADMIN') {
+      const res = await getEntitiesId();
+      entityId.value = res.data[0]?.entityId;
+      window.localStorage.setItem('entityId', JSON.stringify(entityId.value));
+      window.sessionStorage.setItem('entityId', JSON.stringify(entityId.value));
+    }
   });
   });
 </script>
 </script>