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

src/pages/bsmanager/workOrder/workflowEdit/WorkflowHomePage.jsx

@@ -444,11 +444,12 @@ const WorkflowHomePage = () => {
                       </div>
                     </div>
                     {ele.PreviewImage ? (
-                      <img
-                        src={`${
-                          window.location.origin
-                        }/PandaOMS/OMS/FileCenter/DownLoadFiles?filePath=${ele.PreviewImage}`}
-                      />
+                      // <img
+                      //   src={`${
+                      //     window.location.origin
+                      //   }/PandaOMS/OMS/FileCenter/DownLoadFiles?filePath=${ele.PreviewImage}`}
+                      // />
+                      <img src={`${window.location.origin}/${ele.PreviewImage}`} />
                     ) : (
                       <img
                         className={styles.noDataImg}

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

@@ -506,13 +506,15 @@ const IotConfig = props => {
                   测试连接
                 </Button>
                 {upgrade && (
+                  <Tooltip title="添加物联统一接入平台的子网站，并导入网页菜单数据">
                     <Button
                       type="primary"
                       onClick={() => PingIotUpdata()}
                       style={{ marginLeft: '25px' }}
                     >
-                    新增物联子站
+                      平台升级
                     </Button>
+                  </Tooltip>
                 )}
                 <span style={{ display: show1 }}>
                   <img

src/pages/userCenter/userManage/AddUserModal.jsx

@@ -76,7 +76,7 @@ const AddUserModal = props => {
     const password = addUserForm.getFieldValue('password') || '';
     const phone = addUserForm.getFieldValue('phone') || '';
     const email = addUserForm.getFieldValue('email') || '';
-
+    addUserForm.validateFields().then(validate => {
       // 正则验证
       if (loginName === '') {
         notification.error({
@@ -156,6 +156,7 @@ const AddUserModal = props => {
             message.error(err);
           });
       }
+    });
   };
   // 密码强度验证
   const changeValue = changedFields => {

src/pages/userCenter/userManage/EditUserModal.jsx

@@ -50,6 +50,7 @@ const EditUserModal = props => {
     const oldPassword = passwordForm.getFieldValue('oldPassword');
     const newPassword = passwordForm.getFieldValue('newPassword');
     const passwordConfirm = passwordForm.getFieldValue('passwordConfirm');
+    editUserForm.validateFields().then(validate => {
       // 正则验证
       if (loginName === '') {
         notification.error({
@@ -147,6 +148,7 @@ const EditUserModal = props => {
             message.error(err);
           });
       }
+    });
   };
   const title = (
     <span>