道管中心领导无法查看受检次数

VisualInspection/js/statistics/assess_ranking.js

@@ -190,9 +190,11 @@ function getEmployeeInfosClick(url, param, start_score, end_score, start_num, en
             var flag = judgeParamFilter(data, i, score, start_score, end_score, check_number, start_num, end_num)
             if (flag) {
                 html = "";
-                if (hasRole(ROLE_JICHA_ADMIN) || hasRole(ROLE_ADMIN)) {
+                if (hasRole(ROLE_JICHA_ADMIN) || hasRole(ROLE_ADMIN) || hasRole(ROLE_ROAD_MANAGER)) {
                     isshownumber = true;
-                    html += "<button id=\"user_" + data[i].user.id + "\" onClick='addTask(" + data[i].user.id + ",\"" + data[i].user.truename + "\",\"" + data[i].user.fee_station_name + "\",\"" + data[i].checked_num + "\",\"" + param.start_date + "\",\"" + param.end_date + "\")'  class=\"btn\" style='margin-left: 10px;padding: 0px;border: 0;background: none;' type=\"button\"><i class=\"icon icon-plus-sign\"></i></button>"
+                    if (hasRole(ROLE_JICHA_ADMIN)) {
+                        html += "<button id=\"user_" + data[i].user.id + "\" onClick='addTask(" + data[i].user.id + ",\"" + data[i].user.truename + "\",\"" + data[i].user.fee_station_name + "\",\"" + data[i].checked_num + "\",\"" + param.start_date + "\",\"" + param.end_date + "\")'  class=\"btn\" style='margin-left: 10px;padding: 0px;border: 0;background: none;' type=\"button\"><i class=\"icon icon-plus-sign\"></i></button>"
+                    }
                 }
 
                 strTbody += "<tr><td width='4%;'>" + (count + 1) + "</td><td width='6%;'>" + data[i].user.fee_station_name + "</td>" +

VisualInspection/js/util/const.js

@@ -53,12 +53,13 @@ var VIDEO_GET_ID = "/webcam/getVideoById/"
 var FILE_UPLOAD = "/file/upload"
 
 
-var CURRENT_PAGE_URL="-1";
-
-var ROLE_JICHA_ADMIN="ROLE_JICHA_ADMIN";
-var ROLE_STATION_ADMIN="ROLE_STATION_ADMIN";
-var ROLE_STATION="ROLE_STATION";
-var ROLE_JICHA="ROLE_JICHA";
-var ROLE_MANAGER="ROLE_MANAGER";
-var ROLE_STATION_AGENT="ROLE_STATION_AGENT";
-var ROLE_ADMIN ="ROLE_ADMIN";
+var CURRENT_PAGE_URL = "-1";
+
+var ROLE_JICHA_ADMIN = "ROLE_JICHA_ADMIN";
+var ROLE_STATION_ADMIN = "ROLE_STATION_ADMIN";
+var ROLE_STATION = "ROLE_STATION";
+var ROLE_JICHA = "ROLE_JICHA";
+var ROLE_MANAGER = "ROLE_MANAGER";
+var ROLE_STATION_AGENT = "ROLE_STATION_AGENT";
+var ROLE_ADMIN = "ROLE_ADMIN";
+var ROLE_ROAD_MANAGER = "ROLE_ROAD_MANAGER";

VisualInspection_server/src/main/resources/application.properties

@@ -3,7 +3,8 @@ spring.thymeleaf.cache=false
 context.listener.classes=com.xintong.SystemInit
 
 #master.datasource.url = jdbc:mysql://10.112.0.199:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
-master.datasource.url = jdbc:mysql://git.topm.win:6400/visualinspection?useUnicode=true&characterEncoding=utf-8
+#master.datasource.url = jdbc:mysql://git.topm.win:6400/visualinspection?useUnicode=true&characterEncoding=utf-8
+master.datasource.url = jdbc:mysql://git.topm.win:6381/visualinspection?useUnicode=true&characterEncoding=utf-8
 #master.datasource.url = jdbc:mysql://10.112.0.199:7002/visualinspection?useUnicode=true&characterEncoding=utf-8
 master.datasource.username = root
 master.datasource.password = root
@@ -12,7 +13,8 @@ master.mapper-locations=classpath:com/xintong/visualinspection/mapper/master/*.x
 
 ## \u7528\u6237\u6570\u636E\u6E90\u914D\u7F6E
 #cluster.datasource.url=jdbc:mysql://10.112.0.199:3306/visualinspection?useUnicode=true&characterEncoding=utf8
-cluster.datasource.url=jdbc:mysql://git.topm.win:6400/visualinspection?useUnicode=true&characterEncoding=utf8
+#cluster.datasource.url=jdbc:mysql://git.topm.win:6400/visualinspection?useUnicode=true&characterEncoding=utf8
+cluster.datasource.url = jdbc:mysql://git.topm.win:6381/visualinspection?useUnicode=true&characterEncoding=utf-8
 #cluster.datasource.url=jdbc:mysql://10.112.0.199:7002/visualinspection?useUnicode=true&characterEncoding=utf8
 cluster.datasource.username=root
 cluster.datasource.password=root
@@ -60,7 +62,8 @@ spring.redis.host=git.topm.win
 #spring.redis.port=6379
 
 #spring.redis.port=7003
-spring.redis.port=6401
+#spring.redis.port=6401
+spring.redis.port=6380
 # Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09
 spring.redis.password=xintong
 # \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09