jiazhizhong/fx-falsework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改一些细节

Browse Source
This commit is contained in:
liwen
2020-12-01 11:39:51 +08:00
parent fdc2ccf499
commit a2fde7654a
9 changed files with 121 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
client/src/main/java/META-INF/MANIFEST.MF Normal file
View File

@@ -0,0 +1,56 @@
Manifest-Version: 1.0
Main-Class: com.epri.fx.client.AppStartup
Class-Path: . libs/javax.inject-1.jar libs/tilesfx-1.6.8.jar libs/netfli
x-statistics-0.1.1.jar libs/jackson-core-2.11.0.jar libs/spring-boot-st
arter-security-2.3.0.RELEASE.jar libs/spring-boot-starter-logging-2.3.0
.RELEASE.jar libs/spring-web-5.2.6.RELEASE.jar libs/jackson-module-para
meter-names-2.11.0.jar libs/datafx-injection-8.0.2-SNAPSHOT.jar libs/pi
nyin4j-2.5.0.jar libs/okhttp-3.14.8.jar libs/spring-context-support-5.2
.6.RELEASE.jar libs/spring-boot-starter-json-2.3.0.RELEASE.jar libs/myb
atis-spring-2.0.5.jar libs/druid-spring-boot-starter-1.1.14.jar libs/Hi
kariCP-3.4.5.jar libs/xml-apis-1.0.b2.jar libs/datafx-core-8.0.2-SNAPSH
OT.jar libs/controlsfx-8.40.17.jar libs/pagehelper-spring-boot-autoconf
igure-1.2.5.jar libs/archaius-core-0.7.6.jar libs/commons-collections-3
.2.1.jar libs/servo-core-0.10.1.jar libs/feign-jackson-10.9.jar libs/ja
karta.annotation-api-1.3.5.jar libs/jsr305-3.0.1.jar libs/ribbon-loadba
lancer-2.3.0.jar libs/tomcat-embed-websocket-9.0.35.jar libs/spring-con
text-5.2.6.RELEASE.jar libs/slf4j-api-1.7.30.jar libs/mybatis-spring-bo
ot-autoconfigure-2.1.3.jar libs/spring-boot-starter-jdbc-2.3.0.RELEASE.
jar libs/okio-1.17.2.jar libs/spring-tx-5.2.6.RELEASE.jar libs/jackson-
datatype-jsr310-2.11.0.jar libs/commons-lang3-3.10.jar libs/spring-boot
-starter-cache-2.3.0.RELEASE.jar libs/jsr311-api-1.1.1.jar libs/hystrix
-core-1.5.18.jar libs/httpcore-4.4.13.jar libs/datafx-flow-8.0.2-SNAPSH
OT.jar libs/ribbon-core-2.3.0.jar libs/log4j-api-2.13.2.jar libs/lucene
-queryparser-7.4.0.jar libs/joda-time-2.10.1.jar libs/servo-internal-0.
10.1.jar libs/pagehelper-5.1.4.jar libs/annotations-2.0.0.jar libs/spri
ng-boot-starter-2.3.0.RELEASE.jar libs/lucene-core-7.4.0.jar libs/dom4j
-1.6.1.jar libs/feign-hystrix-10.9.jar libs/javassist-3.18.1-GA.jar lib
s/logback-classic-1.2.3.jar libs/observable-toogles-0.1.jar libs/DmJdbc
Driver-1.0.0.jar libs/jfoenix-8.0.10.jar libs/tomcat-embed-core-9.0.35.
jar libs/ikonli-javafx-2.4.0.jar libs/spring-security-config-5.3.2.RELE
ASE.jar libs/spring-boot-autoconfigure-2.3.0.RELEASE.jar libs/jakarta.e
l-3.0.3.jar libs/rxjava-1.3.8.jar libs/snakeyaml-1.26.jar libs/spring-s
ecurity-core-5.3.2.RELEASE.jar libs/spring-jdbc-5.2.6.RELEASE.jar libs/
lucene-sandbox-7.4.0.jar libs/pagehelper-spring-boot-starter-1.2.5.jar
libs/log4j-to-slf4j-2.13.2.jar libs/HdrHistogram-2.1.9.jar libs/jjwt-0.
7.0.jar libs/jersey-apache-client4-1.19.1.jar libs/spring-expression-5.
2.6.RELEASE.jar libs/lucene-queries-7.4.0.jar libs/spring-security-web-
5.3.2.RELEASE.jar libs/commons-logging-1.1.1.jar libs/feign-ribbon-10.9
.jar libs/feign-okhttp-10.9.jar libs/ikonli-fontawesome5-pack-2.4.0.jar
libs/feign-core-10.9.jar libs/druid-1.1.14.jar libs/spring-core-5.2.6.
RELEASE.jar libs/commons-configuration-1.8.jar libs/spring-boot-starter
-tomcat-2.3.0.RELEASE.jar libs/logback-core-1.2.3.jar libs/lucene-group
ing-7.4.0.jar libs/spring-beans-5.2.6.RELEASE.jar libs/datafx-eventsyst
em-8.0.2-SNAPSHOT.jar libs/spring-boot-starter-web-2.3.0.RELEASE.jar li
bs/jackson-datatype-jdk8-2.11.0.jar libs/togglz-core-2.0.1.Final.jar li
bs/mysql-connector-java-8.0.20.jar libs/spring-webmvc-5.2.6.RELEASE.jar
libs/jul-to-slf4j-1.7.30.jar libs/spring-jcl-5.2.6.RELEASE.jar libs/ne
tflix-commons-util-0.1.1.jar libs/spring-boot-2.3.0.RELEASE.jar libs/co
mmons-lang-2.6.jar libs/jackson-annotations-2.11.0.jar libs/jackson-dat
abind-2.11.0.jar libs/jersey-client-1.19.1.jar libs/fontawesomefx-8.9.j
ar libs/ribbon-httpclient-2.2.0.jar libs/ikonli-core-2.4.0.jar libs/myb
atis-3.5.5.jar libs/jersey-core-1.19.1.jar libs/guava-16.0.1.jar libs/s
pring-aop-5.2.6.RELEASE.jar libs/commons-codec-1.14.jar libs/mybatis-sp
ring-boot-starter-2.1.3.jar libs/httpclient-4.5.12.jar libs/feign-slf4j
-10.9.jar libs/jsqlparser-1.0.jar

