fix: 添加流程节点是否发送短信配置，调整用户中心目录结构

src/components/BaseForm/index.js

@@ -91,7 +91,7 @@ const BaseForm = props => {
   }, []);
 
   return (
-    <Form size="small" form={form} {...formProps} {...restProps}>
+    <Form form={form} {...formProps} {...restProps}>
       {items &&
         items.map(item => {
           const {

src/components/Upload/index.tsx

 import React from 'react';
-import { Upload, Modal, message, Tabs, Result, Input, Collapse } from 'antd';
+import { Upload, Modal, message, Tabs, Result, Input, Collapse,Anchor  } from 'antd';
 import { PlusOutlined, CheckCircleFilled } from '@ant-design/icons';
 import ImgCrop from 'antd-img-crop';
 import classnames from 'classnames';
@@ -10,6 +10,7 @@ import styles from './index.less';
 import { getImageBases } from '@/services/common/api';
 import UploadContext from './context.js'
 import _, { clone } from 'lodash'
+const { Link } = Anchor;
 
 
 
@@ -22,12 +23,12 @@ const wallCateName: any = {
   uploaded: '上传',
 };
 const tabNames: any = {
-  CityTemp: '用户上传',
   icon: 'icon图标',
   androidMenu: '移动应用图标',
   menuNew: '应用图标',
   logo: '项目logo',
-  menu: '菜单图标'
+  menu: '菜单图标',
+  CityTemp: '用户上传',
 }
 
 function getBase64(file: File | Blob) {
@@ -163,6 +164,8 @@ class PicturesWall extends React.Component<PicturesWallType> {
   };
 
   handleImgSelected = (url: string, baseUrl: any) => {
+    console.log(url,baseUrl);
+    
     this.setState({
       curSelectedImg: url,
       baseUrl: baseUrl
@@ -288,7 +291,7 @@ class PicturesWall extends React.Component<PicturesWallType> {
             <CheckCircleFilled />
           </span>
         </div>
-        <span title={fileName}>{fileName}</span>
+        <span id={`#${curSelectedImg}`} title={fileName}>{fileName}</span>
       </div>
     );
   }
@@ -442,11 +445,12 @@ class PicturesWall extends React.Component<PicturesWallType> {
           onOk={this.handleModalOk}
           className={styles.modal}
         >
-          {/* <Search onSearch={onSearch} /> */}
+          {/* <Search style ={{   width:'200px',margin: '10px 0 10px 100px'}} onSearch={onSearch} /> */}
           <Tabs defaultActiveKey={imgBed[0]?.moduleName} tabPosition="left" style={{ height: 520 }}>
             {imgBed.map((item, i) => {
               if (item.moduleName == picType || item.moduleName == 'CityTemp') {
                 const child = [...item.child] || [];
+                console.log(item,'item');
                 if (item.fileUrls.length > 0) {
                   child.push({
                     moduleName: item.moduleName,

src/layouts/BasicLayout.js

@@ -44,9 +44,7 @@ const BasicLayout = props => {
   matchRoutes(props.route.routes, props.location.pathname);
   return (
     <ProLayout
-      logo={() => (
-        <img src={logo} style={{ width: '32px', height: '32px' }} alt="" />
-      )}
+      logo={() => <img src={logo} style={{ width: '32px', height: '32px' }} alt="" />}
       style={{ height: '100vh' }}
       onCollapse={handleMenuCollapse}
       onMenuHeaderClick={() => {}}

src/pages/database/InitDataBase.jsx

@@ -466,14 +466,9 @@ const InitDataBase = props => {
             let mapCheckVersion = mapList.get(item.key);
             // 根据key值去匹配对应的checkVersion
             item.checkVersion =
-              mapCheckVersion.checkVersion === undefined
-                ? null
-                : mapCheckVersion.checkVersion;
+              mapCheckVersion.checkVersion === undefined ? null : mapCheckVersion.checkVersion;
             // 根据key值去匹配对应的二级目录的check
-            item.check =
-              mapCheckVersion.check === undefined
-                ? null
-                : mapCheckVersion.check;
+            item.check = mapCheckVersion.check === undefined ? null : mapCheckVersion.check;
             if (item.check) {
               item.hasCheck = true;
             }
@@ -526,8 +521,7 @@ const InitDataBase = props => {
   const radioChange = (index, value) => {
     setInitList(val => {
       const list = JSON.parse(JSON.stringify(val));
-      const secondList =
-        list[index.tabIndex].modularSolutions[index.radioIndex];
+      const secondList = list[index.tabIndex].modularSolutions[index.radioIndex];
       // 取消功能 一开始未选中的才能取消
       if (value === secondList.checkVersion && !secondList.hasCheck) {
         secondList.checkVersion = null;
@@ -651,7 +645,7 @@ const InitDataBase = props => {
           >
             修改描述
           </Button>
-          <div onClick={e => e.stopPropagation()}>
+          {/* <div onClick={e => e.stopPropagation()}>
             <Popconfirm
               title="是否删除该连接的历史记录？"
               okText="确认"
@@ -664,7 +658,7 @@ const InitDataBase = props => {
                 删除
               </Button>
             </Popconfirm>
-          </div>
+          </div> */}
         </Space>
       ),
     },
@@ -710,9 +704,7 @@ const InitDataBase = props => {
                     console.log(option);
                     return (
                       option.children &&
-                      option.children
-                        .toLowerCase()
-                        .indexOf(input.toLowerCase()) >= 0
+                      option.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
                     );
                   }}
                 >
@@ -730,11 +722,7 @@ const InitDataBase = props => {
                   <Space size="large" className={styles.btnBox}>
                     <Space>
                       <Button onClick={onCheck}>测试连接</Button>
-                      <Button
-                        type="primary"
-                        htmlType="submit"
-                        loading={tableLoading}
-                      >
+                      <Button type="primary" htmlType="submit" loading={tableLoading}>
                         保存连接
                       </Button>
                     </Space>
@@ -859,10 +847,7 @@ const InitDataBase = props => {
           visible={modalVisible.initVisible}
           onCancel={() => handleShowModal('initVisible', false)}
           footer={[
-            <Button
-              key="back"
-              onClick={() => handleShowModal('initVisible', false)}
-            >
+            <Button key="back" onClick={() => handleShowModal('initVisible', false)}>
               取消
             </Button>,
             <Popconfirm

src/pages/database/ManagementDataBase.jsx

@@ -165,9 +165,7 @@ const ManagementDataBase = () => {
   const handleErrLog = (text, val) => {
     setModalTitle(val);
     let arr = [];
-    arr.push(
-      text.split(/(\r\n)|(\n)/).map((item, index) => <p key={index}>{item}</p>),
-    );
+    arr.push(text.split(/(\r\n)|(\n)/).map((item, index) => <p key={index}>{item}</p>));
     setModalVisible(true);
     // setContent(text);
     setContent(arr);
@@ -175,9 +173,7 @@ const ManagementDataBase = () => {
   const handleLog = (text, val) => {
     setModalTitle(val);
     let arr = [];
-    arr.push(
-      text.split(/(\r\n)|(\n)/).map((item, index) => <p key={index}>{item}</p>),
-    );
+    arr.push(text.split(/(\r\n)|(\n)/).map((item, index) => <p key={index}>{item}</p>));
     setModalVisible(true);
     // setContent(text);
     setContent(arr);
@@ -381,8 +377,7 @@ const ManagementDataBase = () => {
         </Card>
         <Card className={styles.mgTop20}>
           <div className={styles.tableTitle}>
-            手动修复
-            （字段长度不统一，请手动修改差异，数据可能会截断，请谨慎操作）
+            手动修复 （字段长度不统一，请手动修改差异，数据可能会截断，请谨慎操作）
           </div>
           <Table
             className={styles.mgTop20}
@@ -421,11 +416,7 @@ const ManagementDataBase = () => {
         }}
         style={{ top: '40px' }}
         footer={[
-          <Button
-            type="primary"
-            onClick={() => setModalVisible(false)}
-            key="back"
-          >
+          <Button type="primary" onClick={() => setModalVisible(false)} key="back">
             关闭窗口
           </Button>,
         ]}

src/pages/platformCenter/bsmanager/workFlow/flowComponents/Timelimit.jsx

@@ -103,9 +103,7 @@ const Timelimit = props => {
       dataIndex: 'TimeLimitField',
       align: 'center',
       render: text => (
-        <span style={{ color: text === '(未配置)' ? 'grey' : '#0000009D' }}>
-          {text}
-        </span>
+        <span style={{ color: text === '(未配置)' ? 'grey' : '#0000009D' }}>{text}</span>
       ),
     },
     {
@@ -113,9 +111,7 @@ const Timelimit = props => {
       dataIndex: 'TimeoutField',
       align: 'center',
       render: text => (
-        <span style={{ color: text === '(未配置)' ? 'grey' : '#0000009D' }}>
-          {text}
-        </span>
+        <span style={{ color: text === '(未配置)' ? 'grey' : '#0000009D' }}>{text}</span>
       ),
     },
     {
@@ -139,9 +135,7 @@ const Timelimit = props => {
                 okText="是"
                 cancelText="否"
               >
-                <DeleteOutlined
-                  style={{ fontSize: '16px', color: '#e86060' }}
-                />
+                <DeleteOutlined style={{ fontSize: '16px', color: '#e86060' }} />
               </Popconfirm>
             </Tooltip>
           </Space>
@@ -186,8 +180,7 @@ const Timelimit = props => {
             },
           })}
           pagination={{
-            showTotal: (total, range) =>
-              `第${range[0]}-${range[1]} 条/共 ${total} 条`,
+            showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条`,
             pageSizeOptions: [10, 20, 50, 100],
             defaultPageSize: 10,
             showQuickJumper: true,

src/pages/platformCenter/bsmanager/workFlow/flowComponents/timelimitComponents/AddModal.jsx

@@ -8,15 +8,7 @@ import { Form, Modal, Input, notification, Select } from 'antd';
 const { Option } = Select;
 
 const AddModal = props => {
-  const {
-    onSubumit,
-    handleCancel,
-    visible,
-    msg,
-    flowId,
-    modalType,
-    title,
-  } = props;
+  const { onSubumit, handleCancel, visible, msg, flowId, modalType, title } = props;
   const [flowNodes, setFlowNodes] = useState([]);
   const [timeLimitFlowNodes, setTimeLimitFlowNodes] = useState([]);
   const [startNodeIndex, setStartNodeIndex] = useState(null);
@@ -147,11 +139,7 @@ const AddModal = props => {
         <Form.Item label="规则名称" name="Name" rules={[{ required: true }]}>
           <Input placeholder="请输入规则名称" />
         </Form.Item>
-        <Form.Item
-          label="起止节点"
-          style={{ marginBottom: 0, message: '请选择节点' }}
-          required
-        >
+        <Form.Item label="起止节点" style={{ marginBottom: 0, message: '请选择节点' }} required>
           <div style={{ display: 'flex' }}>
             <Form.Item
               name="StartNode"
@@ -181,9 +169,7 @@ const AddModal = props => {
                   <Option
                     value={item.Name}
                     key={item.ID}
-                    disabled={
-                      startNodeIndex !== null && index <= startNodeIndex
-                    }
+                    disabled={startNodeIndex !== null && index <= startNodeIndex}
                   >
                     {item.Name}
                   </Option>
@@ -201,9 +187,7 @@ const AddModal = props => {
                 { required: true, message: '请选填写时限' },
                 {
                   validator: (_, value) =>
-                    value < 0
-                      ? Promise.reject(new Error('默认时限需要大于零'))
-                      : Promise.resolve(),
+                    value < 0 ? Promise.reject(new Error('默认时限需要大于零')) : Promise.resolve(),
                 },
               ]}
             >

src/pages/platformCenter/bsmanager/workFlow/flowNode/flowNode.jsx

@@ -172,7 +172,18 @@ const FlowNode = () => {
         key: 'outFields',
         align: 'center',
         width: 100,
-        render: text => <span style={{ color: Number(text) > 0 ? 'red' : '' }}>{text}</span>,
+        render: text => (
+          <span
+            style={{
+              display: 'inline-block',
+              width: '80px',
+              color: Number(text) > 0 ? 'red' : '',
+              backgroundColor: Number(text) > 0 ? 'yellow' : '',
+            }}
+          >
+            {text}
+          </span>
+        ),
       },
 
       {
@@ -220,6 +231,15 @@ const FlowNode = () => {
           <span style={{ color: record.colorType === 2 ? 'red' : '#000000D9' }}>{text}</span>
         ),
       },
+      {
+        title: '发送短信',
+        dataIndex: 'IsSendMessage',
+        align: 'center',
+        width: 80,
+        render: (text, record) => (
+          <span style={{ color: record.colorType === 2 ? 'red' : '#000000D9' }}>{text}</span>
+        ),
+      },
       {
         title: '操作',
         align: 'center',
@@ -369,6 +389,11 @@ const FlowNode = () => {
       align: 'center',
       width: 80,
     },
+    {
+      title: '发送短信',
+      align: 'center',
+      width: 80,
+    },
     {
       title: '操作',
       align: 'center',

src/pages/platformCenter/bsmanager/workFlow/flowNode/flowNodeComponents/NodeEdit.jsx

@@ -369,6 +369,12 @@ const NodeEdit = props => {
             <Radio value="1">是</Radio>
           </Radio.Group>
         </Form.Item>
+        <Form.Item label="是否发送短信" name="IsSendMessage">
+          <Radio.Group>
+            <Radio value={0}>否</Radio>
+            <Radio value={1}>是</Radio>
+          </Radio.Group>
+        </Form.Item>
         <Form.Item label="工单主表" name="TableName">
           <Select placeholder="请选择工单主表" onChange={changTable}>
             {eventTable.map(item => (

src/pages/platformCenter/bsmanager/workFlow/flowNode/flowNodeComponents/auxiliaryComponents/AddModal.jsx

 import React, { useEffect } from 'react';
-import {
-  getFlowNodeExtendPage,
-  operateFlowNodeExtendPage,
-} from '@/services/platform/flow';
+import { getFlowNodeExtendPage, operateFlowNodeExtendPage } from '@/services/platform/flow';
 import { Form, Modal, Input, notification } from 'antd';
 
 const ProcessConfig = props => {
-  const {
-    onSubumit,
-    handleCancel,
-    visible,
-    msg,
-    flowNodeId,
-    modalType,
-    title,
-  } = props;
+  const { onSubumit, handleCancel, visible, msg, flowNodeId, modalType, title } = props;
   const [form] = Form.useForm();
   useEffect(() => {
     form.resetFields();

src/pages/platformCenter/bsmanager/workOrder/incident.jsx

@@ -202,7 +202,18 @@ const incident = () => {
       key: 'outFields',
       align: 'center',
       width: 100,
-      render: text => <span style={{ color: Number(text) > 0 ? 'red' : '' }}>{text}</span>,
+      render: text => (
+        <span
+          style={{
+            display: 'inline-block',
+            width: '80px',
+            color: Number(text) > 0 ? 'red' : '',
+            backgroundColor: Number(text) > 0 ? 'yellow' : '',
+          }}
+        >
+          {text}
+        </span>
+      ),
     },
     {
       title: '上报方式',

src/pages/platformCenter/bsmanager/workflowEdit/Workflow.jsx

 import React, { useEffect, useState } from 'react';
-import {
-  WFGetAllFlow,
-  GetFlowNode,
-  DeleteFlow,
-} from '@/services/platform/workflow';
+import { WFGetAllFlow, GetFlowNode, DeleteFlow } from '@/services/platform/workflow';
 
 import { Card, Spin, Tooltip, notification, Empty, Modal } from 'antd';
 import {
@@ -263,10 +259,7 @@ const Workflow = () => {
             <div style={{ display: `${treeVisible ? 'block' : 'none'}` }}>
               <span className={styles.processTitle}>流程树</span>
               <Tooltip title="添加流程组">
-                <PlusSquareFilled
-                  onClick={e => addFlowGroup(e)}
-                  className={styles.treeHeadIcon}
-                />
+                <PlusSquareFilled onClick={e => addFlowGroup(e)} className={styles.treeHeadIcon} />
               </Tooltip>
               <hr className={styles.splitLine} />
               <div className={styles.treeContent}>
@@ -303,10 +296,7 @@ const Workflow = () => {
               leaveCallBack={leaveCallBack}
             />
           ) : (
-            <Empty
-              image={Empty.PRESENTED_IMAGE_SIMPLE}
-              description="当前未选中流程"
-            />
+            <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} description="当前未选中流程" />
           )}
         </div>
       </div>

src/pages/platformCenter/bsmanager/workflowEdit/workFlowComponents/FlowChart.jsx

@@ -155,9 +155,7 @@ const FlowChart = props => {
     diagram.nodeTemplate = objGo(
       go.Node,
       'Auto',
-      new go.Binding('location', 'points', go.Point.parse).makeTwoWay(
-        go.Point.stringify,
-      ),
+      new go.Binding('location', 'points', go.Point.parse).makeTwoWay(go.Point.stringify),
       // 节点样式配置
       objGo(
         go.Panel,
@@ -165,13 +163,9 @@ const FlowChart = props => {
           go.Shape,
           new go.Binding('width', 'NodeType', v => (v === '0' ? 135 : 105)),
           new go.Binding('height', 'NodeType', v => (v === '0' ? 75 : 105)),
-          new go.Binding('figure', 'NodeType', v =>
-            v === '0' ? 'RoundedRectangle' : 'Ellipse',
-          ),
+          new go.Binding('figure', 'NodeType', v => (v === '0' ? 'RoundedRectangle' : 'Ellipse')),
           new go.Binding('strokeWidth', 'NodeType', v => (v === '0' ? 1 : 15)),
-          new go.Binding('stroke', 'NodeType', v =>
-            v === '0' ? '#0587E0' : '#D7EFFF',
-          ),
+          new go.Binding('stroke', 'NodeType', v => (v === '0' ? '#0587E0' : '#D7EFFF')),
           new go.Binding('fill', 'NodeType', v => {
             if (v === '0') {
               return '#DCF2FE';
@@ -191,9 +185,7 @@ const FlowChart = props => {
         go.TextBlock,
         { maxSize: new go.Size(130, NaN), wrap: go.TextBlock.WrapFit },
         new go.Binding('text', 'NodeName'),
-        new go.Binding('stroke', 'NodeType', v =>
-          v === '0' ? '#077BD6' : '#fff',
-        ),
+        new go.Binding('stroke', 'NodeType', v => (v === '0' ? '#077BD6' : '#fff')),
       ),
       objGo(
         go.Picture,
@@ -333,9 +325,7 @@ const FlowChart = props => {
       Nodes: diagramObj.nodeDataArray,
       Lines: diagramObj.linkDataArray,
     };
-    if (
-      JSON.stringify(stageJson.Nodes) === JSON.stringify(initFlowData.Nodes)
-    ) {
+    if (JSON.stringify(stageJson.Nodes) === JSON.stringify(initFlowData.Nodes)) {
       setShowLeaveTip(false);
       leaveCallBack(false);
     } else {
@@ -373,6 +363,11 @@ const FlowChart = props => {
     })
       .then(res => {
         if (res.code === 0) {
+          setDeleteNodes([]);
+          setDeleteLines([]);
+          setAddNodes([]);
+          setDeleteNode('');
+          setDeleteLine('');
           getFlowData();
           notification.success({
             message: '提示',
@@ -397,10 +392,7 @@ const FlowChart = props => {
   };
   return (
     <>
-      <Prompt
-        message="编辑的内容还未保存，确定要离开该页面吗?"
-        when={showLeaveTip}
-      />
+      <Prompt message="编辑的内容还未保存，确定要离开该页面吗?" when={showLeaveTip} />
       <div className={styles.buttonList}>
         <Button onClick={() => addNode()}>添加节点</Button>
         <Button type="primary" onClick={() => saveFlow()}>

src/pages/platformCenter/bsmanager/workflowEdit/workFlowComponents/flowChartComponents/NodeModal.jsx

@@ -70,10 +70,7 @@ const NodeModal = props => {
       return;
     }
     // 如果已经有角色就提示
-    if (
-      nodeMsg.roleList.some(item => item.roleId === obj.roleId) &&
-      isEdit === 'add'
-    ) {
+    if (nodeMsg.roleList.some(item => item.roleId === obj.roleId) && isEdit === 'add') {
       notification.error({
         message: '提示',
         duration: 3,
@@ -82,9 +79,7 @@ const NodeModal = props => {
       return;
     }
     // 编辑角色覆盖原有
-    let chooseIndex = nodeMsg.roleList.findIndex(
-      item => item.roleId === obj.roleId,
-    );
+    let chooseIndex = nodeMsg.roleList.findIndex(item => item.roleId === obj.roleId);
     let newList;
     if (chooseIndex === -1) {
       // 添加表格
@@ -146,9 +141,7 @@ const NodeModal = props => {
                 okText="是"
                 cancelText="否"
               >
-                <DeleteOutlined
-                  style={{ fontSize: '16px', color: '#e86060' }}
-                />
+                <DeleteOutlined style={{ fontSize: '16px', color: '#e86060' }} />
               </Popconfirm>
             </Tooltip>
             <Tooltip title="修改默认承办人">

src/pages/platformCenter/bsmanager/workflowEdit/workFlowComponents/flowChartComponents/nodeModalComponents/RoalChoose.jsx

@@ -220,10 +220,7 @@ const RoalChoose = props => {
         treeData={treeData.map(item => mapTree(item))}
       />
     ) : (
-      <Empty
-        image={Empty.PRESENTED_IMAGE_SIMPLE}
-        description="未有查找到角色"
-      />
+      <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} description="未有查找到角色" />
     );
   return (
     <Modal
@@ -250,11 +247,7 @@ const RoalChoose = props => {
                 />
               </Form.Item>
               <Form.Item>
-                <Button
-                  type="primary"
-                  htmlType="submit"
-                  disabled={modalType === 'edit'}
-                >
+                <Button type="primary" htmlType="submit" disabled={modalType === 'edit'}>
                   搜索
                 </Button>
               </Form.Item>
@@ -296,26 +289,15 @@ const RoalChoose = props => {
         {/* 用户列表 */}
         <div className={styles.userContent}>
           <div className={styles.userCheckBox}>
-            <Checkbox
-              indeterminate={indeterminate}
-              onChange={onCheckAllChange}
-              checked={checkAll}
-            >
+            <Checkbox indeterminate={indeterminate} onChange={onCheckAllChange} checked={checkAll}>
               <span style={{ fontWeight: 700 }}>用户列表</span>
             </Checkbox>
             <Divider style={{ margin: '10px 0' }} />
             <div className={styles.checkContent}>
               {plainOptions.length > 0 ? (
-                <CheckboxGroup
-                  options={plainOptions}
-                  value={checkedList}
-                  onChange={onChange}
-                />
+                <CheckboxGroup options={plainOptions} value={checkedList} onChange={onChange} />
               ) : (
-                <Empty
-                  image={Empty.PRESENTED_IMAGE_SIMPLE}
-                  description="未有查找到用户"
-                />
+                <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} description="未有查找到用户" />
               )}
             </div>
           </div>

src/pages/platformCenter/standingBook/standingBook.jsx

@@ -104,7 +104,18 @@ const standingBook = props => {
       key: 'outFields',
       align: 'center',
       width: 100,
-      render: text => <span style={{ color: Number(text) > 0 ? 'red' : '' }}>{text}</span>,
+      render: text => (
+        <span
+          style={{
+            display: 'inline-block',
+            width: '80px',
+            color: Number(text) > 0 ? 'red' : '',
+            backgroundColor: Number(text) > 0 ? 'yellow' : '',
+          }}
+        >
+          {text}
+        </span>
+      ),
     },
     {
       title: '操作',

src/pages/testPages/request.jsx

@@ -3,10 +3,7 @@ import { Form, Input, Button, Space, Select, Col } from 'antd';
 import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons';
 import { get, post } from '../../services';
 
-const methods = [
-  { label: 'get', value: 'get' },
-  { label: 'post', value: 'post' },
-];
+const methods = [{ label: 'get', value: 'get' }, { label: 'post', value: 'post' }];
 
 const RequestTest = () => {
   const [protocal, setprotocal] = useState('http://');
@@ -46,11 +43,7 @@ const RequestTest = () => {
   };
 
   const protocalBefore = (
-    <Select
-      defaultValue="http://"
-      className="select-before"
-      onChange={handleProtoSelectChange}
-    >
+    <Select defaultValue="http://" className="select-before" onChange={handleProtoSelectChange}>
       <Select.Option value="http://">http://</Select.Option>
       <Select.Option value="https://">https://</Select.Option>
     </Select>

src/pages/userCenter/roleManage/SelectUser/SelectUser.jsx

@@ -278,18 +278,6 @@ const SelectUser = props => {
                 ))}
               </div>
             </Spin>
-            {/* 分页 */}
-            <Pagination
-              total={total}
-              showTotal={(totals, range) => `第${range[0]}-${range[1]} 条/共 ${totals} 条`}
-              defaultPageSize={pageSize}
-              defaultCurrent={1}
-              current={currentPage}
-              onChange={paginationChange}
-              style={{ marginBottom: '10px', width: '500px' }}
-              size="small"
-              showQuickJumper
-            />
           </div>
           <div className={styles.tableRight}>
             <Table
@@ -304,6 +292,18 @@ const SelectUser = props => {
             />
           </div>
         </div>
+        {/* 分页 */}
+        <Pagination
+          total={total}
+          showTotal={(totals, range) => `第${range[0]}-${range[1]} 条/共 ${totals} 条`}
+          defaultPageSize={pageSize}
+          defaultCurrent={1}
+          current={currentPage}
+          onChange={paginationChange}
+          style={{ marginBottom: '10px' }}
+          size="small"
+          showQuickJumper
+        />
       </Modal>
     </>
   );

src/pages/userCenter/siteManage/SiteManage.less

-.cardBox{
-  min-height: calc(100vh - 75px);
-  max-height: calc(100vh - 75px);
-  overflow-y: scroll;
-  overflow-x: hidden;
-  width: 300px;
-  left: 0;
-  top: 0;
-  margin-right: 10px;
-  position: relative;
-  // transition: left,width 10s;
-  transition-property:width,left;
-  transition-duration: 0.5s;
-  white-space: nowrap
+: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;
+  }
 }
-.hideBox{
-  left: 0px;
-  top: 0;
-  width: 20px;
+
+.redText {
+  color: red;
+  cursor: pointer;
 }
-.hideH{
-  width: 100%;
+
+.ant-layout {
+  overflow: auto;
+
+  .ant-layout-content {
+    margin: 12px !important;
+  }
 }
-.siteTitle{
+
+.siteTitle {
   font-size: 16px;
   margin: 0 0 6px 0;
   user-select: none;
   padding: 3px;
   border-bottom: 1px solid #ccc;
 }
-.cardBoxR{
-  min-height: calc(100vh - 210px);
-  max-height: calc(100vh - 210px);
-  min-width: 600px;
-  overflow-y: scroll;
-}
-.cardBoxTop{
-  // max-width: calc( 100% - 450px);
-  // margin-bottom: 10px;
 
-}
-.ant-tree-node-content-wrapper-open{
-  display: flex;
-  align-items: center;
-}
-.treeTitle {
-  display: flex;
+.siteManageContainer {
+  .ant-card-body {
+    padding: 15px;
+  }
+  .ant-spin-container {
+    // overflow-y: scroll;
+    // height: calc(100vh - 410px);
+  }
+  .ant-tree-treenode {
+    width: 100% !important;
+
+    .ant-tree-node-content-wrapper {
+      display: inline-block;
+      width: 100%;
+    }
+
+    .iconWraper1 {
+      float: right;
+
       span {
         display: none;
       }
-}
-.treeTitle:hover {
-  span {
-      margin-left: 20px;
-      display: block;
     }
-}
-.titleBox{
+  }
+
+  .ant-tree-treenode:hover {
+    .iconWraper1 > span {
+      margin-left: 12px;
+      font-size: 18px;
+      display: inline-block;
+    }
+  }
+
+  .contentContainer {
     display: flex;
-  // flex-wrap: wrap;
-  justify-content: space-around;
-  align-items: center;
-}
-.listItem{
-  height: 35px !important;
-  padding-left: 5px;
-  cursor: pointer;
-  font-size: 14px;
-}
-.listItem:hover{
-  background-color:  #f8f8f8  ;
-}
-.selected{
-  font-weight: bold;
-  background-color: #bae7ff!important;
-}
+    width: 100%;
+    position: relative;
+
+    .orgContainer {
+      height: calc(100vh - 74px);
+      width: 407px;
+      padding-right: 10px;
+      left: 0;
+      top: 0;
+      overflow: hidden;
+      margin-right: 10px;
+      position: relative;
+      transition-property: width, left;
+      transition-duration: 0.5s;
+      white-space: nowrap;
+
+      .ant-tree {
+        padding-top: 6px;
 
-.hide{
+        .ant-tree-switcher {
+          line-height: 1;
+          margin-right: 0px !important;
+          color: #1890ff;
+
+          .ant-tree-switcher-line-icon {
+            margin-left: 5px;
+          }
+        }
+      }
+
+      .switcher {
         display: block;
         position: absolute;
         font-size: 18px;
-  color: #1890FF!important;
+        color: #1890ff !important;
         top: 45%;
-  right: -3px;
-  transform: translate(0%,-50%);
-  z-index: 2;
-}
-// .hide{
-//   left: 0;
-// }
-.content{
+        right: 2px;
+        transform: translate(0%, -50%);
+        z-index: 1;
+      }
+    }
+
+    .orgContainerHide {
+      // transform: translateX(-230px);
+      left: 0px;
+      top: 0;
+      width: 26px;
+    }
+
+    .userContainer {
+      height: calc(100vh - 74px) !important;
+      z-index: 999;
+      // min-width: 800px;
+      background: white;
       width: 100%;
-  display: flex;
       position: relative;
+      transition: width 0.5s;
+
+      .title {
+        margin: 16px 0 10px 16px;
+        display: inline-block;
+        width: 270px;
+        cursor: pointer;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
+
+      .ant-table-pagination {
+        padding-right: 12px;
+        background: white;
+        margin: 1px 0;
+        padding: 8px;
+        padding-right: 20px;
+      }
+
+      .ant-btn {
+        margin: 0px 10px;
+
+        .ant-btn-primary {
+          background: #50aefc;
+        }
+      }
+
+      .ant-input-search-button {
+        margin-left: 0px !important;
+      }
+
+      .ant-table-thead tr th {
+        font-weight: 600;
+        color: rgba(0, 0, 0, 0.85);
+      }
+
+      .ant-table-cell {
+        text-align: center;
+        overflow: hidden;
+        // text-overflow:ellipsis;
+        white-space: nowrap;
+      }
+
+      .ant-table-body {
+        height: calc(100vh - 210px);
+        border-right: white;
+        overflow: auto !important;
+      }
+
+      .clickRowStyle {
+        background: #cfe7fd;
+      }
+
+      .ant-pagination {
+        z-index: 999;
+        border-top: 1px solid #f0eded;
+      }
+    }
+  }
 }
-.boxR{
+
+//机构编辑面板
+.boxR {
   width: 100%;
   position: relative;
   transition: width 2s;
 }
 
-.siteCheckbox .ant-collapse-content > .ant-collapse-content-box{
+.cardBoxR {
+  min-height: calc(100vh - 210px);
+  max-height: calc(100vh - 210px);
+  min-width: 600px;
+}
+
+.siteCheckbox .ant-collapse-content > .ant-collapse-content-box {
   padding: 16px 16px 0;
 }
-.siteList{
-  width:199px;
+
+.siteList {
+  width: 199px;
+  // margin:0 0 15px 0;
+  padding: 0 0 15px 0;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+.siteListTitle {
+  width: 199px;
   // margin:0 0 15px 0;
-  padding:0 0  15px 0;
+  padding: 0 0 0 15px;
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
 }
-.sitePanel{
+.sitePanel {
   margin: 0 0 10px 0;
 }
-.sitePanelHead{
+
+.sitePanelHead {
   background-color: #f5f5f5;
-  padding:8px 10px;
+  padding: 8px 10px;
   cursor: pointer;
   display: flex;
+  align-items: center;
   flex-direction: row;
 }
-.sitePanelHead p{
+
+.sitePanelHead p {
   margin: 0;
+  margin-right: 0.6rem;
 }
-.sitePanelCon{
-  border:1px solid #f5f5f5;
-  padding:20px;
+
+.sitePanelCon {
+  border: 1px solid #f5f5f5;
+  padding: 20px;
   padding-bottom: 0;
-  border-top:0;
+  border-top: 0;
   max-height: 200px;
   overflow: auto;
 }
-.sitePanel .ant-checkbox-wrapper + .ant-checkbox-wrapper{
-  margin:0
+
+.sitePanel .ant-checkbox-wrapper + .ant-checkbox-wrapper {
+  margin: 0;
 }
-.siteIcon{
-  color:#ccc;
-  margin:4px 10px 0 0;
+
+.siteIcon {
+  color: #ccc;
+  margin: 4px 10px 0 0;
 }
-.siteAll{
-  margin:0 0 10px 0;
+
+.siteAll {
+  margin: 0 0 10px 0;
 }
-.siteColor{
-  color:#f00
+
+.siteColor {
+  color: #f00;
 }
-.siteCommit{
+
+.siteCommit {
   margin: 10px 0;
 }
-.siteSelectList{
-  border:1px solid #f5f5f5;
-  height: 200px;
+
+.siteSelectList {
+  border: 1px solid #f5f5f5;
+
   overflow: auto;
-  margin-bottom: 50px;
-  .siteSelectUl{
+  .siteSelectUl {
     margin: 0;
     padding: 15px;
     display: flex;
     flex-direction: row;
     flex-wrap: wrap;
-    li{
-      width:200px;
+
+    li {
       height: 35px;
       line-height: 35px;
-      background: rgba(24, 144, 255,0.16) url('../../../assets/images/icons/close.png') no-repeat 175px;
+      background: rgba(24, 144, 255, 0.16)
+        url('../../../assets/images/icons/close.png') no-repeat 170px;
       background-size: 20px;
+      background-position: center right;
       margin: 0 10px 10px 0;
       cursor: pointer;
       overflow: hidden;
       white-space: nowrap;
       text-overflow: ellipsis;
-      padding: 0 20px 0 10px;
+      padding: 0 40px 0 10px;
     }
   }
 }
-.siteline{
-  border-top: 1px solid #eee;
-  padding-top: 15px;
-  margin-top: 20px;
+
+.siteline {
 }
-.siteBtn{
-  width:98%;
+
+.siteBtn {
+  width: 98%;
   display: flex;
   flex-direction: row;
   align-items: center;
+  justify-content: center;
+}
+
+.ant-modal-root {
+  .ant-tree-switcher {
+    line-height: 1;
+    color: #1890ff;
+    margin-right: 0px !important;
+  }
+
+  .ant-checkbox-group .ant-checkbox-group-item {
+    margin-right: 0px !important;
+    min-width: 300px !important;
+  }
+
+  .ant-tree-list-holder {
+    overflow: auto;
+    overflow-x: hidden;
+    height: 40vh;
+  }
+
+  .ant-tabs-content-holder {
+    overflow: auto;
+    height: 50vh;
+  }
+}
+.title {
+  display: flex;
+  align-items: center;
+  width: 100%;
+}
+.tip {
+  display: none;
+}
+.title:hover {
+  .tip {
+    display: flex;
+    align-items: center;
     justify-content: flex-end;
+    width: 100%;
+  }
+}
+.titleText {
+  width: 12rem;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+.fs {
+  font-size: 18px;
+  margin-left: 10px;
+}
+.titleTop {
+  width: 12rem;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
 }

src/pages/userCenter/siteManageV2/siteManage.less

-: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 {
-  color: red;
-  cursor: pointer;
-}
-
-.ant-layout {
-  overflow: auto;
-
-  .ant-layout-content {
-    margin: 12px !important;
-  }
-}
-
-.siteTitle {
-  font-size: 16px;
-  margin: 0 0 6px 0;
-  user-select: none;
-  padding: 3px;
-  border-bottom: 1px solid #ccc;
-}
-
-.siteManageContainer {
-  .ant-card-body {
-    padding: 15px;
-  }
-  .ant-spin-container {
-    // overflow-y: scroll;
-    // height: calc(100vh - 410px);
-  }
-  .ant-tree-treenode {
-    width: 100% !important;
-
-    .ant-tree-node-content-wrapper {
-      display: inline-block;
-      width: 100%;
-    }
-
-    .iconWraper1 {
-      float: right;
-
-      span {
-        display: none;
-      }
-    }
-  }
-
-  .ant-tree-treenode:hover {
-    .iconWraper1 > span {
-      margin-left: 12px;
-      font-size: 18px;
-      display: inline-block;
-    }
-  }
-
-  .contentContainer {
-    display: flex;
-    width: 100%;
-    position: relative;
-
-    .orgContainer {
-      height: calc(100vh - 74px);
-      width: 407px;
-      padding-right: 10px;
-      left: 0;
-      top: 0;
-      overflow: hidden;
-      margin-right: 10px;
-      position: relative;
-      transition-property: width, left;
-      transition-duration: 0.5s;
-      white-space: nowrap;
-
-      .ant-tree {
-        padding-top: 6px;
-
-        .ant-tree-switcher {
-          line-height: 1;
-          margin-right: 0px !important;
-          color: #1890ff;
-
-          .ant-tree-switcher-line-icon {
-            margin-left: 5px;
-          }
-        }
-      }
-
-      .switcher {
-        display: block;
-        position: absolute;
-        font-size: 18px;
-        color: #1890ff !important;
-        top: 45%;
-        right: 2px;
-        transform: translate(0%, -50%);
-        z-index: 1;
-      }
-    }
-
-    .orgContainerHide {
-      // transform: translateX(-230px);
-      left: 0px;
-      top: 0;
-      width: 26px;
-    }
-
-    .userContainer {
-      height: calc(100vh - 74px) !important;
-      z-index: 999;
-      // min-width: 800px;
-      background: white;
-      width: 100%;
-      position: relative;
-      transition: width 0.5s;
-
-      .title {
-        margin: 16px 0 10px 16px;
-        display: inline-block;
-        width: 270px;
-        cursor: pointer;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-      }
-
-      .ant-table-pagination {
-        padding-right: 12px;
-        background: white;
-        margin: 1px 0;
-        padding: 8px;
-        padding-right: 20px;
-      }
-
-      .ant-btn {
-        margin: 0px 10px;
-
-        .ant-btn-primary {
-          background: #50aefc;
-        }
-      }
-
-      .ant-input-search-button {
-        margin-left: 0px !important;
-      }
-
-      .ant-table-thead tr th {
-        font-weight: 600;
-        color: rgba(0, 0, 0, 0.85);
-      }
-
-      .ant-table-cell {
-        text-align: center;
-        overflow: hidden;
-        // text-overflow:ellipsis;
-        white-space: nowrap;
-      }
-
-      .ant-table-body {
-        height: calc(100vh - 210px);
-        border-right: white;
-        overflow: auto !important;
-      }
-
-      .clickRowStyle {
-        background: #cfe7fd;
-      }
-
-      .ant-pagination {
-        z-index: 999;
-        border-top: 1px solid #f0eded;
-      }
-    }
-  }
-}
-
-//机构编辑面板
-.boxR {
-  width: 100%;
-  position: relative;
-  transition: width 2s;
-}
-
-.cardBoxR {
-  min-height: calc(100vh - 210px);
-  max-height: calc(100vh - 210px);
-  min-width: 600px;
-}
-
-.siteCheckbox .ant-collapse-content > .ant-collapse-content-box {
-  padding: 16px 16px 0;
-}
-
-.siteList {
-  width: 199px;
-  // margin:0 0 15px 0;
-  padding: 0 0 15px 0;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-}
-.siteListTitle {
-  width: 199px;
-  // margin:0 0 15px 0;
-  padding: 0 0 0 15px;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-}
-.sitePanel {
-  margin: 0 0 10px 0;
-}
-
-.sitePanelHead {
-  background-color: #f5f5f5;
-  padding: 8px 10px;
-  cursor: pointer;
-  display: flex;
-  align-items: center;
-  flex-direction: row;
-}
-
-.sitePanelHead p {
-  margin: 0;
-  margin-right: 0.6rem;
-}
-
-.sitePanelCon {
-  border: 1px solid #f5f5f5;
-  padding: 20px;
-  padding-bottom: 0;
-  border-top: 0;
-  max-height: 200px;
-  overflow: auto;
-}
-
-.sitePanel .ant-checkbox-wrapper + .ant-checkbox-wrapper {
-  margin: 0;
-}
-
-.siteIcon {
-  color: #ccc;
-  margin: 4px 10px 0 0;
-}
-
-.siteAll {
-  margin: 0 0 10px 0;
-}
-
-.siteColor {
-  color: #f00;
-}
-
-.siteCommit {
-  margin: 10px 0;
-}
-
-.siteSelectList {
-  border: 1px solid #f5f5f5;
-
-  overflow: auto;
-  .siteSelectUl {
-    margin: 0;
-    padding: 15px;
-    display: flex;
-    flex-direction: row;
-    flex-wrap: wrap;
-
-    li {
-      height: 35px;
-      line-height: 35px;
-      background: rgba(24, 144, 255, 0.16)
-        url('../../../assets/images/icons/close.png') no-repeat 170px;
-      background-size: 20px;
-      background-position: center right;
-      margin: 0 10px 10px 0;
-      cursor: pointer;
-      overflow: hidden;
-      white-space: nowrap;
-      text-overflow: ellipsis;
-      padding: 0 40px 0 10px;
-    }
-  }
-}
-
-.siteline {
-}
-
-.siteBtn {
-  width: 98%;
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: center;
-}
-
-.ant-modal-root {
-  .ant-tree-switcher {
-    line-height: 1;
-    color: #1890ff;
-    margin-right: 0px !important;
-  }
-
-  .ant-checkbox-group .ant-checkbox-group-item {
-    margin-right: 0px !important;
-    min-width: 300px !important;
-  }
-
-  .ant-tree-list-holder {
-    overflow: auto;
-    overflow-x: hidden;
-    height: 40vh;
-  }
-
-  .ant-tabs-content-holder {
-    overflow: auto;
-    height: 50vh;
-  }
-}
-.title {
-  display: flex;
-  align-items: center;
-  width: 100%;
-}
-.tip {
-  display: none;
-}
-.title:hover {
-  .tip {
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-    width: 100%;
-  }
-}
-.titleText {
-  width: 12rem;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-}
-.fs {
-  font-size: 18px;
-  margin-left: 10px;
-}
-.titleTop {
-  width: 12rem;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-}

src/routes/config.js

@@ -23,7 +23,7 @@ import CurrentSolution from '@/pages/currentSolution/CurrentSolution';
 import UserManage from '../pages/userCenter/userManage/UserManage';
 import RoleManage from '@/pages/userCenter/roleManage/RoleManage';
 import SiteManage from '../pages/userCenter/siteManage/SiteManage';
-import SiteManageV2 from '../pages/userCenter/siteManageV2/siteManage';
+
 import Dictionary from '../pages/dataCenter/dictionary';
 import Dictionary1 from '../pages/dataCenter/dictionary1';
 // import Search from '../pages/dataCenter/search';
@@ -150,7 +150,7 @@ export default {
             {
               path: '/userCenter/SiteManage',
               name: '站点管理',
-              component: SiteManageV2,
+              component: SiteManage,
             },
           ],
         },
@@ -173,7 +173,7 @@ export default {
               routes: [
                 {
                   path: '/platformCenter/gis/twoDimensionConfig',
-                  name: '二维配置',
+                  name: '地图配置',
                   component: SchemeConfig,
                 },
                 {