From 7fd4a7b5973c1b321e318f959f6b7295d9500648 Mon Sep 17 00:00:00 2001 From: Wen JY Date: Mon, 14 Aug 2023 14:23:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?change=20-=20=E6=8B=A6=E6=88=AA=E5=99=A8?= =?UTF-8?q?=E3=80=81=E6=95=B0=E6=8D=AE=E5=BA=93=E3=80=81=E7=AB=AF=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/src/main/resources/application-druid.yml | 2 +- ruoyi-admin/src/main/resources/application.yml | 4 ++-- .../java/com/ruoyi/framework/config/InterceptorConfig.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index f8ce9df..46ca272 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -23,7 +23,7 @@ spring: # username: system # password: aucma url: jdbc:oracle:thin:@10.100.71.119:1521:ORCL - username: system + username: scada password: aucma # 从库数据源 slave: diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 9ed7600..06daf9b 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -16,7 +16,7 @@ ruoyi: # 开发环境配置 server: # 服务器的HTTP端口，正式端口8012 - port: 8013 + port: 8012 servlet: # 应用的访问路径 context-path: / @@ -138,4 +138,4 @@ swagger: # 是否开启swagger enabled: true -in_id: 2 +in_id: 1 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/InterceptorConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/InterceptorConfig.java index 58d3e26..b86ac2b 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/InterceptorConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/InterceptorConfig.java @@ -9,6 +9,6 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; public class InterceptorConfig implements WebMvcConfigurer { @Override public void addInterceptors(InterceptorRegistry registry) { - registry.addInterceptor(new AInterceptor()).addPathPatterns("/**"); + //registry.addInterceptor(new AInterceptor()).addPathPatterns("/**"); } } From 46a035f5ebd463b5beec113a81b40330213eecbf Mon Sep 17 00:00:00 2001 From: Wen JY Date: Mon, 14 Aug 2023 15:04:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?change=20-=20=E5=8F=91=E6=B3=A1=E5=B0=8F?= =?UTF-8?q?=E6=97=B6=E8=AE=A1=E5=88=92=E4=BA=A7=E9=87=8F=E7=B4=AF=E8=AE=A1?= =?UTF-8?q?=E5=90=88=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/templates/scada/NorthFoamerMesPlan.html | 4 ++-- .../main/resources/templates/scada/NorthFoamerMesPlan2.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ruoyi-admin/src/main/resources/templates/scada/NorthFoamerMesPlan.html b/ruoyi-admin/src/main/resources/templates/scada/NorthFoamerMesPlan.html index e7b3c59..0667628 100644 --- a/ruoyi-admin/src/main/resources/templates/scada/NorthFoamerMesPlan.html +++ b/ruoyi-admin/src/main/resources/templates/scada/NorthFoamerMesPlan.html @@ -475,10 +475,10 @@ } console.log(dataB) console.log(dataC) - planInfo.loadData([title,...dataA], 19, { + planInfo.loadData([...dataB], 19, { includeHead: true, }) - planInfo2.loadData([title,...dataA], 19, { + planInfo2.loadData([...dataC], 19, { includeHead: true, }) } diff --git a/ruoyi-admin/src/main/resources/templates/scada/NorthFoamerMesPlan2.html b/ruoyi-admin/src/main/resources/templates/scada/NorthFoamerMesPlan2.html index bfda6d7..a87e68b 100644 --- a/ruoyi-admin/src/main/resources/templates/scada/NorthFoamerMesPlan2.html +++ b/ruoyi-admin/src/main/resources/templates/scada/NorthFoamerMesPlan2.html @@ -453,14 +453,14 @@ dataB = [title] dataC = [title] dataB.push(...([...dataA].splice(dataIndex, 6))) - dataB.push([' ', '合计', '', totle([...dataB], 2), totle([...dataB], 3), totle([...dataB], 4), totle([...dataB], 3) === 0 ? '0%' : ((totle([...dataB], 4) / totle([...dataB], 3)) * 100).toString().substr(0, 5) + '%', totle([...dataB], 6), totle([...dataB], 7), totle([...dataB], 8), totle([...dataB], 9), totle([...dataB], 10), totle([...dataB], 11), totle([...dataB], 12), totle([...dataB], 13), totle([...dataB], 14), totle([...dataB], 15), totle([...dataB], 16), totle([...dataB], 17)]) + dataB.push([' ', '合计', '', totle([title,...dataA], 2), totle([title,...dataA], 3), totle([title,...dataA], 4), totle([title,...dataA], 3) === 0 ? '0%' : ((totle([title,...dataA], 4) / totle([title,...dataA], 3)) * 100).toString().substr(0, 5) + '%', totle([title,...dataA], 6), totle([title,...dataA], 7), totle([title,...dataA], 8), totle([title,...dataA], 9), totle([title,...dataA], 10), totle([title,...dataA], 11), totle([title,...dataA], 12), totle([title,...dataA], 13), totle([title,...dataA], 14), totle([title,...dataA], 15), totle([title,...dataA], 16), totle([title,...dataA], 17)]) if (dataIndex + 6 > dataA.length) { dataIndex = 0 } else { dataIndex += 6 } dataC.push(...([...dataA].splice(dataIndex, 6))) - dataC.push([' ', '合计', '', totle([...dataC], 2), totle([...dataC], 3), totle([...dataC], 4), totle([...dataC], 3) === 0 ? '0%' : ((totle([...dataC], 4) / totle([...dataC], 3)) * 100).toString().substr(0, 5) + '%', totle([...dataC], 6), totle([...dataC], 7), totle([...dataC], 8), totle([...dataC], 9), totle([...dataC], 10), totle([...dataC], 11), totle([...dataC], 12), totle([...dataC], 13), totle([...dataC], 14), totle([...dataC], 15), totle([...dataC], 16), totle([...dataC], 17)]) + dataC.push([' ', '合计', '', totle([title,...dataA], 2), totle([title,...dataA], 3), totle([title,...dataA], 4), totle([title,...dataA], 3) === 0 ? '0%' : ((totle([title,...dataA], 4) / totle([title,...dataA], 3)) * 100).toString().substr(0, 5) + '%', totle([title,...dataA], 6), totle([title,...dataA], 7), totle([title,...dataA], 8), totle([title,...dataA], 9), totle([title,...dataA], 10), totle([title,...dataA], 11), totle([title,...dataA], 12), totle([title,...dataA], 13), totle([title,...dataA], 14), totle([title,...dataA], 15), totle([title,...dataA], 16), totle([title,...dataA], 17)]) if (dataIndex + 6 > dataA.length) { dataIndex = 0 } else {