正在显示
10 个修改的文件
包含
41 行增加
和
20 行删除
@@ -441,8 +441,8 @@ spring: | @@ -441,8 +441,8 @@ spring: | ||
441 | datasource: | 441 | datasource: |
442 | driverClassName: "${SPRING_DRIVER_CLASS_NAME:org.postgresql.Driver}" | 442 | driverClassName: "${SPRING_DRIVER_CLASS_NAME:org.postgresql.Driver}" |
443 | url: "${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:5432/postgres}" | 443 | url: "${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:5432/postgres}" |
444 | - username: "${SPRING_DATASOURCE_USERNAME:postgres}" | ||
445 | - password: "${SPRING_DATASOURCE_PASSWORD:postgres}" | 444 | + username: "postgres" |
445 | + password: "911221" | ||
446 | hikari: | 446 | hikari: |
447 | maximumPoolSize: "${SPRING_DATASOURCE_MAXIMUM_POOL_SIZE:5}" | 447 | maximumPoolSize: "${SPRING_DATASOURCE_MAXIMUM_POOL_SIZE:5}" |
448 | 448 |
@@ -71,8 +71,8 @@ | @@ -71,8 +71,8 @@ | ||
71 | <goal>install-node-and-npm</goal> | 71 | <goal>install-node-and-npm</goal> |
72 | </goals> | 72 | </goals> |
73 | <configuration> | 73 | <configuration> |
74 | - <nodeVersion>v12.16.1</nodeVersion> | ||
75 | - <npmVersion>6.13.4</npmVersion> | 74 | + <nodeVersion>v12.18.0</nodeVersion> |
75 | + <npmVersion>6.14.4</npmVersion> | ||
76 | </configuration> | 76 | </configuration> |
77 | </execution> | 77 | </execution> |
78 | <execution> | 78 | <execution> |
@@ -25,10 +25,26 @@ | @@ -25,10 +25,26 @@ | ||
25 | "assets": [ | 25 | "assets": [ |
26 | "src/thingsboard.ico", | 26 | "src/thingsboard.ico", |
27 | "src/assets", | 27 | "src/assets", |
28 | - { "glob": "worker-html.js", "input": "./node_modules/ace-builds/src-min/", "output": "/" }, | ||
29 | - { "glob": "worker-css.js", "input": "./node_modules/ace-builds/src-min/", "output": "/" }, | ||
30 | - { "glob": "worker-json.js", "input": "./node_modules/ace-builds/src-min/", "output": "/" }, | ||
31 | - { "glob": "worker-javascript.js", "input": "./node_modules/ace-builds/src-min/", "output": "/" } | 28 | + { |
29 | + "glob": "worker-html.js", | ||
30 | + "input": "./node_modules/ace-builds/src-min/", | ||
31 | + "output": "/" | ||
32 | + }, | ||
33 | + { | ||
34 | + "glob": "worker-css.js", | ||
35 | + "input": "./node_modules/ace-builds/src-min/", | ||
36 | + "output": "/" | ||
37 | + }, | ||
38 | + { | ||
39 | + "glob": "worker-json.js", | ||
40 | + "input": "./node_modules/ace-builds/src-min/", | ||
41 | + "output": "/" | ||
42 | + }, | ||
43 | + { | ||
44 | + "glob": "worker-javascript.js", | ||
45 | + "input": "./node_modules/ace-builds/src-min/", | ||
46 | + "output": "/" | ||
47 | + } | ||
32 | ], | 48 | ], |
33 | "styles": [ | 49 | "styles": [ |
34 | "src/styles.scss", | 50 | "src/styles.scss", |
@@ -45,7 +61,7 @@ | @@ -45,7 +61,7 @@ | ||
45 | ], | 61 | ], |
46 | "stylePreprocessorOptions": { | 62 | "stylePreprocessorOptions": { |
47 | "includePaths": [ | 63 | "includePaths": [ |
48 | - "src/scss" | 64 | + "src/scss" |
49 | ] | 65 | ] |
50 | }, | 66 | }, |
51 | "scripts": [ | 67 | "scripts": [ |
@@ -196,5 +212,8 @@ | @@ -196,5 +212,8 @@ | ||
196 | } | 212 | } |
197 | } | 213 | } |
198 | }, | 214 | }, |
199 | - "defaultProject": "thingsboard" | ||
200 | -} | 215 | + "defaultProject": "thingsboard", |
216 | + "cli": { | ||
217 | + "analytics": "a0ca19d7-f3d7-47ff-b967-e9421b38cc28" | ||
218 | + } | ||
219 | +} |
此 diff 太大无法显示。
@@ -5,6 +5,7 @@ | @@ -5,6 +5,7 @@ | ||
5 | "postinstall": "ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points", | 5 | "postinstall": "ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points", |
6 | "ng": "ng", | 6 | "ng": "ng", |
7 | "start": "ng serve --host 0.0.0.0 --open", | 7 | "start": "ng serve --host 0.0.0.0 --open", |
8 | + "dev": "ng serve --host 0.0.0.0 --open", | ||
8 | "build": "ng build", | 9 | "build": "ng build", |
9 | "build:prod": "ng build --prod --vendor-chunk", | 10 | "build:prod": "ng build --prod --vendor-chunk", |
10 | "test": "ng test", | 11 | "test": "ng test", |
@@ -184,12 +184,13 @@ export class MenuService { | @@ -184,12 +184,13 @@ export class MenuService { | ||
184 | path: '/ruleChains', | 184 | path: '/ruleChains', |
185 | icon: 'settings_ethernet' | 185 | icon: 'settings_ethernet' |
186 | }, | 186 | }, |
187 | - { | ||
188 | - name: 'customer.customers', | ||
189 | - type: 'link', | ||
190 | - path: '/customers', | ||
191 | - icon: 'supervisor_account' | ||
192 | - }, | 187 | + // tao_bao_qiang |
188 | + // { | ||
189 | + // name: 'customer.customers', | ||
190 | + // type: 'link', | ||
191 | + // path: '/customers', | ||
192 | + // icon: 'supervisor_account' | ||
193 | + // }, | ||
193 | { | 194 | { |
194 | name: 'asset.assets', | 195 | name: 'asset.assets', |
195 | type: 'link', | 196 | type: 'link', |
@@ -50,7 +50,7 @@ export class HomeComponent extends PageComponent implements AfterViewInit, OnIni | @@ -50,7 +50,7 @@ export class HomeComponent extends PageComponent implements AfterViewInit, OnIni | ||
50 | sidenavMode: 'over' | 'push' | 'side' = 'side'; | 50 | sidenavMode: 'over' | 'push' | 'side' = 'side'; |
51 | sidenavOpened = true; | 51 | sidenavOpened = true; |
52 | 52 | ||
53 | - logo = require('../../../assets/logo_title_white.svg').default; | 53 | + logo = require('../../../assets/logo_smail.png').default; |
54 | 54 | ||
55 | @ViewChild('sidenav') | 55 | @ViewChild('sidenav') |
56 | sidenav: MatSidenav; | 56 | sidenav: MatSidenav; |
@@ -39,7 +39,7 @@ import { DashboardModule } from '@modules/home/pages/dashboard/dashboard.module' | @@ -39,7 +39,7 @@ import { DashboardModule } from '@modules/home/pages/dashboard/dashboard.module' | ||
39 | DeviceModule, | 39 | DeviceModule, |
40 | AssetModule, | 40 | AssetModule, |
41 | EntityViewModule, | 41 | EntityViewModule, |
42 | - CustomerModule, | 42 | + CustomerModule, // 不到如客户模块 |
43 | RuleChainModule, | 43 | RuleChainModule, |
44 | WidgetLibraryModule, | 44 | WidgetLibraryModule, |
45 | DashboardModule, | 45 | DashboardModule, |
@@ -23,7 +23,7 @@ import { Component } from '@angular/core'; | @@ -23,7 +23,7 @@ import { Component } from '@angular/core'; | ||
23 | }) | 23 | }) |
24 | export class LogoComponent { | 24 | export class LogoComponent { |
25 | 25 | ||
26 | - logo = require('../../../assets/logo_title_white.svg').default; | 26 | + logo = require('../../../assets/logo_smail.png').default; |
27 | 27 | ||
28 | gotoThingsboard(): void { | 28 | gotoThingsboard(): void { |
29 | window.open('https://thingsboard.io', '_blank'); | 29 | window.open('https://thingsboard.io', '_blank'); |
ui-ngx/src/assets/logo_smail.png
0 → 100644
29.0 KB
-
请 注册 或 登录 后发表评论