潘钊 / bsth_control · Commits

Commit 09c8d69418f85e69612c23e587051358472f3d67

Authored by 徐烜
2 parents 58dabf02 aef1fd26
build: skipped

update

Inline Side-by-side
Showing 7 changed files with 11 additions and 16 deletions
src/main/resources/application-prod.properties
  View file @09c8d69
... ... @@ -8,9 +8,9 @@ spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
8 8 spring.jpa.database= MYSQL
9 9 spring.jpa.show-sql= true
10 10 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
11   -spring.datasource.url= jdbc:mysql://192.168.168.171:3306/control
  11 +spring.datasource.url= jdbc:mysql://192.168.40.82:3306/qp_control
12 12 spring.datasource.username= root
13   -spring.datasource.password= root2jsp
  13 +spring.datasource.password= 123456
14 14 #DATASOURCE
15 15 spring.datasource.max-active=100
16 16 spring.datasource.max-idle=8
... ... @@ -26,6 +26,6 @@ spring.datasource.validation-query=select 1
26 26 ##
27 27 #222.66.0.204:5555
28 28 ##\u5B9E\u65F6gps
29   -http.gps.real.url= http://192.168.168.171:8080/transport_server/rtgps/
  29 +http.gps.real.url= http://192.168.40.82:8080/transport_server/rtgps/
30 30 ##\u6D88\u606F\u4E0B\u53D1
31   -http.send.directive = http://192.168.168.171:8080/transport_server/message/
  31 +http.send.directive = http://192.168.40.82:8080/transport_server/message/
... ...
src/main/resources/datatools/config-prod.properties
  View file @09c8d69
... ... @@ -4,13 +4,13 @@
4 4 datatools.kettle_properties=/datatools/kettle.properties
5 5 # 2、ktr文件通用配置变量（数据库连接，根据不同的环境需要修正）
6 6 #数据库ip地址
7   -datatools.kvars_dbip=192.168.168.171
  7 +datatools.kvars_dbip=192.168.40.82
8 8 #数据库用户名
9 9 datatools.kvars_dbuname=root
10 10 #数据库密码
11   -datatools.kvars_dbpwd=root2jsp
  11 +datatools.kvars_dbpwd=123456
12 12 #数据库库名
13   -datatools.kvars_dbdname=control
  13 +datatools.kvars_dbdname=qp_control
14 14  
15 15 # 3、上传数据配置信息
16 16 # 上传文件目录配置（根据不同的环境需要修正）
... ...
src/main/resources/static/assets/img/logo_text.png
View file @09c8d69

12.4 KB | W: | H:

15 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
src/main/resources/static/pages/base/carpark/js/carpark-list-table.js
  View file @09c8d69
... ... @@ -93,9 +93,9 @@
93 93  
94 94 });
95 95 return params;
96   -
  96 +
97 97 }
98   -
  98 +
99 99  
100 100 /**
101 101 * 表格数据分页加载事件
... ...
src/main/resources/static/pages/base/carpark/list.html
  View file @09c8d69
... ... @@ -47,6 +47,7 @@
47 47 </td>
48 48 <td>
49 49 <input type="text" class="form-control form-filter input-sm" name="parkCode_like">
  50 +
50 51 </td>
51 52 <td>
52 53 <input type="text" class="form-control form-filter input-sm" name="gCenterPoint_like">
... ...
src/main/resources/static/pages/base/station/js/station-list-table.js
  View file @09c8d69
... ... @@ -42,7 +42,6 @@
42 42 });
43 43  
44 44 function getParams() {
45   -
46 45 // cells 集合返回表格中所有（列）单元格的一个数组
47 46 var cells = $('tr.filter')[0].cells;
48 47  
... ... @@ -73,7 +72,6 @@
73 72 }
74 73  
75 74 });
76   -
77 75 return params;
78 76 }
79 77  
... ...
src/main/resources/static/pages/permission/user/list.html
  View file @09c8d69
... ... @@ -133,11 +133,7 @@
133 133 {{obj.lastLoginDate}}
134 134 </td>
135 135 <td>
136   - {{if obj.enabled}}
137   - <button type="button" onclick="changeEnabled({{obj.id}},0)" class="btn btn-warning btn-sm">禁用</button>
138   - {{else}}
139   - <button type="button" onclick="changeEnabled({{obj.id}},1)" class="btn btn-success btn-sm">启用</button>
140   - {{/if}}
  136 +
141 137 </td>
142 138 </tr>
143 139 {{/each}}
... ...