From 0d2c3d97a5c587b0cda7ac695722381261147a17 Mon Sep 17 00:00:00 2001 From: bichangxiong <3057647414@qq.com> Date: Thu, 28 Aug 2025 18:43:40 +0800 Subject: [PATCH 1/6] =?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 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/dev.yml b/.gitea/workflows/dev.yml index 750ce3df..eadc6f65 100644 --- a/.gitea/workflows/dev.yml +++ b/.gitea/workflows/dev.yml @@ -21,7 +21,9 @@ jobs: run: npm i pnpm -g - name: 安装依赖 - run: pnpm install + run: | + git config --global url."https://".insteadOf git:// + pnpm install continue-on-error: false # 依赖安装失败则终止工作流 - name: 构建项目 From 7fc74b88b8ef4e2bc002be4682a04928c77a7b1e Mon Sep 17 00:00:00 2001 From: 15683799673 Date: Thu, 28 Aug 2025 19:53:15 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=97=A8=E7=A6=81?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=BB=91=E5=AE=9A=E5=8F=96=E6=B6=88=E6=93=8D?= =?UTF-8?q?=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/src/views/sis/acAdmin/index.vue | 3 ++- .../src/views/sis/accessControl/device/accessControlModal.vue | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/web-antd/src/views/sis/acAdmin/index.vue b/apps/web-antd/src/views/sis/acAdmin/index.vue index 8957c42a..589ec097 100644 --- a/apps/web-antd/src/views/sis/acAdmin/index.vue +++ b/apps/web-antd/src/views/sis/acAdmin/index.vue @@ -180,7 +180,8 @@ function doPlayer(nodeData: any, index: number = 0) { console.log('index=', index); if (mpegts.isSupported()) { streamProxy(nodeData, (res: AddStreamProxyResult) => { - const url = res.flv; + const host = window.location.host; + const url = `http://${host}/${res.app}/${res.streamId}.live.flv`; // 将url 绑定到 nodeData nodeData.url = url; closePlayer(index); diff --git a/apps/web-antd/src/views/sis/accessControl/device/accessControlModal.vue b/apps/web-antd/src/views/sis/accessControl/device/accessControlModal.vue index c0e783f3..fcfc0741 100644 --- a/apps/web-antd/src/views/sis/accessControl/device/accessControlModal.vue +++ b/apps/web-antd/src/views/sis/accessControl/device/accessControlModal.vue @@ -144,12 +144,14 @@ async function setupCommunitySelect() { { componentProps: () => ({ options: arr, + allowClear: true, }), fieldName: 'bindDeviceId', }, { componentProps: () => ({ options: arr, + allowClear: true, mode: 'multiple', // 关键属性，启用多选模式 }), fieldName: 'devicePoint', From f2a5567664041db254c0f5c6a8f5552979de9c42 Mon Sep 17 00:00:00 2001 From: zcxlsm Date: Thu, 28 Aug 2025 20:01:47 +0800 Subject: [PATCH 3/6] =?UTF-8?q?feat(property):=20=E7=94=B5=E8=83=BD?= =?UTF-8?q?=E8=B6=8B=E5=8A=BF=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E8=83=BD?= =?UTF-8?q?=E8=80=97=E6=80=BB=E5=80=BC=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../electricEnergy/electricTrend/index.vue | 16 ++++++++++++---- .../personPassRecordManagement/index.vue | 4 ++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/apps/web-antd/src/views/property/energyManagement/electricEnergy/electricTrend/index.vue b/apps/web-antd/src/views/property/energyManagement/electricEnergy/electricTrend/index.vue index ff63dbd5..c78babc1 100644 --- a/apps/web-antd/src/views/property/energyManagement/electricEnergy/electricTrend/index.vue +++ b/apps/web-antd/src/views/property/energyManagement/electricEnergy/electricTrend/index.vue @@ -248,7 +248,9 @@ onMounted(() => { }); }); -const trendData = ref({}); +const hourTotal = ref(); +const dayTotal = ref(); +const monthTotal = ref(); async function handleSelectFloor(selectedKeys, info) { let data = { day: currentDay.value.format('YYYY-MM-DD'), @@ -269,6 +271,7 @@ async function handleSelectFloor(selectedKeys, info) { // 更新日数据图表 if (chartInstances.value.day && trend.hour) { + hourTotal.value = trend.hour.total; chartInstances.value.day.setOption({ xAxis: { data: trend.hour.categories || [], @@ -284,6 +287,7 @@ async function handleSelectFloor(selectedKeys, info) { // 更新月数据图表 if (chartInstances.value.month && trend.day) { + dayTotal.value = trend.day.total; chartInstances.value.month.setOption({ xAxis: { data: trend.day.categories || [], @@ -299,6 +303,7 @@ async function handleSelectFloor(selectedKeys, info) { // 更新年数据图表 if (chartInstances.value.year && trend.month) { + monthTotal.value = trend.month.total; chartInstances.value.year.setOption({ xAxis: { data: trend.month.categories || [], @@ -332,7 +337,8 @@ async function handleSelectFloor(selectedKeys, info) { 当日能耗总值：125.04KW.h + /> + 当日能耗总值：{{ hourTotal }}KW.h
@@ -352,7 +358,8 @@ async function handleSelectFloor(selectedKeys, info) { v-model:value="currentMonth" :disabled-date="disabledMonth" picker="month" - />当月能耗总值：125.04KW.h + /> + 当日能耗总值：{{ dayTotal }}KW.h
@@ -372,7 +379,8 @@ async function handleSelectFloor(selectedKeys, info) { v-model:value="currentYear" :disabled-date="disabledYear" picker="year" - />当年能耗总值：125.04KW.h + /> + 当日能耗总值：{{ monthTotal }}KW.h
diff --git a/apps/web-antd/src/views/property/resident/personPassRecordManagement/index.vue b/apps/web-antd/src/views/property/resident/personPassRecordManagement/index.vue index 95bd5498..c3438c5b 100644 --- a/apps/web-antd/src/views/property/resident/personPassRecordManagement/index.vue +++ b/apps/web-antd/src/views/property/resident/personPassRecordManagement/index.vue @@ -37,8 +37,8 @@ const gridOptions: VxeGridProps = { return await getVisitorList({ pageNum: page.currentPage, pageSize: page.pageSize, - begTime: typeof formValues.dateRange === 'undefined' ? '' : formValues.dateRange[0], - endTime: typeof formValues.dateRange === 'undefined' ? '' : formValues.dateRange[1], + begTime: typeof formValues.dateRange === 'undefined' ? '' : formValues.dateRange[0].format('YYYY-MM-DD'), + endTime: typeof formValues.dateRange === 'undefined' ? '' : formValues.dateRange[1].format('YYYY-MM-DD'), personName: typeof formValues.personName === 'undefined' ? '' : formValues.personName, recordType: typeof formValues.recordType === 'undefined' ? '' : formValues.recordType, }); From 26d34774ccb6993557c20246bb15b71ed2ef8156 Mon Sep 17 00:00:00 2001 From: 15683799673 Date: Thu, 28 Aug 2025 21:07:45 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E7=BA=A7=E5=88=AB?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../videoSystem/videoWarning/videoWarningHasDone/data.ts | 4 ++-- .../videoSystem/videoWarning/videoWarningProcessing/data.ts | 4 ++-- .../views/videoSystem/videoWarning/videoWarningToDone/data.ts | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningHasDone/data.ts b/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningHasDone/data.ts index 67fd78c9..2f2e89a3 100644 --- a/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningHasDone/data.ts +++ b/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningHasDone/data.ts @@ -58,9 +58,9 @@ export const columns: VxeGridProps['columns'] = [ slots: { default: ({ row }: any) => { const levelColors: Record = { - 1: 'red', + 1: 'blue', 2: 'orange', - 3: 'blue', + 3: 'red', }; return h( 'span', diff --git a/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningProcessing/data.ts b/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningProcessing/data.ts index 67fd78c9..2f2e89a3 100644 --- a/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningProcessing/data.ts +++ b/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningProcessing/data.ts @@ -58,9 +58,9 @@ export const columns: VxeGridProps['columns'] = [ slots: { default: ({ row }: any) => { const levelColors: Record = { - 1: 'red', + 1: 'blue', 2: 'orange', - 3: 'blue', + 3: 'red', }; return h( 'span', diff --git a/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningToDone/data.ts b/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningToDone/data.ts index a1188dbd..d9a81d28 100644 --- a/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningToDone/data.ts +++ b/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningToDone/data.ts @@ -59,9 +59,9 @@ export const columns: VxeGridProps['columns'] = [ slots: { default: ({ row }: any) => { const levelColors: Record = { - 1: 'red', + 1: 'blue', 2: 'orange', - 3: 'blue', + 3: 'red', }; return h( 'span', From 4e6c160fb60561dd54d94ede75b981dbb898ac71 Mon Sep 17 00:00:00 2001 From: zcxlsm Date: Thu, 28 Aug 2025 21:16:53 +0800 Subject: [PATCH 5/6] feat(personLibImg): 1 --- apps/web-antd/src/views/sis/personLibImg/data.tsx | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/apps/web-antd/src/views/sis/personLibImg/data.tsx b/apps/web-antd/src/views/sis/personLibImg/data.tsx index 73815bf5..b1f3309c 100644 --- a/apps/web-antd/src/views/sis/personLibImg/data.tsx +++ b/apps/web-antd/src/views/sis/personLibImg/data.tsx @@ -103,6 +103,15 @@ test.forEach((item) => { }); export const modalSchema: FormSchemaGetter = () => [ + { + label: '主键', + fieldName: 'id', + component: 'Input', + dependencies: { + show: () => false, + triggerFields: [''], + }, + }, { label: '人员标签', fieldName: 'rosterType', From d6c3048a9f22ff149cf5b26f7b442f529408153b Mon Sep 17 00:00:00 2001 From: lxj <15683799673@163.com> Date: Fri, 29 Aug 2025 11:34:13 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E8=A7=86=E9=A2=91=E6=B5=81=E9=80=82?= =?UTF-8?q?=E9=85=8D=E5=86=85=E5=A4=96=E7=BD=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/src/views/screen/monitor/map/Map.vue | 12 +++++------- apps/web-antd/src/views/sis/acAdmin/index.vue | 4 ++-- apps/web-antd/src/views/sis/video/index.vue | 14 +++++--------- 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/apps/web-antd/src/views/screen/monitor/map/Map.vue b/apps/web-antd/src/views/screen/monitor/map/Map.vue index f56abc0f..347dac12 100644 --- a/apps/web-antd/src/views/screen/monitor/map/Map.vue +++ b/apps/web-antd/src/views/screen/monitor/map/Map.vue @@ -11,10 +11,7 @@ import { deviceManageList } from '#/api/sis/deviceManage/index.js'; import { deviceChannelList } from '#/api/sis/deviceChannel/index.js'; import mpegts from 'mpegts.js'; import { message } from 'ant-design-vue'; -import { - addFFmpegMediaStreamProxy, - addMediaStreamProxy, -} from '#/api/sis/stream/index.js'; +import { addMediaStreamProxy } from '#/api/sis/stream/index.js'; import { checkHEVCSupport } from '#/utils/video.js'; // 地图全局对象 @@ -114,7 +111,8 @@ function loadCameraData() { function doPlayer(nodeData) { if (mpegts.isSupported()) { streamProxy(nodeData, (res) => { - const url = res.flv; + const host = window.location.host; + const url = `http://${host}/${res.app}/${res.streamId}.live.flv`; // 将url 绑定到 nodeData nodeData.url = url; closeVideo(currentPlayer); @@ -152,8 +150,8 @@ function streamProxy(params, cb) { if (isSupportH265) { addMediaStreamProxy(params).then((res) => cb(res)); } else { - // addMediaStreamProxy(params).then((res) => cb(res)); - addFFmpegMediaStreamProxy(params).then((res) => cb(res)); + addMediaStreamProxy(params).then((res) => cb(res)); + // addFFmpegMediaStreamProxy(params).then((res) => cb(res)); } } diff --git a/apps/web-antd/src/views/sis/acAdmin/index.vue b/apps/web-antd/src/views/sis/acAdmin/index.vue index 589ec097..f8da3d60 100644 --- a/apps/web-antd/src/views/sis/acAdmin/index.vue +++ b/apps/web-antd/src/views/sis/acAdmin/index.vue @@ -1,7 +1,7 @@