Commit 4508ae30 authored by 熊成伟's avatar 熊成伟

debug

parent 8b4e576c
Pipeline #15214 passed with stages
in 1 minute and 3 seconds
...@@ -2,8 +2,9 @@ ...@@ -2,8 +2,9 @@
<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$/src/pages/Backlog/Backlog.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/Backlog/Backlog.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/utils/instance.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/utils/instance.js" 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" />
</list> </list>
<ignored path="$PROJECT_DIR$/.tmp/" /> <ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" /> <ignored path="$PROJECT_DIR$/temp/" />
...@@ -16,6 +17,31 @@ ...@@ -16,6 +17,31 @@
</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="true">
<entry file="file://$PROJECT_DIR$/src/pages/EventProcessing/Process.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="26" column="27" selection-start-line="26" selection-start-column="27" selection-end-line="26" selection-end-column="27" />
<folding>
<element signature="e#0#49#0" expanded="true" />
<element signature="e#183#204#0" expanded="true" />
</folding>
</state>
</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="325">
<caret line="13" column="31" lean-forward="true" selection-start-line="13" selection-start-column="31" selection-end-line="13" selection-end-column="31" />
<folding>
<element signature="e#0#49#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<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">
...@@ -52,13 +78,14 @@ ...@@ -52,13 +78,14 @@
</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/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="200"> <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" /> <caret line="39" column="32" selection-start-line="39" selection-start-column="32" selection-end-line="39" selection-end-column="32" />
<caret line="38" column="32" lean-forward="true" selection-start-line="38" selection-start-column="32" selection-end-line="38" selection-end-column="32" />
<folding> <folding>
<element signature="e#0#26#0" expanded="true" /> <element signature="e#0#49#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -200,7 +227,6 @@ ...@@ -200,7 +227,6 @@
<option value="$PROJECT_DIR$/src/components/WorkCard/index.jsx" /> <option value="$PROJECT_DIR$/src/components/WorkCard/index.jsx" />
<option value="$PROJECT_DIR$/src/components/WorkCard/CardItem.jsx" /> <option value="$PROJECT_DIR$/src/components/WorkCard/CardItem.jsx" />
<option value="$PROJECT_DIR$/src/components/LogCard/index.jsx" /> <option value="$PROJECT_DIR$/src/components/LogCard/index.jsx" />
<option value="$PROJECT_DIR$/src/pages/Notice/Notice.jsx" />
<option value="$PROJECT_DIR$/src/components/AddressList/index.jsx" /> <option value="$PROJECT_DIR$/src/components/AddressList/index.jsx" />
<option value="$PROJECT_DIR$/src/components/AddressList/AddressUser.jsx" /> <option value="$PROJECT_DIR$/src/components/AddressList/AddressUser.jsx" />
<option value="$PROJECT_DIR$/src/components/LogCard/index.less" /> <option value="$PROJECT_DIR$/src/components/LogCard/index.less" />
...@@ -208,8 +234,6 @@ ...@@ -208,8 +234,6 @@
<option value="$PROJECT_DIR$/src/pages/EventProcessing/Basic.jsx" /> <option value="$PROJECT_DIR$/src/pages/EventProcessing/Basic.jsx" />
<option value="$PROJECT_DIR$/src/pages/EventProcessing/Flow.jsx" /> <option value="$PROJECT_DIR$/src/pages/EventProcessing/Flow.jsx" />
<option value="$PROJECT_DIR$/src/pages/EventProcessing/Adjunct.jsx" /> <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/layout/Footer.jsx" /> <option value="$PROJECT_DIR$/src/layout/Footer.jsx" />
<option value="$PROJECT_DIR$/src/pages/Login/index.jsx" /> <option value="$PROJECT_DIR$/src/pages/Login/index.jsx" />
<option value="$PROJECT_DIR$/src/pages/Communicate/Communicate.jsx" /> <option value="$PROJECT_DIR$/src/pages/Communicate/Communicate.jsx" />
...@@ -220,6 +244,9 @@ ...@@ -220,6 +244,9 @@
<option value="$PROJECT_DIR$/default.conf" /> <option value="$PROJECT_DIR$/default.conf" />
<option value="$PROJECT_DIR$/src/pages/Backlog/Backlog.jsx" /> <option value="$PROJECT_DIR$/src/pages/Backlog/Backlog.jsx" />
<option value="$PROJECT_DIR$/src/utils/instance.js" /> <option value="$PROJECT_DIR$/src/utils/instance.js" />
<option value="$PROJECT_DIR$/src/pages/Notice/Notice.jsx" />
<option value="$PROJECT_DIR$/src/pages/EventProcessing/Option.jsx" />
<option value="$PROJECT_DIR$/src/pages/EventProcessing/Process.jsx" />
</list> </list>
</option> </option>
</component> </component>
...@@ -263,6 +290,20 @@ ...@@ -263,6 +290,20 @@
<item name="pages" type="462c0819:PsiDirectoryNode" /> <item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="Backlog" type="462c0819:PsiDirectoryNode" /> <item name="Backlog" type="462c0819:PsiDirectoryNode" />
</path> </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="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>
<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" />
...@@ -325,12 +366,12 @@ ...@@ -325,12 +366,12 @@
<workItem from="1591419899087" duration="268000" /> <workItem from="1591419899087" duration="268000" />
<workItem from="1591493817957" duration="11217000" /> <workItem from="1591493817957" duration="11217000" />
<workItem from="1591579020550" duration="32744000" /> <workItem from="1591579020550" duration="32744000" />
<workItem from="1591665260536" duration="27236000" /> <workItem from="1591665260536" duration="27573000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="162795000" /> <option name="totallyTimeSpent" value="163132000" />
</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" />
...@@ -517,17 +558,6 @@ ...@@ -517,17 +558,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/pages/Notice/Notice.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="38" column="31" selection-start-line="38" selection-start-column="31" selection-end-line="38" selection-end-column="31" />
<caret line="39" column="31" selection-start-line="39" selection-start-column="31" selection-end-line="39" selection-end-column="31" />
<folding>
<element signature="e#0#49#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/AddressList/index.jsx"> <entry file="file://$PROJECT_DIR$/src/components/AddressList/index.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="172"> <state relative-caret-position="172">
...@@ -582,26 +612,6 @@ ...@@ -582,26 +612,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/pages/EventProcessing/Process.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="8" column="30" lean-forward="true" selection-start-line="8" selection-start-column="30" selection-end-line="8" selection-end-column="30" />
<folding>
<element signature="e#0#49#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="575">
<caret line="26" column="13" lean-forward="true" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
<folding>
<element signature="e#0#39#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/EventProcessing/Basic.jsx"> <entry file="file://$PROJECT_DIR$/src/pages/EventProcessing/Basic.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="75">
...@@ -728,6 +738,26 @@ ...@@ -728,6 +738,26 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/pages/Backlog/Backlog.jsx">
<provider selected="true" editor-type-id="text-editor">
<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="1475">
<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>
<entry file="file://$PROJECT_DIR$/src/pages/Communicate/AddressBook.jsx"> <entry file="file://$PROJECT_DIR$/src/pages/Communicate/AddressBook.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="525"> <state relative-caret-position="525">
...@@ -738,22 +768,34 @@ ...@@ -738,22 +768,34 @@
</state> </state>
</provider> </provider>
</entry> </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"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="575"> <state relative-caret-position="200">
<caret line="23" column="61" selection-start-line="23" selection-start-column="61" selection-end-line="23" selection-end-column="61" /> <caret line="39" column="32" selection-start-line="39" selection-start-column="32" selection-end-line="39" selection-end-column="32" />
<caret line="38" column="32" lean-forward="true" selection-start-line="38" selection-start-column="32" selection-end-line="38" selection-end-column="32" />
<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/EventProcessing/Option.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="13" column="31" lean-forward="true" selection-start-line="13" selection-start-column="31" selection-end-line="13" selection-end-column="31" />
<folding>
<element signature="e#0#49#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<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="200"> <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" /> <caret line="26" column="27" selection-start-line="26" selection-start-column="27" selection-end-line="26" selection-end-column="27" />
<folding> <folding>
<element signature="e#0#26#0" expanded="true" /> <element signature="e#0#49#0" expanded="true" />
<element signature="e#183#204#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
......
...@@ -21,7 +21,7 @@ const Backlog = (props) => { ...@@ -21,7 +21,7 @@ const Backlog = (props) => {
setLoading(true) setLoading(true)
axiosRequest({ axiosRequest({
method: 'post', method: 'post',
url: '/idtAppServiceV6/getWaitDealList&tableids=1', url: '/idtAppServiceV6/oApp/getUnDone',
}).then(res => { }).then(res => {
setLoading(false); setLoading(false);
let result = res.rows ? data.concat(res.rows) : data; let result = res.rows ? data.concat(res.rows) : data;
......
import React, {useState, useEffect} from 'react'; import React, {useState, useEffect} from 'react';
import AddressList from '../../components/AddressList';
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 {ActivityIndicator} from "antd-mobile";
...@@ -8,7 +7,7 @@ import {ActivityIndicator} from "antd-mobile"; ...@@ -8,7 +7,7 @@ import {ActivityIndicator} from "antd-mobile";
const Communicate = (props) => { const Communicate = (props) => {
const [loading, setLoading] = useState(false); const [loading, setLoading] = useState(false);
const [data, setData] = useState([]); const [data, setData] = useState([]);
const [type, setType] = useState('basic') // const [type, setType] = useState('basic')
// const {id} = props.match.params; // const {id} = props.match.params;
...@@ -16,6 +15,7 @@ const Communicate = (props) => { ...@@ -16,6 +15,7 @@ const Communicate = (props) => {
const getData = () => { const getData = () => {
setLoading(true); setLoading(true);
console.log(data)
axiosRequest({ axiosRequest({
method: 'post', method: 'post',
url: '/idtAppServiceV6/oApp/getSearchAddressBook', url: '/idtAppServiceV6/oApp/getSearchAddressBook',
...@@ -25,18 +25,10 @@ const Communicate = (props) => { ...@@ -25,18 +25,10 @@ const Communicate = (props) => {
}); });
}; };
useEffect(() => { useEffect(() => {
if (props.location.query && props.location.query.parent) {
const {parent} = props.location.query;
}
// const {parent} = props.location.query;
console.log(props.location.query)
getData() getData()
}, []); }, []);
const getCurrent = () =>{
}
return ( return (
<div> <div>
<ActivityIndicator <ActivityIndicator
......
import React, {useState, useEffect} from 'react'; import React, { useEffect} from 'react';
import {Modal} from 'antd-mobile' import {Modal} from 'antd-mobile'
import './index.less'; import './index.less';
import axiosRequest from '../../utils/request'; import axiosRequest from '../../utils/request';
......
import React, {useState, useEffect} from 'react'; import React, {useState, useEffect} from 'react';
import {WingBlank, WhiteSpace, ActionSheet, ActivityIndicator} from 'antd-mobile' import {WingBlank, WhiteSpace, ActionSheet, ActivityIndicator} from 'antd-mobile'
import axiosRequest from '../../utils/request'; // import axiosRequest from '../../utils/request';
import './index.less' import './index.less'
import TopTabs from '../../components/BlankTabs' import TopTabs from '../../components/BlankTabs'
import Basic from './Basic' import Basic from './Basic'
...@@ -23,6 +23,8 @@ const Pro = (props) => { ...@@ -23,6 +23,8 @@ const Pro = (props) => {
setFootStatus(true) setFootStatus(true)
}; };
useEffect(() => { useEffect(() => {
setTableId();
console.log(tableId)
setLoading(false); setLoading(false);
const option = document.getElementsByClassName("option-text")[0] const option = document.getElementsByClassName("option-text")[0]
option.addEventListener('focus', optionBlur, true); option.addEventListener('focus', optionBlur, true);
...@@ -75,14 +77,14 @@ const Pro = (props) => { ...@@ -75,14 +77,14 @@ const Pro = (props) => {
console.log(buttonIndex) console.log(buttonIndex)
}); });
}; };
const processEnd = () => { // const processEnd = () => {
axiosRequest({ // axiosRequest({
method: 'post', // method: 'post',
url: `/dgbg/MobileGetFlowsByTabId.view?userName=2012012099&clientFlag=123456&tableId=${tableId}`, // url: `/dgbg/MobileGetFlowsByTabId.view?userName=2012012099&clientFlag=123456&tableId=${tableId}`,
}).then(res => { // }).then(res => {
console.log(res) // console.log(res)
}); // });
} // }
const handleScroll = () => { const handleScroll = () => {
const adjunct = document.getElementById("event-adjunct").offsetTop; const adjunct = document.getElementById("event-adjunct").offsetTop;
......
...@@ -36,8 +36,8 @@ const Notice = (props) => { ...@@ -36,8 +36,8 @@ const Notice = (props) => {
} }
}; };
useEffect(() => { useEffect(() => {
// window.addEventListener('scroll', handleScroll, true); window.addEventListener('scroll', handleScroll, true);
// return () => window.removeEventListener('scroll', handleScroll, true); return () => window.removeEventListener('scroll', handleScroll, true);
}, [data]); }, [data]);
const checkLog = () => { const checkLog = () => {
......
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