Skip to content

R
rota
Commit 3d12a077 authored by 刘丙寅's avatar 刘丙寅
Browse files
Options

优化代码1

parent 06cecc9a
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing with 96 additions and 57 deletions
.idea/workspace.xml
View file @ 3d12a077
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="a188f8e8-7383-4735-a16a-e71d8f97fff3" name="Default Changelist" comment=""> <list default="true" id="a188f8e8-7383-4735-a16a-e71d8f97fff3" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/rota_gm_new.py" beforeDir="false" afterPath="$PROJECT_DIR$/rota_gm_new.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/peizhi.py" beforeDir="false" afterPath="$PROJECT_DIR$/peizhi.py" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
...@@ -12,41 +12,30 @@ ...@@ -12,41 +12,30 @@
<option name="LAST_RESOLUTION" value="IGNORE" /> <option name="LAST_RESOLUTION" value="IGNORE" />
</component> </component>
<component name="CoverageDataManager"> <component name="CoverageDataManager">
<SUITE FILE_PATH="coverage/rota$demo.coverage" NAME="demo Coverage Results" MODIFIED="1620285725994" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" /> <SUITE FILE_PATH="coverage/rota$demo.coverage" NAME="demo Coverage Results" MODIFIED="1621216010941" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
<SUITE FILE_PATH="coverage/rota$rota_gm_new.coverage" NAME="rota_gm_new Coverage Results" MODIFIED="1620461959785" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" /> <SUITE FILE_PATH="coverage/rota$rota_gm_new.coverage" NAME="rota_gm_new Coverage Results" MODIFIED="1624590270702" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
<SUITE FILE_PATH="coverage/rota$rota_gm.coverage" NAME="rota_gm Coverage Results" MODIFIED="1619690148319" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" /> <SUITE FILE_PATH="coverage/rota$rota_gm.coverage" NAME="rota_gm Coverage Results" MODIFIED="1619690148319" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/rota_gm.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="529">
<caret line="25" column="40" selection-start-line="25" selection-start-column="40" selection-end-line="25" selection-end-column="40" />
<folding>
<element signature="e#0#15#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/rota_gm_new.py"> <entry file="file://$PROJECT_DIR$/rota_gm_new.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="547"> <state relative-caret-position="299">
<caret line="82" column="40" lean-forward="true" selection-start-line="82" selection-start-column="40" selection-end-line="82" selection-end-column="40" /> <caret line="13" column="49" lean-forward="true" selection-start-line="13" selection-start-column="49" selection-end-line="13" selection-end-column="49" />
<folding> <folding>
<element signature="e#0#15#0" expanded="true" /> <element signature="e#0#15#0" expanded="true" />
<element signature="e#694#134799#0" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/peizhi.py"> <entry file="file://$PROJECT_DIR$/peizhi.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="368"> <state relative-caret-position="253">
<caret line="16" column="19" selection-start-line="16" selection-start-column="19" selection-end-line="16" selection-end-column="19" /> <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -80,16 +69,16 @@ ...@@ -80,16 +69,16 @@
<list> <list>
<option value="$PROJECT_DIR$/rota_gm.py" /> <option value="$PROJECT_DIR$/rota_gm.py" />
<option value="$PROJECT_DIR$/demo.py" /> <option value="$PROJECT_DIR$/demo.py" />
<option value="$PROJECT_DIR$/peizhi.py" />
<option value="$PROJECT_DIR$/rota_gm_new.py" /> <option value="$PROJECT_DIR$/rota_gm_new.py" />
<option value="$PROJECT_DIR$/peizhi.py" />
</list> </list>
</option> </option>
</component> </component>
<component name="ProjectFrameBounds" fullScreen="true"> <component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="1440" /> <option name="x" value="-1920" />
<option name="y" value="-180" /> <option name="y" value="-157" />
<option name="width" value="1920" /> <option name="width" value="1920" />
<option name="height" value="1080" /> <option name="height" value="1057" />
</component> </component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" /> <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView"> <component name="ProjectView">
...@@ -217,7 +206,13 @@ ...@@ -217,7 +206,13 @@
<workItem from="1619664053864" duration="11284000" /> <workItem from="1619664053864" duration="11284000" />
<workItem from="1619763908943" duration="12423000" /> <workItem from="1619763908943" duration="12423000" />
<workItem from="1620269647785" duration="10899000" /> <workItem from="1620269647785" duration="10899000" />
<workItem from="1620460883656" duration="1048000" /> <workItem from="1620460883656" duration="1600000" />
<workItem from="1621215894472" duration="3106000" />
<workItem from="1623760376054" duration="27000" />
<workItem from="1623760622650" duration="150000" />
<workItem from="1624005728824" duration="70000" />
<workItem from="1624413811074" duration="2649000" />
<workItem from="1624589403519" duration="1162000" />
</task> </task>
<task id="LOCAL-00001" summary="修改文案和时间"> <task id="LOCAL-00001" summary="修改文案和时间">
<created>1619687262591</created> <created>1619687262591</created>
...@@ -247,11 +242,53 @@ ...@@ -247,11 +242,53 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1620287097928</updated> <updated>1620287097928</updated>
</task> </task>
<option name="localTasksCounter" value="5" /> <task id="LOCAL-00005" summary="自动分配用户">
<created>1620461996018</created>
<option name="number" value="00005" />
<option name="presentableId" value="LOCAL-00005" />
<option name="project" value="LOCAL" />
<updated>1620461996018</updated>
</task>
<task id="LOCAL-00006" summary="修改bug">
<created>1621218618121</created>
<option name="number" value="00006" />
<option name="presentableId" value="LOCAL-00006" />
<option name="project" value="LOCAL" />
<updated>1621218618121</updated>
</task>
<task id="LOCAL-00007" summary="jenkins调试">
<created>1621219727285</created>
<option name="number" value="00007" />
<option name="presentableId" value="LOCAL-00007" />
<option name="project" value="LOCAL" />
<updated>1621219727285</updated>
</task>
<task id="LOCAL-00008" summary="jenkins调试1">
<created>1621219934581</created>
<option name="number" value="00008" />
<option name="presentableId" value="LOCAL-00008" />
<option name="project" value="LOCAL" />
<updated>1621219934581</updated>
</task>
<task id="LOCAL-00009" summary="更新代码">
<created>1624417081745</created>
<option name="number" value="00009" />
<option name="presentableId" value="LOCAL-00009" />
<option name="project" value="LOCAL" />
<updated>1624417081745</updated>
</task>
<task id="LOCAL-00010" summary="优化代码">
<created>1624590586340</created>
<option name="number" value="00010" />
<option name="presentableId" value="LOCAL-00010" />
<option name="project" value="LOCAL" />
<updated>1624590586340</updated>
</task>
<option name="localTasksCounter" value="11" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="35654000" /> <option name="totallyTimeSpent" value="43370000" />
</component> </component>
<component name="TodoView"> <component name="TodoView">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
...@@ -263,15 +300,15 @@ ...@@ -263,15 +300,15 @@
</todo-panel> </todo-panel>
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="1440" y="-180" width="1920" height="1080" extended-state="0" /> <frame x="-1920" y="-157" width="1920" height="1057" extended-state="6" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.13525027" /> <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.10596379" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" /> <window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" /> <window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" weight="0.37425742" /> <window_info anchor="bottom" id="Run" order="2" weight="0.43626943" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" /> <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
...@@ -297,7 +334,12 @@ ...@@ -297,7 +334,12 @@
<MESSAGE value="修改代码逻辑" /> <MESSAGE value="修改代码逻辑" />
<MESSAGE value="完善代码逻辑" /> <MESSAGE value="完善代码逻辑" />
<MESSAGE value="自动分配用户" /> <MESSAGE value="自动分配用户" />
<option name="LAST_COMMIT_MESSAGE" value="自动分配用户" /> <MESSAGE value="修改bug" />
<MESSAGE value="jenkins调试" />
<MESSAGE value="jenkins调试1" />
<MESSAGE value="更新代码" />
<MESSAGE value="优化代码" />
<option name="LAST_COMMIT_MESSAGE" value="优化代码" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/venv/lib/python3.7/site-packages/requests/adapters.py"> <entry file="file://$PROJECT_DIR$/venv/lib/python3.7/site-packages/requests/adapters.py">
...@@ -464,13 +506,6 @@ ...@@ -464,13 +506,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$APPLICATION_HOME_DIR$/helpers/typeshed/stdlib/2and3/datetime.pyi">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="160">
<caret line="140" column="12" selection-start-line="140" selection-start-column="12" selection-end-line="140" selection-end-column="12" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Library/Caches/PyCharm2018.3/python_stubs/1348919709/builtins.py"> <entry file="file://$USER_HOME$/Library/Caches/PyCharm2018.3/python_stubs/1348919709/builtins.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="369"> <state relative-caret-position="369">
...@@ -494,42 +529,47 @@ ...@@ -494,42 +529,47 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/demo.py"> <entry file="file://$APPLICATION_HOME_DIR$/helpers/typeshed/stdlib/2and3/datetime.pyi">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="413"> <state relative-caret-position="327">
<caret line="53" column="30" lean-forward="true" selection-start-line="53" selection-start-column="30" selection-end-line="53" selection-end-column="30" /> <caret line="140" column="42" selection-start-line="140" selection-start-column="42" selection-end-line="140" selection-end-column="42" />
<folding>
<element signature="e#0#13#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/rota_gm.py"> <entry file="file://$PROJECT_DIR$/demo.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="529"> <state relative-caret-position="1114">
<caret line="25" column="40" selection-start-line="25" selection-start-column="40" selection-end-line="25" selection-end-column="40" /> <caret line="73" column="26" lean-forward="true" selection-start-line="73" selection-start-column="26" selection-end-line="73" selection-end-column="26" />
<folding> <folding>
<element signature="e#0#15#0" expanded="true" /> <element signature="e#0#13#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/peizhi.py"> <entry file="file://$PROJECT_DIR$/rota_gm.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="368"> <state relative-caret-position="618">
<caret line="16" column="19" selection-start-line="16" selection-start-column="19" selection-end-line="16" selection-end-column="19" /> <caret line="46" column="25" lean-forward="true" selection-start-line="46" selection-start-column="25" selection-end-line="46" selection-end-column="25" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/rota_gm_new.py"> <entry file="file://$PROJECT_DIR$/rota_gm_new.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="547"> <state relative-caret-position="299">
<caret line="82" column="40" lean-forward="true" selection-start-line="82" selection-start-column="40" selection-end-line="82" selection-end-column="40" /> <caret line="13" column="49" lean-forward="true" selection-start-line="13" selection-start-column="49" selection-end-line="13" selection-end-column="49" />
<folding> <folding>
<element signature="e#0#15#0" expanded="true" /> <element signature="e#0#15#0" expanded="true" />
<element signature="e#694#134799#0" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/peizhi.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="253">
<caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
</state>
</provider>
</entry>
</component> </component>
</project> </project>
\ No newline at end of file
peizhi.py
View file @ 3d12a077
...@@ -11,17 +11,15 @@ Personnel_list={ ...@@ -11,17 +11,15 @@ Personnel_list={
} }
Personnel_list_new = ["淑琴", "婷婷", "崔鑫", "张慧", "丙寅", "韧开", "陈雪", "林颖", "艮霞", "莹莹", "奉龙", "伟男"] Personnel_list_new = ["淑琴", "崔鑫", "张慧", "丙寅", "韧开", "林颖", "艮霞", "莹莹", "奉龙", "伟男"]
Personnel_list_1 ={ Personnel_list_1 ={
"淑琴":15201310698, "淑琴":15201310698,
"婷婷":17796839512,
"崔鑫":17777863287, "崔鑫":17777863287,
"张慧":17610410225, "张慧":17610410225,
"丙寅":17601625117, "丙寅":17601625117,
"韧开":18331001142, "韧开":18331001142,
"陈雪":18645658305,
"林颖":15033502665, "林颖":15033502665,
"艮霞":17610450939, "艮霞":17610450939,
"莹莹":18301089928, "莹莹":18301089928,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment