Skip to content

F
frontend
Commit 186034f2 authored by 熊成伟's avatar 熊成伟
Browse files
Options

debug

parent b475f9de
Hide whitespace changes
Inline Side-by-side
Showing with 145 additions and 103 deletions
.idea/workspace.xml
View file @ 186034f2
......@@ -3,8 +3,17 @@
<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$/public/img/footer-work-s.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/public/img/footer-work.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/Steps/index.jsx" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/Steps/index.less" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/TodoCard/index.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/LogCard/index.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/TodoCard/index.less" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/LogCard/index.less" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/TopNotice/index.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/NoticeTab/index.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/TopNotice/index.less" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/NoticeTab/index.less" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/TopTabs/index.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/BlankTabs/index.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/TopTabs/index.less" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/BlankTabs/index.less" 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/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" />
<change beforePath="$PROJECT_DIR$/src/router.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/router.js" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
......@@ -19,10 +28,10 @@
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/components/TodoCard/index.jsx">
<entry file="file://$PROJECT_DIR$/src/components/LogCard/index.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="350">
<caret line="14" column="28" selection-start-line="14" selection-start-column="28" selection-end-line="14" selection-end-column="28" />
<state relative-caret-position="50">
<caret line="2" lean-forward="true" selection-start-line="2" selection-end-line="2" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
......@@ -64,33 +73,67 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/img/footer-work.png">
<provider selected="true" editor-type-id="images" />
<entry file="file://$PROJECT_DIR$/src/router.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="350">
<caret line="32" column="44" selection-start-line="32" selection-start-column="44" selection-end-line="32" selection-end-column="48" />
<folding>
<element signature="e#0#25#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/../frontend/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="200">
<caret line="8" selection-start-line="8" selection-end-line="8" selection-end-column="58" />
<state relative-caret-position="75">
<caret line="10" column="65" selection-start-line="10" selection-start-column="65" selection-end-line="10" selection-end-column="65" />
<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/router.js">
<entry file="file://$PROJECT_DIR$/src/components/BlankTabs/index.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="8" column="58" selection-start-line="8" selection-start-column="58" selection-end-line="8" selection-end-column="58" />
<state relative-caret-position="350">
<caret line="16" column="27" selection-start-line="16" selection-start-column="27" selection-end-line="16" selection-end-column="27" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/pages/Communicate/Communicate.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1500">
<caret column="39" selection-start-column="39" selection-end-column="39" />
<state relative-caret-position="225">
<caret line="9" column="47" selection-start-line="9" selection-start-column="47" selection-end-line="9" selection-end-column="47" />
<folding>
<element signature="e#0#39#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<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="250">
<caret line="13" column="44" selection-start-line="13" selection-start-column="44" selection-end-line="13" selection-end-column="44" />
</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>
......@@ -100,9 +143,9 @@
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
<option value="Less File" />
<option value="React jsx" />
<option value="JavaScript File" />
<option value="Less File" />
</list>
</option>
</component>
......@@ -151,8 +194,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/public/manifest.json" />
<option value="$PROJECT_DIR$/src/Pages/Notice/Notice.jsx" />
<option value="$PROJECT_DIR$/src/components/TopTabs/index.less" />
<option value="$PROJECT_DIR$/src/index.js" />
<option value="$PROJECT_DIR$/config-overrides.js" />
......@@ -196,12 +237,14 @@
<option value="$PROJECT_DIR$/public/index.html" />
<option value="$PROJECT_DIR$/src/components/TodoCard/index.less" />
<option value="$PROJECT_DIR$/src/components/TodoCard/index.jsx" />
<option value="$PROJECT_DIR$/src/pages/Backlog/Backlog.jsx" />
<option value="$PROJECT_DIR$/src/layout/Footer.jsx" />
<option value="$PROJECT_DIR$/src/layout/index.less" />
<option value="$PROJECT_DIR$/src/layout/CommonLayout.jsx" />
<option value="$PROJECT_DIR$/src/router.js" />
<option value="$PROJECT_DIR$/src/pages/Communicate/Communicate.jsx" />
<option value="$PROJECT_DIR$/src/pages/Communicate/index.less" />
<option value="$PROJECT_DIR$/src/router.js" />
<option value="$PROJECT_DIR$/src/components/LogCard/index.jsx" />
<option value="$PROJECT_DIR$/src/pages/Backlog/Backlog.jsx" />
</list>
</option>
</component>
......@@ -232,6 +275,12 @@
<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="components" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="create-react-app" type="b2602c69:ProjectViewProjectNode" />
<item name="create-react-app" type="462c0819:PsiDirectoryNode" />
......@@ -243,7 +292,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" />
<item name="Backlog" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
......@@ -299,12 +348,12 @@
<workItem from="1591406085733" duration="5474000" />
<workItem from="1591419899087" duration="268000" />
<workItem from="1591493817957" duration="11217000" />
<workItem from="1591579020550" duration="10701000" />
<workItem from="1591579020550" duration="11352000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="113516000" />
<option name="totallyTimeSpent" value="114167000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="784" extended-state="6" />
......@@ -335,12 +384,6 @@
<option name="version" value="1" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/public/img/unread.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/public/img/urgency.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/public/img/serious.png">
<provider selected="true" editor-type-id="images" />
</entry>
......@@ -387,16 +430,6 @@
<entry file="file://$PROJECT_DIR$/src/pages/WorkDetail/WorkDetail.jsx">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/components/StepCard/index.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="10" column="65" selection-start-line="10" selection-start-column="65" selection-end-line="10" selection-end-column="65" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/img/process-edit.png">
<provider selected="true" editor-type-id="images" />
</entry>
......@@ -424,16 +457,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/TopTabs/index.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="16" column="27" selection-start-line="16" selection-start-column="27" selection-end-line="16" selection-end-column="27" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</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="248">
......@@ -550,7 +573,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/TodoCard/index.less">
<entry file="file://$PROJECT_DIR$/src/components/LogCard/index.less">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="350">
<caret line="17" column="20" selection-start-line="17" selection-start-column="20" selection-end-line="17" selection-end-column="20" />
......@@ -582,13 +605,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="325">
<caret line="16" column="37" selection-start-line="16" selection-start-column="37" selection-end-line="16" selection-end-column="37" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/TopSearch/index.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-241">
......@@ -636,16 +652,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/TodoCard/index.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="350">
<caret line="14" column="28" selection-start-line="14" selection-start-column="28" selection-end-line="14" selection-end-column="28" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/layout/CommonLayout.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
......@@ -666,17 +672,76 @@
</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/router.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="8" column="58" selection-start-line="8" selection-start-column="58" selection-end-line="8" selection-end-column="58" />
<state relative-caret-position="350">
<caret line="32" column="44" selection-start-line="32" selection-start-column="44" selection-end-line="32" selection-end-column="48" />
<folding>
<element signature="e#0#25#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/Steps/index.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-16">
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</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="75">
<caret line="10" column="65" selection-start-line="10" selection-start-column="65" selection-end-line="10" selection-end-column="65" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/BlankTabs/index.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="350">
<caret line="16" column="27" selection-start-line="16" selection-start-column="27" selection-end-line="16" selection-end-column="27" />
<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="-1500">
<caret column="39" selection-start-column="39" selection-end-column="39" />
<state relative-caret-position="225">
<caret line="9" column="47" selection-start-line="9" selection-start-column="47" selection-end-line="9" selection-end-column="47" />
<folding>
<element signature="e#0#39#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="50">
<caret line="2" lean-forward="true" selection-start-line="2" selection-end-line="2" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</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="250">
<caret line="13" column="44" selection-start-line="13" selection-start-column="44" selection-end-line="13" selection-end-column="44" />
</state>
</provider>
</entry>
......
src/components/TodoCard/index.jsx → src/components/LogCard/index.jsx
View file @ 186034f2
......@@ -3,7 +3,7 @@ import './index.less'
const Index = (props) => {
return (
<div className="todo-card" onClick={props.onCLick}>
<div className="todo-card" onClick={props.onClick}>
<div className="todo-title pos-aline">
<div className="pos-aline">
<div className="todo-tag pos-aline">
......
src/components/Steps/index.jsx deleted 100644 → 0
View file @ b475f9de
import React from 'react';
import {Steps, Icon} from 'antd-mobile'
const Step = Steps.Step;
// const data = [{}, {current: true}, {}]
const Index = (props) => {
return (
<Steps direction={props.direction} current={3}>
<Step icon={<Icon type="check-circle" size="xxs"/>} />
<Step icon={<Icon type="check-circle" size="xxs"/>}/>
<Step status="error" icon={<Icon type="check-circle" size="xxs"/>}/>
{/*<Step icon={<div style={{width: 17, height: 17, borderRadius: '50%', background: 'gray'}}/>}/>*/}
</Steps>
);
};
export default Index;
src/components/Steps/index.less deleted 100644 → 0
View file @ b475f9de
.step_success{
width: 16.7px;
height: 16.7px;
border-radius: 50%;
}
src/pages/Backlog/Backlog.jsx
View file @ 186034f2
import React, {Component} from 'react';
import {WhiteSpace, WingBlank, ActivityIndicator} from 'antd-mobile'
import TodoCard from '../../components/TodoCard'
import TodoCard from '../../components/LogCard'
import TopSearch from '../../components/TopSearch'
class Index extends Component {
......@@ -11,7 +11,7 @@ class Index extends Component {
};
};
checkLog = () => {
this.props.history.push(`/blank/example/1`)
this.props.history.push(`/blank/info/example/1`)
}
render() {
const {loading} = this.state;
......@@ -28,7 +28,7 @@ class Index extends Component {
[{},{},{},{},{},{}].map((item, index) => (
<div key={index}>
<WhiteSpace/>
<TodoCard data={item} onCLick={this.checkLog}/>
<TodoCard data={item} onClick={this.checkLog}/>
</div>
))
......
src/pages/EventProcessing/Process.jsx
View file @ 186034f2
import React, {Component} from 'react';
import {WingBlank, WhiteSpace, ActionSheet, ActivityIndicator} from 'antd-mobile'
import './index.less'
import TopTabs from '../../components/TopTabs'
import TopTabs from '../../components/BlankTabs'
import Basic from './Basic'
import Adjunct from './Adjunct'
import Flow from './Flow';
......
src/pages/Notice/Notice.jsx
View file @ 186034f2
import React, {Component} from 'react';
import {ActivityIndicator, WhiteSpace, WingBlank} from 'antd-mobile'
import TodoCard from '../../components/TodoCard'
import TopNotice from '../../components/TopNotice'
import TodoCard from '../../components/LogCard'
import TopNotice from '../../components/NoticeTab'
......
src/router.js
View file @ 186034f2
......@@ -30,7 +30,7 @@ const ReactRouter = () => {
}/>
<Route path="/blank" component={() =>
<BlankLayout>
<Route path="/blank/:name/:id" component={Process}/>
<Route path="/blank/info/:name/:id" component={Process}/>
</BlankLayout>
}/>
<Route component={NoFound}/>
......
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