Commit ad2f7444346015532d280fdf617130f85cb50785
Merge branch 'main_dev'
# Conflicts: # src/views/device/list/cpns/tabs/VideoChannel/video.vue
Showing
3 changed files
with
5 additions
and
51 deletions
Too many changes to show.
To preserve performance only 3 of 234 files are displayed.
| @@ -8,10 +8,10 @@ VITE_GLOB_PUBLIC_PATH = / | @@ -8,10 +8,10 @@ VITE_GLOB_PUBLIC_PATH = / | ||
| 8 | # Please note that no line breaks | 8 | # Please note that no line breaks |
| 9 | 9 | ||
| 10 | # 本地 | 10 | # 本地 |
| 11 | -VITE_PROXY = [["/api","http://localhost:8080/api"],["/thingskit-scada","http://localhost:5173/thingskit-scada"],["/large-designer", "http://localhost:5555/large-designer/"]] | 11 | +VITE_PROXY = [["/api","http://222.180.200.114:30480/api"],["/thingskit-scada","http://localhost:5173/thingskit-scada"],["/large-designer", "http://localhost:5555/large-designer/"]] |
| 12 | 12 | ||
| 13 | # 实时数据的ws地址 | 13 | # 实时数据的ws地址 |
| 14 | -VITE_GLOB_WEB_SOCKET = ws://192.168.1.8:8080/api/ws/plugins/telemetry?token= | 14 | +VITE_GLOB_WEB_SOCKET = ws://222.180.200.114:30480/api/ws/plugins/telemetry?token= |
| 15 | 15 | ||
| 16 | # Delete console | 16 | # Delete console |
| 17 | VITE_GLOB_DROP_CONSOLE = true | 17 | VITE_GLOB_DROP_CONSOLE = true |
| @@ -6,6 +6,7 @@ | @@ -6,6 +6,7 @@ | ||
| 6 | ], | 6 | ], |
| 7 | "cSpell.words": [ | 7 | "cSpell.words": [ |
| 8 | "ACKS", | 8 | "ACKS", |
| 9 | + "Cascader", | ||
| 9 | "clazz", | 10 | "clazz", |
| 10 | "Cmds", | 11 | "Cmds", |
| 11 | "COAP", | 12 | "COAP", |
| @@ -28,6 +29,7 @@ | @@ -28,6 +29,7 @@ | ||
| 28 | "SNMP", | 29 | "SNMP", |
| 29 | "TSLV", | 30 | "TSLV", |
| 30 | "UNACK", | 31 | "UNACK", |
| 32 | + "UNINT", | ||
| 31 | "unref", | 33 | "unref", |
| 32 | "vben", | 34 | "vben", |
| 33 | "videojs", | 35 | "videojs", |
| @@ -35,5 +37,5 @@ | @@ -35,5 +37,5 @@ | ||
| 35 | "vnode", | 37 | "vnode", |
| 36 | "vueuse", | 38 | "vueuse", |
| 37 | "windicss" | 39 | "windicss" |
| 38 | - ] | 40 | + ], |
| 39 | } | 41 | } |
.yarnclean
deleted
100644 → 0
| 1 | -# test directories | ||
| 2 | -__tests__ | ||
| 3 | -test | ||
| 4 | -tests | ||
| 5 | -powered-test | ||
| 6 | - | ||
| 7 | -# asset directories | ||
| 8 | -docs | ||
| 9 | -doc | ||
| 10 | -website | ||
| 11 | -images | ||
| 12 | -assets | ||
| 13 | - | ||
| 14 | -# examples | ||
| 15 | -example | ||
| 16 | -examples | ||
| 17 | - | ||
| 18 | -# code coverage directories | ||
| 19 | -coverage | ||
| 20 | -.nyc_output | ||
| 21 | - | ||
| 22 | -# build scripts | ||
| 23 | -Makefile | ||
| 24 | -Gulpfile.js | ||
| 25 | -Gruntfile.js | ||
| 26 | - | ||
| 27 | -# configs | ||
| 28 | -appveyor.yml | ||
| 29 | -circle.yml | ||
| 30 | -codeship-services.yml | ||
| 31 | -codeship-steps.yml | ||
| 32 | -wercker.yml | ||
| 33 | -.tern-project | ||
| 34 | -.gitattributes | ||
| 35 | -.editorconfig | ||
| 36 | -.*ignore | ||
| 37 | -.eslintrc | ||
| 38 | -.jshintrc | ||
| 39 | -.flowconfig | ||
| 40 | -.documentup.json | ||
| 41 | -.yarn-metadata.json | ||
| 42 | -.travis.yml | ||
| 43 | - | ||
| 44 | -# misc | ||
| 45 | -*.md | ||
| 46 | - | ||
| 47 | -!istanbul-reports/lib/html/assets | ||
| 48 | -!istanbul-api/node_modules/istanbul-reports/lib/html/assets |