潘钊 / bsth_control · Commits

Commit 6735bf1a1461f98c74bf076e9887139ba019544c

Authored by 王通
1 parent 6acafe9b
build: skipped

1.成都

Inline Side-by-side
Showing 11 changed files with 277 additions and 270 deletions
src/main/resources/application-test.properties
  View file @6735bf1
... ... @@ -14,7 +14,7 @@ spring.jpa.properties.hibernate.dialect= org.hibernate.spatial.dialect.mysql.MyS
14 14  
15 15 #DATABASE
16 16 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
17   -spring.datasource.url= jdbc:mysql://192.170.100.114/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
  17 +spring.datasource.url= jdbc:mysql://192.168.168.152/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
18 18 spring.datasource.username= root
19 19 spring.datasource.password= root2jsp
20 20 spring.datasource.type= com.zaxxer.hikari.HikariDataSource
... ... @@ -31,14 +31,14 @@ spring.datasource.hikari.connection-test-query= SELECT 1
31 31 spring.datasource.hikari.validation-timeout= 3000
32 32 spring.datasource.hikari.register-mbeans=true
33 33  
34   -kafka.use= true
  34 +kafka.use= false
35 35 spring.kafka.consumer.bootstrap-servers= 192.170.100.114:9092,192.170.100.114:9093,192.170.100.114:9094
36 36 spring.kafka.consumer.group-id= schedule-system-test
37 37 spring.kafka.consumer.auto-offset-reset= latest
38 38 spring.kafka.consumer.key-deserializer= org.apache.kafka.common.serialization.StringDeserializer
39 39 spring.kafka.consumer.value-deserializer= org.apache.kafka.common.serialization.StringDeserializer
40 40  
41   -sso.enabled= true
  41 +sso.enabled= false
42 42 sso.systemcode = SYS0023
43 43 sso.http.url.login= https://112.64.45.51/portal/index.html#/login
44 44 sso.http.url.logout= https://112.64.45.51/information/api/v1/logout
... ...
src/main/resources/application.properties
  View file @6735bf1
1   -spring.profiles.active = cloud
  1 +spring.profiles.active = test
2 2  
3 3 spring.view.suffix=.html
4 4 server.session-timeout=-1
... ...
src/main/resources/control-jdbc.properties
  View file @6735bf1
1 1 station.mysql.driver= com.mysql.jdbc.Driver
2   -station.mysql.url= jdbc:mysql://192.170.100.132/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
  2 +station.mysql.url= jdbc:mysql://192.168.168.152/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
3 3 station.mysql.username= root
4 4 station.mysql.password= root2jsp
5 5  
... ...
src/main/resources/datatools/config-test.properties
  View file @6735bf1
... ... @@ -5,23 +5,23 @@ datatools.kettle_properties=/datatools/kettle.properties
5 5 # 2、ktr文件通用配置变量（数据库连接，根据不同的环境需要修正）
6 6  
7 7 #数据库ip地址
8   -datatools.kvars_dbip=10.10.200.148
  8 +datatools.kvars_dbip=192.168.168.152
9 9 #数据库用户名
10 10 datatools.kvars_dbuname=root
11 11 #数据库密码
12   -datatools.kvars_dbpwd=root
  12 +datatools.kvars_dbpwd=root2jsp
13 13 #数据库库名
14 14 datatools.kvars_dbdname=control
15 15  
16 16 # 3、上传数据配置信息
17 17 # 上传文件目录配置（根据不同的环境需要修正）
18   -datatools.fileupload_dir=/Users/xu/resource/project_code/runtime_temp/bsth_control_u_d_files
  18 +datatools.fileupload_dir=/home/bsth/control/bsth_control_u_d_files
19 19 # ktr转换文件，中配置的错误输出目录（根据不同的环境需要修正）
20   -datatools.trans_errordir=/Users/xu/resource/project_code/runtime_temp/bsth_control_u_d_files/erroroutput
  20 +datatools.trans_errordir=/home/bsth/control/bsth_control_u_d_files/erroroutput
21 21 # 临时输出文件目录
22   -datatools.trans_tempdir=/Users/xu/resource/project_code/runtime_temp/bsth_control_u_d_files/temp
  22 +datatools.trans_tempdir=/home/bsth/control/bsth_control_u_d_files/temp
