fix: 修改密码回显

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

@@ -183,7 +183,7 @@ const NodeModal = props => {
     <>
       <Drawer
         title="节点配置"
-        width={450}
+        width={550}
         onClose={handleCancel}
         visible={visible}
         bodyStyle={{ paddingBottom: 20 }}
@@ -208,11 +208,11 @@ const NodeModal = props => {
         >
           节点信息
         </Divider>
-        <Form form={form} labelCol={{ span: 6 }} wrapperCol={{ span: 17 }}>
+        <Form form={form} labelCol={{ span: 5 }} wrapperCol={{ span: 19 }}>
           <Form.Item
-            label="序号"
+            label="排序"
             name="SerialNo"
-            rules={[{ required: true, message: '请输入序号' }]}
+            rules={[{ required: true, message: '请输入排序' }]}
           >
             <Input placeholder="请输入序号" />
           </Form.Item>
@@ -238,14 +238,14 @@ const NodeModal = props => {
           >
             <Select placeholder="请选择节点类型">
               <Option value="1">开始节点</Option>
-              <Option value="0">普通节点</Option>
+              <Option value="0">经办节点</Option>
               <Option value="2">结束节点</Option>
             </Select>
           </Form.Item>
           <Form.Item label="检查前面在办" name="aheadHandle">
             <Select>
-              <Option value={1}>前面有在办不能移交</Option>
-              <Option value={0}>前面有在办也能移交</Option>
+              <Option value={0}>前面有在办可以移交</Option>
+              <Option value={1}>前面有在办不能移交（汇合节点）</Option>
             </Select>
           </Form.Item>
           <Form.Item label="节点办理方式" name="NodeHandling">
@@ -268,7 +268,7 @@ const NodeModal = props => {
           承办管理
         </Divider>
         <Button
-          style={{ marginBottom: '10px', marginLeft: '335px' }}
+          style={{ marginBottom: '10px', marginLeft: '435px' }}
           onClick={() => {
             setShowRoal(true);
           }}

src/pages/database/InitDataBase/InitDataBase.jsx

@@ -101,8 +101,9 @@ const InitDataBase = props => {
         Object.keys(dbForm).forEach(k => {
           obj[k] = res[k];
         });
-        form.setFieldsValue(obj);
-        setDbForm(val => ({ ...val, ...obj }));
+        console.log(obj, 'objohjfaosdjf');
+        form.setFieldsValue({ ...obj, password: atob(obj.password) });
+        setDbForm(val => ({ ...val, ...obj, password: atob(obj.password) }));
         setAllSqulDir(res.allSqlDir);
         if (res.allSqlDir.some(item => item === inUse)) {
           setDefaultSqlDir(res.tableSQLDirName);
@@ -235,7 +236,7 @@ const InitDataBase = props => {
             ip: obj.ip,
             dbName: obj.dbName,
             userName: obj.userName,
-            password: obj.password,
+            password: btoa(obj.password),
           });
           // setUpData(upData + 1);
           getConnRecordData();

src/pages/database/databaseConfig/mysqltable/AddModal.jsx

@@ -84,7 +84,7 @@ const AddModal = props => {
           form.setFieldsValue({ port: 3306 });
           break;
         case 'edit':
-          form.setFieldsValue({ ...formObj });
+          form.setFieldsValue({ ...formObj, password: atob(formObj.password) });
           if (!formObj.port) {
             form.setFieldsValue({ port: 3306 });
           }
@@ -145,7 +145,7 @@ const AddModal = props => {
             <Input placeholder="请输入用户名" allowClear />
           </Item>
           <Item label="密码" name="password" rules={[{ required: true, message: '请输入密码' }]}>
-            <Input placeholder="请输入密码" allowClear />
+            <Input.Password placeholder="请输入密码" allowClear />
           </Item>
         </Form>
       )}

src/pages/database/databaseConfig/oracle/AddModal.jsx

@@ -83,7 +83,7 @@ const AddModal = props => {
         form.resetFields();
         break;
       case 'edit':
-        form.setFieldsValue({ ...formObj });
+        form.setFieldsValue({ ...formObj, password: atob(formObj.password) });
         break;
       default:
         break;
@@ -135,7 +135,7 @@ const AddModal = props => {
             <Input placeholder="请输入用户名" allowClear />
           </Item>
           <Item label="密码" name="password" rules={[{ required: true, message: '请输入密码' }]}>
-            <Input placeholder="请输入密码" allowClear />
+            <Input.Password placeholder="请输入密码" allowClear />
           </Item>
         </Form>
       )}

src/pages/database/databaseConfig/sqlServer/AddModal.jsx

@@ -83,7 +83,7 @@ const AddModal = props => {
         form.resetFields();
         break;
       case 'edit':
-        form.setFieldsValue({ ...formObj });
+        form.setFieldsValue({ ...formObj, password: atob(formObj.password) });
         break;
       default:
         break;
@@ -138,7 +138,7 @@ const AddModal = props => {
             <Input placeholder="请输入用户名" allowClear />
           </Item>
           <Item label="密码" name="password" rules={[{ required: true, message: '请输入密码' }]}>
-            <Input placeholder="请输入密码" allowClear />
+            <Input.Password placeholder="请输入密码" allowClear />
           </Item>
         </Form>
       )}

src/pages/database/databaseInitialization/DatabaseInitialization.jsx

@@ -308,7 +308,7 @@ const DatabaseInitialization = props => {
         ip: resdata.data.ip,
         dbName: resdata.data.dbName,
         userName: resdata.data.userName,
-        password: btoa(resdata.data.password),
+        password: resdata.data.password,
       }).then(res => {
         if (res.code === 0) {
           if (res.data.DbInfo.ip == '127.0.0.1' || !res.data.DbInfo.ip) {
@@ -337,7 +337,7 @@ const DatabaseInitialization = props => {
             ip: resdata.data.ip,
             dbName: resdata.data.dbName,
             userName: resdata.data.userName,
-            password: resdata.data.password,
+            password: atob(resdata.data.password),
           });
           GetDbChangeFirst(kk);
           // 有License的情况下首次进入展示数据

src/pages/platformCenter/gis/schemeConfig/VectorData/AddModal.jsx

@@ -33,7 +33,7 @@ const AddModal = props => {
             gsAppName: obj.servicename,
             gsUser: obj.user,
             gsWorkspaceName: obj.workname,
-            gsPwd: obj.password,
+            gsPwd: btoa(obj.password),
             mapServerName: obj.name,
             solution: solutionNames,
           };
@@ -149,7 +149,7 @@ const AddModal = props => {
             GISServerPort: obj.port,
             gsAppName: obj.servicename,
             gsUser: obj.user,
-            gsPwd: obj.password,
+            gsPwd: btoa(obj.password),
             isGeoServer: true,
             _version: 9999,
           };

src/pages/platformCenter/hostmanager/IotConfig/IotConfig.jsx

@@ -100,7 +100,7 @@ const IotConfig = () => {
   const getCurrentConfig = () => {
     GetDataBaseConfig().then(res => {
       if (res.code === 0) {
-        GetDbProduct({ ...res.data, password: btoa(res.data.password) }).then(ress => {
+        GetDbProduct({ ...res.data }).then(ress => {
           console.log(ress.data.Project);
           if (ress.data.Project.length > 0) {
             console.log(ress.data.Project[ress.data.Project.length - 1].projectName);

src/pages/platformCenter/hostmanager/messageConfig/messageConfig.jsx

@@ -105,7 +105,7 @@ const MessageConfig = () => {
 
         GetDataBaseConfig().then(resdata => {
           if (resdata.code === 0) {
-            setCurrentDataBase(resdata.data);
+            setCurrentDataBase({ ...resdata.data, password: atob(resdata.data.password) });
             GetBasicInfo().then(reslist => {
               if (reslist.code === 0) {
                 setcurrentSiteInfo(reslist.data);

src/pages/platformCenter/videoManager/AddAllModal.jsx

@@ -56,7 +56,7 @@ const AddModal = props => {
         }
         getValue.VideoManufacturer = Type;
 
-        addInsertVideoConfig(getValue).then(res => {
+        addInsertVideoConfig({ ...getValue, LoginPwd: btoa(getValue.LoginPwd) }).then(res => {
           if (res.msg === 'Ok') {
             onCancel();
             setLoad(false);

src/pages/platformCenter/videoManager/AddModal.jsx

@@ -32,7 +32,7 @@ const AddModal = props => {
     if (kind === 'add') {
       form.resetFields();
     } else {
-      form.setFieldsValue({ ...obj });
+      form.setFieldsValue({ ...obj, LoginPwd: obj.LoginPwd ? atob(obj.LoginPwd) : '' });
     }
   }, [visible]);
   const onSubmit = () => {
@@ -52,7 +52,7 @@ const AddModal = props => {
         }
         getValue.VideoManufacturer = type;
         if (kind === 'add') {
-          addInsertVideoConfig(getValue).then(res => {
+          addInsertVideoConfig({ ...getValue, LoginPwd: btoa(getValue.LoginPwd) }).then(res => {
             if (res.msg === 'Ok') {
               onCancel();
               setLoad(false);
@@ -77,6 +77,7 @@ const AddModal = props => {
           editInsertVideoConfig({
             ...getValue,
             Id: obj.Id,
+            LoginPwd: btoa(getValue.LoginPwd),
           }).then(res => {
             if (res.msg === 'Ok') {
               onCancel();

src/pages/platformCenter/videoManager/DHModal.jsx

@@ -32,7 +32,7 @@ const AddDHModal = props => {
     if (kind === 'add') {
       form.resetFields();
     } else {
-      form.setFieldsValue({ ...obj });
+      form.setFieldsValue({ ...obj, LoginPwd: obj.LoginPwd ? atob(obj.LoginPwd) : '' });
     }
   }, [visible]);
   const onSubmit = () => {
@@ -52,7 +52,7 @@ const AddDHModal = props => {
         }
         getValue.VideoManufacturer = type;
         if (kind === 'add') {
-          addInsertVideoConfig(getValue).then(res => {
+          addInsertVideoConfig({ ...getValue, LoginPwd: btoa(getValue.LoginPwd) }).then(res => {
             if (res.msg === 'Ok') {
               onCancel();
               setLoad(false);
@@ -77,6 +77,7 @@ const AddDHModal = props => {
           editInsertVideoConfig({
             ...getValue,
             Id: obj.Id,
+            LoginPwd: btoa(getValue.LoginPwd),
           }).then(res => {
             if (res.msg === 'Ok') {
               onCancel();

src/pages/platformCenter/videoManager/HKModal.jsx

@@ -31,7 +31,7 @@ const AddHKModal = props => {
     if (kind === 'add') {
       form.resetFields();
     } else {
-      form.setFieldsValue({ ...obj });
+      form.setFieldsValue({ ...obj, LoginPwd: obj.LoginPwd ? atob(obj.LoginPwd) : '' });
     }
   }, [visible]);
   const onSubmit = () => {
@@ -51,7 +51,7 @@ const AddHKModal = props => {
         }
         getValue.VideoManufacturer = type;
         if (kind === 'add') {
-          addInsertVideoConfig(getValue).then(res => {
+          addInsertVideoConfig({ ...getValue, LoginPwd: btoa(getValue.LoginPwd) }).then(res => {
             if (res.msg === 'Ok') {
               onCancel();
               setLoad(false);
@@ -76,6 +76,7 @@ const AddHKModal = props => {
           editInsertVideoConfig({
             ...getValue,
             Id: obj.Id,
+            LoginPwd: btoa(getValue.LoginPwd),
           }).then(res => {
             if (res.msg === 'Ok') {
               onCancel();

src/pages/platformCenter/videoManager/index.jsx

@@ -486,7 +486,7 @@ const videoManager = () => {
               rowKey={record => record.Id}
               columns={columns}
               dataSource={tableData}
-              scroll={{ y: 'calc(100% - 210px)', x: 'max-content' }}
+              scroll={{ y: 'calc(100% - 50px)', x: 'max-content' }}
               onRow={record => ({
                 onDoubleClick: event => {
                   event.stopPropagation();

src/pages/platformCenter/videoManager/index.less

@@ -7,7 +7,9 @@
 
   .tablebox {
     height: calc(100% - 54px);
-
+    .ant-table-container {
+      height: 100%;
+    }
     .ant-table-wrapper {
       height: 100%;
       .ant-table {