From 1eceea995e51bb62898c6cc9a8836a734cc81016 Mon Sep 17 00:00:00 2001
From: byb11 <byb11@DESKTOP-EM3PGKQ>
Date: Mon, 29 Mar 2021 16:44:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BA=E5=85=B3=E9=94=AE=E5=AD=97=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=A4=87=E6=B3=A8=EF=BC=8C=E5=B9=B6=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?Settings=E5=92=8CAdministrator=E8=AF=A5=E5=85=B3=E9=94=AE?=
 =?UTF-8?q?=E5=AD=97=E4=BC=A0=E5=85=A5=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 02-Keyword/tsg_ui/administration/Administration.robot |  6 +++---
 02-Keyword/tsg_ui/setting/Settings.robot              |  4 ++--
 04-CustomLibrary/Custometest/StringManipulation.py    | 10 +++-------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/02-Keyword/tsg_ui/administration/Administration.robot b/02-Keyword/tsg_ui/administration/Administration.robot
index 4be7f70..101e3c3 100644
--- a/02-Keyword/tsg_ui/administration/Administration.robot
+++ b/02-Keyword/tsg_ui/administration/Administration.robot
@@ -436,7 +436,7 @@ LoginRestrictions-LastIPNumber
     Execute Javascript    window.scrollTo(0, document.body.scrollHeight)
     ${text}    Get Element Attribute     xpath=/html/body/div/div/div[3]/div[2]/div/div[1]/div/div[2]/div/div/form/div[2]/div/div[1]/div[2]/div[1]/div/div[last()]/div/div/div[2]/i[2]    id
     sleep    ${sleep_min}
-    ${Number}=    StringSegmentation_2    ${text}    ${a}
+    ${Number}=    StringSegmentation    ${text}    ${a}
     [Return]    ${Number}
     
 EditMaximumLoginAttemepts
@@ -606,7 +606,7 @@ AdministrationPagingDisplay
     sleep    ${sleep}
     ${text}    Get text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[4]/div/span[1]
     sleep    ${sleep_min}
-    ${Quantity}    StringSegmentation    ${text}
+    ${Quantity}    StringSegmentation    ${text}    6
     sleep    ${sleep_min}
     ${quyu}    Evaluate    ${Quantity}%${Number}
     ${qumo}    Evaluate    ${Quantity}/${Number}
@@ -637,7 +637,7 @@ AuditLogs-PagingDisplay
     sleep    ${sleep} 
     ${text}    Get text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[4]/div/span[1]
     sleep    ${sleep_min}
-    ${Quantity}    StringSegmentation    ${text}
+    ${Quantity}    StringSegmentation    ${text}    6
     sleep    ${sleep_min}
     ${quyu}    Evaluate    ${Quantity}%${Number}
     ${qumo}    Evaluate    ${Quantity}/${Number}
diff --git a/02-Keyword/tsg_ui/setting/Settings.robot b/02-Keyword/tsg_ui/setting/Settings.robot
index 59670d3..64a7087 100644
--- a/02-Keyword/tsg_ui/setting/Settings.robot
+++ b/02-Keyword/tsg_ui/setting/Settings.robot
@@ -2331,7 +2331,7 @@ PagingDisplay
     sleep    ${sleep}
     ${text}    Get text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[last()]/div/span[1]
     sleep    ${sleep_min}
-    ${Quantity}    StringSegmentation    ${text}
+    ${Quantity}    StringSegmentation    ${text}    6
     sleep    ${sleep_min}
     ${quyu}    Evaluate    ${Quantity}%${Number}
     ${qumo}    Evaluate    ${Quantity}/${Number}
@@ -2364,7 +2364,7 @@ PagingDisplay_Second
     sleep    ${sleep}            
     ${text}    Get text    xpath=//*[@id="ly-table1-listcontent"]/div[2]/div/div/span[1]
     sleep    ${sleep_min}
-    ${Quantity}    StringSegmentation    ${text}
+    ${Quantity}    StringSegmentation    ${text}    6
     sleep    ${sleep_min}
     ${quyu}    Evaluate    ${Quantity}%${Number}
     ${qumo}    Evaluate    ${Quantity}/${Number}
diff --git a/04-CustomLibrary/Custometest/StringManipulation.py b/04-CustomLibrary/Custometest/StringManipulation.py
index dd8a4b5..9b33eed 100644
--- a/04-CustomLibrary/Custometest/StringManipulation.py
+++ b/04-CustomLibrary/Custometest/StringManipulation.py
@@ -1,11 +1,7 @@
-from builtins import len
+ from builtins import len
 
-def StringSegmentation(a):
-	b=len(a)
-	c=a[6:b]
-	return c
-
-def StringSegmentation_2(a,k):
+#用于Settings和Administrator关键字对字符串的切割
+def StringSegmentation(a,k):
 	b=len(a)
 	c=a[k:b]
 	return c
\ No newline at end of file