From 5c7080a3da4b6097b23931f94cc7d5cc263bc33c Mon Sep 17 00:00:00 2001 From: FLL <2162874245@qq.com> Date: Wed, 20 Aug 2025 14:25:51 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=83=AD=E9=97=A8=E6=B4=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerService/activities/activities-modal.vue | 5 +++++ .../views/property/customerService/activities/data.ts | 4 ++-- .../property/customerService/notices/notices-modal.vue | 9 +++++---- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/apps/web-antd/src/views/property/customerService/activities/activities-modal.vue b/apps/web-antd/src/views/property/customerService/activities/activities-modal.vue index 356e6a59..d6a09e58 100644 --- a/apps/web-antd/src/views/property/customerService/activities/activities-modal.vue +++ b/apps/web-antd/src/views/property/customerService/activities/activities-modal.vue @@ -10,6 +10,7 @@ import { activitiesAdd, activitiesInfo, activitiesUpdate } from '#/api/property/ import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup'; import { modalSchema } from './data'; +import dayjs from "dayjs"; const emit = defineEmits<{ reload: [] }>(); @@ -59,6 +60,8 @@ const [BasicModal, modalApi] = useVbenModal({ if (isUpdate.value && id) { const record = await activitiesInfo(id); + dayjs(record.startTime, 'YYYY-MM-DD HH:mm:ss') + dayjs(record.endTime, 'YYYY-MM-DD HH:mm:ss') await formApi.setValues(record); } await markInitialized(); @@ -76,6 +79,8 @@ async function handleConfirm() { } // getValues获取为一个readonly的对象 需要修改必须先深拷贝一次 const data = cloneDeep(await formApi.getValues()); + data.startTime = dayjs(data.startTime).format('YYYY-MM-DD HH:mm:ss'); + data.endTime = dayjs(data.endTime).format('YYYY-MM-DD HH:mm:ss'); await (isUpdate.value ? activitiesUpdate(data) : activitiesAdd(data)); resetInitialized(); emit('reload'); diff --git a/apps/web-antd/src/views/property/customerService/activities/data.ts b/apps/web-antd/src/views/property/customerService/activities/data.ts index e1944a95..92b3aae3 100644 --- a/apps/web-antd/src/views/property/customerService/activities/data.ts +++ b/apps/web-antd/src/views/property/customerService/activities/data.ts @@ -37,7 +37,7 @@ export const columns: VxeGridProps['columns'] = [ }, { title: '创建人', - field: 'title', + field: 'createName', }, { title: '开始时间', @@ -90,7 +90,7 @@ export const modalSchema: FormSchemaGetter = () => [ maxCount: 1, }, formItemClass: 'col-span-2', - rules: 'required', + // rules: 'required', }, { label: '开始时间', diff --git a/apps/web-antd/src/views/property/customerService/notices/notices-modal.vue b/apps/web-antd/src/views/property/customerService/notices/notices-modal.vue index 2926035d..77e73d5d 100644 --- a/apps/web-antd/src/views/property/customerService/notices/notices-modal.vue +++ b/apps/web-antd/src/views/property/customerService/notices/notices-modal.vue @@ -12,6 +12,7 @@ import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup'; import { modalSchema } from './data'; import {personList} from "#/api/property/resident/person"; import {renderDictValue} from "#/utils/render"; +import {userList} from "#/api/system/user"; const emit = defineEmits<{ reload: [] }>(); @@ -104,11 +105,11 @@ async function queryPersonData() { pageSize: 1000, pageNum: 1, } - const res = await personList(params); + const res = await userList(params); const options = res.rows.map((user) => ({ - label: user.userName + '-' + renderDictValue(user.gender, 'sys_user_sex') - + '-' + user.phone + '-' + user.unitName, - value: user.id, + label: user.nickName + '-' + renderDictValue(user.sex, 'sys_user_sex') + + '-' + user.phonenumber, + value: user.userId.toString(), })); formApi.updateSchema([{ componentProps: () => ({ From 4139af56733db0d86bf7ef9c14122dbb75e8be29 Mon Sep 17 00:00:00 2001 From: dev_ljl <2590379346@qq.com> Date: Wed, 20 Aug 2025 14:26:59 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=E9=A2=84=E8=A7=88=E9=97=AE=E5=8D=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../questionnaire/questionnaire-detail.vue | 5 ++--- .../elctricitySituation/floor-tree.vue | 15 ++++----------- .../electricEnergy/elctricitySituation/index.vue | 5 +++-- .../property/waterPower/waterSituation/index.vue | 5 +++-- 4 files changed, 12 insertions(+), 18 deletions(-) diff --git a/apps/web-antd/src/views/property/customerService/questionnaire/questionnaire-detail.vue b/apps/web-antd/src/views/property/customerService/questionnaire/questionnaire-detail.vue index ee62df03..1b4394f2 100644 --- a/apps/web-antd/src/views/property/customerService/questionnaire/questionnaire-detail.vue +++ b/apps/web-antd/src/views/property/customerService/questionnaire/questionnaire-detail.vue @@ -1,5 +1,5 @@ @@ -87,13 +87,6 @@ onMounted(loadTree); From 28d6a77848893c17c47eaff63aff5bf86aed41d3 Mon Sep 17 00:00:00 2001 From: bichangxiong <3057647414@qq.com> Date: Wed, 20 Aug 2025 14:42:45 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/dev.y?= =?UTF-8?q?ml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/dev.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitea/workflows/dev.yml b/.gitea/workflows/dev.yml index b0900e97..76dec171 100644 --- a/.gitea/workflows/dev.yml +++ b/.gitea/workflows/dev.yml @@ -18,7 +18,6 @@ jobs: run: npm i pnpm -g - name: node run: | - pnpm config set registry https://registry.npmmirror.com pnpm install - name: Build From 4b3ed5c2d5f2777e9f179a7d0cad0947c606dea6 Mon Sep 17 00:00:00 2001 From: bichangxiong <3057647414@qq.com> Date: Wed, 20 Aug 2025 14:53:47 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/dev.y?= =?UTF-8?q?ml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/dev.yml b/.gitea/workflows/dev.yml index 76dec171..aea22546 100644 --- a/.gitea/workflows/dev.yml +++ b/.gitea/workflows/dev.yml @@ -27,7 +27,7 @@ jobs: with: host: 127.0.0.1 username: ${ { SERVER_NAME } } - password: ${{ SERVER_PWD}} + password: ${ { SERVER_PWD } } port: 11001 source: "./apps/web-antd/dist" target: "/www/wwwroot/183.230.235.66_11010/property" From 3d1681e8115517e0551bc754d049c113c7db8e66 Mon Sep 17 00:00:00 2001 From: bichangxiong <3057647414@qq.com> Date: Wed, 20 Aug 2025 15:11:14 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/dev.y?= =?UTF-8?q?ml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/dev.yml | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/.gitea/workflows/dev.yml b/.gitea/workflows/dev.yml index aea22546..416b395c 100644 --- a/.gitea/workflows/dev.yml +++ b/.gitea/workflows/dev.yml @@ -10,27 +10,39 @@ jobs: - name: 拉取代码仓库 uses: http://git.missmoc.top/mocheng/checkout@v4 - - name: Set up Node.js ${{ matrix.node-version }} + - name: Set up Node.js uses: http://git.missmoc.top/mocheng/setup-node@v3 with: node-version: 20.x - - name: pnpm + + - name: 安装pnpm run: npm i pnpm -g - - name: node - run: | - pnpm install - - - name: Build + + - name: 安装依赖 + run: pnpm install + continue-on-error: false # 依赖安装失败则终止工作流 + + - name: 构建项目 run: pnpm build:antd - - name: copy file via ssh password + continue-on-error: false # 构建失败则终止工作流 + + - name: 检查构建结果 + run: | + if [ ! -d "./apps/web-antd/dist" ]; then + echo "构建目录不存在，构建失败" + exit 1 + fi + if [ -z "$(ls -A ./apps/web-antd/dist)" ]; then + echo "构建目录为空，构建失败" + exit 1 + fi + + - name: 通过SSH复制文件 uses: http://git.missmoc.top/mocheng/scp-action@v0.1.7 with: host: 127.0.0.1 - username: ${ { SERVER_NAME } } - password: ${ { SERVER_PWD } } + username: ${{ secrets.SERVER_NAME }} # 使用secrets存储 + password: ${{ secrets.SERVER_PWD }} # 使用secrets存储 port: 11001 source: "./apps/web-antd/dist" target: "/www/wwwroot/183.230.235.66_11010/property" - - -