Commit 3446cf24 authored by 熊成伟's avatar 熊成伟

debug

parent 58cb6dd0
Pipeline #15281 failed with stages
in 31 seconds
......@@ -2,11 +2,23 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="a6d092de-b4f8-454d-99f5-4dac3ce112e5" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/src/components/BlankTabs/index.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/BlankTabs/index.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/BlankTabs/index.less" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/BlankTabs/index.less" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/package-lock.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/AddressList/AddressCheckbox.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/AddressList/AddressCheckbox.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/StepCard/index.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/StepCard/index.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/AddressBook.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/Communicate/AddressBook.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pages/EventProcessing/Option.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/EventProcessing/Option.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/EventProcessing/index.less" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/EventProcessing/index.less" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pages/EventProcessing/SubmitDetail.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/EventProcessing/SubmitDetail.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/Notice/index.less" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/Notice/index.less" 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/WorkDetail.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/Work/WorkDetail.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/useHooks/useDebounce.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/useHooks/useThrottle.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/utils/instance.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/utils/instance.js" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
......@@ -22,20 +34,25 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/pages/EventProcessing/Process.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="170" column="39" lean-forward="true" selection-start-line="166" selection-start-column="7" selection-end-line="170" selection-end-column="39" />
<state relative-caret-position="125">
<caret line="5" selection-start-line="5" selection-start-column="3" selection-end-line="5" selection-end-column="51" />
<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>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/pages/Backlog/Backlog.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="231">
<caret line="37" column="6" lean-forward="true" selection-start-line="35" selection-start-column="2" selection-end-line="37" selection-end-column="6" />
<state relative-caret-position="356">
<caret line="94" column="32" selection-start-line="94" selection-start-column="32" selection-end-line="94" selection-end-column="32" />
<folding>
<element signature="e#0#49#0" expanded="true" />
</folding>
......@@ -43,11 +60,11 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/pages/Notice/Notice.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="231">
<caret line="70" column="6" selection-start-line="70" selection-start-column="6" selection-end-line="70" selection-end-column="6" />
<state relative-caret-position="275">
<caret line="35" column="30" selection-start-line="35" selection-start-column="30" selection-end-line="35" selection-end-column="30" />
<folding>
<element signature="e#0#49#0" expanded="true" />
</folding>
......@@ -55,49 +72,80 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/pages/EventProcessing/Option.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="645">
<caret line="29" column="22" selection-start-line="29" selection-start-column="22" selection-end-line="29" selection-end-column="22" />
<folding>
<element signature="e#0#40#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/components/LogCard/index.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="6" column="33" selection-start-line="6" selection-start-column="24" selection-end-line="6" selection-end-column="33" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/components/LogCard/index.less">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-75" />
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
<option value="JavaScript File" />
<option value="React jsx" />
<option value="Less File" />
<option value="JavaScript File" />
</list>
</option>
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>common-content</find>
<find>tabChange</find>
<find>.am-checkbox.am-checkbox-checked .am-checkbox-inner</find>
<find>content</find>
<find>map(item</find>
<find>auto-list-item</find>
<find>nth</find>
<find>#</find>
<find>props.match.params</find>
<find>auto-step-content-head</find>
<find>min-height</find>
<find>basic</find>
<find>title</find>
<find>getData</find>
<find>adjunctData</find>
<find>1px solid</find>
<find>overflow</find>
<find>common-layout-content-static</find>
<find>setNodeId</find>
<find>scrollTop</find>
<find>setStart</find>
<find>scroll</find>
<find>setEnd</find>
<find>endT</find>
<find>setEndT</find>
<find>/blank/work/1</find>
<find>workUrl</find>
<find>scrollTo</find>
<find>setCurrent</find>
<find>checkLog</find>
<find>optionChange</find>
<find>uuid</find>
<find>body</find>
<find>useDebounce</find>
<find>useD</find>
<find>height: 30px;</find>
<find>content-end</find>
<find>window</find>
<find>params</find>
<find>t</find>
<find>setT</find>
<find>start</find>
<find>end</find>
<find>setEnd</find>
<find>setStart</find>
<find>beforeSubmit</find>
<find>onChange</find>
<find>setSearchWord</find>
<find>endT</find>
<find>setEndT</find>
</findStrings>
<replaceStrings>
<replace>this.props</replace>
......@@ -114,9 +162,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/src/layout/BlankLayout.jsx" />
<option value="$PROJECT_DIR$/src/pages/Communicate/Com.jsx" />
<option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/.gitlab-ci.yml" />
<option value="$PROJECT_DIR$/config-overrides.js" />
<option value="$PROJECT_DIR$/src/components/LogCard/index.less" />
......@@ -124,11 +169,8 @@
<option value="$PROJECT_DIR$/src/pages/Login/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/pages/EventProcessing/Option.jsx" />
<option value="$PROJECT_DIR$/src/utils/request.js" />
<option value="$PROJECT_DIR$/src/components/AddressList/index.jsx" />
<option value="$PROJECT_DIR$/src/layout/Footer.jsx" />
<option value="$PROJECT_DIR$/src/pages/Notice/index.less" />
<option value="$PROJECT_DIR$/src/pages/index.less" />
<option value="$PROJECT_DIR$/src/pages/Empty.jsx" />
<option value="$PROJECT_DIR$/src/components/TopSearch/index.jsx" />
......@@ -137,41 +179,48 @@
<option value="$PROJECT_DIR$/src/components/useHooks/useThrottle.js" />
<option value="$PROJECT_DIR$/src/components/AddressList/AddressUser.jsx" />
<option value="$PROJECT_DIR$/src/pages/EventProcessing/Basic.jsx" />
<option value="$PROJECT_DIR$/src/components/StepCard/index.jsx" />
<option value="$PROJECT_DIR$/src/components/StepCard/index.less" />
<option value="$PROJECT_DIR$/src/pages/EventProcessing/Adjunct.jsx" />
<option value="$PROJECT_DIR$/src/components/List/index.less" />
<option value="$PROJECT_DIR$/src/components/Adjunct/index.less" />
<option value="$PROJECT_DIR$/src/components/Adjunct/index.jsx" />
<option value="$PROJECT_DIR$/src/components/AddressList/AddressCheckbox.jsx" />
<option value="$PROJECT_DIR$/src/components/AddressList/index.less" />
<option value="$PROJECT_DIR$/src/components/List/index.jsx" />
<option value="$PROJECT_DIR$/src/index.css" />
<option value="$PROJECT_DIR$/src/layout/index.less" />
<option value="$PROJECT_DIR$/src/layout/CommonLayout.jsx" />
<option value="$PROJECT_DIR$/src/pages/Work/WorkDetail.jsx" />
<option value="$PROJECT_DIR$/src/variable.less" />
<option value="$PROJECT_DIR$/src/pages/Communicate/Communicate.jsx" />
<option value="$PROJECT_DIR$/src/pages/Communicate/AddressBook.jsx" />
<option value="$PROJECT_DIR$/src/pages/Work/Work.jsx" />
<option value="$PROJECT_DIR$/src/pages/Backlog/Backlog.jsx" />
<option value="$PROJECT_DIR$/src/pages/EventProcessing/Flow.jsx" />
<option value="$PROJECT_DIR$/src/pages/EventProcessing/SubmitDetail.jsx" />
<option value="$PROJECT_DIR$/src/components/WorkCard/CardItem.jsx" />
<option value="$PROJECT_DIR$/src/router.js" />
<option value="$PROJECT_DIR$/src/utils/instance.js" />
<option value="$PROJECT_DIR$/src/components/BlankTabs/index.jsx" />
<option value="$PROJECT_DIR$/src/components/BlankTabs/index.less" />
<option value="$PROJECT_DIR$/src/pages/EventProcessing/index.less" />
<option value="$PROJECT_DIR$/src/components/AddressList/AddressCheckbox.jsx" />
<option value="$PROJECT_DIR$/src/components/StepCard/index.jsx" />
<option value="$PROJECT_DIR$/src/pages/EventProcessing/SubmitDetail.jsx" />
<option value="$PROJECT_DIR$/src/utils/request.js" />
<option value="$PROJECT_DIR$/src/utils/instance.js" />
<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/Communicate/AddressBook.jsx" />
<option value="$PROJECT_DIR$/src/pages/Work/Work.jsx" />
<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/Backlog/index.less" />
<option value="$PROJECT_DIR$/src/pages/Notice/Notice.jsx" />
<option value="$PROJECT_DIR$/src/pages/Backlog/Backlog.jsx" />
</list>
</option>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="685" />
<option name="width" value="682" />
<option name="height" value="769" />
<option name="x" value="-8" />
<option name="y" value="-8" />
<option name="width" value="681" />
<option name="height" value="768" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
<ConfirmationsSetting value="1" id="添加" />
......@@ -204,7 +253,14 @@
<item name="create-react-app" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="components" type="462c0819:PsiDirectoryNode" />
<item name="BlankTabs" type="462c0819:PsiDirectoryNode" />
<item name="LogCard" 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="components" type="462c0819:PsiDirectoryNode" />
<item name="Skeleton" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="create-react-app" type="b2602c69:ProjectViewProjectNode" />
......@@ -224,14 +280,14 @@
<item name="create-react-app" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="EventProcessing" type="462c0819:PsiDirectoryNode" />
<item name="Notice" 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" />
<item name="Work" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
......@@ -242,7 +298,7 @@
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="F:/社区矫正/braceletAdmin" />
<property name="last_opened_file_path" value="F:/照明/light-admin-web" />
<property name="list.type.of.created.stylesheet" value="Less" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
......@@ -293,11 +349,12 @@
<workItem from="1591579020550" duration="32744000" />
<workItem from="1591665260536" duration="37378000" />
<workItem from="1591751569364" duration="40213000" />
<workItem from="1591837824022" duration="22840000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="213150000" />
<option name="totallyTimeSpent" value="235990000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="784" extended-state="6" />
......@@ -328,64 +385,6 @@
<option name="version" value="1" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/default.conf">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="7" column="29" selection-start-line="7" selection-start-column="14" selection-end-line="7" selection-end-column="29" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/nginx.conf">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-150" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitlab-ci.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="398">
<caret line="116" column="21" lean-forward="true" selection-start-line="116" selection-start-column="21" selection-end-line="116" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/AddressList/AddressList.jsx" />
<entry file="file://$PROJECT_DIR$/src/pages/Login/index.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="14" column="23" selection-start-line="14" selection-start-column="23" selection-end-line="14" selection-end-column="23" />
<folding>
<element signature="e#103#146#0" expanded="true" />
</folding>
</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="100">
<caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
<folding>
<element signature="e#0#40#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/LogCard/index.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="548">
<caret line="28" column="29" selection-start-line="28" selection-start-column="29" selection-end-line="28" selection-end-column="29" />
<caret line="29" column="53" selection-start-line="29" selection-start-column="53" selection-end-line="29" selection-end-column="53" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/utils/request.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="825">
<caret line="33" column="34" selection-start-line="33" selection-start-column="34" selection-end-line="33" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config-overrides.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2350">
......@@ -393,9 +392,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/Notice/index.less">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/index.less">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
......@@ -485,16 +481,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/StepCard/index.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="21" column="64" selection-start-line="21" selection-start-column="54" selection-end-line="21" selection-end-column="64" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/EventProcessing/Adjunct.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="350">
......@@ -522,16 +508,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/AddressList/AddressCheckbox.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="100">
<caret line="12" column="47" selection-start-line="12" selection-start-column="38" selection-end-line="12" selection-end-column="47" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/AddressList/index.less">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="320">
......@@ -610,148 +586,234 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/Communicate/AddressBook.jsx">
<entry file="file://$PROJECT_DIR$/src/variable.less">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="10" column="45" lean-forward="true" selection-start-line="10" selection-start-column="3" selection-end-line="10" selection-end-column="45" />
<folding>
<element signature="e#0#49#0" expanded="true" />
</folding>
<state relative-caret-position="420">
<caret line="83" column="1" selection-start-line="83" selection-start-column="1" selection-end-line="83" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/variable.less">
<entry file="file://$PROJECT_DIR$/src/components/WorkCard/index.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420">
<caret line="83" column="1" selection-start-line="83" selection-start-column="1" selection-end-line="83" selection-end-column="1" />
<state relative-caret-position="325">
<caret line="15" column="13" lean-forward="true" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/Work/WorkDetail.jsx">
<entry file="file://$PROJECT_DIR$/src/pages/EventProcessing/index.less">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="409">
<caret line="56" column="86" selection-start-line="56" selection-start-column="86" selection-end-line="56" selection-end-column="86" />
<state relative-caret-position="150">
<caret line="6" column="19" lean-forward="true" selection-start-line="6" selection-start-column="19" selection-end-line="6" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/router.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
<caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
<folding>
<element signature="e#0#49#0" expanded="true" />
<element signature="e#0#25#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/Work/Work.jsx">
<entry file="file://$PROJECT_DIR$/src/components/WorkCard/CardItem.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="447">
<caret line="78" column="44" selection-start-line="78" selection-start-column="37" selection-end-line="78" selection-end-column="44" />
<state relative-caret-position="50">
<caret line="2" selection-start-line="2" selection-end-line="2" />
<folding>
<element signature="e#0#51#0" expanded="true" />
<element signature="e#0#49#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/WorkCard/index.jsx">
<entry file="file://$PROJECT_DIR$/src/components/BlankTabs/index.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="15" column="13" lean-forward="true" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
<caret line="13" column="38" selection-start-line="13" selection-start-column="24" selection-end-line="13" selection-end-column="38" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/EventProcessing/index.less">
<entry file="file://$PROJECT_DIR$/src/components/BlankTabs/index.less">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="6" column="19" lean-forward="true" selection-start-line="6" selection-start-column="19" selection-end-line="6" selection-end-column="19" />
<state relative-caret-position="50">
<caret line="2" column="14" selection-start-line="2" selection-start-column="14" selection-end-line="2" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/EventProcessing/Flow.jsx">
<entry file="file://$PROJECT_DIR$/src/components/AddressList/AddressCheckbox.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
<state relative-caret-position="425">
<caret line="17" column="46" selection-start-line="17" selection-start-column="46" selection-end-line="17" selection-end-column="46" />
<folding>
<element signature="e#0#39#0" expanded="true" />
<element signature="e#0#26#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/EventProcessing/SubmitDetail.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-477">
<caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
<state relative-caret-position="323">
<caret line="13" column="51" selection-start-line="13" selection-start-column="51" selection-end-line="13" selection-end-column="51" />
<folding>
<element signature="e#123#170#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/router.js">
<entry file="file://$PROJECT_DIR$/src/components/StepCard/index.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
<caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
<state relative-caret-position="150">
<caret line="18" column="118" lean-forward="true" selection-start-line="18" selection-start-column="118" selection-end-line="18" selection-end-column="118" />
<folding>
<element signature="e#0#25#0" expanded="true" />
<element signature="e#0#26#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/WorkCard/CardItem.jsx">
<entry file="file://$PROJECT_DIR$/src/pages/EventProcessing/Flow.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" />
<state relative-caret-position="250">
<caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
</state>
</provider>
</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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="673">
<caret line="33" column="41" lean-forward="true" selection-start-line="33" selection-start-column="41" selection-end-line="33" selection-end-column="41" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/Work/WorkDetail.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="181">
<caret line="51" column="25" selection-start-line="51" selection-start-column="25" selection-end-line="51" selection-end-column="25" />
<folding>
<element signature="e#0#49#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/Skeleton/index.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="475">
<caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/Skeleton/index.less">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="11" column="16" lean-forward="true" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/utils/instance.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="63" column="50" selection-start-line="63" selection-start-column="50" selection-end-line="63" selection-end-column="50" />
<state relative-caret-position="250">
<caret line="39" column="38" selection-start-line="39" selection-start-column="38" selection-end-line="39" selection-end-column="38" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/BlankTabs/index.jsx">
<entry file="file://$PROJECT_DIR$/src/pages/EventProcessing/Process.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="13" column="38" selection-start-line="13" selection-start-column="24" selection-end-line="13" selection-end-column="38" />
<state relative-caret-position="125">
<caret line="5" selection-start-line="5" selection-start-column="3" selection-end-line="5" selection-end-column="51" />
<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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/LogCard/index.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="6" column="33" selection-start-line="6" selection-start-column="24" selection-end-line="6" selection-end-column="33" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/BlankTabs/index.less">
<entry file="file://$PROJECT_DIR$/src/pages/Work/Work.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="50">
<caret line="2" column="14" selection-start-line="2" selection-start-column="14" selection-end-line="2" selection-end-column="14" />
<state relative-caret-position="-1150">
<caret line="5" selection-start-line="5" selection-end-line="5" selection-end-column="48" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/EventProcessing/Process.jsx">
<entry file="file://$PROJECT_DIR$/src/pages/Communicate/AddressBook.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="170" column="39" lean-forward="true" selection-start-line="166" selection-start-column="7" selection-end-line="170" selection-end-column="39" />
<state relative-caret-position="75">
<caret line="3" column="47" selection-start-line="3" selection-start-column="47" selection-end-line="3" selection-end-column="47" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/LogCard/index.less">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-75" />
</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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/Backlog/index.less">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<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="645">
<caret line="29" column="22" selection-start-line="29" selection-start-column="22" selection-end-line="29" selection-end-column="22" />
<folding>
<element signature="e#0#49#0" expanded="true" />
<element signature="e#0#40#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/Backlog/Backlog.jsx">
<entry file="file://$PROJECT_DIR$/src/pages/Notice/Notice.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="231">
<caret line="37" column="6" lean-forward="true" selection-start-line="35" selection-start-column="2" selection-end-line="37" selection-end-column="6" />
<state relative-caret-position="275">
<caret line="35" column="30" selection-start-line="35" selection-start-column="30" selection-end-line="35" selection-end-column="30" />
<folding>
<element signature="e#0#49#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/Notice/Notice.jsx">
<entry file="file://$PROJECT_DIR$/src/pages/Backlog/Backlog.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="231">
<caret line="70" column="6" selection-start-line="70" selection-start-column="6" selection-end-line="70" selection-end-column="6" />
<state relative-caret-position="356">
<caret line="94" column="32" selection-start-line="94" selection-start-column="32" selection-end-line="94" selection-end-column="32" />
<folding>
<element signature="e#0#49#0" expanded="true" />
</folding>
......
......@@ -9543,6 +9543,11 @@
"resolved": "https://registry.npm.taobao.org/q/download/q-1.5.1.tgz",
"integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc="
},
"qs": {
"version": "6.9.4",
"resolved": "https://registry.npm.taobao.org/qs/download/qs-6.9.4.tgz",
"integrity": "sha1-kJCykNH5FyjTwi5UhDykSupatoc="
},
"query-string": {
"version": "4.3.4",
"resolved": "https://registry.npm.taobao.org/query-string/download/query-string-4.3.4.tgz",
......@@ -9793,6 +9798,11 @@
"dotenv": "^4.0.0"
}
},
"react-content-loader": {
"version": "5.0.4",
"resolved": "https://registry.npm.taobao.org/react-content-loader/download/react-content-loader-5.0.4.tgz",
"integrity": "sha1-FJNJHS9rMJ0oHYQUSmVUF+pzRIY="
},
"react-dev-utils": {
"version": "4.2.3",
"resolved": "https://registry.npm.taobao.org/react-dev-utils/download/react-dev-utils-4.2.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Freact-dev-utils%2Fdownload%2Freact-dev-utils-4.2.3.tgz",
......
......@@ -10,7 +10,9 @@
"http-proxy-middleware": "^1.0.4",
"lib-flexible": "^0.3.2",
"postcss-px2rem": "^0.3.0",
"qs": "^6.9.4",
"react": "^16.8.4",
"react-content-loader": "^5.0.4",
"react-document-title": "^2.0.3",
"react-dom": "^16.8.4",
"react-router-dom": "^5.2.0",
......
......@@ -15,10 +15,7 @@ const Index = (props) => {
</div>
{item.childrenUser && item.childrenUser.map((child, index) => (
<Item key={child.XM} className="sub-checkbox" onChange={(val) => setName(child.XM, val.target.checked)}>
<div>
<img alt="" src="" className=""/>
{child.XM || ''}
</div>
{child.XM || ''}
<div className="address-user">
<img alt="" className='smallIco mr-5' src='/img/tel.png' />
{child.YDDH || '无'}
......
import React from 'react';
import ContentLoader, { Facebook } from 'react-content-loader'
import './index.less'
const Index = () => {
return (
<div className="skeleton">
<ContentLoader viewBox="0 0 350 211" className="skeleton-content">
<rect x="0" y="0" rx="4" ry="4" width="350" height="25" />
<rect x="0" y="30" rx="3" ry="3" width="300" height="25" />
<rect x="0" y="60" rx="4" ry="4" width="270" height="25" />
<rect x="0" y="90" rx="3" ry="3" width="350" height="25" />
<rect x="0" y="120" rx="4" ry="4" width="300" height="25" />
<rect x="0" y="150" rx="3" ry="3" width="250" height="25" />
<rect x="0" y="180" rx="4" ry="4" width="200" height="25" />
</ContentLoader>
</div>
);
};
export default Index;
.skeleton {
display: flex;
align-items: center;
height: 211px;
padding: 10px;
background: #ffffff;
border-radius: 7px;
z-index: -1;
}
.skeleton-content{
width: 320px;
height: 211px;
}
......@@ -21,9 +21,9 @@ const Index = (props) => {
</div>
<div className="pos-center">{item.SENDDATE}</div>
</div>
{item.result && (
{item.BLYJ && (
<div className="auto-step-content-result">
11111
{item.BLYJ}
</div>
)}
</div>
......
......@@ -2,35 +2,25 @@ import React, {useState, useEffect} from 'react';
import {WhiteSpace, WingBlank, ActivityIndicator} from 'antd-mobile'
import TodoCard from '../../components/LogCard'
import TopSearch from '../../components/TopSearch';
import Skeleton from '../../components/Skeleton'
import axiosRequest from '../../utils/request';
import Document from 'react-document-title'
import Empty from '../Empty'
import './index.less'
const Backlog = (props) => {
const [start, setStart] = useState(true);
const [end, setEnd] = useState(true)
const [endT, setEndT] = useState(false);
const [t, setT] = useState(false)
useEffect(() => {
setT(true)
axiosRequest({
method: 'post',
url: '/idtAppServiceV6/oApp/getUnDone',
body: {nowPage: 1, pageSize: 10},
}).then(res => {
setT(false);
setStart(false)
let result = end && res.rows ? data.concat(res.rows) : data;
res.rows && res.rows.length >= 10 && setCurrent(1);
setEnd(res.rows && res.rows.length >= 10)
setData(result);
});
//回到顶部
window.scrollTo(0, 0)
getData()
}, [])
const [current, setCurrent] = useState(0);
const [searchWord, setSearchWord] = useState();
const [loading, setLoading] = useState(false);
const [data, setData] = useState([]);
const checkLog = (OPERATEID, UUID) => {
......@@ -38,80 +28,75 @@ const Backlog = (props) => {
};
const getData = () => {
const pageMap ={searchWord, nowPage: current + 1, pageSize: 10};
setLoading(true)
setLoading(true);
axiosRequest({
method: 'post',
url: '/idtAppServiceV6/oApp/getUnDone',
body: pageMap,
}).then(res => {
setLoading(false);
let result = end && res.rows ? data.concat(res.rows) : data;
res.rows && res.rows.length >= 10 ? setCurrent(current + 1) : setEndT(true);
setStart(false);
setEnd(res.rows && res.rows.length >= 10)
let result = end && res.rows ? data.concat(res.rows) : data;
res.rows && res.rows.length >= 10 && setCurrent(1);
setData(result);
setLoading(false);
});
};
//下拉加载
const [end, setEnd] = useState(true);
const handleScroll =() => {
let scrollTop = document.documentElement.scrollTop || document.body.scrollTop;
let clientHeight = document.documentElement.clientHeight || document.body.clientHeight;
let scrollHeight = document.documentElement.scrollHeight || document.body.scrollHeight;
console.log(scrollTop, scrollHeight, clientHeight, scrollTop + clientHeight === scrollHeight)
if(scrollHeight > clientHeight && scrollTop + clientHeight === scrollHeight) {
current > 0 && window.scrollTo(0, document.body.scrollHeight);
getData()
}
}
useEffect(() => {
window.addEventListener('touchmove', handleScroll, true);
return () => window.removeEventListener('touchmove', handleScroll, true);
window.addEventListener('touchend', handleScroll, true);
return () => window.removeEventListener('touchend', handleScroll, true);
}, [data]);
//回到顶部
useEffect(() => {
window.scrollTo(0, 0)
}, [])
const wordSearch = val => {
setCurrent(0)
setSearchWord(val);
getData()
};
useEffect(() => {
setStart(true);
setEndT(false)
setData([])
!start && getData()
}, [searchWord]);
console.log(loading)
return (
<Document title="待办">
<WingBlank>
<ActivityIndicator
toast
text="加载中..."
animating={t}
/>
<WhiteSpace/>
<TopSearch onSearch={wordSearch}/>
{
!start && (
data.length > 0 ? data.map((item, index) => (
<div key={index}>
<WhiteSpace/>
<TodoCard data={item} onClick={() => checkLog(item.OPERATEID, item.UUID)}/>
</div>
<WhiteSpace/>
{start ? <div> <WhiteSpace/><Skeleton/><WhiteSpace/><Skeleton/><WhiteSpace/><Skeleton/></div> : (!start && (
data.length > 0 ? data.map((item, index) => (
<div key={index}>
<WhiteSpace/>
<TodoCard data={item} onClick={() => checkLog(item.OPERATEID, item.UUID)}/>
</div>
)) : <Empty/>
)
)) : <Empty/>
))}
}
<WhiteSpace/>
{loading && endT && (
<div className="pos-line mb-10">
{loading && (
<div className="pos-line content-loading">
<ActivityIndicator/>
<WhiteSpace/>
</div>
)}
{!loading && !end && data.length > 0 && (
<div className="content-end">
—————— 我是有底线的 ——————
</div>
)}
</WingBlank>
</Document>
......
.content-end{
width: 100%;
text-align: center;
color: rgba(67, 67, 67, 0.2);
margin-top: 20px;
}
.content-loading{
margin-top: 15px;
}
......@@ -2,7 +2,7 @@ import React, {useState, useEffect} from 'react';
import Document from 'react-document-title'
import AddressList from '../../components/AddressList';
import axiosRequest from '../../utils/request';
import {ActivityIndicator} from "antd-mobile";
import Skeleton from '../../components/Skeleton'
import './index.less'
import Empty from '../Empty'
......@@ -38,15 +38,10 @@ const AddressBook = (props) => {
return (
<Document title="通讯录">
<div>
<ActivityIndicator
toast
text="加载中..."
animating={loading}
/>
<div className='adMainBox'>
{ !start && ( data.length > 0 ? (
{loading ? <Skeleton/> : (!start && ( data.length > 0 ? (
<AddressList data={data} onCLick={treeClick}/>
): <Empty/>)}
): <Empty/>))}
</div>
</div>
......
import React, { useEffect} from 'react';
import React from 'react';
import {Modal} from 'antd-mobile'
import './index.less';
// import axiosRequest from '../../utils/request';
const operation = Modal.operation;
const Option = (props) => {
const onChange = () => {
const input = document.getElementsByClassName("option-text");
......@@ -15,14 +13,6 @@ const Option = (props) => {
const input = document.getElementsByClassName("option-text");
input[0].value = val
};
useEffect(() => {
// axiosRequest({
// method: 'post',
// url: '/dgbg/mobileGetListOptionKey.view?userName=2012012099&clientFlag=123456',
// }).then(res => {
// console.log(res)
// });
}, [])
return (
<div>
<div className="option-card">
......
......@@ -2,17 +2,22 @@ import React, {useState, useEffect} from 'react';
import Document from 'react-document-title'
import {WingBlank, WhiteSpace, ActionSheet, ActivityIndicator} from 'antd-mobile'
import axiosRequest from '../../utils/request';
import './index.less'
import TopTabs from '../../components/BlankTabs'
// import Skeleton from '../../components/Skeleton'
import Basic from './Basic'
import Adjunct from './Adjunct'
import Flow from './Flow';
import Option from './Option';
import './index.less'
const Process = (props) => {
const {uuid} = props.match.params;
const [templateId, setTemplateId] = useState();
const [tableId, setTableId] = useState();
const [nodeId, setNodeId] = useState();
const [operateId, setOperateId] = useState()
//回到顶部
useEffect(() => {
......@@ -30,6 +35,7 @@ const Process = (props) => {
setTableId(res.table && res.table.tableId);
setTemplateId(res.property && res.property.templateId)
setNodeId(res.property && res.property.curNodeId)
setOperateId(res.property && res.property.operateId)
});
}, []);
......@@ -72,15 +78,15 @@ const Process = (props) => {
setAdjunctData(res)
});
};
// const [button, setButton] = useState([])
const [button, setButton] = useState([])
const getButton= uuid => {
axiosRequest({
method: 'post',
url: `/idtAppServiceV6/oApp/nextNodeList`,
body: {curNodeId: nodeId}
}).then(res => {
console.log(res)
// setButton(res)
const result = res ? res.map(item => ({button: item.name, target: item.special})) : []
setButton(result)
});
};
useEffect(() => {
......@@ -109,7 +115,9 @@ const Process = (props) => {
return () => option.removeEventListener('focus', optionBlur, true);
}, []);
const [blyj, setBlyj] = useState()
const optionChange = val => {
setBlyj(val)
setDisabled(!(val != null && val !== ''))
};
......@@ -142,11 +150,29 @@ const Process = (props) => {
wrapProps = {
onTouchStart: e => e.preventDefault(),
};
};
const beforeSubmit = () => {
axiosRequest({
method: 'post',
url: `/idtAppServiceV6/oApp/save`,
body: {
tableId,
templateId,
dealInfo: {"BLYJ": blyj},
params: {uuid},
curNodeId: nodeId,
operateId
}
}).then(res => {
console.log(res)
});
}
const showActionSheet = () => {
// const but = button.map(item => (`${item.showname}`));
// console.log(but)
const BUTTONS = ['送部门领导审核', '送办公室分管主任审批', '办结', '取消'];
const BUTTON = []
button.map(item => BUTTON.push(item.button));
const BUTTONS = BUTTON.concat(['取消']);
ActionSheet.showActionSheetWithOptions({
options: BUTTONS,
cancelButtonIndex: BUTTONS.length - 1,
......@@ -159,8 +185,9 @@ const Process = (props) => {
});
};
const subUrl = key => {
const url = key === 0 ? 2 : 10
props.history.push(`/blank/submit/${url}`)
beforeSubmit()
// const url = button[key].target;
// props.history.push(`/blank/submit/${url}`)
}
const handleScroll = () => {
......
......@@ -8,10 +8,10 @@ const SubmitDetail = (props) => {
// const [title, setTitle] = useState([]);
const [disabled, setDisabled] = useState(true);
useEffect(() => {
// const {type} = props.match.params
const {type} = props.match.params
axiosRequest({
method: 'post',
url: `/idtAppServiceV6/oApp/getLeaders?mobileUse=true&nType=1`,
url: `/idtAppServiceV6/oApp/getLeaders?nType=${type}`,
}).then(res => {
setData(res)
});
......
......@@ -3,30 +3,16 @@ import {ActivityIndicator, Toast, WhiteSpace, WingBlank} from 'antd-mobile'
import TodoCard from '../../components/LogCard'
import TopNotice from '../../components/NoticeTab'
import axiosRequest from '../../utils/request';
import Skeleton from '../../components/Skeleton'
import Document from 'react-document-title'
import Empty from '../Empty'
// import useDebounce from '../../useHooks/useDebounce'
const Notice = (props) => {
const [start, setStart] = useState(true);
const [end, setEnd] = useState(true)
const [endT, setEndT] = useState(false);
const [t, setT] = useState(false)
useEffect(() => {
setT(true)
axiosRequest({
method: 'post',
url: '/idtAppServiceV6/oApp/getUnDone',
body: {nowPage: 1, pageSize: 10},
}).then(res => {
setT(false);
setStart(false)
let result = end && res.rows ? data.concat(res.rows) : data;
res.rows && res.rows.length >= 10 && setCurrent(1);
setEnd(res.rows && res.rows.length >= 10)
setData(result);
});
}, [])
const [current, setCurrent] = useState(0);
const [searchWord, setSearchWord] = useState();
......@@ -35,35 +21,36 @@ const Notice = (props) => {
const [data, setData] = useState([]);
const getData = () => {
const pageMap ={searchWord, nowPage: current + 1, pageSize: 10};
setLoading(true)
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 = end && res.rows ? data.concat(res.rows) : data;
res.rows && res.rows.length >= 10 ? setCurrent(current + 1) : setEndT(true);
setStart(false);
setEnd(res.rows && res.rows.length >= 10)
let result = end && res.rows ? data.concat(res.rows) : data;
res.rows && res.rows.length >= 10 && setCurrent(1);
setData(result);
setLoading(false);
});
};
//下拉加载
const [end, setEnd] = useState(true)
const handleScroll = () => {
let scrollTop = document.documentElement.scrollTop || document.body.scrollTop;
let clientHeight = document.documentElement.clientHeight || document.body.clientHeight;
let scrollHeight = document.documentElement.scrollHeight || document.body.scrollHeight;
if(scrollHeight > clientHeight && scrollTop + clientHeight === scrollHeight) {
current > 0 && window.scrollTo(0, document.body.scrollHeight)
getData()
}
}
useEffect(() => {
window.addEventListener('touchmove', handleScroll, true);
return () => window.removeEventListener('touchmove', handleScroll, true);
window.addEventListener('touchend', handleScroll, true);
return () => window.removeEventListener('touchend', handleScroll, true);
}, [data]);
const checkLog = (OPERATEID, UUID) => {
......@@ -77,57 +64,67 @@ const Notice = (props) => {
//tab已读未读切换
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 = end && res.rows ? [].concat(res.rows) : [];
res.rows && res.rows.length >= 10 ? setCurrent(current + 1) : Toast.info('当前是最后一页', 1);
setEnd(res.rows && res.rows.length >= 10)
setData(result);
});
};
// 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 => {
setCurrent(0)
setTab(val);
tabData()
};
const tabSearch = val => {
setCurrent(0)
setSearchWord(val)
}
useEffect(() => {
//回到顶部
window.scrollTo(0, 0)
getData()
}, [searchWord, tab])
}, [])
useEffect(() => {
setStart(true);
setEndT(false)
setData([])
setCurrent(0)
getData()
}, [searchWord, tab]);
console.log(current)
return (
<Document title="通知">
<WingBlank>
<ActivityIndicator
toast
text="加载中..."
animating={t}
/>
<WhiteSpace/>
<TopNotice onSearch={setSearchWord} tabChange={tabChange}/>
{
!start && (
data.length > 0 ? data.map((item, index) => (
<div key={index}>
<WhiteSpace/>
<TodoCard data={item} onClick={() => checkLog(item.OPERATEID, item.UUID)}/>
</div>
<TopNotice onSearch={tabSearch} tabChange={tabChange}/>
{ start ? <div> <WhiteSpace/><Skeleton/><WhiteSpace/><Skeleton/><WhiteSpace/><Skeleton/></div> : ( !start && (
data.length > 0 ? data.map((item, index) => (
<div key={index}>
<WhiteSpace/>
<TodoCard data={item} onClick={() => checkLog(item.OPERATEID, item.UUID)}/>
</div>
)) : <Empty/>
)
}
)) : <Empty/>
))}
<WhiteSpace/>
{loading && endT && (
<div className="pos-line mb-10">
{loading && (
<div className="pos-line content-loading">
<ActivityIndicator/>
<WhiteSpace/>
</div>
)}
{!loading && !end && data.length > 0 && (
<div className="content-end">
—————— 我是有底线的 ——————
</div>
)}
</WingBlank>
</Document>
......
.content-end{
width: 100%;
text-align: center;
color: rgba(67, 67, 67, 0.2);
margin-top: 20px;
}
.content-loading{
margin-top: 15px;
}
import React, { useState, useEffect } from 'react';
import {ActivityIndicator, WhiteSpace, WingBlank} from "antd-mobile";
import {WhiteSpace, WingBlank} from "antd-mobile";
import axiosRequest from '../../utils/request';
import TopSearch from '../../components/TopSearch'
import WorkCard from '../../components/WorkCard';
import Skeleton from '../../components/Skeleton'
import Document from 'react-document-title'
import Empty from '../Empty'
......@@ -61,15 +62,10 @@ const Work = (props) => {
return (
<Document title="工作">
<WingBlank>
<ActivityIndicator
toast
text="加载中..."
animating={loading}
/>
<WhiteSpace/>
<TopSearch onSearch={ workSearch }/>
<WhiteSpace/>
{ !start && (data.length > 0 ? (
{loading ? <Skeleton/> : (!start && (data.length > 0 ? (
<WorkCard
title="工作详情"
addCommon={ commonEdit }
......@@ -78,8 +74,7 @@ const Work = (props) => {
workUrl={workUrl}
iconAction={ itemAdd }
/>
) : <Empty/>)}
) : <Empty/>))}
</WingBlank>
</Document>
);
......
......@@ -5,7 +5,7 @@ import TopNotice from '../../components/NoticeTab'
import axiosRequest from '../../utils/request';
import './index.less'
import Empty from '../Empty'
import useDebounce from '../../useHooks/useDebounce'
// import useDebounce from '../../useHooks/useDebounce'
const WorkDetail = (props) => {
const [start, setStart] = useState(true);
......@@ -49,7 +49,7 @@ const WorkDetail = (props) => {
//下拉加载
const [end, setEnd] = useState(true)
const handleScroll = useDebounce(() => {
const handleScroll = () => {
let scrollTop = document.documentElement.scrollTop || document.body.scrollTop;
let clientHeight = document.documentElement.clientHeight || document.body.clientHeight;
let scrollHeight = document.documentElement.scrollHeight || document.body.scrollHeight;
......@@ -57,10 +57,10 @@ const WorkDetail = (props) => {
if(scrollHeight > clientHeight && scrollTop + clientHeight === scrollHeight) {
getData()
}
}, 500)
}
useEffect(() => {
window.addEventListener('scroll', handleScroll, true);
return () => window.removeEventListener('scroll', handleScroll, true);
window.addEventListener('touchend', handleScroll, true);
return () => window.removeEventListener('touchend', handleScroll, true);
}, [data]);
const checkLog = () => {
......
import {useRef, useCallback, useEffect} from 'react';
const UseDebounce = (fn, delay, dep = []) => {
const {current} = useRef({fn, timer: null});
useEffect(() => {
current.fn = fn
}, [fn])
return useCallback((...args) => {
if (current.timer) {
clearTimeout(current.timer)
}
current.timer = setTimeout(() => {
current.fn.call(this, ...args)
}, delay)
})
};
export default UseDebounce;
import {useRef, useCallback, useEffect} from 'react';
const UseThrottle = (fn, delay, dep = []) => {
const {current} = useRef({fn, timer: null});
useEffect(() => {
current.fn = fn
}, [fn])
return useCallback((...args) => {
if (!current.timer) {
current.timer = setTimeout(() => {
delete current.timer
}, delay);
current.fn.call(this, ...args)
}
}, dep)
};
export default UseThrottle;
import axios from 'axios';
import { Toast } from 'antd-mobile';
var qs = require('qs')
const instance = axios.create();
const token = localStorage.getItem("token");
......@@ -31,37 +32,27 @@ export const createAPI = (baseURL) => {
let opts = conf.opts || {};
let body = conf.body || {};
let urlParams = '';
console.log(conf)
let headers = { ...defaultHeaders, ...opts.headers };
if (conf.opts) {
urlParams = "?";
let keys = Object.keys(conf.opts);
keys.map(item => {
let value = conf.opts[item];
if (value !== null && value !== undefined && value !== '') {
urlParams += `${item}=${conf.opts[item]}&`
}
return null
});
urlParams = urlParams.substr(0, urlParams.length - 1)
urlParams += qs.stringify(conf.opts)
}
// if (conf.queryType === 'query') {
// urlParams = conf.body ? "?" + stringify(conf.body) : '';
// }
return instance(Object.assign({}, {
url: conf.url + urlParams,
baseURL: baseURL,
method: conf.method,
data: body,
// data: body,
headers,
}, conf.opts))
}))
.then(function (response) {
response = response.data;
console.log(response)
// console.log(response)
if (!response || !response.data) {
window.location.href = '/login'
// response.code === 'idt-core-505' && (window.location.href = '/login')
console.log('response出错, 无返回数据!', response); return false;
};
if (response.data && response.data.errorMessage) {
......
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