Browse Source

Merge branch 'pc-repair' of http://git.dashitech.com/seimin/zuel-itsm-3.0.2 into pc-repair

seimin 2 years ago
parent
commit
169418e3c7
2 changed files with 26 additions and 110 deletions
  1. 10 97
      js/index.js
  2. 16 13
      js/login.js

+ 10 - 97
js/index.js

@@ -509,7 +509,7 @@ $(function () {
509
     // 过滤数据
509
     // 过滤数据
510
     var resFilter1 = { list: [] };
510
     var resFilter1 = { list: [] };
511
     for (var i = 0; i < placeList.length; i++) {
511
     for (var i = 0; i < placeList.length; i++) {
512
-      if (placeList[i]["area"]["id"] == resFilter.list[0].id) {
512
+      if (resFilter.list[0] && placeList[i]["area"]["id"] == resFilter.list[0].id) {
513
         resFilter1.list.push(placeList[i]);
513
         resFilter1.list.push(placeList[i]);
514
       }
514
       }
515
     }
515
     }
@@ -537,7 +537,7 @@ $(function () {
537
     // 过滤数据
537
     // 过滤数据
538
     var resFilter1 = { list: [] };
538
     var resFilter1 = { list: [] };
539
     for (var i = 0; i < roomList.length; i++) {
539
     for (var i = 0; i < roomList.length; i++) {
540
-      if (roomList[i]["place"]["id"] == resFilter.list[0].id) {
540
+      if (resFilter.list[0] && roomList[i]["place"]["id"] == resFilter.list[0].id) {
541
         resFilter1.list.push(roomList[i]);
541
         resFilter1.list.push(roomList[i]);
542
       }
542
       }
543
     }
543
     }
@@ -1102,7 +1102,7 @@ $(function () {
1102
           });
1102
           });
1103
           var html = template("area_list_temp", res);
1103
           var html = template("area_list_temp", res);
1104
           $("#area_list").html(html);
1104
           $("#area_list").html(html);
1105
-          $("#area_list").val(loginUser.place.area.id);
1105
+          loginUser.place && $("#area_list").val(loginUser.place.area.id);
1106
         }
1106
         }
1107
       },
1107
       },
