no message

jjb.config.js

@@ -10,7 +10,7 @@ module.exports = {
       javaGitBranch: "<branch-name>",
       // 接口服务地址
       // API_HOST: "http://192.168.20.100:30140",
-      API_HOST: "",
+      API_HOST: "https://gbs-gateway.qhdsafety.com",
     },
     production: {
       // 应用后端分支名称，部署上线需要
@@ -46,7 +46,7 @@ module.exports = {
   // 开发服务
   server: {
     // 监听端口号
-    port: "8081",
+    port: "8061",
     // 服务地址
     host: "127.0.0.1",
     // 是否自动打开浏览器

package.json

@@ -6,8 +6,8 @@
   "license": "MIT",
   "main": "index.js",
   "scripts": {
-    "serve": "node node_modules/@cqsjjb/scripts/webpack.dev.server.js",
+    "serve": "node scripts/rspack.dev.server.cjs",
-    "build": "node node_modules/@cqsjjb/scripts/webpack.build.js",
+    "build": "node node_modules/@cqsjjb/scripts/rspack.build.js",
     "push": "jjb-cmd push java production",
     "clean-cache": "rimraf node_modules/.cache/webpack",
     "serve:development": "cross-env NODE_ENV=development npm run serve",
@@ -31,8 +31,9 @@
     "lodash-es": "^4.17.21",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
+    "react-pdf": "10.4.1",
     "react-to-print": "^3.2.0",
-    "zy-react-library": "^1.2.35"
+    "zy-react-library": "^1.3.15"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^5.4.1",

scripts/rspack.dev.server.cjs

@@ -0,0 +1,24 @@
+'use strict';
+
+const rspackConfigModule = require('@cqsjjb/scripts/rspack.config');
+
+const baseConfig = rspackConfigModule.default || rspackConfigModule;
+const patchedConfig = {
+  ...baseConfig,
+  // pdfjs-dist ships a prebundled pdf.mjs that declares __webpack_exports__.
+  // eval-based source maps hoist that symbol and break module initialization.
+  devtool: 'source-map',
+};
+
+const rspackConfigPath = require.resolve('@cqsjjb/scripts/rspack.config');
+require.cache[rspackConfigPath] = {
+  id: rspackConfigPath,
+  filename: rspackConfigPath,
+  loaded: true,
+  exports: {
+    __esModule: true,
+    default: patchedConfig,
+  },
+};
+
+require('@cqsjjb/scripts/rspack.dev.server');

src/api/inspection/index.js

@@ -56,6 +56,10 @@ export const hiddenList = declareRequest(
   "assignLoading",
   `Post > @/hidden/hidden/queryHiddenListByForeign`,
 );
+export const xgfProjectList = declareRequest(
+  "inspectionLoading",
+  `Get > /xgfManager/project/listAllByCorp`,
+);
 export const hiddenConfirmUserAllList = declareRequest(
   "confirmUserLoading",
   `Post > @/hidden/hiddenConfirmUser/listAll`,

src/enumerate/constant/index.js

@@ -4,6 +4,11 @@
 
 export {};
 
+export const IS_RELATED_ENUM = [
+  { bianma: "1", name: "是" },
+  { bianma: "0", name: "否" },
+];
+
 export const INSPECTION_QUESTION_ENUM = [
   { bianma: "安全检查", name: "安全" },
   { bianma: "环保检查", name: "环保" },

src/pages/Container/BranchCompany/Inspection/Inspection/Add/components/HiddenAdd/index.js

@@ -1,3 +1,4 @@
+import { Connect } from "@cqsjjb/jjb-dva-runtime";
 import { Button, Form, Input, Modal } from "antd";
 import dayjs from "dayjs";
 import { useEffect, useState } from "react";
@@ -8,21 +9,29 @@ import HiddenLevelSelectTree from "zy-react-library/components/SelectTree/Hidden
 import HiddenPartSelectTree from "zy-react-library/components/SelectTree/HiddenPart/Gwj";
 import Upload from "zy-react-library/components/Upload";
 import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
+import { IS_RELATED_ENUM } from "~/enumerate/constant";
+import { NS_INSPECTION } from "~/enumerate/namespace";
 
 function HiddenAddModal(props) {
   const [form] = Form.useForm();
   const [hiddenPartType, setHiddenPartType] = useState("select");
+
   useEffect(() => {
-    form.setFieldsValue(props.hiddenInfo);
+    setHiddenPartType(props.hiddenInfo?.hiddenPartType || "select");
-  }, [props.hiddenInfo]);
+    form.setFieldsValue({
+      ...props.hiddenInfo,
+    });
+  }, [form, props.hiddenInfo]);
+
 
   const onSubmit = (values) => {
+
+
     props.onConfirm({
-      ...values,
+      ...submitValues,
       hiddenPartType,
       hiddenFindTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
       rectificationType: 2,
-      isRelated: 0,
     });
     props.onCancel();
   };
@@ -46,6 +55,8 @@ function HiddenAddModal(props) {
           { name: "id", label: "id", onlyForLabel: true },
           { name: "hiddenId", label: "隐患id", onlyForLabel: true },
           { name: "hiddenDesc", label: "隐患描述", render: FORM_ITEM_RENDER_ENUM.TEXTAREA, span: 24 },
+
+          { name: "projectName", label: "相关方项目名称", onlyForLabel: true },
           {
             name: "hiddenLevel",
             label: "隐患级别",
@@ -75,8 +86,8 @@ function HiddenAddModal(props) {
             ),
           },
           { name: "hiddenTypeName", label: "隐患类型名称", onlyForLabel: true },
-          { name: "hiddenType2", label: "隐患类型名称", onlyForLabel: true },
+          { name: "hiddenType2", label: "隐患类型二级编码", onlyForLabel: true },
-          { name: "hiddenType2Name", label: "隐患类型名称", onlyForLabel: true },
+          { name: "hiddenType2Name", label: "隐患类型二级名称", onlyForLabel: true },
           {
             name: "hiddenPart",
             customizeRender: true,
@@ -156,4 +167,4 @@ function HiddenAddModal(props) {
   );
 }
 
-export default HiddenAddModal;
+export default Connect([NS_INSPECTION], true)(HiddenAddModal);