Skip to content

Z
zksyService
Commit f280f3f4 authored by wangjinjing's avatar wangjinjing
Browse files
Options

事件图片展示问题

parent 0265bcb4
Show whitespace changes
Inline Side-by-side
Showing with 23 additions and 17 deletions
pom.xml
View file @ f280f3f4
...@@ -185,6 +185,15 @@ ...@@ -185,6 +185,15 @@
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>
......
src/main/resources/application.properties
View file @ f280f3f4
...@@ -2,12 +2,12 @@ spring.profiles.active=dev ...@@ -2,12 +2,12 @@ spring.profiles.active=dev
server.port=8082 server.port=8082
spring.datasource.username=hzjt #spring.datasource.username=hzjt
spring.datasource.password=hzjt #spring.datasource.password=hzjt
spring.datasource.url=jdbc:oracle:thin:@33.65.250.179:1521:helowin #spring.datasource.url=jdbc:oracle:thin:@33.65.250.179:1521:helowin
#spring.datasource.username=test spring.datasource.username=test
#spring.datasource.password=test spring.datasource.password=test
#spring.datasource.url=jdbc:oracle:thin:@192.168.168.212:1523:helowin spring.datasource.url=jdbc:oracle:thin:@192.168.168.212:1523:helowin
spring.datasource.driver-class-name=oracle.jdbc.OracleDriver spring.datasource.driver-class-name=oracle.jdbc.OracleDriver
# ��ʼ����С����С����� # ��ʼ����С����С�����
...@@ -29,8 +29,8 @@ spring.datasource.useGlobalDataSourceStat=true ...@@ -29,8 +29,8 @@ spring.datasource.useGlobalDataSourceStat=true
spring.jackson.date-format=yyyy-MM-dd HH:mm:ss spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
spring.jackson.time-zone=GMT+8 spring.jackson.time-zone=GMT+8
# #
#spring.redis.host=localhost spring.redis.host=localhost
spring.redis.host=33.65.250.179 #spring.redis.host=33.65.250.179
spring.redis.port=6379 spring.redis.port=6379
spring.cache.type=redis spring.cache.type=redis
spring.cache.redis.time-to-live=600000 spring.cache.redis.time-to-live=600000
...@@ -39,7 +39,7 @@ spring.cache.redis.time-to-live=600000 ...@@ -39,7 +39,7 @@ spring.cache.redis.time-to-live=600000
mybatis.configuration.map-underscore-to-camel-case=true mybatis.configuration.map-underscore-to-camel-case=true
mybatis.mapper-locations=classpath:mapper/*.xml mybatis.mapper-locations=classpath:mapper/*.xml
#logging.level.im.zhaojun=info logging.level.im.zhaojun=info
logging.level.org.crazycake.shiro=info logging.level.org.crazycake.shiro=info
logging.pattern.console=%clr(%d{${LOG_DATEFORMAT_PATTERN:yyyy-MM-dd HH:mm:ss.SSS}}){faint} %clr(${LOG_LEVEL_PATTERN:%5p}) %clr(${PID}){magenta} %clr(---){faint} %clr([%15.15t]){faint} [%15.15X{username}] [%15.15X{ip}] %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:%wEx} logging.pattern.console=%clr(%d{${LOG_DATEFORMAT_PATTERN:yyyy-MM-dd HH:mm:ss.SSS}}){faint} %clr(${LOG_LEVEL_PATTERN:%5p}) %clr(${PID}){magenta} %clr(---){faint} %clr([%15.15t]){faint} [%15.15X{username}] [%15.15X{ip}] %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:%wEx}
......
src/main/resources/static/bootstrap/css/bootstrap-select.css
View file @ f280f3f4
...@@ -389,4 +389,3 @@ select.selectpicker { ...@@ -389,4 +389,3 @@ select.selectpicker {
width: 100%; width: 100%;
float: none; float: none;
} }
/*# sourceMappingURL=bootstrap-select.css.map */
\ No newline at end of file
src/main/resources/templates/page/jkgl.html
View file @ f280f3f4
...@@ -7,13 +7,13 @@ ...@@ -7,13 +7,13 @@
<title>监控管理</title> <title>监控管理</title>
<link rel="stylesheet" href="../bootstrap/css/bootstrap.css"> <link rel="stylesheet" href="../bootstrap/css/bootstrap.css">
<link rel="stylesheet" href="../bootstrap/css/bootstrap-datetimepicker.css"> <link rel="stylesheet" href="../bootstrap/css/bootstrap-datetimepicker.css">
<link rel="stylesheet" href="../bootstrap/css/bootstrap-treeview.css">
<link rel="stylesheet" href="../bootstrap/css/bootstrap-switch.min.css"> <link rel="stylesheet" href="../bootstrap/css/bootstrap-switch.min.css">
<link rel="stylesheet" href="../css/jkgl.css"> <link rel="stylesheet" href="../css/jkgl.css">
<!--<link rel="stylesheet" href="../css/viewer.min.css">--> <!--<link rel="stylesheet" href="../css/viewer.min.css">-->
<link rel="stylesheet" href="../css/photoviewer.css"> <link rel="stylesheet" href="../css/photoviewer.css">
<link rel="stylesheet" href="../css/animate.css"> <link rel="stylesheet" href="../css/animate.css">
<link rel="stylesheet" href="../css/noticejs.css"> <link rel="stylesheet" href="../css/noticejs.css">
<link rel="stylesheet" href="../bootstrap/css/bootstrap-treeview.css">
</head> </head>
<body> <body>
<div id="page-sy"> <div id="page-sy">
......
src/main/resources/templates/page/sjcx.html
View file @ f280f3f4
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge"> <meta http-equiv="X-UA-Compatible" content="ie=edge">
<link rel="stylesheet" href="../bootstrap/css/bootstrap.css"> <link rel="stylesheet" href="../bootstrap/css/bootstrap.css">
<link rel="stylesheet" href="../bootstrap/css/bootstrap-datetimepicker.css"> <link rel="stylesheet" href="../bootstrap/css/bootstrap-datetimepicker.css">
<link rel="stylesheet" href="../bootstrap/css/bootstrap-select.css"> <link rel="stylesheet" href="../bootstrap/css/bootstrap-select.css">
...@@ -11,8 +12,6 @@ ...@@ -11,8 +12,6 @@
<link rel="stylesheet" href="../bootstrap/css/bootstrap-switch.min.css"> <link rel="stylesheet" href="../bootstrap/css/bootstrap-switch.min.css">
<link rel="stylesheet" href="../css/sjcx.css"> <link rel="stylesheet" href="../css/sjcx.css">
<link rel="stylesheet" href="../css/photoviewer.css"> <link rel="stylesheet" href="../css/photoviewer.css">
<link rel="stylesheet" href="../bootstrap/css/bootstrap-switch.min.css">
<link rel="stylesheet" href="../css/photoviewer.css">
<link rel="stylesheet" href="../css/animate.css"> <link rel="stylesheet" href="../css/animate.css">
<link rel="stylesheet" href="../css/noticejs.css"> <link rel="stylesheet" href="../css/noticejs.css">
<!--<link rel="stylesheet" href="../css/viewer.min.css">--> <!--<link rel="stylesheet" href="../css/viewer.min.css">-->
...@@ -35,7 +34,7 @@ ...@@ -35,7 +34,7 @@
</div> </div>
<div id="tree-xzxq" style="height: calc(100% - 80px);overflow-x: auto;float: left;width: 100%;"></div> <div id="tree-xzxq" style="height: calc(100% - 80px);overflow-x: auto;float: left;width: 100%;"></div>
</div> </div>
<div id="sjcx_s" class="div-right"> <div id="sjcx" class="div-right">
<span class="div-right-top"> <span class="div-right-top">
<span class="pub-span">告警时间：</span> <span class="pub-span">告警时间：</span>
<input type="text" class="form-control input-pub" id="kssj" style="width: 300px;" placeholder="请选择开始时间至结束时间"> <input type="text" class="form-control input-pub" id="kssj" style="width: 300px;" placeholder="请选择开始时间至结束时间">
...@@ -523,13 +522,12 @@ ...@@ -523,13 +522,12 @@
<script src="../bootstrap/js/bootstrap-paginator.js"></script> <script src="../bootstrap/js/bootstrap-paginator.js"></script>
<script src="../bootstrap/js/bootstrap-treeview.js"></script> <script src="../bootstrap/js/bootstrap-treeview.js"></script>
<script src="../bootstrap/js/bootstrap-select.js"></script> <script src="../bootstrap/js/bootstrap-select.js"></script>
<script src="../bootstrap/js/bootstrap-switch.min.js"></script>
<!--<script src="../bootstrap/js/bootstrap-datetimepicker.js"></script>--> <!--<script src="../bootstrap/js/bootstrap-datetimepicker.js"></script>-->
<!--<script src="../bootstrap/js/bootstrap-datetimepicker.zh-CN.js"></script>--> <!--<script src="../bootstrap/js/bootstrap-datetimepicker.zh-CN.js"></script>-->
<script src="../js/laydate/laydate.js"></script> <script src="../js/laydate/laydate.js"></script>
<script src="../js/notice.js"></script> <script src="../js/notice.js"></script>
<script src="../bootstrap/js/bootstrap.js"></script>
<script src="../bootstrap/js/bootstrap-treeview.js"></script>
<script src="../bootstrap/js/bootstrap-switch.min.js"></script>
<script src="../js/echarts.min.js"></script> <script src="../js/echarts.min.js"></script>
<script src="../js/echarts-liquidfill.min.js"></script> <script src="../js/echarts-liquidfill.min.js"></script>
<script src="../js/vue.js"></script> <script src="../js/vue.js"></script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment