Commit 8b4e576c authored by 熊成伟's avatar 熊成伟

debug

parent 8aa664bd
Pipeline #15213 failed with stages
in 36 seconds
......@@ -2,30 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<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/AddressList/AddressUser.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/AddressList/AddressUser.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/AddressList/index.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/AddressList/index.jsx" 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/LogCard/index.less" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/LogCard/index.less" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/NoticeTab/index.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/NoticeTab/index.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/TopSearch/index.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/TopSearch/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/components/WorkCard/index.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/WorkCard/index.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/layout/Footer.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/layout/Footer.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/Communicate/Communicate.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/Communicate/Communicate.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pages/EventProcessing/Adjunct.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/EventProcessing/Adjunct.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pages/EventProcessing/Basic.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/EventProcessing/Basic.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pages/EventProcessing/Flow.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/EventProcessing/Flow.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/SubmitDetail.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/EventProcessing/SubmitDetail.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pages/Login/index.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/Login/index.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/WorkDetail.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/Work/WorkDetail.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/router.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/router.js" afterDir="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/" />
......@@ -42,8 +19,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/pages/Backlog/Backlog.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="350">
<caret line="23" column="50" selection-start-line="23" selection-start-column="18" selection-end-line="23" selection-end-column="50" />
<state relative-caret-position="575">
<caret line="23" column="61" selection-start-line="23" selection-start-column="61" selection-end-line="23" selection-end-column="61" />
<folding>
<element signature="e#0#49#0" expanded="true" />
</folding>
......@@ -66,7 +43,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/pages/Communicate/AddressBook.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<state relative-caret-position="525">
<caret line="27" column="17" lean-forward="true" selection-start-line="27" selection-start-column="17" selection-end-line="27" selection-end-column="17" />
<folding>
<element signature="e#0#49#0" expanded="true" />
......@@ -75,27 +52,26 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/.gitlab-ci.yml">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/utils/instance.js">
<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 relative-caret-position="200">
<caret line="59" column="30" selection-start-line="59" selection-start-column="30" selection-end-line="59" selection-end-column="30" />
<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$/nginx.conf">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-150" />
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/default.conf">
<entry file="file://$PROJECT_DIR$/src/pages/AddressList/AddressList.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="7" column="18" selection-start-line="7" selection-start-column="14" selection-end-line="7" selection-end-column="18" />
<state relative-caret-position="200">
<caret line="9" column="17" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
<folding>
<element signature="e#0#39#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
......@@ -136,11 +112,6 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/utils/utils.jsx">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
......@@ -198,7 +169,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/src/components/List/index.less" />
<option value="$PROJECT_DIR$/src/components/StepCard/index.less" />
<option value="$PROJECT_DIR$/src/components/TopSearch/index.less" />
<option value="$PROJECT_DIR$/src/pages/EventProcessing/index.less" />
......@@ -240,15 +210,16 @@
<option value="$PROJECT_DIR$/src/pages/EventProcessing/Adjunct.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/Backlog/Backlog.jsx" />
<option value="$PROJECT_DIR$/src/layout/Footer.jsx" />
<option value="$PROJECT_DIR$/src/pages/Login/index.jsx" />
<option value="$PROJECT_DIR$/src/utils/instance.js" />
<option value="$PROJECT_DIR$/src/pages/Communicate/Communicate.jsx" />
<option value="$PROJECT_DIR$/src/router.js" />
<option value="$PROJECT_DIR$/src/pages/Work/Work.jsx" />
<option value="$PROJECT_DIR$/src/pages/Work/WorkDetail.jsx" />
<option value="$PROJECT_DIR$/src/pages/Communicate/AddressBook.jsx" />
<option value="$PROJECT_DIR$/default.conf" />
<option value="$PROJECT_DIR$/src/pages/Backlog/Backlog.jsx" />
<option value="$PROJECT_DIR$/src/utils/instance.js" />
</list>
</option>
</component>
......@@ -274,6 +245,30 @@
<item name="create-react-app" type="b2602c69:ProjectViewProjectNode" />
<item name="create-react-app" 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" />
</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" />
</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="Backlog" 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="utils" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
......@@ -330,12 +325,12 @@
<workItem from="1591419899087" duration="268000" />
<workItem from="1591493817957" duration="11217000" />
<workItem from="1591579020550" duration="32744000" />
<workItem from="1591665260536" duration="26636000" />
<workItem from="1591665260536" duration="27236000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="162195000" />
<option name="totallyTimeSpent" value="162795000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="784" extended-state="6" />
......@@ -456,16 +451,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/AddressList/AddressList.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="9" column="17" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
<folding>
<element signature="e#0#39#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="125">
......@@ -664,16 +649,6 @@
<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/instance.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="125">
<caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/layout/Footer.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
......@@ -704,16 +679,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/Backlog/Backlog.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="350">
<caret line="23" column="50" selection-start-line="23" selection-start-column="18" selection-end-line="23" selection-end-column="50" />
<folding>
<element signature="e#0#49#0" expanded="true" />
</folding>
</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="220">
......@@ -734,16 +699,28 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/Communicate/AddressBook.jsx">
<entry file="file://$PROJECT_DIR$/src/pages/AddressList/AddressList.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="27" column="17" lean-forward="true" selection-start-line="27" selection-start-column="17" selection-end-line="27" selection-end-column="17" />
<state relative-caret-position="200">
<caret line="9" column="17" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
<folding>
<element signature="e#0#49#0" expanded="true" />
<element signature="e#0#39#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<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">
......@@ -751,15 +728,33 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/nginx.conf">
<entry file="file://$PROJECT_DIR$/src/pages/Communicate/AddressBook.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-150" />
<state relative-caret-position="525">
<caret line="27" column="17" lean-forward="true" selection-start-line="27" selection-start-column="17" selection-end-line="27" selection-end-column="17" />
<folding>
<element signature="e#0#49#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/default.conf">
<entry file="file://$PROJECT_DIR$/src/pages/Backlog/Backlog.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="7" column="18" selection-start-line="7" selection-start-column="14" selection-end-line="7" selection-end-column="18" />
<state relative-caret-position="575">
<caret line="23" column="61" selection-start-line="23" selection-start-column="61" selection-end-line="23" selection-end-column="61" />
<folding>
<element signature="e#0#49#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/utils/instance.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="59" column="30" selection-start-line="59" selection-start-column="30" selection-end-line="59" selection-end-column="30" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
......
......@@ -21,7 +21,7 @@ const Backlog = (props) => {
setLoading(true)
axiosRequest({
method: 'post',
url: '/idtAppServiceV6/getWaitDealList',
url: '/idtAppServiceV6/getWaitDealList&tableids=1',
}).then(res => {
setLoading(false);
let result = res.rows ? data.concat(res.rows) : data;
......
......@@ -47,7 +47,7 @@ export const createAPI = (baseURL) => {
headers,
}, conf.opts))
.then(function (response) {
console.log(response)
response = response.data;
if (!response || !response.data) { console.log('response出错, 无返回数据!', response); return false; };
if (response.data && response.data.errorMessage) {
......@@ -55,12 +55,11 @@ export const createAPI = (baseURL) => {
return false;
}
// 保存到本地
if (response && response.data && response.data.data && response.data.data.token) {
console.log(response.data.data.token)
if (response && response.data && response.data.token) {
defaultHeaders = {
token: response.data.data.token,
token: response.data.access_token,
}
localStorage.setItem("token", response.data.data.token);
localStorage.setItem("token", response.data.access_token);
}
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