Merge branch 'master' of http://git.xt.wenhq.top:8083/wenhongquan/VisualInspection

* 'master' of http://git.xt.wenhq.top:8083/wenhongquan/VisualInspection:
  部门修改

VisualInspection/qzd/js/appeal_management/appeal_list.js

@@ -25,7 +25,17 @@ function initQueryParams() {
         cur_page = store_params.currentpage;
     }
 
-    setWreckerGroupAllSelect("#fsList", checked_dept);
+    if (roleContains("WRECKER")) {
+        checked_dept = getCurrentUser().organid;
+    }
+        if(checked_dept){
+           var optStr = '<option value="' + checked_dept + '" selected="selected">' + getCurrentUser().organname + '</option>';
+           $("#fsList").html('');
+           $("#fsList").html(optStr);
+           $("#fsList").attr('disabled', 'disabled')
+        }else{
+            setWreckerGroupAllSelect("#fsList"); 
+        }
 
     //获取页面参数
     var page_params = $.zui.store.get("page_params");

VisualInspection/qzd/js/task/new.js

@@ -28,11 +28,18 @@ function initQueryParams() {
     }
 
     var checked_dept = null;
-    if (roleContains("FWQ")) {
+    if (roleContains("WRECKER")) {
         checked_dept = getCurrentUser().organid;
     }
-    setWreckerGroupSelect("#deptlist", checked_dept);
-    setWreckerGroupSelect("#dept", checked_dept);
+        if(checked_dept){
+           var optStr = '<option value="' + checked_dept + '" selected="selected">' + getCurrentUser().organname + '</option>';
+           $("#deptlist").html('');
+           $("#deptlist").html(optStr);
+           $("#deptlist").attr('disabled', 'disabled')
+        }else{
+            setWreckerGroupAllSelect("#deptlist"); 
+        }
+        setWreckerGroupSelect("#dept", checked_dept);
 
 
     if (hasRole(ROLE_JICHA_ADMIN) && cur_status == 4) {

VisualInspection/qzd/js/task/task_list.js

@@ -58,10 +58,17 @@ function initQueryParams() {
         cur_status = page_params.status;
     }
 
-    if (roleContains("FWQ")) {
+    if (roleContains("WRECKER")) {
         checked_dept = getCurrentUser().organid;
     }
-    setWreckerGroupSelect("#qzd", checked_dept);
+        if(checked_dept){
+           var optStr = '<option value="' + checked_dept + '" selected="selected">' + getCurrentUser().organname + '</option>';
+           $("#qzd").html('');
+           $("#qzd").html(optStr);
+           $("#qzd").attr('disabled', 'disabled')
+        }else{
+            setWreckerGroupAllSelect("#qzd"); 
+        }
 
 
     if (hasRole(ROLE_JICHA_ADMIN) && cur_status == 4) {

VisualInspection/qzd/view/appeal_management/appeal_submited.html

@@ -51,11 +51,18 @@
             // $("#hasScoreList").val(store_params.hasScore);
             cur_page = store_params.currentpage;
         }
-        if (roleContains("STATION")) {
-            checked_dept = getCurrentUser().organid;
+        if (roleContains("WRECKER")) {
+        checked_dept = getCurrentUser().organid;
+    }
+        if(checked_dept){
+           var optStr = '<option value="' + checked_dept + '" selected="selected">' + getCurrentUser().organname + '</option>';
+           $("#fsList").html('');
+           $("#fsList").html(optStr);
+        }else{
+            setWreckerGroupAllSelect("#fsList"); 
         }
-        setWreckerGroupAllSelect("#fsList", checked_dept);
-        if (roleContains("STATION")) {
+
+        if (roleContains("WRECKER")) {
             $("#fsList").attr('disabled', 'disabled');
         }
 

VisualInspection/qzd/view/record/record_list.html

@@ -58,4 +58,4 @@
             </div>
         </div>
     </div>
-</div>
+</div>

VisualInspection_server/src/main/resources/application.properties

@@ -56,9 +56,10 @@ spring.datasource.useGlobalDataSourceStat=true
 # Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
 spring.redis.database=0  
 # Redis\u670D\u52A1\u5668\u5730\u5740
-#spring.redis.host=10.112.0.199
-spring.redis.host=127.0.0.1
+spring.redis.host=10.112.0.199
+#spring.redis.host=127.0.0.1
 #spring.redis.host=192.168.45.158
+#spring.redis.host=xt.wenhq.top
 # Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3
 spring.redis.port=6379