From cf472e7a26c5f785d0d9ba1958b1cb228d2f4bfa Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Wed, 29 Nov 2023 15:20:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E6=9D=A1=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/NewAndEditDialog.js | 2 +- .../components/company/company.js | 7 ----- .../components/resource/ResourceCard.js | 2 +- .../components/resource/resource.js | 2 -- pc4mobx/organization/stores/resource.js | 1 - pc4mobx/organization/style/card.less | 7 ++--- pc4mobx/organization/style/index.less | 26 +++++++++---------- pc4mobx/organization/style/resume.less | 2 +- 8 files changed, 17 insertions(+), 32 deletions(-) diff --git a/pc4mobx/organization/components/NewAndEditDialog.js b/pc4mobx/organization/components/NewAndEditDialog.js index c9e24d6..51a984e 100644 --- a/pc4mobx/organization/components/NewAndEditDialog.js +++ b/pc4mobx/organization/components/NewAndEditDialog.js @@ -20,7 +20,7 @@ import { i18n } from '../public/i18n'; import AttachToNumberField from './NewNumberField'; -import "../style/common.less"; + export default class NewAndEditDialog extends React.Component { constructor(props) { diff --git a/pc4mobx/organization/components/company/company.js b/pc4mobx/organization/components/company/company.js index 3cf53da..b4c7e35 100644 --- a/pc4mobx/organization/components/company/company.js +++ b/pc4mobx/organization/components/company/company.js @@ -1,10 +1,3 @@ -/** - * @Author: 程亮 - * @Date: 2022-05-18 16:23:32 - * @LastEditTime: 2023-08-08 11:23:40 - * @Description: - * @FilePath: /trunk/src4js/pc4mobx/organization/components/company/company.js - */ import React from 'react' import * as mobx from 'mobx' import { diff --git a/pc4mobx/organization/components/resource/ResourceCard.js b/pc4mobx/organization/components/resource/ResourceCard.js index 9e3907d..e9b13b4 100644 --- a/pc4mobx/organization/components/resource/ResourceCard.js +++ b/pc4mobx/organization/components/resource/ResourceCard.js @@ -32,7 +32,7 @@ import { i18n } from '../../public/i18n'; -import '../../style/card.less'; + import FormItem from './FormItem'; import IframeItem from './IframeItem'; import AnchorDetect from './AnchorDetect'; diff --git a/pc4mobx/organization/components/resource/resource.js b/pc4mobx/organization/components/resource/resource.js index 56a3ed3..d20a5f6 100644 --- a/pc4mobx/organization/components/resource/resource.js +++ b/pc4mobx/organization/components/resource/resource.js @@ -35,8 +35,6 @@ import { i18n } from '../../public/i18n'; -//import '../../style/common.less'; -import '../../style/resource.less'; import NewAndEditDialog from '../NewAndEditDialog'; import { renderNoright } from '../../util'; diff --git a/pc4mobx/organization/stores/resource.js b/pc4mobx/organization/stores/resource.js index 27da720..681bddf 100644 --- a/pc4mobx/organization/stores/resource.js +++ b/pc4mobx/organization/stores/resource.js @@ -109,7 +109,6 @@ export class ResourceStore { @action("列表") getTableInfo() { this.tableStore = new TableStore(); let params = {}; - debugger; if(this.isEmptyObject(this.radioParams)) { params = { ...this.selectTreeNodeInfo, diff --git a/pc4mobx/organization/style/card.less b/pc4mobx/organization/style/card.less index 32624a4..f98d1a4 100644 --- a/pc4mobx/organization/style/card.less +++ b/pc4mobx/organization/style/card.less @@ -1,7 +1,4 @@ -// #container { -// background-color: #e5eaf2; -// } //我的卡片样式 .gutter-resource-card { display: flex; @@ -209,9 +206,9 @@ } } - .scroll-spin { +.scroll-spin { margin-left: 50%; - } +} diff --git a/pc4mobx/organization/style/index.less b/pc4mobx/organization/style/index.less index 35ab4ac..f57d0b9 100644 --- a/pc4mobx/organization/style/index.less +++ b/pc4mobx/organization/style/index.less @@ -22,26 +22,25 @@ body { color: #333333; } +// 字体设置 +// div,span { +// font-size: 16px !important; +// } -#container, -body, -html { + +#container { height: 100%; overflow: scroll !important; scrollbar-width: none; //火狐滚动条处理 - + ::-webkit-scrollbar { + width: 0px; + height: 0px; + background-color: transparent; + } } -::-webkit-scrollbar { - width: 0px; - height: 0px; - background-color: transparent; - display: none; -} - - //列表滚动条 -.wea-new-table { +.wea-new-table,.wea-table-edit { ::-webkit-scrollbar { width: 10px !important; height: 10px !important; @@ -49,7 +48,6 @@ html { } /*定义滚动条轨道 内阴影+圆角*/ ::-webkit-scrollbar-track { - -webkit-box-shadow: transparent; background-color: transparent; } /*定义滑块 内阴影+圆角*/ diff --git a/pc4mobx/organization/style/resume.less b/pc4mobx/organization/style/resume.less index cb6b315..419010e 100644 --- a/pc4mobx/organization/style/resume.less +++ b/pc4mobx/organization/style/resume.less @@ -21,7 +21,7 @@ text-align: center; } .resume-table { - margin-top: 20px; + margin: 20px auto; .photos{ width: 100px; height: 120px;