zy-react-library 1.0.151 → 1.0.153

package/components/HiddenInfo/gwj/index.js

@@ -63,19 +63,18 @@ function HiddenInfo(props) {
     setHiddenVideoFiles(hiddenVideoFiles);
 
     if (info.hiddenRectifyUserCO && info.hiddenRectifyUserCO.length > 0) {
-      const afterRectificationImageFiles = await getFile({
-        eqType: UPLOAD_FILE_TYPE_ENUM["4"],
-        eqForeignKey: hiddenId || query[hiddenIdKey],
-      });
-      setAfterRectificationImageFiles(afterRectificationImageFiles);
-
       for (let i = 0; i < info.hiddenRectifyUserCO.length; i++) {
-        if ((info.hiddenRectifyUserCO[i].isRectificationScheme === 1 && info.hiddenRectifyUserCO[i].hiddenSchemeCO && Object.keys(info.hiddenRectifyUserCO[i].hiddenSchemeCO).length > 0)) {
+        const afterRectificationImageFiles = await getFile({
+          eqType: UPLOAD_FILE_TYPE_ENUM["4"],
+          eqForeignKey: info.hiddenRectifyUserCO[i].hiddenUserId,
+        });
+        setAfterRectificationImageFiles(prevState => [...prevState, afterRectificationImageFiles]);
+        if (info.hiddenRectifyUserCO[i].isRectificationScheme === 1 && info.hiddenRectifyUserCO[i].hiddenSchemeCO && Object.keys(info.hiddenRectifyUserCO[i].hiddenSchemeCO).length > 0) {
           const rectificationPlanImageFiles = await getFile({
             eqType: UPLOAD_FILE_TYPE_ENUM["8"],
-            eqForeignKey: hiddenId || query[hiddenIdKey],
+            eqForeignKey: info.hiddenRectifyUserCO[i].hiddenSchemeId,
           });
-          setRectificationPlanImageFiles(prevState => [...prevState, ...rectificationPlanImageFiles]);
+          setRectificationPlanImageFiles(prevState => [...prevState, rectificationPlanImageFiles]);
         }
       }
     }
@@ -86,7 +85,7 @@ function HiddenInfo(props) {
           eqType: UPLOAD_FILE_TYPE_ENUM["5"],
           eqForeignKey: hiddenId || query[hiddenIdKey],
         });
-        setAcceptImageFiles(prevState => [...prevState, ...acceptImageFiles]);
+        setAcceptImageFiles(prevState => [...prevState, acceptImageFiles]);
       }
     }
 
