Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial

2 years ago · 8e74408c87
11 changed files with 11 additions and 21 deletions
--- a/code/VideoAccess-VCMP/web/client/index.html
+++ b/code/VideoAccess-VCMP/web/client/index.html
@ -6,6 +6,7 @@
    <meta name="viewport" content="minimum-scale=1, initial-scale=1, width=device-width" />
    <link rel="shortcut icon" href="/assets/images/favicon.ico">
    <script src="/assets/js/jessibuca/jessibuca.js"></script>
+    <script src="https://lf1-cdn-tos.bytegoofy.com/obj/iconpark/icons_14797_10.b43556420cacd0119dedf94deff663bb.js"></script>
 </head>

 <body>
--- a/code/VideoAccess-VCMP/web/client/src/sections/aiAbility/nav-item.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/sections/aiAbility/nav-item.jsx
@ -1,11 +1,9 @@
 import React from 'react';
-import { IconCode } from '@douyinfe/semi-icons';
-
 export function getNavItem (user, dispatch) {
    return (
        [
            {
-                itemKey: 'aiAbility', text: '视频AI能力', to: '/aiAbility', icon: <IconCode />,
+                itemKey: 'aiAbility', text: '视频AI能力', to: '/aiAbility', icon:<iconpark-icon style={{width:20,height:20}} name="ai-1"></iconpark-icon>,
                items: [
                    { itemKey: 'hiAI', to: '/aiAbility/hiAI', text: 'hi AI' },
                    { itemKey: 'consumption', to: '/aiAbility/consumption', text: '用量监控' }
--- a/code/VideoAccess-VCMP/web/client/src/sections/application/nav-item.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/sections/application/nav-item.jsx
@ -1,11 +1,10 @@
 import React from 'react';
-import { IconCode } from '@douyinfe/semi-icons';

 export function getNavItem (user, dispatch) {
   return (
      [
         {
-            itemKey: 'application', text: '应用管理', to: '/application', icon: <IconCode />,
+            itemKey: 'application', text: '应用管理', to: '/application', icon:<iconpark-icon style={{width:20,height:20}}  name="ying-1"></iconpark-icon>,
         },
      ]
   );
--- a/code/VideoAccess-VCMP/web/client/src/sections/archive/nav-item.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/sections/archive/nav-item.jsx
@ -1,11 +1,10 @@
 import React from 'react';
-import { IconCode } from '@douyinfe/semi-icons';

 export function getNavItem (user, dispatch) {
   return (
      [
         {
-            itemKey: 'containers', text: '文档中心', to: '/containers', icon: <IconCode />,
+            itemKey: 'containers', text: '文档中心', to: '/containers', icon:<iconpark-icon style={{width:20,height:20}}  name="wen-1"></iconpark-icon>,
         },
      ]
   );
--- a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/nav-item.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/nav-item.jsx
@ -1,11 +1,10 @@
 import React from 'react';
-import { IconCode } from '@douyinfe/semi-icons';

 export function getNavItem (user, dispatch) {
   return (
      [
         {
-            itemKey: 'equipmentWarehouse', text: '设备仓库', icon: <IconCode />,
+            itemKey: 'equipmentWarehouse', text: '设备仓库', icon:<iconpark-icon style={{width:20,height:20}}  name="she-1"></iconpark-icon>,
            items: [
               { itemKey: 'nvr', to: '/equipmentWarehouse/nvr', text: 'NVR管理' },
               { itemKey: 'camera', to: '/equipmentWarehouse/camera', text: '摄像头管理' },
--- a/code/VideoAccess-VCMP/web/client/src/sections/journaling/nav-item.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/sections/journaling/nav-item.jsx
@ -1,11 +1,10 @@
 import React from 'react';
-import { IconCode } from '@douyinfe/semi-icons';

 export function getNavItem (user, dispatch) {
   return (
      [
         {
-            itemKey: 'journaling', text: '设备报表', to: '/journaling', icon: <IconCode />,
+            itemKey: 'journaling', text: '设备报表', to: '/journaling', icon:<iconpark-icon style={{width:20,height:20}}  name="shebei-1"></iconpark-icon>,
         },
      ]
   );
--- a/code/VideoAccess-VCMP/web/client/src/sections/member/nav-item.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/sections/member/nav-item.jsx
@ -1,11 +1,10 @@
 import React from 'react';
-import { IconCode } from '@douyinfe/semi-icons';

 export function getNavItem (user, dispatch) {
   return (
      [
         {
-            itemKey: 'member', text: '成员管理', to: '/member', icon: <IconCode />,
+            itemKey: 'member', text: '成员管理', to: '/member', icon:<iconpark-icon style={{width:20,height:20}}  name="cheng-1"></iconpark-icon>,
         },
      ]
   );
--- a/code/VideoAccess-VCMP/web/client/src/sections/monitor/nav-item.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/sections/monitor/nav-item.jsx
@ -1,11 +1,10 @@
 import React from 'react';
-import { IconCode } from '@douyinfe/semi-icons';

 export function getNavItem (user, dispatch) {
   return (
      [
         {
-            itemKey: 'monitor', text: '数据监控中心', to: '/monitor', icon: <IconCode />,
+            itemKey: 'monitor', text: '数据监控中心', to: '/monitor', icon:<iconpark-icon  name="shu-1-5mn331bg"></iconpark-icon>,
         },
      ]
   );
--- a/code/VideoAccess-VCMP/web/client/src/sections/offline/nav-item.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/sections/offline/nav-item.jsx
@ -1,11 +1,10 @@
 import React from 'react';
-import { IconCode } from '@douyinfe/semi-icons';

 export function getNavItem (user, dispatch) {
    return (
        [
            {
-                itemKey: 'offline', text: '离线管理', to: '/offline', icon: <IconCode />,
+                itemKey: 'offline', text: '离线管理', to: '/offline', icon:<iconpark-icon style={{width:20,height:20}}  name="li-1"></iconpark-icon>,
                items: [
                    { itemKey: 'statuscode', to: '/offline/statuscode', text: '状态码管理' },
                    { itemKey: 'carrierpigeon', to: '/offline/carrierpigeon', text: '信鸽服务' }
--- a/code/VideoAccess-VCMP/web/client/src/sections/openness/nav-item.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/sections/openness/nav-item.jsx
@ -1,11 +1,10 @@
 import React from 'react';
-import { IconCode } from '@douyinfe/semi-icons';

 export function getNavItem (user, dispatch) {
    return (
        [
            {
-                itemKey: 'openness', text: '开放能力', to: '/openness', icon: <IconCode />,
+                itemKey: 'openness', text: '开放能力', to: '/openness', icon:<iconpark-icon style={{width:20,height:20}}  name="kai-1"></iconpark-icon>,
                items: [
                    { itemKey: 'mirroring', to: '/openness/mirroring', text: '镜像服务' },
                ],
--- a/code/VideoAccess-VCMP/web/client/src/sections/system/nav-item.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/sections/system/nav-item.jsx
@ -1,11 +1,10 @@
 import React from 'react';
-import { IconCode } from '@douyinfe/semi-icons';

 export function getNavItem (user, dispatch) {
    return (
        [
            {
-                itemKey: 'system', text: '系统管理', to: '/system', icon: <IconCode />,
+                itemKey: 'system', text: '系统管理', to: '/system', icon:<iconpark-icon style={{width:20,height:20}}  name="xi-1"></iconpark-icon>,
                items: [
                    { itemKey: 'journal', to: '/system/journal', text: '操作日志' },
                    { itemKey: 'theme', to: '/system/theme', text: '主题设置' }