1108
       error: function (err) {
1108
       error: function (err) {
@@ -1121,11 +1121,11 @@ $(function () {
1121
         if (res.status == 200) {
1121
         if (res.status == 200) {
1122
           placeList = JSON.parse(JSON.stringify(res.list));
1122
           placeList = JSON.parse(JSON.stringify(res.list));
1123
           res.list = res.list.filter((v) => {
1123
           res.list = res.list.filter((v) => {
1124
-            return v.area.id == loginUser.place.area.id;
1124
+            return v.area.id == loginUser.place ? loginUser.place.area.id : null;
1125
           });
1125
           });
1126
           var html = template("place_list_temp", res);
1126
           var html = template("place_list_temp", res);
1127
           $("#place_list").html(html);
1127
           $("#place_list").html(html);
1128
-          $("#place_list").val(loginUser.place.id);
1128
+          loginUser.place && $("#place_list").val(loginUser.place.id);
1129
         }
1129
         }
1130
       },
1130
       },
1131
       error: function (err) {
1131
       error: function (err) {
@@ -1144,7 +1144,7 @@ $(function () {
1144
         if (res.status == 200) {
1144
         if (res.status == 200) {
1145
           roomList = JSON.parse(JSON.stringify(res.list));
1145
           roomList = JSON.parse(JSON.stringify(res.list));
1146
           res.list = res.list.filter((v) => {
1146
           res.list = res.list.filter((v) => {
1147
-            return v.place.id == loginUser.place.id;
1147
+            return v.place.id == loginUser.place ? loginUser.place.id : null;
1148
           });
1148
           });
1149
           var html = template("room_list_temp", res);
1149
           var html = template("room_list_temp", res);
1150
           $("#room_list").html(html);
1150
           $("#room_list").html(html);
@@ -1399,52 +1399,8 @@ $(function () {
1399
                   //弹窗展示
1399
                   //弹窗展示
1400
                   pop1Handle({
1400
                   pop1Handle({
1401
                     title: "报修查看",
1401
                     title: "报修查看",
1402
-                    confirmTitle: "撤回",
1403
-                    cancelTitle: "取消",
1404
-                    onlyButton: false,
1405
-                    twoConfirmClose: false,
1406
-                    confirmHandle: function () {
1407
-                      // setTimeout(function () {
1408
-                      //填充弹窗数据
1409
-                      var html = template("back_detail_temp", {});
1410
-                      $("#pop1").html(html);
1411
-                      //placeholder
1412
-                      $(".back-textarea")
1413
-                        .on("focus", function () {
1414
-                          if ($(this).val() == "请输入撤回原因") {
1415
-                            $(this).val("");
1416
-                          }
1417
-                        })
1418
-                        .on("blur", function () {
1419
-                          if ($(this).val() == "") {
1420
-                            $(this).val("请输入撤回原因");
1421
-                          }
1422
-                        });
1423
-                      pop1Handle({
1424
-                        width: 340,
1425
-                        height: 230,
1426
-                        title: "撤回原因",
1427
-                        confirmTitle: "撤回",
1428
-                        cancelTitle: "取消",
1429
-                        onlyButton: false,
1430
-                        twoConfirmClose: false,
1431
-                        confirmHandle: function () {
1432
-                          if (
1433
-                            $.trim($("#pop1 .back-textarea").val()) != "" &&
1434
-                            $.trim($("#pop1 .back-textarea").val()) !=
1435
-                              "请输入撤回原因"
1436
-                          ) {
1437
-                            bxBack({
1438
-                              id: id,
1439
-                              retractReason: $("#pop1 .back-textarea").val(),
1440
-                            });
1441
-                          } else {
1442
-                            alert("撤回原因不能为空");
1443
-                          }
1444
-                        },
1445
-                      });
1446
-                      // }, 200)
1447
-                    },
1402
+                    confirmTitle: "取消",
1403
+                    onlyButton: true
1448
                   });
1404
                   });
1449
                 } else if (resFilter.state.id == 0) {
1405
                 } else if (resFilter.state.id == 0) {
1450
                   //添加详情页流程数据
1406
                   //添加详情页流程数据
@@ -1462,51 +1418,8 @@ $(function () {
1462
                   //弹窗展示
1418
                   //弹窗展示
1463
                   pop1Handle({
1419
                   pop1Handle({
1464
                     title: "报修查看",
1420
                     title: "报修查看",
1465
-                    confirmTitle: "撤回",
1466
-                    cancelTitle: "取消",
1467
-                    onlyButton: false,
1468
-                    confirmHandle: function () {
1469
-                      // setTimeout(function () {
1470
-                      //填充弹窗数据
1471
-                      var html = template("back_detail_temp", {});
1472
-                      $("#pop1").html(html);
1473
-                      //placeholder
1474
-                      $(".back-textarea")
1475
-                        .on("focus", function () {
1476
-                          if ($(this).val() == "请输入撤回原因") {
1477
-                            $(this).val("");
1478
-                          }
1479
-                        })
1480
-                        .on("blur", function () {
1481
-                          if ($(this).val() == "") {
1482
-                            $(this).val("请输入撤回原因");
1483
-                          }
1484
-                        });
1485
-                      pop1Handle({
1486
-                        width: 340,
1487
-                        height: 230,
1488
-                        title: "撤回原因",
1489
-                        confirmTitle: "撤回",
1490
-                        cancelTitle: "取消",
1491
-                        onlyButton: false,
1492
-                        twoConfirmClose: false,
1493
-                        confirmHandle: function () {
1494
-                          if (
1495
-                            $.trim($("#pop1 .back-textarea").val()) != "" ||
1496
-                            $.trim($("#pop1 .back-textarea").val()) !=
1497
-                              "请输入撤回原因"
1498
-                          ) {
1499
-                            bxBack({
1500
-                              id: id,
1501
-                              retractReason: $("#pop1 .back-textarea").val(),
1502
-                            });
1503
-                          } else {
1504
-                            alert("撤回原因不能为空");
1505
-                          }
1506
-                        },
1507
-                      });
1508
-                      // }, 200)
1509
-                    },
1421
+                    confirmTitle: "取消",
1422
+                    onlyButton: true
1510
                   });
1423
                   });
1511
                 } else if (resFilter.state.id == 1594) {
1424
                 } else if (resFilter.state.id == 1594) {
1512
                   //添加详情页流程数据
1425
                   //添加详情页流程数据

+ 16 - 13
js/login.js

@@ -21,7 +21,7 @@ $(function () {
21
   // $("#logo").html(
21
   // $("#logo").html(
22
   //   template("logo_temp", { isVersion: sessionStorage.getItem("version_qd") })
22
   //   template("logo_temp", { isVersion: sessionStorage.getItem("version_qd") })
23
   // );
23
   // );
24
-  var isSSo = location.search.length > 0; //是否单点登录
24
+  var isSSo = true; //是否单点登录
25
   if (isSSo) {
25
   if (isSSo) {
26
     $(".container").hide();
26
     $(".container").hide();
27
     login();
27
     login();
@@ -42,22 +42,22 @@ $(function () {
42
       password: pwd,
42
       password: pwd,
43
     };
43
     };
44
     // 单点登录 start
44
     // 单点登录 start
45
-    var ssoStr = "";
46
-    var ssoJson;
47
-    if (isSSo) {
48
-      ssoStr = location.search.replace("?", "").split("&")[0].split("=")[1];
49
-      ssoStr = Base64.decode(decodeURIComponent(ssoStr));
50
-      ssoJson = JSON.parse(ssoStr);
51
-    }
52
-    var postData = isSSo
53
-      ? { username: ssoJson.a, password: ssoJson.r, t: false }
54
-      : data;
45
+    // var ssoStr = "";
46
+    // var ssoJson;
47
+    // if (isSSo) {
48
+    //   ssoStr = location.search.replace("?", "").split("&")[0].split("=")[1];
49
+    //   ssoStr = Base64.decode(decodeURIComponent(ssoStr));
50
+    //   ssoJson = JSON.parse(ssoStr);
51
+    // }
52
+    // var postData = isSSo
53
+    //   ? { username: ssoJson.a, password: ssoJson.r, t: false }
54
+    //   : data;
55
     // 单点登录 end
55
     // 单点登录 end
56
     $.ajax({
56
     $.ajax({
57
       type: "POST",
57
       type: "POST",
58
       contentType: "application/json;charset=UTF-8",
58
       contentType: "application/json;charset=UTF-8",
59
-      url: baseUrl + "auth/reqlogin",
60
-      data: JSON.stringify(postData),
59
+      url: baseUrl + "auth/sslLogin",
60
+      data: JSON.stringify({type: 'req'}),
61
       success: function (res) {
61
       success: function (res) {
62
         if (res.state == 200) {
62
         if (res.state == 200) {
63
           if (isSSo) {
63
           if (isSSo) {
@@ -110,6 +110,9 @@ $(function () {
110
               console.log(e.responseText);
110
               console.log(e.responseText);
111
             },
111
             },
112
           });
112
           });
113
+        } else if(res.state == 501) {
114
+          window.location.href = "index.html";
115
+          hasClick = false;
113
         } else {
116
         } else {
114
           alert("用户名或密码错误,请重试!");
117
           alert("用户名或密码错误,请重试!");
115
           hasClick = false;
118
           hasClick = false;