From 059155bf6923e4bc7a943aa69f416c5d4b309028 Mon Sep 17 00:00:00 2001 From: "853931625@qq.com" Date: Fri, 5 Jun 2026 16:01:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9BUG=20=E4=BF=AE=E6=94=B9=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E6=89=BF=E8=AF=BA=E6=95=B0=E5=AD=97=E8=BF=87=E9=95=BF?= =?UTF-8?q?=E4=B8=8D=E8=87=AA=E5=8A=A8=E6=8A=98=E8=A1=8C=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jjb.config.js | 4 ++-- package.json | 6 +++--- .../Enterprise/BusPromiseTemplate/List/index.js | 1 + .../Container/Enterprise/Management/Add/index.js | 9 ++++++--- .../Supervise/BusPromiseTemplate/List/index.js | 1 + src/pages/Container/Supervise/Management/Add/index.js | 11 +++++++---- .../Supervise/components/DetailModal/index.js | 2 +- .../Supervise/components/DetailModal/index.less | 5 +++++ 8 files changed, 26 insertions(+), 13 deletions(-) diff --git a/jjb.config.js b/jjb.config.js index 3a148fa..335515e 100644 --- a/jjb.config.js +++ b/jjb.config.js @@ -10,7 +10,7 @@ module.exports = { javaGitBranch: "", // 接口服务地址 // API_HOST: "http://192.168.20.100:30140", - API_HOST: "http://localhost:80", + API_HOST: "https://gbs-gateway.qhdsafety.com", }, production: { // 应用后端分支名称，部署上线需要 @@ -46,7 +46,7 @@ module.exports = { // 开发服务 server: { // 监听端口号 - port: "8085", + port: "8065", // 服务地址 host: "127.0.0.1", // 是否自动打开浏览器 diff --git a/package.json b/package.json index 4200e1c..abde34b 100644 --- a/package.json +++ b/package.json @@ -6,8 +6,8 @@ "license": "MIT", "main": "index.js", "scripts": { - "serve": "node node_modules/@cqsjjb/scripts/webpack.dev.server.js", - "build": "node node_modules/@cqsjjb/scripts/webpack.build.js", + "serve": "node node_modules/@cqsjjb/scripts/rspack.dev.server.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", @@ -32,7 +32,7 @@ "react": "^18.2.0", "react-dom": "^18.2.0", "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", diff --git a/src/pages/Container/Enterprise/BusPromiseTemplate/List/index.js b/src/pages/Container/Enterprise/BusPromiseTemplate/List/index.js index d2bf5c1..9ee5523 100644 --- a/src/pages/Container/Enterprise/BusPromiseTemplate/List/index.js +++ b/src/pages/Container/Enterprise/BusPromiseTemplate/List/index.js @@ -13,6 +13,7 @@ function List(props) { const [form] = Form.useForm(); const { tableProps, getData } = useTable(props["busPromiseTemplateList"], { form, + }); const updateState = (id, state) => { const stateValue = state === 0 ? 1 : 0; diff --git a/src/pages/Container/Enterprise/Management/Add/index.js b/src/pages/Container/Enterprise/Management/Add/index.js index 5746441..bbfdc39 100644 --- a/src/pages/Container/Enterprise/Management/Add/index.js +++ b/src/pages/Container/Enterprise/Management/Add/index.js @@ -213,7 +213,7 @@ function Add(props) { /> ), }, - { name: [field.name, "departmentName"], label: `部门${index + 1}名称`, onlyForLabel: true }, + // { name: [field.name, "departmentName"], label: `部门${index + 1}名称`, onlyForLabel: true }, { name: [field.name, "postId"], span: 8, @@ -235,8 +235,8 @@ function Add(props) { }, }, }, - { name: [field.name, "postName"], label: `岗位${index + 1}名称`, onlyForLabel: true }, - { name: [field.name, "userName"], label: `人员${index + 1}名称`, onlyForLabel: true }, + // { name: [field.name, "postName"], label: `岗位${index + 1}名称`, onlyForLabel: true }, + // { name: [field.name, "userName"], label: `人员${index + 1}名称`, onlyForLabel: true }, { name: [field.name, "userId"], span: 8, @@ -358,6 +358,9 @@ const ChoiceTemplateModalComponent = (props) => { const [form] = Form.useForm(); const { tableProps, getData } = useTable(props["busPromiseTemplateList"], { form, + params:{ + state:0, + }, }); return ( diff --git a/src/pages/Container/Supervise/BusPromiseTemplate/List/index.js b/src/pages/Container/Supervise/BusPromiseTemplate/List/index.js index 8cd6ee6..e742817 100644 --- a/src/pages/Container/Supervise/BusPromiseTemplate/List/index.js +++ b/src/pages/Container/Supervise/BusPromiseTemplate/List/index.js @@ -15,6 +15,7 @@ function List(props) { const [form] = Form.useForm(); const { tableProps, getData } = useTable(props["busPromiseTemplateList"], { form, + }); const onDelete = (id) => { Modal.confirm({ diff --git a/src/pages/Container/Supervise/Management/Add/index.js b/src/pages/Container/Supervise/Management/Add/index.js index 0b28563..f3273ff 100644 --- a/src/pages/Container/Supervise/Management/Add/index.js +++ b/src/pages/Container/Supervise/Management/Add/index.js @@ -235,7 +235,7 @@ function Add(props) { }, }, }, - { name: [field.name, "corpName"], label: `签订单位${index + 1}名称`, onlyForLabel: true }, + // { name: [field.name, "corpName"], label: `签订单位${index + 1}名称`, onlyForLabel: true }, ] : []), { @@ -262,7 +262,7 @@ function Add(props) { /> ), }, - { name: [field.name, "departmentName"], label: `部门${index + 1}名称`, onlyForLabel: true }, + // { name: [field.name, "departmentName"], label: `部门${index + 1}名称`, onlyForLabel: true }, { name: [field.name, "postId"], label: `岗位${index + 1}`, @@ -284,8 +284,8 @@ function Add(props) { }, }, }, - { name: [field.name, "postName"], label: `岗位${index + 1}名称`, onlyForLabel: true }, - { name: [field.name, "userName"], label: `人员${index + 1}名称`, onlyForLabel: true }, + // { name: [field.name, "postName"], label: `岗位${index + 1}名称`, onlyForLabel: true }, + // { name: [field.name, "userName"], label: `人员${index + 1}名称`, onlyForLabel: true }, { name: [field.name, "userId"], label: `人员${index + 1}`, @@ -413,6 +413,9 @@ const ChoiceTemplateModalComponent = (props) => { const [form] = Form.useForm(); const { tableProps, getData } = useTable(props["busPromiseTemplateList"], { form, + params:{ + state:0, + }, useStorageQueryCriteria: false, }); diff --git a/src/pages/Container/Supervise/components/DetailModal/index.js b/src/pages/Container/Supervise/components/DetailModal/index.js index 52d64da..617c432 100644 --- a/src/pages/Container/Supervise/components/DetailModal/index.js +++ b/src/pages/Container/Supervise/components/DetailModal/index.js @@ -59,7 +59,7 @@ const DetailModal = (props) => { {`${(form.promisePeople && form.promisePeoplePost) ? `${form.promisePeople + form.promisePeoplePost}:` : ""}` || ""} )} -
+
{ diff --git a/src/pages/Container/Supervise/components/DetailModal/index.less b/src/pages/Container/Supervise/components/DetailModal/index.less index 4952d7c..2c122bc 100644 --- a/src/pages/Container/Supervise/components/DetailModal/index.less +++ b/src/pages/Container/Supervise/components/DetailModal/index.less @@ -32,6 +32,11 @@ text-align: justify; } + .promise-rich-text { + overflow-wrap: anywhere; + word-break: break-all; + } + .footer { margin-top: 30px; display: flex;