From 8156e9245393c90b8d2f91fec174b873cd05daf5 Mon Sep 17 00:00:00 2001 From: "chenzhigang@pansoft.com" Date: Wed, 25 Sep 2024 18:51:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1=E3=80=81=E5=80=BC=E7=8F=AD=E5=8F=B0?= =?UTF-8?q?=E8=B4=A6=E5=A2=9E=E5=8A=A0=E8=AF=B4=E6=98=8E=202=E3=80=81?= =?UTF-8?q?=E5=A4=87=E6=B3=A8=E6=9C=89=E5=80=BC=E5=88=97=E6=95=B4=E8=A1=8C?= =?UTF-8?q?=E9=AB=98=E4=BA=AE=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/duty/standing-book/index.vue | 41 +++++++++++-------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/apps/web-office/src/views/duty/standing-book/index.vue b/apps/web-office/src/views/duty/standing-book/index.vue index 047b0df9..ad193b61 100644 --- a/apps/web-office/src/views/duty/standing-book/index.vue +++ b/apps/web-office/src/views/duty/standing-book/index.vue @@ -107,6 +107,12 @@ const gridOptions = reactive( backgroundColor: '#f6fbfb', }; } + // 判断 remark 字段是否有值 + if (row.remark) { + return { + backgroundColor: '#fffae6', // 浅黄色背景 + }; + } console.log(rowIndex); }, pagerConfig: { @@ -252,7 +258,8 @@ onMounted(() => {

值班信息栏

-
+
+ - -
-
+
+ + +
+

+ 1.公司机关值班人员（包括值班司机）都必须严格遵守值班管理要求，值班期间保持值班电话畅通。 +

+

+ 2.值班干部值班期间离岗外出、开会、现场指挥等特殊情况，应落实人员接替同时落实值班职责。 +

+

+ 3.值班司机值班地点为公司小车班休息室，值班车辆必须停放在公司机关院内，确保遇到突发事件值班领导能迅速赶赴现场协调处置。 +

+

4.值班时间：当日10：00——次日10：00。

+

5.市应急管理办公室信息科：6224327、6236233。

+
From 8e5c2aaa6b703f20d6da4c644e3857470081f6bb Mon Sep 17 00:00:00 2001 From: "chenzhigang@pansoft.com" Date: Wed, 25 Sep 2024 19:04:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=80=BC=E7=8F=AD=E5=8F=B0=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-contract/package.json | 1 - .../src/views/duty/standing-book/index.vue | 1 - pnpm-lock.yaml | 15 --------------- 3 files changed, 17 deletions(-) diff --git a/apps/web-contract/package.json b/apps/web-contract/package.json index 9b39cb8b..d4f17bc7 100644 --- a/apps/web-contract/package.json +++ b/apps/web-contract/package.json @@ -39,7 +39,6 @@ "ant-design-vue": "^4.2.3", "big.js": "^6.2.1", "common-utils": "workspace:*", - "common-utils2": "workspace:*", "dayjs": "^1.11.13", "exceljs": "^4.4.0", "lodash-es": "^4.17.21", diff --git a/apps/web-office/src/views/duty/standing-book/index.vue b/apps/web-office/src/views/duty/standing-book/index.vue index ad193b61..174283f6 100644 --- a/apps/web-office/src/views/duty/standing-book/index.vue +++ b/apps/web-office/src/views/duty/standing-book/index.vue @@ -298,7 +298,6 @@ onMounted(() => {
-

1.公司机关值班人员（包括值班司机）都必须严格遵守值班管理要求，值班期间保持值班电话畅通。 diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0221a9e6..10d6b2fe 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -264,9 +264,6 @@ importers: common-utils: specifier: workspace:* version: link:../../packages/common-utils - common-utils2: - specifier: workspace:* - version: link:../../packages/common-utils2 dayjs: specifier: ^1.11.13 version: 1.11.13 @@ -1276,18 +1273,6 @@ importers: specifier: ^4.4.4 version: 4.4.4(vue@3.5.4(typescript@5.6.2)) - packages/common-utils2: - dependencies: - '@vben-core/shared': - specifier: workspace:* - version: link:../@core/base/shared - '@vben-core/typings': - specifier: workspace:* - version: link:../@core/base/typings - vue-router: - specifier: ^4.4.4 - version: 4.4.4(vue@3.5.4(typescript@5.6.2)) - packages/constants: dependencies: '@vben-core/shared':