diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_11.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_11.xml index 3bfac4b..103c121 100644 --- a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_11.xml +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_11.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_11.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_11.xml index 66fd58c..1e0339a 100644 --- a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_11.xml +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_11.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__cn_easyproject_orai18n_12_1_0_2_0.xml b/.idea/libraries/Maven__cn_easyproject_orai18n_12_1_0_2_0.xml index c803520..f2379b0 100644 --- a/.idea/libraries/Maven__cn_easyproject_orai18n_12_1_0_2_0.xml +++ b/.idea/libraries/Maven__cn_easyproject_orai18n_12_1_0_2_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_alibaba_fastjson_1_2_47.xml b/.idea/libraries/Maven__com_alibaba_fastjson_1_2_47.xml index 2cdf25a..42f9e5c 100644 --- a/.idea/libraries/Maven__com_alibaba_fastjson_1_2_47.xml +++ b/.idea/libraries/Maven__com_alibaba_fastjson_1_2_47.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_2_0.xml b/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_2_0.xml index 9ce1011..e4a4a68 100644 --- a/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_2_0.xml +++ b/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_2_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_2_0.xml b/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_2_0.xml index 56ca092..8ae7b70 100644 --- a/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_2_0.xml +++ b/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_2_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_2_0.xml b/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_2_0.xml index 8dadb10..249af6d 100644 --- a/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_2_0.xml +++ b/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_2_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_2_0.xml b/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_2_0.xml index a67e6d7..2b498ec 100644 --- a/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_2_0.xml +++ b/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_2_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_2_0.xml b/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_2_0.xml index 893e509..abaf362 100644 --- a/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_2_0.xml +++ b/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_2_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_baomidou_mybatis_plus_generator_3_2_0.xml b/.idea/libraries/Maven__com_baomidou_mybatis_plus_generator_3_2_0.xml index 7bd08c4..0825d93 100644 --- a/.idea/libraries/Maven__com_baomidou_mybatis_plus_generator_3_2_0.xml +++ b/.idea/libraries/Maven__com_baomidou_mybatis_plus_generator_3_2_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_13_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_13_2.xml index 49f73b6..bc75e22 100644 --- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_13_2.xml +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_13_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_13_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_13_2.xml index 3225882..f4b523f 100644 --- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_13_2.xml +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_13_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_13_2_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_13_2_2.xml index 0d8cd7a..4dff754 100644 --- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_13_2_2.xml +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_13_2_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_13_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_13_2.xml index 0cedb0a..1864ccc 100644 --- a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_13_2.xml +++ b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_13_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_13_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_13_2.xml index 0aaf5c1..e5edabc 100644 --- a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_13_2.xml +++ b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_13_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_13_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_13_2.xml index e4acb69..e2d7a12 100644 --- a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_13_2.xml +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_13_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_2_1.xml b/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_2_1.xml index 8a0f349..fc4a883 100644 --- a/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_2_1.xml +++ b/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_2_1.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_6_0.xml b/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_6_0.xml index b28fff9..510eca2 100644 --- a/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_6_0.xml +++ b/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_6_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_database_jdbc_ojdbc8_21_3_0_0.xml b/.idea/libraries/Maven__com_oracle_database_jdbc_ojdbc8_21_3_0_0.xml index ff6a736..469e94f 100644 --- a/.idea/libraries/Maven__com_oracle_database_jdbc_ojdbc8_21_3_0_0.xml +++ b/.idea/libraries/Maven__com_oracle_database_jdbc_ojdbc8_21_3_0_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml b/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml index 5eb2b35..3899977 100644 --- a/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml +++ b/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_zaxxer_HikariCP_4_0_3.xml b/.idea/libraries/Maven__com_zaxxer_HikariCP_4_0_3.xml index c747323..b5eceb8 100644 --- a/.idea/libraries/Maven__com_zaxxer_HikariCP_4_0_3.xml +++ b/.idea/libraries/Maven__com_zaxxer_HikariCP_4_0_3.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml b/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml index 624e833..4b21a76 100644 --- a/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml +++ b/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml b/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml index 0d51901..39760fa 100644 --- a/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml +++ b/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml b/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml index 0192e98..61d47cf 100644 --- a/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml +++ b/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_28.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_28.xml index b0f1889..6a6ca9f 100644 --- a/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_28.xml +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_28.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_11_22.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_11_22.xml index dedcf1e..0558039 100644 --- a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_11_22.xml +++ b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_11_22.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_11_22.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_11_22.xml index d13245d..c334ffe 100644 --- a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_11_22.xml +++ b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_11_22.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_minidev_accessors_smart_2_4_8.xml b/.idea/libraries/Maven__net_minidev_accessors_smart_2_4_8.xml index c7671bb..96bdf9f 100644 --- a/.idea/libraries/Maven__net_minidev_accessors_smart_2_4_8.xml +++ b/.idea/libraries/Maven__net_minidev_accessors_smart_2_4_8.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_minidev_json_smart_2_4_8.xml b/.idea/libraries/Maven__net_minidev_json_smart_2_4_8.xml index 4fb29ab..5ce913d 100644 --- a/.idea/libraries/Maven__net_minidev_json_smart_2_4_8.xml +++ b/.idea/libraries/Maven__net_minidev_json_smart_2_4_8.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_17_2.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_17_2.xml index 9593449..b6827fc 100644 --- a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_17_2.xml +++ b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_17_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_17_2.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_17_2.xml index 15a9fd6..d6d975a 100644 --- a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_17_2.xml +++ b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_17_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_60.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_60.xml index 0f16a1e..2b29a22 100644 --- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_60.xml +++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_60.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_60.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_60.xml index 2469e48..f4a1403 100644 --- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_60.xml +++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_60.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_60.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_60.xml index 0c8717c..3f16778 100644 --- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_60.xml +++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_60.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_2.xml b/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_2.xml index 1a06739..645e245 100644 --- a/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_2.xml +++ b/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_assertj_assertj_core_3_21_0.xml b/.idea/libraries/Maven__org_assertj_assertj_core_3_21_0.xml index 993a750..58fe1f5 100644 --- a/.idea/libraries/Maven__org_assertj_assertj_core_3_21_0.xml +++ b/.idea/libraries/Maven__org_assertj_assertj_core_3_21_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_attoparser_attoparser_2_0_5_RELEASE.xml b/.idea/libraries/Maven__org_attoparser_attoparser_2_0_5_RELEASE.xml index 1838b35..afc1101 100644 --- a/.idea/libraries/Maven__org_attoparser_attoparser_2_0_5_RELEASE.xml +++ b/.idea/libraries/Maven__org_attoparser_attoparser_2_0_5_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_freemarker_freemarker_2_3_31.xml b/.idea/libraries/Maven__org_freemarker_freemarker_2_3_31.xml index 07491d3..53045c3 100644 --- a/.idea/libraries/Maven__org_freemarker_freemarker_2_3_31.xml +++ b/.idea/libraries/Maven__org_freemarker_freemarker_2_3_31.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml index f08b75b..ae33eaf 100644 --- a/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_8_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_8_2.xml index 49a5485..02dd763 100644 --- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_8_2.xml +++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_8_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_8_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_8_2.xml index 5744e41..11e6f8b 100644 --- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_8_2.xml +++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_8_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_8_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_8_2.xml index d477228..aca8711 100644 --- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_8_2.xml +++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_8_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_8_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_8_2.xml index 32533ba..8bae46e 100644 --- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_8_2.xml +++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_8_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_8_2.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_8_2.xml index 6d332c3..55fcebc 100644 --- a/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_8_2.xml +++ b/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_8_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_8_2.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_8_2.xml index 8b6af51..4e40324 100644 --- a/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_8_2.xml +++ b/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_8_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_4_0_0.xml b/.idea/libraries/Maven__org_mockito_mockito_core_4_0_0.xml index 8789950..43f70cf 100644 --- a/.idea/libraries/Maven__org_mockito_mockito_core_4_0_0.xml +++ b/.idea/libraries/Maven__org_mockito_mockito_core_4_0_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_4_0_0.xml b/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_4_0_0.xml index f8eb710..cedd96c 100644 --- a/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_4_0_0.xml +++ b/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_4_0_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_3_5_2.xml b/.idea/libraries/Maven__org_mybatis_mybatis_3_5_2.xml index 4f1357f..bfcc44e 100644 --- a/.idea/libraries/Maven__org_mybatis_mybatis_3_5_2.xml +++ b/.idea/libraries/Maven__org_mybatis_mybatis_3_5_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_2.xml b/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_2.xml index d1b1d9d..230090d 100644 --- a/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_2.xml +++ b/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_3_2.xml b/.idea/libraries/Maven__org_objenesis_objenesis_3_2.xml index f7723a6..d106a5e 100644 --- a/.idea/libraries/Maven__org_objenesis_objenesis_3_2.xml +++ b/.idea/libraries/Maven__org_objenesis_objenesis_3_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml b/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml index bebbb38..5b7d0e0 100644 --- a/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml +++ b/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_9_1.xml b/.idea/libraries/Maven__org_ow2_asm_asm_9_1.xml index a13059f..2c5c126 100644 --- a/.idea/libraries/Maven__org_ow2_asm_asm_9_1.xml +++ b/.idea/libraries/Maven__org_ow2_asm_asm_9_1.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_projectlombok_lombok_1_18_22.xml b/.idea/libraries/Maven__org_projectlombok_lombok_1_18_22.xml index 5cffa84..7ebafb5 100644 --- a/.idea/libraries/Maven__org_projectlombok_lombok_1_18_22.xml +++ b/.idea/libraries/Maven__org_projectlombok_lombok_1_18_22.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml b/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml index 8dea164..05fb21c 100644 --- a/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml +++ b/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_36.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_36.xml index a6a570e..7dee608 100644 --- a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_36.xml +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_36.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_36.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_36.xml index e71f13b..d60f6ed 100644 --- a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_36.xml +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_36.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_6_6.xml index 5470298..31f2220 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_6_6.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_6_6.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_6_6.xml index f225e53..2a7691d 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_6_6.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_6_6.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_6_6.xml index 2c3c04c..b74c8b4 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_6_6.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_6_6.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_6_6.xml index 26fe404..2052cda 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_6_6.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_6_6.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_freemarker_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_freemarker_2_6_6.xml index 47348e7..4a745d5 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_freemarker_2_6_6.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_freemarker_2_6_6.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_6_6.xml index 65413c2..cb2270e 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_6_6.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_6_6.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_6_6.xml index e3c782a..ccac7ec 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_6_6.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_6_6.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_6_6.xml index e3f2001..786ac60 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_6_6.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_6_6.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_6_6.xml index 430a840..b5accc0 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_6_6.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_6_6.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_2_6_6.xml index 2f98709..c264c31 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_2_6_6.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_2_6_6.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_6_6.xml index f2d75c9..9987307 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_6_6.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_6_6.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_6_6.xml index 41cffd0..51fc99b 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_6_6.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_6_6.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_6_6.xml index f7f57ec..7df3556 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_6_6.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_6_6.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_6_6.xml index c7e2738..2305cf3 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_6_6.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_6_6.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_5_3_18.xml b/.idea/libraries/Maven__org_springframework_spring_aop_5_3_18.xml index cf9641a..36078d0 100644 --- a/.idea/libraries/Maven__org_springframework_spring_aop_5_3_18.xml +++ b/.idea/libraries/Maven__org_springframework_spring_aop_5_3_18.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_5_3_18.xml b/.idea/libraries/Maven__org_springframework_spring_beans_5_3_18.xml index 4f0c8ae..d147640 100644 --- a/.idea/libraries/Maven__org_springframework_spring_beans_5_3_18.xml +++ b/.idea/libraries/Maven__org_springframework_spring_beans_5_3_18.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_5_3_18.xml b/.idea/libraries/Maven__org_springframework_spring_context_5_3_18.xml index 01f2da1..a3b5344 100644 --- a/.idea/libraries/Maven__org_springframework_spring_context_5_3_18.xml +++ b/.idea/libraries/Maven__org_springframework_spring_context_5_3_18.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_5_3_18.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_5_3_18.xml index 4063512..626d85b 100644 --- a/.idea/libraries/Maven__org_springframework_spring_context_support_5_3_18.xml +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_5_3_18.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_5_3_18.xml b/.idea/libraries/Maven__org_springframework_spring_core_5_3_18.xml index 53e8608..a760a37 100644 --- a/.idea/libraries/Maven__org_springframework_spring_core_5_3_18.xml +++ b/.idea/libraries/Maven__org_springframework_spring_core_5_3_18.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_5_3_18.xml b/.idea/libraries/Maven__org_springframework_spring_expression_5_3_18.xml index 530a252..8375a56 100644 --- a/.idea/libraries/Maven__org_springframework_spring_expression_5_3_18.xml +++ b/.idea/libraries/Maven__org_springframework_spring_expression_5_3_18.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jcl_5_3_18.xml b/.idea/libraries/Maven__org_springframework_spring_jcl_5_3_18.xml index 75120b1..b397472 100644 --- a/.idea/libraries/Maven__org_springframework_spring_jcl_5_3_18.xml +++ b/.idea/libraries/Maven__org_springframework_spring_jcl_5_3_18.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_5_3_18.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_5_3_18.xml index 24deb65..4c074ca 100644 --- a/.idea/libraries/Maven__org_springframework_spring_jdbc_5_3_18.xml +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_5_3_18.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_5_3_18.xml b/.idea/libraries/Maven__org_springframework_spring_test_5_3_18.xml index 8ceaf93..4dece25 100644 --- a/.idea/libraries/Maven__org_springframework_spring_test_5_3_18.xml +++ b/.idea/libraries/Maven__org_springframework_spring_test_5_3_18.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_5_3_18.xml b/.idea/libraries/Maven__org_springframework_spring_tx_5_3_18.xml index 3374580..ab40436 100644 --- a/.idea/libraries/Maven__org_springframework_spring_tx_5_3_18.xml +++ b/.idea/libraries/Maven__org_springframework_spring_tx_5_3_18.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_5_3_18.xml b/.idea/libraries/Maven__org_springframework_spring_web_5_3_18.xml index 2a04ddf..4cb8253 100644 --- a/.idea/libraries/Maven__org_springframework_spring_web_5_3_18.xml +++ b/.idea/libraries/Maven__org_springframework_spring_web_5_3_18.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_5_3_18.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_5_3_18.xml index 95fa0da..0ab9eab 100644 --- a/.idea/libraries/Maven__org_springframework_spring_webmvc_5_3_18.xml +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_5_3_18.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_thymeleaf_extras_thymeleaf_extras_java8time_3_0_4_RELEASE.xml b/.idea/libraries/Maven__org_thymeleaf_extras_thymeleaf_extras_java8time_3_0_4_RELEASE.xml index f7b24c7..593a3b6 100644 --- a/.idea/libraries/Maven__org_thymeleaf_extras_thymeleaf_extras_java8time_3_0_4_RELEASE.xml +++ b/.idea/libraries/Maven__org_thymeleaf_extras_thymeleaf_extras_java8time_3_0_4_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_thymeleaf_thymeleaf_3_0_15_RELEASE.xml b/.idea/libraries/Maven__org_thymeleaf_thymeleaf_3_0_15_RELEASE.xml index de06823..266bc1c 100644 --- a/.idea/libraries/Maven__org_thymeleaf_thymeleaf_3_0_15_RELEASE.xml +++ b/.idea/libraries/Maven__org_thymeleaf_thymeleaf_3_0_15_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring5_3_0_15_RELEASE.xml b/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring5_3_0_15_RELEASE.xml index bcf1e18..b3dbd9f 100644 --- a/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring5_3_0_15_RELEASE.xml +++ b/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring5_3_0_15_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_unbescape_unbescape_1_1_6_RELEASE.xml b/.idea/libraries/Maven__org_unbescape_unbescape_1_1_6_RELEASE.xml index c8017d4..3572d1e 100644 --- a/.idea/libraries/Maven__org_unbescape_unbescape_1_1_6_RELEASE.xml +++ b/.idea/libraries/Maven__org_unbescape_unbescape_1_1_6_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_8_4.xml b/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_8_4.xml index c2004af..accfa41 100644 --- a/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_8_4.xml +++ b/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_8_4.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_yaml_snakeyaml_1_29.xml b/.idea/libraries/Maven__org_yaml_snakeyaml_1_29.xml index 61cd4dc..246aa4d 100644 --- a/.idea/libraries/Maven__org_yaml_snakeyaml_1_29.xml +++ b/.idea/libraries/Maven__org_yaml_snakeyaml_1_29.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/productionboard/src/main/resources/static/css/common/ondutyplan.css b/productionboard/src/main/resources/static/css/common/ondutyplan.css index c565020..5650d9d 100644 --- a/productionboard/src/main/resources/static/css/common/ondutyplan.css +++ b/productionboard/src/main/resources/static/css/common/ondutyplan.css @@ -10,7 +10,7 @@ .display-blocks { text-align: center; - font-size: 16% !important; + font-size: 1.6vw; } .display-blocks span { diff --git a/productionboard/src/main/resources/static/css/foamBox/style.css b/productionboard/src/main/resources/static/css/foamBox/style.css index 8b5c2bd..0cf3476 100644 --- a/productionboard/src/main/resources/static/css/foamBox/style.css +++ b/productionboard/src/main/resources/static/css/foamBox/style.css @@ -118,8 +118,8 @@ body { .swiperModule { position: absolute; width: 23%; - height: 19%; - top: 47%; + height: 21%; + top: 45%; left: 73%; } diff --git a/productionboard/src/main/resources/static/js/aluminumLiner/index.js b/productionboard/src/main/resources/static/js/aluminumLiner/index.js index d288941..a444462 100644 --- a/productionboard/src/main/resources/static/js/aluminumLiner/index.js +++ b/productionboard/src/main/resources/static/js/aluminumLiner/index.js @@ -59,13 +59,14 @@ $(() => { headerBGC: 'rgba(8,36,75,0.2)', oddRowBGC: 'rgba(8,36,75,0.2)', evenRowBGC: 'rgba(6,25,57,0.2)', - colWidth: ['100%', '100%', '100%', '100%', '100%'] + colWidth: ['20%', '20%', '20%', '20%', '20%'] }); }, error: function (e) { console.log(e) } }); + tableAnimation('#productionPlan') diff --git a/productionboard/src/main/resources/static/js/common/echarts.common.js b/productionboard/src/main/resources/static/js/common/echarts.common.js index 8d66ae7..47ed24d 100644 --- a/productionboard/src/main/resources/static/js/common/echarts.common.js +++ b/productionboard/src/main/resources/static/js/common/echarts.common.js @@ -21,20 +21,20 @@ const horizontalBarChart = (res, ids) => { let attackSourcesColor = [ new echarts.graphic.LinearGradient(0, 1, 1, 1, [ - { offset: 0, color: "#EB3B5A" }, - { offset: 1, color: "#FE9C5A" }, + {offset: 0, color: "#EB3B5A"}, + {offset: 1, color: "#FE9C5A"}, ]), new echarts.graphic.LinearGradient(0, 1, 1, 1, [ - { offset: 0, color: "#FA8231" }, - { offset: 1, color: "#FFD14C" }, + {offset: 0, color: "#FA8231"}, + {offset: 1, color: "#FFD14C"}, ]), new echarts.graphic.LinearGradient(0, 1, 1, 1, [ - { offset: 0, color: "#F7B731" }, - { offset: 1, color: "#FFEE96" }, + {offset: 0, color: "#F7B731"}, + {offset: 1, color: "#FFEE96"}, ]), new echarts.graphic.LinearGradient(0, 1, 1, 1, [ - { offset: 0, color: "#395CFE" }, - { offset: 1, color: "#2EC7CF" }, + {offset: 0, color: "#395CFE"}, + {offset: 1, color: "#2EC7CF"}, ]), ]; let attackSourcesColor1 = [ @@ -317,7 +317,7 @@ const brokenLineAreaDiagram = (res, ids) => { [ { offset: 0, - color: "rgba(19,208,100,1)", + color: "rgb(38,208,19)", }, { offset: 1, @@ -1080,7 +1080,7 @@ const bluePolygonHistogram = (res, ids) => { }, series: [ { - data:yValue, + data: yValue, type: "bar", barMaxWidth: "auto", barWidth: 30, @@ -1174,10 +1174,23 @@ const multipleThreeDimensionalCylindrical = (res, ids) => { const xValue = res.map(val => val.materialName) const lineStoreAmount = res.map(val => val.lineStoreAmount) const hullStoreAmount = res.map(val => val.hullStoreAmount) + hullStoreAmount.forEach((val, index) => { + if (val == 0) { + console.log(val) + hullStoreAmount[index] = 1 + } + }) + lineStoreAmount.forEach((val, index) => { + if (val == 0) { + console.log(val) + lineStoreAmount[index] = 1 + } + }) let lineColor = "#406A92"; let labelColor = "#fff"; let fontSize = "12"; let lineWidth = 1; + let isDataZoom = xValue.length > 3 let option = { grid: { left: "0%", @@ -1280,8 +1293,10 @@ const multipleThreeDimensionalCylindrical = (res, ids) => { }, }, ], + dataZoom: [], series: [ { + // 左侧上圆片 name: "", type: "pictorialBar", symbolSize: [26, 12], @@ -1300,15 +1315,15 @@ const multipleThreeDimensionalCylindrical = (res, ids) => { }, }, color: "#26B2E8", - data:hullStoreAmount, + data: hullStoreAmount, }, { + // 左侧下内圈 name: "", type: "pictorialBar", - tooltip: { - show: false, - }, - //外圈 + // tooltip: { + // show: false, + // }, symbolSize: [37, 20], symbolOffset: [-39, 20], z: 10, @@ -1320,9 +1335,14 @@ const multipleThreeDimensionalCylindrical = (res, ids) => { borderWidth: 20, }, }, - data: lineStoreAmount, + data: hullStoreAmount, + show: function (val) { + console.log(val) + return false + } }, { + // 左侧下外圈 name: "", type: "pictorialBar", tooltip: { @@ -1339,9 +1359,10 @@ const multipleThreeDimensionalCylindrical = (res, ids) => { borderWidth: 20, }, }, - data: lineStoreAmount, + data: hullStoreAmount, }, { + // 左侧下圆片 name: "", type: "pictorialBar", symbolSize: [26, 12], @@ -1351,7 +1372,7 @@ const multipleThreeDimensionalCylindrical = (res, ids) => { symbolOffset: [-39, 5], z: 12, color: "#26B2E8", - data:lineStoreAmount, + data: hullStoreAmount, }, { type: "bar", @@ -1376,9 +1397,10 @@ const multipleThreeDimensionalCylindrical = (res, ids) => { opacity: 1, }, }, - data:hullStoreAmount, + data: hullStoreAmount, }, { + // 右柱上圆片 name: "", type: "pictorialBar", symbolSize: [26, 12], @@ -1400,6 +1422,7 @@ const multipleThreeDimensionalCylindrical = (res, ids) => { data: lineStoreAmount, }, { + // 右柱下内圈 name: "", type: "pictorialBar", tooltip: { @@ -1416,9 +1439,10 @@ const multipleThreeDimensionalCylindrical = (res, ids) => { borderWidth: 20, }, }, - data: lineStoreAmount, + data: hullStoreAmount, }, { + // 右柱下外圈 name: "", type: "pictorialBar", tooltip: { @@ -1435,9 +1459,10 @@ const multipleThreeDimensionalCylindrical = (res, ids) => { borderWidth: 20, }, }, - data: lineStoreAmount, + data: hullStoreAmount, }, { + // 右柱下圆片 name: "", type: "pictorialBar", symbolSize: [26, 12], @@ -1447,7 +1472,7 @@ const multipleThreeDimensionalCylindrical = (res, ids) => { symbolOffset: [39, 5], z: 12, color: "#20D3AB", - data:lineStoreAmount, + data: lineStoreAmount, }, { type: "bar", @@ -1475,6 +1500,14 @@ const multipleThreeDimensionalCylindrical = (res, ids) => { }, ], }; + if (isDataZoom) { + option.dataZoom.push({ + type: 'slider', + start: 0, + end: 20, + }) + option.grid.bottom='20%' + } mycharts.setOption(option); $(window).resize(mycharts.resize); @@ -1583,7 +1616,7 @@ const OEEStatistics = (res, ids) => { symbolSize: 6, lineStyle: { normal: { - color: "rgb(165,122,75)", // 线条颜色 + color: "rgb(45,220,47)", // 线条颜色 }, borderColor: "#f0f", }, @@ -1591,7 +1624,7 @@ const OEEStatistics = (res, ids) => { show: true, position: "top", textStyle: { - color: "rgb(165,122,75)", + color: "rgb(47,224,8)", }, }, itemStyle: { @@ -1616,20 +1649,19 @@ const OEEStatistics = (res, ids) => { [ { offset: 0, - color: "rgba(102,64,38,1)", + color: "rgb(6,236,71)", }, { offset: 1, color: "rgba(0,0,0, 0)", }, ], - ), shadowColor: "rgba(53,142,215, 0.9)", //阴影颜色 shadowBlur: 20, //shadowBlur设图形阴影的模糊大小。配合shadowColor,shadowOffsetX/Y, 设置图形的阴影效果。 }, }, - data:yAxisData, + data: yAxisData, } ], }; @@ -1652,30 +1684,30 @@ const inventory = (res, ids) => { "rgba(2,195,241,0.1)", ]; let Res = - { - datas: [ - { - name: 'SC-279', - value: 2 - }, - { - name: 'SC-606', - value: 6 - }, - { - name: 'SC-387NE', - value: 31 - }, - { - name: 'SC-329', - value: 2 - }, - { - name: 'SC-279', - value: 9 - }, - ] - } + { + datas: [ + { + name: 'SC-279', + value: 2 + }, + { + name: 'SC-606', + value: 6 + }, + { + name: 'SC-387NE', + value: 31 + }, + { + name: 'SC-329', + value: 2 + }, + { + name: 'SC-279', + value: 9 + }, + ] + } Res.datas.forEach((item) => { xAxisData.push(item.name); @@ -2253,123 +2285,123 @@ const energyConsumption = (res, ids) => { containLabel: true }, xAxis: [ - { - interval: 0, - type: 'category', - data: xAxisData, - axisPointer: { - type: 'shadow' + { + interval: 0, + type: 'category', + data: xAxisData, + axisPointer: { + type: 'shadow' + } } - } ], yAxis: [ - { - type: 'value', - name: '产量(t)', - min: 0, - // max: 40, - // interval: 10, - axisLabel: { - formatter: '{value} ml' - }, - splitLine: { - show: false, - lineStyle: { - color: "rgb(217,217,217,0.5)", - type: "dashed" //虚线 - // width: 2 - } - }, - axisLine: { - show: true, + { + type: 'value', + name: '产量(t)', + min: 0, + // max: 40, + // interval: 10, + axisLabel: { + formatter: '{value} ml' + }, + splitLine: { + show: false, + lineStyle: { + color: "rgb(217,217,217,0.5)", + type: "dashed" //虚线 + // width: 2 + } + }, + axisLine: { + show: true, + }, }, - }, - { - type: 'value', - name: '能耗(kw·h)', - min: 0, - // max: 20, - // interval: 5, - axisLabel: { - formatter: '{value} °C' + { + type: 'value', + name: '能耗(kw·h)', + min: 0, + // max: 20, + // interval: 5, + axisLabel: { + formatter: '{value} °C' + }, + splitLine: { + show: false, + lineStyle: { + color: "rgb(217,217,217,0.5)", + type: "dashed" //虚线 + // width: 2 + } + }, + axisLine: { + show: true, + }, + } + ], + series: [ + { + name: '产量', + type: 'bar', + itemStyle: { + normal: { + color: function (params) { + return new echarts.graphic.LinearGradient(0, 0, 0, 1, [ + { + offset: 1, + color: "rgba(10,50,220)", + }, + { + offset: 0, + color: "rgba(40,140,210)", + }, + ]); + }, + }, + }, + tooltip: { + valueFormatter: function (value) { + return value + ' ml'; + } + }, + barWidth: 20, + data: yAxisDataOne, }, - splitLine: { - show: false, - lineStyle: { - color: "rgb(217,217,217,0.5)", - type: "dashed" //虚线 - // width: 2 - } + { + name: '能耗', + type: 'line', + yAxisIndex: 1, + tooltip: { + valueFormatter: function (value) { + return value + ' °C'; + } + }, + data: yAxisDataTwo, }, - axisLine: { - show: true, + { + name: "柱顶部", + type: "pictorialBar", + symbolSize: [20, 6], + symbolOffset: [0, -3], + z: 12, + itemStyle: { + normal: { + color: function (params) { + return 'rgb(217,217,217)'; + }, + }, + }, + label: { + show: true, + position: "top", + textStyle: { + color: "#02C3F1", + }, + }, + symbolPosition: "end", + data: yAxisDataOne, }, - } - ], - series: [ - { - name: '产量', - type: 'bar', - itemStyle: { - normal: { - color: function (params) { - return new echarts.graphic.LinearGradient(0, 0, 0, 1, [ - { - offset: 1, - color: "rgba(10,50,220)", - }, - { - offset: 0, - color: "rgba(40,140,210)", - }, - ]); - }, - }, - }, - tooltip: { - valueFormatter: function (value) { - return value + ' ml'; - } - }, - barWidth: 20, - data: yAxisDataOne, - }, - { - name: '能耗', - type: 'line', - yAxisIndex: 1, - tooltip: { - valueFormatter: function (value) { - return value + ' °C'; - } - }, - data: yAxisDataTwo, - }, - { - name: "柱顶部", - type: "pictorialBar", - symbolSize: [20, 6], - symbolOffset: [0, -3], - z: 12, - itemStyle: { - normal: { - color: function (params) { - return 'rgb(217,217,217)'; - }, - }, - }, - label: { - show: true, - position: "top", - textStyle: { - color: "#02C3F1", - }, - }, - symbolPosition: "end", - data:yAxisDataOne, - }, ] - }; + }; mycharts.setOption(option); $(window).resize(mycharts.resize); diff --git a/productionboard/src/main/resources/static/js/common/scrollTable.js b/productionboard/src/main/resources/static/js/common/scrollTable.js index 3831c1d..1502923 100644 --- a/productionboard/src/main/resources/static/js/common/scrollTable.js +++ b/productionboard/src/main/resources/static/js/common/scrollTable.js @@ -110,7 +110,7 @@ let dynamicTable = resource => { }; const th_tdCSS = { color:'#59B2F6', - margin: 'auto', + // margin: 'auto', whiteSpace: 'nowrap', overflow: "hidden", textOverflow: 'ellipsis', @@ -213,8 +213,9 @@ let dynamicTable = resource => { } else { for (let i = 0; i < colWidth.length; i++) { let emptyUnitColWidth = emptyUnit(colWidth[i]); - $(`${ele}>.table>.thead>.tr>.th:nth-child(${i+1})`).width(emptyUnitColWidth); - $(`${ele}>.table>.tbody>.tr>.td:nth-child(${i+1})`).width(emptyUnitColWidth); + console.log(emptyUnitColWidth) + $(`${ele}>.table>.thead>.tr>.th:nth-child(${i+1})`).width(`${emptyUnitColWidth}%`); + $(`${ele}>.table>.tbody>.tr>.td:nth-child(${i+1})`).width(`${emptyUnitColWidth}%`); } } @@ -226,3 +227,32 @@ let dynamicTable = resource => { } }); } + +const tableAnimation = (el) => { + const evenRowBGC = 'rgba(6,25,57,0.2)' === undefined ? '#ddd' : 'rgba(6,25,57,0.2)'; + const oddRowBGC = 'rgba(8,36,75,0.2)' === undefined ? '#bbb' : 'rgba(8,36,75,0.2)'; + const trEvenCSS = { + display: "flex", + background: evenRowBGC + }; + const trOddCSS = { + display: "flex", + background: oddRowBGC + }; + let oddORevenCheck = $(`${el}>.table>.tbody>.tr`).length % 2 == 0 ? 'even' : 'odd'; + setInterval(function () { + $(el + '>.table>.tbody>.tr:eq(0)').slideToggle(100, function () { + switch (oddORevenCheck) { + case 'even': + $(this).clone().css(trEvenCSS).appendTo(el + '>.table>.tbody'); + oddORevenCheck = 'odd'; + break; + case 'odd': + $(this).clone().css(trOddCSS).appendTo(el + '>.table>.tbody'); + oddORevenCheck = 'even'; + break; + } + $(this).remove(); + }); + }, 2000); +} \ No newline at end of file diff --git a/productionboard/src/main/resources/static/js/foamBox/index.js b/productionboard/src/main/resources/static/js/foamBox/index.js index dfc44ac..e28a6a3 100644 --- a/productionboard/src/main/resources/static/js/foamBox/index.js +++ b/productionboard/src/main/resources/static/js/foamBox/index.js @@ -43,7 +43,7 @@ $(() => { top: '10%', left: '6%', right: '6%', - bottom: '10%', + bottom: '3%', containLabel: true }, tooltip: { @@ -59,8 +59,8 @@ $(() => { }, axisLabel:{ show: true, - // rotate:10, - interval:3 + rotate:30, + interval:0 } } ], @@ -70,18 +70,18 @@ $(() => { show: false, }, type: 'value', - name: 'Precipitation', + name: '温度', min: 0, max: 50, interval: 10, axisLabel: { - formatter: '{value} ml' + formatter: '{value} °C ' } }, ], series: [ { - name: 'Evaporation', + name: '内膜温度', type: 'bar', tooltip: { valueFormatter: function (value) { @@ -91,7 +91,7 @@ $(() => { data: res.interiorList }, { - name: 'Precipitation', + name: '外膜温度', type: 'bar', tooltip: { valueFormatter: function (value) { @@ -120,12 +120,12 @@ $(() => { const deviceStatus = (statusArray) => { let info = ` - - - - - - + + + + + +
`; diff --git a/productionboard/src/main/resources/static/js/storage/index.js b/productionboard/src/main/resources/static/js/storage/index.js index 1b45a77..f4b81ff 100644 --- a/productionboard/src/main/resources/static/js/storage/index.js +++ b/productionboard/src/main/resources/static/js/storage/index.js @@ -17,13 +17,14 @@ $(()=>{ headerBGC: 'rgba(8,36,75,0.2)', oddRowBGC: 'rgba(8,36,75,0.2)', evenRowBGC: 'rgba(6,25,57,0.2)', - colWidth: ['100%', '100%', '100%', '100%','100%'] + colWidth: ['20%', '20%', '20%', '20%','20%'] }); }, error: function(e) { console.log(e) } }); + tableAnimation('#productionPlan') //当前库存统计 $.getJSON(`/storage/getStoreStatistics?ids=${ids}`, function (result) { diff --git a/productionboard/src/main/resources/static/js/tankShell/device.js b/productionboard/src/main/resources/static/js/tankShell/device.js index 13bba99..8c37afc 100644 --- a/productionboard/src/main/resources/static/js/tankShell/device.js +++ b/productionboard/src/main/resources/static/js/tankShell/device.js @@ -49,7 +49,7 @@ $(() => { headerBGC: 'rgba(8,36,75,0.2)', oddRowBGC: 'rgba(8,36,75,0.2)', evenRowBGC: 'rgba(6,25,57,0.2)', - colWidth: ['250%', '50%', '50%',] + colWidth: ['70%', '15%', '15%',] }); }, error: function (e) { diff --git a/productionboard/src/main/resources/templates/tankShell/device.html b/productionboard/src/main/resources/templates/tankShell/device.html index 5719cc8..999a15b 100644 --- a/productionboard/src/main/resources/templates/tankShell/device.html +++ b/productionboard/src/main/resources/templates/tankShell/device.html @@ -12,7 +12,6 @@ -