From 17c3b830bc42c266aca3bab92ef0a7612be310bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=B7=E6=88=90=E4=BC=9F?= Date: Tue, 10 Dec 2024 15:23:48 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/deploy/das.md | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/docs/deploy/das.md b/docs/deploy/das.md index 74f0068a..ea15c1d5 100644 --- a/docs/deploy/das.md +++ b/docs/deploy/das.md @@ -340,6 +340,13 @@ systemctl start nginx systemctl enable nginx ``` +### 防火墙配置 + +```shell +firewall-cmd --zone=public --add-port=80/tcp --permanent +firewall-cmd --reload +``` + ## DAS程序部署 @@ -398,6 +405,12 @@ tdengine: password: taosdata url: jdbc:TAOS-RS://127.0.0.1:6041/das username: root +#minio配置 +minio: + url: http://127.0.0.1:9000 + bucket: das + accessKey: das + secretKey: zaq12WSX ``` @@ -429,3 +442,15 @@ systemctl start das systemctl enable das ``` +## DAS-DN部署 + +### 程序部署 + +```shell +mkdir -p /das/app +cd /das/app +wget https://oss.jsspisoft.com/ +``` + + + From f77d4c8a3b850666438124bf647c0c2fe0143e45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=B7=E6=88=90=E4=BC=9F?= Date: Tue, 10 Dec 2024 15:42:05 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/deploy/das.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/docs/deploy/das.md b/docs/deploy/das.md index ea15c1d5..51469e3b 100644 --- a/docs/deploy/das.md +++ b/docs/deploy/das.md @@ -75,6 +75,8 @@ cd patch ``` > PS. 此脚本会更改TDEngine的默认数据目录为/das/data/tddata +> +> ### TDEngine3启动顺序 @@ -85,6 +87,17 @@ systemctl start taosd systemctl start taosadapter ``` +### 数据库创建 + +执行taos进入命令行，执行sql创建数据库 + +```sql +create DATABASE `das` BUFFER 64 CACHESIZE 8 CACHEMODEL 'both' COMP 2 KEEP 1098 +PAGES 512 PAGESIZE 8 VGROUPS 16 +``` + + + ### TDEngine3停止顺序 ```shell From 2f21e4de10116cbe42d31dfe38aa420cd2362004 Mon Sep 17 00:00:00 2001 From: fengrong Date: Tue, 10 Dec 2024 17:02:45 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/dasadmin/src/views/backend/dashboard.vue | 72 ++++++++++++++++++++- 1 file changed, 70 insertions(+), 2 deletions(-) diff --git a/ui/dasadmin/src/views/backend/dashboard.vue b/ui/dasadmin/src/views/backend/dashboard.vue index d2d58e44..eab68704 100644 --- a/ui/dasadmin/src/views/backend/dashboard.vue +++ b/ui/dasadmin/src/views/backend/dashboard.vue @@ -5,7 +5,66 @@
- + +
+
+
+ {{realData.attributeMap.windfarmavgwindspeed}} + m/s +
+
平均风速
+
+
+
+
+
+ {{realData.attributeMap.windfarmactivepower}} + kW +
+
实时有功
+
+
+
+
+
+ {{realData.attributeMap.windfarmreactivepower}} + kvar +
+
实时无功
+
+
+
+
+ +
+ {{realData.attributeMap.windfarmdayprodenergy}} + 万kWh +
+
日发电量
+
+
+
+
+ +
+ {{realData.attributeMap.windfarmmonthprodenergy}} + 万kWh +
+
本月发电量
+
+
+
+
+ +
+ {{realData.attributeMap.windfarmyearprodenergy}} + 万kWh +
+
年发电量
+
+
+ +
@@ -602,6 +661,7 @@ $labelHeight: 30px; margin: 5px; align-items: center; color: #4E5969; + justify-content: space-between; .small-panel-pic{ width: 80px; height: 80px; @@ -610,6 +670,14 @@ $labelHeight: 30px; text-align: center; border-right: 1px #eeeeee solid; } + .smallBox{ + width: 18%; + .small-base{ + text-align: center; + border-right: 1px #eeeeee solid; + } + } + } } From 06788dfa91f8bb5ca8b8946e3131d85ac3b3eee8 Mon Sep 17 00:00:00 2001 From: fengrong Date: Tue, 10 Dec 2024 17:08:48 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/dasadmin/src/views/backend/dashboard.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/dasadmin/src/views/backend/dashboard.vue b/ui/dasadmin/src/views/backend/dashboard.vue index eab68704..79c6b20b 100644 --- a/ui/dasadmin/src/views/backend/dashboard.vue +++ b/ui/dasadmin/src/views/backend/dashboard.vue @@ -671,7 +671,7 @@ $labelHeight: 30px; border-right: 1px #eeeeee solid; } .smallBox{ - width: 18%; + width: 20%; .small-base{ text-align: center; border-right: 1px #eeeeee solid; From ded29af5e93a68f171cf0cfb29ab191d8a95670b Mon Sep 17 00:00:00 2001 From: fengrong Date: Tue, 10 Dec 2024 17:11:19 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/dasadmin/src/views/backend/dashboard.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/dasadmin/src/views/backend/dashboard.vue b/ui/dasadmin/src/views/backend/dashboard.vue index 79c6b20b..eab68704 100644 --- a/ui/dasadmin/src/views/backend/dashboard.vue +++ b/ui/dasadmin/src/views/backend/dashboard.vue @@ -671,7 +671,7 @@ $labelHeight: 30px; border-right: 1px #eeeeee solid; } .smallBox{ - width: 20%; + width: 18%; .small-base{ text-align: center; border-right: 1px #eeeeee solid;