事件权限交互修改

src/pages/database/InitDataBase.jsx

+/* eslint-disable spaced-comment */
+/* eslint-disable eqeqeq */
 import React, { useEffect, useRef, useState } from 'react';
 import {
   Card,
@@ -258,7 +260,7 @@ const InitDataBase = props => {
     })
       .then(res => {
         setCardLoading(false);
-        if (res.code === 0&& res.data == true) {
+        if (res.code == 0 && res.data == true) {
           notification.success({
             message: '提示',
             duration: 3,
@@ -279,7 +281,7 @@ const InitDataBase = props => {
   };
   // 获取数据库列表
   const selectFocus = e => {
-     //setOption([]);
+    //setOption([]);
     let params = form.getFieldsValue();
     getDataBaseList({
       // _version: 9999,
@@ -290,7 +292,7 @@ const InitDataBase = props => {
     })
       .then(res => {
         if (res.code == 0) {
-          console.log(res.data.root)
+          console.log(res.data.root);
           setOption(res.data.root);
         } else {
           notification.error({
@@ -689,7 +691,7 @@ const InitDataBase = props => {
                 <Input placeholder="请输入用户名称" />
               </Form.Item>
               <Form.Item label={`${formLables.password}：`} name="password">
-                <Input placeholder="请输入用户密码" type="password"/>
+                <Input placeholder="请输入用户密码" type="password" />
               </Form.Item>
               <Form.Item label={`${formLables.dbName}：`} name="dbName">
                 <Select
@@ -757,7 +759,7 @@ const InitDataBase = props => {
         <Card className={styles.mgTop20}>
           <div className={styles.tableTitle}>近期保存的数据库连接</div>
           <Table
-            style={{ marginTop: '20px'}}
+            style={{ marginTop: '20px' }}
             scroll={{ x: 'max-content', y: 'calc(100vh - 580px)' }}
             columns={columns}
             dataSource={data}

src/pages/database/ManagementDataBase.jsx

@@ -8,7 +8,7 @@ import {
   Popconfirm,
   notification,
   Spin,
-  Pagination
+  Pagination,
 } from 'antd';
 import copy from 'copy-to-clipboard';
 import PageContainer from '@/components/BasePageContainer';
@@ -338,11 +338,11 @@ const ManagementDataBase = () => {
   ];
 
   const paginationChange = (page, pageSizes) => {
-    console.log(page)
-    console.log(pageSizes)
+    console.log(page);
+    console.log(pageSizes);
     setCurrentPage(page);
     setPageSize(pageSizes);
-  }
+  };
 
   return (
     <>

src/pages/platformCenter/bsmanager/workFlow/flowNode/flowNodeComponents/nodeEditComponents/Fieldselection.jsx

@@ -133,7 +133,7 @@ const Fieldselection = props => {
       title="流程节点配置"
       visible={visible}
       onOk={onFinish}
-      width="700px"
+      width="750px"
       onCancel={handleCancel}
       maskClosable={false}
       destroyOnClose

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

@@ -130,7 +130,7 @@ const AddFlowsModal = props => {
     let a1 = [];
     let a2;
     let a3 = [];
-    initialArr.map(i => {
+    initialArr.data.map(i => {
       // console.log(i.groupType)
       a2 = i.groupType;
       // console.log(a2)

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

@@ -791,11 +791,12 @@ const AddModal = props => {
     return tempObj;
   };
   const formateArrDataA1 = (initialArr, name) => {
+    console.log(initialArr);
     let aa = [];
     let a1 = [];
     let a2;
     let a3 = [];
-    initialArr.map(i => {
+    initialArr.data.map(i => {
       // console.log(i.groupType)
       a2 = i.groupType;
       // console.log(a2)
@@ -888,6 +889,9 @@ const AddModal = props => {
   };
   const onOK = prop => {
     console.log(prop.isType);
+    console.log(prop.stt);
+    console.log(prop.filed22);
+    console.log(prop.title);
     if (prop.isType == 'app') {
       let title = prop.title;
       let selectData = prop.stt;
@@ -904,8 +908,13 @@ const AddModal = props => {
           }
         });
         console.log(aa);
-        if (aa.length == 0) {
-          bb = 1;
+        if (item == '外部字段' && aa.length == 0) {
+          bb = 0;
+        } else {
+          // eslint-disable-next-line no-lonely-if
+          if (aa.length == 0) {
+            bb = 1;
+          }
         }
       });
       console.log(aa);
@@ -917,6 +926,8 @@ const AddModal = props => {
       } else {
         setIsVisible(false);
         let inputText = { ...inputValue };
+        console.log(inputText);
+        console.log(prop.str);
         inputText[prop.pickItem] = prop.str;
         setCheckedList1(prop.checkedList);
         setInputValue(inputText);
@@ -990,11 +1001,11 @@ const AddModal = props => {
         }
       }
     });
-    if (a.length > 0) {
-      pp.外部字段 = a;
-      console.log(pp);
-      arr.push('外部字段');
-    }
+    // if (a.length > 0) {
+    //   pp.外部字段 = a;
+    //   console.log(pp);
+    //   arr.push('外部字段');
+    // }
     console.log(a);
     console.log(pp);
     setFiled1(pp);

src/pages/platformCenter/bsmanager/workOrder/changeAdd.less

+.ant-modal-close-x {
+  line-height: 35px;
+}
+.ant-btn .anticon.anticon-plus > svg {
+  margin-top: -5px;
+}
+.incidentContainer {
+  .ant-card-body {
+    padding: 12px 24px 24px 24px;
+  }
+  .ant-modal-body {
+    padding: 0px 24px 0px 24px;
+  }
+  .linkDrowp {
+    position: absolute;
+    left: 93.5%;
+    width: 1rem;
+    height: 100%;
+    display: flex;
+    align-items: center;
+  }
+  .listItem {
+    display: flex;
+    justify-content: space-between;
+    font-size: 14px;
+    font-weight: 400;
+    color: #414e65;
+    cursor: pointer;
+    line-height: 28px;
+    align-items: center;
+    padding: 8px 14px;
+  }
+  .ant-btn .anticon.anticon-plus > svg,
+  .ant-btn .anticon.anticon-minus > svg {
+    margin-top: -5px;
+  }
+  .pickItem {
+    background-color: #f5f6f9;
+  }
+  .contentContainers {
+    .ant-table table {
+      width: 100% !important;
+      overflow-x: scroll;
+    }
+    display: flex;
+    width: 100%;
+    position: relative;
+    .ant-table.ant-table-bordered > .ant-table-container {
+      min-width: calc(100vw - 582px);
+      height: calc(100vh - 166px);
+      overflow-x: hidden;
+      border: none;
+    }
+    .orgContainer {
+      height: calc(100vh - 74px);
+      width: 250px;
+      left: 0;
+      top: 0;
+      overflow-x: 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: 50%;
+        right: 2px;
+        transform: translate(0%, -50%);
+        z-index: 1;
+      }
+    }
+
+    .orgContainerHide {
+      // transform: translateX(-230px);
+      left: 0px;
+      top: 0;
+      width: 26px;
+    }
+    .ant-popover-message-title {
+      padding-left: 20px;
+    }
+    .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);
+        background-color: #f6f9fe;
+      }
+      .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;
+      }
+    }
+  }
+  .icon {
+    margin-top: -5px !important;
+    vertical-align: text-bottom;
+  }
+}
+.formData {
+  height: 38rem;
+  overflow-y: scroll;
+  .ant-form-item-label
+    > label.ant-form-item-required:not(.ant-form-item-required-mark-optional)::before {
+    display: none;
+  }
+  .formData_label {
+    display: flex;
+    align-items: center;
+  }
+  .filed_listItem {
+    display: flex;
+    height: 3.6rem;
+    .ant-btn-icon-only {
+      width: 32px;
+      height: 32px;
+      /* padding: 2.4px 0; */
+      font-size: 16px;
+      border-radius: 2px;
+
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+  }
+  .ant-modal-root .ant-checkbox-group .ant-checkbox-group-item {
+    margin-right: 0px !important;
+    min-width: 200px !important;
+  }
+}
+.listCard {
+  display: flex;
+  justify-content: space-around;
+  width: 100%;
+  .cardItem {
+    padding: 0.5rem;
+    width: 50%;
+  }
+  .cardContent {
+    height: 30rem;
+    overflow-y: scroll;
+    overflow-x: scroll;
+    width: 100%;
+  }
+  .cardItemData {
+    padding: 1rem;
+    border: 1px solid #b5b8c8;
+    margin-bottom: 1rem;
+    overflow-x: scroll;
+  }
+}
+.listCard1 {
+  width: 100%;
+  display: flex;
+  height: 34rem;
+  .cardItem1 {
+    border: 1px solid #b5b8c8;
+    padding: 0.5rem;
+    width: 70%;
+  }
+  .cardItem11 {
+    padding: 0rem 0.5rem;
+    width: 30%;
+    height: 34.5rem;
+    overflow-y: scroll;
+    overflow-x: scroll;
+  }
+  .cardContent1 {
+    height: 33rem;
+    overflow-y: scroll;
+    width: 100%;
+    display: flex;
+    justify-content: space-around;
+  }
+  .tab {
+    width: 100%;
+  }
+  .cardItemData1 {
+    padding: 0rem 1rem;
+    margin-bottom: 1rem;
+    width: 100%;
+    height: 28rem;
+  }
+}
+.doctorTable {
+  margin-bottom: 16px;
+}
+
+.ant-drawer-footer {
+  display: flex;
+  justify-content: flex-end;
+}
+.config {
+  display: flex;
+  padding: 1rem 0 0.5rem 0.5rem;
+  justify-content: space-between;
+  width: calc(100% - 10px);
+  .title {
+    font-size: 18px;
+    color: rgba(0, 114, 255, 1);
+    font-weight: bold;
+  }
+  .btn {
+    display: flex;
+    justify-content: flex-end;
+    width: 20rem;
+  }
+  .ant-btn {
+    display: flex;
+    align-items: center;
+    margin-left: 20px;
+  }
+}
+.containerBox {
+  width: 100vm;
+  height: calc(100vh - 90px);
+  background: #ffffff;
+  .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;
+  }
+  .clickRowStyle {
+    background: #cfe7fd;
+  }
+  .ant-table-thead tr th {
+    font-weight: 600;
+    color: rgba(0, 0, 0, 0.85);
+  }
+}
+.panda-pro-pages-platform-center-bsmanager-work-order-incident-filed_listItem {
+  display: flex;
+}

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

@@ -76,38 +76,90 @@ const incident = () => {
       dataIndex: 'name',
       key: 'name',
       width: 150,
+      render: record => {
+        if (record) {
+          return (
+            <Tooltip placement="topLeft" title={record}>
+              {record}
+            </Tooltip>
+          );
+        }
+      },
     },
     {
       title: '事件主表',
       dataIndex: 'tableName',
       key: 'tableName',
       width: 200,
-      ellipsis: true,
+      render: record => {
+        if (record) {
+          return (
+            <Tooltip placement="topLeft" title={record}>
+              {record}
+            </Tooltip>
+          );
+        }
+      },
     },
     {
       title: '编码',
       dataIndex: 'code',
       key: 'code',
-      width: 50,
+      width: 80,
+      render: record => {
+        if (record) {
+          return (
+            <Tooltip placement="topLeft" title={record}>
+              {record}
+            </Tooltip>
+          );
+        }
+      },
     },
     {
       title: '摘要字段',
       dataIndex: 'summaryFields',
       key: 'summaryFields',
-      width: 200,
-      ellipsis: true,
+      width: 100,
+      render: record => {
+        if (record) {
+          return (
+            <Tooltip placement="topLeft" title={record}>
+              {record}
+            </Tooltip>
+          );
+        }
+      },
     },
     {
       title: '权限',
       dataIndex: 'roles',
       key: 'roles',
       width: 50,
+      render: record => {
+        if (record) {
+          return (
+            <Tooltip placement="topLeft" title={record}>
+              {record}
+            </Tooltip>
+          );
+        }
+      },
     },
     {
       title: '流程',
       dataIndex: 'flowCount',
       key: 'flowCount',
       width: 50,
+      render: record => {
+        if (record) {
+          return (
+            <Tooltip placement="topLeft" title={record}>
+              {record}
+            </Tooltip>
+          );
+        }
+      },
     },
     {
       title: '上报',
@@ -119,23 +171,35 @@ const incident = () => {
       title: '上报字段',
       dataIndex: 'reportFields',
       key: 'reportFields',
-      width: 100,
-      render: item => (
-        <span style={{ color: 'grey' }} key={item}>
-          {item}
-        </span>
-      ),
+      width: 80,
+      render: record => {
+        if (record) {
+          return (
+            <Tooltip placement="topLeft" title={record}>
+              <span style={{ color: 'grey' }} key={record}>
+                {record}
+              </span>
+            </Tooltip>
+          );
+        }
+      },
     },
     {
       title: '显示字段',
       dataIndex: 'displayFields',
       key: 'displayFields',
-      width: 100,
-      render: item => (
-        <span style={{ color: 'grey' }} key={item}>
-          {item}
-        </span>
-      ),
+      width: 80,
+      render: record => {
+        if (record) {
+          return (
+            <Tooltip placement="topLeft" title={record}>
+              <span style={{ color: 'grey' }} key={record}>
+                {record}
+              </span>
+            </Tooltip>
+          );
+        }
+      },
     },
 
     {
@@ -153,7 +217,7 @@ const incident = () => {
       title: '编辑字段',
       dataIndex: 'editableFields',
       key: 'editableFields',
-      width: 100,
+      width: 80,
       render: item => (
         <div
           ref={r => {
@@ -168,7 +232,7 @@ const incident = () => {
       title: '上报方式',
       dataIndex: 'createMode',
       key: 'createMode',
-      width: 100,
+      width: 80,
     },
     // {
     //     title: '置顶条件',
@@ -500,12 +564,12 @@ const incident = () => {
             </div>
             <div className={styles.switcher}>
               {treeVisible && (
-                <Tooltip title="隐藏机构列表">
+                <Tooltip title="隐藏事件列表">
                   <DoubleLeftOutlined onClick={() => setTreeVisible(false)} />
                 </Tooltip>
               )}
               {!treeVisible && (
-                <Tooltip title="显示机构列表">
+                <Tooltip title="显示事件列表">
                   <DoubleRightOutlined onClick={() => setTreeVisible(true)} />
                 </Tooltip>
               )}
@@ -547,7 +611,7 @@ const incident = () => {
             })}
             columns={columns}
             dataSource={tableData[pickItem]}
-            // scroll={{ y: 'calc(100vh - 155px)', x: 'max-content' }}
+            scroll={{ y: 'calc(100vh - 155px)', x: 'max-content' }}
             pagination={{
               showTotal: (total, range) =>
                 `第${range[0]}-${range[1]} 条/共 ${total} 条`,

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

@@ -8,7 +8,9 @@
   .ant-card-body {
     padding: 12px 24px 24px 24px;
   }
-
+  .ant-modal-body {
+    padding: 0px 24px 0px 24px;
+  }
   .linkDrowp {
     position: absolute;
     left: 93.5%;
@@ -36,6 +38,10 @@
     background-color: #f5f6f9;
   }
   .contentContainers {
+    .ant-table table {
+      width: 100% !important;
+      overflow-x: scroll;
+    }
     display: flex;
     width: 100%;
     position: relative;
@@ -129,7 +135,7 @@
       .ant-table-cell {
         text-align: center;
         overflow: hidden;
-        // text-overflow:ellipsis;
+        text-overflow: ellipsis;
         white-space: nowrap;
       }
       .ant-table-body {
@@ -204,10 +210,20 @@
   }
 }
 .listCard1 {
+  width: 100%;
   display: flex;
+  height: 34rem;
   .cardItem1 {
+    border: 1px solid #b5b8c8;
     padding: 0.5rem;
-    width: 100%;
+    width: 70%;
+  }
+  .cardItem11 {
+    padding: 0rem 0.5rem;
+    width: 30%;
+    height: 34.5rem;
+    overflow-y: scroll;
+    overflow-x: scroll;
   }
   .cardContent1 {
     height: 33rem;
@@ -216,12 +232,14 @@
     display: flex;
     justify-content: space-around;
   }
+  .tab {
+    width: 100%;
+  }
   .cardItemData1 {
-    padding: 1rem;
-    border: 1px solid #b5b8c8;
+    padding: 0rem 1rem;
     margin-bottom: 1rem;
-    width: 33.3%;
-    overflow-x: scroll;
+    width: 100%;
+    height: 28rem;
   }
 }
 .doctorTable {

src/pages/platformCenter/hostmanager/gateWay/gateWay.jsx

@@ -49,7 +49,7 @@ const GateConfig = () => {
           >
             <img src={configuration} style={{ height: '16px' }} alt="" />
             <span style={{ marginLeft: '10px', fontWeight: 'bold' }}>
-              服务管理
+              网关配置
             </span>
           </div>
           <Divider />
@@ -66,7 +66,7 @@ const GateConfig = () => {
                     marginRight: '-10px',
                   }}
                 >
-                  服务运行
+                  网关开启
                 </div>
               </Col>
               <Col span={22}>

src/pages/platformCenter/standingBook/changeAdd.jsx

@@ -187,7 +187,7 @@ const AddModal = props => {
       title={isType === 'rule' ? '选择验证规则' : '字段集选择'}
       bodyStyle={{ width: '100%', minHeight: '100px' }}
       style={{ top: '10px' }}
-      width="700px"
+      width="750px"
       centered
       maskClosable={false}
       cancelText="取消"

src/pages/platformCenter/standingBook/standingBook.less

@@ -294,7 +294,7 @@
   .cardContent {
     height: 40rem;
     overflow-y: scroll;
-    width: 19.5rem;
+    width: 21rem;
   }
   .cardItemData {
     padding: 1rem;

src/pages/userCenter/siteManageV2/siteManage.less

@@ -369,7 +369,7 @@
 
   .ant-checkbox-group .ant-checkbox-group-item {
     margin-right: 0px !important;
-    min-width: 200px !important;
+    min-width: 300px !important;
   }
 
   .ant-tree-list-holder {