Commit 51d5046c authored by 熊成伟's avatar 熊成伟

debug

parent c905588f
Pipeline #15224 passed with stages
in 1 minute and 3 seconds
This diff is collapsed.
...@@ -5510,7 +5510,7 @@ ...@@ -5510,7 +5510,7 @@
}, },
"is-extglob": { "is-extglob": {
"version": "2.1.1", "version": "2.1.1",
"resolved": "http://registry.npm.taobao.org/is-extglob/download/is-extglob-2.1.1.tgz", "resolved": "https://registry.npm.taobao.org/is-extglob/download/is-extglob-2.1.1.tgz",
"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
}, },
"is-glob": { "is-glob": {
...@@ -9823,6 +9823,15 @@ ...@@ -9823,6 +9823,15 @@
"text-table": "0.2.0" "text-table": "0.2.0"
} }
}, },
"react-document-title": {
"version": "2.0.3",
"resolved": "https://registry.npm.taobao.org/react-document-title/download/react-document-title-2.0.3.tgz",
"integrity": "sha1-u/kioNcUEvyUgkXkKDskEt9w8rk=",
"requires": {
"prop-types": "^15.5.6",
"react-side-effect": "^1.0.2"
}
},
"react-dom": { "react-dom": {
"version": "16.13.1", "version": "16.13.1",
"resolved": "https://registry.npm.taobao.org/react-dom/download/react-dom-16.13.1.tgz", "resolved": "https://registry.npm.taobao.org/react-dom/download/react-dom-16.13.1.tgz",
...@@ -10250,6 +10259,14 @@ ...@@ -10250,6 +10259,14 @@
} }
} }
}, },
"react-side-effect": {
"version": "1.2.0",
"resolved": "https://registry.npm.taobao.org/react-side-effect/download/react-side-effect-1.2.0.tgz",
"integrity": "sha1-DpQMePq6DHO5sOupzT3ajft+fa4=",
"requires": {
"shallowequal": "^1.0.1"
}
},
"react-tween-state": { "react-tween-state": {
"version": "0.1.5", "version": "0.1.5",
"resolved": "https://registry.npm.taobao.org/react-tween-state/download/react-tween-state-0.1.5.tgz", "resolved": "https://registry.npm.taobao.org/react-tween-state/download/react-tween-state-0.1.5.tgz",
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
"lib-flexible": "^0.3.2", "lib-flexible": "^0.3.2",
"postcss-px2rem": "^0.3.0", "postcss-px2rem": "^0.3.0",
"react": "^16.8.4", "react": "^16.8.4",
"react-document-title": "^2.0.3",
"react-dom": "^16.8.4", "react-dom": "^16.8.4",
"react-router-dom": "^5.2.0", "react-router-dom": "^5.2.0",
"react-scripts": "1.0.13" "react-scripts": "1.0.13"
......
...@@ -3,8 +3,8 @@ import {Tabs, Icon} from 'antd-mobile' ...@@ -3,8 +3,8 @@ import {Tabs, Icon} from 'antd-mobile'
import './index.less' import './index.less'
const tabs = [ const tabs = [
{ title: '读', sub: '1' }, { title: '读', sub: '1' },
{ title: '未读', sub: '2' }, { title: '已读', sub: '2' }
] ]
const Index = (props) => { const Index = (props) => {
......
...@@ -3,6 +3,7 @@ import {WhiteSpace, WingBlank, ActivityIndicator} from 'antd-mobile' ...@@ -3,6 +3,7 @@ import {WhiteSpace, WingBlank, ActivityIndicator} from 'antd-mobile'
import TodoCard from '../../components/LogCard' import TodoCard from '../../components/LogCard'
import TopSearch from '../../components/TopSearch'; import TopSearch from '../../components/TopSearch';
import axiosRequest from '../../utils/request'; import axiosRequest from '../../utils/request';
import Document from 'react-document-title'
const Backlog = (props) => { const Backlog = (props) => {
const [current, setCurrent] = useState(1); const [current, setCurrent] = useState(1);
...@@ -61,24 +62,26 @@ const Backlog = (props) => { ...@@ -61,24 +62,26 @@ const Backlog = (props) => {
getData() getData()
} }
return ( return (
<WingBlank> <Document title="待办">
<ActivityIndicator <WingBlank>
toast <ActivityIndicator
text="加载中..." toast
animating={loading} text="加载中..."
/> animating={loading}
<WhiteSpace/> />
<TopSearch onSearch={wordSearch}/> <WhiteSpace/>
{ <TopSearch onSearch={wordSearch}/>
data.map((item, index) => ( {
<div key={index}> data.map((item, index) => (
<WhiteSpace/> <div key={index}>
<TodoCard data={item} onClick={() => checkLog(item.OPERATEID)}/> <WhiteSpace/>
</div> <TodoCard data={item} onClick={() => checkLog(item.OPERATEID)}/>
</div>
)) ))
} }
</WingBlank> </WingBlank>
</Document>
); );
}; };
......
import React, {useState, useEffect} from 'react'; import React, {useState, useEffect} from 'react';
import Document from 'react-document-title'
import AddressList from '../../components/AddressList'; import AddressList from '../../components/AddressList';
import axiosRequest from '../../utils/request'; import axiosRequest from '../../utils/request';
import {ActivityIndicator} from "antd-mobile"; import {ActivityIndicator} from "antd-mobile";
...@@ -32,17 +33,19 @@ const AddressBook = (props) => { ...@@ -32,17 +33,19 @@ const AddressBook = (props) => {
props.history.push(`/bord/address/${val}`) props.history.push(`/bord/address/${val}`)
}; };
return ( return (
<div> <Document title="通讯录">
<ActivityIndicator <div>
toast <ActivityIndicator
text="加载中..." toast
animating={loading} text="加载中..."
/> animating={loading}
<div className='adMainBox'> />
<AddressList data={data} onCLick={treeClick}/> <div className='adMainBox'>
<AddressList data={data} onCLick={treeClick}/>
</div>
</div> </div>
</div> </Document>
); );
}; };
......
...@@ -2,6 +2,7 @@ import React, {useState, useEffect} from 'react'; ...@@ -2,6 +2,7 @@ import React, {useState, useEffect} from 'react';
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";
import Document from 'react-document-title'
const Communicate = (props) => { const Communicate = (props) => {
...@@ -27,25 +28,22 @@ const Communicate = (props) => { ...@@ -27,25 +28,22 @@ const Communicate = (props) => {
return ( return (
<div> <Document title="通讯录">
<ActivityIndicator <div>
toast <ActivityIndicator
text="加载中..." toast
animating={loading} text="加载中..."
/> animating={loading}
<div className='breadBox'> />
{title.length > 0 ? title[0].depts : ''} <div className='breadBox'>
{/*<span className='currentLink'>科技创新委员会</span>*/} {title.length > 0 ? title[0].depts : ''}
{/*<span className='symbol'>&gt;</span>*/} </div>
{/*<span>组织架构</span>*/} <div className='adMainBox'>
{/*<span className='symbol'>&gt;</span>*/} <AddressUser data={data}/>
{/*<span>办公厅</span>*/} </div>
</div>
<div className='adMainBox'>
<AddressUser data={data}/>
</div> </div>
</div> </Document>
); );
}; };
......
import React, {useState, useEffect} from 'react'; import React, {useState, useEffect} from 'react';
import Document from 'react-document-title'
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'
...@@ -118,40 +119,42 @@ const Process = (props) => { ...@@ -118,40 +119,42 @@ const Process = (props) => {
return () => window.removeEventListener('scroll', handleScroll, true); return () => window.removeEventListener('scroll', handleScroll, true);
}, []) }, [])
return ( return (
<div> <Document title="待办详情">
<ActivityIndicator <div>
toast <ActivityIndicator
text="加载中..." toast
animating={loading} text="加载中..."
/> animating={loading}
<TopTabs page={current} onClick={tabClick}/> />
<div id="event"> <TopTabs page={current} onClick={tabClick}/>
<WingBlank> <div id="event">
<div id="event-basic"/> <WingBlank>
<WhiteSpace/> <div id="event-basic"/>
<Basic data={[]}/> <WhiteSpace/>
<div id="event-adjunct"/> <Basic data={[]}/>
<WhiteSpace/> <div id="event-adjunct"/>
<Adjunct data={[]}/> <WhiteSpace/>
<div id="event-flow"/> <Adjunct data={[]}/>
<WhiteSpace/> <div id="event-flow"/>
<Flow data={[]}/> <WhiteSpace/>
<div id="event-option"/> <Flow data={[]}/>
<WhiteSpace/> <div id="event-option"/>
<Option onChange={optionChange}/> <WhiteSpace/>
</WingBlank> <Option onChange={optionChange}/>
</div> </WingBlank>
<div className="event-footer">
<div className={`event-footer-button ${(footStatus && disabled) ? 'button-disabled' : '' }`} onClick={footStatus && !disabled ? showActionSheet: textClick}>
{!footStatus && (
<img alt="" src="/img/process-edit.png" className="process-edit"/>
)}
{footButton}
</div> </div>
<div className="event-footer">
<div className={`event-footer-button ${(footStatus && disabled) ? 'button-disabled' : '' }`} onClick={footStatus && !disabled ? showActionSheet: textClick}>
{!footStatus && (
<img alt="" src="/img/process-edit.png" className="process-edit"/>
)}
{footButton}
</div>
</div> </div>
</div> </div>
</Document>
); );
}; };
......
...@@ -3,6 +3,7 @@ import {ActivityIndicator, WhiteSpace, WingBlank} from 'antd-mobile' ...@@ -3,6 +3,7 @@ import {ActivityIndicator, WhiteSpace, WingBlank} from 'antd-mobile'
import TodoCard from '../../components/LogCard' import TodoCard from '../../components/LogCard'
import TopNotice from '../../components/NoticeTab' import TopNotice from '../../components/NoticeTab'
import axiosRequest from '../../utils/request'; import axiosRequest from '../../utils/request';
import Document from 'react-document-title'
const Notice = (props) => { const Notice = (props) => {
const [loading, setLoading] = useState(false); const [loading, setLoading] = useState(false);
...@@ -61,24 +62,26 @@ const Notice = (props) => { ...@@ -61,24 +62,26 @@ const Notice = (props) => {
getData() getData()
}, [searchWord, tab]) }, [searchWord, tab])
return ( return (
<WingBlank> <Document title="通知">
<ActivityIndicator <WingBlank>
toast <ActivityIndicator
text="加载中..." toast
animating={loading} text="加载中..."
/> animating={loading}
<WhiteSpace/> />
<TopNotice onSearch={setSearchWord} tabChange={tabChange}/> <WhiteSpace/>
{ <TopNotice onSearch={setSearchWord} tabChange={tabChange}/>
data.map((item, index) => ( {
<div key={index}> data.map((item, index) => (
<WhiteSpace/> <div key={index}>
<TodoCard data={item} onClick={checkLog}/> <WhiteSpace/>
</div> <TodoCard data={item} onClick={checkLog}/>
</div>
)) ))
} }
</WingBlank> </WingBlank>
</Document>
); );
}; };
......
...@@ -3,6 +3,7 @@ import {ActivityIndicator, WhiteSpace, WingBlank} from "antd-mobile"; ...@@ -3,6 +3,7 @@ import {ActivityIndicator, WhiteSpace, WingBlank} from "antd-mobile";
import axiosRequest from '../../utils/request'; import axiosRequest from '../../utils/request';
import TopSearch from '../../components/TopSearch' import TopSearch from '../../components/TopSearch'
import WorkCard from '../../components/WorkCard'; import WorkCard from '../../components/WorkCard';
import Document from 'react-document-title'
const Work = (props) => { const Work = (props) => {
const [loading, setLoading] = useState(false) const [loading, setLoading] = useState(false)
...@@ -55,24 +56,26 @@ const Work = (props) => { ...@@ -55,24 +56,26 @@ const Work = (props) => {
} }
return ( return (
<WingBlank> <Document title="工作">
<ActivityIndicator <WingBlank>
toast <ActivityIndicator
text="加载中..." toast
animating={loading} text="加载中..."
/> animating={loading}
<WhiteSpace/> />
<TopSearch onSearch={ workSearch }/> <WhiteSpace/>
<WhiteSpace/> <TopSearch onSearch={ workSearch }/>
<WorkCard <WhiteSpace/>
title="工作详情" <WorkCard
addCommon={ commonEdit } title="工作详情"
addStatus={addStatus} addCommon={ commonEdit }
data={data} addStatus={addStatus}
workUrl={workUrl} data={data}
iconAction={ itemAdd } workUrl={workUrl}
/> iconAction={ itemAdd }
</WingBlank> />
</WingBlank>
</Document>
); );
} }
......
...@@ -26,7 +26,7 @@ const ReactRouter = () => { ...@@ -26,7 +26,7 @@ const ReactRouter = () => {
<Route path="/login" component={Login} /> <Route path="/login" component={Login} />
<Route path="/bord" render={ () => <Route path="/bord" render={ () =>
<CommonLayout> <CommonLayout>
<Route path="/bord/backlog" component={Backlog} /> <Route path="/bord/backlog" component={Backlog}/>
<Route path="/bord/work" component={Work}/> <Route path="/bord/work" component={Work}/>
<Route path="/bord/address/:id" component={Communicate}/> <Route path="/bord/address/:id" component={Communicate}/>
<Route path="/bord/addressList" component={AddressBook}/> <Route path="/bord/addressList" component={AddressBook}/>
......
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