fix: 修改工作流编辑器配置、web配置

src/app.js

@@ -8,7 +8,7 @@ import 'sanitize.css/sanitize.css';
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { ArcGISMap as MapComponent } from '@wisdom-map/arcgismap';
+// import { ArcGISMap as MapComponent } from '@wisdom-map/arcgismap';
 import { ConfigProvider } from 'antd';
 import zhCN from 'antd/es/locale/zh_CN';
 import { ConnectedRouter } from 'connected-react-router/immutable';

src/pages/bsmanager/base/standingBook/standingBook.less

@@ -2,17 +2,21 @@
   color: red;
   cursor: pointer;
 }
+
 .ant-layout {
   overflow: auto;
+
   .ant-layout-content {
     margin: 12px !important;
   }
 }
-.ant-btn > .anticon + span,
-.ant-btn > span + .anticon {
+
+.ant-btn>.anticon+span,
+.ant-btn>span+.anticon {
   margin-left: 8px;
   vertical-align: middle;
 }
+
 .siteTitle {
   font-size: 16px;
   margin: 0 0 6px 0;
@@ -20,14 +24,16 @@
   padding: 3px;
   border-bottom: 1px solid #ccc;
 }
+
 .userManageContainer {
   .ant-card-body {
     padding-left: 0;
     padding-right: 0;
   }
+
   .listItem {
-    display: flex;
-    justify-content: space-between;
+    // display: flex;
+    // justify-content: space-between;
     font-size: 14px;
     font-weight: 400;
     color: #414e65;
@@ -35,38 +41,51 @@
     line-height: 28px;
     align-items: center;
     padding: 8px 14px;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
   }
+
   .pickItem {
     background-color: #aed8fa;
   }
+
   .listHover {
     background-color: #f5f6f9;
   }
+
   .ant-form-item {
     vertical-align: top;
   }
-  .ant-form-item-label > label {
+
+  .ant-form-item-label>label {
     align-items: middle;
   }
+
   .ant-modal-body {
     padding-bottom: 0px;
     padding-right: 40px;
     padding-left: 40px;
+
     .ant-form {
       width: 90%;
     }
   }
+
   .anticon svg {
     margin-top: -3px;
   }
+
   .ant-popover-message {
     position: relative;
     padding: 0px 0 0px;
     color: rgba(0, 0, 0, 0.85);
     font-size: 14px;
   }
+
   .ant-tree-treenode {
     width: 100% !important;
+
     .ant-tree-node-content-wrapper {
       display: inline-block;
       width: 100%;
@@ -74,31 +93,37 @@
 
     .iconWraper1 {
       float: right;
+
       span {
         display: none;
       }
     }
   }
+
   .ant-tree-treenode:hover {
-    .iconWraper1 > span {
+    .iconWraper1>span {
       margin-left: 12px;
       font-size: 18px;
       display: inline-block;
     }
   }
+
   .ant-radio-group {
     margin: 0px !important;
   }
+
   .contentContainers {
     display: flex;
     width: 100%;
     position: relative;
-    .ant-table.ant-table-bordered > .ant-table-container {
+
+    .ant-table.ant-table-bordered>.ant-table-container {
       min-width: calc(100vw - 582px);
       // height: calc(100vh - 175px);
       overflow-x: hidden;
       border: none;
     }
+
     .orgContainer {
       height: calc(100vh - 74px);
       width: 240px;
@@ -110,17 +135,21 @@
       transition-duration: 0.5s;
       white-space: nowrap;
       padding-right: 20px;
+
       .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;
@@ -139,9 +168,11 @@
       top: 0;
       width: 26px;
     }
+
     .ant-popover-message-title {
       padding-left: 20px;
     }
+
     .userContainer {
       height: calc(100vh - 74px) !important;
       z-index: 999;
@@ -150,6 +181,7 @@
       width: 100%;
       position: relative;
       transition: width 0.5s;
+
       .title {
         margin: 16px 0 10px 16px;
         display: inline-block;
@@ -159,6 +191,7 @@
         text-overflow: ellipsis;
         white-space: nowrap;
       }
+
       .ant-table-pagination {
         padding-right: 12px;
         background: white;
@@ -166,33 +199,41 @@
         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;
@@ -200,21 +241,25 @@
     }
   }
 }
+
 .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: 200px !important;
   }
+
   .ant-tree-list-holder {
     overflow: auto;
     overflow-x: hidden;
     height: 40vh;
   }
+
   .ant-tabs-content-holder {
     overflow: auto;
     height: 50vh;
@@ -224,22 +269,27 @@
 .ant-modal-content {
   border-radius: 5px;
 }
+
 .ant-modal-header {
   border-radius: 5px 5px 0 0;
   padding: 28px 40px;
 }
+
 .ant-modal-close {
   top: 14px;
   right: 20px;
 }
+
 .ant-modal-footer {
   border: none;
   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-left: 15px;
 }
+
 // .ant-form-horizontal .ant-form-item-control {
 //     margin-left: 10px;
 // }
@@ -252,18 +302,22 @@
   display: flex;
   align-items: center;
 }
+
 .title {
   display: flex;
   align-items: center;
   width: 100%;
 }
+
 .tip {
   display: none;
 }
+
 .fs {
   font-size: 18px;
   margin-left: 10px;
 }
+
 .title:hover {
   .tip {
     display: flex;
@@ -272,66 +326,78 @@
     width: 100%;
   }
 }
+
 .titleText {
   width: 12rem;
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
 }
+
 .ant-popover-inner {
   border-radius: 10px;
   background-color: rgba(255, 255, 255, 0.788);
 }
+
 .ant-popover-inner-content {
   padding: 10px 10px;
 }
 
-.ant-popover-message > .anticon {
+.ant-popover-message>.anticon {
   top: 7.0005px;
 }
+
 .listCard {
   display: flex;
+
   .cardItem {
     padding: 0.5rem;
   }
+
   .cardContent {
     height: 40rem;
     overflow-y: scroll;
     width: 21rem;
   }
+
   .cardItemData {
     padding: 1rem;
     border: 1px solid #b5b8c8;
     margin-bottom: 1rem;
   }
 }
+
 .sortable-ghost {
   border-bottom: 2px dashed #1890ff;
 }
 
 .doctorTable {
   margin-bottom: 16px;
+
   .cardContent {
     height: 40rem;
     overflow-y: scroll;
     width: 19.5rem;
   }
 }
+
 .formData {
   height: calc(100vh - 170px);
   overflow-y: scroll;
   padding-right: 20px;
-  .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;
   }
 
   .doctorTable {
     margin-bottom: 16px;
   }
+
   .filed_listItem {
     display: flex;
     height: 3.6rem;
+
     .ant-btn-icon-only {
       width: 32px;
       height: 32px;
@@ -344,4 +410,4 @@
       justify-content: center;
     }
   }
-}
+}
\ No newline at end of file

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

@@ -366,7 +366,7 @@ const NodeEdit = props => {
             <Option value="移交上报人">移交上报人</Option>
           </Select>
         </Form.Item>
-        <Form.Item label="检查前面在办" name="aheadHandle">
+        {/* <Form.Item label="检查前面在办" name="aheadHandle">
           <Select>
             <Option value={0}>前面有在办也能移交</Option>
             <Option value={1}>前面有在办不能移交</Option>
@@ -378,7 +378,7 @@ const NodeEdit = props => {
             <Option value={1}>多人接收，一人办理</Option>
             <Option value={2}>一人接收，一人办理</Option>
           </Select>
-        </Form.Item>
+        </Form.Item> */}
         <Form.Item label="平级移交" name="Transferable">
           <Radio.Group>
             <Radio value="0">否</Radio>

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

@@ -363,12 +363,14 @@ const FlowChart = props => {
     if (modalType === 'edit') {
       // 编辑节点
       let nodeData = diagram.model.findNodeDataForKey(nodeKey);
-      const { NodeName, NodeType, roleList, SerialNo } = obj;
+      const { NodeName, NodeType, roleList, SerialNo, aheadHandle, NodeHandling } = obj;
       nodeData.NodeName = NodeName;
       nodeData.NodeType = NodeType;
       nodeData.NodeId = nodeKey;
       nodeData.roleList = roleList;
       nodeData.SerialNo = SerialNo;
+      nodeData.aheadHandle = aheadHandle;
+      nodeData.NodeHandling = NodeHandling;
       diagram.model.updateTargetBindings(nodeData);
     }
     // 关闭时进行数据比对看数据是否改变

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

@@ -29,6 +29,8 @@ const NodeModal = props => {
     NodeName: '',
     NodeType: '',
     SerialNo: '',
+    aheadHandle: 1,
+    NodeHandling: 1,
     roleList: [],
   });
   useEffect(() => {
@@ -45,7 +47,12 @@ const NodeModal = props => {
           type = '1';
         }
         setNodeMsg({ ...nodeMsg, newSerialNo, NodeType: type, roleList: [] });
-        form.setFieldsValue({ SerialNo: newSerialNo, NodeType: type });
+        form.setFieldsValue({
+          SerialNo: newSerialNo,
+          NodeType: type,
+          aheadHandle: 1,
+          NodeHandling: 1,
+        });
       }
     }
   }, [visible]);
@@ -53,8 +60,8 @@ const NodeModal = props => {
   const getFormData = () => {
     setNodeMsg(editMsg);
     console.log(editMsg, 'editMsg');
-    const { NodeName, NodeType, SerialNo } = editMsg;
-    form.setFieldsValue({ NodeName, NodeType, SerialNo });
+    const { NodeName, NodeType, SerialNo, aheadHandle, NodeHandling } = editMsg;
+    form.setFieldsValue({ NodeName, NodeType, SerialNo, aheadHandle, NodeHandling });
   };
   // 提交表单
   const onFinish = () => {
@@ -201,7 +208,7 @@ const NodeModal = props => {
         >
           节点信息
         </Divider>
-        <Form form={form} labelCol={{ span: 5 }} wrapperCol={{ span: 18 }}>
+        <Form form={form} labelCol={{ span: 6 }} wrapperCol={{ span: 17 }}>
           <Form.Item
             label="序号"
             name="SerialNo"
@@ -235,6 +242,19 @@ const NodeModal = props => {
               <Option value="2">结束节点</Option>
             </Select>
           </Form.Item>
+          <Form.Item label="检查前面在办" name="aheadHandle">
+            <Select>
+              <Option value={0}>前面有在办也能移交</Option>
+              <Option value={1}>前面有在办不能移交</Option>
+            </Select>
+          </Form.Item>
+          <Form.Item label="节点办理情况" name="NodeHandling">
+            <Select>
+              <Option value={0}>多人接收，多人办理</Option>
+              <Option value={1}>多人接收，一人办理</Option>
+              <Option value={2}>一人接收，一人办理</Option>
+            </Select>
+          </Form.Item>
         </Form>
         <Divider
           orientation="left"
@@ -262,7 +282,7 @@ const NodeModal = props => {
           rowKey={record => record.roleId}
           bordered
           size="small"
-          scroll={{ y: 'calc(100vh - 515px)' }}
+          scroll={{ y: 'calc(100vh - 630px)' }}
           onRow={(record, index) => ({
             onDoubleClick: () => {
               toEdit(record, index);

src/pages/productCenter/webConfig/components/siteConfigDrawer.js

@@ -23,8 +23,8 @@ import ColorLinear from './ColorLinear';
 import Upload from '@/components/Upload';
 import styles from './siteConfigDrawer.less';
 const { Option } = Select;
-const plainOptions = ['搜索', '首页', '常用', '反馈', '消息'];
-const defaultCheckedList = ['搜索', '首页', '常用', '反馈', '消息'];
+const plainOptions = ['搜索', '消息', '反馈'];
+const defaultCheckedList = ['搜索', '消息'];
 const colorList = [
   { key: '薄暮', color: '#F5222D' },
   { key: '火山', color: '#FA541C' },
@@ -131,6 +131,7 @@ export default props => {
       if (validate) {
         onOk({
           ...validate,
+          headerPrimaryColor: validate.primaryColor,
           mode: 'single',
           menu: 'banner-left',
         });
@@ -271,7 +272,7 @@ export default props => {
         <Divider orientation="left" style={{ borderTopColor: '#99bbe8' }}>
           主题配置
         </Divider>
-        <Form.Item name="headerPrimaryColor" label="顶部">
+        {/* <Form.Item name="headerPrimaryColor" label="顶部">
           <div className={styles.colorBox}>
             <div
               className={styles.colorSwatch}
@@ -290,11 +291,11 @@ export default props => {
               />
             </div>
           </div>
-        </Form.Item>
+        </Form.Item> */}
         <Form.Item name="navTheme" label="菜单">
           <Radio.Group>
-            <Radio value="dark">暗</Radio>
-            <Radio value="light">亮</Radio>
+            <Radio value="dark">黑</Radio>
+            <Radio value="light">白</Radio>
           </Radio.Group>
         </Form.Item>
         <Form.Item name="primaryColor" label="基础">
@@ -342,7 +343,7 @@ export default props => {
               onChange={onChange}
             />
           </Form.Item>
-          <Form.Item label="功能标签" name="mdi">
+          {/* <Form.Item label="功能标签" name="mdi">
             <Select placeholder="请选择功能标签">
               <Option value="MDI" key="0">
                 多标签模式
@@ -351,7 +352,7 @@ export default props => {
                 单标签模式
               </Option>
             </Select>
-          </Form.Item>
+          </Form.Item> */}
           <Form.Item label="二维码地址" name="qrcode">
             <Input placeholder="请输入二维码地址" autoComplete="off" />
           </Form.Item>