From edd7e4c2a669ad42ecb7f6a04b2ca63b48241bf0 Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Tue, 18 Oct 2022 13:58:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=8D=A1=E7=89=87=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E9=87=8D=E5=81=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/organization/apis/resourceCard.js | 8 + .../components/company/CompanyExtend.js | 5 +- .../components/newImport/stepDialog.js | 3 + .../components/resource/IframeItem.js | 17 +- .../components/resource/ResourceCard.js | 316 ++++++++-------- .../components/resource/ResourceExtend.js | 44 +-- .../components/resource/resource.js | 83 +---- pc4mobx/organization/images/workflow.jpg | Bin 37548 -> 33032 bytes pc4mobx/organization/index.js | 2 +- pc4mobx/organization/stores/resourceCard.js | 342 ++++++++++-------- pc4mobx/organization/stores/resourceExtend.js | 10 +- pc4mobx/organization/style/card.less | 4 +- 12 files changed, 414 insertions(+), 420 deletions(-) diff --git a/pc4mobx/organization/apis/resourceCard.js b/pc4mobx/organization/apis/resourceCard.js index e69de29..6f49c60 100644 --- a/pc4mobx/organization/apis/resourceCard.js +++ b/pc4mobx/organization/apis/resourceCard.js @@ -0,0 +1,8 @@ + +import { + WeaTools +} from 'ecCom' + +export const getCardData = (id) => { + return WeaTools.callApi(`/api/bs/hrmorganization/personnelcard/getPersonnelCard?id=${id}`, 'GET'); +} diff --git a/pc4mobx/organization/components/company/CompanyExtend.js b/pc4mobx/organization/components/company/CompanyExtend.js index a3c903c..c2d8a78 100644 --- a/pc4mobx/organization/components/company/CompanyExtend.js +++ b/pc4mobx/organization/components/company/CompanyExtend.js @@ -1,7 +1,7 @@ /** * @Author: 程亮 * @Date: 2022-05-18 14:52:39 - * @LastEditTime: 2022-09-08 17:11:51 + * @LastEditTime: 2022-10-12 18:01:56 * @Description: * @FilePath: /trunk/src4js/pc4mobx/organization/components/company/CompanyExtend.js */ @@ -277,7 +277,8 @@ export default class CompanyExtend extends React.Component { ) - } catch (e) { + } + catch (e) { return
{i18n.message.authFailed()}
diff --git a/pc4mobx/organization/components/newImport/stepDialog.js b/pc4mobx/organization/components/newImport/stepDialog.js index 957caa3..b59f128 100644 --- a/pc4mobx/organization/components/newImport/stepDialog.js +++ b/pc4mobx/organization/components/newImport/stepDialog.js @@ -26,6 +26,7 @@ import { const Step = Steps.Step; import StepContent from './stepContent'; +import "../../style/common.less"; @inject("newImport") @observer @@ -71,6 +72,7 @@ export default class StepDialog extends React.Component { return ( newImport.init()} buttons={buttons} style={{ width: width, height: height }} + initLoadCss >
diff --git a/pc4mobx/organization/components/resource/IframeItem.js b/pc4mobx/organization/components/resource/IframeItem.js index ee8ccf1..b8e65ee 100644 --- a/pc4mobx/organization/components/resource/IframeItem.js +++ b/pc4mobx/organization/components/resource/IframeItem.js @@ -28,13 +28,24 @@ export default class IframeItem extends React.Component { } = this.state; return ( -
+

{iframeInfo.title}

-
-