Skip to content

C
CivManage
Commit 76477a88 authored by 邓超's avatar 邓超
Browse files
Options

Merge remote-tracking branch 'remotes/origin/styleEditBranch'

# Conflicts: # src/pages/bsmanager/workOrder/incident/AddModal.jsx # src/pages/database/ManagementDataBase/ManagementDataBase.jsx # src/pages/platformCenter/gis/schemeConfig/SchemeConfig.less
parents 3bf666bf 709086c9
Pipeline #61451 waiting for manual action with stages
          Expand all Hide whitespace changes
          Inline Side-by-side
          Showing with 1524 additions and 805 deletions
          src/components/BasePageContainer/index.less
          View file @ 76477a88
          ...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
          } }
          .ant-layout .ant-layout-content { .ant-layout .ant-layout-content {
          margin: 0px !important; margin: 12px;
          } }
          .ant-pro-page-container { .ant-pro-page-container {
          ......
          src/components/RolePmSite/index.less
          View file @ 76477a88
          ...@@ -2,16 +2,20 @@ ...@@ -2,16 +2,20 @@
          .ant-modal-body { .ant-modal-body {
          padding: 0; padding: 0;
          } }
          .ant-modal-header { .ant-modal-header {
          padding: 28px 16px; padding: 28px 16px;
          } }
          .pageContent { .pageContent {
          display: flex; display: flex;
          height: 100%; height: 100%;
          .optionalList { .optionalList {
          position: relative; position: relative;
          width: 60%; width: 68%;
          border-right: 1px solid #e7e7e7; border-right: 1px solid #e7e7e7;
          .title { .title {
          position: absolute; position: absolute;
          left: 17px; left: 17px;
          ...@@ -21,18 +25,22 @@ ...@@ -21,18 +25,22 @@
          z-index: 1; z-index: 1;
          color: #00070d; color: #00070d;
          } }
          .tabContent { .tabContent {
          height: 590px; height: 590px;
          .ant-tabs-content-holder { .ant-tabs-content-holder {
          height: 523px; height: 523px;
          } }
          } }
          .searchInput { .searchInput {
          position: absolute; position: absolute;
          width: 200px; width: 200px;
          z-index: 1; z-index: 1;
          top: 3px; top: 3px;
          right: 40px; right: 40px;
          .anticon svg { .anticon svg {
          margin-top: 0px; margin-top: 0px;
          } }
          ...@@ -42,26 +50,33 @@ ...@@ -42,26 +50,33 @@
          border-top-left-radius: 20px; border-top-left-radius: 20px;
          border-bottom-left-radius: 20px; border-bottom-left-radius: 20px;
          } }
          .ant-input-group-addon { .ant-input-group-addon {
          border-top-right-radius: 20px; border-top-right-radius: 20px;
          border-bottom-right-radius: 20px; border-bottom-right-radius: 20px;
          } }
          .ant-input-search-button { .ant-input-search-button {
          width: 40px; width: 40px;
          border-top-right-radius: 20px; border-top-right-radius: 20px;
          border-bottom-right-radius: 20px; border-bottom-right-radius: 20px;
          } }
          } }
          .checkContent { .checkContent {
          display: flex; display: flex;
          flex-wrap: wrap; flex-wrap: wrap;
          margin-left: 32px; margin-left: 32px;
          height: 525px;
          overflow-y: scroll;
          .check { .check {
          .ant-checkbox-wrapper { .ant-checkbox-wrapper {
          width: 180px; width: 180px;
          margin-bottom: 10px; margin-bottom: 10px;
          margin-left: 6px; margin-left: 6px;
          } }
          .ant-checkbox-wrapper span { .ant-checkbox-wrapper span {
          max-width: 160px; max-width: 160px;
          overflow: hidden; overflow: hidden;
          ...@@ -70,21 +85,26 @@ ...@@ -70,21 +85,26 @@
          } }
          } }
          } }
          .footer { .footer {
          padding-left: 25px; padding-left: 25px;
          .ant-pagination { .ant-pagination {
          border: none; border: none;
          } }
          } }
          .ant-tabs-nav { .ant-tabs-nav {
          background-color: #f2f1f1; background-color: #f2f1f1;
          } }
          .ant-tabs-tab { .ant-tabs-tab {
          background-color: #f2f1f1; background-color: #f2f1f1;
          color: #666666; color: #666666;
          border-top-left-radius: 5px; border-top-left-radius: 5px;
          border-top-right-radius: 5px; border-top-right-radius: 5px;
          } }
          .ant-tabs-tab-active { .ant-tabs-tab-active {
          background-color: #fff; background-color: #fff;
          color: #1685ff; color: #1685ff;
          ...@@ -92,6 +112,7 @@ ...@@ -92,6 +112,7 @@
          border-top-right-radius: 5px; border-top-right-radius: 5px;
          } }
          } }
          .selectedList { .selectedList {
          position: relative; position: relative;
          width: 40%; width: 40%;
          ...@@ -100,6 +121,7 @@ ...@@ -100,6 +121,7 @@
          height: 40px; height: 40px;
          width: 100%; width: 100%;
          background-color: #f2f1f1; background-color: #f2f1f1;
          .title { .title {
          position: absolute; position: absolute;
          left: 17px; left: 17px;
          ...@@ -109,16 +131,19 @@ ...@@ -109,16 +131,19 @@
          z-index: 1; z-index: 1;
          color: #00070d; color: #00070d;
          } }
          .tagHead { .tagHead {
          display: flex; display: flex;
          position: absolute; position: absolute;
          top: 10px; top: 10px;
          left: 88px; left: 88px;
          .tagContent { .tagContent {
          display: flex; display: flex;
          align-items: center; align-items: center;
          margin-right: 11px; margin-right: 11px;
          } }
          .tagRol, .tagRol,
          .tagOrg, .tagOrg,
          .tagSite { .tagSite {
          ...@@ -127,25 +152,31 @@ ...@@ -127,25 +152,31 @@
          margin-right: 5px; margin-right: 5px;
          } }
          .tagRol { .tagRol {
          background-color: #87e8de; background-color: #87e8de;
          } }
          .tagOrg { .tagOrg {
          background-color: #ffd591; background-color: #ffd591;
          } }
          .tagSite { .tagSite {
          background-color: #a785dd; background-color: #a785dd;
          } }
          } }
          } }
          .selectBox { .selectBox {
          height: 528px; height: 528px;
          padding: 10px; padding: 10px;
          overflow-y: scroll; overflow-y: scroll;
          .selectContent { .selectContent {
          display: flex; display: flex;
          flex-wrap: wrap; flex-wrap: wrap;
          flex-direction: row; flex-direction: row;
          .selectValue { .selectValue {
          margin-bottom: 15px; margin-bottom: 15px;
          } }
          ...@@ -153,11 +184,13 @@ ...@@ -153,11 +184,13 @@
          } }
          } }
          } }
          .ant-empty-normal { .ant-empty-normal {
          margin: auto; margin: auto;
          } }
          .ant-divider-horizontal { .ant-divider-horizontal {
          margin-top: 0px; margin-top: 0px;
          margin-bottom: 10px; margin-bottom: 10px;
          } }
          } }
          \ No newline at end of file
          src/components/Upload/index.tsx
          View file @ 76477a88
          ...@@ -465,7 +465,7 @@ class PicturesWall extends React.Component<PicturesWallType> { ...@@ -465,7 +465,7 @@ class PicturesWall extends React.Component<PicturesWallType> {
          onChange={e => this.setState({search: e.target.value})} onChange={e => this.setState({search: e.target.value})}
          allowClear/> allowClear/>
          {/* <Search style ={{ width:'200px',margin: '10px 0 10px 100px'}} onSearch={onSearch} /> */} {/* <Search style ={{ width:'200px',margin: '10px 0 10px 100px'}} onSearch={onSearch} /> */}
          <Tabs defaultActiveKey={imgBed[0]?.moduleName} tabPosition="left" style={{ height: 520}}> <Tabs defaultActiveKey={imgBed[0]?.moduleName} tabPosition="left" style={{ height: 520, overflowY:'scroll'}}>
          {imgBed.map((item, i) => { {imgBed.map((item, i) => {
          if (item.moduleName == picType || item.moduleName == 'CityTemp') { if (item.moduleName == picType || item.moduleName == 'CityTemp') {
          const child = [...item.child] || []; const child = [...item.child] || [];
          ......
          src/global.less
          View file @ 76477a88
          ...@@ -12,6 +12,11 @@ body, ...@@ -12,6 +12,11 @@ body,
          .ant-layout { .ant-layout {
          min-height: 100vh; min-height: 100vh;
          overflow: auto;
          .ant-layout-content {
          margin: 12px;
          }
          } }
          canvas { canvas {
          ...@@ -38,12 +43,15 @@ iframe { ...@@ -38,12 +43,15 @@ iframe {
          .ant-table { .ant-table {
          width: 100%; width: 100%;
          overflow-x: auto; overflow-x: auto;
          &-thead > tr,
          &-tbody > tr { &-thead>tr,
          > th, &-tbody>tr {
          > td {
          >th,
          >td {
          white-space: pre; white-space: pre;
          > span {
          >span {
          display: block; display: block;
          } }
          } }
          ...@@ -52,19 +60,112 @@ iframe { ...@@ -52,19 +60,112 @@ iframe {
          } }
          // 兼容IE11 // 兼容IE11
          @media screen and(-ms-high-contrast: active), (-ms-high-contrast: none) { @media screen and(-ms-high-contrast: active),
          body .ant-design-pro > .ant-layout { (-ms-high-contrast: none) {
          body .ant-design-pro>.ant-layout {
          min-height: 100vh; min-height: 100vh;
          } }
          } }
          .ant-pro-global-header-layout-side>div:first-child /deep/{
          .ant-pro-global-header-layout-side>div:first-child /deep/ {
          flex: 0 !important; flex: 0 !important;
          } }
          iframe{
          iframe {
          border: none !important; border: none !important;
          } }
          :global{
          .ant-tree-node-content-wrapper .anticon-folder, .ant-tree-icon__customize, .ant-tree-switcher-icon{ :global {
          color: #1890ff !important;
          ::-webkit-scrollbar {
          height: 6px; //x轴滚动条粗细
          width: 6px; //y轴滚动条粗细
          border-bottom: 2px solid white;
          } }
          }
          //滚动条里面的小方块，能上下左右移动（取决于是垂直滚动条还是水平滚动条）
          ::-webkit-scrollbar-thumb {
          border-radius: 10px;
          box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.1);
          background: rgba(74, 74, 75, 0.3);
          margin-bottom: 10px;
          }
          //滚动条的轨道（里面装有thumb）滚动槽
          ::-webkit-scrollbar-track {
          box-shadow: 0;
          border-radius: 0;
          background: white; //滚动槽背景色
          border-radius: 10px; //滚动条边框半径设置
          }
          .ant-table-body {
          border-right: 1px solid rgb(240, 240, 240);
          }
          .ant-table-cell {
          overflow: hidden;
          white-space: nowrap;
          }
          .ant-tree.ant-tree-block-node .ant-tree-list-holder-inner .ant-tree-node-content-wrapper {
          line-height: 28px;
          width: 0;
          }
          .ant-tree-drop-indicator {
          bottom: 3px;
          margin-left: 6px;
          }
          .ant-tree-draggable-icon {
          display: none;
          }
          .ant-tree-switcher-icon svg {
          font-size: 14px;
          color: #767777;
          }
          .ant-table-pagination {
          padding-right: 12px;
          background: white;
          margin: 1px 0;
          padding: 8px;
          padding-right: 20px;
          }
          .ant-pagination {
          padding-right: 12px;
          background: white;
          margin: 1px 0;
          padding: 8px;
          padding-right: 20px;
          }
          .ant-tree-node-content-wrapper .anticon-folder,
          .ant-tree-icon__customize,
          .ant-tree-switcher-icon {
          color: #1890ff;
          }
          .ant-tree-node-content-wrapper {
          width: 100%;
          .ant-tree-title {
          overflow: hidden;
          text-overflow: ellipsis;
          white-space: nowrap;
          display: block;
          }
          }
          .ant-spin-nested-loading {
          height: 100%;
          }
          .ant-spin-container {
          height: 100%;
          }
          }
          \ No newline at end of file
          src/pages/bsmanager/base/standingBook/standingBook.jsx
          View file @ 76477a88
          ...@@ -370,7 +370,7 @@ const StandingBook = props => { ...@@ -370,7 +370,7 @@ const StandingBook = props => {
          > >
          {treeVisible ? ( {treeVisible ? (
          <> <>
          <div> <div style={{ width: '214px', height: '100%' }}>
          <span <span
          style={{ style={{
          fontSize: '15px ', fontSize: '15px ',
          ...@@ -396,7 +396,7 @@ const StandingBook = props => { ...@@ -396,7 +396,7 @@ const StandingBook = props => {
          <hr style={{ width: '100%', color: '#eeecec' }} /> <hr style={{ width: '100%', color: '#eeecec' }} />
          <div <div
          style={{ style={{
          height: 'calc(100vh - 150px)', height: 'calc(100% - 35px)',
          overflowY: 'scroll', overflowY: 'scroll',
          }} }}
          > >
          ...@@ -470,7 +470,7 @@ const StandingBook = props => { ...@@ -470,7 +470,7 @@ const StandingBook = props => {
          重置 重置
          </Button> */} </Button> */}
          </div> </div>
          <div style={{ marginTop: '10px' }}> <div style={{ marginTop: '10px', height: 'calc(100% - 94px)' }}>
          <Table <Table
          size="small" size="small"
          rowKey="ID" rowKey="ID"
          ...@@ -487,7 +487,7 @@ const StandingBook = props => { ...@@ -487,7 +487,7 @@ const StandingBook = props => {
          loading={tableLoading} loading={tableLoading}
          dataSource={searchFlag === 0 ? allData[pickItem] : searchData[pickItem]} dataSource={searchFlag === 0 ? allData[pickItem] : searchData[pickItem]}
          // loading={tableLoading} // loading={tableLoading}
          scroll={{ x: 'max-content', y: 'calc(100vh - 180px)' }} scroll={{ x: 'max-content', y: 'calc(100% - 40px)' }}
          // scroll={{ x: 'max-content' }} // scroll={{ x: 'max-content' }}
          pagination={{ pagination={{
          showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条`, showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条`,
          ......
          src/pages/bsmanager/base/standingBook/standingBook.less
          View file @ 76477a88
          ...@@ -3,19 +3,19 @@ ...@@ -3,19 +3,19 @@
          cursor: pointer; cursor: pointer;
          } }
          .ant-layout { // .ant-layout {
          overflow: auto; // overflow: auto;
          .ant-layout-content { // .ant-layout-content {
          margin: 12px !important; // margin: 12px !important;
          } // }
          } // }
          .ant-btn>.anticon+span, // .ant-btn>.anticon+span,
          .ant-btn>span+.anticon { // .ant-btn>span+.anticon {
          margin-left: 8px; // margin-left: 8px;
          vertical-align: middle; // vertical-align: middle;
          } // }
          .siteTitle { .siteTitle {
          font-size: 16px; font-size: 16px;
          ...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
          .userManageContainer { .userManageContainer {
          .ant-card-body { .ant-card-body {
          padding-left: 0; height: 100%;
          padding-right: 0; padding: 12px 24px 24px 10px;
          } }
          .listItem { .listItem {
          ...@@ -115,18 +115,21 @@ ...@@ -115,18 +115,21 @@
          .contentContainers { .contentContainers {
          display: flex; display: flex;
          width: 100%; width: 100%;
          height: 100%;
          position: relative; position: relative;
          .ant-table.ant-table-bordered>.ant-table-container { .ant-table.ant-table-bordered>.ant-table-container {
          min-width: calc(100vw - 582px); // min-width: calc(100vw - 582px);
          // height: calc(100vh - 175px); // height: calc(100vh - 175px);
          height: 100%;
          overflow-x: hidden; overflow-x: hidden;
          border: none; border: none;
          } }
          .orgContainer { .orgContainer {
          height: calc(100vh - 74px); // height: calc(100vh - 74px);
          width: 240px; height: 100%;
          width: 250px;
          left: 0; left: 0;
          top: 0; top: 0;
          margin-right: 10px; margin-right: 10px;
          ...@@ -174,7 +177,7 @@ ...@@ -174,7 +177,7 @@
          } }
          .userContainer { .userContainer {
          height: calc(100vh - 74px) !important; height: 100%;
          z-index: 999; z-index: 999;
          min-width: 800px; min-width: 800px;
          background: white; background: white;
          ...@@ -192,6 +195,13 @@ ...@@ -192,6 +195,13 @@
          white-space: nowrap; white-space: nowrap;
          } }
          .ant-table-wrapper {
          height: 100%;
          .ant-table {
          height: 100%;
          }
          }
          .ant-table-pagination { .ant-table-pagination {
          padding-right: 12px; padding-right: 12px;
          background: white; background: white;
          ...@@ -225,9 +235,9 @@ ...@@ -225,9 +235,9 @@
          } }
          .ant-table-body { .ant-table-body {
          height: calc(100vh - 210px); // height: calc(100vh - 210px);
          border-right: white; // border-right: white;
          overflow: auto !important; // overflow: auto !important;
          } }
          .clickRowStyle { .clickRowStyle {
          ...@@ -242,53 +252,53 @@ ...@@ -242,53 +252,53 @@
          } }
          } }
          .ant-modal-root { // .ant-modal-root {
          .ant-tree-switcher { // .ant-tree-switcher {
          line-height: 1; // line-height: 1;
          color: #1890ff; // color: #1890ff;
          margin-right: 0px !important; // margin-right: 0px !important;
          } // }
          .ant-checkbox-group .ant-checkbox-group-item { // .ant-checkbox-group .ant-checkbox-group-item {
          margin-right: 0px !important; // margin-right: 0px !important;
          // min-width: 200px !important; // // min-width: 200px !important;
          } // }
          .ant-tree-list-holder { // .ant-tree-list-holder {
          overflow: auto; // overflow: auto;
          overflow-x: hidden; // overflow-x: hidden;
          height: 40vh; // height: 40vh;
          } // }
          .ant-tabs-content-holder { // .ant-tabs-content-holder {
          overflow: auto; // overflow: auto;
          height: 50vh; // height: 50vh;
          } // }
          } // }
          .ant-modal-content { // .ant-modal-content {
          border-radius: 5px; // border-radius: 5px;
          } // }
          .ant-modal-header { // .ant-modal-header {
          border-radius: 5px 5px 0 0; // border-radius: 5px 5px 0 0;
          padding: 28px 40px; // padding: 28px 40px;
          } // }
          .ant-modal-close { // .ant-modal-close {
          top: 14px; // top: 14px;
          right: 20px; // right: 20px;
          } // }
          .ant-modal-footer { // .ant-modal-footer {
          border: none; // border: none;
          padding: 28px 40px; // padding: 28px 40px;
          } // }
          .ant-modal-footer .ant-btn+.ant-btn:not(.ant-dropdown-trigger) { // .ant-modal-footer .ant-btn+.ant-btn:not(.ant-dropdown-trigger) {
          margin-bottom: 0; // margin-bottom: 0;
          margin-left: 15px; // margin-left: 15px;
          } // }
          // .ant-form-horizontal .ant-form-item-control { // .ant-form-horizontal .ant-form-item-control {
          // margin-left: 10px; // margin-left: 10px;
          ...@@ -334,22 +344,26 @@ ...@@ -334,22 +344,26 @@
          text-overflow: ellipsis; text-overflow: ellipsis;
          } }
          .ant-popover-inner { // .ant-popover-inner {
          border-radius: 10px; // border-radius: 10px;
          background-color: rgba(255, 255, 255, 0.788); // background-color: rgba(255, 255, 255, 0.788);
          } // }
          .ant-popover-inner-content { // .ant-popover-inner-content {
          padding: 10px 10px; // padding: 10px 10px;
          } // }
          .ant-popover-message>.anticon { // .ant-popover-message>.anticon {
          top: 7.0005px; // top: 7.0005px;
          } // }
          .listCard { .listCard {
          display: flex; display: flex;
          .ant-checkbox-group-item {
          width: 100%;
          }
          .cardItem { .cardItem {
          padding: 0.5rem; padding: 0.5rem;
          } }
          ......
          src/pages/bsmanager/base/tablemanager/components/TableView.jsx
          View file @ 76477a88
          ...@@ -670,13 +670,19 @@ const TableView = props => { ...@@ -670,13 +670,19 @@ const TableView = props => {
          /> />
          </Form.Item> </Form.Item>
          <Form.Item> <Form.Item>
          <Button icon={<PlusOutlined />} type="primary" onClick={() => handleAdd()}> <Button type="primary" onClick={() => handleAdd()}>
          新增 <div style={{ display: 'flex', alignItems: 'center' }}>
          <PlusOutlined style={{ marginRight: '5px' }} />
          <span> 新增</span>
          </div>
          </Button> </Button>
          </Form.Item> </Form.Item>
          <Form.Item> <Form.Item>
          <Button icon={<MinusOutlined />} onClick={() => deleteFilleds()}> <Button onClick={() => deleteFilleds()}>
          批量删除 <div style={{ display: 'flex', alignItems: 'center' }}>
          <MinusOutlined style={{ marginRight: '5px' }} />
          <span> 批量删除</span>
          </div>
          </Button> </Button>
          </Form.Item> </Form.Item>
          </Form> </Form>
          ......
          src/pages/bsmanager/base/tablemanager/filedConfig/filedConfig.jsx
          View file @ 76477a88
          ...@@ -31,9 +31,9 @@ import { ...@@ -31,9 +31,9 @@ import {
          } from '@/services/tablemanager/tablemanager'; } from '@/services/tablemanager/tablemanager';
          import { useHistory } from 'react-router-dom'; import { useHistory } from 'react-router-dom';
          import FieldEditor from './fieldEditor'; import FieldEditor from './fieldEditor';
          import styles from './index.less';
          import AffiliateAdd from '../components/Field/affiliateAdd'; import AffiliateAdd from '../components/Field/affiliateAdd';
          import LoadGroup from '../components/Field/loadGroupNew'; import LoadGroup from '../components/Field/loadGroupNew';
          import styles from './index.less';
          const AddModal = props => { const AddModal = props => {
          const history = useHistory(); const history = useHistory();
          const [allData, setAllData] = useState([]); const [allData, setAllData] = useState([]);
          ...@@ -698,7 +698,7 @@ const AddModal = props => { ...@@ -698,7 +698,7 @@ const AddModal = props => {
          bordered bordered
          expandedRowKeys={selectGroup.map(item => item.key)} expandedRowKeys={selectGroup.map(item => item.key)}
          expandRowByClick expandRowByClick
          scroll={{ y: 'calc(100vh - 170px)' }} scroll={{ y: 'calc(100% - 70px)' }}
          onRow={record => ({ onRow={record => ({
          onDoubleClick: event => { onDoubleClick: event => {
          event.stopPropagation(); event.stopPropagation();
          ......
          src/pages/bsmanager/base/tablemanager/filedConfig/index.less
          View file @ 76477a88
          ...@@ -25,9 +25,19 @@ ...@@ -25,9 +25,19 @@
          } }
          } }
          .containerBox { .containerBox {
          width: 100vm; width: 100%;
          height: calc(100vh - 90px); // height: calc(100vh - 90px);
          height: 100%;
          background: #ffffff; background: #ffffff;
          .ant-table-wrapper {
          height: calc(100% - 56px);
          }
          .ant-table {
          height: 100%;
          }
          .ant-table-container {
          height: 100%;
          }
          .ant-table.ant-table-small .ant-table-tbody .ant-table-wrapper:only-child .ant-table { .ant-table.ant-table-small .ant-table-tbody .ant-table-wrapper:only-child .ant-table {
          margin-left: 0; margin-left: 0;
          } }
          ......
          src/pages/bsmanager/base/tablemanager/index.jsx
          View file @ 76477a88
          ...@@ -46,7 +46,7 @@ import { ...@@ -46,7 +46,7 @@ import {
          } from '@/services/tablemanager/tablemanager'; } from '@/services/tablemanager/tablemanager';
          import { useHistory } from 'react-router-dom'; import { useHistory } from 'react-router-dom';
          import { Ellipse } from 'bizcharts/lib/g-components'; import { Ellipse } from 'bizcharts/lib/g-components';
          import styles from './index.less';
          import Editor from './components/Field/editor'; import Editor from './components/Field/editor';
          // import AddTablelList from './components/Field/addTable'; // import AddTablelList from './components/Field/addTable';
          import AddTablelList from './components/TableView'; import AddTablelList from './components/TableView';
          ...@@ -54,6 +54,7 @@ import AffiliateAdd from './components/Field/affiliateAdd'; ...@@ -54,6 +54,7 @@ import AffiliateAdd from './components/Field/affiliateAdd';
          import LoadGroup from './components/Field/loadGroup'; import LoadGroup from './components/Field/loadGroup';
          import LoadGroupNew from './components/Field/loadGroupNew'; import LoadGroupNew from './components/Field/loadGroupNew';
          import { defaultFields } from './components/defaultFields'; import { defaultFields } from './components/defaultFields';
          import styles from './index.less';
          const { Search } = Input; const { Search } = Input;
          const { Option } = Select; const { Option } = Select;
          const placeholder = '请输入表名'; const placeholder = '请输入表名';
          ...@@ -621,7 +622,7 @@ const TableManager = props => { ...@@ -621,7 +622,7 @@ const TableManager = props => {
          附加表 附加表
          </Button> </Button>
          </div> </div>
          <div style={{ flex: 1, position: 'relative', width: '100%' }}> <div style={{ flex: 1, position: 'relative', width: '100%', background: '#fff' }}>
          <Table <Table
          rowKey={record => record.key} rowKey={record => record.key}
          size="small" size="small"
          ...@@ -629,7 +630,7 @@ const TableManager = props => { ...@@ -629,7 +630,7 @@ const TableManager = props => {
          style={{ position: 'absolute' }} style={{ position: 'absolute' }}
          columns={columns} columns={columns}
          dataSource={allData[select]} dataSource={allData[select]}
          scroll={{ x: 'max-content', y: 'calc(100vh - 217px)' }} scroll={{ x: 'max-content', y: 'calc(100% - 50px)' }}
          rowClassName={setRowClassName} rowClassName={setRowClassName}
          onRow={record => ({ onRow={record => ({
          onDoubleClick: event => { onDoubleClick: event => {
          ......
          src/pages/bsmanager/base/tablemanager/index.less
          View file @ 76477a88
          ...@@ -2,30 +2,52 @@ ...@@ -2,30 +2,52 @@
          position: relative; position: relative;
          display: flex; display: flex;
          width: 100%; width: 100%;
          height: 100%;
          } }
          .tablemanager_container { .tablemanager_container {
          position: relative; position: relative;
          display: flex; display: flex;
          flex-direction: column; flex-direction: column;
          width: 100%; width: 100%;
          height: 100%;
          border: 1px solid #f0f0f0; border: 1px solid #f0f0f0;
          .lack { .lack {
          background-color: rgb(255, 255, 0); background-color: rgb(255, 255, 0);
          color: rgb(255, 0, 0); color: rgb(255, 0, 0);
          } }
          .ant-table-pagination.ant-pagination {
          margin: 0; .ant-pagination {
          margin: 10px 20px 0 0;
          } }
          .ant-table.ant-table-small .ant-table-tbody .ant-table-wrapper:only-child .ant-table {
          margin-left: 0; .ant-table-wrapper {
          height: 100%;
          } }
          .ant-table.ant-table-bordered > .ant-table-container {
          border: none; .ant-table-container {
          height: 100%;
          } }
          .ant-table {
          height: calc(100% - 50px);
          }
          // .ant-table-pagination.ant-pagination {
          // margin: 0;
          // }
          // .ant-table.ant-table-small .ant-table-tbody .ant-table-wrapper:only-child .ant-table {
          // margin-left: 0;
          // }
          // .ant-table.ant-table-bordered > .ant-table-container {
          // border: none;
          // }
          .ant-table-thead tr th { .ant-table-thead tr th {
          font-weight: 600; font-weight: 600;
          color: rgba(0, 0, 0, 0.85); color: rgba(0, 0, 0, 0.85);
          } }
          .ant-btn { .ant-btn {
          display: flex; display: flex;
          align-items: center; align-items: center;
          ...@@ -34,6 +56,7 @@ ...@@ -34,6 +56,7 @@
          .clickRowStyle { .clickRowStyle {
          background: #cfe7fd; background: #cfe7fd;
          } }
          .operate_bar { .operate_bar {
          width: 100%; width: 100%;
          height: 60px; height: 60px;
          ...@@ -42,6 +65,7 @@ ...@@ -42,6 +65,7 @@
          flex-direction: row; flex-direction: row;
          justify-content: flex-start; justify-content: flex-start;
          align-items: center; align-items: center;
          .fast_search { .fast_search {
          height: 60px; height: 60px;
          margin-right: 10px; margin-right: 10px;
          ...@@ -57,26 +81,35 @@ ...@@ -57,26 +81,35 @@
          } }
          } }
          } }
          .orgContainer { .orgContainer {
          position: relative; position: relative;
          left: 0; left: 0;
          top: 0; top: 0;
          height: calc(100vh - 74px); // height: calc(100vh - 74px);
          height: 100%;
          width: 250px; width: 250px;
          margin-right: 10px; margin-right: 10px;
          transition-property: width; transition-property: width;
          transition-duration: 0.5s; transition-duration: 0.5s;
          white-space: nowrap; white-space: nowrap;
          .ant-card-body {
          padding: 12px 24px 24px 10px;
          }
          .processTitle { .processTitle {
          font-size: 15px; font-size: 15px;
          font-weight: bold; font-weight: bold;
          color: #333e51; color: #333e51;
          padding-left: 14px; padding-left: 14px;
          } }
          .splitLine { .splitLine {
          width: 100%; width: 100%;
          color: #eeecec; color: #eeecec;
          } }
          .listItem { .listItem {
          display: flex; display: flex;
          justify-content: space-between; justify-content: space-between;
          ...@@ -88,6 +121,7 @@ ...@@ -88,6 +121,7 @@
          color: #414e65; color: #414e65;
          cursor: pointer; cursor: pointer;
          } }
          .listHover { .listHover {
          background-color: #f5f6f9; background-color: #f5f6f9;
          } }
          ...@@ -95,6 +129,7 @@ ...@@ -95,6 +129,7 @@
          .pickItem { .pickItem {
          background-color: #aed8fa; background-color: #aed8fa;
          } }
          .switcher { .switcher {
          display: block; display: block;
          position: absolute; position: absolute;
          ...@@ -106,6 +141,7 @@ ...@@ -106,6 +141,7 @@
          z-index: 1; z-index: 1;
          } }
          } }
          .orgContainerHide { .orgContainerHide {
          width: 26px; width: 26px;
          } }
          \ No newline at end of file
          src/pages/bsmanager/patrolMaintenance/maintenance/AddModal.jsx
          View file @ 76477a88
          ...@@ -502,7 +502,7 @@ const AddModal = props => { ...@@ -502,7 +502,7 @@ const AddModal = props => {
          <Col span={12}> <Col span={12}>
          <Item <Item
          label={ label={
          <div> <div style={{ display: 'flex', alignItems: 'center' }}>
          <Tooltip title="任务提前生成天数，仅适用于接口定时执行"> <Tooltip title="任务提前生成天数，仅适用于接口定时执行">
          <InfoCircleOutlined <InfoCircleOutlined
          style={{ style={{
          ......
          src/pages/bsmanager/patrolMaintenance/maintenance/maintenance.less
          View file @ 76477a88
          .maintenanceContainer { .maintenanceContainer {
          height: 100%;
          .contentContainers {
          height: 100%;
          .ant-table-wrapper {
          height: calc(100% - 100px);
          .ant-table {
          height: 100%;
          }
          }
          .ant-pagination {
          padding: 10px;
          }
          }
          .ant-card-body { .ant-card-body {
          padding: 12px 24px 24px 24px; padding: 12px 24px 24px 24px;
          } }
          .pickItem { .pickItem {
          background-color: #f5f6f9; background-color: #f5f6f9;
          } }
          } }
          .formData { .formData {
          height: 38rem; height: 38rem;
          overflow-y: scroll; overflow-y: scroll;
          .ant-form-item-label
          > label.ant-form-item-required:not(.ant-form-item-required-mark-optional)::before { .ant-form-item-label>label.ant-form-item-required:not(.ant-form-item-required-mark-optional)::before {
          display: none; display: none;
          } }
          .formData_label { .formData_label {
          display: flex; display: flex;
          align-items: center; align-items: center;
          } }
          .filed_listItem { .filed_listItem {
          display: flex; display: flex;
          height: 3.6rem; height: 3.6rem;
          .ant-btn-icon-only { .ant-btn-icon-only {
          width: 32px; width: 32px;
          height: 32px; height: 32px;
          ...@@ -33,15 +56,18 @@ ...@@ -33,15 +56,18 @@
          } }
          } }
          } }
          .cardContent { .cardContent {
          height: 30rem; height: 30rem;
          overflow-y: scroll; overflow-y: scroll;
          overflow-x: scroll; overflow-x: scroll;
          width: 100%; width: 100%;
          } }
          .doctorTable { .doctorTable {
          margin-bottom: 16px; margin-bottom: 16px;
          } }
          .linkDrowp { .linkDrowp {
          position: absolute; position: absolute;
          top: 0px; top: 0px;
          ...@@ -51,6 +77,7 @@ ...@@ -51,6 +77,7 @@
          display: flex; display: flex;
          align-items: center; align-items: center;
          } }
          .listItem { .listItem {
          display: flex; display: flex;
          justify-content: space-between; justify-content: space-between;
          ...@@ -62,19 +89,24 @@ ...@@ -62,19 +89,24 @@
          align-items: center; align-items: center;
          padding: 8px 14px; padding: 8px 14px;
          } }
          .ant-select-arrow .anticon { .ant-select-arrow .anticon {
          vertical-align: middle; vertical-align: middle;
          } }
          .listCard { .listCard {
          display: flex; display: flex;
          .cardItem { .cardItem {
          padding: 0.5rem; padding: 0.5rem;
          } }
          .cardContent { .cardContent {
          height: 30rem; height: 30rem;
          overflow-y: scroll; overflow-y: scroll;
          width: 100%; width: 100%;
          } }
          .cardItemData { .cardItemData {
          display: inline-block; display: inline-block;
          padding: 0.5rem; padding: 0.5rem;
          ...@@ -86,12 +118,15 @@ ...@@ -86,12 +118,15 @@
          overflow-y: scroll; overflow-y: scroll;
          } }
          } }
          .ant-modal-body { .ant-modal-body {
          padding: 10px 24px 0px 24px; padding: 10px 24px 0px 24px;
          } }
          .ant-modal-footer { .ant-modal-footer {
          padding: 10px 48px 10px 40px; padding: 10px 48px 10px 40px;
          } }
          .ant-table-pagination.ant-pagination { .ant-table-pagination.ant-pagination {
          margin: 5px 0; margin: 5px 0;
          } }
          \ No newline at end of file
          src/pages/bsmanager/patrolMaintenance/patrolFeedback/patrolFeedback.jsx
          View file @ 76477a88
          ...@@ -280,7 +280,7 @@ const patrolFeedback = () => { ...@@ -280,7 +280,7 @@ const patrolFeedback = () => {
          })} })}
          columns={columns} columns={columns}
          dataSource={tableData} dataSource={tableData}
          scroll={{ y: 'calc(100vh - 205px)', x: 'max-content' }} scroll={{ y: 'calc(100% - 205px)', x: 'max-content' }}
          pagination={{ pagination={{
          showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条`, showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条`,
          pageSizeOptions: [10, 20, 50, 100], pageSizeOptions: [10, 20, 50, 100],
          ......
          src/pages/bsmanager/patrolMaintenance/patrolFeedback/patrolFeedback.less
          View file @ 76477a88
          .PatrolFeedbackContainer { .PatrolFeedbackContainer {
          height: 100%;
          .contentContainers {
          height: 100%;
          .ant-table-wrapper {
          height: calc(100% - 100px);
          .ant-table {
          height: 100%;
          }
          }
          .ant-pagination {
          padding: 10px;
          }
          }
          .ant-card-body { .ant-card-body {
          padding: 12px 24px 24px 24px; padding: 12px 24px 24px 24px;
          } }
          .pickItem { .pickItem {
          background-color: #f5f6f9; background-color: #f5f6f9;
          } }
          } }
          .formData { .formData {
          height: 38rem; height: 38rem;
          overflow-y: scroll; overflow-y: scroll;
          .ant-form-item-label
          > label.ant-form-item-required:not(.ant-form-item-required-mark-optional)::before { .ant-form-item-label>label.ant-form-item-required:not(.ant-form-item-required-mark-optional)::before {
          display: none; display: none;
          } }
          .formData_label { .formData_label {
          display: flex; display: flex;
          align-items: center; align-items: center;
          } }
          .filed_listItem { .filed_listItem {
          display: flex; display: flex;
          height: 3.6rem; height: 3.6rem;
          .ant-btn-icon-only { .ant-btn-icon-only {
          width: 32px; width: 32px;
          height: 32px; height: 32px;
          ...@@ -33,15 +59,18 @@ ...@@ -33,15 +59,18 @@
          } }
          } }
          } }
          .cardContent { .cardContent {
          height: 30rem; height: 30rem;
          overflow-y: scroll; overflow-y: scroll;
          overflow-x: scroll; overflow-x: scroll;
          width: 100%; width: 100%;
          } }
          .doctorTable { .doctorTable {
          margin-bottom: 16px; margin-bottom: 16px;
          } }
          .linkDrowp { .linkDrowp {
          position: absolute; position: absolute;
          top: 0px; top: 0px;
          ...@@ -51,6 +80,7 @@ ...@@ -51,6 +80,7 @@
          display: flex; display: flex;
          align-items: center; align-items: center;
          } }
          .listItem { .listItem {
          display: flex; display: flex;
          justify-content: space-between; justify-content: space-between;
          ...@@ -62,19 +92,24 @@ ...@@ -62,19 +92,24 @@
          align-items: center; align-items: center;
          padding: 8px 14px; padding: 8px 14px;
          } }
          .ant-select-arrow .anticon { .ant-select-arrow .anticon {
          vertical-align: middle; vertical-align: middle;
          } }
          .listCard { .listCard {
          display: flex; display: flex;
          .cardItem { .cardItem {
          padding: 0.5rem; padding: 0.5rem;
          } }
          .cardContent { .cardContent {
          height: 30rem; height: 30rem;
          overflow-y: scroll; overflow-y: scroll;
          width: 100%; width: 100%;
          } }
          .cardItemData { .cardItemData {
          display: inline-block; display: inline-block;
          padding: 0.5rem; padding: 0.5rem;
          ...@@ -86,12 +121,15 @@ ...@@ -86,12 +121,15 @@
          overflow-y: scroll; overflow-y: scroll;
          } }
          } }
          .ant-modal-body { .ant-modal-body {
          padding: 10px 24px 0px 24px; padding: 10px 24px 0px 24px;
          } }
          .ant-modal-footer { .ant-modal-footer {
          padding: 10px 48px 10px 40px; padding: 10px 48px 10px 40px;
          } }
          .ant-table-pagination.ant-pagination { .ant-table-pagination.ant-pagination {
          margin: 5px 0; margin: 5px 0;
          } }
          \ No newline at end of file
          src/pages/bsmanager/workOrder/incident/AddModal.jsx
          View file @ 76477a88
          ...@@ -46,7 +46,13 @@ import { ...@@ -46,7 +46,13 @@ import {
          GetCM_Event_QueryEventType, GetCM_Event_QueryEventType,
          CM_Event_AddEventTable, CM_Event_AddEventTable,
          } from '@/services/standingBook/api'; } from '@/services/standingBook/api';
          import { PlusOutlined, DownOutlined, InfoCircleOutlined, DeleteOutlined, PictureOutlined } from '@ant-design/icons'; import {
          PlusOutlined,
          DownOutlined,
          InfoCircleOutlined,
          DeleteOutlined,
          PictureOutlined,
          } from '@ant-design/icons';
          import styles from './incident.less'; import styles from './incident.less';
          import ChangeAdd from './changeAdd'; import ChangeAdd from './changeAdd';
          import ChangeEdit from './changeEdit'; import ChangeEdit from './changeEdit';
          ...@@ -626,7 +632,7 @@ const AddModal = props => { ...@@ -626,7 +632,7 @@ const AddModal = props => {
          setOrder(res.data.root.Order); setOrder(res.data.root.Order);
          form.setFieldsValue({ ...res.data.root }); form.setFieldsValue({ ...res.data.root });
          if (res.data.root.ImageExpression) { if (res.data.root.ImageExpression) {
          setImageUrl(`${window.location.origin }/civweb4/${res.data.root.ImageExpression}`); setImageUrl(`${window.location.origin}/civweb4/${res.data.root.ImageExpression}`);
          setIm(res.data.root.ImageExpression); setIm(res.data.root.ImageExpression);
          } else { } else {
          form.setFieldsValue({ form.setFieldsValue({
          ...@@ -966,23 +972,23 @@ const AddModal = props => { ...@@ -966,23 +972,23 @@ const AddModal = props => {
          console.log(initialArr); console.log(initialArr);
          //新建一个包含多个list的结果对象 //新建一个包含多个list的结果对象
          let tempObj = {}; let tempObj = {};
          let aa =[]; let aa = [];
          // 根据不同的"name"生成多个数组 // 根据不同的"name"生成多个数组
          // eslint-disable-next-line guard-for-in // eslint-disable-next-line guard-for-in
          for (let k in nameArr) { for (let k in nameArr) {
          for (let j in initialArr) { for (let j in initialArr) {
          if (initialArr[j][`${name}`] == nameArr[k]) { if (initialArr[j][`${name}`] == nameArr[k]) {
          // 每次外循环时新建一个对应"name"的数组, 内循环时当前数组不变 // 每次外循环时新建一个对应"name"的数组, 内循环时当前数组不变
          tempObj[nameArr[k]] = tempObj[nameArr[k]] || []; tempObj[nameArr[k]] = tempObj[nameArr[k]] || [];
          if(initialArr[j].isDefaultField==false){ if (initialArr[j].isDefaultField == false) {
          tempObj[nameArr[k]].push(initialArr[j]); tempObj[nameArr[k]].push(initialArr[j]);
          }else{ } else {
          aa.push(initialArr[j].fieldName); aa.push(initialArr[j].fieldName);
          } }
          } }
          } }
          } }
          console.log(aa); console.log(aa);
          // tempObj.内置字段 = aa; // tempObj.内置字段 = aa;
          for (let key in tempObj) { for (let key in tempObj) {
          ...@@ -1324,7 +1330,7 @@ const AddModal = props => { ...@@ -1324,7 +1330,7 @@ const AddModal = props => {
          const onOk = props => { const onOk = props => {
          if (props) { if (props) {
          setImageUrl(`${window.location.origin }/civweb4/${props}`); setImageUrl(`${window.location.origin}/civweb4/${props}`);
          setIm(props); setIm(props);
          setKeepImgeUrl(props); setKeepImgeUrl(props);
          form.setFieldsValue({ ImageExpression: `${props}` }); form.setFieldsValue({ ImageExpression: `${props}` });
          ...@@ -1543,12 +1549,11 @@ const AddModal = props => { ...@@ -1543,12 +1549,11 @@ const AddModal = props => {
          <Col span={24}> <Col span={24}>
          <Item <Item
          label={ label={
          <div> <div style={{ display: 'flex', alignItems: 'center' }}>
          <Tooltip title={`存在${summaryValue}个外部字段`}> <Tooltip title={`存在${summaryValue}个外部字段`}>
          <InfoCircleOutlined <InfoCircleOutlined
          style={{ style={{
          color: 'red', color: 'red',
          display: summaryIsShow, display: summaryIsShow,
          }} }}
          /> />
          ...@@ -1563,20 +1568,20 @@ const AddModal = props => { ...@@ -1563,20 +1568,20 @@ const AddModal = props => {
          { {
          validator: (rule, value) => { validator: (rule, value) => {
          console.log(checkedList1); console.log(checkedList1);
          let aa =form.getFieldValue().SummaryFields let aa = form.getFieldValue().SummaryFields;
          let bb =[]; let bb = [];
          console.log(aa.split(',')); console.log(aa.split(','));
          aa.split(',').map(i=>{ aa.split(',').map(i => {
          if(i!=''){ if (i != '') {
          bb.push(i) bb.push(i);
          } }
          }) });
          console.log(bb); console.log(bb);
          if (aa == '') { if (aa == '') {
          return Promise.reject('摘要字段必选'); return Promise.reject('摘要字段必选');
          } }
          if(bb.length<3|| aa.split(',').length>5){ if (bb.length < 3 || aa.split(',').length > 5) {
          return Promise.reject('最少配置三个字段，最多配置五个字段'); return Promise.reject('最少配置三个字段，最多配置五个字段');
          } }
          return Promise.resolve(); return Promise.resolve();
          }, },
          ...@@ -1603,7 +1608,7 @@ const AddModal = props => { ...@@ -1603,7 +1608,7 @@ const AddModal = props => {
          <Col span={24}> <Col span={24}>
          <Item <Item
          label={ label={
          <div> <div style={{ display: 'flex', alignItems: 'center' }}>
          <Tooltip title={`存在${reportValue}个外部字段`}> <Tooltip title={`存在${reportValue}个外部字段`}>
          <InfoCircleOutlined <InfoCircleOutlined
          style={{ style={{
          ...@@ -1650,7 +1655,7 @@ const AddModal = props => { ...@@ -1650,7 +1655,7 @@ const AddModal = props => {
          <Col span={24}> <Col span={24}>
          <Item <Item
          label={ label={
          <div> <div style={{ display: 'flex', alignItems: 'center' }}>
          <Tooltip title={`存在${displayValue}个外部字段`}> <Tooltip title={`存在${displayValue}个外部字段`}>
          <InfoCircleOutlined <InfoCircleOutlined
          style={{ style={{
          ...@@ -1697,7 +1702,7 @@ const AddModal = props => { ...@@ -1697,7 +1702,7 @@ const AddModal = props => {
          <Col span={24}> <Col span={24}>
          <Item <Item
          label={ label={
          <div> <div style={{ display: 'flex', alignItems: 'center' }}>
          <Tooltip title={`存在${editableValue}个外部字段`}> <Tooltip title={`存在${editableValue}个外部字段`}>
          <InfoCircleOutlined <InfoCircleOutlined
          style={{ style={{
          ...@@ -1744,7 +1749,7 @@ const AddModal = props => { ...@@ -1744,7 +1749,7 @@ const AddModal = props => {
          <Col span={24}> <Col span={24}>
          <Item <Item
          label={ label={
          <div> <div style={{ display: 'flex', alignItems: 'center' }}>
          <Tooltip title={`存在${displayColumns}个外部字段`}> <Tooltip title={`存在${displayColumns}个外部字段`}>
          <InfoCircleOutlined <InfoCircleOutlined
          style={{ style={{
          ...@@ -1893,19 +1898,19 @@ const AddModal = props => { ...@@ -1893,19 +1898,19 @@ const AddModal = props => {
          left: '24px', left: '24px',
          top: '45px', top: '45px',
          color: 'white', color: 'white',
          zIndex:'999' zIndex: '999',
          }} }}
          /> />
          <PictureOutlined <PictureOutlined
          onClick={pictruePreview} onClick={pictruePreview}
          style={{ style={{
          position: 'absolute', position: 'absolute',
          fontSize: '18px', fontSize: '18px',
          left: '54px', left: '54px',
          top: '45px', top: '45px',
          color: 'white', color: 'white',
          zIndex:'999' zIndex: '999',
          }} }}
          /> />
          </> </>
          ) : ( ) : (
          ......
          src/pages/bsmanager/workOrder/incident/changeAdd.less
          View file @ 76477a88
          .ant-modal-close-x { // .ant-modal-close-x {
          line-height: 35px; // line-height: 35px;
          } // }
          .ant-btn .anticon.anticon-plus > svg { // .ant-btn .anticon.anticon-plus > svg {
          margin-top: -5px; // margin-top: -5px;
          } // }
          .incidentContainer { .incidentContainer {
          .ant-card-body { .ant-card-body {
          padding: 12px 24px 24px 24px; padding: 12px 24px 24px 24px;
          ...@@ -246,10 +246,10 @@ ...@@ -246,10 +246,10 @@
          margin-bottom: 16px; margin-bottom: 16px;
          } }
          .ant-drawer-footer { // .ant-drawer-footer {
          display: flex; // display: flex;
          justify-content: flex-end; // justify-content: flex-end;
          } // }
          .config { .config {
          display: flex; display: flex;
          padding: 1rem 0 0.5rem 0.5rem; padding: 1rem 0 0.5rem 0.5rem;
          ...@@ -292,6 +292,6 @@ ...@@ -292,6 +292,6 @@
          color: rgba(0, 0, 0, 0.85); color: rgba(0, 0, 0, 0.85);
          } }
          } }
          .panda-pro-pages-platform-center-bsmanager-work-order-incident-filed_listItem { // .panda-pro-pages-platform-center-bsmanager-work-order-incident-filed_listItem {
          display: flex; // display: flex;
          } // }
          src/pages/bsmanager/workOrder/incident/incident.jsx
          View file @ 76477a88
          ...@@ -70,7 +70,7 @@ const incident = () => { ...@@ -70,7 +70,7 @@ const incident = () => {
          const [maxLength, setMaxLength] = useState(0); const [maxLength, setMaxLength] = useState(0);
          const [pickItem, setPickItem] = useState(''); const [pickItem, setPickItem] = useState('');
          const [hoverItemIndex, setHoverItemIndex] = useState(0); // hover流程索引 const [hoverItemIndex, setHoverItemIndex] = useState(0); // hover流程索引
          const [keepIdValue, setKeepIdValue] = useState([]) const [keepIdValue, setKeepIdValue] = useState([]);
          const columns = [ const columns = [
          { {
          ...@@ -309,7 +309,7 @@ const incident = () => { ...@@ -309,7 +309,7 @@ const incident = () => {
          console.log(newArr[rember]); console.log(newArr[rember]);
          console.log(newArr, 'newArr'); console.log(newArr, 'newArr');
          setTreeData(newArr); setTreeData(newArr);
          }else{ } else {
          notification.error({ notification.error({
          message: '提示', message: '提示',
          duration: 3, duration: 3,
          ...@@ -455,7 +455,7 @@ const incident = () => { ...@@ -455,7 +455,7 @@ const incident = () => {
          [styles.orgContainerHide]: !treeVisible, [styles.orgContainerHide]: !treeVisible,
          })} })}
          > >
          <div> <div style={{ height: '100%', display: treeVisible ? 'block' : 'none' }}>
          <span <span
          style={{ style={{
          fontSize: '15px ', fontSize: '15px ',
          ...@@ -479,7 +479,7 @@ const incident = () => { ...@@ -479,7 +479,7 @@ const incident = () => {
          <hr style={{ width: '100%', color: '#eeecec' }} /> <hr style={{ width: '100%', color: '#eeecec' }} />
          <div <div
          style={{ style={{
          height: 'calc(100vh - 150px)', height: 'calc(100% - 60px)',
          overflowY: 'scroll', overflowY: 'scroll',
          }} }}
          > >
          ...@@ -570,7 +570,7 @@ const incident = () => { ...@@ -570,7 +570,7 @@ const incident = () => {
          })} })}
          columns={columns} columns={columns}
          dataSource={tableData[pickItem]} dataSource={tableData[pickItem]}
          scroll={{ y: 'calc(100vh - 155px)', x: 'max-content' }} scroll={{ y: 'calc(100% - 50px)', x: 'max-content' }}
          pagination={{ pagination={{
          showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条`, showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条`,
          pageSizeOptions: [10, 20, 50, 100], pageSizeOptions: [10, 20, 50, 100],
          ......
          src/pages/bsmanager/workOrder/incident/incident.less
          View file @ 76477a88
          .ant-modal-close-x { .ant-modal-close-x {
          line-height: 35px; line-height: 35px;
          } }
          .ant-btn .anticon.anticon-plus > svg {
          .ant-btn .anticon.anticon-plus>svg {
          margin-top: -5px; margin-top: -5px;
          } }
          .incidentContainer { .incidentContainer {
          height: 100%;
          .ant-checkbox-wrapper ant-checkbox-group-item {
          color: red;
          }
          .ant-card-body { .ant-card-body {
          padding: 12px 24px 24px 24px; padding: 12px 24px 24px 10px;
          } }
          .ant-modal-body { .ant-modal-body {
          padding: 0px 24px 0px 24px; padding: 0px 24px 0px 24px;
          } }
          .linkDrowp { .linkDrowp {
          position: absolute; position: absolute;
          left: 93.5%; left: 93.5%;
          ...@@ -19,6 +29,7 @@ ...@@ -19,6 +29,7 @@
          display: flex; display: flex;
          align-items: center; align-items: center;
          } }
          .listItem { .listItem {
          display: flex; display: flex;
          justify-content: space-between; justify-content: space-between;
          ...@@ -30,32 +41,42 @@ ...@@ -30,32 +41,42 @@
          align-items: center; align-items: center;
          padding: 8px 14px; padding: 8px 14px;
          } }
          .ant-btn .anticon.anticon-plus > svg,
          .ant-btn .anticon.anticon-minus > svg { .ant-btn .anticon.anticon-plus>svg,
          .ant-btn .anticon.anticon-minus>svg {
          margin-top: -5px; margin-top: -5px;
          } }
          .pickItem { .pickItem {
          background-color: #aed8fa; background-color: #aed8fa;
          } }
          .listHover { .listHover {
          background-color: #f5f6f9; background-color: #f5f6f9;
          } }
          .contentContainers { .contentContainers {
          height: 100%;
          .ant-table table { .ant-table table {
          width: 100% !important; width: 100% !important;
          overflow-x: scroll; overflow-x: scroll;
          } }
          display: flex; display: flex;
          width: 100%; width: 100%;
          position: relative; position: relative;
          .ant-table.ant-table-bordered > .ant-table-container {
          min-width: calc(100vw - 582px); // .ant-table.ant-table-bordered>.ant-table-container {
          height: calc(100vh - 166px); // min-width: calc(100vw - 582px);
          overflow-x: hidden; // height: calc(100vh - 166px);
          border: none; // overflow-x: hidden;
          } // border: none;
          // }
          .orgContainer { .orgContainer {
          height: calc(100vh - 74px); // height: calc(100vh - 74px);
          height: 100%;
          width: 250px; width: 250px;
          left: 0; left: 0;
          top: 0; top: 0;
          ...@@ -64,17 +85,25 @@ ...@@ -64,17 +85,25 @@
          transition-property: width, left; transition-property: width, left;
          transition-duration: 0.5s; transition-duration: 0.5s;
          white-space: nowrap; white-space: nowrap;
          .ant-card-body {
          height: 100%;
          }
          .ant-tree { .ant-tree {
          padding-top: 6px; padding-top: 6px;
          .ant-tree-switcher { .ant-tree-switcher {
          line-height: 1; line-height: 1;
          margin-right: 0px !important; margin-right: 0px !important;
          color: #1890ff; color: #1890ff;
          .ant-tree-switcher-line-icon { .ant-tree-switcher-line-icon {
          margin-left: 5px; margin-left: 5px;
          } }
          } }
          } }
          .switcher { .switcher {
          display: block; display: block;
          position: absolute; position: absolute;
          ...@@ -93,17 +122,20 @@ ...@@ -93,17 +122,20 @@
          top: 0; top: 0;
          width: 26px; width: 26px;
          } }
          .ant-popover-message-title { .ant-popover-message-title {
          padding-left: 20px; padding-left: 20px;
          } }
          .userContainer { .userContainer {
          height: calc(100vh - 74px) !important; height: 100%;
          z-index: 999; z-index: 999;
          min-width: 800px; min-width: 800px;
          background: white; background: white;
          width: 100%; width: 100%;
          position: relative; position: relative;
          transition: width 0.5s; transition: width 0.5s;
          .title { .title {
          margin: 16px 0 10px 16px; margin: 16px 0 10px 16px;
          display: inline-block; display: inline-block;
          ...@@ -113,6 +145,7 @@ ...@@ -113,6 +145,7 @@
          text-overflow: ellipsis; text-overflow: ellipsis;
          white-space: nowrap; white-space: nowrap;
          } }
          .ant-table-pagination { .ant-table-pagination {
          padding-right: 12px; padding-right: 12px;
          background: white; background: white;
          ...@@ -120,59 +153,84 @@ ...@@ -120,59 +153,84 @@
          padding: 8px; padding: 8px;
          padding-right: 20px; padding-right: 20px;
          } }
          .ant-btn { .ant-btn {
          margin: 0px 10px; margin: 0px 10px;
          .ant-btn-primary { .ant-btn-primary {
          background: #50aefc; background: #50aefc;
          } }
          } }
          .ant-input-search-button { .ant-input-search-button {
          margin-left: 0px !important; margin-left: 0px !important;
          } }
          .ant-table-thead tr th { .ant-table-thead tr th {
          font-weight: 600; font-weight: 600;
          color: rgba(0, 0, 0, 0.85); color: rgba(0, 0, 0, 0.85);
          background-color: #f6f9fe; background-color: #f6f9fe;
          } }
          .ant-table-cell { .ant-table-cell {
          text-align: center; text-align: center;
          overflow: hidden; overflow: hidden;
          text-overflow: ellipsis; text-overflow: ellipsis;
          white-space: nowrap; white-space: nowrap;
          } }
          .ant-table-body {
          height: calc(100vh - 210px); .ant-table-wrapper {
          border-right: white; height: calc(100% - 50px);
          overflow: auto !important;
          .ant-table {
          height: calc(100% - 45px);
          .ant-table-container {
          height: 100%;
          }
          }
          } }
          // .ant-table-body {
          // height: calc(100vh - 210px);
          // border-right: white;
          // overflow: auto !important;
          // }
          .clickRowStyle { .clickRowStyle {
          background: #cfe7fd; background: #cfe7fd;
          } }
          .ant-pagination { .ant-pagination {
          z-index: 999; z-index: 999;
          border-top: 1px solid #f0eded; border-top: 1px solid #f0eded;
          } }
          } }
          } }
          .icon { .icon {
          margin-top: -5px !important; margin-top: -5px !important;
          vertical-align: text-bottom; vertical-align: text-bottom;
          } }
          } }
          .formData { .formData {
          height: 38rem; height: 38rem;
          overflow-y: scroll; overflow-y: scroll;
          .ant-form-item-label
          > label.ant-form-item-required:not(.ant-form-item-required-mark-optional)::before { .ant-form-item-label>label.ant-form-item-required:not(.ant-form-item-required-mark-optional)::before {
          display: none; display: none;
          } }
          .formData_label { .formData_label {
          display: flex; display: flex;
          align-items: center; align-items: center;
          } }
          .filed_listItem { .filed_listItem {
          display: flex; display: flex;
          height: 3.6rem; height: 3.6rem;
          .ant-btn-icon-only { .ant-btn-icon-only {
          width: 32px; width: 32px;
          height: 32px; height: 32px;
          ...@@ -185,56 +243,74 @@ ...@@ -185,56 +243,74 @@
          justify-content: center; justify-content: center;
          } }
          } }
          .ant-modal-root .ant-checkbox-group .ant-checkbox-group-item { .ant-modal-root .ant-checkbox-group .ant-checkbox-group-item {
          margin-right: 0px !important; margin-right: 0px !important;
          min-width: 200px !important; min-width: 200px !important;
          } }
          } }
          .listCard { .listCard {
          display: flex; display: flex;
          justify-content: space-around; justify-content: space-around;
          width: 100%; width: 100%;
          .cardItem { .cardItem {
          padding: 0.5rem; padding: 0.5rem;
          width: 50%; width: 50%;
          } }
          .cardContent { .cardContent {
          height: 30rem; height: 30rem;
          overflow-y: scroll; overflow-y: scroll;
          overflow-x: scroll; overflow-x: scroll;
          width: 100%; width: 100%;
          .ant-checkbox-group {
          .ant-checkbox-wrapper {
          width: 100%;
          }
          }
          } }
          .cardItemData { .cardItemData {
          padding: 1rem; padding: 1rem;
          border: 1px solid #b5b8c8; border: 1px solid #b5b8c8;
          margin-bottom: 1rem; margin-bottom: 1rem;
          overflow-x: scroll; overflow-x: scroll;
          } }
          .cardItemData1 { .cardItemData1 {
          padding: 1rem; padding: 1rem;
          border: 1px solid #b5b8c8; border: 1px solid #b5b8c8;
          margin-bottom: 1rem; margin-bottom: 1rem;
          overflow-x: scroll; overflow-x: scroll;
          .ant-checkbox-group-item { .ant-checkbox-group-item {
          color: red !important; color: red !important;
          } }
          } }
          } }
          .listCard1 { .listCard1 {
          width: 100%; width: 100%;
          display: flex; display: flex;
          height: 34rem; height: 34rem;
          .cardItem1 { .cardItem1 {
          border: 1px solid #b5b8c8; border: 1px solid #b5b8c8;
          padding: 0.5rem; padding: 0.5rem;
          width: 70%; width: 70%;
          } }
          .cardItem11 { .cardItem11 {
          border: 1px solid #b5b8c8; border: 1px solid #b5b8c8;
          padding: 0.5rem; padding: 0.5rem;
          width: 30%; width: 30%;
          } }
          .cardContent1 { .cardContent1 {
          height: 33rem; height: 33rem;
          overflow-y: scroll; overflow-y: scroll;
          ...@@ -242,9 +318,11 @@ ...@@ -242,9 +318,11 @@
          display: flex; display: flex;
          justify-content: space-around; justify-content: space-around;
          } }
          .tab { .tab {
          width: 100%; width: 100%;
          } }
          .cardItemData1 { .cardItemData1 {
          padding: 0rem 1rem; padding: 0rem 1rem;
          margin-bottom: 1rem; margin-bottom: 1rem;
          ...@@ -252,6 +330,7 @@ ...@@ -252,6 +330,7 @@
          // height: 28re; // height: 28re;
          } }
          } }
          .doctorTable { .doctorTable {
          margin-bottom: 16px; margin-bottom: 16px;
          } }
          ...@@ -260,27 +339,32 @@ ...@@ -260,27 +339,32 @@
          display: flex; display: flex;
          justify-content: flex-end; justify-content: flex-end;
          } }
          .config { .config {
          display: flex; display: flex;
          padding: 1rem 0 0.5rem 0.5rem; padding: 1rem 0 0.5rem 0.5rem;
          justify-content: space-between; justify-content: space-between;
          width: calc(100% - 10px); width: calc(100% - 10px);
          .title { .title {
          font-size: 18px; font-size: 18px;
          color: rgba(0, 114, 255, 1); color: rgba(0, 114, 255, 1);
          font-weight: bold; font-weight: bold;
          } }
          .btn { .btn {
          display: flex; display: flex;
          justify-content: flex-end; justify-content: flex-end;
          width: 20rem; width: 20rem;
          } }
          .ant-btn { .ant-btn {
          display: flex; display: flex;
          align-items: center; align-items: center;
          margin-left: 20px; margin-left: 20px;
          } }
          } }
          .imgg { .imgg {
          position: relative; position: relative;
          top: -95px; top: -95px;
          ...@@ -289,34 +373,38 @@ ...@@ -289,34 +373,38 @@
          width: 104px; width: 104px;
          background: rgba(0, 0, 0, 0.5); background: rgba(0, 0, 0, 0.5);
          border-radius: 2px; border-radius: 2px;
          z-index:1; z-index: 1;
          } }
          .imgg :hover { .imgg :hover {
          opacity: 0.7; opacity: 0.7;
          width: '100%'; width: '100%';
          background-color: '#2881a1'; background-color: '#2881a1';
          } }
          .containerBox { .containerBox {
          width: 100vm; width: 100vm;
          height: calc(100vh - 90px); height: calc(100vh - 90px);
          background: #ffffff; background: #ffffff;
          .ant-table.ant-table-small .ant-table-tbody .ant-table-wrapper:only-child .ant-table { .ant-table.ant-table-small .ant-table-tbody .ant-table-wrapper:only-child .ant-table {
          margin-left: 0; margin-left: 0;
          } }
          .ant-table.ant-table-bordered > .ant-table-container {
          .ant-table.ant-table-bordered>.ant-table-container {
          border: none; border: none;
          } }
          .clickRowStyle { .clickRowStyle {
          background: #cfe7fd; background: #cfe7fd;
          } }
          .ant-table-thead tr th { .ant-table-thead tr th {
          font-weight: 600; font-weight: 600;
          color: rgba(0, 0, 0, 0.85); color: rgba(0, 0, 0, 0.85);
          } }
          } }
          .panda-pro-pages-platform-center-bsmanager-work-order-incident-filed_listItem {
          display: flex; // .panda-pro-pages-platform-center-bsmanager-work-order-incident-filed_listItem {
          } // display: flex;
          .ant-checkbox-wrapper ant-checkbox-group-item{ // }
          color:red; \ No newline at end of file
          }
          src/pages/bsmanager/workOrder/workFlow/flow.jsx
          View file @ 76477a88
          ...@@ -229,11 +229,11 @@ const Flow = () => { ...@@ -229,11 +229,11 @@ const Flow = () => {
          [styles.orgContainerHide]: !treeVisible, [styles.orgContainerHide]: !treeVisible,
          })} })}
          > >
          <div style={{ display: `${treeVisible ? 'block' : 'none'}` }}> <div style={{ height: '100%', display: `${treeVisible ? 'block' : 'none'}` }}>
          <span className={styles.processTitle}>流程列表</span> <span className={styles.processTitle}>流程列表</span>
          <hr className={styles.splitLine} /> <hr className={styles.splitLine} />
          {/* 流程列表 */} {/* 流程列表 */}
          <div style={{ overflowY: 'scroll', height: 'calc(100vh - 150px)' }}> <div style={{ overflowY: 'scroll', height: 'calc(100% - 30px)' }}>
          {processData.length > 0 && {processData.length > 0 &&
          processData.map((item, index) => ( processData.map((item, index) => (
          <div <div
          ...@@ -293,7 +293,7 @@ const Flow = () => { ...@@ -293,7 +293,7 @@ const Flow = () => {
          rowKey={record => record.ID} rowKey={record => record.ID}
          bordered bordered
          size="small" size="small"
          scroll={{ x: 'max-content', y: '100vh-150px' }} scroll={{ x: 'max-content', y: 'calc(100% - 40px)' }}
          onRow={record => ({ onRow={record => ({
          onDoubleClick: () => { onDoubleClick: () => {
          toNode(record.name); toNode(record.name);
          ......
          src/pages/bsmanager/workOrder/workFlow/flow.less
          View file @ 76477a88
          .flowContainer { .flowContainer {
          display: flex; display: flex;
          width: 100%; width: 100%;
          height: 100%;
          position: relative; position: relative;
          .orgContainer { .orgContainer {
          position: relative; position: relative;
          left: 0; left: 0;
          top: 0; top: 0;
          height: calc(100vh - 74px); height: 100%;
          width: 250px; width: 250px;
          margin-right: 10px; margin-right: 10px;
          transition-property: width; transition-property: width;
          transition-duration: 0.5s; transition-duration: 0.5s;
          white-space: nowrap; white-space: nowrap;
          .ant-card-body {
          height: 100%;
          padding: 12px 24px 24px 10px;
          }
          .processTitle { .processTitle {
          font-size: 15px; font-size: 15px;
          font-weight: bold; font-weight: bold;
          color: #333e51; color: #333e51;
          padding-left: 14px; padding-left: 14px;
          } }
          .splitLine { .splitLine {
          width: 100%; width: 100%;
          color: #eeecec; color: #eeecec;
          } }
          .listItem { .listItem {
          display: flex; display: flex;
          justify-content: space-between; justify-content: space-between;
          ...@@ -34,6 +43,7 @@ ...@@ -34,6 +43,7 @@
          color: #414e65; color: #414e65;
          cursor: pointer; cursor: pointer;
          } }
          .listHover { .listHover {
          background-color: #f5f6f9; background-color: #f5f6f9;
          } }
          ...@@ -41,6 +51,7 @@ ...@@ -41,6 +51,7 @@
          .pickItem { .pickItem {
          background-color: #aed8fa; background-color: #aed8fa;
          } }
          .switcher { .switcher {
          display: block; display: block;
          position: absolute; position: absolute;
          ...@@ -52,24 +63,41 @@ ...@@ -52,24 +63,41 @@
          z-index: 1; z-index: 1;
          } }
          } }
          .orgContainerHide { .orgContainerHide {
          width: 26px; width: 26px;
          } }
          .processContainer { .processContainer {
          position: relative; position: relative;
          width: 100%; width: 100%;
          height: calc(100vh - 74px); height: 100%;
          min-width: 800px; min-width: 800px;
          background: white; background: white;
          .ant-table-wrapper {
          height: calc(100% - 52px);
          .ant-table {
          height: calc(100% - 50px);
          .ant-table-container {
          height: 100%;
          }
          }
          }
          .buttonList { .buttonList {
          display: flex; display: flex;
          justify-content: flex-end; justify-content: flex-end;
          margin: 10px 10px 10px 0; margin: 10px 10px 10px 0;
          .ant-btn { .ant-btn {
          vertical-align: middle; vertical-align: middle;
          line-height: 2px; line-height: 2px;
          } }
          } }
          .ant-table-pagination { .ant-table-pagination {
          padding-right: 12px; padding-right: 12px;
          background: white; background: white;
          ...@@ -77,47 +105,58 @@ ...@@ -77,47 +105,58 @@
          padding: 8px; padding: 8px;
          padding-right: 20px; padding-right: 20px;
          } }
          .ant-table-thead tr th { .ant-table-thead tr th {
          font-weight: 600; font-weight: 600;
          color: rgba(0, 0, 0, 0.85); color: rgba(0, 0, 0, 0.85);
          } }
          .ant-table-cell { .ant-table-cell {
          text-align: center; text-align: center;
          overflow: hidden; overflow: hidden;
          white-space: nowrap; white-space: nowrap;
          } }
          .ant-table-body {
          height: calc(100vh - 210px); // .ant-table-body {
          border-right: white; // height: calc(100vh - 210px);
          overflow: auto !important; // border-right: white;
          } // overflow: auto;
          // }
          .ant-pagination { .ant-pagination {
          z-index: 999; z-index: 999;
          border-top: 1px solid #f0eded; border-top: 1px solid #f0eded;
          } }
          } }
          } }
          .ant-radio-wrapper { .ant-radio-wrapper {
          min-width: 150px; min-width: 150px;
          margin-bottom: 2px; margin-bottom: 2px;
          } }
          .doctorTable { .doctorTable {
          margin-bottom: 16px; margin-bottom: 16px;
          table { table {
          width: 100%; width: 100%;
          td { td {
          padding: 6px; padding: 6px;
          border: 1px solid #e8e8e8; border: 1px solid #e8e8e8;
          } }
          thead { thead {
          tr { tr {
          font-weight: 600; font-weight: 600;
          background: #fafafa; background: #fafafa;
          } }
          td { td {
          width: 12rem; width: 12rem;
          } }
          } }
          tbody { tbody {
          tr:hover { tr:hover {
          background-color: #ededed; background-color: #ededed;
          ...@@ -130,6 +169,7 @@ ...@@ -130,6 +169,7 @@
          display: flex; display: flex;
          justify-content: flex-end; justify-content: flex-end;
          margin-bottom: 15px; margin-bottom: 15px;
          .ant-btn { .ant-btn {
          display: flex; display: flex;
          align-items: center; align-items: center;
          ...@@ -138,34 +178,15 @@ ...@@ -138,34 +178,15 @@
          } }
          } }
          // 表格样式 .timelimitBox {
          .ant-table-pagination { height: 600px;
          padding-right: 12px;
          background: white; .ant-table-wrapper {
          margin: 1px 0; height: 100%;
          padding: 8px;
          padding-right: 20px; .ant-table {
          } // height: 100%;
          .ant-table-thead tr th { height: 500px;
          font-weight: 600; }
          color: rgba(0, 0, 0, 0.85);
          }
          .ant-table-cell {
          // text-align: center;
          overflow: hidden;
          white-space: nowrap;
          }
          .ant-table-body {
          height: calc(100vh - 160px);
          border-right: 1px solid rgb(240, 240, 240);
          overflow: auto !important;
          }
          .ant-pagination {
          z-index: 999;
          border-top: 1px solid #f0eded;
          }
          .unfoldTable {
          .ant-table {
          margin-left: -9px !important;
          } }
          } }
          \ No newline at end of file
          src/pages/bsmanager/workOrder/workFlow/flowComponents/Timelimit.jsx
          View file @ 76477a88
          ...@@ -157,40 +157,42 @@ const Timelimit = props => { ...@@ -157,40 +157,42 @@ const Timelimit = props => {
          footer={null} footer={null}
          destroyOnClose destroyOnClose
          > >
          <div className={styles.buttonList}> <div className={styles.timelimitBox}>
          <Button <div className={styles.buttonList}>
          type="primary" <Button
          onClick={() => { type="primary"
          setViewModal(true); onClick={() => {
          setModalType('add'); setViewModal(true);
          }} setModalType('add');
          icon={<PlusOutlined />} }}
          > icon={<PlusOutlined />}
          新增流程时限配置 >
          </Button> 新增流程时限配置
          </Button>
          </div>
          <Spin spinning={loading} tip="loading...">
          <Table
          dataSource={tableData}
          columns={columns}
          rowKey={record => record.ID}
          bordered
          size="small"
          scroll={{ y: '400px' }}
          onRow={record => ({
          onDoubleClick: () => {
          toEdit(record);
          },
          })}
          pagination={{
          showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条`,
          pageSizeOptions: [10, 20, 50, 100],
          defaultPageSize: 10,
          showQuickJumper: true,
          showSizeChanger: true,
          }}
          />
          </Spin>
          </div> </div>
          <Spin spinning={loading} tip="loading...">
          <Table
          dataSource={tableData}
          columns={columns}
          rowKey={record => record.ID}
          bordered
          size="small"
          scroll={{ y: '500px' }}
          onRow={record => ({
          onDoubleClick: () => {
          toEdit(record);
          },
          })}
          pagination={{
          showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条`,
          pageSizeOptions: [10, 20, 50, 100],
          defaultPageSize: 10,
          showQuickJumper: true,
          showSizeChanger: true,
          }}
          />
          </Spin>
          <AddModal <AddModal
          visible={viewModal} visible={viewModal}
          ......
          src/pages/bsmanager/workOrder/workFlow/flowNode/flowNode.jsx
          View file @ 76477a88
          ...@@ -407,22 +407,23 @@ const FlowNode = () => { ...@@ -407,22 +407,23 @@ const FlowNode = () => {
          </Button> </Button>
          </div> </div>
          </div> </div>
          <Spin spinning={loading} tip="loading..."> <div style={{ height: 'calc(100% - 50px)', overflowY: 'scroll' }}>
          <Table <Spin spinning={loading} tip="loading...">
          dataSource={tableData} <Table
          columns={columns} dataSource={tableData}
          rowKey={record => record.GroupName} columns={columns}
          size="small" rowKey={record => record.GroupName}
          showHeader size="small"
          scroll={{ y: '100vh-150px' }} showHeader
          expandable={{ expandable={{
          expandedRowRender: record => createUnfoldTable(record.Items), expandedRowRender: record => createUnfoldTable(record.Items),
          }} }}
          expandedRowKeys={expandedRowKeys} expandedRowKeys={expandedRowKeys}
          onExpand={onUnfold} onExpand={onUnfold}
          pagination={false} pagination={false}
          /> />
          </Spin> </Spin>
          </div>
          <NodeEdit <NodeEdit
          visible={visible.nodeEdit} visible={visible.nodeEdit}
          ......
          src/pages/bsmanager/workOrder/workFlow/flowNode/flowNode.less
          View file @ 76477a88
          ...@@ -2,22 +2,64 @@ ...@@ -2,22 +2,64 @@
          .NodeContent { .NodeContent {
          position: relative; position: relative;
          width: 100%; width: 100%;
          height: calc(100vh - 74px); // height: calc(100vh - 74px);
          height: 100%;
          min-width: 800px; min-width: 800px;
          background: white; background: white;
          // 表格样式
          .ant-table-pagination {
          padding-right: 12px;
          background: white;
          margin: 1px 0;
          padding: 8px;
          padding-right: 20px;
          }
          .ant-table-thead tr th {
          font-weight: 600;
          color: rgba(0, 0, 0, 0.85);
          }
          .ant-table-cell {
          // text-align: center;
          overflow: hidden;
          white-space: nowrap;
          }
          .ant-table-body {
          // height: calc(100vh - 160px);
          // border-right: 1px solid rgb(240, 240, 240);
          // overflow: auto !important;
          }
          .ant-pagination {
          z-index: 999;
          border-top: 1px solid #f0eded;
          }
          .unfoldTable {
          .ant-table {
          margin-left: -9px !important;
          }
          }
          .header { .header {
          display: flex; display: flex;
          justify-content: space-between; justify-content: space-between;
          height: 50px; height: 50px;
          line-height: 50px; line-height: 50px;
          .nodeTitle { .nodeTitle {
          font-size: 18px; font-size: 18px;
          color: #0072ff; color: #0072ff;
          font-weight: bold; font-weight: bold;
          margin-left: 10px; margin-left: 10px;
          } }
          .buttonBox { .buttonBox {
          margin-right: 10px; margin-right: 10px;
          .ant-btn { .ant-btn {
          vertical-align: middle; vertical-align: middle;
          line-height: 1px; line-height: 1px;
          ...@@ -30,14 +72,17 @@ ...@@ -30,14 +72,17 @@
          .formData { .formData {
          height: calc(100vh - 162px); height: calc(100vh - 162px);
          overflow-y: scroll; overflow-y: scroll;
          .ant-radio-wrapper { .ant-radio-wrapper {
          min-width: 130px; min-width: 130px;
          } }
          .filedListItem { .filedListItem {
          display: flex; display: flex;
          flex-wrap: nowrap; flex-wrap: nowrap;
          justify-content: space-between; justify-content: space-between;
          width: 100%; width: 100%;
          .ant-btn-icon-only { .ant-btn-icon-only {
          display: flex; display: flex;
          align-items: center; align-items: center;
          ...@@ -51,6 +96,7 @@ ...@@ -51,6 +96,7 @@
          // 字段集选择 // 字段集选择
          .fieldContent { .fieldContent {
          display: flex; display: flex;
          .willSelectBox { .willSelectBox {
          width: 50%; width: 50%;
          height: 600px; height: 600px;
          ...@@ -58,42 +104,56 @@ ...@@ -58,42 +104,56 @@
          padding: 8px; padding: 8px;
          border-right: 1px solid rgb(153, 187, 232); border-right: 1px solid rgb(153, 187, 232);
          box-sizing: border-box; box-sizing: border-box;
          .cardContent { .cardContent {
          height: 530px; height: 530px;
          overflow-y: scroll; overflow-y: scroll;
          .cardBox { .cardBox {
          padding: 10px; padding: 10px;
          margin-bottom: 10px; margin-bottom: 10px;
          border: 1px solid #b5b8c8; border: 1px solid #b5b8c8;
          box-sizing: border-box; box-sizing: border-box;
          } }
          .filedList {
          .ant-checkbox-wrapper {
          width: 100%;
          }
          }
          } }
          } }
          .hasSelectBox { .hasSelectBox {
          width: 50%; width: 50%;
          height: 600px; height: 600px;
          padding: 8px 8px 8px 12px; padding: 8px 8px 8px 12px;
          box-sizing: border-box; box-sizing: border-box;
          .doctorTable { .doctorTable {
          margin-bottom: 16px; margin-bottom: 16px;
          height: 530px; height: 530px;
          overflow-y: scroll; overflow-y: scroll;
          } }
          } }
          .header { .header {
          margin: 0px 0px 10px; margin: 0px 0px 10px;
          background-color: rgb(223, 232, 246); background-color: rgb(223, 232, 246);
          .headDivider { .headDivider {
          margin-bottom: 10px; margin-bottom: 10px;
          background-color: #dfe8f6; background-color: #dfe8f6;
          } }
          } }
          .cardDivider { .cardDivider {
          margin-bottom: 10px; margin-bottom: 10px;
          font-weight: 700; font-weight: 700;
          color: #15428b; color: #15428b;
          line-height: 100%; line-height: 100%;
          border-top-color: #99bbe8; border-top-color: #99bbe8;
          .groupName { .groupName {
          display: inline-block; display: inline-block;
          margin-right: 10px; margin-right: 10px;
          ...@@ -101,6 +161,11 @@ ...@@ -101,6 +161,11 @@
          overflow: hidden; overflow: hidden;
          text-overflow: ellipsis; text-overflow: ellipsis;
          white-space: nowrap; white-space: nowrap;
          vertical-align: middle;
          }
          .ant-checkbox-wrapper {
          vertical-align: middle;
          } }
          } }
          } }
          ...@@ -109,6 +174,7 @@ ...@@ -109,6 +174,7 @@
          display: flex; display: flex;
          justify-content: flex-end; justify-content: flex-end;
          margin-bottom: 15px; margin-bottom: 15px;
          .ant-btn { .ant-btn {
          display: flex; display: flex;
          align-items: center; align-items: center;
          ...@@ -117,34 +183,15 @@ ...@@ -117,34 +183,15 @@
          } }
          } }
          // 表格样式 .auxiliaryViewBox {
          .ant-table-pagination { height: 600px;
          padding-right: 12px;
          background: white; .ant-table-wrapper {
          margin: 1px 0; height: 100%;
          padding: 8px;
          padding-right: 20px; .ant-table {
          } // height: 100%;
          .ant-table-thead tr th { height: 500px;
          font-weight: 600; }
          color: rgba(0, 0, 0, 0.85);
          }
          .ant-table-cell {
          // text-align: center;
          overflow: hidden;
          white-space: nowrap;
          }
          .ant-table-body {
          height: calc(100vh - 160px);
          border-right: 1px solid rgb(240, 240, 240);
          overflow: auto !important;
          }
          .ant-pagination {
          z-index: 999;
          border-top: 1px solid #f0eded;
          }
          .unfoldTable {
          .ant-table {
          margin-left: -9px !important;
          } }
          } }
          \ No newline at end of file
          src/pages/bsmanager/workOrder/workFlow/flowNode/flowNodeComponents/AuxiliaryView.jsx
          View file @ 76477a88
          ...@@ -93,22 +93,36 @@ const AuxiliaryView = props => { ...@@ -93,22 +93,36 @@ const AuxiliaryView = props => {
          title: '前端视图', title: '前端视图',
          dataIndex: 'WebPage', dataIndex: 'WebPage',
          align: 'center', align: 'center',
          ellipsis: {
          showTitle: true,
          },
          render: text => { render: text => {
          if (text === '(未配置)' || text === '(无)') { if (text === '(未配置)' || text === '(无)') {
          return <span style={{ color: 'grey' }}>{text}</span>; return <span style={{ color: 'grey' }}>{text}</span>;
          } }
          return <span>{text}</span>; return (
          <Tooltip placement="topLeft" title={text}>
          <span>{text}</span>
          </Tooltip>
          );
          }, },
          }, },
          { {
          title: '前端参数', title: '前端参数',
          dataIndex: 'WebParam', dataIndex: 'WebParam',
          align: 'center', align: 'center',
          ellipsis: {
          showTitle: true,
          },
          render: text => { render: text => {
          if (text === '(未配置)' || text === '(无)') { if (text === '(未配置)' || text === '(无)') {
          return <span style={{ color: 'grey' }}>{text}</span>; return <span style={{ color: 'grey' }}>{text}</span>;
          } }
          return <span>{text}</span>; return (
          <Tooltip placement="topLeft" title={text}>
          <span>{text}</span>
          </Tooltip>
          );
          }, },
          }, },
          { {
          ...@@ -183,41 +197,42 @@ const AuxiliaryView = props => { ...@@ -183,41 +197,42 @@ const AuxiliaryView = props => {
          centered centered
          footer={null} footer={null}
          > >
          <div className={styles.buttonList}> <div className={styles.auxiliaryViewBox}>
          <Button <div className={styles.buttonList}>
          type="primary" <Button
          onClick={() => { type="primary"
          setViewModal(true); onClick={() => {
          setModalType('add'); setViewModal(true);
          }} setModalType('add');
          icon={<PlusOutlined />} }}
          > icon={<PlusOutlined />}
          新增辅助视图 >
          </Button> 新增辅助视图1
          </Button>
          </div>
          <Spin spinning={loading} tip="loading...">
          <Table
          dataSource={tableData}
          columns={columns}
          rowKey={record => record.ID}
          bordered
          size="small"
          scroll={{ y: '400px' }}
          onRow={record => ({
          onDoubleClick: () => {
          toEdit(record);
          },
          })}
          pagination={{
          showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条`,
          pageSizeOptions: [10, 20, 50, 100],
          defaultPageSize: 10,
          showQuickJumper: true,
          showSizeChanger: true,
          }}
          />
          </Spin>
          </div> </div>
          <Spin spinning={loading} tip="loading...">
          <Table
          dataSource={tableData}
          columns={columns}
          rowKey={record => record.ID}
          bordered
          size="small"
          scroll={{ y: '500px' }}
          onRow={record => ({
          onDoubleClick: () => {
          toEdit(record);
          },
          })}
          pagination={{
          showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条`,
          pageSizeOptions: [10, 20, 50, 100],
          defaultPageSize: 10,
          showQuickJumper: true,
          showSizeChanger: true,
          }}
          />
          </Spin>
          <AddModal <AddModal
          visible={viewModal} visible={viewModal}
          msg={editMsg} msg={editMsg}
          ......
          src/pages/bsmanager/workOrder/workflowEdit/Workflow.jsx
          View file @ 76477a88
          ...@@ -21,7 +21,7 @@ import FlowModal from './workFlowComponents/FlowModal'; ...@@ -21,7 +21,7 @@ import FlowModal from './workFlowComponents/FlowModal';
          import FlowGroupModal from './workFlowComponents/FlowGroupModal'; import FlowGroupModal from './workFlowComponents/FlowGroupModal';
          import styles from './workflow.less'; import styles from './workflow.less';
          import { list } from 'postcss';
          const { confirm } = Modal; const { confirm } = Modal;
          const Workflow = () => { const Workflow = () => {
          ...@@ -38,7 +38,7 @@ const Workflow = () => { ...@@ -38,7 +38,7 @@ const Workflow = () => {
          const [canSelect, setCanSelect] = useState(true); // 是否可以切换树 const [canSelect, setCanSelect] = useState(true); // 是否可以切换树
          const [expandedKey, setExpandedKey] = useState(''); // 默认展开项 const [expandedKey, setExpandedKey] = useState(''); // 默认展开项
          const [flag, setFlag] = useState(1); const [flag, setFlag] = useState(1);
          const [keep, setKeep] = useState([]) const [keep, setKeep] = useState([]);
          const [visible, setVisible] = useState({ const [visible, setVisible] = useState({
          FlowModal: false, FlowModal: false,
          FlowGroupModal: false, FlowGroupModal: false,
          ...@@ -84,16 +84,16 @@ const Workflow = () => { ...@@ -84,16 +84,16 @@ const Workflow = () => {
          setTreeLoading(false); setTreeLoading(false);
          if (res.code === 0) { if (res.code === 0) {
          setFlag(flag + 1); setFlag(flag + 1);
          let listdata =[] let listdata = [];
          res.data.map(i=>{ res.data.forEach(i => {
          if(i.children.length>0){ if (i.children.length > 0) {
          i.children.map(j=>{ i.children.forEach(j => {
          listdata.push(j.FlowName) listdata.push(j.FlowName);
          }) });
          } }
          }) });
          console.log(listdata)
          setKeep(listdata) setKeep(listdata);
          let data = res.data.map(item => { let data = res.data.map(item => {
          item.isOld = true; item.isOld = true;
          return item; return item;
          ...@@ -299,7 +299,7 @@ const Workflow = () => { ...@@ -299,7 +299,7 @@ const Workflow = () => {
          [styles.treeContainerHide]: !treeVisible, [styles.treeContainerHide]: !treeVisible,
          })} })}
          > >
          <div style={{ display: `${treeVisible ? 'block' : 'none'}` }}> <div style={{ display: `${treeVisible ? 'block' : 'none'}`, height: '100%' }}>
          <span className={styles.processTitle}>流程树</span> <span className={styles.processTitle}>流程树</span>
          <Tooltip title="添加流程组"> <Tooltip title="添加流程组">
          <PlusSquareFilled onClick={e => addFlowGroup(e)} className={styles.treeHeadIcon} /> <PlusSquareFilled onClick={e => addFlowGroup(e)} className={styles.treeHeadIcon} />
          ......
          src/pages/bsmanager/workOrder/workflowEdit/workFlowComponents/FlowChart.jsx
          View file @ 76477a88
          ...@@ -470,14 +470,15 @@ const FlowChart = props => { ...@@ -470,14 +470,15 @@ const FlowChart = props => {
          保存 保存
          </Button> </Button>
          </div> </div>
          <Spin spinning={chartLoading}> <div className={styles.chartBox}>
          <div <Spin spinning={chartLoading}>
          id="myDiagramDiv" <div
          className={styles.myDiagramDiv} id="myDiagramDiv"
          style={{ backgroundColor: '#EFF8FA' }} className={styles.myDiagramDiv}
          /> style={{ backgroundColor: '#EFF8FA' }}
          </Spin> />
          </Spin>
          </div>
          <NodeModal <NodeModal
          visible={visible} visible={visible}
          editMsg={editMsg} editMsg={editMsg}
          ......
          src/pages/bsmanager/workOrder/workflowEdit/workFlowComponents/flowChartComponents/nodeModalComponents/RoalChoose.jsx
          View file @ 76477a88
          ...@@ -149,29 +149,31 @@ const RoalChoose = props => { ...@@ -149,29 +149,31 @@ const RoalChoose = props => {
          // 角色列表样式 // 角色列表样式
          const roleDom = () => ( const roleDom = () => (
          <> <>
          <Spin spinning={loading}> <div className={styles.checkContainer}>
          {plainOptions.length > 0 ? ( <Spin spinning={loading}>
          <div className={styles.checkContent}> {plainOptions.length > 0 ? (
          {plainOptions.map((item, index) => ( <div className={styles.checkContent}>
          <div key={item.id} className={styles.check} title={item.name}> {plainOptions.map((item, index) => (
          <Checkbox <div key={item.id} className={styles.check} title={item.name}>
          checked={item.isChecked} <Checkbox
          onChange={e => { checked={item.isChecked}
          selectChange(e, index, item); onChange={e => {
          }} selectChange(e, index, item);
          > }}
          {item.name} >
          </Checkbox> {item.name}
          </div> </Checkbox>
          ))} </div>
          </div> ))}
          ) : ( </div>
          <Empty ) : (
          image={Empty.PRESENTED_IMAGE_SIMPLE} <Empty
          description={`未有查找到${roleType === '2' ? '角色' : '机构'}`} image={Empty.PRESENTED_IMAGE_SIMPLE}
          /> description={`未有查找到${roleType === '2' ? '角色' : '机构'}`}
          )} />
          </Spin> )}
          </Spin>
          </div>
          </> </>
          ); );
          return ( return (
          ......
          src/pages/bsmanager/workOrder/workflowEdit/workFlowComponents/flowChartComponents/nodeModalComponents/RoalChoose.less
          View file @ 76477a88
          ...@@ -2,16 +2,20 @@ ...@@ -2,16 +2,20 @@
          .ant-modal-body { .ant-modal-body {
          padding: 0; padding: 0;
          } }
          .ant-modal-header { .ant-modal-header {
          padding: 28px 16px; padding: 28px 16px;
          } }
          .pageContent { .pageContent {
          display: flex; display: flex;
          height: 450px; height: 465px;
          .optionalList { .optionalList {
          position: relative; position: relative;
          width: 60%; width: 60%;
          border-right: 1px solid #e7e7e7; border-right: 1px solid #e7e7e7;
          .title { .title {
          position: absolute; position: absolute;
          left: 17px; left: 17px;
          ...@@ -21,12 +25,15 @@ ...@@ -21,12 +25,15 @@
          z-index: 1; z-index: 1;
          color: #00070d; color: #00070d;
          } }
          .tabContent { .tabContent {
          height: 430px; height: 430px;
          .ant-tabs-content-holder { .ant-tabs-content-holder {
          height: 355px; height: 355px;
          } }
          } }
          .searchInput { .searchInput {
          position: absolute; position: absolute;
          width: 200px; width: 200px;
          ...@@ -39,47 +46,64 @@ ...@@ -39,47 +46,64 @@
          border-top-left-radius: 20px; border-top-left-radius: 20px;
          border-bottom-left-radius: 20px; border-bottom-left-radius: 20px;
          } }
          .ant-input-group-addon { .ant-input-group-addon {
          border-top-right-radius: 20px; border-top-right-radius: 20px;
          border-bottom-right-radius: 20px; border-bottom-right-radius: 20px;
          } }
          .ant-input-search-button { .ant-input-search-button {
          width: 40px; width: 40px;
          border-top-right-radius: 20px; border-top-right-radius: 20px;
          border-bottom-right-radius: 20px; border-bottom-right-radius: 20px;
          } }
          } }
          .checkContent {
          display: flex; .checkContainer {
          flex-wrap: wrap; height: 360px;
          margin-left: 32px; overflow-y: scroll;
          .check {
          width: 150px; .checkContent {
          margin-bottom: 10px; display: flex;
          margin-right: 6px; flex-wrap: wrap;
          .ant-checkbox-wrapper span { margin-left: 32px;
          max-width: 130px;
          overflow: hidden; .check {
          text-overflow: ellipsis; width: 150px;
          white-space: nowrap; margin-bottom: 10px;
          margin-right: 6px;
          .ant-checkbox-wrapper span {
          max-width: 130px;
          overflow: hidden;
          text-overflow: ellipsis;
          white-space: nowrap;
          }
          } }
          } }
          } }
          .footer { .footer {
          padding-left: 25px; padding-left: 25px;
          .ant-pagination { .ant-pagination {
          border: none; border: none;
          } }
          } }
          .ant-tabs-nav { .ant-tabs-nav {
          background-color: #f2f1f1; background-color: #f2f1f1;
          } }
          .ant-tabs-tab { .ant-tabs-tab {
          background-color: #f2f1f1; background-color: #f2f1f1;
          color: #666666; color: #666666;
          border-top-left-radius: 5px; border-top-left-radius: 5px;
          border-top-right-radius: 5px; border-top-right-radius: 5px;
          } }
          .ant-tabs-tab-active { .ant-tabs-tab-active {
          background-color: #fff; background-color: #fff;
          color: #1685ff; color: #1685ff;
          ...@@ -87,6 +111,7 @@ ...@@ -87,6 +111,7 @@
          border-top-right-radius: 5px; border-top-right-radius: 5px;
          } }
          } }
          .selectedList { .selectedList {
          position: relative; position: relative;
          width: 40%; width: 40%;
          ...@@ -95,6 +120,7 @@ ...@@ -95,6 +120,7 @@
          height: 40px; height: 40px;
          width: 100%; width: 100%;
          background-color: #f2f1f1; background-color: #f2f1f1;
          .title { .title {
          position: absolute; position: absolute;
          left: 17px; left: 17px;
          ...@@ -104,16 +130,19 @@ ...@@ -104,16 +130,19 @@
          z-index: 1; z-index: 1;
          color: #00070d; color: #00070d;
          } }
          .tagHead { .tagHead {
          display: flex; display: flex;
          position: absolute; position: absolute;
          top: 10px; top: 10px;
          left: 88px; left: 88px;
          .tagContent { .tagContent {
          display: flex; display: flex;
          align-items: center; align-items: center;
          margin-right: 11px; margin-right: 11px;
          } }
          .tagRol, .tagRol,
          .tagOrg { .tagOrg {
          width: 10px; width: 10px;
          ...@@ -121,22 +150,27 @@ ...@@ -121,22 +150,27 @@
          margin-right: 5px; margin-right: 5px;
          } }
          .tagRol { .tagRol {
          background-color: #87E8DE; background-color: #87E8DE;
          } }
          .tagOrg { .tagOrg {
          background-color: #FFD591; background-color: #FFD591;
          } }
          } }
          } }
          .selectBox { .selectBox {
          height: 365px; height: 365px;
          padding: 10px; padding: 10px;
          overflow-y: scroll; overflow-y: scroll;
          .selectContent { .selectContent {
          display: flex; display: flex;
          flex-wrap: wrap; flex-wrap: wrap;
          flex-direction: row; flex-direction: row;
          .selectValue { .selectValue {
          margin-bottom: 15px; margin-bottom: 15px;
          } }
          ...@@ -144,4 +178,4 @@ ...@@ -144,4 +178,4 @@
          } }
          } }
          } }
          } }
          \ No newline at end of file
          src/pages/bsmanager/workOrder/workflowEdit/workflow.less
          View file @ 76477a88
          ...@@ -3,47 +3,62 @@ ...@@ -3,47 +3,62 @@
          position: relative; position: relative;
          display: flex; display: flex;
          width: 100%; width: 100%;
          height: 100%;
          .treeContainer { .treeContainer {
          position: relative; position: relative;
          left: 0; left: 0;
          top: 0; top: 0;
          height: calc(100vh - 74px); height: 100%;
          width: 250px; width: 250px;
          margin-right: 10px; margin-right: 10px;
          transition-property: width, left; transition-property: width, left;
          transition-duration: 0.5s; transition-duration: 0.5s;
          white-space: nowrap; white-space: nowrap;
          .ant-card-body {
          height: 100%;
          padding: 12px 24px 24px 10px;
          }
          .processTitle { .processTitle {
          font-size: 15px; font-size: 15px;
          font-weight: bold; font-weight: bold;
          color: #333e51; color: #333e51;
          padding-left: 14px; padding-left: 14px;
          } }
          .treeContent { .treeContent {
          height: calc(100vh - 150px); height: calc(100% - 50px);
          overflow-y: scroll; overflow-y: scroll;
          } }
          .treeHeadIcon { .treeHeadIcon {
          color: #1890ff; color: #1890ff;
          font-size: 25px; font-size: 25px;
          vertical-align: middle; vertical-align: middle;
          margin-left: 130px; margin-left: 130px;
          } }
          .ant-tree-treenode { .ant-tree-treenode {
          width: 100%; width: 100%;
          } }
          .ant-tree-title { .ant-tree-title {
          width: 100%; width: 100%;
          } }
          .nodeTitle { .nodeTitle {
          width: 100%; width: 100%;
          display: flex; display: flex;
          align-items: center; align-items: center;
          justify-content: space-between; justify-content: space-between;
          margin-bottom: 5px; margin-bottom: 5px;
          .nodeTip { .nodeTip {
          display: none; display: none;
          .fs { .fs {
          font-size: 18px; font-size: 18px;
          margin-left: 5px; margin-left: 5px;
          ...@@ -51,6 +66,7 @@ ...@@ -51,6 +66,7 @@
          } }
          } }
          } }
          .nodeTitle:hover { .nodeTitle:hover {
          .nodeTip { .nodeTip {
          display: flex; display: flex;
          ...@@ -58,6 +74,7 @@ ...@@ -58,6 +74,7 @@
          justify-content: flex-end; justify-content: flex-end;
          } }
          } }
          .switcher { .switcher {
          display: block; display: block;
          position: absolute; position: absolute;
          ...@@ -69,22 +86,31 @@ ...@@ -69,22 +86,31 @@
          z-index: 1; z-index: 1;
          } }
          } }
          .treeContainerHide { .treeContainerHide {
          left: 0px; left: 0px;
          top: 0; top: 0;
          width: 26px; width: 26px;
          } }
          // 流程图 // 流程图
          .flowChartContainer { .flowChartContainer {
          position: relative; position: relative;
          width: 100%; width: 100%;
          height: calc(100vh - 74px); height: calc(100%);
          background-color: #fff; background-color: #fff;
          .chartBox {
          height: calc(100% - 62px);
          }
          .buttonList { .buttonList {
          display: flex; display: flex;
          justify-content: flex-start; justify-content: flex-start;
          margin: 15px 0 15px 0; margin: 15px 0 15px 0;
          .ant-btn { .ant-btn {
          display: flex; display: flex;
          align-items: center; align-items: center;
          ...@@ -92,22 +118,27 @@ ...@@ -92,22 +118,27 @@
          margin-left: 10px; margin-left: 10px;
          } }
          } }
          canvas { canvas {
          border: 0px; border: 0px;
          outline: none; outline: none;
          } }
          .myDiagramDiv { .myDiagramDiv {
          width: 100%; width: 100%;
          height: calc(100vh - 135px); height: 100%;
          } }
          } }
          } }
          // 角色用户列表 // 角色用户列表
          .pageContent { .pageContent {
          display: flex; display: flex;
          .roleContent { .roleContent {
          width: 50%; width: 50%;
          margin-right: 10px; margin-right: 10px;
          .treeContent { .treeContent {
          width: 100%; width: 100%;
          height: 370px; height: 370px;
          ...@@ -115,17 +146,21 @@ ...@@ -115,17 +146,21 @@
          padding: 8px 20px 20px 20px; padding: 8px 20px 20px 20px;
          box-sizing: border-box; box-sizing: border-box;
          border: 1px solid #ccc; border: 1px solid #ccc;
          .ant-tree-list-holder { .ant-tree-list-holder {
          height: 285px; height: 285px;
          } }
          } }
          .footer { .footer {
          position: relative; position: relative;
          z-index: 999; z-index: 999;
          } }
          } }
          .userContent { .userContent {
          width: 50%; width: 50%;
          .userCheckBox { .userCheckBox {
          margin-top: 41px; margin-top: 41px;
          padding: 20px; padding: 20px;
          ...@@ -133,6 +168,7 @@ ...@@ -133,6 +168,7 @@
          width: 100%; width: 100%;
          height: 370px; height: 370px;
          border: 1px solid #ccc; border: 1px solid #ccc;
          .checkContent { .checkContent {
          height: 285px; height: 285px;
          width: 100%; width: 100%;
          ...@@ -140,4 +176,4 @@ ...@@ -140,4 +176,4 @@
          } }
          } }
          } }
          } }
          \ No newline at end of file
          src/pages/dataCenter/dictionary/WebDic.jsx
          View file @ 76477a88
          ...@@ -1041,10 +1041,13 @@ const WebDic = () => { ...@@ -1041,10 +1041,13 @@ const WebDic = () => {
          okText="确认" okText="确认"
          cancelText="取消" cancelText="取消"
          > >
          <Form autoComplete="off" form={addForm} labelCol={{ span: 3 }}> <Form form={addForm} labelCol={{ span: 3 }}>
          <Form.Item name="nodeName" label="名称" rules={[{ required: true, message: '不能为空' }]}> <Form.Item name="nodeName" label="名称" rules={[{ required: true, message: '不能为空' }]}>
          <Input placeholder="请输入名称" style={{ width: '95%' }} /> <Input placeholder="请输入名称" style={{ width: '95%' }} />
          </Form.Item> </Form.Item>
          <Form.Item name="nodeName" label="名称" style={{ display: 'none' }}>
          <Input placeholder="请输入名称" style={{ width: '95%' }} />
          </Form.Item>
          </Form> </Form>
          </Modal> </Modal>
          {/* 添加二级 */} {/* 添加二级 */}
          ......
          src/pages/database/InitDataBase/InitDataBase.jsx
          View file @ 76477a88
          ...@@ -887,23 +887,25 @@ const InitDataBase = props => { ...@@ -887,23 +887,25 @@ const InitDataBase = props => {
          </Card> </Card>
          <Card className={styles.mgTop20}> <Card className={styles.mgTop20}>
          <div className={styles.tableTitle}>近期保存的数据库连接</div> <div className={styles.recordBox}>
          <Table <div className={styles.tableTitle}>近期保存的数据库连接</div>
          style={{ marginTop: '20px' }} <Table
          scroll={{ x: 'max-content', y: 'calc(100vh - 550px)' }} style={{ marginTop: '20px', marginBottom: '20px' }}
          columns={columns} scroll={{ x: 'max-content', y: 'calc(100vh - 550px)' }}
          dataSource={data} columns={columns}
          pagination={false} dataSource={data}
          bordered pagination={false}
          loading={tableLoading} bordered
          size="small" loading={tableLoading}
          onRow={record => ({ size="small"
          onClick: () => { onRow={record => ({
          tableClick(record); onClick: () => {
          setFlag(0); tableClick(record);
          }, // 点击行 setFlag(0);
          })} }, // 点击行
          /> })}
          />
          </div>
          </Card> </Card>
          <Modal <Modal
          title="初始化数据库" title="初始化数据库"
          ......
          src/pages/database/InitDataBase/InitDataBase.less
          View file @ 76477a88
          .tableTitle { .tableTitle {
          font-size: 16px; font-size: 16px;
          } }
          .mgTop20 {
          margin-top: 20px !important;
          }
          .tCenter { .tCenter {
          text-align: center; text-align: center;
          .btnBox { .btnBox {
          display: flex !important; display: flex !important;
          justify-content: space-between; justify-content: space-between;
          } }
          } }
          .decsBox { .decsBox {
          height: 32px; height: 32px;
          line-height: 32px; line-height: 32px;
          ...@@ -19,10 +21,24 @@ ...@@ -19,10 +21,24 @@
          .ant-modal-header { .ant-modal-header {
          height: 70px; height: 70px;
          } }
          InitDataBaseContainer {
          .InitDataBaseContainer {
          .ant-card-body { .ant-card-body {
          padding-bottom: 0px !important; padding-bottom: 0px !important;
          } }
          .mgTop20 {
          margin-top: 20px;
          }
          // .recordBox {
          // height: 300px;
          // }
          } }
          .cardContainer { .cardContainer {
          ...@@ -32,18 +48,21 @@ InitDataBaseContainer { ...@@ -32,18 +48,21 @@ InitDataBaseContainer {
          .ant-tabs-nav { .ant-tabs-nav {
          background-color: #f4f6fc; background-color: #f4f6fc;
          .ant-tabs-tab { .ant-tabs-tab {
          background-color: transparent; background-color: transparent;
          border: none; border: none;
          border-top: 2px solid transparent; border-top: 2px solid transparent;
          box-sizing: content-box; box-sizing: content-box;
          } }
          .ant-tabs-tab-active { .ant-tabs-tab-active {
          border: none; border: none;
          background-color: #fff; background-color: #fff;
          border-top: 2px solid #1685ff; border-top: 2px solid #1685ff;
          } }
          } }
          .tabContainer { .tabContainer {
          padding-left: 20px; padding-left: 20px;
          box-sizing: border-box; box-sizing: border-box;
          ...@@ -52,16 +71,19 @@ InitDataBaseContainer { ...@@ -52,16 +71,19 @@ InitDataBaseContainer {
          .initItemData1 { .initItemData1 {
          height: calc(100vh - 190px); height: calc(100vh - 190px);
          // overflow: scroll; // overflow: scroll;
          .btnBox { .btnBox {
          display: flex !important; display: flex !important;
          justify-content: flex-end; justify-content: flex-end;
          } }
          .ant-checkbox-wrapper { .ant-checkbox-wrapper {
          width: 298px; width: 298px;
          margin-bottom: 10px; margin-bottom: 10px;
          margin-left: 8px; margin-left: 8px;
          } }
          // .ant-checkbox-wrapper { // .ant-checkbox-wrapper {
          // width: 298px; // width: 298px;
          // margin-bottom: 10px; // margin-bottom: 10px;
          ...@@ -75,16 +97,19 @@ InitDataBaseContainer { ...@@ -75,16 +97,19 @@ InitDataBaseContainer {
          .initItemData { .initItemData {
          height: calc(100vh - 190px); height: calc(100vh - 190px);
          overflow: scroll; overflow: scroll;
          .btnBox { .btnBox {
          display: flex !important; display: flex !important;
          justify-content: flex-end; justify-content: flex-end;
          } }
          .ant-checkbox-wrapper { .ant-checkbox-wrapper {
          width: 268px; width: 268px;
          margin-bottom: 10px; margin-bottom: 10px;
          margin-left: 8px; margin-left: 8px;
          } }
          .view:hover { .view:hover {
          cursor: not-allowed; cursor: not-allowed;
          } }
          } }
          \ No newline at end of file
          src/pages/database/ManagementDataBase/ManagementDataBase.less
          View file @ 76477a88
          .tableTitle{ .tableTitle {
          font-size: 16px; font-size: 16px;
          display: flex; display: flex;
          justify-content: space-between; justify-content: space-between;
          } }
          .mgTop20{
          margin-top: 20px !important; .mgTop20 {
          margin-top: 20px;
          } }
          .tCenter{
          .tCenter {
          text-align: center; text-align: center;
          } }
          .btnBox{
          .btnBox {
          text-align: center; text-align: center;
          margin-top: 10px; margin-top: 10px;
          } }
          .pageContent {
          height: 100%;
          width: 100%;
          overflow-y: scroll;
          }
          \ No newline at end of file
          src/pages/database/databaseConfig/DatabaseConfig.jsx
          View file @ 76477a88
          ...@@ -92,25 +92,30 @@ const DatabaseConnectConfig = props => { ...@@ -92,25 +92,30 @@ const DatabaseConnectConfig = props => {
          return ( return (
          <PageContainer> <PageContainer>
          <Card> <div style={{ width: '100%', height: '100%', overflowY: 'scroll' }}>
          {/* <Tabs activeKey={active} onChange={e => handleChange(e)}> <Card>
          {/* <Tabs activeKey={active} onChange={e => handleChange(e)}>
          {dataArr.map(item => ( {dataArr.map(item => (
          <TabPane tab={item.title} key={item.key}> <TabPane tab={item.title} key={item.key}>
          {active === item.key && item.component} {active === item.key && item.component}
          </TabPane> </TabPane>
          ))} ))}
          </Tabs> */} </Tabs> */}
          <div style={{ marginBottom: '15px' }}>
          <SQLServerTable /> <SQLServerTable />
          </div>
          <OracleTable /> <div style={{ marginBottom: '15px' }}>
          <OracleTable />
          <MongDBTable /> </div>
          <div style={{ marginBottom: '15px' }}>
          <MySQLTable /> <MongDBTable />
          </div>
          <MasterTable /> <div style={{ marginBottom: '15px' }}>
          </Card> <MySQLTable />
          </div>
          <MasterTable />
          </Card>
          </div>
          </PageContainer> </PageContainer>
          ); );
          }; };
          ......
          src/pages/database/databaseInitialization/DatabaseInitialization.jsx
          View file @ 76477a88
          ...@@ -1082,7 +1082,7 @@ const DatabaseInitialization = props => { ...@@ -1082,7 +1082,7 @@ const DatabaseInitialization = props => {
          <div style={{ display: 'flex', alignItems: 'center', width: '100%' }}> <div style={{ display: 'flex', alignItems: 'center', width: '100%' }}>
          <div style={{ width: '30%' }}> <div style={{ width: '30%' }}>
          <Card> <Card>
          <div style={{ height: 'calc(100vh - 108px)', paddingTop: '13px' }}> <div style={{ height: 'calc(100vh - 101px)', paddingTop: '13px' }}>
          <Form <Form
          className={styles.mgTop20} className={styles.mgTop20}
          layout="horizontal" layout="horizontal"
          ......
          src/pages/database/databaseInitialization/DatabaseInitialization.less
          View file @ 76477a88
          ...@@ -14,11 +14,13 @@ ...@@ -14,11 +14,13 @@
          .btnBox { .btnBox {
          display: flex !important; display: flex !important;
          justify-content: flex-end; justify-content: flex-end;
          margin-bottom: 10px;
          } }
          .ant-modal-header { .ant-modal-header {
          height: 70px; height: 70px;
          } }
          InitDataBaseContainer { .InitDataBaseContainer {
          height: 100%;
          .ant-card-body { .ant-card-body {
          padding-bottom: 0px !important; padding-bottom: 0px !important;
          } }
          ......
          src/pages/platformCenter/gis/dimensionsConfig/dimensionsConfig.less
          View file @ 76477a88
          .container3d { .container3d {
          width: 100%; width: 100%;
          height: 100%;
          background-color: #ffffff; background-color: #ffffff;
          display: flex; display: flex;
          .ant-tabs-content {
          height: 100%;
          }
          .ant-table-wrapper {
          height: calc(100% - 51px);
          }
          .ant-table { .ant-table {
          min-height: 15rem !important; height: calc(100% - 70px);
          } }
          padding: 0.8rem; padding: 0.8rem;
          .ant-table-thead tr th { .ant-table-thead tr th {
          font-weight: 600; font-weight: 600;
          color: rgba(0, 0, 0, 0.85); color: rgba(0, 0, 0, 0.85);
          } }
          overflow-y: scroll; overflow-y: scroll;
          .ant-input-number-input { .ant-input-number-input {
          background-color: #ffffff; background-color: #ffffff;
          color: #000000; color: #000000;
          } }
          .ant-card-body { .ant-card-body {
          padding: 12px 24px 24px 25px; padding: 12px 24px 24px 25px;
          } }
          } }
          .imgList { .imgList {
          display: flex; display: flex;
          flex-wrap: wrap; flex-wrap: wrap;
          } }
          .imgItem { .imgItem {
          display: flex; display: flex;
          flex-direction: column; flex-direction: column;
          align-items: center; align-items: center;
          margin: 0 1rem 1rem 0; margin: 0 1rem 1rem 0;
          } }
          .tileBtn { .tileBtn {
          display: flex; display: flex;
          justify-content: flex-end; justify-content: flex-end;
          width: 100%; width: 100%;
          padding: 0 0 2rem; padding: 0 0 2rem;
          } }
          .schemeName { .schemeName {
          margin-right: 0.8rem; margin-right: 0.8rem;
          font-weight: bold; font-weight: bold;
          ...@@ -46,10 +64,12 @@ ...@@ -46,10 +64,12 @@
          display: flex; display: flex;
          align-items: center; align-items: center;
          } }
          .schemeBtn { .schemeBtn {
          width: 12rem; width: 12rem;
          justify-content: center; justify-content: center;
          } }
          .mapItem { .mapItem {
          display: flex; display: flex;
          border: 1px solid #ccc; border: 1px solid #ccc;
          ...@@ -59,6 +79,7 @@ ...@@ -59,6 +79,7 @@
          margin: 0.5rem 0; margin: 0.5rem 0;
          width: 14.5rem; width: 14.5rem;
          } }
          .defaultTile { .defaultTile {
          background: #ccc; background: #ccc;
          color: white; color: white;
          ...@@ -69,19 +90,23 @@ ...@@ -69,19 +90,23 @@
          width: 3rem; width: 3rem;
          justify-content: center; justify-content: center;
          } }
          .mapText { .mapText {
          width: 10rem; width: 10rem;
          text-align: center; text-align: center;
          } }
          .mapIcon { .mapIcon {
          display: flex; display: flex;
          justify-content: center; justify-content: center;
          align-items: center; align-items: center;
          cursor: pointer; cursor: pointer;
          } }
          .activeTile { .activeTile {
          background-color: #4699f4; background-color: #4699f4;
          } }
          .dropList { .dropList {
          position: absolute; position: absolute;
          right: 2%; right: 2%;
          ...@@ -89,11 +114,13 @@ ...@@ -89,11 +114,13 @@
          color: rgba(0, 0, 0, 0.25); color: rgba(0, 0, 0, 0.25);
          z-index: 99; z-index: 99;
          } }
          .divider { .divider {
          display: flex; display: flex;
          align-items: center; align-items: center;
          line-height: 100%; line-height: 100%;
          padding: 0.5rem; padding: 0.5rem;
          .dividerIcon { .dividerIcon {
          margin-left: 0.8rem; margin-left: 0.8rem;
          color: #4699f4; color: #4699f4;
          ...@@ -105,15 +132,17 @@ ...@@ -105,15 +132,17 @@
          display: flex; display: flex;
          flex-wrap: wrap; flex-wrap: wrap;
          } }
          .cardItem { .cardItem {
          width: 18rem; width: 18rem;
          height: 26rem; height: 26rem;
          margin: 0 2rem; margin: 0 2rem;
          } }
          .containerFileds { .containerFileds {
          display: flex; display: flex;
          justify-content: space-between; justify-content: space-between;
          width: 98%; width: 98%;
          border: 1px solid #f0f0f0; border: 1px solid #f0f0f0;
          margin-top: 0.5rem; margin-top: 0.5rem;
          } }
          \ No newline at end of file
          src/pages/platformCenter/gis/schemeConfig/SchemeConfig.less
          View file @ 76477a88
          .container { .container {
          width: 100%; width: 100%;
          height: 100%;
          background-color: #ffffff; background-color: #ffffff;
          padding: 0.8rem; padding: 0.8rem;
          display: flex; display: flex;
          .ant-tabs-content {
          height: 100%;
          }
          .ant-table { .ant-table {
          min-height: 15rem !important; min-height: 15rem !important;
          } }
          .ant-table-thead tr th { .ant-table-thead tr th {
          font-weight: 600; font-weight: 600;
          color: rgba(0, 0, 0, 0.85); color: rgba(0, 0, 0, 0.85);
          } }
          overflow-y: scroll; overflow-y: scroll;
          .ant-input-number-input { .ant-input-number-input {
          background-color: #ffffff; background-color: #ffffff;
          color: #000000; color: #000000;
          } }
          .ant-card-body { .ant-card-body {
          padding: 12px 24px 24px 25px; padding: 12px 24px 24px 25px;
          } }
          } }
          .imgList { .imgList {
          display: flex; display: flex;
          flex-wrap: wrap; flex-wrap: wrap;
          } }
          .imgItem { .imgItem {
          border: 3px solid#4699f4; border: 3px solid#4699f4;
          border-radius: 5px; border-radius: 5px;
          } }
          .imgHidden { .imgHidden {
          border: none; border: none;
          } }
          .tileBtn { .tileBtn {
          display: flex; display: flex;
          justify-content: flex-end; justify-content: flex-end;
          width: 100%; width: 100%;
          padding: 0 0 2rem; padding: 0 0 2rem;
          } }
          .schemeName { .schemeName {
          width: 68px; width: 68px;
          margin-right: 0.8rem; margin-right: 0.8rem;
          ...@@ -48,18 +63,21 @@ ...@@ -48,18 +63,21 @@
          display: flex; display: flex;
          align-items: center; align-items: center;
          } }
          .schemeBtn1 { .schemeBtn1 {
          width: 260px; width: 260px;
          justify-content: center; justify-content: center;
          display: flex; display: flex;
          align-items: center; align-items: center;
          } }
          .schemeBtn { .schemeBtn {
          width: 234px; width: 234px;
          justify-content: center; justify-content: center;
          display: flex; display: flex;
          align-items: center; align-items: center;
          } }
          .mapItem { .mapItem {
          display: flex; display: flex;
          border: 1px solid #ccc; border: 1px solid #ccc;
          ...@@ -69,6 +87,7 @@ ...@@ -69,6 +87,7 @@
          margin: 0.5rem 0; margin: 0.5rem 0;
          // width: 14.5rem; // width: 14.5rem;
          } }
          .mapItem1 { .mapItem1 {
          display: flex; display: flex;
          border: 1px solid #ccc; border: 1px solid #ccc;
          ...@@ -78,6 +97,7 @@ ...@@ -78,6 +97,7 @@
          margin: 0.5rem 0; margin: 0.5rem 0;
          width: 18.8rem; width: 18.8rem;
          } }
          .defaultTile { .defaultTile {
          background: #ccc; background: #ccc;
          color: white; color: white;
          ...@@ -88,6 +108,7 @@ ...@@ -88,6 +108,7 @@
          width: 3rem; width: 3rem;
          justify-content: center; justify-content: center;
          } }
          .defaultTile1 { .defaultTile1 {
          background: #4699f4; background: #4699f4;
          color: white; color: white;
          ...@@ -97,6 +118,7 @@ ...@@ -97,6 +118,7 @@
          width: 41px; width: 41px;
          justify-content: center; justify-content: center;
          } }
          .mapText { .mapText {
          width: 14rem; width: 14rem;
          text-align: center; text-align: center;
          ...@@ -106,6 +128,7 @@ ...@@ -106,6 +128,7 @@
          padding-left: 5px; padding-left: 5px;
          padding-right: 5px; padding-right: 5px;
          } }
          .mapText1 { .mapText1 {
          width: 13rem; width: 13rem;
          text-align: center; text-align: center;
          ...@@ -115,6 +138,7 @@ ...@@ -115,6 +138,7 @@
          padding-left: 5px; padding-left: 5px;
          padding-right: 5px; padding-right: 5px;
          } }
          .mapIcon { .mapIcon {
          margin-left: 4px; margin-left: 4px;
          display: flex; display: flex;
          ...@@ -123,6 +147,7 @@ ...@@ -123,6 +147,7 @@
          cursor: pointer; cursor: pointer;
          margin-top: 5px; margin-top: 5px;
          } }
          .mapIcon1 { .mapIcon1 {
          margin-left: 4px; margin-left: 4px;
          display: flex; display: flex;
          ...@@ -131,9 +156,11 @@ ...@@ -131,9 +156,11 @@
          cursor: pointer; cursor: pointer;
          margin-top: 5px; margin-top: 5px;
          } }
          .activeTile { .activeTile {
          background-color: #4699f4; background-color: #4699f4;
          } }
          .dropList { .dropList {
          position: absolute; position: absolute;
          right: 2%; right: 2%;
          ...@@ -141,11 +168,13 @@ ...@@ -141,11 +168,13 @@
          color: rgba(0, 0, 0, 0.25); color: rgba(0, 0, 0, 0.25);
          z-index: 99; z-index: 99;
          } }
          .divider { .divider {
          display: flex; display: flex;
          align-items: center; align-items: center;
          line-height: 100%; line-height: 100%;
          padding: 0.5rem; padding: 0.5rem;
          .dividerIcon { .dividerIcon {
          margin-left: 0.8rem; margin-left: 0.8rem;
          color: #4699f4; color: #4699f4;
          ...@@ -156,56 +185,109 @@ ...@@ -156,56 +185,109 @@
          .cardsList { .cardsList {
          display: flex; display: flex;
          flex-wrap: wrap; flex-wrap: wrap;
          height: calc(100vh - 234px); height: 100%;
          overflow-y: scroll; overflow-y: scroll;
          } }
          .cardsList1 { .cardsList1 {
          display: flex; display: flex;
          flex-wrap: wrap; flex-wrap: wrap;
          } }
          .cardItem { .cardItem {
          width: 21rem; width: 21rem;
          height: 22rem; height: 22rem;
          margin: 0 2rem; margin: 0 2rem;
          } }
          .pipeNetwork {
          height: 100%;
          .ant-table-wrapper {
          height: 100%;
          .ant-table {
          height: calc(100% - 65px);
          .ant-table-container {
          height: 100%;
          }
          }
          }
          .ant-table-body {
          height: 100%;
          border-right: 1px solid #f0f0f0;
          overflow: auto;
          }
          }
          .tileContainer { .tileContainer {
          height: 100%;
          overflow-y: scroll;
          .ant-table-wrapper {
          height: 100%;
          .ant-table {
          height: calc(100% - 65px);
          .ant-table-container {
          height: 100%;
          }
          }
          }
          .ant-table-body { .ant-table-body {
          height: calc(100vh - 330px) !important; height: 100%;
          border-right: 1px solid #f0f0f0; border-right: 1px solid #f0f0f0;
          overflow: auto !important; overflow: auto;
          } }
          } }
          .TileConfigContainer { .TileConfigContainer {
          .ant-card-head { .ant-card-head {
          background-color: #ecf5ff; background-color: #ecf5ff;
          } }
          } }
          .solutionContainer { .solutionContainer {
          .ant-table-body { .ant-table-body {
          height: calc(100vh - 250px) !important; height: calc(100vh - 250px) !important;
          border-bottom: 1px solid #f0f0f0; border-bottom: 1px solid #f0f0f0;
          } }
          } }
          .titleText { .titleText {
          width: 700px; width: 700px;
          overflow: hidden; overflow: hidden;
          white-space: nowrap; white-space: nowrap;
          text-overflow: ellipsis; text-overflow: ellipsis;
          } }
          .title1 { .title1 {
          display: flex; display: flex;
          align-items: center; align-items: center;
          width: 100%; width: 100%;
          } }
          // .solutionConfig { // .solutionConfig {
          // height: calc(100% - 30px); // height: calc(100% - 30px);
          // } // }
          .treeHeight{ .treeHeight {
          .ant-tree-list-holder { .ant-tree-list-holder {
          overflow: auto; overflow: auto;
          height: 638px !important; height: 638px !important;
          }
          } }
          }
          .clickRowStyle { .clickRowStyle {
          background: #cfe7fd; background: #cfe7fd;
          } }
          // .solutionConfig {
          // height: calc(100% - 30px);
          // }
          .schemeBox {
          height: calc(100% - 51px);
          }
          \ No newline at end of file
          src/pages/platformCenter/gis/schemeConfig/TileConfig/TileConfig.jsx
          View file @ 76477a88
          ...@@ -223,21 +223,10 @@ const TileData = props => { ...@@ -223,21 +223,10 @@ const TileData = props => {
          }; };
          return ( return (
          <div className={styles.tileContainer}> <div className={styles.tileContainer}>
          <div style={{ height: 'calc(100vh - 153px)', overflowY: 'scroll' }}> <div>
          <Spin tip="loading..." spinning={treeLoading}> <Spin tip="loading..." spinning={treeLoading}>
          {/* <div className={styles.tileBtn}>
          <Button
          type="primary"
          onClick={() => {
          handleAdd();
          }}
          >
          新增
          </Button>
          </div> */}
          <Divider orientation="left"> <Divider orientation="left">
          <div className={styles.divider}> <div className={styles.divider}>
          {' '}
          基础底图{' '} 基础底图{' '}
          <Tooltip title="新增基础底图"> <Tooltip title="新增基础底图">
          <PlusOutlined <PlusOutlined
          ......
          src/pages/platformCenter/gis/schemeConfig/VectorData/VectorData.jsx
          View file @ 76477a88
          ...@@ -210,7 +210,7 @@ const VectorData = props => { ...@@ -210,7 +210,7 @@ const VectorData = props => {
          return ( return (
          <> <>
          <div className={styles.tileContainer}> <div className={styles.pipeNetwork}>
          <Spin tip="loading..." spinning={treeLoading}> <Spin tip="loading..." spinning={treeLoading}>
          <div className={styles.tileBtn}> <div className={styles.tileBtn}>
          <Button <Button
          ...@@ -222,13 +222,13 @@ const VectorData = props => { ...@@ -222,13 +222,13 @@ const VectorData = props => {
          新增 新增
          </Button> </Button>
          </div> </div>
          <div style={{ height: 'calc(100vh - 220px)', width: '100%' }}> <div style={{ height: 'calc(100% - 51px)', width: '100%' }}>
          <Table <Table
          columns={columns} columns={columns}
          dataSource={tileData} dataSource={tileData}
          bordered bordered
          rowKey="CreateTime" rowKey="CreateTime"
          scroll={{ y: 600 }} scroll={{ y: 'calc(100% - 70px)' }}
          pagination={{ pagination={{
          showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条`, showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条`,
          }} }}
          ......
          src/pages/platformCenter/gis/schemeConfig/projectMessage/projectMessage.jsx
          View file @ 76477a88
          ...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
          * @Description: * @Description:
          * @Author: leizhe * @Author: leizhe
          * @Date: 2022-01-13 10:47:32 * @Date: 2022-01-13 10:47:32
          * @LastEditTime: 2022-08-17 11:04:24 * @LastEditTime: 2022-10-09 14:07:11
          * @LastEditors: leizhe * @LastEditors: dengchao 754083046@qq.com
          */ */
          /* eslint-disable indent */ /* eslint-disable indent */
          import { Button, Spin, Empty } from 'antd'; import { Button, Spin, Empty } from 'antd';
          ...@@ -107,43 +107,45 @@ const VectorData = props => { ...@@ -107,43 +107,45 @@ const VectorData = props => {
          新增 新增
          </Button> </Button>
          </div> </div>
          <Spin tip="loading..." spinning={treeLoading}> <div className={styles.schemeBox}>
          <div style={{ height: 'calc(100vh - 216px)', width: '100%' }}> <Spin tip="loading..." spinning={treeLoading}>
          <div className={styles.cardsList}> <div style={{ height: 'calc(100%)', width: '100%' }}>
          {/* {console.log(tileData)} */} <div className={styles.cardsList}>
          {tileData && tileData.length ? ( {/* {console.log(tileData)} */}
          tileData.map((item, index) => ( {tileData && tileData.length ? (
          <div tileData.map((item, index) => (
          className={styles.cardItem} <div
          key={index} className={styles.cardItem}
          span={5} key={index}
          offset={2} span={5}
          style={{ marginBottom: '1rem' }} offset={2}
          > style={{ marginBottom: '1rem' }}
          <Cards >
          item={item} <Cards
          cardFlag={cardFlag} item={item}
          deletebaseMaps={onDeletebaseMap} cardFlag={cardFlag}
          keepData={keepData} deletebaseMaps={onDeletebaseMap}
          nameData={nameData} keepData={keepData}
          /> nameData={nameData}
          </div> />
          )) </div>
          ) : ( ))
          <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} style={{ margin: 'auto' }} /> ) : (
          )} <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} style={{ margin: 'auto' }} />
          )}
          </div>
          <AddModal
          visible={visible}
          onCancel={() => setVisible(false)}
          callBackSubmit={onSubmit}
          type={type}
          formObj={formObj}
          keepData={keepData}
          nameData={nameData}
          />
          </div> </div>
          <AddModal </Spin>
          visible={visible} </div>
          onCancel={() => setVisible(false)}
          callBackSubmit={onSubmit}
          type={type}
          formObj={formObj}
          keepData={keepData}
          nameData={nameData}
          />
          </div>
          </Spin>
          </> </>
          ); );
          }; };
          ......
          src/pages/platformCenter/messageManage/projectManage/ProjectManage.less
          View file @ 76477a88
          ...@@ -24,9 +24,11 @@ ...@@ -24,9 +24,11 @@
          margin-right: 10px; margin-right: 10px;
          } }
          } }
          .anticon svg { .anticon svg {
          margin-top: -5px; margin-top: -5px;
          } }
          .fast_search { .fast_search {
          height: 60px; height: 60px;
          margin-right: 10px; margin-right: 10px;
          ...@@ -49,15 +51,21 @@ ...@@ -49,15 +51,21 @@
          display: flex; display: flex;
          flex-direction: column; flex-direction: column;
          justify-content: flex-start; justify-content: flex-start;
          .ant-table-thead tr th{
          .ant-pagination {
          padding-right: 10px;
          }
          .ant-table-thead tr th {
          font-weight: 600; font-weight: 600;
          color:rgba(0,0,0,0.85); color: rgba(0, 0, 0, 0.85);
          } }
          .ant-table-container{
          max-height: calc(100vh - 240px)!important; .ant-table-container {
          min-height:calc(100vh - 240px)!important; max-height: calc(100vh - 240px) !important;
          min-height: calc(100vh - 240px) !important;
          overflow-y: scroll; overflow-y: scroll;
          } }
          } }
          } }
          \ No newline at end of file
          src/pages/platformCenter/messageManage/projectManage/components/PushTest/PushTest.jsx
          View file @ 76477a88
          ...@@ -171,8 +171,9 @@ const PushTest = props => { ...@@ -171,8 +171,9 @@ const PushTest = props => {
          </Button> </Button>
          </div> </div>
          {/* 复选框模块 */} {/* 复选框模块 */}
          <Spin spinning={loading}>
          <div className={styles.checkContainer}> <div className={styles.checkContainer}>
          <Spin spinning={loading}>
          {allList.map((item, index) => ( {allList.map((item, index) => (
          <div className={styles.checkBoxContent} key={item.groupId}> <div className={styles.checkBoxContent} key={item.groupId}>
          <CardCheck <CardCheck
          ...@@ -183,8 +184,8 @@ const PushTest = props => { ...@@ -183,8 +184,8 @@ const PushTest = props => {
          /> />
          </div> </div>
          ))} ))}
          </div> </Spin>
          </Spin> </div>
          </div> </div>
          <div className={styles.tableRight}> <div className={styles.tableRight}>
          <Table <Table
          ......
          src/pages/platformCenter/messageManage/templateManage/TemplateManage.less
          View file @ 76477a88
          ...@@ -53,9 +53,12 @@ ...@@ -53,9 +53,12 @@
          } }
          .list_view { .list_view {
          width: 100%; width: 100%;
          height: calc(100vh - 184px); height: calc(100vh - 180x);
          background-color: white; background-color: white;
          overflow-y: scroll; overflow-y: scroll;
          .ant-pagination {
          padding-right: 10px;
          }
          } }
          .button, .button,
          html [type='button'], html [type='button'],
          ......
          src/pages/platformCenter/videoManager/index.jsx
          View file @ 76477a88
          ...@@ -476,8 +476,9 @@ const videoManager = () => { ...@@ -476,8 +476,9 @@ const videoManager = () => {
          </Button> </Button>
          </Col> </Col>
          </Row> </Row>
          <Spin spinning={loading} tip="loading">
          <div className={styles.table}> <div className={styles.tablebox}>
          <Spin spinning={loading} tip="loading">
          {tableData.length > 0 ? ( {tableData.length > 0 ? (
          <Table <Table
          size="small" size="small"
          ...@@ -485,7 +486,7 @@ const videoManager = () => { ...@@ -485,7 +486,7 @@ const videoManager = () => {
          rowKey={record => record.Id} rowKey={record => record.Id}
          columns={columns} columns={columns}
          dataSource={tableData} dataSource={tableData}
          scroll={{ y: 'calc(100vh - 210px)', x: 'max-content' }} scroll={{ y: 'calc(100% - 210px)', x: 'max-content' }}
          onRow={record => ({ onRow={record => ({
          onDoubleClick: event => { onDoubleClick: event => {
          event.stopPropagation(); event.stopPropagation();
          ...@@ -523,8 +524,9 @@ const videoManager = () => { ...@@ -523,8 +524,9 @@ const videoManager = () => {
          }} }}
          /> />
          )} )}
          </div> </Spin>
          </Spin> </div>
          <AddModal <AddModal
          visible={addVisible} visible={addVisible}
          onCancel={() => { onCancel={() => {
          ......
          src/pages/platformCenter/videoManager/index.less
          View file @ 76477a88
          .videoManagerContainer { .videoManagerContainer {
          height: 100%;
          .ant-table-pagination.ant-pagination { .ant-table-pagination.ant-pagination {
          margin: 2px 0; margin: 2px 0;
          } }
          .tablebox {
          height: calc(100% - 54px);
          .ant-table-wrapper {
          height: 100%;
          .ant-table {
          height: calc(100% - 50px);
          }
          }
          .ant-pagination {
          // padding-right: 10px;
          padding: 10px;
          }
          }
          .head { .head {
          padding: 10px; padding: 10px;
          background: white; background: white;
          margin-bottom: 2px; margin-bottom: 2px;
          width: 100%; width: 100%;
          } }
          .ant-card-body { .ant-card-body {
          padding: 0px 24px 24px 17px; padding: 0px 24px 24px 17px;
          } }
          .sel { .sel {
          width: 200px; width: 200px;
          } }
          .icon { .icon {
          margin-top: -5px !important; margin-top: -5px !important;
          vertical-align: text-bottom; vertical-align: text-bottom;
          } }
          .redText { .redText {
          color: red; color: red;
          } }
          } }
          .ant-input[disabled] { .ant-input[disabled] {
          color: rgba(0, 0, 0, 0.5); color: rgba(0, 0, 0, 0.5);
          } }
          .ant-select-disabled.ant-select:not(.ant-select-customize-input) .ant-select-selector { .ant-select-disabled.ant-select:not(.ant-select-customize-input) .ant-select-selector {
          color: rgba(0, 0, 0, 0.5); color: rgba(0, 0, 0, 0.5);
          } }
          \ No newline at end of file
          src/pages/productCenter/mobileConfig/index.jsx
          View file @ 76477a88
          ...@@ -10,6 +10,8 @@ import SiteConfig from './SiteConfig'; ...@@ -10,6 +10,8 @@ import SiteConfig from './SiteConfig';
          import MiniMenu from './menuconfig/miniMenu'; import MiniMenu from './menuconfig/miniMenu';
          import AddConfig from './addConfig'; import AddConfig from './addConfig';
          import { appConnector } from '@/containers/App/store'; import { appConnector } from '@/containers/App/store';
          import styles from './index.less';
          const { TabPane } = Tabs; const { TabPane } = Tabs;
          const MobileConfigPage = props => { const MobileConfigPage = props => {
          const { userMode } = props; const { userMode } = props;
          ...@@ -228,16 +230,18 @@ const MobileConfigPage = props => { ...@@ -228,16 +230,18 @@ const MobileConfigPage = props => {
          ]; ];
          return ( return (
          <PageContainer> <PageContainer>
          <Spin spinning={loading} tip="loading..."> <div className={styles.mobileContainer}>
          <Tabs <Spin spinning={loading} tip="loading...">
          activeKey={parentKey} <Tabs
          onChange={handleParChange} activeKey={parentKey}
          type="editable-card" onChange={handleParChange}
          onEdit={handleEdit} type="editable-card"
          > onEdit={handleEdit}
          {singleList.map(item => cts(item, parentKey))} >
          </Tabs> {singleList.map(item => cts(item, parentKey))}
          </Spin> </Tabs>
          </Spin>
          </div>
          <Drawer <Drawer
          title="新增应用" title="新增应用"
          destroyOnClose destroyOnClose
          ......
          src/pages/productCenter/mobileConfig/menuconfig/miniMenu.jsx
          View file @ 76477a88
          ...@@ -20,7 +20,7 @@ import { ...@@ -20,7 +20,7 @@ import {
          dragMenu, dragMenu,
          } from '@/services/mobileConfig/api'; } from '@/services/mobileConfig/api';
          import { setIn } from 'immutable'; import { setIn } from 'immutable';
          import styles from './miniMenu.less';
          import { appConnector } from '@/containers/App/store'; import { appConnector } from '@/containers/App/store';
          import Tree from '@/components/ExpendableTree'; import Tree from '@/components/ExpendableTree';
          import AddForm from './AddForm'; import AddForm from './AddForm';
          ...@@ -28,6 +28,7 @@ import EditForm from './editForm'; ...@@ -28,6 +28,7 @@ import EditForm from './editForm';
          import ImportOrExport from './ImportOrExport'; import ImportOrExport from './ImportOrExport';
          import CheckList from './checkBox'; import CheckList from './checkBox';
          import styles from './miniMenu.less';
          const MiniMenu = props => { const MiniMenu = props => {
          const { userMode, clientName, parentKey } = props; const { userMode, clientName, parentKey } = props;
          const [flag, setFlag] = useState(1); // 刷新标志 const [flag, setFlag] = useState(1); // 刷新标志
          ...@@ -713,7 +714,7 @@ const MiniMenu = props => { ...@@ -713,7 +714,7 @@ const MiniMenu = props => {
          </div> </div>
          </div> </div>
          {treeData.length > 0 ? ( {treeData.length > 0 ? (
          <div style={{ height: 'calc(100vh - 300px)', overflowY: 'scroll' }}> <div style={{ height: 'calc(100% - 35px)', overflowY: 'scroll' }}>
          <Tree <Tree
          showIcon showIcon
          onSelect={handleSelect} onSelect={handleSelect}
          ......
          src/pages/productCenter/mobileConfig/menuconfig/miniMenu.less
          View file @ 76477a88
          .box { .box {
          height: calc(100vh - 240px) !important; height: 100%;
          display: flex; display: flex;
          } }
          .left { .left {
          min-width: 300px; min-width: 300px;
          width: 350px; width: 350px;
          min-height: 100%; min-height: 100%;
          border: 1px solid #eee; border: 1px solid #eee;
          padding: 10px; padding: 10px;
          .ant-tree-node-content-wrapper { .ant-tree-node-content-wrapper {
          display: flex; display: flex;
          align-items: center; align-items: center;
          .ant-tree-iconEle { .ant-tree-iconEle {
          display: flex; display: flex;
          align-items: center; align-items: center;
          line-height: 20px;
          } }
          .ant-tree-title { .ant-tree-title {
          width: 100%; width: 100%;
          } }
          } }
          .leftTop { .leftTop {
          display: flex; display: flex;
          align-items: center; align-items: center;
          margin-bottom: 10px; margin-bottom: 10px;
          justify-content: space-between; justify-content: space-between;
          .tRight { .tRight {
          display: flex; display: flex;
          align-items: center; align-items: center;
          .icon1 { .icon1 {
          font-size: 20px; font-size: 20px;
          margin-right: 10px; margin-right: 10px;
          } }
          .icon2 { .icon2 {
          font-size: 18px; font-size: 18px;
          margin-right: 5px; margin-right: 5px;
          } }
          .icon:hover { .icon:hover {
          cursor: pointer; cursor: pointer;
          } }
          } }
          } }
          } }
          .middle { .middle {
          min-width: 500px; min-width: 500px;
          width: 100%; width: 100%;
          ...@@ -50,14 +63,17 @@ ...@@ -50,14 +63,17 @@
          padding: 10px; padding: 10px;
          margin: 0 0 0 10px; margin: 0 0 0 10px;
          } }
          .title { .title {
          display: flex; display: flex;
          align-items: center; align-items: center;
          width: 100%; width: 100%;
          } }
          .tip { .tip {
          display: none; display: none;
          } }
          .title:hover { .title:hover {
          .tip { .tip {
          display: flex; display: flex;
          ...@@ -66,14 +82,17 @@ ...@@ -66,14 +82,17 @@
          width: 100%; width: 100%;
          } }
          } }
          .fs { .fs {
          font-size: 18px; font-size: 18px;
          margin-left: 10px; margin-left: 10px;
          } }
          .fsize { .fsize {
          font-size: 18px; font-size: 18px;
          margin-left: 10px; margin-left: 10px;
          } }
          .rightBox { .rightBox {
          min-width: 200px; min-width: 200px;
          // width: 600px; // width: 600px;
          ...@@ -81,8 +100,4 @@ ...@@ -81,8 +100,4 @@
          min-height: 100%; min-height: 100%;
          border: 1px solid #eee; border: 1px solid #eee;
          padding: 10px; padding: 10px;
          } }
          :global { \ No newline at end of file
          .ant-tree .ant-tree-node-content-wrapper .ant-tree-iconEle .anticon-folder {
          }
          }
          src/pages/productCenter/productConfig/productConfig.jsx
          View file @ 76477a88
          ...@@ -74,7 +74,8 @@ const ProductConfig = props => { ...@@ -74,7 +74,8 @@ const ProductConfig = props => {
          list.add(i.ProductType); list.add(i.ProductType);
          }); });
          let a = []; let a = [];
          list.map(i => { console.log(list, 'listsss');
          [...list].map(i => {
          a.push(i); a.push(i);
          }); });
          let aa = []; let aa = [];
          ...@@ -223,7 +224,7 @@ const ProductConfig = props => { ...@@ -223,7 +224,7 @@ const ProductConfig = props => {
          <div className={styles.box}> <div className={styles.box}>
          <Card className={classnames(`${styles.leftList}`)}> <Card className={classnames(`${styles.leftList}`)}>
          <div className={styles.listTop}>可用产品：</div> <div className={styles.listTop}>可用产品：</div>
          <div style={{ height: 'calc(100vh - 172px)', overflow: 'scroll' }}> <div style={{ height: 'calc(100% - 50px)', overflow: 'scroll' }}>
          {productList && productList.length > 0 ? ( {productList && productList.length > 0 ? (
          productList.map(item => renderListItem(item)) productList.map(item => renderListItem(item))
          ) : ( ) : (
          ......
          src/pages/productCenter/productConfig/productConfig.less
          View file @ 76477a88
          .box { .box {
          width: 100%; width: 100%;
          display: flex; display: flex;
          height: calc(100vh - 72px); height: 100%;
          } }
          .leftList { .leftList {
          width: 500px; width: 500px;
          height: calc(100vh - 72px); height: 100%;
          // overflow: scroll; // overflow: scroll;
          .ant-card-body {
          padding: 12px 24px 24px 10px;
          height: 100%;
          }
          } }
          .rightForm { .rightForm {
          width: 100%; width: 100%;
          } }
          .listTop { .listTop {
          display: flex; display: flex;
          justify-content: space-between; justify-content: space-between;
          ...@@ -22,6 +30,7 @@ ...@@ -22,6 +30,7 @@
          font-weight: bold; font-weight: bold;
          border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
          } }
          .listItem { .listItem {
          height: 35px !important; height: 35px !important;
          padding-left: 5px; padding-left: 5px;
          ...@@ -30,14 +39,17 @@ ...@@ -30,14 +39,17 @@
          display: flex; display: flex;
          align-items: center; align-items: center;
          justify-content: flex-start; justify-content: flex-start;
          .itemspan { .itemspan {
          margin-left: 10px; margin-left: 10px;
          } }
          } }
          .listItem:hover { .listItem:hover {
          background-color: #f8f8f8; background-color: #f8f8f8;
          } }
          .selected { .selected {
          font-weight: bold; font-weight: bold;
          background-color: #bae7ff !important; background-color: #bae7ff !important;
          } }
          \ No newline at end of file
          src/pages/productCenter/webConfig/index.jsx
          View file @ 76477a88
          ...@@ -338,8 +338,6 @@ const WebConfigPage = props => { ...@@ -338,8 +338,6 @@ const WebConfigPage = props => {
          ) : ( ) : (
          <span style={{ color: '#1890ff' }}>{tabPaneItem.existMapComponent}</span> <span style={{ color: '#1890ff' }}>{tabPaneItem.existMapComponent}</span>
          )} )}
          {/* <span>/</span>
          <span>{tabPaneItem.mapComponent})</span> */}
          </strong> </strong>
          {tabPaneItem.existMapComponent < 9 && ( {tabPaneItem.existMapComponent < 9 && (
          <Button type="primary" onClick={() => SyncMap(tabPaneItem)}> <Button type="primary" onClick={() => SyncMap(tabPaneItem)}>
          ......
          src/pages/productCenter/webConfig/index.less
          View file @ 76477a88
          .webConfigContainer{ .webConfigContainer {
          position: absolute; position: absolute;
          width: 100%; width: 100%;
          height: 100%; height: 100%;
          .link{
          .link {
          color: #000; color: #000;
          cursor: pointer; cursor: pointer;
          font-size: 16px; font-size: 16px;
          ...@@ -10,64 +11,81 @@ ...@@ -10,64 +11,81 @@
          position: relative; position: relative;
          top: -10px; top: -10px;
          color: #1890ff; color: #1890ff;
          .anticon{
          .anticon {
          top: -3px; top: -3px;
          margin-right: 2px; margin-right: 2px;
          position: relative; position: relative;
          } }
          } }
          .ant-tabs-content-holder>.ant-tabs-content.ant-tabs-content-top{
          .ant-tabs-content-holder>.ant-tabs-content.ant-tabs-content-top {
          position: absolute; position: absolute;
          width: 100%; width: 100%;
          height: calc(100% - 40px); // height: calc(100% - 40px);
          } }
          .webConfigTabcontent{
          background: #fff;
          height: calc(100vh - 128px);
          }
          }
          .webConfigContainer > .ant-tabs-card .ant-tabs-content { .ant-tabs-content {
          height: 100%; height: calc(100% - 56px);
          margin-top: -16px;
          }
          .webConfigContainer > .ant-tabs-card .ant-tabs-content > .ant-tabs-tabpane {
          background: #fff;
          padding: 16px;
          }
          .webConfigContainer > .ant-tabs-card > .ant-tabs-nav::before {
          display: none;
          }
          .webConfigContainer > .ant-tabs-card .ant-tabs-tab,
          [data-theme='compact'] .webConfigContainer > .ant-tabs-card .ant-tabs-tab {
          border-color: transparent;
          background: transparent;
          } }
          .webConfigContainer > .ant-tabs-card .ant-tabs-tab-active,
          [data-theme='compact'] .webConfigContainer > .ant-tabs-card .ant-tabs-tab-active { .webConfigTabcontent {
          border-color: #fff;
          background: #fff; background: #fff;
          height: 100%;
          } }
          #components-tabs-demo-card-top .code-box-demo { }
          background: #f5f5f5;
          overflow: hidden; .webConfigContainer>.ant-tabs-card .ant-tabs-content {
          padding: 24px; height: 100%;
          } margin-top: -16px;
          [data-theme='compact'] .webConfigContainer > .ant-tabs-card .ant-tabs-content { }
          height: 120px;
          margin-top: -8px; .webConfigContainer>.ant-tabs-card .ant-tabs-content>.ant-tabs-tabpane {
          } background: #fff;
          [data-theme='dark'] .webConfigContainer > .ant-tabs-card .ant-tabs-tab { padding: 16px;
          border-color: transparent; }
          background: transparent;
          } .webConfigContainer>.ant-tabs-card>.ant-tabs-nav::before {
          [data-theme='dark'] #components-tabs-demo-card-top .code-box-demo { display: none;
          background: #000; }
          }
          [data-theme='dark'] .webConfigContainer > .ant-tabs-card .ant-tabs-content > .ant-tabs-tabpane { .webConfigContainer>.ant-tabs-card .ant-tabs-tab,
          background: #141414; [data-theme='compact'] .webConfigContainer>.ant-tabs-card .ant-tabs-tab {
          } border-color: transparent;
          [data-theme='dark'] .webConfigContainer > .ant-tabs-card .ant-tabs-tab-active { background: transparent;
          border-color: #141414; }
          background: #141414;
          } .webConfigContainer>.ant-tabs-card .ant-tabs-tab-active,
          \ No newline at end of file [data-theme='compact'] .webConfigContainer>.ant-tabs-card .ant-tabs-tab-active {
          border-color: #fff;
          background: #fff;
          }
          #components-tabs-demo-card-top .code-box-demo {
          background: #f5f5f5;
          overflow: hidden;
          padding: 24px;
          }
          [data-theme='compact'] .webConfigContainer>.ant-tabs-card .ant-tabs-content {
          height: 120px;
          margin-top: -8px;
          }
          [data-theme='dark'] .webConfigContainer>.ant-tabs-card .ant-tabs-tab {
          border-color: transparent;
          background: transparent;
          }
          [data-theme='dark'] #components-tabs-demo-card-top .code-box-demo {
          background: #000;
          }
          [data-theme='dark'] .webConfigContainer>.ant-tabs-card .ant-tabs-content>.ant-tabs-tabpane {
          background: #141414;
          }
          [data-theme='dark'] .webConfigContainer>.ant-tabs-card .ant-tabs-tab-active {
          border-color: #141414;
          background: #141414;
          }
          \ No newline at end of file
          src/pages/productCenter/webConfig/menuconfig/MenuConfig.jsx
          View file @ 76477a88
          ...@@ -7,7 +7,7 @@ const MenuConfig = props => { ...@@ -7,7 +7,7 @@ const MenuConfig = props => {
          const { menu } = props; const { menu } = props;
          return ( return (
          <> <>
          <div split="vertical"> <div split="vertical" style={{ height: 'calc(100% - 10px)' }}>
          <WebMenu {...props} /> <WebMenu {...props} />
          </div> </div>
          </> </>
          ......
          src/pages/productCenter/webConfig/menuconfig/webMenu.less
          View file @ 76477a88
          .box { .box {
          min-height: calc(100vh - 198px); // min-height: calc(100vh - 198px);
          // min-height: 100%;
          height: 100%;
          display: flex; display: flex;
          overflow-x: hidden; overflow-x: hidden;
          } }
          .left { .left {
          min-width: 300px; min-width: 300px;
          width: 350px; width: 350px;
          ...@@ -11,62 +14,76 @@ ...@@ -11,62 +14,76 @@
          padding: 10px; padding: 10px;
          // height: calc( 100vh - 198px); // height: calc( 100vh - 198px);
          overflow-y: auto; overflow-y: auto;
          .ant-tree-node-content-wrapper { .ant-tree-node-content-wrapper {
          display: flex; display: flex;
          align-items: center; align-items: center;
          .ant-tree-iconEle { .ant-tree-iconEle {
          display: flex; display: flex;
          align-items: center; align-items: center;
          } }
          .ant-tree-title { .ant-tree-title {
          width: 100%; width: 100%;
          } }
          } }
          .leftTop { .leftTop {
          display: flex; display: flex;
          align-items: center; align-items: center;
          margin-bottom: 10px; margin-bottom: 10px;
          justify-content: space-between; justify-content: space-between;
          .tRight { .tRight {
          display: flex; display: flex;
          align-items: center; align-items: center;
          .icon1 { .icon1 {
          font-size: 20px; font-size: 20px;
          margin-right: 10px; margin-right: 10px;
          } }
          .icon2 { .icon2 {
          font-size: 18px; font-size: 18px;
          margin-right: 5px; margin-right: 5px;
          } }
          .icon:hover { .icon:hover {
          cursor: pointer; cursor: pointer;
          } }
          } }
          } }
          } }
          .middle { .middle {
          min-width: 500px; min-width: 500px;
          width: 100%; width: 100%;
          border: 1px solid #eee; border: 1px solid #eee;
          padding: 10px; padding: 10px;
          margin: 0 0 0 10px; margin: 0 0 0 10px;
          height: calc(100vh - 180px); // height: calc(100vh - 180px);
          height: 100%;
          overflow-y: scroll; overflow-y: scroll;
          } }
          .title { .title {
          display: flex; display: flex;
          align-items: center; align-items: center;
          width: 100%; width: 100%;
          } }
          .titleText { .titleText {
          width: 20rem; width: 20rem;
          overflow: hidden; overflow: hidden;
          white-space: nowrap; white-space: nowrap;
          text-overflow: ellipsis; text-overflow: ellipsis;
          } }
          .tip { .tip {
          display: none; display: none;
          } }
          .title:hover { .title:hover {
          .tip { .tip {
          display: flex; display: flex;
          ...@@ -75,10 +92,12 @@ ...@@ -75,10 +92,12 @@
          width: 100%; width: 100%;
          } }
          } }
          .fs { .fs {
          font-size: 18px; font-size: 18px;
          margin-left: 10px; margin-left: 10px;
          } }
          .rightBox { .rightBox {
          min-width: 200px; min-width: 200px;
          // width: 600px; // width: 600px;
          ...@@ -86,20 +105,4 @@ ...@@ -86,20 +105,4 @@
          min-height: 100%; min-height: 100%;
          border: 1px solid #eee; border: 1px solid #eee;
          padding: 10px; padding: 10px;
          } }
          .ant-tree.ant-tree-block-node .ant-tree-list-holder-inner .ant-tree-node-content-wrapper { \ No newline at end of file
          line-height: 28px !important;
          width: 0;
          }
          .ant-tree-drop-indicator {
          bottom: 3px !important;
          margin-left: 6px;
          }
          .ant-tree-draggable-icon {
          display: none;
          }
          // .modal{
          // .ant-modal-body{
          // padding: 0 !important;
          // }
          // }
          src/pages/userCenter/roleManage/RoleManage.less
          View file @ 76477a88
          .ant-spin-container {
          height: 100%;
          }
          .cardBox { .cardBox {
          // min-height: calc(100vh - 74px);
          // max-height: calc(100vh - 74px);
          height: 100%; height: 100%;
          // overflow-y: scroll;
          // overflow: auto;
          overflow: hidden; overflow: hidden;
          width: 320px; width: 320px;
          left: 0; left: 0;
          top: 0; top: 0;
          margin-right: 10px; margin-right: 10px;
          position: relative; position: relative;
          // transition: left,width 10s;
          transition-property: width, left; transition-property: width, left;
          transition-duration: 0.5s; transition-duration: 0.5s;
          white-space: nowrap; white-space: nowrap;
          ...@@ -56,10 +50,7 @@ ...@@ -56,10 +50,7 @@
          width: 100%; width: 100%;
          } }
          .ant-tree-node-content-wrapper-open {
          display: flex;
          align-items: center;
          }
          .treeTitle { .treeTitle {
          display: flex; display: flex;
          ...@@ -104,19 +95,11 @@ ...@@ -104,19 +95,11 @@
          overflow-y: scroll; overflow-y: scroll;
          } }
          :global {
          .ant-tree-switcher {
          display: flex;
          align-items: center;
          margin-right: -8px;
          margin-left: 5px;
          // color:#1890FF;
          .ant-tree-switcher-line-icon {
          // margin-left: 5px;
          }
          }
          }
          .hide { .hide {
          display: block; display: block;
          ...@@ -162,6 +145,10 @@ ...@@ -162,6 +145,10 @@
          height: 100%; height: 100%;
          display: flex; display: flex;
          position: relative; position: relative;
          .ant-card-body {
          padding: 12px 24px 24px 10px;
          }
          } }
          .title { .title {
          ......
          src/pages/userCenter/siteManage/SiteManage.less
          View file @ 76477a88
          :global {
          ::-webkit-scrollbar {
          height: 6px; //x轴滚动条粗细
          width: 6px; //y轴滚动条粗细
          border-bottom: 2px solid white;
          }
          //滚动条里面的小方块，能上下左右移动（取决于是垂直滚动条还是水平滚动条）
          ::-webkit-scrollbar-thumb {
          border-radius: 10px;
          box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.1);
          background: rgba(74, 74, 75, 0.3);
          margin-bottom: 10px;
          }
          //滚动条的轨道（里面装有thumb）滚动槽
          ::-webkit-scrollbar-track {
          box-shadow: 0;
          border-radius: 0;
          background: white; //滚动槽背景色
          border-radius: 10px; //滚动条边框半径设置
          }
          .ant-tree-node-content-wrapper {
          width: 100%;
          // overflow: hidden !important;
          .ant-tree-title {
          overflow: hidden;
          text-overflow: ellipsis;
          white-space: nowrap;
          display: block;
          }
          }
          .ant-pagination-prev,
          .ant-pagination-next {
          line-height: 8px !important;
          }
          .ant-input-search-button {
          line-height: 1;
          }
          .ant-dropdown-menu-item > .anticon:first-child {
          vertical-align: 0.15em !important;
          }
          .ant-table-tbody {
          .ant-table-row:hover > td {
          background: #aed8fa !important;
          }
          }
          .ant-modal-close-icon {
          vertical-align: 0.3em;
          }
          .ant-notification-close-icon {
          vertical-align: 0.2em;
          }
          .ant-tree-switcher-icon svg {
          font-size: 14px;
          }
          }
          .redText { .redText {
          color: red; color: red;
          cursor: pointer; cursor: pointer;
          ...@@ -114,7 +47,7 @@ ...@@ -114,7 +47,7 @@
          } }
          .ant-tree-treenode:hover { .ant-tree-treenode:hover {
          .iconWraper1 > span { .iconWraper1>span {
          margin-left: 12px; margin-left: 12px;
          font-size: 18px; font-size: 18px;
          display: inline-block; display: inline-block;
          ...@@ -258,6 +191,7 @@ ...@@ -258,6 +191,7 @@
          .ant-spin-nested-loading { .ant-spin-nested-loading {
          height: calc(100% - 50px); height: calc(100% - 50px);
          } }
          .ant-card-body { .ant-card-body {
          height: 100%; height: 100%;
          } }
          ...@@ -270,7 +204,7 @@ ...@@ -270,7 +204,7 @@
          min-width: 600px; min-width: 600px;
          } }
          .siteCheckbox .ant-collapse-content > .ant-collapse-content-box { .siteCheckbox .ant-collapse-content>.ant-collapse-content-box {
          padding: 16px 16px 0; padding: 16px 16px 0;
          } }
          ...@@ -319,7 +253,7 @@ ...@@ -319,7 +253,7 @@
          overflow: auto; overflow: auto;
          } }
          .sitePanel .ant-checkbox-wrapper + .ant-checkbox-wrapper { .sitePanel .ant-checkbox-wrapper+.ant-checkbox-wrapper {
          margin: 0; margin: 0;
          } }
          ...@@ -355,8 +289,7 @@ ...@@ -355,8 +289,7 @@
          li { li {
          height: 35px; height: 35px;
          line-height: 35px; line-height: 35px;
          background: rgba(24, 144, 255, 0.16) url('../../../assets/images/icons/close.png') no-repeat background: rgba(24, 144, 255, 0.16) url('../../../assets/images/icons/close.png') no-repeat 170px;
          170px;
          background-size: 20px; background-size: 20px;
          background-position: center right; background-position: center right;
          margin: 0 10px 10px 0; margin: 0 10px 10px 0;
          ...@@ -369,8 +302,7 @@ ...@@ -369,8 +302,7 @@
          } }
          } }
          .siteline { .siteline {}
          }
          .siteBtn { .siteBtn {
          width: 100%; width: 100%;
          ...@@ -441,4 +373,4 @@ ...@@ -441,4 +373,4 @@
          overflow: hidden; overflow: hidden;
          white-space: nowrap; white-space: nowrap;
          text-overflow: ellipsis; text-overflow: ellipsis;
          } }
          \ No newline at end of file
          src/pages/userCenter/userManage/AddUserModal.less
          View file @ 76477a88
          ...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
          .tipsText { .tipsText {
          position: absolute; position: absolute;
          right: 40px; right: 40px;
          top: 5px; top: 7px;
          z-index: 11; z-index: 11;
          } }
          ......
          src/pages/userCenter/userManage/RelateRoleModal.jsx
          View file @ 76477a88
          ...@@ -158,33 +158,37 @@ const RelateRoleModal = props => { ...@@ -158,33 +158,37 @@ const RelateRoleModal = props => {
          <Spin spinning={loading} tip="loading"> <Spin spinning={loading} tip="loading">
          <Tabs activeKey={activeKey} onChange={onChange} style={{ marginTop: '-16px' }}> <Tabs activeKey={activeKey} onChange={onChange} style={{ marginTop: '-16px' }}>
          <TabPane tab="角色" key="1"> <TabPane tab="角色" key="1">
          {visible && <div style={{ heigth: '500px', overflowY: 'scroll' }}>
          rolelist.map((role, index) => ( {visible &&
          <ListCardItem rolelist.map((role, index) => (
          style={{ display: 'none' }} <ListCardItem
          itemid={index} style={{ display: 'none' }}
          key={`item${index}key`} itemid={index}
          userList={role.roleList} key={`item${index}key`}
          multiRoleList={multiRoleList} userList={role.roleList}
          mult={mult} multiRoleList={multiRoleList}
          OUName={role.visibleTitle} mult={mult}
          getValueCallback={getRoleValueCallback} OUName={role.visibleTitle}
          /> getValueCallback={getRoleValueCallback}
          ))} />
          ))}
          </div>
          </TabPane> </TabPane>
          <TabPane tab="站点" key="2"> <TabPane tab="站点" key="2">
          {visible && <div style={{ heigth: '500px', overflowY: 'scroll' }}>
          stationlist.map((station, index) => ( {visible &&
          <ListCardItem stationlist.map((station, index) => (
          itemid={index} <ListCardItem
          key={`item${index}key`} itemid={index}
          userList={station.stationList} key={`item${index}key`}
          multistationList={multistationList} userList={station.stationList}
          mult={mult} multistationList={multistationList}
          OUName={station.visibleTitle} mult={mult}
          getValueCallback={getStationValueCallback} OUName={station.visibleTitle}
          /> getValueCallback={getStationValueCallback}
          ))} />
          ))}
          </div>
          </TabPane> </TabPane>
          </Tabs> </Tabs>
          </Spin> </Spin>
          ...@@ -205,30 +209,34 @@ const RelateRoleModal = props => { ...@@ -205,30 +209,34 @@ const RelateRoleModal = props => {
          <Spin spinning={loading} tip="loading"> <Spin spinning={loading} tip="loading">
          <Tabs activeKey={activeKey} onChange={onChange} style={{ marginTop: '-16px' }}> <Tabs activeKey={activeKey} onChange={onChange} style={{ marginTop: '-16px' }}>
          <TabPane tab="角色" key="1"> <TabPane tab="角色" key="1">
          {visible && <div style={{ height: '500px', overflowY: 'scroll' }}>
          rolelist.map((role, index) => ( {visible &&
          <ListCardItem rolelist.map((role, index) => (
          itemid={index} <ListCardItem
          key={`item${index}key`} itemid={index}
          userList={role.roleList} key={`item${index}key`}
          mult={mult} userList={role.roleList}
          OUName={role.visibleTitle} mult={mult}
          getValueCallback={getRoleValueCallback} OUName={role.visibleTitle}
          /> getValueCallback={getRoleValueCallback}
          ))} />
          ))}
          </div>
          </TabPane> </TabPane>
          <TabPane tab="站点" key="2"> <TabPane tab="站点" key="2">
          {visible && <div style={{ height: '500px', overflowY: 'scroll' }}>
          stationlist.map((station, index) => ( {visible &&
          <ListCardItem stationlist.map((station, index) => (
          itemid={index} <ListCardItem
          key={`item${index}key`} itemid={index}
          userList={station.stationList} key={`item${index}key`}
          mult={mult} userList={station.stationList}
          OUName={station.visibleTitle} mult={mult}
          getValueCallback={getStationValueCallback} OUName={station.visibleTitle}
          /> getValueCallback={getStationValueCallback}
          ))} />
          ))}
          </div>
          </TabPane> </TabPane>
          </Tabs> </Tabs>
          </Spin> </Spin>
          ......
          src/pages/userCenter/userManage/UserManage.jsx
          View file @ 76477a88
          ...@@ -493,7 +493,14 @@ const UserManage = () => { ...@@ -493,7 +493,14 @@ const UserManage = () => {
          <div className={styles.title1}> <div className={styles.title1}>
          <span className={styles.titleText}> <span className={styles.titleText}>
          {org.children.length == 0 ? ( {org.children.length == 0 ? (
          <ApartmentOutlined style={{ fontSize: '14px', color: '#1890FF' }} /> <ApartmentOutlined
          style={{
          fontSize: '14px',
          color: '#1890FF',
          verticalAlign: 'middle',
          marginTop: '-3px',
          }}
          />
          ) : ( ) : (
          <span /> <span />
          )} )}
          ...@@ -1684,23 +1691,24 @@ const UserManage = () => { ...@@ -1684,23 +1691,24 @@ const UserManage = () => {
          enterButton enterButton
          value={searchWordOrg} value={searchWordOrg}
          /> />
          <div style={{ height: '500px', overflowY: 'scroll' }}>
          {changeOrgVisible && treeDataCopy.length > 0 && ( {changeOrgVisible && treeDataCopy.length > 0 && (
          <Tree <Tree
          showIcon="true" showIcon="true"
          showLine={{ showLeafIcon: false }} showLine={{ showLeafIcon: false }}
          // defaultExpandAll // defaultExpandAll
          // 未切换时原先的节点，注意要转字符串 // 未切换时原先的节点，注意要转字符串
          selectedKeys={[`${currentSelectOldOrg}`]} selectedKeys={[`${currentSelectOldOrg}`]}
          onSelect={value => { onSelect={value => {
          setNewOrgID(value[0]); setNewOrgID(value[0]);
          // 切换后选中的节点 // 切换后选中的节点
          setCurrentSelectOldOrg(value[0]); setCurrentSelectOldOrg(value[0]);
          }} }}
          expandedKeys={expendKeyOrg} expandedKeys={expendKeyOrg}
          treeData={treeDataCopy.map(t => mapTree1(t))} treeData={treeDataCopy.map(t => mapTree1(t))}
          /> />
          )} )}
          </div>
          </Modal> </Modal>
          {/* 修改密码 */} {/* 修改密码 */}
          <ChangePasswordModal <ChangePasswordModal
          ......
          src/routes/config.js
          View file @ 76477a88
          This diff is collapsed.
          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