23 23 # 模版文件目录
24   -datatools.trans_templatedir=/Users/xu/resource/project_code/runtime_temp/bsth_control_u_d_files/template
  24 +datatools.trans_templatedir=/home/bsth/control/bsth_control_u_d_files/template
25 25  
26 26 ##---------------------------- 导入数据ktr ----------------------------##
27 27 # 车辆信息导入ktr转换
... ... @@ -57,7 +57,7 @@ datatools.schedulerule_datainputktr=/datatools/ktrs/scheduleRuleDataInput.ktr
57 57  
58 58 # 4、数据导出配置信息
59 59 # 导出数据文件目录配置（根据不同的环境需要修正）
60   -datatools.fileoutput_dir=/Users/xu/resource/project_code/runtime_temp/bsth_control_u_d_files
  60 +datatools.fileoutput_dir=/home/bsth/control/bsth_control_u_d_files
61 61  
62 62 ##---------------------------- 导出数据ktr -----------------------------##
63 63 # 车辆信息导出ktr转换
... ...
src/main/resources/ms-jdbc.properties
  View file @6735bf1
... ... @@ -4,6 +4,6 @@
4 4 #ms.mysql.password= 123456
5 5  
6 6 ms.mysql.driver= com.mysql.jdbc.Driver
7   -ms.mysql.url= jdbc:mysql://192.170.100.63/ms?useUnicode=true&characterEncoding=utf-8
  7 +ms.mysql.url= jdbc:mysql://192.168.168.152/ms?useUnicode=true&characterEncoding=utf-8
8 8 ms.mysql.username= root
9 9 ms.mysql.password= root2jsp
10 10 \ No newline at end of file
... ...
src/main/resources/static/pages/base/stationroute/js/routes-operation.js
  View file @6735bf1