@@ -206,7 +205,7 @@ function HiddenInfo(props) {
             )
           }
           {
-            (info.isConfirm === 1 && (info.hiddenConfirmUserCO && info.hiddenConfirmUserCO.length > 0)) && (
+            (info.hiddenConfirmUserCO && info.hiddenConfirmUserCO.length > 0) && (
               <>
                 <Divider orientation="left">隐患确认</Divider>
                 {
@@ -379,7 +378,7 @@ function HiddenInfo(props) {
               <>
                 <Divider orientation="left">整改信息</Divider>
                 {
-                  info.hiddenSpecialList.map((item, index) => (
+                  info.hiddenRectifyUserCO.map((item, index) => (
                     <Descriptions
                       key={item.id}
                       bordered
@@ -392,7 +391,7 @@ function HiddenInfo(props) {
                         { label: "整改描述", children: item.descr },
                         { label: "投入资金", children: item.investmentFunds },
                         { label: "临时安全措施", children: info.tempSafeMeasure },
-                        { label: "整改后图片", children: <PreviewImg files={afterRectificationImageFiles} /> },
+                        { label: "整改后图片", children: <PreviewImg files={afterRectificationImageFiles[index]} /> },
                         { label: "整改方案", children: item.isRectificationScheme === 0 ? "无" : "有" },
                         ...((item.isRectificationScheme === 1 && item.hiddenSchemeCO && Object.keys(item.hiddenSchemeCO).length > 0)
                           ? [
@@ -422,7 +421,7 @@ function HiddenInfo(props) {
                         <>
                           <Divider orientation="left">验收信息</Divider>
                           {
-                            info.hiddenSpecialList.map((item, index) => (
+                            info.hiddenAcceptUserCO.map((item, index) => (
                               <Descriptions
                                 key={item.id}
                                 bordered
@@ -446,7 +445,7 @@ function HiddenInfo(props) {
                         <>
                           <Divider orientation="left">验收打回信息</Divider>
                           {
-                            info.hiddenSpecialList.map(item => (
+                            info.hiddenAcceptUserCO.map(item => (
                               <Descriptions
                                 key={item.id}
                                 bordered

package/components/Map/MapSelector.js

@@ -93,6 +93,17 @@ const MapSelector = (props) => {
     }
   };
 
+  // 清空
+  const handleLocalClear = () => {
+    setLocalSearch("");
+    if (mapInstanceRef.current) {
+      const local = new window.BMapGL.LocalSearch(mapInstanceRef.current, {
+        renderOptions: { map: mapInstanceRef.current },
+      });
+      local.search("");
+    }
+  };
+
   // 关闭弹窗
   const handleClose = () => {
     setLocalSearch("");
@@ -191,10 +202,13 @@ const MapSelector = (props) => {
                 </Form.Item>
               </Col>
               <Col span={12}>
-                <Form.Item label=" " colon={false}>
+                <Form.Item label=" " colon={false} style={{ textAlign: "right" }}>
                   <Button type="primary" onClick={handleLocalSearch}>
                     搜索
                   </Button>
+                  <Button onClick={handleLocalClear}>
+                    重置
+                  </Button>
                 </Form.Item>
               </Col>
             </Row>

package/components/Select/Personnel/Gwj/index.d.ts

@@ -27,6 +27,8 @@ export interface PersonnelSelectProps extends Omit<BasicSelectProps, "data" | "p
   isNeedPostId?: boolean;
   /** 是否需要部门id，默认 true */
   isNeedDepartmentId?: boolean;
+  /** 返回值是否存在主账号 */
+  noMain?: 1 | "";
 }
 
 /**

package/components/Select/Personnel/Gwj/index.js

@@ -12,6 +12,7 @@ function PersonnelSelect(props) {
     isNeedCorpInfoId = false,
     isNeedDepartmentId = true,
     isNeedPostId = false,
+    noMain = "",
     ...restProps
   } = props;
 
@@ -27,13 +28,13 @@ function PersonnelSelect(props) {
     if (isNeedPostId && !params.postId)
       return;
 
-    const { data } = await request("/basicInfo/user/listAll", "get", params);
+    const { data } = await request("/basicInfo/user/listAll", "get", { ...params, noMain });
     setData(data);
   };
 
   useEffect(() => {
     getData();
-  }, [JSON.stringify(params), isNeedCorpInfoId, isNeedDepartmentId, isNeedPostId]);
+  }, [JSON.stringify(params), isNeedCorpInfoId, isNeedDepartmentId, isNeedPostId, noMain]);
 
   return (
     <BasicSelect data={data} placeholder={placeholder} {...restProps} />

package/enum/uploadFile/gwj/index.js

@@ -81,6 +81,10 @@ export const UPLOAD_FILE_TYPE_ENUM = {
   149: 149, // safety_qualification - 相关方-安全资质（弃用，全部改成使用148）
   150: 150, // promise_bookmark_photo - 安全承诺签字
   151: 151, // project_related_materials - 相关方-项目相关资料
+  152: 152, // legal_and_regulatory_database - 法律法规库
+  153: 153, // regulations_resource_library - 安全生产操作规程资源库
+  154: 154, // responsibility_based_resource_library - 安全生产责任制资源库
+  155: 155, // institutional_resource_library - 安全生产管理制度资源库
 };
 
 /**
@@ -163,4 +167,8 @@ export const UPLOAD_FILE_PATH_ENUM = {
   149: "safety_qualification",
   150: "promise_bookmark_photo",
   151: "project_related_materials",
+  152: "legal_and_regulatory_database",
+  153: "regulations_resource_library",
+  154: "responsibility_based_resource_library",
+  155: "institutional_resource_library",
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zy-react-library",
   "private": false,
-  "version": "1.0.151",
+  "version": "1.0.153",
   "type": "module",
   "description": "",
   "author": "LiuJiaNan",