Skip to content

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

debug

parent 246a9cee
Pipeline #15300 failed with stages
        in 30 seconds
        Show whitespace changes
        Inline Side-by-side
        Showing with 102 additions and 48 deletions
        .idea/workspace.xml
        View file @ eef33c20
        ......@@ -2,7 +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/pages/Notice/Notice.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/Notice/Notice.jsx" afterDir="false" />
        <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
        <change beforePath="$PROJECT_DIR$/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/package-lock.json" afterDir="false" />
        <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" 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/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/" />
        ......@@ -27,8 +31,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="175">
        <caret line="31" column="80" selection-start-line="31" selection-start-column="80" selection-end-line="31" selection-end-column="80" />
        <state relative-caret-position="150">
        <caret line="51" column="68" selection-start-line="51" selection-start-column="68" selection-end-line="51" selection-end-column="68" />
        <folding>
        <element signature="e#0#49#0" expanded="true" />
        </folding>
        ......@@ -37,10 +41,34 @@
        </entry>
        </file>
        <file pinned="false" current-in-tab="true">
        <entry file="file://$PROJECT_DIR$/src/components/LogCard/index.jsx">
        <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="250">
        <caret line="34" column="191" selection-start-line="34" selection-start-column="191" selection-end-line="34" selection-end-column="191" />
        <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/instance.js">
        <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="-200">
        <caret line="58" column="59" lean-forward="true" selection-start-line="58" selection-start-column="59" selection-end-line="58" selection-end-column="59" />
        <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/pages/Notice/Notice.jsx">
        <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="175">
        <caret line="46" column="58" selection-start-line="46" selection-start-column="58" selection-end-line="46" selection-end-column="58" />
        <state relative-caret-position="200">
        <caret line="47" selection-start-line="47" selection-end-line="47" />
        <folding>
        <element signature="e#0#49#0" expanded="true" />
        </folding>
        ......@@ -52,7 +80,7 @@
        <entry file="file://$PROJECT_DIR$/src/components/NoticeTab/index.jsx">
        <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="375">
        <caret line="17" column="58" lean-forward="true" selection-start-line="17" selection-start-column="58" selection-end-line="17" selection-end-column="58" />
        <caret line="17" column="58" selection-start-line="17" selection-start-column="58" selection-end-line="17" selection-end-column="58" />
        </state>
        </provider>
        </entry>
        ......@@ -61,7 +89,7 @@
        <entry file="file://$PROJECT_DIR$/src/pages/Work/Work.jsx">
        <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="325">
        <caret line="28" column="28" lean-forward="true" selection-start-line="28" selection-start-column="28" selection-end-line="28" selection-end-column="28" />
        <caret line="28" column="28" selection-start-line="28" selection-start-column="28" selection-end-line="28" selection-end-column="28" />
        <folding>
        <element signature="e#0#51#0" expanded="true" />
        <element signature="e#154#204#0" expanded="true" />
        ......@@ -141,11 +169,11 @@
        <find>loadingCount</find>
        <find>setLoading</find>
        <find>console</find>
        <find>setEndT</find>
        <find>end</find>
        <find>setEnd</find>
        <find>loading</find>
        <find>document</find>
        <find>setEnd</find>
        <find>setEndT</find>
        </findStrings>
        <replaceStrings>
        <replace>this.props</replace>
        ......@@ -202,17 +230,17 @@
        <option value="$PROJECT_DIR$/src/pages/Notice/index.less" />
        <option value="$PROJECT_DIR$/src/pages/Backlog/index.less" />
        <option value="$PROJECT_DIR$/src/components/Skeleton/index.jsx" />
        <option value="$PROJECT_DIR$/src/utils/instance.js" />
        <option value="$PROJECT_DIR$/src/pages/Communicate/AddressBook.jsx" />
        <option value="$PROJECT_DIR$/src/components/LogCard/index.jsx" />
        <option value="$PROJECT_DIR$/src/components/WorkCard/CardItem.jsx" />
        <option value="$PROJECT_DIR$/src/pages/Work/Work.jsx" />
        <option value="$PROJECT_DIR$/src/pages/Communicate/Communicate.jsx" />
        <option value="$PROJECT_DIR$/src/components/Loading/index.jsx" />
        <option value="$PROJECT_DIR$/src/components/Loading/index.less" />
        <option value="$PROJECT_DIR$/src/pages/Backlog/Backlog.jsx" />
        <option value="$PROJECT_DIR$/src/pages/EventProcessing/Process.jsx" />
        <option value="$PROJECT_DIR$/src/pages/Notice/Notice.jsx" />
        <option value="$PROJECT_DIR$/src/pages/Backlog/Backlog.jsx" />
        <option value="$PROJECT_DIR$/src/utils/instance.js" />
        <option value="$PROJECT_DIR$/src/components/LogCard/index.jsx" />
        </list>
        </option>
        </component>
        ......@@ -247,6 +275,19 @@
        <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" />
        <item name="src" type="462c0819:PsiDirectoryNode" />
        <item name="components" type="462c0819:PsiDirectoryNode" />
        <item name="LogCard" type="462c0819:PsiDirectoryNode" />
        </path>
        <path>
        <item name="create-react-app" type="b2602c69:ProjectViewProjectNode" />
        <item name="create-react-app" type="462c0819:PsiDirectoryNode" />
        ......@@ -260,6 +301,12 @@
        <item name="pages" type="462c0819:PsiDirectoryNode" />
        <item name="Notice" 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>
        ......@@ -321,12 +368,12 @@
        <workItem from="1591579020550" duration="32744000" />
        <workItem from="1591665260536" duration="37378000" />
        <workItem from="1591751569364" duration="40213000" />
        <workItem from="1591837824022" duration="34382000" />
        <workItem from="1591837824022" duration="34988000" />
        </task>
        <servers />
        </component>
        <component name="TimeTrackingManager">
        <option name="totallyTimeSpent" value="247532000" />
        <option name="totallyTimeSpent" value="248138000" />
        </component>
        <component name="ToolWindowManager">
        <frame x="-8" y="-8" width="1382" height="784" extended-state="6" />
        ......@@ -658,17 +705,7 @@
        <entry file="file://$PROJECT_DIR$/src/components/NoticeTab/index.jsx">
        <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="375">
        <caret line="17" column="58" lean-forward="true" selection-start-line="17" selection-start-column="58" selection-end-line="17" selection-end-column="58" />
        </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="575">
        <caret line="23" column="65" selection-start-line="23" selection-start-column="65" selection-end-line="23" selection-end-column="65" />
        <folding>
        <element signature="e#0#26#0" expanded="true" />
        </folding>
        <caret line="17" column="58" selection-start-line="17" selection-start-column="58" selection-end-line="17" selection-end-column="58" />
        </state>
        </provider>
        </entry>
        ......@@ -679,16 +716,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="200">
        <caret line="35" lean-forward="true" selection-start-line="35" selection-end-line="35" />
        <folding>
        <element signature="e#0#26#0" expanded="true" />
        </folding>
        </state>
        </provider>
        </entry>
        <entry file="file://$PROJECT_DIR$/src/utils/utils.jsx">
        <provider selected="true" editor-type-id="text-editor" />
        </entry>
        ......@@ -715,7 +742,7 @@
        <entry file="file://$PROJECT_DIR$/src/pages/Work/Work.jsx">
        <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="325">
        <caret line="28" column="28" lean-forward="true" selection-start-line="28" selection-start-column="28" selection-end-line="28" selection-end-column="28" />
        <caret line="28" column="28" selection-start-line="28" selection-start-column="28" selection-end-line="28" selection-end-column="28" />
        <folding>
        <element signature="e#0#51#0" expanded="true" />
        <element signature="e#154#204#0" expanded="true" />
        ......@@ -747,29 +774,49 @@
        </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="50">
        <caret line="2" column="42" selection-start-line="2" selection-start-column="42" selection-end-line="2" selection-end-column="42" />
        </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="200">
        <caret line="47" selection-start-line="47" selection-end-line="47" />
        <folding>
        <element signature="e#0#49#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="175">
        <caret line="31" column="80" selection-start-line="31" selection-start-column="80" selection-end-line="31" selection-end-column="80" />
        <state relative-caret-position="150">
        <caret line="51" column="68" selection-start-line="51" selection-start-column="68" selection-end-line="51" selection-end-column="68" />
        <folding>
        <element signature="e#0#49#0" expanded="true" />
        </folding>
        </state>
        </provider>
        </entry>
        <entry file="file://$PROJECT_DIR$/src/pages/EventProcessing/Process.jsx">
        <entry file="file://$PROJECT_DIR$/src/utils/instance.js">
        <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="50">
        <caret line="2" column="42" selection-start-line="2" selection-start-column="42" selection-end-line="2" selection-end-column="42" />
        <state relative-caret-position="-200">
        <caret line="58" column="59" lean-forward="true" selection-start-line="58" selection-start-column="59" selection-end-line="58" selection-end-column="59" />
        <folding>
        <element signature="e#0#26#0" expanded="true" />
        </folding>
        </state>
        </provider>
        </entry>
        <entry file="file://$PROJECT_DIR$/src/pages/Notice/Notice.jsx">
        <entry file="file://$PROJECT_DIR$/src/components/LogCard/index.jsx">
        <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="175">
        <caret line="46" column="58" selection-start-line="46" selection-start-column="58" selection-end-line="46" selection-end-column="58" />
        <state relative-caret-position="250">
        <caret line="34" column="191" selection-start-line="34" selection-start-column="191" selection-end-line="34" selection-end-column="191" />
        <folding>
        <element signature="e#0#49#0" expanded="true" />
        <element signature="e#0#26#0" expanded="true" />
        </folding>
        </state>
        </provider>
        ......
        package-lock.json
        View file @ eef33c20
        ......@@ -7285,6 +7285,11 @@
        "minimist": "^1.2.5"
        }
        },
        "moment": {
        "version": "2.26.0",
        "resolved": "https://registry.npm.taobao.org/moment/download/moment-2.26.0.tgz",
        "integrity": "sha1-Xh+Cxrr8pug+gIswyHBe7Q3L05o="
        },
        "ms": {
        "version": "2.0.0",
        "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fms%2Fdownload%2Fms-2.0.0.tgz",
        ......
        package.json
        View file @ eef33c20
        ......@@ -9,6 +9,7 @@
        "customize-cra": "^1.0.0",
        "http-proxy-middleware": "^1.0.4",
        "lib-flexible": "^0.3.2",
        "moment": "^2.26.0",
        "postcss-px2rem": "^0.3.0",
        "qs": "^6.9.4",
        "react": "^16.8.4",
        ......
        src/components/LogCard/index.jsx
        View file @ eef33c20
        import React from 'react';
        import moment from 'moment'
        import './index.less'
        const Index = (props) => {
        ......@@ -31,8 +32,8 @@ const Index = (props) => {
        </div>
        <div className="todo-footer">
        <div>
        <p className="pos-aline"><img alt="" src="/img/time.png" className="footer-mes-img"/>更新时间：2020-05-26 17:51</p>
        <p className="pos-aline footer-mes-sec"><img alt="" src="/img/time-2.png" className="footer-mes-img"/>停滞时间：24h</p>
        <p className="pos-aline"><img alt="" src="/img/time.png" className="footer-mes-img"/>更新时间：{data.RECEIVEDATE && moment(data.RECEIVEDATE).format("YYYY-MM-DD HH:mm:ss") || ''}</p>
        <p className="pos-aline footer-mes-sec"><img alt="" src="/img/time-2.png" className="footer-mes-img"/>发起时间：{data.SENDTIME && moment(data.SENDTIME).format("YYYY-MM-DD HH:mm:ss") || ''}</p>
        </div>
        <img
        alt=""
        ......
        src/utils/instance.js
        View file @ eef33c20
        ......@@ -52,7 +52,7 @@ export const createAPI = (baseURL) => {
        // console.log(response)
        if (!response || !response.data) {
        response.code === 'idt-core-500' && (window.location.href = '/login')
        response.message === '票据已经失效' && (window.location.href = '/login')
        console.log('response出错, 无返回数据！', response); return false;
        };
        if (response.data && response.data.errorMessage) {
        ......
        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