46
client/src/main/java/com/epri/fx/client/gui/uicomponents/home/HomeController.java
View File

@@ -63,6 +63,8 @@ public class HomeController {
public static final Color BACKGROUND_DARK = Color.rgb(39, 49, 66); // #2a2a2a
public static final Color BACKGROUND_LIGHT = Color.rgb(255, 255, 255); // #2a2a2a
public static final Color FOREGROUND_DARK = Color.rgb(223, 223, 223); // #2a2a2a
public static final Color FOREGROUND_LIGHT = Color.rgb(52, 52, 52); // #2a2a2a
public static final Color BORDERCOLOR_DARK = Color.rgb(49, 61, 79); // #2a2a2a
public static final Color BORDERCOLOR_LIGHT = Color.rgb(185, 185, 185, 0.3f); // #2a2a2a
@@ -214,6 +216,14 @@ public class HomeController {
chartData6 = new ChartData("Item 6", 13.0, Tile.BLUE);
chartData7 = new ChartData("Item 7", 13.0, Tile.BLUE);
chartData8 = new ChartData("Item 8", 13.0, Tile.BLUE);
chartData1.setTextColor(FOREGROUND_LIGHT);
chartData2.setTextColor(FOREGROUND_LIGHT);
chartData3.setTextColor(FOREGROUND_LIGHT);
chartData4.setTextColor(FOREGROUND_LIGHT);
chartData5.setTextColor(FOREGROUND_LIGHT);
chartData6.setTextColor(FOREGROUND_LIGHT);
chartData7.setTextColor(FOREGROUND_LIGHT);
chartData8.setTextColor(FOREGROUND_LIGHT);
//ChartData.animated = false;
smoothChartData1 = new ChartData("Item 1", RND.nextDouble() * 25, Tile.BLUE);
@@ -223,20 +233,20 @@ public class HomeController {
sparkLineTile = TileBuilder.create()
.skinType(Tile.SkinType.SPARK_LINE)
.skinType(Tile.SkinType.SPARK_LINE).foregroundBaseColor(FOREGROUND_LIGHT)
.title("SparkLine Tile")
.unit("mb").borderRadius(14)
.gradientStops(new Stop(0, Tile.GREEN),
new Stop(0.5, Tile.YELLOW),
new Stop(1.0, Tile.RED))
.strokeWithGradient(true)
.backgroundColor(BACKGROUND_DARK).borderColor(BORDERCOLOR_DARK).borderWidth(0.8d)
.backgroundColor(BACKGROUND_LIGHT).borderColor(BORDERCOLOR_LIGHT).borderWidth(0.8d)
//.smoothing(true)
.build();
areaChartTile = TileBuilder.create()
.skinType(Tile.SkinType.SMOOTHED_CHART).backgroundColor(BACKGROUND_DARK).borderRadius(14).borderColor(BORDERCOLOR_DARK).borderWidth(0.8d)
.skinType(Tile.SkinType.SMOOTHED_CHART).foregroundBaseColor(FOREGROUND_LIGHT).backgroundColor(BACKGROUND_LIGHT).borderRadius(14).borderColor(BORDERCOLOR_LIGHT).borderWidth(0.8d)
.title("SmoothedChart Tile")
.chartType(Tile.ChartType.AREA)
//.animated(true)
@@ -251,16 +261,16 @@ public class HomeController {
.build();
lineChartTile = TileBuilder.create()
.skinType(Tile.SkinType.SMOOTHED_CHART).backgroundColor(BACKGROUND_DARK).borderRadius(14).borderColor(BORDERCOLOR_DARK).borderWidth(0.8d)
.skinType(Tile.SkinType.SMOOTHED_CHART).foregroundBaseColor(FOREGROUND_LIGHT).backgroundColor(BACKGROUND_LIGHT).borderRadius(14).borderColor(BORDERCOLOR_LIGHT).borderWidth(0.8d)
.title("SmoothedChart Tile")
//.animated(true)
.animated(true)
.smoothing(false)
.series(series2, series3)
.build();
worldTile = TileBuilder.create()
.skinType(Tile.SkinType.WORLDMAP).backgroundColor(BACKGROUND_DARK).borderRadius(14).borderColor(BORDERCOLOR_DARK).borderWidth(0.8d)
.skinType(Tile.SkinType.WORLDMAP).foregroundBaseColor(FOREGROUND_LIGHT).backgroundColor(BACKGROUND_LIGHT).borderRadius(14).borderColor(BORDERCOLOR_LIGHT).borderWidth(0.8d)
.title("WorldMap Tile")
.text("Whatever text")
.textVisible(false)
@@ -268,7 +278,7 @@ public class HomeController {
radialChartTile = TileBuilder.create()
.skinType(Tile.SkinType.RADIAL_CHART).backgroundColor(BACKGROUND_DARK).borderRadius(14).borderColor(BORDERCOLOR_DARK).borderWidth(0.8d)
.skinType(Tile.SkinType.RADIAL_CHART).foregroundBaseColor(FOREGROUND_LIGHT).backgroundColor(BACKGROUND_LIGHT).borderRadius(14).borderColor(BORDERCOLOR_LIGHT).borderWidth(0.8d)
.title("RadialChart")
.text("Some text")
.textVisible(false)
@@ -277,7 +287,7 @@ public class HomeController {
donutChartTile = TileBuilder.create()
.skinType(Tile.SkinType.DONUT_CHART)
.title("DonutChart").backgroundColor(BACKGROUND_DARK).borderRadius(14).borderColor(BORDERCOLOR_DARK).borderWidth(0.8d)
.title("DonutChart").foregroundBaseColor(FOREGROUND_LIGHT).backgroundColor(BACKGROUND_LIGHT).borderRadius(14).borderColor(BORDERCOLOR_LIGHT).borderWidth(0.8d)
.text("Some text")
.textVisible(false)
.chartData(chartData1, chartData2, chartData3, chartData4)
@@ -285,7 +295,7 @@ public class HomeController {
circularProgressTile = TileBuilder.create()
.skinType(Tile.SkinType.CIRCULAR_PROGRESS)
.title("CircularProgress").backgroundColor(BACKGROUND_DARK).borderRadius(14).borderColor(BORDERCOLOR_DARK).borderWidth(0.8d)
.title("CircularProgress").foregroundBaseColor(FOREGROUND_LIGHT).backgroundColor(BACKGROUND_LIGHT).borderRadius(14).borderColor(BORDERCOLOR_LIGHT).borderWidth(0.8d)
.text("Some text")
.unit("\u0025")
//.graphic(new WeatherSymbol(ConditionAndIcon.CLEAR_DAY, 48, Color.WHITE))
@@ -294,7 +304,7 @@ public class HomeController {
radarChartTile1 = TileBuilder.create().skinType(Tile.SkinType.RADAR_CHART)
.minValue(0)
.maxValue(50).backgroundColor(BACKGROUND_DARK).borderRadius(14).borderColor(BORDERCOLOR_DARK).borderWidth(0.8d)
.maxValue(50).foregroundBaseColor(FOREGROUND_LIGHT).backgroundColor(BACKGROUND_LIGHT).borderRadius(14).borderColor(BORDERCOLOR_LIGHT).borderWidth(0.8d)
.title("RadarChart Sector")
.unit("Unit")
.radarChartMode(RadarChart.Mode.SECTOR)
@@ -318,7 +328,7 @@ public class HomeController {
ephemerisTile = TileBuilder.create().skinType(Tile.SkinType.EPHEMERIS)
.title("Ephemeris").backgroundColor(BACKGROUND_DARK).borderRadius(14).borderColor(BORDERCOLOR_DARK).borderWidth(0.8d)
.title("Ephemeris").foregroundBaseColor(FOREGROUND_LIGHT).backgroundColor(BACKGROUND_LIGHT).borderRadius(14).borderColor(BORDERCOLOR_LIGHT).borderWidth(0.8d)
.currentLocation(new Location(51.911515, 7.6340026, "Hiltrup"))
.text("Hiltrup")
.build();
@@ -335,7 +345,7 @@ public class HomeController {
statusTile = TileBuilder.create()
.skinType(Tile.SkinType.STATUS)
.title("Status Tile").borderWidth(0.8d).backgroundColor(BACKGROUND_DARK).borderRadius(14).borderColor(BORDERCOLOR_DARK).borderWidth(0.8d)
.title("Status Tile").foregroundBaseColor(FOREGROUND_LIGHT).borderWidth(0.8d).backgroundColor(BACKGROUND_LIGHT).borderRadius(14).borderColor(BORDERCOLOR_LIGHT).borderWidth(0.8d)
.description("Notifications")
.leftText("CRITICAL")
.middleText("WARNING")
@@ -426,11 +436,19 @@ public class HomeController {
if (newValue) {
((Tile) node).setBackgroundColor(BACKGROUND_DARK);
((Tile) node).setBorderColor(BORDERCOLOR_DARK);
((Tile) node).setForegroundColor(Color.rgb(223, 223, 223));
((Tile) node).setForegroundBaseColor(FOREGROUND_DARK);
((Tile) node).getChartData().forEach(chartData -> {
chartData.setTextColor(FOREGROUND_DARK);
});
} else {
((Tile) node).setBackgroundColor(BACKGROUND_LIGHT);
((Tile) node).setBorderColor(BORDERCOLOR_LIGHT);
((Tile) node).setForegroundColor(Color.rgb(84, 84, 84));
((Tile) node).setForegroundBaseColor(FOREGROUND_LIGHT);
((Tile) node).getChartData().forEach(chartData -> {
chartData.setTextColor(FOREGROUND_LIGHT);
});
}
}

2
client/src/main/java/com/epri/fx/client/gui/uicomponents/login/LoginController.java
View File

@@ -187,7 +187,7 @@ public class LoginController {
registeredPane.managedProperty().bind(registeredPane.visibleProperty());
initAnimation();
loadingImage();
// loadingImage();
initAction();
}

35
client/src/main/resources/css/app-dark.css
View File

@@ -925,29 +925,26 @@
}
.tile {
-BACKGROUND: rgb(42, 42, 42);
-FOREGROUND: rgb(223, 223, 223);
-GRAY: rgb(139, 144, 146);
-RED: rgb(229, 80, 76);
-LIGHT_RED: rgb(255, 84, 56);
-GREEN: rgb(143, 198, 94);
-LIGHT_GREEN: rgb(132, 228, 50);
-BLUE: rgb(55, 179, 252);
-DARK_BLUE: rgb(55, 94, 252);
-ORANGE: rgb(237, 162, 57);
-YELLOW_ORANGE: rgb(229, 198, 76);
-YELLOW: rgb(229, 229, 76);
-MAGENTA: rgb(198, 75, 232);
-PINK: rgb(233, 14, 139);
-foreground-color: -FOREGROUND;
.tile .chart-vertical-grid-lines {
-fx-stroke : #797979;
-fx-stroke-dash-array: null;
}
.tile .chart-horizontal-grid-lines {
-fx-stroke : #797979;
-fx-stroke-dash-array: null;
}
.tile .axis {
AXIS_COLOR : #c4c4c4;
-fx-tick-label-fill: #c4c4c4;
}
.tile .axis-label {
-fx-text-fill: #ff0000;
}

32
client/src/main/resources/css/app-light.css
View File

@@ -923,23 +923,21 @@
}
.tile {
-BACKGROUND : rgb(42, 42, 42);
-FOREGROUND : rgb(233, 16, 16);
-GRAY : rgb(139,144,146);
-RED : rgb(229, 80, 76);
-LIGHT_RED : rgb(255, 84, 56);
-GREEN : rgb(143, 198, 94);
-LIGHT_GREEN : rgb(132, 228, 50);
-BLUE : rgb(55, 179, 252);
-DARK_BLUE : rgb(55, 94, 252);
-ORANGE : rgb(237, 162, 57);
-YELLOW_ORANGE : rgb(229, 198, 76);
-YELLOW : rgb(229, 229, 76);
-MAGENTA : rgb(198, 75, 232);
-PINK : rgb(233, 14, 139);
-foreground-color: -FOREGROUND;
.tile .chart-vertical-grid-lines {
-fx-stroke : #9d9d9d;
-fx-stroke-dash-array: null;
}
.tile .chart-horizontal-grid-lines {
-fx-stroke : #9d9d9d;
-fx-stroke-dash-array: null;
}
.tile .axis {
AXIS_COLOR : #454545;
-fx-tick-label-fill: #454545;
}
@@ -951,5 +949,3 @@

2
client/src/main/resources/fxml/admin/groupType/group_type_management.fxml
View File

@@ -15,7 +15,7 @@
<children>
<VBox spacing="7.0">
<children>
<HBox alignment="CENTER_RIGHT" spacing="10.0">
<HBox alignment="CENTER_RIGHT" spacing="10.0" styleClass="card-pane">
<children>
<JFXTextField fx:id="searchField" prefHeight="27.0" prefWidth="235.0" promptText="姓名或账户" />
<JFXButton fx:id="searchButton" buttonType="RAISED" text="搜索" />

2
client/src/main/resources/fxml/admin/user/user_management.fxml
View File

@@ -15,7 +15,7 @@
<children>
<VBox fx:id="centPane" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" spacing="10.0">
<children>
<HBox alignment="CENTER_RIGHT" maxHeight="-Infinity" prefHeight="45.0" prefWidth="200.0" spacing="10.0">
<HBox alignment="CENTER_RIGHT" maxHeight="-Infinity" prefHeight="45.0" prefWidth="200.0" spacing="10.0" styleClass="card-pane">
<children>
<JFXTextField fx:id="searchField" promptText="用户名或账户" />
<JFXButton fx:id="searchBut" buttonType="RAISED" text="搜索" />

BIN
client/src/main/resources/images/app.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 22 KiB

BIN
client/src/main/resources/images/loginBack.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 10 MiB