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

debug

parent be67854b
Pipeline #15219 passed with stages
in 58 seconds
......@@ -2,8 +2,11 @@
<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/AddressList/AddressCheckbox.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/AddressList/AddressCheckbox.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/EventProcessing/SubmitDetail.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/EventProcessing/SubmitDetail.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/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/" />
......@@ -19,8 +22,20 @@
<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="89" column="27" lean-forward="true" selection-start-line="89" selection-start-column="27" selection-end-line="89" selection-end-column="27" />
<state relative-caret-position="409">
<caret line="151" column="18" lean-forward="true" selection-start-line="143" selection-start-column="9" selection-end-line="151" selection-end-column="18" />
<folding>
<element signature="e#0#49#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<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="98">
<caret line="21" column="22" lean-forward="true" selection-start-line="21" selection-start-column="22" selection-end-line="21" selection-end-column="22" />
<folding>
<element signature="e#0#49#0" expanded="true" />
</folding>
......@@ -29,12 +44,33 @@
</entry>
</file>
<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="175">
<caret line="31" column="24" selection-start-line="31" selection-start-column="24" selection-end-line="31" selection-end-column="24" />
<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/utils/request.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="348">
<caret line="33" column="25" selection-start-line="33" selection-start-column="21" selection-end-line="33" selection-end-column="25" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/pages/EventProcessing/SubmitDetail.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="273">
<caret line="34" column="63" selection-start-line="34" selection-start-column="63" selection-end-line="34" selection-end-column="63" />
<state relative-caret-position="434">
<caret line="49" column="42" selection-start-line="49" selection-start-column="42" selection-end-line="49" selection-end-column="42" />
<folding>
<element signature="e#0#39#0" expanded="true" />
<element signature="e#123#170#0" expanded="true" />
</folding>
</state>
</provider>
......@@ -52,8 +88,8 @@
<file pinned="false" current-in-tab="false">
<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" column="88" selection-start-line="11" selection-start-column="88" selection-end-line="11" selection-end-column="88" />
<state relative-caret-position="375">
<caret line="15" column="29" selection-start-line="15" selection-start-column="29" selection-end-line="15" selection-end-column="29" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
......@@ -64,8 +100,17 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/pages/EventProcessing/index.less">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="495">
<caret line="99" column="18" selection-start-line="99" selection-start-column="18" selection-end-line="99" selection-end-column="18" />
<state relative-caret-position="420">
<caret line="106" column="22" selection-start-line="106" selection-start-column="22" selection-end-line="106" selection-end-column="22" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/pages/Communicate/index.less">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret selection-end-column="30" />
</state>
</provider>
</entry>
......@@ -170,7 +215,6 @@
<option value="$PROJECT_DIR$/src/pages/Work/WorkDetail.jsx" />
<option value="$PROJECT_DIR$/default.conf" />
<option value="$PROJECT_DIR$/src/pages/Login/index.jsx" />
<option value="$PROJECT_DIR$/src/utils/instance.js" />
<option value="$PROJECT_DIR$/src/pages/Work/Work.jsx" />
<option value="$PROJECT_DIR$/src/components/WorkCard/index.jsx" />
<option value="$PROJECT_DIR$/src/layout/Footer.jsx" />
......@@ -178,7 +222,6 @@
<option value="$PROJECT_DIR$/src/components/AddressList/AddressUser.jsx" />
<option value="$PROJECT_DIR$/src/pages/Communicate/Communicate.jsx" />
<option value="$PROJECT_DIR$/src/components/LogCard/index.jsx" />
<option value="$PROJECT_DIR$/src/pages/Backlog/Backlog.jsx" />
<option value="$PROJECT_DIR$/src/pages/EventProcessing/Option.jsx" />
<option value="$PROJECT_DIR$/src/pages/EventProcessing/Adjunct.jsx" />
<option value="$PROJECT_DIR$/src/pages/EventProcessing/Flow.jsx" />
......@@ -188,9 +231,11 @@
<option value="$PROJECT_DIR$/src/pages/EventProcessing/Process.jsx" />
<option value="$PROJECT_DIR$/src/components/AddressList/index.less" />
<option value="$PROJECT_DIR$/src/components/AddressList/index.jsx" />
<option value="$PROJECT_DIR$/src/pages/EventProcessing/index.less" />
<option value="$PROJECT_DIR$/src/components/AddressList/AddressCheckbox.jsx" />
<option value="$PROJECT_DIR$/src/pages/EventProcessing/SubmitDetail.jsx" />
<option value="$PROJECT_DIR$/src/pages/EventProcessing/index.less" />
<option value="$PROJECT_DIR$/src/pages/Backlog/Backlog.jsx" />
<option value="$PROJECT_DIR$/src/utils/instance.js" />
</list>
</option>
</component>
......@@ -245,14 +290,7 @@
<item name="create-react-app" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="Communicate" 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="EventProcessing" type="462c0819:PsiDirectoryNode" />
<item name="Backlog" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="create-react-app" type="b2602c69:ProjectViewProjectNode" />
......@@ -316,12 +354,12 @@
<workItem from="1591419899087" duration="268000" />
<workItem from="1591493817957" duration="11217000" />
<workItem from="1591579020550" duration="32744000" />
<workItem from="1591665260536" duration="35707000" />
<workItem from="1591665260536" duration="36986000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="171266000" />
<option name="totallyTimeSpent" value="172545000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="784" extended-state="6" />
......@@ -562,23 +600,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/utils/instance.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="51" column="91" selection-start-line="51" selection-start-column="91" selection-end-line="51" selection-end-column="91" />
<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="250">
<caret line="10" column="20" selection-start-line="10" selection-start-column="6" selection-end-line="10" selection-end-column="20" />
</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="248">
......@@ -589,13 +610,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/Communicate/index.less">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret selection-end-column="30" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/Notice/Notice.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
......@@ -606,16 +620,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="375">
<caret line="15" column="39" selection-start-line="15" selection-start-column="39" selection-end-line="15" selection-end-column="39" />
<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="100">
......@@ -654,16 +658,6 @@
</state>
</provider>
</entry>
<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="89" column="27" lean-forward="true" selection-start-line="89" selection-start-column="27" selection-end-line="89" selection-end-column="27" />
<folding>
<element signature="e#0#49#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/Communicate/AddressBook.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
......@@ -684,13 +678,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/Communicate/Communicate.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="25">
<caret line="1" selection-start-line="1" selection-end-line="1" selection-end-column="67" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/EventProcessing/Basic.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-427">
......@@ -722,29 +709,80 @@
</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="375">
<caret line="15" column="29" selection-start-line="15" selection-start-column="29" selection-end-line="15" selection-end-column="29" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/Communicate/Communicate.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="25">
<caret line="1" selection-start-line="1" selection-end-line="1" selection-end-column="67" />
</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="434">
<caret line="49" column="42" selection-start-line="49" selection-start-column="42" selection-end-line="49" selection-end-column="42" />
<folding>
<element signature="e#123#170#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/Communicate/index.less">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret selection-end-column="30" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/EventProcessing/index.less">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="495">
<caret line="99" column="18" selection-start-line="99" selection-start-column="18" selection-end-line="99" selection-end-column="18" />
<state relative-caret-position="420">
<caret line="106" column="22" selection-start-line="106" selection-start-column="22" selection-end-line="106" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/AddressList/AddressCheckbox.jsx">
<entry file="file://$PROJECT_DIR$/src/utils/request.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="11" column="88" selection-start-line="11" selection-start-column="88" selection-end-line="11" selection-end-column="88" />
<state relative-caret-position="348">
<caret line="33" column="25" selection-start-line="33" selection-start-column="21" selection-end-line="33" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/EventProcessing/Process.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="409">
<caret line="151" column="18" lean-forward="true" selection-start-line="143" selection-start-column="9" selection-end-line="151" selection-end-column="18" />
<folding>
<element signature="e#0#26#0" expanded="true" />
<element signature="e#0#49#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/EventProcessing/SubmitDetail.jsx">
<entry file="file://$PROJECT_DIR$/src/pages/Backlog/Backlog.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="273">
<caret line="34" column="63" selection-start-line="34" selection-start-column="63" selection-end-line="34" selection-end-column="63" />
<state relative-caret-position="98">
<caret line="21" column="22" lean-forward="true" selection-start-line="21" selection-start-column="22" selection-end-line="21" selection-end-column="22" />
<folding>
<element signature="e#0#39#0" expanded="true" />
<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="175">
<caret line="31" column="24" selection-start-line="31" selection-start-column="24" selection-end-line="31" selection-end-column="24" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state>
</provider>
......
......@@ -6,7 +6,7 @@ const Index = (props) => {
return (
<div className="address-box">
{data && data.length > 0 && data.map((item, index) => item.NAME && (
<div key={index} onClick={() => onCLick(item.DEPTID)}>
<div key={index} onClick={() => onCLick(item.DEPTID)} className="address-item">
{item.NAME || ''}
<img src="/img/rarrow.png" alt="" className='icon18'/>
</div>
......
......@@ -22,6 +22,7 @@ const Backlog = (props) => {
axiosRequest({
method: 'post',
url: '/idtAppServiceV6/oApp/getUnDone',
body: pageMap,
}).then(res => {
console.log(res)
setLoading(false);
......@@ -55,7 +56,10 @@ const Backlog = (props) => {
element.scrollTo(0, 0)
}, [])
console.log(loading)
const wordSearch = val => {
setSearchWord(val)
getData()
}
return (
<WingBlank>
<ActivityIndicator
......@@ -64,7 +68,7 @@ const Backlog = (props) => {
animating={loading}
/>
<WhiteSpace/>
<TopSearch onSearch={setSearchWord}/>
<TopSearch onSearch={wordSearch}/>
{
data.map((item, index) => (
<div key={index}>
......
......@@ -5,7 +5,8 @@ import AddressCheckbox from '../../components/AddressList/AddressCheckbox';
const SubmitDetail = (props) => {
const [data, setData] = useState([]);
const [title, setTitle] = useState([])
const [title, setTitle] = useState([]);
const [disabled, setDisabled] = useState(true);
useEffect(() => {
// const {type} = props.match.params
axiosRequest({
......@@ -18,8 +19,18 @@ const SubmitDetail = (props) => {
});
}, []);
const [suData, setSuData] = useState([])
const checkName = (name, checked) => {
console.log(name, checked)
const newData = [...suData];
const index = newData.indexOf(name);
checked ? newData.push(name) : newData.splice(index, 1);
newData.length > 0 ? setDisabled(false) : setDisabled(true)
setSuData(newData)
}
const textClick = () => {
console.log(suData)
}
return (
<div>
......@@ -34,6 +45,12 @@ const SubmitDetail = (props) => {
<div className='adMainBox'>
<AddressCheckbox data={data} setName={checkName}/>
</div>
<div className="event-footer">
<div className={`event-footer-button ${(disabled) ? 'button-disabled' : '' }`} onClick={textClick}>
{suData.length > 0 ?`(${suData.length})` : null} 确认发送
</div>
</div>
</div>
);
};
......
@import '../../variable.less';
#event{
position: fixed;
top: 44px;
......@@ -99,3 +101,8 @@
justify-content: space-between;
font-size: 14px;
}
.am-checkbox.am-checkbox-checked .am-checkbox-inner{
border-color: @primary;
background: @primary;
}
......@@ -33,7 +33,6 @@ export const createAPI = (baseURL) => {
let body = conf.body || {};
let urlParams = '';
let headers = { ...defaultHeaders, ...opts.headers };
if (conf.queryType === 'query') {
urlParams = conf.body ? "?" + stringify(conf.body) : '';
......
......@@ -47,4 +47,4 @@ export default axiosRequest;
// url: url,
// opts: params,
// });
// }
\ No newline at end of file
// }
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