fix: web配置登陆界面区分web4跟web5

src/components/CheckGroup/ItemCard.jsx

@@ -165,12 +165,16 @@ const ListCardItem = props => {
               >
                 {isGroup ? (
                   <>
-                    <FolderFilled style={{ color: '#1890ff' }} />
+                    <FolderFilled
+                      style={{ color: '#1890ff', verticalAlign: 'middle', marginTop: '-4px' }}
+                    />
                     <span style={{ marginLeft: '5px' }}>{item.text}</span>
                   </>
                 ) : (
                   <>
-                    <FileOutlined style={{ color: '#1890ff' }} />
+                    <FileOutlined
+                      style={{ color: '#1890ff', verticalAlign: 'middle', marginTop: '-4px' }}
+                    />
                     <span style={{ marginLeft: '5px' }}>{item.text}</span>
                   </>
                 )}

src/components/CheckGroup/index.jsx

@@ -3,7 +3,7 @@ import React, { useState, useEffect } from 'react';
 import { Spin, Checkbox, Button, Empty } from 'antd';
 import _ from 'lodash';
 import ListCardItem from './ItemCard';
-import styles from './ItemCard.less';
+import styles from './itemCard.less';
 import { GetMapSetByGroupID } from '@/services/userManage/api';
 
 const tip = 'loading...';

src/components/CheckGroup/itemCard.less

@@ -7,17 +7,21 @@
   margin-top: 20px;
   min-height: 50px;
   padding: 0 10px 10px 20px;
+
   .ant-checkbox-wrapper {
     background-color: #fff;
   }
+
   .topCheckbox {
     height: 20px;
     margin: -10px 0 0 0px;
     line-height: 20px;
   }
-  .topCheckbox > label :hover {
+
+  .topCheckbox>label :hover {
     font-weight: 600;
   }
+
   .checkdiv {
     display: flex;
     flex-wrap: wrap;
@@ -25,6 +29,7 @@
     // justify-content: space-between;
   }
 }
+
 .divSingle {
   border: none;
   margin-top: 20px;
@@ -37,20 +42,23 @@
   margin-right: 10px;
   background: transparent;
 }
+
 .isSearch {
   color: red;
   background-color: yellow;
 }
+
 .boldLabel {
   font-size: 15px;
   font-weight: bold;
   background-color: #fff;
 }
+
 .btnBox {
-  position: sticky;
-  bottom: 0px;
-  right: 0px;
-  background-color: #fff;
+  position: absolute;
+  top: 55px;
+  right: 7px;
+  // background-color: #fff;
   width: 100%;
   height: 40px;
   padding: 0 20px;

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

@@ -209,6 +209,32 @@ const incident = () => {
       key: 'createMode',
       width: 80,
     },
+    {
+      title: '流程数量',
+      dataIndex: 'flowCount',
+      key: 'flowCount',
+      width: 80,
+      render: (text, record) => (
+        <>
+          <span
+            style={{
+              display: 'inline-block',
+              width: '60px',
+              color:
+                Number(text.split(' ')[0]) > 1 && record.createMode === '工单分派' ? 'red' : '',
+            }}
+          >
+            {Number(text.split(' ')[0]) > 1 && record.createMode === '工单分派' ? (
+              <Tooltip placement="topLeft" title="工单模型的流程数量不能大于1">
+                {text}
+              </Tooltip>
+            ) : (
+              text
+            )}
+          </span>
+        </>
+      ),
+    },
     {
       title: '操作',
       key: 'action',

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

@@ -250,7 +250,7 @@ const NodeModal = props => {
           </Form.Item>
           <Form.Item label="节点办理方式" name="NodeHandling">
             <Select>
-              <Option value={1}>多人接收，一人办理（或签模式）</Option>
+              <Option value={1}>多人接收，一人办理（抢占模式）</Option>
               <Option value={0}>多人接收，多人办理（会签模式）</Option>
               <Option value={2}>一人接收，一人办理</Option>
             </Select>

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

@@ -139,7 +139,7 @@ export default props => {
           messageVoice: true,
           menuState: 'open',
           hideMap: false,
-          loginTemplate: 'Default.html',
+          loginTemplate: 'Dark',
           primaryColor: '#0087F7',
           navTheme: 'dark',
           CloudStyle: '是',
@@ -154,12 +154,44 @@ export default props => {
   const onGetLoginPages = () => {
     if (loginPages.length === 0) {
       getLoginPage().then(res => {
-        setLoginPages(res.data);
-        setLoginPages(res.data);
+        let list = [
+          {
+            label: renderTitle('web5内置模板'),
+            options: [],
+          },
+          {
+            label: renderTitle('web4登录模板'),
+            options: [],
+          },
+        ];
+        res.data.loginTemplate.forEach(item => {
+          if (item.type === 'web5') {
+            list[0].options.push(renderItem(`${item.title}`));
+          }
+          if (item.type === 'web4') {
+            list[1].options.push(renderItem(`${item.title}`));
+          }
+        });
+
+        setLoginPages(list);
       });
     }
   };
-
+  const renderItem = title => ({
+    value: title,
+    label: (
+      <div
+        style={{
+          display: 'flex',
+          justifyContent: 'space-between',
+        }}
+      >
+        {title}
+      </div>
+    ),
+  });
+  // 登录搜索头部
+  const renderTitle = title => <span>{title}</span>;
   const onsubmit = () => {
     form.validateFields().then(validate => {
       console.log(validate);
@@ -326,25 +358,9 @@ export default props => {
         >
           <Input autoComplete="off" disabled={isEdit} />
         </Form.Item>
-        {/* <Row>
-          <Col span={20}> */}
         <Form.Item label="登录模板" name="loginTemplate">
           <AutoComplete placeholder="请选择登录模板" options={loginPages} allowClear />
-          {/* <Select placeholder="请选择登录模板">
-            {loginPages.map(item => (
-              <Option value={item.value} key={item.value}>
-                {item.value}
-              </Option>
-            ))}
-          </Select> */}
-        </Form.Item>
-        {/* </Col> */}
-        {/* <Col span={4}>
-            <Form.Item>
-              <Button onClick={addParama}>参数管理</Button>
         </Form.Item>
-          </Col>
-        </Row> */}
         <Divider orientation="left" style={{ borderTopColor: '#99bbe8' }}>
           主页配置
         </Divider>