diff --git a/.gitea/workflows/dev.yml b/.gitea/workflows/dev.yml index 1ce95172..eadc6f65 100644 --- a/.gitea/workflows/dev.yml +++ b/.gitea/workflows/dev.yml @@ -10,24 +10,26 @@ jobs: - name: 拉取代码仓库 uses: http://git.missmoc.top/mocheng/checkout@v4 with: - fetch-depth: 1 # 只拉取最新的1个提交(浅克隆) + fetch-depth: 0 # 只拉取最新的1个提交(浅克隆) - name: Set up Node.js uses: http://git.missmoc.top/mocheng/setup-node@v3 with: node-version: 20.x - + - name: 安装pnpm run: npm i pnpm -g - + - name: 安装依赖 - run: pnpm install + run: | + git config --global url."https://".insteadOf git:// + pnpm install continue-on-error: false # 依赖安装失败则终止工作流 - + - name: 构建项目 run: pnpm build:antd continue-on-error: false # 构建失败则终止工作流 - + - name: 检查构建结果 run: | if [ ! -d "./apps/web-antd/dist" ]; then @@ -38,7 +40,7 @@ jobs: echo "构建目录为空,构建失败" exit 1 fi - - + + - name: 通过SSH复制文件 - run: cp -rf ./apps/web-antd/dist/* /www/wwwroot/183.230.235.66_11010/property \ No newline at end of file + run: cp -rf ./apps/web-antd/dist/* /www/wwwroot/183.230.235.66_11010/property diff --git a/apps/web-antd/src/api/property/businessManagement/workOrdersType/model.d.ts b/apps/web-antd/src/api/property/businessManagement/workOrdersType/model.d.ts index 65b12b3b..b9316446 100644 --- a/apps/web-antd/src/api/property/businessManagement/workOrdersType/model.d.ts +++ b/apps/web-antd/src/api/property/businessManagement/workOrdersType/model.d.ts @@ -1,4 +1,4 @@ -import type {PageQuery, BaseEntity} from '#/api/common'; +import type { PageQuery, BaseEntity } from '#/api/common'; export interface WorkOrdersTypeVO { /** @@ -41,7 +41,10 @@ export interface WorkOrdersTypeVO { * 处理优先级 */ processingWeight: string; - + /** + * 部门名称 + */ + deptName?: string; } export interface WorkOrdersTypeForm extends BaseEntity { diff --git a/apps/web-antd/src/api/property/energyManagement/meterInfo/index.ts b/apps/web-antd/src/api/property/energyManagement/meterInfo/index.ts index 108a36a7..bf722395 100644 --- a/apps/web-antd/src/api/property/energyManagement/meterInfo/index.ts +++ b/apps/web-antd/src/api/property/energyManagement/meterInfo/index.ts @@ -1,10 +1,9 @@ -import type { MeterInfoVO, MeterInfoForm, MeterInfoQuery } from './model'; +import type { MeterInfoVO, MeterInfoForm, MeterInfoQuery } from './model' -import type { ID, IDS } from '#/api/common'; -import type { PageResult } from '#/api/common'; +import type { ID, IDS, PageResult, TreeNode } from '#/api/common' -import { commonExport } from '#/api/helper'; -import { requestClient } from '#/api/request'; +import { commonExport } from '#/api/helper' +import { requestClient } from '#/api/request' /** * 查询水电气列表 @@ -12,7 +11,7 @@ import { requestClient } from '#/api/request'; * @returns 水电气列表 */ export function meterInfoList(params?: MeterInfoQuery) { - return requestClient.get>('/property/meterInfo/list', { params }); + return requestClient.get>('/property/meterInfo/list', { params }) } /** @@ -21,7 +20,7 @@ export function meterInfoList(params?: MeterInfoQuery) { * @returns 水电气列表 */ export function meterInfoExport(params?: MeterInfoQuery) { - return commonExport('/property/meterInfo/export', params ?? {}); + return commonExport('/property/meterInfo/export', params ?? {}) } /** @@ -30,7 +29,7 @@ export function meterInfoExport(params?: MeterInfoQuery) { * @returns 水电气详情 */ export function meterInfoInfo(id: ID) { - return requestClient.get(`/property/meterInfo/${id}`); + return requestClient.get(`/property/meterInfo/${id}`) } /** @@ -39,7 +38,7 @@ export function meterInfoInfo(id: ID) { * @returns void */ export function meterInfoAdd(data: MeterInfoForm) { - return requestClient.postWithMsg('/property/meterInfo', data); + return requestClient.postWithMsg('/property/meterInfo', data) } /** @@ -48,7 +47,7 @@ export function meterInfoAdd(data: MeterInfoForm) { * @returns void */ export function meterInfoUpdate(data: MeterInfoForm) { - return requestClient.putWithMsg('/property/meterInfo', data); + return requestClient.putWithMsg('/property/meterInfo', data) } /** @@ -57,5 +56,21 @@ export function meterInfoUpdate(data: MeterInfoForm) { * @returns void */ export function meterInfoRemove(id: ID | IDS) { - return requestClient.deleteWithMsg(`/property/meterInfo/${id}`); + return requestClient.deleteWithMsg(`/property/meterInfo/${id}`) } + +/** + * 查询水电气树 + * @param level + * @returns 水电气树 + */ +export function queryTree(params?: any) { + return requestClient.get[]>(`/property/meterInfo/tree`, { params }) +} + +/** + * 获取水/电/气表当前读数/状态 + */ +export function currentReading(params?: any) { + return requestClient.get(`/property/meterInfo/currentReading`, { params }) +} \ No newline at end of file diff --git a/apps/web-antd/src/api/property/energyManagement/meterRecord/index.ts b/apps/web-antd/src/api/property/energyManagement/meterRecord/index.ts index 8074dadf..a9465c99 100644 --- a/apps/web-antd/src/api/property/energyManagement/meterRecord/index.ts +++ b/apps/web-antd/src/api/property/energyManagement/meterRecord/index.ts @@ -1,4 +1,4 @@ -import type { MeterRecordVO, MeterRecordForm, MeterRecordQuery } from './model'; +import type { MeterRecordVO, MeterRecordForm, MeterRecordQuery, MeterRecordTrend } from './model'; import type { ID, IDS } from '#/api/common'; import type { PageResult } from '#/api/common'; @@ -59,3 +59,13 @@ export function meterRecordUpdate(data: MeterRecordForm) { export function meterRecordRemove(id: ID | IDS) { return requestClient.deleteWithMsg(`/property/meterRecord/${id}`); } + +/** + * 获取用电/气/水趋势分析数据 + * + * @param params + * @returns 用电/气/水趋势分析数据 + */ +export function meterRecordTrend(params: MeterRecordTrend) { + return requestClient.get('/property/meterRecord/trend', { params }); +} diff --git a/apps/web-antd/src/api/property/energyManagement/meterRecord/model.d.ts b/apps/web-antd/src/api/property/energyManagement/meterRecord/model.d.ts index 2ae4e5a9..a5d60084 100644 --- a/apps/web-antd/src/api/property/energyManagement/meterRecord/model.d.ts +++ b/apps/web-antd/src/api/property/energyManagement/meterRecord/model.d.ts @@ -147,3 +147,36 @@ export interface MeterRecordQuery extends PageQuery { */ params?: any } + + +export interface MeterRecordTrend { + /** + * 仪表类型 + */ + meterType?: string | number + + /** + * 仪表ID + */ + meterId: string | number + + /** + * 楼层ID + */ + floorId: string | number + + /** + * 日期 + */ + day?: string + + /** + * 月份 + */ + month?: string + + /** + * 年份 + */ + year?: string +} diff --git a/apps/web-antd/src/api/sis/alarmEventProcess/index.ts b/apps/web-antd/src/api/sis/alarmEventProcess/index.ts index b2a6f6c7..cfb94d92 100644 --- a/apps/web-antd/src/api/sis/alarmEventProcess/index.ts +++ b/apps/web-antd/src/api/sis/alarmEventProcess/index.ts @@ -1,18 +1,24 @@ -import type { AlarmEventProcessVO, AlarmEventProcessForm, AlarmEventProcessQuery } from './model'; +import type { + AlarmEventProcessForm, + AlarmEventProcessQuery, + AlarmEventProcessVO, +} from './model'; -import type { ID, IDS } from '#/api/common'; -import type { PageResult } from '#/api/common'; +import type { ID, IDS, PageResult } from '#/api/common'; import { commonExport } from '#/api/helper'; import { requestClient } from '#/api/request'; /** -* 查询告警信息处理流程记录列表 -* @param params -* @returns 告警信息处理流程记录列表 -*/ + * 查询告警信息处理流程记录列表 + * @param params + * @returns 告警信息处理流程记录列表 + */ export function alarmEventProcessList(params?: AlarmEventProcessQuery) { - return requestClient.get>('/sis/alarmEventProcess/list', { params }); + return requestClient.get>( + '/sis/alarmEventProcess/list', + { params }, + ); } /** @@ -59,3 +65,14 @@ export function alarmEventProcessUpdate(data: AlarmEventProcessForm) { export function alarmEventProcessRemove(id: ID | IDS) { return requestClient.deleteWithMsg(`/sis/alarmEventProcess/${id}`); } + +/** + * 删除告警信息处理流程记录 + * @param id id + * @returns void + */ +export function queryResult(id: ID | IDS) { + return requestClient.get( + `/sis/alarmEventProcess/query/result/${id}`, + ); +} diff --git a/apps/web-antd/src/api/sis/stream/model.d.ts b/apps/web-antd/src/api/sis/stream/model.d.ts index 8993f651..dde8e896 100644 --- a/apps/web-antd/src/api/sis/stream/model.d.ts +++ b/apps/web-antd/src/api/sis/stream/model.d.ts @@ -1,5 +1,7 @@ export interface AddStreamProxyResult { key:string; + app:string; + streamId:string; rtsp:string; rtmp:string; flv:string; diff --git a/apps/web-antd/src/app.vue b/apps/web-antd/src/app.vue index ecdd2242..62f49905 100644 --- a/apps/web-antd/src/app.vue +++ b/apps/web-antd/src/app.vue @@ -3,13 +3,8 @@ import { computed } from 'vue'; import { useAntdDesignTokens } from '@vben/hooks'; import { preferences, usePreferences } from '@vben/preferences'; - import { App, ConfigProvider, theme } from 'ant-design-vue'; - import { antdLocale } from '#/locales'; - -import { useUploadTip } from './upload-tip'; - defineOptions({ name: 'App' }); const { isDark } = usePreferences(); @@ -30,8 +25,6 @@ const tokenTheme = computed(() => { token: tokens, }; }); - -useUploadTip();