Commit db448486 authored by 熊成伟's avatar 熊成伟

debug

parent 442c94cc
Pipeline #15297 passed with stages
in 56 seconds
...@@ -2,6 +2,14 @@ ...@@ -2,6 +2,14 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="a6d092de-b4f8-454d-99f5-4dac3ce112e5" name="Default Changelist" comment=""> <list default="true" id="a6d092de-b4f8-454d-99f5-4dac3ce112e5" 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$/src/components/LogCard/index.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/LogCard/index.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/Skeleton/index.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/Skeleton/index.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/WorkCard/CardItem.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/WorkCard/CardItem.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pages/Backlog/Backlog.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/Backlog/Backlog.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pages/Communicate/Communicate.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/Communicate/Communicate.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pages/EventProcessing/Process.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/EventProcessing/Process.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pages/Notice/Notice.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/Notice/Notice.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pages/Work/Work.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/Work/Work.jsx" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/pages/Work/Work.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/Work/Work.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/utils/instance.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/utils/instance.js" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/utils/instance.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/utils/instance.js" afterDir="false" />
</list> </list>
...@@ -16,19 +24,11 @@ ...@@ -16,19 +24,11 @@
</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="true">
<entry file="file://$PROJECT_DIR$/src/pages/EventProcessing/Process.jsx"> <entry file="file://$PROJECT_DIR$/src/pages/EventProcessing/Process.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="125"> <state relative-caret-position="50">
<caret line="5" selection-start-line="5" selection-start-column="3" selection-end-line="5" selection-end-column="51" /> <caret line="2" column="42" selection-start-line="2" selection-start-column="42" selection-end-line="2" selection-end-column="42" />
<folding>
<element signature="e#0#49#0" expanded="true" />
<element signature="e#325#352#0" expanded="true" />
<element signature="e#1338#1722#0" />
<element signature="e#1817#2029#0" />
<element signature="e#2118#2347#0" />
<element signature="e#2689#2905#0" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/pages/Backlog/Backlog.jsx"> <entry file="file://$PROJECT_DIR$/src/pages/Backlog/Backlog.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425"> <state relative-caret-position="175">
<caret line="41" column="30" lean-forward="true" selection-start-line="36" selection-start-column="10" selection-end-line="41" selection-end-column="30" /> <caret line="31" column="80" selection-start-line="31" selection-start-column="80" selection-end-line="31" selection-end-column="80" />
<folding> <folding>
<element signature="e#0#49#0" expanded="true" /> <element signature="e#0#49#0" expanded="true" />
</folding> </folding>
...@@ -48,8 +48,8 @@ ...@@ -48,8 +48,8 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/pages/Notice/Notice.jsx"> <entry file="file://$PROJECT_DIR$/src/pages/Notice/Notice.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-300"> <state relative-caret-position="350">
<caret line="12" column="39" selection-start-line="12" selection-start-column="39" selection-end-line="12" selection-end-column="39" /> <caret line="80" column="14" lean-forward="true" selection-start-line="80" selection-start-column="14" selection-end-line="80" selection-end-column="14" />
<folding> <folding>
<element signature="e#0#49#0" expanded="true" /> <element signature="e#0#49#0" expanded="true" />
</folding> </folding>
...@@ -58,57 +58,57 @@ ...@@ -58,57 +58,57 @@
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/utils/instance.js"> <entry file="file://$PROJECT_DIR$/src/components/NoticeTab/index.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225"> <state relative-caret-position="375">
<caret line="69" column="46" selection-start-line="69" selection-start-column="42" selection-end-line="69" selection-end-column="46" /> <caret line="17" column="58" lean-forward="true" selection-start-line="17" selection-start-column="58" selection-end-line="17" selection-end-column="58" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/pages/Work/Work.jsx"> <entry file="file://$PROJECT_DIR$/src/pages/Work/Work.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225"> <state relative-caret-position="325">
<caret line="25" column="22" selection-start-line="25" selection-start-column="16" selection-end-line="25" selection-end-column="22" /> <caret line="28" column="28" lean-forward="true" selection-start-line="28" selection-start-column="28" selection-end-line="28" selection-end-column="28" />
<folding> <folding>
<element signature="e#0#51#0" expanded="true" /> <element signature="e#0#51#0" expanded="true" />
<element signature="e#154#204#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/pages/EventProcessing/Option.jsx"> <entry file="file://$PROJECT_DIR$/src/pages/Communicate/Communicate.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="645"> <state relative-caret-position="325">
<caret line="29" column="22" selection-start-line="29" selection-start-column="22" selection-end-line="29" selection-end-column="22" /> <caret line="37" column="30" selection-start-line="37" selection-start-column="30" selection-end-line="37" selection-end-column="30" />
<folding> <folding>
<element signature="e#0#40#0" expanded="true" /> <element signature="e#0#49#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/components/LogCard/index.jsx"> <entry file="file://$PROJECT_DIR$/src/components/WorkCard/CardItem.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150"> <state relative-caret-position="400">
<caret line="6" column="33" selection-start-line="6" selection-start-column="24" selection-end-line="6" selection-end-column="33" /> <caret line="35" column="91" selection-start-line="35" selection-start-column="91" selection-end-line="35" selection-end-column="91" />
<folding> <folding>
<element signature="e#0#26#0" expanded="true" /> <element signature="e#0#49#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/components/LogCard/index.less"> <entry file="file://$PROJECT_DIR$/src/utils/request.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-75" /> <state relative-caret-position="975">
<caret line="39" column="18" selection-start-line="39" selection-start-column="11" selection-end-line="39" selection-end-column="18" />
</state>
</provider> </provider>
</entry> </entry>
</file> </file>
...@@ -125,10 +125,6 @@ ...@@ -125,10 +125,6 @@
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
<find>common-layout-content-static</find>
<find>setNodeId</find>
<find>scrollTop</find>
<find>scroll</find>
<find>/blank/work/1</find> <find>/blank/work/1</find>
<find>workUrl</find> <find>workUrl</find>
<find>scrollTo</find> <find>scrollTo</find>
...@@ -146,15 +142,19 @@ ...@@ -146,15 +142,19 @@
<find>t</find> <find>t</find>
<find>setT</find> <find>setT</find>
<find>start</find> <find>start</find>
<find>end</find>
<find>setEnd</find>
<find>setStart</find> <find>setStart</find>
<find>beforeSubmit</find> <find>localStorage</find>
<find>onChange</find> <find>onChange</find>
<find>beforeSubmit</find>
<find>setSearchWord</find>
<find>endT</find> <find>endT</find>
<find>loadingCount</find>
<find>setLoading</find>
<find>console</find>
<find>loading</find>
<find>setEndT</find> <find>setEndT</find>
<find>setSearchWord</find> <find>end</find>
<find>localStorage</find> <find>setEnd</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace>this.props</replace> <replace>this.props</replace>
...@@ -171,13 +171,10 @@ ...@@ -171,13 +171,10 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/.gitlab-ci.yml" />
<option value="$PROJECT_DIR$/config-overrides.js" />
<option value="$PROJECT_DIR$/src/components/LogCard/index.less" /> <option value="$PROJECT_DIR$/src/components/LogCard/index.less" />
<option value="$PROJECT_DIR$/default.conf" /> <option value="$PROJECT_DIR$/default.conf" />
<option value="$PROJECT_DIR$/src/pages/Login/index.jsx" /> <option value="$PROJECT_DIR$/src/pages/Login/index.jsx" />
<option value="$PROJECT_DIR$/src/components/WorkCard/index.jsx" /> <option value="$PROJECT_DIR$/src/components/WorkCard/index.jsx" />
<option value="$PROJECT_DIR$/src/components/LogCard/index.jsx" />
<option value="$PROJECT_DIR$/src/components/AddressList/index.jsx" /> <option value="$PROJECT_DIR$/src/components/AddressList/index.jsx" />
<option value="$PROJECT_DIR$/src/layout/Footer.jsx" /> <option value="$PROJECT_DIR$/src/layout/Footer.jsx" />
<option value="$PROJECT_DIR$/src/pages/index.less" /> <option value="$PROJECT_DIR$/src/pages/index.less" />
...@@ -199,9 +196,7 @@ ...@@ -199,9 +196,7 @@
<option value="$PROJECT_DIR$/src/layout/index.less" /> <option value="$PROJECT_DIR$/src/layout/index.less" />
<option value="$PROJECT_DIR$/src/layout/CommonLayout.jsx" /> <option value="$PROJECT_DIR$/src/layout/CommonLayout.jsx" />
<option value="$PROJECT_DIR$/src/variable.less" /> <option value="$PROJECT_DIR$/src/variable.less" />
<option value="$PROJECT_DIR$/src/pages/Communicate/Communicate.jsx" />
<option value="$PROJECT_DIR$/src/pages/EventProcessing/Flow.jsx" /> <option value="$PROJECT_DIR$/src/pages/EventProcessing/Flow.jsx" />
<option value="$PROJECT_DIR$/src/components/WorkCard/CardItem.jsx" />
<option value="$PROJECT_DIR$/src/router.js" /> <option value="$PROJECT_DIR$/src/router.js" />
<option value="$PROJECT_DIR$/src/components/BlankTabs/index.jsx" /> <option value="$PROJECT_DIR$/src/components/BlankTabs/index.jsx" />
<option value="$PROJECT_DIR$/src/components/BlankTabs/index.less" /> <option value="$PROJECT_DIR$/src/components/BlankTabs/index.less" />
...@@ -211,17 +206,22 @@ ...@@ -211,17 +206,22 @@
<option value="$PROJECT_DIR$/src/pages/EventProcessing/SubmitDetail.jsx" /> <option value="$PROJECT_DIR$/src/pages/EventProcessing/SubmitDetail.jsx" />
<option value="$PROJECT_DIR$/src/utils/request.js" /> <option value="$PROJECT_DIR$/src/utils/request.js" />
<option value="$PROJECT_DIR$/src/pages/EventProcessing/Option.jsx" /> <option value="$PROJECT_DIR$/src/pages/EventProcessing/Option.jsx" />
<option value="$PROJECT_DIR$/src/pages/EventProcessing/Process.jsx" />
<option value="$PROJECT_DIR$/src/pages/Work/WorkDetail.jsx" /> <option value="$PROJECT_DIR$/src/pages/Work/WorkDetail.jsx" />
<option value="$PROJECT_DIR$/src/pages/Communicate/AddressBook.jsx" />
<option value="$PROJECT_DIR$/src/components/Skeleton/index.less" /> <option value="$PROJECT_DIR$/src/components/Skeleton/index.less" />
<option value="$PROJECT_DIR$/src/components/Skeleton/index.jsx" />
<option value="$PROJECT_DIR$/src/pages/Notice/index.less" /> <option value="$PROJECT_DIR$/src/pages/Notice/index.less" />
<option value="$PROJECT_DIR$/src/pages/Backlog/index.less" /> <option value="$PROJECT_DIR$/src/pages/Backlog/index.less" />
<option value="$PROJECT_DIR$/src/pages/Backlog/Backlog.jsx" /> <option value="$PROJECT_DIR$/src/components/Skeleton/index.jsx" />
<option value="$PROJECT_DIR$/src/pages/Notice/Notice.jsx" />
<option value="$PROJECT_DIR$/src/utils/instance.js" /> <option value="$PROJECT_DIR$/src/utils/instance.js" />
<option value="$PROJECT_DIR$/src/pages/Communicate/AddressBook.jsx" />
<option value="$PROJECT_DIR$/src/components/LogCard/index.jsx" />
<option value="$PROJECT_DIR$/src/components/WorkCard/CardItem.jsx" />
<option value="$PROJECT_DIR$/src/pages/Work/Work.jsx" /> <option value="$PROJECT_DIR$/src/pages/Work/Work.jsx" />
<option value="$PROJECT_DIR$/src/pages/Communicate/Communicate.jsx" />
<option value="$PROJECT_DIR$/src/components/Loading/index.jsx" />
<option value="$PROJECT_DIR$/src/components/Loading/index.less" />
<option value="$PROJECT_DIR$/src/pages/Backlog/Backlog.jsx" />
<option value="$PROJECT_DIR$/src/pages/Notice/Notice.jsx" />
<option value="$PROJECT_DIR$/src/pages/EventProcessing/Process.jsx" />
</list> </list>
</option> </option>
</component> </component>
...@@ -246,6 +246,11 @@ ...@@ -246,6 +246,11 @@
<item name="create-react-app" type="b2602c69:ProjectViewProjectNode" /> <item name="create-react-app" type="b2602c69:ProjectViewProjectNode" />
<item name="create-react-app" type="462c0819:PsiDirectoryNode" /> <item name="create-react-app" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="create-react-app" type="b2602c69:ProjectViewProjectNode" />
<item name="create-react-app" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
</path>
<path> <path>
<item name="create-react-app" type="b2602c69:ProjectViewProjectNode" /> <item name="create-react-app" type="b2602c69:ProjectViewProjectNode" />
<item name="create-react-app" type="462c0819:PsiDirectoryNode" /> <item name="create-react-app" type="462c0819:PsiDirectoryNode" />
...@@ -262,27 +267,34 @@ ...@@ -262,27 +267,34 @@
<item name="create-react-app" type="462c0819:PsiDirectoryNode" /> <item name="create-react-app" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" /> <item name="src" type="462c0819:PsiDirectoryNode" />
<item name="components" type="462c0819:PsiDirectoryNode" /> <item name="components" type="462c0819:PsiDirectoryNode" />
<item name="LogCard" type="462c0819:PsiDirectoryNode" /> <item name="Loading" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path> <path>
<item name="create-react-app" type="b2602c69:ProjectViewProjectNode" /> <item name="create-react-app" type="b2602c69:ProjectViewProjectNode" />
<item name="create-react-app" type="462c0819:PsiDirectoryNode" /> <item name="create-react-app" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" /> <item name="src" type="462c0819:PsiDirectoryNode" />
<item name="components" type="462c0819:PsiDirectoryNode" /> <item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="Skeleton" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path> <path>
<item name="create-react-app" type="b2602c69:ProjectViewProjectNode" /> <item name="create-react-app" type="b2602c69:ProjectViewProjectNode" />
<item name="create-react-app" type="462c0819:PsiDirectoryNode" /> <item name="create-react-app" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" /> <item name="src" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" /> <item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="Backlog" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path> <path>
<item name="create-react-app" type="b2602c69:ProjectViewProjectNode" /> <item name="create-react-app" type="b2602c69:ProjectViewProjectNode" />
<item name="create-react-app" type="462c0819:PsiDirectoryNode" /> <item name="create-react-app" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" /> <item name="src" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" /> <item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="Work" type="462c0819:PsiDirectoryNode" /> <item name="EventProcessing" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="create-react-app" type="b2602c69:ProjectViewProjectNode" />
<item name="create-react-app" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="Notice" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path> <path>
<item name="create-react-app" type="b2602c69:ProjectViewProjectNode" /> <item name="create-react-app" type="b2602c69:ProjectViewProjectNode" />
...@@ -307,17 +319,18 @@ ...@@ -307,17 +319,18 @@
<property name="settings.editor.selected.configurable" value="editor.preferences.import" /> <property name="settings.editor.selected.configurable" value="editor.preferences.import" />
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS">
<recent name="F:\即时通讯\create-react-app\src" />
<recent name="F:\即时通讯\create-react-app\src\pages\Work" />
<recent name="F:\即时通讯\create-react-app\src\pages\WorkDetail" />
</key>
<key name="CopyFile.RECENT_KEYS"> <key name="CopyFile.RECENT_KEYS">
<recent name="F:\即时通讯\create-react-app\public\icon" />
<recent name="F:\即时通讯\create-react-app\public\img\test" /> <recent name="F:\即时通讯\create-react-app\public\img\test" />
<recent name="F:\即时通讯\create-react-app\public\img" /> <recent name="F:\即时通讯\create-react-app\public\img" />
<recent name="F:\即时通讯\create-react-app\src\components\AddressList" /> <recent name="F:\即时通讯\create-react-app\src\components\AddressList" />
<recent name="F:\即时通讯\create-react-app\src\pages" /> <recent name="F:\即时通讯\create-react-app\src\pages" />
<recent name="F:\即时通讯\create-react-app\src\pages\AddressList" /> </key>
<key name="MoveFile.RECENT_KEYS">
<recent name="F:\即时通讯\create-react-app\public\img" />
<recent name="F:\即时通讯\create-react-app\src" />
<recent name="F:\即时通讯\create-react-app\src\pages\Work" />
<recent name="F:\即时通讯\create-react-app\src\pages\WorkDetail" />
</key> </key>
</component> </component>
<component name="RunDashboard"> <component name="RunDashboard">
...@@ -350,12 +363,12 @@ ...@@ -350,12 +363,12 @@
<workItem from="1591579020550" duration="32744000" /> <workItem from="1591579020550" duration="32744000" />
<workItem from="1591665260536" duration="37378000" /> <workItem from="1591665260536" duration="37378000" />
<workItem from="1591751569364" duration="40213000" /> <workItem from="1591751569364" duration="40213000" />
<workItem from="1591837824022" duration="23293000" /> <workItem from="1591837824022" duration="33679000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="236443000" /> <option name="totallyTimeSpent" value="246829000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="784" extended-state="6" /> <frame x="-8" y="-8" width="1382" height="784" extended-state="6" />
...@@ -386,44 +399,6 @@ ...@@ -386,44 +399,6 @@
<option name="version" value="1" /> <option name="version" value="1" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/config-overrides.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2350">
<caret line="103" column="5" selection-start-line="103" selection-start-column="5" selection-end-line="103" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/index.less">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="13" column="24" selection-start-line="13" selection-start-column="24" selection-end-line="13" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/TopSearch/index.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="18" column="5" lean-forward="true" selection-start-line="8" selection-start-column="3" selection-end-line="18" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/Empty.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="6" column="39" lean-forward="true" selection-start-line="6" selection-start-column="39" selection-end-line="6" selection-end-column="39" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/NoticeTab/index.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="17" column="58" lean-forward="true" selection-start-line="17" selection-start-column="58" selection-end-line="17" selection-end-column="58" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/useHooks/useThrottle.js"> <entry file="file://$PROJECT_DIR$/src/useHooks/useThrottle.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300"> <state relative-caret-position="300">
...@@ -577,16 +552,6 @@ ...@@ -577,16 +552,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/pages/Communicate/Communicate.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="21" column="27" lean-forward="true" selection-start-line="21" selection-start-column="11" selection-end-line="21" selection-end-column="27" />
<folding>
<element signature="e#0#49#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/variable.less"> <entry file="file://$PROJECT_DIR$/src/variable.less">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420"> <state relative-caret-position="420">
...@@ -618,16 +583,6 @@ ...@@ -618,16 +583,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/components/WorkCard/CardItem.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="50">
<caret line="2" selection-start-line="2" selection-end-line="2" />
<folding>
<element signature="e#0#49#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/BlankTabs/index.jsx"> <entry file="file://$PROJECT_DIR$/src/components/BlankTabs/index.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325"> <state relative-caret-position="325">
...@@ -682,13 +637,6 @@ ...@@ -682,13 +637,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/utils/request.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="33" column="8" selection-start-line="33" selection-start-column="8" selection-end-line="34" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/package.json"> <entry file="file://$PROJECT_DIR$/package.json">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="673"> <state relative-caret-position="673">
...@@ -706,121 +654,165 @@ ...@@ -706,121 +654,165 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/components/Skeleton/index.jsx"> <entry file="file://$PROJECT_DIR$/src/components/Skeleton/index.less">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="475"> <state relative-caret-position="275">
<caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" /> <caret line="11" column="16" lean-forward="true" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="16" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/components/Skeleton/index.less"> <entry file="file://$PROJECT_DIR$/src/components/LogCard/index.less">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275"> <state relative-caret-position="-75" />
<caret line="11" column="16" lean-forward="true" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="16" /> </provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/Notice/index.less">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret selection-end-line="9" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/pages/EventProcessing/Process.jsx"> <entry file="file://$PROJECT_DIR$/src/pages/Backlog/index.less">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="125"> <state relative-caret-position="225">
<caret line="5" selection-start-line="5" selection-start-column="3" selection-end-line="5" selection-end-column="51" /> <caret line="9" selection-start-line="9" selection-end-line="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/EventProcessing/Option.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="570">
<caret line="29" column="22" selection-start-line="29" selection-start-column="22" selection-end-line="29" selection-end-column="22" />
<folding> <folding>
<element signature="e#0#49#0" expanded="true" /> <element signature="e#0#40#0" expanded="true" />
<element signature="e#325#352#0" expanded="true" />
<element signature="e#1338#1722#0" />
<element signature="e#1817#2029#0" />
<element signature="e#2118#2347#0" />
<element signature="e#2689#2905#0" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/pages/Communicate/AddressBook.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="100">
<caret line="4" selection-start-line="4" selection-end-line="4" selection-end-column="48" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/NoticeTab/index.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="17" column="58" lean-forward="true" selection-start-line="17" selection-start-column="58" selection-end-line="17" selection-end-column="58" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/LogCard/index.jsx"> <entry file="file://$PROJECT_DIR$/src/components/LogCard/index.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150"> <state relative-caret-position="575">
<caret line="6" column="33" selection-start-line="6" selection-start-column="24" selection-end-line="6" selection-end-column="33" /> <caret line="23" column="65" selection-start-line="23" selection-start-column="65" selection-end-line="23" selection-end-column="65" />
<folding> <folding>
<element signature="e#0#26#0" expanded="true" /> <element signature="e#0#26#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/pages/Communicate/AddressBook.jsx"> <entry file="file://$PROJECT_DIR$/src/components/Skeleton/index.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75"> <state relative-caret-position="25">
<caret line="3" column="47" selection-start-line="3" selection-start-column="47" selection-end-line="3" selection-end-column="47" /> <caret line="1" column="20" selection-start-line="1" selection-start-column="20" selection-end-line="1" selection-end-column="20" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/components/LogCard/index.less"> <entry file="file://$PROJECT_DIR$/src/utils/instance.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-75" /> <state relative-caret-position="200">
<caret line="35" lean-forward="true" selection-start-line="35" selection-end-line="35" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/pages/Notice/index.less"> <entry file="file://$PROJECT_DIR$/src/utils/utils.jsx">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/utils/request.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state> <state relative-caret-position="975">
<caret selection-end-line="9" /> <caret line="39" column="18" selection-start-line="39" selection-start-column="11" selection-end-line="39" selection-end-column="18" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/pages/Backlog/index.less"> <entry file="file://$PROJECT_DIR$/public/img/add-work.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/src/components/WorkCard/CardItem.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225"> <state relative-caret-position="400">
<caret line="9" selection-start-line="9" selection-end-line="9" /> <caret line="35" column="91" selection-start-line="35" selection-start-column="91" selection-end-line="35" selection-end-column="91" />
<folding>
<element signature="e#0#49#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/pages/EventProcessing/Option.jsx"> <entry file="file://$PROJECT_DIR$/src/pages/Work/Work.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="645"> <state relative-caret-position="325">
<caret line="29" column="22" selection-start-line="29" selection-start-column="22" selection-end-line="29" selection-end-column="22" /> <caret line="28" column="28" lean-forward="true" selection-start-line="28" selection-start-column="28" selection-end-line="28" selection-end-column="28" />
<folding> <folding>
<element signature="e#0#40#0" expanded="true" /> <element signature="e#0#51#0" expanded="true" />
<element signature="e#154#204#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/pages/Backlog/Backlog.jsx"> <entry file="file://$PROJECT_DIR$/src/pages/Communicate/Communicate.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425"> <state relative-caret-position="325">
<caret line="41" column="30" lean-forward="true" selection-start-line="36" selection-start-column="10" selection-end-line="41" selection-end-column="30" /> <caret line="37" column="30" selection-start-line="37" selection-start-column="30" selection-end-line="37" selection-end-column="30" />
<folding> <folding>
<element signature="e#0#49#0" expanded="true" /> <element signature="e#0#49#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/pages/Notice/Notice.jsx"> <entry file="file://$PROJECT_DIR$/src/components/Loading/index.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="25">
<caret line="1" column="20" selection-start-line="1" selection-start-column="20" selection-end-line="1" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/Loading/index.less">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="25">
<caret line="1" column="14" lean-forward="true" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/Backlog/Backlog.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-300"> <state relative-caret-position="175">
<caret line="12" column="39" selection-start-line="12" selection-start-column="39" selection-end-line="12" selection-end-column="39" /> <caret line="31" column="80" selection-start-line="31" selection-start-column="80" selection-end-line="31" selection-end-column="80" />
<folding> <folding>
<element signature="e#0#49#0" expanded="true" /> <element signature="e#0#49#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/utils/instance.js"> <entry file="file://$PROJECT_DIR$/src/pages/Notice/Notice.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225"> <state relative-caret-position="350">
<caret line="69" column="46" selection-start-line="69" selection-start-column="42" selection-end-line="69" selection-end-column="46" /> <caret line="80" column="14" lean-forward="true" selection-start-line="80" selection-start-column="14" selection-end-line="80" selection-end-column="14" />
<folding> <folding>
<element signature="e#0#26#0" expanded="true" /> <element signature="e#0#49#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/pages/Work/Work.jsx"> <entry file="file://$PROJECT_DIR$/src/pages/EventProcessing/Process.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225"> <state relative-caret-position="50">
<caret line="25" column="22" selection-start-line="25" selection-start-column="16" selection-end-line="25" selection-end-column="22" /> <caret line="2" column="42" selection-start-line="2" selection-start-column="42" selection-end-line="2" selection-end-column="42" />
<folding>
<element signature="e#0#51#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
......
import React from 'react';
import './index.less'
const Index = () => {
return (
<div className="loading">
<span/>
<span/>
<span/>
<span/>
<span/>
</div>
);
};
export default Index;
.loading{
width: 100%;
height: 20px;
margin: 9px auto;
display: flex;
justify-content: center;
}
.loading span{
display: inline-block;
width: 8px;
height: 100%;
border-radius: 4px;
background: rgba(35,35,35,0.13);
-webkit-animation: load 1s ease infinite;
}
@-webkit-keyframes load{
0%,100%{
height: 20px;
background: rgba(35,35,35,0.13);
}
50%{
height: 40px;
margin: -15px 0;
background: rgba(35,35,35,0.1);
}
}
.loading span:nth-child(2){
-webkit-animation-delay:0.2s;
}
.loading span:nth-child(3){
-webkit-animation-delay:0.4s;
}
.loading span:nth-child(4){
-webkit-animation-delay:0.6s;
}
.loading span:nth-child(5){
-webkit-animation-delay:0.8s;
}
...@@ -21,7 +21,7 @@ const Index = (props) => { ...@@ -21,7 +21,7 @@ const Index = (props) => {
<img <img
alt="" alt=""
className="todo-read-png" className="todo-read-png"
src={props.data && props.data.read ? '/img/read.png' : '/img/unread.png'} src={props.data && props.data.FLAG === 'D' ? '/img/read.png' : '/img/unread.png'}
/> />
</span> </span>
</div> </div>
......
import React from 'react'; import React from 'react';
import ContentLoader, { Facebook } from 'react-content-loader' import ContentLoader from 'react-content-loader'
import './index.less' import './index.less'
const Index = () => { const Index = () => {
......
...@@ -32,7 +32,8 @@ const CardItem = (props) => { ...@@ -32,7 +32,8 @@ const CardItem = (props) => {
) )
} }
<img src={data.icon} className="card-content-img-svg" alt="" />
<img src={data.icon ? `/img/icon/${data.icon}.png` : "/img/add-work.png"} className="card-content-img-svg" alt="" />
</div> </div>
<div className="card-content-title"> <div className="card-content-title">
{data.text} {data.text}
......
import React, {useState, useEffect} from 'react'; import React, {useState, useEffect} from 'react';
import {WhiteSpace, WingBlank, ActivityIndicator} from 'antd-mobile' import {WhiteSpace, WingBlank} from 'antd-mobile'
import TodoCard from '../../components/LogCard' import TodoCard from '../../components/LogCard'
import TopSearch from '../../components/TopSearch'; import TopSearch from '../../components/TopSearch';
import Skeleton from '../../components/Skeleton' import Skeleton from '../../components/Skeleton'
import Loading from '../../components/Loading'
import axiosRequest from '../../utils/request'; import axiosRequest from '../../utils/request';
import Document from 'react-document-title' import Document from 'react-document-title'
import Empty from '../Empty' import Empty from '../Empty'
...@@ -11,7 +12,6 @@ import './index.less' ...@@ -11,7 +12,6 @@ import './index.less'
const Backlog = (props) => { const Backlog = (props) => {
const [start, setStart] = useState(true); const [start, setStart] = useState(true);
const [end, setEnd] = useState(true) const [end, setEnd] = useState(true)
const [endT, setEndT] = useState(false);
useEffect(() => { useEffect(() => {
//回到顶部 //回到顶部
...@@ -26,9 +26,10 @@ const Backlog = (props) => { ...@@ -26,9 +26,10 @@ const Backlog = (props) => {
const checkLog = (OPERATEID, UUID) => { const checkLog = (OPERATEID, UUID) => {
props.history.push(`/blank/info/${OPERATEID}/${UUID}`) props.history.push(`/blank/info/${OPERATEID}/${UUID}`)
}; };
const getData = () => { const getData = (scroll) => {
const pageMap ={searchWord, nowPage: current + 1, pageSize: 10}; const pageMap ={searchWord, nowPage: current + 1, pageSize: 10};
setLoading(true); setLoading(true);
scroll && current > 0 && window.scrollTo(0, document.body.scrollHeight);
axiosRequest({ axiosRequest({
method: 'post', method: 'post',
url: '/idtAppServiceV6/oApp/getUnDone', url: '/idtAppServiceV6/oApp/getUnDone',
...@@ -49,8 +50,7 @@ const Backlog = (props) => { ...@@ -49,8 +50,7 @@ const Backlog = (props) => {
let clientHeight = document.documentElement.clientHeight || document.body.clientHeight; let clientHeight = document.documentElement.clientHeight || document.body.clientHeight;
let scrollHeight = document.documentElement.scrollHeight || document.body.scrollHeight; let scrollHeight = document.documentElement.scrollHeight || document.body.scrollHeight;
if(scrollHeight > clientHeight && scrollTop + clientHeight === scrollHeight) { if(scrollHeight > clientHeight && scrollTop + clientHeight === scrollHeight) {
current > 0 && window.scrollTo(0, document.body.scrollHeight); getData(true)
getData()
} }
} }
useEffect(() => { useEffect(() => {
...@@ -64,7 +64,6 @@ const Backlog = (props) => { ...@@ -64,7 +64,6 @@ const Backlog = (props) => {
}; };
useEffect(() => { useEffect(() => {
setStart(true); setStart(true);
setEndT(false)
setData([]) setData([])
!start && getData() !start && getData()
}, [searchWord]); }, [searchWord]);
...@@ -88,7 +87,8 @@ const Backlog = (props) => { ...@@ -88,7 +87,8 @@ const Backlog = (props) => {
<WhiteSpace/> <WhiteSpace/>
{loading && ( {loading && (
<div className="pos-line content-loading"> <div className="pos-line content-loading">
<ActivityIndicator/> <Loading/>
<WhiteSpace/>
<WhiteSpace/> <WhiteSpace/>
</div> </div>
)} )}
......
import React, {useState, useEffect} from 'react'; import React, {useState, useEffect} from 'react';
import {WhiteSpace} from 'antd-mobile'
import AddressUser from '../../components/AddressList/AddressUser'; import AddressUser from '../../components/AddressList/AddressUser';
import axiosRequest from '../../utils/request'; import axiosRequest from '../../utils/request';
import {ActivityIndicator} from "antd-mobile"; import Skeleton from '../../components/Skeleton'
import Document from 'react-document-title' import Document from 'react-document-title'
import Empty from '../Empty' import Empty from '../Empty'
...@@ -33,18 +34,14 @@ const Communicate = (props) => { ...@@ -33,18 +34,14 @@ const Communicate = (props) => {
return ( return (
<Document title="通讯录"> <Document title="通讯录">
<div> <div>
<ActivityIndicator
toast
text="加载中..."
animating={loading}
/>
<div className='breadBox'> <div className='breadBox'>
{title.length > 0 ? title[0].depts : ''} {title && title.length > 0 ? title[0].depts : ''}
</div>
<div className='adMainBox'>
{ !start && (data.length > 0 ? <AddressUser data={data}/> : <Empty/>)}
</div> </div>
{loading ? <div><WhiteSpace/><Skeleton/></div> : (
<div className='adMainBox'>
{ data && !start && (data.length > 0 ? <AddressUser data={data}/> : <Empty/>)}
</div>
)}
</div> </div>
</Document> </Document>
......
import React, {useState, useEffect} from 'react'; import React, {useState, useEffect} from 'react';
import Document from 'react-document-title' import Document from 'react-document-title'
import {WingBlank, WhiteSpace, ActionSheet, ActivityIndicator} from 'antd-mobile' import {WingBlank, WhiteSpace, ActionSheet} from 'antd-mobile'
import axiosRequest from '../../utils/request'; import axiosRequest from '../../utils/request';
import TopTabs from '../../components/BlankTabs' import TopTabs from '../../components/BlankTabs'
// import Skeleton from '../../components/Skeleton' import Skeleton from '../../components/Skeleton'
import Basic from './Basic' import Basic from './Basic'
import Adjunct from './Adjunct' import Adjunct from './Adjunct'
import Flow from './Flow'; import Flow from './Flow';
...@@ -41,12 +41,14 @@ const Process = (props) => { ...@@ -41,12 +41,14 @@ const Process = (props) => {
}, []); }, []);
//获取basic数据 //获取basic数据
const [basic, setBasic] = useState([]); const [basic, setBasic] = useState([]);
const [basicLoading, setBasicLoading] = useState(false)
const getBasic = uuid => { const getBasic = uuid => {
axiosRequest({ axiosRequest({
method: 'post', method: 'post',
url: `/idtAppServiceV6/oApp/getData`, url: `/idtAppServiceV6/oApp/getData`,
body: {uuid, tableId, templateId} body: {uuid, tableId, templateId}
}).then(res => { }).then(res => {
setBasicLoading(true)
const result = [...basic]; const result = [...basic];
result.map(item => { result.map(item => {
item.content = res[item.title] item.content = res[item.title]
...@@ -57,24 +59,27 @@ const Process = (props) => { ...@@ -57,24 +59,27 @@ const Process = (props) => {
} }
//获取Flow数据 //获取Flow数据
const [flowData, setFlowData] = useState([]); const [flowData, setFlowData] = useState([]);
const [flowLoading, setFlowLoading] = useState(false)
const getFlow = uuid => { const getFlow = uuid => {
axiosRequest({ axiosRequest({
method: 'post', method: 'post',
url: `/idtAppServiceV6/oApp/getFlowList`, url: `/idtAppServiceV6/oApp/getFlowList`,
body: {uuid, tableId} body: {uuid, tableId}
}).then(res => { }).then(res => {
setFlowLoading(true)
setFlowData(res) setFlowData(res)
}); });
}; };
const [adjunctData, setAdjunctData] = useState([]); const [adjunctData, setAdjunctData] = useState([]);
const [adjunctLoading, setAdjunctLoading] = useState(false)
const getAdjunct= uuid => { const getAdjunct= uuid => {
axiosRequest({ axiosRequest({
method: 'post', method: 'post',
url: `/idtAppServiceV6/oApp/getFiles`, url: `/idtAppServiceV6/oApp/getFiles`,
body: {uuid, fieldName: 'fj', tableId} body: {uuid, fieldName: 'fj', tableId}
}).then(res => { }).then(res => {
setAdjunctLoading(true)
setAdjunctData(res) setAdjunctData(res)
}); });
}; };
...@@ -97,8 +102,6 @@ const Process = (props) => { ...@@ -97,8 +102,6 @@ const Process = (props) => {
getButton() getButton()
}, [nodeId]); }, [nodeId]);
const [loading, setLoading] = useState(false);
//提交按钮状态 //提交按钮状态
const [disabled, setDisabled] = useState(true); const [disabled, setDisabled] = useState(true);
//提交按钮文字 //提交按钮文字
...@@ -109,11 +112,12 @@ const Process = (props) => { ...@@ -109,11 +112,12 @@ const Process = (props) => {
setFootStatus(true) setFootStatus(true)
}; };
useEffect(() => { useEffect(() => {
setLoading(false); const option = document.getElementsByClassName("option-text")[0];
const option = document.getElementsByClassName("option-text")[0] if (option) {
option.addEventListener('focus', optionBlur, true); option.addEventListener('focus', optionBlur, true);
return () => option.removeEventListener('focus', optionBlur, true); return () => option.removeEventListener('focus', optionBlur, true);
}, []); }
}, [basic]);
const [blyj, setBlyj] = useState() const [blyj, setBlyj] = useState()
const optionChange = val => { const optionChange = val => {
...@@ -216,30 +220,25 @@ const Process = (props) => { ...@@ -216,30 +220,25 @@ const Process = (props) => {
return () => window.removeEventListener('scroll', handleScroll, true); return () => window.removeEventListener('scroll', handleScroll, true);
}, []); }, []);
return ( return (
<Document title="待办详情"> <Document title="待办详情">
<div> <div>
<ActivityIndicator
toast
text="加载中..."
animating={loading}
/>
<TopTabs page={current} onClick={tabClick}/> <TopTabs page={current} onClick={tabClick}/>
<div id="event"> <div id="event">
<WingBlank> <WingBlank>
<div id="event-basic"/> <div id="event-basic"/>
<WhiteSpace/> <WhiteSpace/>
<Basic data={basic}/> {basicLoading ? <Basic data={basic}/> : <Skeleton/>}
<div id="event-adjunct"/> <div id="event-adjunct"/>
<WhiteSpace/> <WhiteSpace/>
<Adjunct data={adjunctData}/> {adjunctLoading ? <Adjunct data={adjunctData}/> : <Skeleton/>}
<div id="event-flow"/> <div id="event-flow"/>
<WhiteSpace/> <WhiteSpace/>
<Flow data={flowData}/> {flowLoading ? <Flow data={flowData}/> : <Skeleton/>}
<div id="event-option"/> <div id="event-option"/>
<WhiteSpace/> <WhiteSpace/>
<Option onChange={optionChange}/> {basicLoading ? <Option onChange={optionChange}/> : <Skeleton/>}
</WingBlank> </WingBlank>
</div> </div>
<div className="event-footer"> <div className="event-footer">
......
import React, {useEffect, useState} from 'react'; import React, {useEffect, useState} from 'react';
import {ActivityIndicator, Toast, WhiteSpace, WingBlank} from 'antd-mobile' import {WhiteSpace, WingBlank} from 'antd-mobile'
import TodoCard from '../../components/LogCard' import TodoCard from '../../components/LogCard'
import TopNotice from '../../components/NoticeTab' import TopNotice from '../../components/NoticeTab'
import axiosRequest from '../../utils/request'; import axiosRequest from '../../utils/request';
import Skeleton from '../../components/Skeleton' import Skeleton from '../../components/Skeleton'
import Document from 'react-document-title' import Document from 'react-document-title'
import Empty from '../Empty' import Empty from '../Empty'
// import useDebounce from '../../useHooks/useDebounce' import Loading from "../../components/Loading";
const Notice = (props) => { const Notice = (props) => {
const [start, setStart] = useState(true); const [start, setStart] = useState(true);
const [end, setEnd] = useState(true) const [end, setEnd] = useState(true)
const [endT, setEndT] = useState(false);
const [current, setCurrent] = useState(0); const [current, setCurrent] = useState(0);
const [searchWord, setSearchWord] = useState(); const [searchWord, setSearchWord] = useState();
...@@ -20,9 +19,10 @@ const Notice = (props) => { ...@@ -20,9 +19,10 @@ const Notice = (props) => {
const [data, setData] = useState([]); const [data, setData] = useState([]);
const getData = () => { const getData = (scroll) => {
const pageMap ={searchWord, nowPage: current + 1, pageSize: 10, FLAG: tab}; const pageMap ={searchWord, nowPage: current + 1, pageSize: 10, FLAG: tab};
setLoading(true); setLoading(true);
scroll && current > 0 && window.scrollTo(0, document.body.scrollHeight)
axiosRequest({ axiosRequest({
method: 'post', method: 'post',
url: '/idtAppServiceV6/oApp/getUnDone', url: '/idtAppServiceV6/oApp/getUnDone',
...@@ -31,6 +31,8 @@ const Notice = (props) => { ...@@ -31,6 +31,8 @@ const Notice = (props) => {
setStart(false); setStart(false);
setEnd(res.rows && res.rows.length >= 10) setEnd(res.rows && res.rows.length >= 10)
let result = end && res.rows ? data.concat(res.rows) : data; let result = end && res.rows ? data.concat(res.rows) : data;
console.log('end', end, 'result',result, 'res', res)
res.rows && res.rows.length >= 10 && setCurrent(1); res.rows && res.rows.length >= 10 && setCurrent(1);
setData(result); setData(result);
setLoading(false); setLoading(false);
...@@ -44,8 +46,7 @@ const Notice = (props) => { ...@@ -44,8 +46,7 @@ const Notice = (props) => {
let scrollHeight = document.documentElement.scrollHeight || document.body.scrollHeight; let scrollHeight = document.documentElement.scrollHeight || document.body.scrollHeight;
if(scrollHeight > clientHeight && scrollTop + clientHeight === scrollHeight) { if(scrollHeight > clientHeight && scrollTop + clientHeight === scrollHeight) {
current > 0 && window.scrollTo(0, document.body.scrollHeight) getData(true)
getData()
} }
} }
useEffect(() => { useEffect(() => {
...@@ -64,27 +65,17 @@ const Notice = (props) => { ...@@ -64,27 +65,17 @@ const Notice = (props) => {
//tab已读未读切换 //tab已读未读切换
const [tab, setTab] = useState('N'); const [tab, setTab] = useState('N');
// const tabData = () => {
// const pageMap ={searchWord, nowPage: current + 1, pageSize: 10, FLAG: tab};
// setLoading(true);
// axiosRequest({
// method: 'post',
// url: '/idtAppServiceV6/oApp/getUnDone',
// body: pageMap,
// }).then(res => {
// setLoading(false);
// let result = start && res.rows ? [].concat(res.rows) : [];
// res.rows && res.rows.length >= 10 ? setCurrent(current + 1) : setEndT(true);
// setData(result);
// });
// };
const tabChange = val => { const tabChange = val => {
setCurrent(0) setCurrent(0);
setData([]);
setTab(val); setTab(val);
setEnd(true)
}; };
const tabSearch = val => { const tabSearch = val => {
setCurrent(0) setCurrent(0);
setData([])
setSearchWord(val) setSearchWord(val)
setEnd(true)
} }
useEffect(() => { useEffect(() => {
//回到顶部 //回到顶部
...@@ -93,12 +84,11 @@ const Notice = (props) => { ...@@ -93,12 +84,11 @@ const Notice = (props) => {
}, []) }, [])
useEffect(() => { useEffect(() => {
setStart(true); setStart(true);
setEndT(false) getData(false, [])
setData([])
setCurrent(0)
getData()
}, [searchWord, tab]); }, [searchWord, tab]);
console.log(current)
console.log(data.length)
return ( return (
<Document title="通知"> <Document title="通知">
<WingBlank> <WingBlank>
...@@ -116,7 +106,8 @@ const Notice = (props) => { ...@@ -116,7 +106,8 @@ const Notice = (props) => {
<WhiteSpace/> <WhiteSpace/>
{loading && ( {loading && (
<div className="pos-line content-loading"> <div className="pos-line content-loading">
<ActivityIndicator/> <Loading/>
<WhiteSpace/>
<WhiteSpace/> <WhiteSpace/>
</div> </div>
)} )}
......
import React, { useState, useEffect } from 'react'; import React, { useState, useEffect } from 'react';
import {WhiteSpace, WingBlank} from "antd-mobile"; import {WhiteSpace, WingBlank} from "antd-mobile";
import axiosRequest from '../../utils/request'; // import axiosRequest from '../../utils/request';
import TopSearch from '../../components/TopSearch' import TopSearch from '../../components/TopSearch'
import WorkCard from '../../components/WorkCard'; import WorkCard from '../../components/WorkCard';
import Skeleton from '../../components/Skeleton' import Skeleton from '../../components/Skeleton'
...@@ -19,17 +19,27 @@ const Work = (props) => { ...@@ -19,17 +19,27 @@ const Work = (props) => {
}, []); }, []);
const loadOperates = () => { const loadOperates = () => {
setLoading(true) setLoading(true);
axiosRequest({ setTimeout(() => {
method: 'post', setLoading(false)
url: '/idtAppServiceV6/oApp/getAllOperate', }, 1000)
}).then(res => { const res = localStorage.getItem("menu");
setLoading(false); setStart(false);
setStart(false) const result = JSON.parse(res)
const result = res ? res.map(item => ({ icon: '', text: item.nodeName })) : [] setOperates(result);
setOperates(result); setData(result);
setData(result)
}); // let ss = []
// JSON.parse(res).map(item => ss.push(item.text));
// let a = new Set(ss)
// console.log([...a].join(','))
// axiosRequest({
// method: 'post',
// url: '/idtAppServiceV6/oApp/getAllOperate',
// }).then(res => {
// setLoading(false);
//
// });
} }
const commonEdit = () => { const commonEdit = () => {
......
...@@ -30,9 +30,9 @@ let defaultHeaders = { ...@@ -30,9 +30,9 @@ let defaultHeaders = {
export const createAPI = (baseURL) => { export const createAPI = (baseURL) => {
return (conf = {}) => { return (conf = {}) => {
let opts = conf.opts || {}; let opts = conf.opts || {};
let body = conf.body || {}; // let body = conf.body || {};
let urlParams = ''; let urlParams = '';
console.log(conf) // console.log(conf)
let headers = { ...defaultHeaders, ...opts.headers }; let headers = { ...defaultHeaders, ...opts.headers };
if (conf.opts) { if (conf.opts) {
...@@ -52,7 +52,7 @@ export const createAPI = (baseURL) => { ...@@ -52,7 +52,7 @@ export const createAPI = (baseURL) => {
// console.log(response) // console.log(response)
if (!response || !response.data) { if (!response || !response.data) {
response.code === 'idt-core-505' && (window.location.href = '/login') response.code === 'idt-core-500' && (window.location.href = '/login')
console.log('response出错, 无返回数据!', response); return false; console.log('response出错, 无返回数据!', response); return false;
}; };
if (response.data && response.data.errorMessage) { if (response.data && response.data.errorMessage) {
...@@ -67,7 +67,9 @@ export const createAPI = (baseURL) => { ...@@ -67,7 +67,9 @@ export const createAPI = (baseURL) => {
localStorage.setItem("token", response.data.token); localStorage.setItem("token", response.data.token);
} }
if (response && response.data && response.data.leftOperateBar) { if (response && response.data && response.data.leftOperateBar) {
localStorage.setItem("menu", JSON.stringify(response.data.leftOperateBar)); const result = response.data.leftOperateBar.filter(item => item.nodeName === '公共分组');
const menu = result.length > 0 && result[0].children ? result[0].children.map(item => ({ icon: item.imgType, text: item.nodeName })) : [];
result.length > 0 && localStorage.setItem("menu", JSON.stringify(menu));
} }
if (response.data) { if (response.data) {
......
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