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

js/index.js

@@ -509,7 +509,7 @@ $(function () {
     // 过滤数据
     var resFilter1 = { list: [] };
     for (var i = 0; i < placeList.length; i++) {
-      if (placeList[i]["area"]["id"] == resFilter.list[0].id) {
+      if (resFilter.list[0] && placeList[i]["area"]["id"] == resFilter.list[0].id) {
         resFilter1.list.push(placeList[i]);
       }
     }
@@ -537,7 +537,7 @@ $(function () {
     // 过滤数据
     var resFilter1 = { list: [] };
     for (var i = 0; i < roomList.length; i++) {
-      if (roomList[i]["place"]["id"] == resFilter.list[0].id) {
+      if (resFilter.list[0] && roomList[i]["place"]["id"] == resFilter.list[0].id) {
         resFilter1.list.push(roomList[i]);
       }
     }
@@ -1102,7 +1102,7 @@ $(function () {
           });
           var html = template("area_list_temp", res);
           $("#area_list").html(html);
-          $("#area_list").val(loginUser.place.area.id);
+          loginUser.place && $("#area_list").val(loginUser.place.area.id);
         }
       },
       error: function (err) {
@@ -1121,11 +1121,11 @@ $(function () {
         if (res.status == 200) {
           placeList = JSON.parse(JSON.stringify(res.list));
           res.list = res.list.filter((v) => {
-            return v.area.id == loginUser.place.area.id;
+            return v.area.id == loginUser.place ? loginUser.place.area.id : null;
           });
           var html = template("place_list_temp", res);
           $("#place_list").html(html);
-          $("#place_list").val(loginUser.place.id);
+          loginUser.place && $("#place_list").val(loginUser.place.id);
         }
       },
       error: function (err) {
@@ -1144,7 +1144,7 @@ $(function () {
         if (res.status == 200) {
           roomList = JSON.parse(JSON.stringify(res.list));
           res.list = res.list.filter((v) => {
-            return v.place.id == loginUser.place.id;
+            return v.place.id == loginUser.place ? loginUser.place.id : null;
           });
           var html = template("room_list_temp", res);
           $("#room_list").html(html);
@@ -1399,52 +1399,8 @@ $(function () {
                   //弹窗展示
                   pop1Handle({
                     title: "报修查看",
-                    confirmTitle: "撤回",
-                    cancelTitle: "取消",
-                    onlyButton: false,
-                    twoConfirmClose: false,
-                    confirmHandle: function () {
-                      // setTimeout(function () {
-                      //填充弹窗数据
-                      var html = template("back_detail_temp", {});
-                      $("#pop1").html(html);
-                      //placeholder
-                      $(".back-textarea")
-                        .on("focus", function () {
-                          if ($(this).val() == "请输入撤回原因") {
-                            $(this).val("");
-                          }
-                        })
-                        .on("blur", function () {
-                          if ($(this).val() == "") {
-                            $(this).val("请输入撤回原因");
-                          }
-                        });
-                      pop1Handle({
-                        width: 340,
-                        height: 230,
-                        title: "撤回原因",
-                        confirmTitle: "撤回",
-                        cancelTitle: "取消",
-                        onlyButton: false,
-                        twoConfirmClose: false,
-                        confirmHandle: function () {
-                          if (
-                            $.trim($("#pop1 .back-textarea").val()) != "" &&
-                            $.trim($("#pop1 .back-textarea").val()) !=
-                              "请输入撤回原因"
-                          ) {
-                            bxBack({
-                              id: id,
-                              retractReason: $("#pop1 .back-textarea").val(),
-                            });
-                          } else {
-                            alert("撤回原因不能为空");
-                          }
-                        },
-                      });
-                      // }, 200)
-                    },
+                    confirmTitle: "取消",
+                    onlyButton: true
                   });
                 } else if (resFilter.state.id == 0) {
                   //添加详情页流程数据
@@ -1462,51 +1418,8 @@ $(function () {
                   //弹窗展示
                   pop1Handle({
                     title: "报修查看",
-                    confirmTitle: "撤回",
-                    cancelTitle: "取消",
-                    onlyButton: false,
-                    confirmHandle: function () {
-                      // setTimeout(function () {
-                      //填充弹窗数据
-                      var html = template("back_detail_temp", {});
-                      $("#pop1").html(html);
-                      //placeholder
-                      $(".back-textarea")
-                        .on("focus", function () {
-                          if ($(this).val() == "请输入撤回原因") {
-                            $(this).val("");
-                          }
-                        })
-                        .on("blur", function () {
-                          if ($(this).val() == "") {
-                            $(this).val("请输入撤回原因");
-                          }
-                        });
-                      pop1Handle({
-                        width: 340,
-                        height: 230,
-                        title: "撤回原因",
-                        confirmTitle: "撤回",
-                        cancelTitle: "取消",
-                        onlyButton: false,
-                        twoConfirmClose: false,
-                        confirmHandle: function () {
-                          if (
-                            $.trim($("#pop1 .back-textarea").val()) != "" ||
-                            $.trim($("#pop1 .back-textarea").val()) !=
-                              "请输入撤回原因"
-                          ) {
-                            bxBack({
-                              id: id,
-                              retractReason: $("#pop1 .back-textarea").val(),
-                            });
-                          } else {
-                            alert("撤回原因不能为空");
-                          }
-                        },
-                      });
-                      // }, 200)
-                    },
+                    confirmTitle: "取消",
+                    onlyButton: true
                   });
                 } else if (resFilter.state.id == 1594) {
                   //添加详情页流程数据

js/login.js

@@ -21,7 +21,7 @@ $(function () {
   // $("#logo").html(
   //   template("logo_temp", { isVersion: sessionStorage.getItem("version_qd") })
   // );
-  var isSSo = location.search.length > 0; //是否单点登录
+  var isSSo = true; //是否单点登录
   if (isSSo) {
     $(".container").hide();
     login();
@@ -42,22 +42,22 @@ $(function () {
       password: pwd,
     };
     // 单点登录 start
-    var ssoStr = "";
-    var ssoJson;
-    if (isSSo) {
-      ssoStr = location.search.replace("?", "").split("&")[0].split("=")[1];
-      ssoStr = Base64.decode(decodeURIComponent(ssoStr));
-      ssoJson = JSON.parse(ssoStr);
-    }
-    var postData = isSSo
-      ? { username: ssoJson.a, password: ssoJson.r, t: false }
-      : data;
+    // var ssoStr = "";
+    // var ssoJson;
+    // if (isSSo) {
+    //   ssoStr = location.search.replace("?", "").split("&")[0].split("=")[1];
+    //   ssoStr = Base64.decode(decodeURIComponent(ssoStr));
+    //   ssoJson = JSON.parse(ssoStr);
+    // }
+    // var postData = isSSo
+    //   ? { username: ssoJson.a, password: ssoJson.r, t: false }
+    //   : data;
     // 单点登录 end
     $.ajax({
       type: "POST",
       contentType: "application/json;charset=UTF-8",
-      url: baseUrl + "auth/reqlogin",
-      data: JSON.stringify(postData),
+      url: baseUrl + "auth/sslLogin",
+      data: JSON.stringify({type: 'req'}),
       success: function (res) {
         if (res.state == 200) {
           if (isSSo) {
@@ -110,6 +110,9 @@ $(function () {
               console.log(e.responseText);
             },
           });
+        } else if(res.state == 501) {
+          window.location.href = "index.html";
+          hasClick = false;
         } else {
           alert("用户名或密码错误，请重试！");
           hasClick = false;