Browse Source

时限问题修改

liuyifan 5 years ago
parent
commit
17247c4996
3 changed files with 76 additions and 29 deletions
  1. 28 0
      WebChart/.project
  2. 9 0
      WebUI/CallCenterWeb.UI/.project
  3. 39 29
      WebUI/CallCenterWeb.UI/js/index.js

+ 28 - 0
WebChart/.project

@@ -0,0 +1,28 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<projectDescription>
3
+	<name>睢县大屏WebChart</name>
4
+	<comment></comment>
5
+	<projects>
6
+	</projects>
7
+	<buildSpec>
8
+		<buildCommand>
9
+			<name>com.aptana.ide.core.unifiedBuilder</name>
10
+			<arguments>
11
+			</arguments>
12
+		</buildCommand>
13
+	</buildSpec>
14
+	<natures>
15
+		<nature>com.aptana.projects.webnature</nature>
16
+	</natures>
17
+	<filteredResources>
18
+		<filter>
19
+			<id>1599548839614</id>
20
+			<name></name>
21
+			<type>26</type>
22
+			<matcher>
23
+				<id>org.eclipse.ui.ide.multiFilter</id>
24
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
25
+			</matcher>
26
+		</filter>
27
+	</filteredResources>
28
+</projectDescription>

+ 9 - 0
WebUI/CallCenterWeb.UI/.project

@@ -33,5 +33,14 @@
33 33
 				<arguments>1.0-name-matches-false-false-node_modules</arguments>
34 34
 			</matcher>
35 35
 		</filter>
36
+		<filter>
37
+			<id>1599533014633</id>
38
+			<name></name>
39
+			<type>26</type>
40
+			<matcher>
41
+				<id>org.eclipse.ui.ide.multiFilter</id>
42
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
43
+			</matcher>
44
+		</filter>
36 45
 	</filteredResources>
37 46
 </projectDescription>

+ 39 - 29
WebUI/CallCenterWeb.UI/js/index.js

@@ -188,35 +188,45 @@ $(document).ready(function () {
188 188
         "token": $.cookie("token")
189 189
     }, function (result) {
190 190
         if (result.state.toLowerCase() == "success") {
191
-            $("#RoleCode").val(result.data.user.F_RoleCode);
192
-            $("#GroupCode").val(result.data.user.F_GroupCode);
193
-            //console.log($("#RoleCode").val());
194
-            $(".username").text(result.data.user.F_UserName);
195
-            $('.user_code').text(result.data.user.F_UserCode);
196
-            $('.group').text(result.data.user.F_SeartGroup);
197
-            $(".rolename").text(result.data.user.depname);
198
-//          if (result.data.role) {
199
-//              $(".rolename").text(result.data.role.F_RoleName);
200
-//          }
201
-            $(".yhtx").attr("src", huayi.config.callcenter_url.substr(0, huayi.config.callcenter_url.length - 1) + result.data.user.F_See);
202
-
203
-            obj.AgentID = result.data.user.F_UserCode;
204
-            //obj.AgentExten = result.data.user.F_WorkNumber;
205
-            $('.mgh').val(result.data.user.F_UserCode);
206
-            $('.mn').val(result.data.user.F_UserName);
207
-            if (result.data.user.F_SeatFlag) {
208
-                Connect();
209
-                //heartbeat = setInterval(function() {
210
-                //	Heart()
211
-                //}, 60000);
212
-                $("#top-search").show();
213
-                $(".phoneBZ").show();
214
-                $(".zts").show();
215
-                //签入
216
-                //obj.Type = "Login";
217
-                //obj.AgentGroup = "364";
218
-                //obj.AgentType = "0";
219
-                //Send();
191
+            if (result.data !== null) {
192
+                $("#RoleCode").val(result.data.user.F_RoleCode);
193
+                $("#GroupCode").val(result.data.user.F_GroupCode);
194
+                //console.log($("#RoleCode").val());
195
+                $(".username").text(result.data.user.F_UserName);
196
+                $('.user_code').text(result.data.user.F_UserCode);
197
+                $('.group').text(result.data.user.F_SeartGroup);
198
+                $(".rolename").text(result.data.user.depname);
199
+    //          if (result.data.role) {
200
+    //              $(".rolename").text(result.data.role.F_RoleName);
201
+    //          }
202
+                $(".yhtx").attr("src", huayi.config.callcenter_url.substr(0, huayi.config.callcenter_url.length - 1) + result.data.user.F_See);
203
+    
204
+                obj.AgentID = result.data.user.F_UserCode;
205
+                //obj.AgentExten = result.data.user.F_WorkNumber;
206
+                $('.mgh').val(result.data.user.F_UserCode);
207
+                $('.mn').val(result.data.user.F_UserName);
208
+                if (result.data.user.F_SeatFlag) {
209
+                    Connect();
210
+                    //heartbeat = setInterval(function() {
211
+                    //	Heart()
212
+                    //}, 60000);
213
+                    $("#top-search").show();
214
+                    $(".phoneBZ").show();
215
+                    $(".zts").show();
216
+                    //签入
217
+                    //obj.Type = "Login";
218
+                    //obj.AgentGroup = "364";
219
+                    //obj.AgentType = "0";
220
+                    //Send();
221
+                }
222
+            } else {
223
+                layer.confirm("授权过期,请联系系统厂家", {
224
+                    icon: 2,
225
+                    btn: ['确定'],
226
+                    yes:function (index, layero) {
227
+                        window.location.href = "login.html";
228
+                    }
229
+                });
220 230
             }
221 231
         }
222 232
     });