Merge branch 'main_dev'

# Conflicts:
#	src/views/device/list/cpns/tabs/VideoChannel/video.vue

@@ -8,10 +8,10 @@ VITE_GLOB_PUBLIC_PATH = /
 # Please note that no line breaks
 
 # 本地
-VITE_PROXY = [["/api","http://localhost:8080/api"],["/thingskit-scada","http://localhost:5173/thingskit-scada"],["/large-designer", "http://localhost:5555/large-designer/"]]
+VITE_PROXY = [["/api","http://222.180.200.114:30480/api"],["/thingskit-scada","http://localhost:5173/thingskit-scada"],["/large-designer", "http://localhost:5555/large-designer/"]]
 
 # 实时数据的ws地址
-VITE_GLOB_WEB_SOCKET = ws://192.168.1.8:8080/api/ws/plugins/telemetry?token=
+VITE_GLOB_WEB_SOCKET = ws://222.180.200.114:30480/api/ws/plugins/telemetry?token=
 
 # Delete console
 VITE_GLOB_DROP_CONSOLE = true

@@ -6,6 +6,7 @@
   ],
   "cSpell.words": [
     "ACKS",
+    "Cascader",
     "clazz",
     "Cmds",
     "COAP",
@@ -28,6 +29,7 @@
     "SNMP",
     "TSLV",
     "UNACK",
+    "UNINT",
     "unref",
     "vben",
     "videojs",
@@ -35,5 +37,5 @@
     "vnode",
     "vueuse",
     "windicss"
-  ]
+  ],
 }

-# test directories
-__tests__
-test
-tests
-powered-test
-
-# asset directories
-docs
-doc
-website
-images
-assets
-
-# examples
-example
-examples
-
-# code coverage directories
-coverage
-.nyc_output
-
-# build scripts
-Makefile
-Gulpfile.js
-Gruntfile.js
-
-# configs
-appveyor.yml
-circle.yml
-codeship-services.yml
-codeship-steps.yml
-wercker.yml
-.tern-project
-.gitattributes
-.editorconfig
-.*ignore
-.eslintrc
-.jshintrc
-.flowconfig
-.documentup.json
-.yarn-metadata.json
-.travis.yml
-
-# misc
-*.md
-
-!istanbul-reports/lib/html/assets
-!istanbul-api/node_modules/istanbul-reports/lib/html/assets