Merge branch 'master' of https://g.civnet.cn:8443/ReactWeb5/maintenance

src/pages/bsmanager/base/tablemanager/filedConfig/filedConfig.jsx

@@ -369,7 +369,7 @@ const AddModal = props => {
               aa.push({ name: item, key: index, ID: index, children: arr[item] });
               bb.push(item);
             });
-            console.log(aa,'aaaaaaaaaaaaa');
+            console.log(aa, 'aaaaaaaaaaaaa');
             console.log(arr);
             console.log(newArr);
             setSelectGroup(newArr);
@@ -628,7 +628,7 @@ const AddModal = props => {
       <Spin tip="loading..." spinning={treeLoading}>
         <div className={styles.containerBox}>
           <div className={styles.config}>
-            <div className={styles.title}> 页面属性 【{formObj}】</div>
+            <div className={styles.title}> 字段配置 【{formObj}】</div>
             <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
               <div style={{ lineHeight: '32px', marginRight: '5px' }}>快速切换表:</div>
               <div style={{ width: '350px', marginRight: '10px' }}>

src/pages/bsmanager/patrolMaintenance/maintenance/maintenance.jsx

+/* eslint-disable no-else-return */
 /* eslint-disable react-hooks/rules-of-hooks */
 /* eslint-disable camelcase */
 import React, { useState, useEffect } from 'react';
-import { Space, Table, Popconfirm, Tooltip, Button, notification } from 'antd';
+import { Space, Table, Popconfirm, Tooltip, Button, notification, Tag } from 'antd';
 import {
   CM_XWBPlan_DataList,
   CM_XWBPlan_RemovePlan,
@@ -73,7 +74,7 @@ const maintenance = () => {
       align: 'center',
     },
     {
-      title: '台账名称',
+      title: '维保设备',
       dataIndex: 'accountName',
       key: 'accountName',
       width: 200,
@@ -114,34 +115,6 @@ const maintenance = () => {
         </Tooltip>
       ),
     },
-    {
-      title: '台账过滤条件',
-      dataIndex: 'filterCondition',
-      key: 'filterCondition',
-      width: 150,
-      onCell: () => ({
-        style: {
-          maxWidth: 150,
-          overflow: 'hidden',
-          whiteSpace: 'nowrap',
-          textOverflow: 'ellipsis',
-          cursor: 'pointer',
-        },
-      }),
-      align: 'center',
-      render: record => (
-        <Tooltip placement="topLeft" title={record}>
-          {record}
-        </Tooltip>
-      ),
-    },
-    {
-      title: '是否送审',
-      dataIndex: 'isSubmit',
-      key: 'isSubmit',
-      width: 80,
-      align: 'center',
-    },
     {
       title: '执行角色',
       dataIndex: 'doRole',
@@ -167,7 +140,7 @@ const maintenance = () => {
       title: '预生成天数',
       dataIndex: 'produceDays',
       key: 'produceDays',
-      width: 80,
+      width: 90,
       align: 'center',
       onCell: () => ({
         style: {
@@ -183,7 +156,7 @@ const maintenance = () => {
       title: '在线任务量',
       dataIndex: 'onLines',
       key: 'onLines',
-      width: 80,
+      width: 90,
       align: 'center',
       onCell: () => ({
         style: {
@@ -207,6 +180,41 @@ const maintenance = () => {
     //   width: 80,
     //   align: 'center',
     // },
+    {
+      title: '是否送审',
+      dataIndex: 'isSubmit',
+      key: 'isSubmit',
+      width: 80,
+      align: 'center',
+      render: record => {
+        if (record == '是') {
+          return <Tag color="success">{record}</Tag>;
+        } else {
+          return <Tag color="processing">{record}</Tag>;
+        }
+      },
+    },
+    {
+      title: '台账过滤条件',
+      dataIndex: 'filterCondition',
+      key: 'filterCondition',
+      width: 150,
+      onCell: () => ({
+        style: {
+          maxWidth: 150,
+          overflow: 'hidden',
+          whiteSpace: 'nowrap',
+          textOverflow: 'ellipsis',
+          cursor: 'pointer',
+        },
+      }),
+      align: 'center',
+      render: record => (
+        <Tooltip placement="topLeft" title={record}>
+          {record}
+        </Tooltip>
+      ),
+    },
     {
       title: '操作',
       ellipsis: true,

src/pages/platformCenter/hostmanager/proxyConfig/ProxyConfig.jsx

@@ -146,6 +146,11 @@ const ProxyConfig = () => {
     // });
     GetNginxConfigInfo().then(res => {
       if (res.code === 0) {
+        form.setFieldsValue({
+          NginxPort: res.data.NginxPort,
+          IISIPProt: res.data.IISIPProt,
+          EMQIPPort: res.data.EMQIPPort,
+        });
         setCurrentConfig({
           NginxPort: res.data.NginxPort,
           IISIPProt: res.data.IISIPProt,

src/pages/userCenter/roleManage/AddModal.jsx

@@ -50,6 +50,12 @@ const AddModal = props => {
         });
         setTypeList(list);
         console.log(list);
+      } else {
+        notification.error({
+          message: '提示',
+          duration: 5,
+          description: res.msg,
+        });
       }
       console.log(res, 'resss');
     });