1 1 var RoutesOperation = (function () {
2 2 var lineId, versions, directions = 0, status;
3 3 var lineRegions = [];
  4 + var city = '成都市';
4 5 // 百度地图对象
5 6 var baiduMap;
6 7 // 进出场路段编辑时当前选中的路段
... ... @@ -444,7 +445,7 @@ var RoutesOperation = (function () {
444 445 /***************************************************map*******************************************************/
445 446 initMap: function () {
446 447 baiduMap = new BMap.Map('routes_list_map_container' , {enableMapClick: false});
447   - baiduMap.centerAndZoom(new BMap.Point(121.528733, 31.237425), 14);
  448 + baiduMap.centerAndZoom(city, 14);
448 449 baiduMap.enableDragging();
449 450 baiduMap.enableScrollWheelZoom();
450 451 baiduMap.disableDoubleClickZoom();
... ... @@ -1681,7 +1682,7 @@ var RoutesOperation = (function () {
1681 1682 getDistanceAndDuration : function(stations,callback){
1682 1683 var stationRoutes = new Array();
1683 1684 stations.forEach(function (item) {
1684   - var stationRoute = { stationName: item.stationName, station: item };
  1685 + var stationRoute = { stationName: item.stationName, station: item, shapedType: 'r', radius: 80 };
1685 1686 item.distance = 0;
1686 1687 item.duration = 0;
1687 1688 stationRoutes.push(stationRoute);
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/index.html
  View file @6735bf1
1   -<div class="page-head">
2   - <div class="page-title">
3   - <h1>车辆信息管理</h1>
4   - </div>
5   -</div>
6   -
7   -<ul class="page-breadcrumb breadcrumb">
8   - <li>
9   - <a href="/pages/home.html" data-pjax>首页</a>
10   - <i class="fa fa-circle"></i>
11   - </li>
12   - <li>
13   - <span class="active">基础信息</span>
14   - <i class="fa fa-circle"></i>
15   - </li>
16   - <li>
17   - <span class="active">车辆信息管理</span>
18   - </li>
19   -</ul>
20   -
21   -<div class="row">
22   - <div class="col-md-12" ng-controller="BusInfoManageCtrl as ctrl">
23   - <style>
24   - .dropdown-menu {
25   - border-color: #32c5d2;
26   - }
27   - .btn-group > .dropdown-menu:before {
28   - border-bottom-color: #32c5d2;
29   - }
30   - </style>
31   -
32   - <div class="portlet light bordered">
33   - <div class="portlet-title">
34   - <div class="caption font-dark">
35   - <i class="fa fa-database font-dark"></i>
36   - <span class="caption-subject bold uppercase">车辆信息表</span>
37   - </div>
38   - <div class="actions">
39   - <!--<a href="javascript:" class="btn blue" ng-click="ctrl.goForm()">-->
40   - <!--<i class="fa fa-plus"></i>-->
41   - <!--添加车辆信息-->
42   - <!--</a>-->
43   -
44   - <div class="btn-group">
45   - <a href="javascript:" class="btn red btn-outline" data-toggle="dropdown">
46   - <i class="fa fa-share"></i>
47   - <span>数据工具</span>
48   - <i class="fa fa-angle-down"></i>
49   - </a>
50   - <ul class="dropdown-menu pull-right">
51   - <!--<li>-->
52   - <!--<a href="javascript:" class="tool-action" ng-click="ctrl.importData()">-->
53   - <!--<i class="fa fa-file-excel-o"></i>-->
54   - <!--导入excel-->
55   - <!--</a>-->
56   - <!--</li>-->
57   - <li>
58   - <a href="javascript:" class="tool-action" ng-click="ctrl.exportData()">
59   - <i class="fa fa-file-excel-o"></i>
60   - 导出excel
61   - </a>
62   - </li>
63   - <!--<li class="divider"></li>-->
64   - <!--<li>-->
65   - <!--<a href="javascript:" class="tool-action">-->
66   - <!--<i class="fa fa-download"></i>-->
67   - <!--excel模版-->
68   - <!--</a>-->
69   - <!--</li>-->
70   - </ul>
71   - </div>
72   - </div>
73   - </div>
74   -
75   - <div class="portlet-body">
76   - <div ui-view="busInfoManage_list"></div>
77   - </div>
78   - </div>
79   - </div>
80   -</div>
  1 +<div class="page-head">
  2 + <div class="page-title">
  3 + <h1>车辆信息管理</h1>
  4 + </div>
  5 +</div>
  6 +
  7 +<ul class="page-breadcrumb breadcrumb">
  8 + <li>
  9 + <a href="/pages/home.html" data-pjax>首页</a>
  10 + <i class="fa fa-circle"></i>
  11 + </li>
  12 + <li>
  13 + <span class="active">基础信息</span>
  14 + <i class="fa fa-circle"></i>
  15 + </li>
  16 + <li>
  17 + <span class="active">车辆信息管理</span>
  18 + </li>
  19 +</ul>
  20 +
  21 +<div class="row">
  22 + <div class="col-md-12" ng-controller="BusInfoManageCtrl as ctrl">
  23 + <style>
  24 + .dropdown-menu {
  25 + border-color: #32c5d2;
  26 + }
  27 + .btn-group > .dropdown-menu:before {
  28 + border-bottom-color: #32c5d2;
  29 + }
  30 + </style>
  31 +
  32 + <div class="portlet light bordered">
  33 + <div class="portlet-title">
  34 + <div class="caption font-dark">
  35 + <i class="fa fa-database font-dark"></i>
  36 + <span class="caption-subject bold uppercase">车辆信息表</span>
  37 + </div>
  38 + <div class="actions">
  39 + <a href="javascript:" class="btn blue" ng-click="ctrl.goForm()">
  40 + <i class="fa fa-plus"></i>
  41 + 添加车辆信息
  42 + </a>
  43 +
  44 + <div class="btn-group">
  45 + <a href="javascript:" class="btn red btn-outline" data-toggle="dropdown">
  46 + <i class="fa fa-share"></i>
  47 + <span>数据工具</span>
  48 + <i class="fa fa-angle-down"></i>
  49 + </a>
  50 + <ul class="dropdown-menu pull-right">
  51 + <!--<li>-->
  52 + <!--<a href="javascript:" class="tool-action" ng-click="ctrl.importData()">-->
  53 + <!--<i class="fa fa-file-excel-o"></i>-->
  54 + <!--导入excel-->
  55 + <!--</a>-->
  56 + <!--</li>-->
  57 + <li>
  58 + <a href="javascript:" class="tool-action" ng-click="ctrl.exportData()">
  59 + <i class="fa fa-file-excel-o"></i>
  60 + 导出excel
  61 + </a>
  62 + </li>
  63 + <!--<li class="divider"></li>-->
  64 + <!--<li>-->
  65 + <!--<a href="javascript:" class="tool-action">-->
  66 + <!--<i class="fa fa-download"></i>-->
  67 + <!--excel模版-->
  68 + <!--</a>-->
  69 + <!--</li>-->
  70 + </ul>
  71 + </div>
  72 + </div>
  73 + </div>
  74 +
  75 + <div class="portlet-body">
  76 + <div ui-view="busInfoManage_list"></div>
  77 + </div>
  78 + </div>
  79 + </div>
  80 +</div>
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/list.html
  View file @6735bf1
1   -<!-- ui-route busInfoManage.list -->
2   -<div ng-controller="BusInfoManageListCtrl as ctrl">
3   - <div class="fixDiv">
4   - <table class="table fixTable table-striped table-bordered table-hover table-checkable order-column">
5   - <thead>
6   - <tr role="row" class="heading">
7   - <th style="width:70px;">序号</th>
8   - <th style="width: 120px;">车辆编号</th>
9   - <th style="width: 120px;">内部编号</th>
10   - <th style="width: 120px;">设备编号</th>
11   - <th style="width: 120px;">车牌号</th>
12   - <th >所在公司</th>
13   - <th >所在分公司</th>
14   - <th style="width: 60px">电车</th>
15   - <th style="width: 80px;" >状态</th>
16   - <th >操作</th>
17   - </tr>
18   - <tr role="row" class="filter">
19   - <td></td>
20   - <td>
21   - <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition().carCode_like" placeholder="输入车辆编号..."/>
22   - </td>
23   - <td>
24   - <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition().insideCode_like" placeholder="输入内部编号..."/>
25   - </td>
26   - <td>
27   - <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition().equipmentCode_like" placeholder="输入设备编号..."/>
28   - </td>
29   - <td>
30   - <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition().carPlate_like" placeholder="输入车牌号..."/>
31   - </td>
32   - <td>
33   - <sa-Select5 name="gs"
34   - model="ctrl.searchCondition()"
35   - cmaps="{'businessCode_eq': 'businessCode'}"
36   - dcname="businessCode_eq"
37   - icname="businessCode"
38   - dsparams="{{ {type: 'ajax', param:{'upCode_eq': '88' }, atype:'gs' } | json }}"
39   - iterobjname="item"
40   - iterobjexp="item.businessName"
41   - searchph="请输拼音..."
42   - searchexp="this.businessName"
43   - required
44   - >
45   - </sa-Select5>
46   - </td>
47   - <td>
48   - <sa-Select5 name="fgs"
49   - model="ctrl.searchCondition()"
50   - cmaps="{'brancheCompanyCode_eq': 'businessCode'}"
51   - dcname="brancheCompanyCode_eq"
52   - icname="businessCode"
53   - dsparams="{{ {type: 'ajax', param:{'upCode_eq': ctrl.searchCondition().businessCode_eq }, atype:'gs' } | json }}"
54   - iterobjname="item"
55   - iterobjexp="item.businessName"
56   - searchph="请输拼音..."
57   - searchexp="this.businessName"
58   - required
59   - >
60   - </sa-Select5>
61   - </td>
62   - <td>
63   -
64   - </td>
65   - <td>
66   - <label class="checkbox-inline input">
67   - <input type="checkbox" ng-model="ctrl.searchCondition()['scrapState_eq']" />报废
68   - </label>
69   - </td>
70   - <td>
71   - <div class="btn-group">
72   - <button class="btn btn-sm green btn-outline filter-submit margin-bottom" style="margin-right: 0;"
73   - ng-click="ctrl.doPage()">
74   - <i class="fa fa-search"></i> 搜索</button>
75   - <button class="btn btn-sm green btn-outline filter-submit margin-bottom dropdown-toggle"
76   - data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
77   - <span class="caret"></span>
78   - <span class="sr-only">dropdown</span>
79   - </button>
80   - <ul class="dropdown-menu pull-right">
81   - <li>
82   - <a href="javascript:" class="tool-action" ng-click="ctrl.customOrder()">
83   - <i class="fa fa-sort-amount-asc" aria-hidden="true"></i>
84   - 排序选项
85   - </a>
86   - </li>
87   - </ul>
88   - </div>
89   -
90   - <button class="btn btn-sm red btn-outline filter-cancel"
91   - ng-click="ctrl.reset()">
92   - <i class="fa fa-times"></i> 重置</button>
93   - </td>
94   -
95   - </tr>
96   - </thead>
97   - <tbody>
98   - <tr ng-repeat="info in ctrl.page()['content']" class="odd gradeX">
99   - <td>
100   - <div>
101   - <a href="#"
102   - tooltip-animation="false"
103   - tooltip-placement="top"
104   - uib-tooltip="{{'公司/编号：' + info.company + '/' + info.insideCode}}"
105   - tooltip-class="headClass">
106   -
107   - <i class="fa fa-list-ol" aria-hidden="true"></i>
108   - {{$index + ctrl.page().number * 10 + 1}}
109   - </a>
110   - </div>
111   - </td>
112   - <td>
113   - <span ng-bind="info.carCode"></span>
114   - </td>
115   - <td>
116   - <span ng-bind="info.insideCode"></span>
117   - </td>
118   - <td>
119   - <span ng-bind="info.equipmentCode"></span>
120   - </td>
121   - <td>
122   - <span ng-bind="info.carPlate"></span>
123   - </td>
124   - <td>
125   - <span ng-bind="info.company"></span>
126   - </td>
127   - <td>
128   - <span ng-bind="info.brancheCompany"></span>
129   - </td>
130   - <td>
131   - <span ng-bind="info.sfdc | dict:'truefalseType':'未知' "></span>
132   - </td>
133   - <td>
134   - <span ng-bind="info.scrapState | dict:'truefalseType':'未知' "></span>
135   - </td>
136   - <td>
137   - <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
138   - <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
139   - <a ui-sref="busInfoManage_detail({id: info.id})" class="btn btn-info btn-sm"> 详细 </a>
140   - <!--<a ui-sref="busInfoManage_edit({id: info.id})" class="btn btn-info btn-sm"> 修改 </a>-->
141   - <!--<a sweetalert-->
142   - <!--sweet-options="{title: '是否删除车辆信息？',text: '内部编码：' + info.insideCode + '</br>如果有车辆配置信息关联，会报错，建议不要随便删除！', html: true,type: 'warning',showCancelButton: true,confirmButtonColor: '#DD6B55',confirmButtonText: '是',cancelButtonText: '取消'}"-->
143   - <!--sweet-on-confirm="ctrl.deleteCar(info.id)"-->
144   - <!--class="btn btn-danger btn-sm">删除</a>-->
145   - </td>
146   - </tr>
147   - </tbody>
148   - </table>
149   - </div>
150   -
151   - <div class="pageBar">
152   - <div class="pageBarLeft">
153   - {{'显示从' + ctrl.page()['uiFromRecord'] + '到' + ctrl.page()['uiToRecord'] + ' 共' + ctrl.page()['totalElements'] + '条' + ' 每页显示10条'}}
154   - </div>
155   -
156   - <div class="pageBarRight">
157   - <uib-pagination total-items="ctrl.page()['totalElements']"
158   - ng-model="ctrl.page()['uiNumber']"
159   - ng-change="ctrl.doPage()"
160   - rotate="false"
161   - max-size="10"
162   - boundary-links="true"
163   - first-text="首页"
164   - previous-text="上一页"
165   - next-text="下一页"
166   - last-text="尾页">
167   - </uib-pagination>
168   - </div>
169   - </div>
170   -
171   -</div>
  1 +<!-- ui-route busInfoManage.list -->
  2 +<div ng-controller="BusInfoManageListCtrl as ctrl">
  3 + <div class="fixDiv">
  4 + <table class="table fixTable table-striped table-bordered table-hover table-checkable order-column">
  5 + <thead>
  6 + <tr role="row" class="heading">
  7 + <th style="width:70px;">序号</th>
  8 + <th style="width: 120px;">车辆编号</th>
  9 + <th style="width: 120px;">内部编号</th>
  10 + <th style="width: 120px;">设备编号</th>
  11 + <th style="width: 120px;">车牌号</th>
  12 + <th >所在公司</th>
  13 + <th >所在分公司</th>
  14 + <th style="width: 60px">电车</th>
  15 + <th style="width: 80px;" >状态</th>
  16 + <th >操作</th>
  17 + </tr>
  18 + <tr role="row" class="filter">
  19 + <td></td>
  20 + <td>
  21 + <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition().carCode_like" placeholder="输入车辆编号..."/>
  22 + </td>
  23 + <td>
  24 + <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition().insideCode_like" placeholder="输入内部编号..."/>
  25 + </td>
  26 + <td>
  27 + <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition().equipmentCode_like" placeholder="输入设备编号..."/>
  28 + </td>
  29 + <td>
  30 + <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition().carPlate_like" placeholder="输入车牌号..."/>
  31 + </td>
  32 + <td>
  33 + <sa-Select5 name="gs"
  34 + model="ctrl.searchCondition()"
  35 + cmaps="{'businessCode_eq': 'businessCode'}"
  36 + dcname="businessCode_eq"
  37 + icname="businessCode"
  38 + dsparams="{{ {type: 'ajax', param:{'upCode_eq': '88' }, atype:'gs' } | json }}"
  39 + iterobjname="item"
  40 + iterobjexp="item.businessName"
  41 + searchph="请输拼音..."
  42 + searchexp="this.businessName"
  43 + required
  44 + >
  45 + </sa-Select5>
  46 + </td>
  47 + <td>
  48 + <sa-Select5 name="fgs"
  49 + model="ctrl.searchCondition()"
  50 + cmaps="{'brancheCompanyCode_eq': 'businessCode'}"
  51 + dcname="brancheCompanyCode_eq"
  52 + icname="businessCode"
  53 + dsparams="{{ {type: 'ajax', param:{'upCode_eq': ctrl.searchCondition().businessCode_eq }, atype:'gs' } | json }}"
  54 + iterobjname="item"
  55 + iterobjexp="item.businessName"
  56 + searchph="请输拼音..."
  57 + searchexp="this.businessName"
  58 + required
  59 + >
  60 + </sa-Select5>
  61 + </td>
  62 + <td>
  63 +
  64 + </td>
  65 + <td>
  66 + <label class="checkbox-inline input">
  67 + <input type="checkbox" ng-model="ctrl.searchCondition()['scrapState_eq']" />报废
  68 + </label>
  69 + </td>
  70 + <td>
  71 + <div class="btn-group">
  72 + <button class="btn btn-sm green btn-outline filter-submit margin-bottom" style="margin-right: 0;"
  73 + ng-click="ctrl.doPage()">
  74 + <i class="fa fa-search"></i> 搜索</button>
  75 + <button class="btn btn-sm green btn-outline filter-submit margin-bottom dropdown-toggle"
  76 + data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
  77 + <span class="caret"></span>
  78 + <span class="sr-only">dropdown</span>
  79 + </button>
  80 + <ul class="dropdown-menu pull-right">
  81 + <li>
  82 + <a href="javascript:" class="tool-action" ng-click="ctrl.customOrder()">
  83 + <i class="fa fa-sort-amount-asc" aria-hidden="true"></i>
  84 + 排序选项
  85 + </a>
  86 + </li>
  87 + </ul>
  88 + </div>
  89 +
  90 + <button class="btn btn-sm red btn-outline filter-cancel"
  91 + ng-click="ctrl.reset()">
  92 + <i class="fa fa-times"></i> 重置</button>
  93 + </td>
  94 +
  95 + </tr>
  96 + </thead>
  97 + <tbody>
  98 + <tr ng-repeat="info in ctrl.page()['content']" class="odd gradeX">
  99 + <td>
  100 + <div>
  101 + <a href="#"
  102 + tooltip-animation="false"
  103 + tooltip-placement="top"
  104 + uib-tooltip="{{'公司/编号：' + info.company + '/' + info.insideCode}}"
  105 + tooltip-class="headClass">
  106 +
  107 + <i class="fa fa-list-ol" aria-hidden="true"></i>
  108 + {{$index + ctrl.page().number * 10 + 1}}
  109 + </a>
  110 + </div>
  111 + </td>
  112 + <td>
  113 + <span ng-bind="info.carCode"></span>
  114 + </td>
  115 + <td>
  116 + <span ng-bind="info.insideCode"></span>
  117 + </td>
  118 + <td>
  119 + <span ng-bind="info.equipmentCode"></span>
  120 + </td>
  121 + <td>
  122 + <span ng-bind="info.carPlate"></span>
  123 + </td>
  124 + <td>
  125 + <span ng-bind="info.company"></span>
  126 + </td>
  127 + <td>
  128 + <span ng-bind="info.brancheCompany"></span>
  129 + </td>
  130 + <td>
  131 + <span ng-bind="info.sfdc | dict:'truefalseType':'未知' "></span>
  132 + </td>
  133 + <td>
  134 + <span ng-bind="info.scrapState | dict:'truefalseType':'未知' "></span>
  135 + </td>
  136 + <td>
  137 + <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
  138 + <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
  139 + <a ui-sref="busInfoManage_detail({id: info.id})" class="btn btn-info btn-sm"> 详细 </a>
  140 + <a ui-sref="busInfoManage_edit({id: info.id})" class="btn btn-info btn-sm"> 修改 </a>
  141 + <!--<a sweetalert-->
  142 + <!--sweet-options="{title: '是否删除车辆信息？',text: '内部编码：' + info.insideCode + '</br>如果有车辆配置信息关联，会报错，建议不要随便删除！', html: true,type: 'warning',showCancelButton: true,confirmButtonColor: '#DD6B55',confirmButtonText: '是',cancelButtonText: '取消'}"-->
  143 + <!--sweet-on-confirm="ctrl.deleteCar(info.id)"-->
  144 + <!--class="btn btn-danger btn-sm">删除</a>-->
  145 + </td>
  146 + </tr>
  147 + </tbody>
  148 + </table>
  149 + </div>
  150 +
  151 + <div class="pageBar">
  152 + <div class="pageBarLeft">
  153 + {{'显示从' + ctrl.page()['uiFromRecord'] + '到' + ctrl.page()['uiToRecord'] + ' 共' + ctrl.page()['totalElements'] + '条' + ' 每页显示10条'}}
  154 + </div>
  155 +
  156 + <div class="pageBarRight">
  157 + <uib-pagination total-items="ctrl.page()['totalElements']"
  158 + ng-model="ctrl.page()['uiNumber']"
  159 + ng-change="ctrl.doPage()"
  160 + rotate="false"
  161 + max-size="10"
  162 + boundary-links="true"
  163 + first-text="首页"
  164 + previous-text="上一页"
  165 + next-text="下一页"
  166 + last-text="尾页">
  167 + </uib-pagination>
  168 + </div>
  169 + </div>
  170 +
  171 +</div>
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/index.html
  View file @6735bf1
... ... @@ -36,9 +36,9 @@
36 36 <span class="caption-subject bold uppercase">人员信息表</span>
37 37 </div>
38 38 <div class="actions">
39   - <a href="javascript:" class="btn blue" ng-click="ctrl.goForm()" ng-if="ctrl.userInfo.getRole().indexOf('_ADMIN') > -1">
  39 + <a href="javascript:" class="btn blue" ng-click="ctrl.goForm()">
40 40 <i class="fa fa-plus"></i>
41   - 添加人员信息{{}}
  41 + 添加人员信息
42 42 </a>
43 43  
44 44 <div class="btn-group">
... ... @@ -49,6 +49,12 @@
49 49 </a>
50 50 <ul class="dropdown-menu pull-right">
51 51 <li>
  52 + <a href="javascript:" class="tool-action" ng-click="ctrl.importData()">
  53 + <i class="fa fa-file-excel-o"></i>
  54 + 导入excel
  55 + </a>
  56 + </li>
  57 + <li>
52 58 <a href="javascript:" class="tool-action" ng-click="ctrl.exportData()">
53 59 <i class="fa fa-file-excel-o"></i>
54 60 导出excel
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/list.html
  View file @6735bf1
... ... @@ -169,7 +169,7 @@
169 169 <td>
170 170 <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
171 171 <a ui-sref="employeeInfoManage_detail({id: info.id})" class="btn btn-info btn-sm"> 详细 </a>
172   - <a ui-sref="employeeInfoManage_edit({id: info.id})" class="btn btn-info btn-sm" ng-if="ctrl.userInfo.getRole().indexOf('_ADMIN') > -1"> 修改 </a>
  172 + <a ui-sref="employeeInfoManage_edit({id: info.id})" class="btn btn-info btn-sm"> 修改 </a>
173 173 </td>
174 174 </tr>
175 175 </tbody>
... ...
src/main/resources/traffic-jdbc.properties
  View file @6735bf1
... ... @@ -4,6 +4,6 @@
4 4 #ms.mysql.password= 123456
5 5  
6 6 ms.mysql.driver= com.mysql.jdbc.Driver
7   -ms.mysql.url= jdbc:mysql://192.170.100.63/ms?useUnicode=true&characterEncoding=utf-8
  7 +ms.mysql.url= jdbc:mysql://192.168.168.152/ms?useUnicode=true&characterEncoding=utf-8
8 8 ms.mysql.username= root
9 9 ms.mysql.password= root2jsp
10 10 \ No newline at end of file
... ...