Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5

apps/web-antd/src/api/property/roomBooking/participants/index.ts

@@ -0,0 +1,59 @@
+import type { ParticipantsVO, ParticipantsForm, ParticipantsQuery } from './model';
+import type { ID, IDS } from '#/api/common';
+import type { PageResult } from '#/api/common';
+import { commonExport } from '#/api/helper';
+import { requestClient } from '#/api/request';
+
+/**
+* 查询会议室参会记录列表
+* @param params
+* @returns 会议室参会记录列表
+*/
+export function participantsList(params?: ParticipantsQuery) {
+  return requestClient.get<PageResult<ParticipantsVO>>('/property/participants/list', { params });
+}
+
+/**
+ * 导出会议室参会记录列表
+ * @param params
+ * @returns 会议室参会记录列表
+ */
+export function participantsExport(params?: ParticipantsQuery) {
+  return commonExport('/property/participants/export', params ?? {});
+}
+
+/**
+ * 查询会议室参会记录详情
+ * @param id id
+ * @returns 会议室参会记录详情
+ */
+export function participantsInfo(id: ID) {
+  return requestClient.get<ParticipantsVO>(`/property/participants/${id}`);
+}
+
+/**
+ * 新增会议室参会记录
+ * @param data
+ * @returns void
+ */
+export function participantsAdd(data: ParticipantsForm) {
+  return requestClient.postWithMsg<void>('/property/participants', data);
+}
+
+/**
+ * 更新会议室参会记录
+ * @param data
+ * @returns void
+ */
+export function participantsUpdate(data: ParticipantsForm) {
+  return requestClient.putWithMsg<void>('/property/participants', data);
+}
+
+/**
+ * 删除会议室参会记录
+ * @param id id
+ * @returns void
+ */
+export function participantsRemove(id: ID | IDS) {
+  return requestClient.deleteWithMsg<void>(`/property/participants/${id}`);
+}

apps/web-antd/src/api/property/roomBooking/participants/model.d.ts

@@ -0,0 +1,54 @@
+import type { PageQuery, BaseEntity } from '#/api/common';
+
+export interface ParticipantsVO {
+  /**
+   * 主键id
+   */
+  id: string | number;
+
+  /**
+   * 会议室id
+   */
+  meetId: string | number;
+
+  /**
+   * 入驻人员id
+   */
+  residentPersonId: string | number;
+
+}
+
+export interface ParticipantsForm extends BaseEntity {
+  /**
+   * 主键id
+   */
+  id?: string | number;
+
+  /**
+   * 会议室id
+   */
+  meetId?: string | number;
+
+  /**
+   * 入驻人员id
+   */
+  residentPersonId?: string | number;
+
+}
+
+export interface ParticipantsQuery extends PageQuery {
+  /**
+   * 会议室id
+   */
+  meetId?: string | number;
+
+  /**
+   * 入驻人员id
+   */
+  residentPersonId?: string | number;
+
+  /**
+    * 日期范围参数
+    */
+  params?: any;
+}

apps/web-antd/src/views/property/building/building-modal.vue

@@ -23,7 +23,7 @@ const [BasicForm, formApi] = useVbenForm({
     // 默认占满两列
     formItemClass: 'col-span-1',
     // 默认label宽度 px
-    labelWidth: 80,
+    labelWidth: 90,
     // 通用配置项 会影响到所有表单项
     componentProps: {
       class: 'w-full',

apps/web-antd/src/views/property/building/data.tsx

@@ -49,6 +49,10 @@ export const columns: VxeGridProps['columns'] = [
     title: '建筑名称',
     field: 'buildingName',
   },
+  {
+    title: '社区',
+    field: 'communityText',
+  },
   {
     title: '总层数',
     field: 'floorCount',
@@ -73,6 +77,18 @@ export const columns: VxeGridProps['columns'] = [
     title: '地址',
     field: 'addr',
   },
+  {
+    title: '建筑面积(㎡)',
+    field: 'area',
+  },
+  {
+    title: '套内面积(㎡)',
+    field: 'insideInArea',
+  },
+  {
+    title: '公摊面积(㎡)',
+    field: 'sharedArea',
+  },
   {
     field: 'action',
     fixed: 'right',
@@ -153,4 +169,34 @@ export const modalSchema: FormSchemaGetter = () => [
     component: 'Input',
     rules: 'required',
   },
+  {
+    label: '建筑面积(㎡)',
+    fieldName: 'area',
+    component: 'InputNumber',
+    componentProps: {
+      min:0,
+      precision:2,
+    },
+    rules: 'required',
+  },
+  {
+    label: '套内面积(㎡)',
+    fieldName: 'insideInArea',
+    component: 'InputNumber',
+    componentProps: {
+      min:0,
+      precision:2,
+    },
+    rules: 'required',
+  },
+  {
+    label: '公摊面积(㎡)',
+    fieldName: 'sharedArea',
+    component: 'InputNumber',
+    componentProps: {
+      min:0,
+      precision:2,
+    },
+    rules: 'required',
+  },
 ];

apps/web-antd/src/views/property/costManagement/costMeterWater/data.ts

@@ -5,9 +5,12 @@ import {renderDict} from "#/utils/render";
 
 export const querySchema: FormSchemaGetter = () => [
   {
-    component: 'Input',
+    label: '费用类型',
-    fieldName: 'searchValue',
+    fieldName: 'costType',
-    label: '搜索值',
+    component: 'Select',
+    componentProps: () => ({
+      options: getDictOptions('wy_cbfylx'),
+    }),
   },
 ];
 

apps/web-antd/src/views/property/floor/data.ts

@@ -13,6 +13,14 @@ export const querySchema: FormSchemaGetter = () => [
 // export const columns: () => VxeGridProps['columns'] = () => [
 export const columns: VxeGridProps['columns'] = [
   { type: 'checkbox', width: 60 },
+  {
+    title: '社区',
+    field: 'communityText',
+  },
+  {
+    title: '建筑',
+    field: 'buildingText',
+  },
   {
     title: '楼层名称',
     field: 'floorName',
@@ -33,6 +41,18 @@ export const columns: VxeGridProps['columns'] = [
     title: '层高',
     field: 'floorHeight',
   },
+  {
+    title: '建筑面积(㎡)',
+    field: 'area',
+  },
+  {
+    title: '套内面积(㎡)',
+    field: 'insideInArea',
+  },
+  {
+    title: '公摊面积(㎡)',
+    field: 'sharedArea',
+  },
   {
     field: 'action',
     fixed: 'right',
@@ -95,4 +115,34 @@ export const modalSchema: FormSchemaGetter = () => [
       precision:0,
     },
   },
+  {
+    label: '建筑面积(㎡)',
+    fieldName: 'area',
+    component: 'InputNumber',
+    componentProps: {
+      min:0,
+      precision:2,
+    },
+    rules: 'required',
+  },
+  {
+    label: '套内面积(㎡)',
+    fieldName: 'insideInArea',
+    component: 'InputNumber',
+    componentProps: {
+      min:0,
+      precision:2,
+    },
+    rules: 'required',
+  },
+  {
+    label: '公摊面积(㎡)',
+    fieldName: 'sharedArea',
+    component: 'InputNumber',
+    componentProps: {
+      min:0,
+      precision:2,
+    },
+    rules: 'required',
+  },
 ];

apps/web-antd/src/views/property/floor/floor-modal.vue

@@ -22,9 +22,9 @@ const title = computed(() => {
 const [BasicForm, formApi] = useVbenForm({
   commonConfig: {
     // 默认占满两列
-    formItemClass: 'col-span-2',
+    formItemClass: 'col-span-1',
     // 默认label宽度 px
-    labelWidth: 80,
+    labelWidth: 90,
     // 通用配置项 会影响到所有表单项
     componentProps: {
       class: 'w-full',
@@ -44,7 +44,7 @@ const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff(
 
 const [BasicModal, modalApi] = useVbenModal({
   // 在这里更改宽度
-  class: 'w-[550px]',
+  class: 'w-[60%]',
   fullscreenButton: false,
   onBeforeClose,
   onClosed: handleClosed,

apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/data.ts

@@ -112,6 +112,12 @@ export const modalSchema: FormSchemaGetter = () => [
     fieldName: 'nfcCode',
     component: 'Input',
   },
+  {
+    label: '巡检位置',
+    fieldName: 'inspectionLocation',
+    component: 'Input',
+    rules: 'required',
+  },
   {
     label: '备注',
     fieldName: 'remark',

apps/web-antd/src/views/property/room/floor-tree.vue

@@ -0,0 +1,122 @@
+<script setup lang="ts">
+import type { PropType } from 'vue';
+import type { DeptTree } from '#/api/system/user/model';
+import { onMounted, ref } from 'vue';
+import { SyncOutlined } from '@ant-design/icons-vue';
+import { Empty, InputSearch, Skeleton, Tree } from 'ant-design-vue';
+import { communityTree } from '#/api/property/community';
+
+defineOptions({ inheritAttrs: false });
+
+withDefaults(defineProps<{ showSearch?: boolean }>(), { showSearch: true });
+
+const emit = defineEmits<{
+  /**
+   * 点击刷新按钮的事件
+   */
+  reload: [];
+  /**
+   * 点击节点的事件
+   */
+  select: [];
+}>();
+
+const selectDeptId = defineModel('selectDeptId', {
+  required: true,
+  type: Array as PropType<string[]>,
+});
+
+const searchValue = defineModel('searchValue', {
+  type: String,
+  default: '',
+});
+
+/** 部门数据源 */
+type DeptTreeArray = DeptTree[];
+const deptTreeArray = ref<DeptTreeArray>([]);
+/** 骨架屏加载 */
+const showTreeSkeleton = ref<boolean>(true);
+
+async function loadTree() {
+  showTreeSkeleton.value = true;
+  searchValue.value = '';
+  selectDeptId.value = [];
+  const ret = await communityTree(3);
+  deptTreeArray.value = ret;
+  showTreeSkeleton.value = false;
+}
+
+async function handleReload() {
+  await loadTree();
+  emit('reload');
+}
+
+onMounted(loadTree);
+</script>
+
+<template>
+  <div :class="$attrs.class">
+    <Skeleton
+      :loading="showTreeSkeleton"
+      :paragraph="{ rows: 8 }"
+      active
+      class="p-[8px]"
+    >
+      <div
+        class="bg-background flex h-full flex-col overflow-y-auto rounded-lg"
+      >
+        <!-- 固定在顶部 必须加上bg-background背景色 否则会产生'穿透'效果 -->
+        <div
+          v-if="showSearch"
+          class="bg-background z-100 sticky left-0 top-0 p-[8px]"
+        >
+          <InputSearch
+            v-model:value="searchValue"
+            :placeholder="$t('pages.common.search')"
+            size="small"
+          >
+            <template #enterButton>
+              <a-button @click="handleReload">
+                <SyncOutlined class="text-primary" />
+              </a-button>
+            </template>
+          </InputSearch>
+        </div>
+        <div class="h-full overflow-x-hidden px-[8px]">
+          <Tree
+            v-bind="$attrs"
+            v-if="deptTreeArray.length > 0"
+            v-model:selected-keys="selectDeptId"
+            :class="$attrs.class"
+            :field-names="{ title: 'label', key: 'id' }"
+            :show-line="{ showLeafIcon: false }"
+            :tree-data="deptTreeArray"
+            :virtual="false"
+            default-expand-all
+            @select="$emit('select')"
+          >
+            <template #title="{ label }">
+              <span v-if="label.indexOf(searchValue) > -1">
+                {{ label.substring(0, label.indexOf(searchValue)) }}
+                <span style="color: #f50">{{ searchValue }}</span>
+                {{
+                  label.substring(
+                    label.indexOf(searchValue) + searchValue.length,
+                  )
+                }}
+              </span>
+              <span v-else>{{ label }}</span>
+            </template>
+          </Tree>
+          <!-- 仅本人数据权限 可以考虑直接不显示 -->
+          <div v-else class="mt-5">
+            <Empty
+              :image="Empty.PRESENTED_IMAGE_SIMPLE"
+              description="无部门数据"
+            />
+          </div>
+        </div>
+      </div>
+    </Skeleton>
+  </div>
+</template>

apps/web-antd/src/views/property/room/index.vue

@@ -1,13 +1,8 @@
 <script setup lang="ts">
-import type { Recordable } from '@vben/types';
-
-import { ref } from 'vue';
-
 import { Page, useVbenModal, type VbenFormProps } from '@vben/common-ui';
 import { getVxePopupContainer } from '@vben/utils';
-
 import { Modal, Popconfirm, Space } from 'ant-design-vue';
-import dayjs from 'dayjs';
+import FloorTree from "./floor-tree.vue"
 
 import {
   useVbenVxeGrid,
@@ -125,8 +120,10 @@ function handleDownloadExcel() {
 </script>
 
 <template>
-  <Page :auto-content-height="true">
+  <Page :auto-content-height="true" style="width: 100%">
-    <BasicTable table-title="房间信息列表">
+    <div class="flex h-full gap-[15px]">
+      <FloorTree></FloorTree>
+      <BasicTable class="flex-1 overflow-hidden" table-title="房间信息列表">
         <template #toolbar-tools>
           <Space>
             <a-button
@@ -177,6 +174,7 @@ function handleDownloadExcel() {
           </Space>
         </template>
       </BasicTable>
+    </div>
     <RoomModal @reload="tableApi.query()" />
   </Page>
 </template>

apps/web-antd/src/views/property/roomBooking/participants/data.ts

@@ -0,0 +1,88 @@
+import type { FormSchemaGetter } from '#/adapter/form';
+import type { VxeGridProps } from '#/adapter/vxe-table';
+import { personList } from '#/api/property/resident/person';
+import {participantsList} from '#/api/property/roomBooking/participants';
+
+export const querySchema: FormSchemaGetter = () => [
+  {
+    label: '会议室名称',
+    fieldName: 'meetBookId',
+    component: 'ApiSelect',
+    componentProps: {
+      api: async () => {
+        const rows = await participantsList({ pageSize: 1000000000, pageNum: 1 });
+        return rows;
+      },
+      resultField: 'rows',
+      labelField: 'meetBookingVo.name',
+      valueField: 'meetBookId',
+    },
+  },
+  {
+    label: '发起人',
+    fieldName: 'residentPersonId',
+    component: 'ApiSelect',
+    componentProps: {
+      api: async () => {
+        const rows = await personList({ pageSize: 1000000000, pageNum: 1 });
+        return rows;
+      },
+      resultField: 'rows',
+      labelField: 'userName',
+      valueField: 'id',
+    },
+  },
+];
+
+export const columns: VxeGridProps['columns'] = [
+  {
+    title: '会议室名称',
+    field: 'meetBookingVo.name',
+  },
+  {
+    title: '会议主题',
+    field: 'meetBookingVo.meetTheme',
+  },
+  {
+    title: '会议时间',
+    field: 'meetBookingVo.meetingTime',
+    slots: {
+      default: ({row}) => {
+        return row.meetBookingVo.scheduledStarttime+'~'+row.meetBookingVo.scheduledEndtime;
+      },
+    },
+    width:300
+  },
+  {
+    title: '发起人',
+    field: 'meetBookingVo.personName',
+  },
+  {
+    title: '发起单位',
+    field: 'meetBookingVo.unitName',
+  },
+  {
+    title: '会议室地点',
+    field: 'meetBookingVo.meetLocation',
+  },
+  {
+    title: '签到状态',
+    field: 'signState',
+    slots: {
+      default: ({row}) => {
+        return row.signState === '0' ? '未签到' : '已签到';
+      },
+    },
+  },
+  {
+    title: '签到时间',
+    field: 'signTime',
+  },
+  {
+    field: 'action',
+    fixed: 'right',
+    slots: { default: 'action' },
+    title: '操作',
+    width: 180,
+  },
+];

apps/web-antd/src/views/property/roomBooking/participants/index.vue

@@ -0,0 +1,101 @@
+<script setup lang="ts">
+import { Page, useVbenModal, type VbenFormProps } from '@vben/common-ui';
+import { Space } from 'ant-design-vue';
+import {
+  useVbenVxeGrid,
+  type VxeGridProps
+} from '#/adapter/vxe-table';
+import {
+  participantsExport,
+  participantsList,
+} from '#/api/property/roomBooking/participants';
+import type { ParticipantsForm } from '#/api/property/roomBooking/participants/model';
+import { commonDownloadExcel } from '#/utils/file/download';
+import participantsDetail from './participants-detail.vue';
+import { columns, querySchema } from './data';
+
+const formOptions: VbenFormProps = {
+  commonConfig: {
+    labelWidth: 80,
+    componentProps: {
+      allowClear: true,
+    },
+  },
+  schema: querySchema(),
+  wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4',
+};
+
+const gridOptions: VxeGridProps = {
+  checkboxConfig: {
+    highlight: true,
+    reserve: true,
+  },
+  columns,
+  height: 'auto',
+  keepSource: true,
+  pagerConfig: {},
+  proxyConfig: {
+    ajax: {
+      query: async ({ page }, formValues = {}) => {
+        return await participantsList({
+          pageNum: page.currentPage,
+          pageSize: page.pageSize,
+          ...formValues,
+        });
+      },
+    },
+  },
+  rowConfig: {
+    keyField: 'id',
+  },
+  // 表格全局唯一表示 保存列配置需要用到
+  id: 'property-participants-index'
+};
+
+const [BasicTable, tableApi] = useVbenVxeGrid({
+  formOptions,
+  gridOptions,
+});
+
+const [ParticipantsDetail, participantsDetailApi] = useVbenModal({
+  connectedComponent: participantsDetail,
+});
+
+async function handleInfo(row: Required<ParticipantsForm>) {
+  participantsDetailApi.setData({ id: row.id });
+  participantsDetailApi.open();
+}
+
+function handleDownloadExcel() {
+  commonDownloadExcel(participantsExport, '会议室参会记录数据', tableApi.formApi.form.values, {
+    fieldMappingTime: formOptions.fieldMappingTime,
+  });
+}
+</script>
+
+<template>
+  <Page :auto-content-height="true">
+    <BasicTable table-title="会议室参会记录列表">
+      <template #toolbar-tools>
+        <Space>
+          <a-button
+            v-access:code="['property:participants:export']"
+            @click="handleDownloadExcel"
+          >
+            {{ $t('pages.common.export') }}
+          </a-button>
+        </Space>
+      </template>
+      <template #action="{ row }">
+        <Space>
+          <ghost-button
+            @click.stop="handleInfo(row)"
+          >
+            {{ $t('pages.common.info') }}
+          </ghost-button>
+        </Space>
+      </template>
+    </BasicTable>
+    <ParticipantsDetail/>
+  </Page>
+</template>

apps/web-antd/src/views/property/roomBooking/participants/participants-detail.vue

@@ -0,0 +1,82 @@
+<script setup lang="ts">
+import type {ParticipantsVO} from '#/api/property/roomBooking/participants/model';
+import {shallowRef} from 'vue';
+import {useVbenModal} from '@vben/common-ui';
+import {Descriptions, DescriptionsItem} from 'ant-design-vue';
+import {participantsInfo} from '#/api/property/roomBooking/participants';
+import {ossInfo} from "#/api/system/oss";
+
+const [BasicModal, modalApi] = useVbenModal({
+  onOpenChange: handleOpenChange,
+  onClosed() {
+    ParticipantsDetail.value = null;
+  },
+});
+
+const ParticipantsDetail = shallowRef<null | ParticipantsVO>(null);
+
+async function handleOpenChange(open: boolean) {
+  if (!open) {
+    return null;
+  }
+  modalApi.modalLoading(true);
+  const {id} = modalApi.getData() as { id: number | string };
+  ParticipantsDetail.value = await participantsInfo(id);
+  try {
+    if (ParticipantsDetail.value.residentPersonVo.img) {
+      const res = await ossInfo([ParticipantsDetail.value.residentPersonVo.img]);
+      ParticipantsDetail.value.residentPersonVo.img = res?.[0]?.url
+    }
+  } catch (e) {}
+
+  modalApi.modalLoading(false);
+}
+</script>
+
+<template>
+  <BasicModal :footer="false" :fullscreen-button="false" title="会议室详情" class="w-[70%]">
+    <Descriptions v-if="ParticipantsDetail" size="small" :column="2" bordered
+                  :labelStyle="{width:'120px'}">
+      <DescriptionsItem label="会议室名称">
+        {{ ParticipantsDetail.meetBookingVo.name }}
+      </DescriptionsItem>
+      <DescriptionsItem label="会议主题">
+        {{ ParticipantsDetail.meetBookingVo.meetTheme }}
+      </DescriptionsItem>
+      <DescriptionsItem label="会议时间">
+        {{ ParticipantsDetail.meetBookingVo.scheduledStarttime }}
+      </DescriptionsItem>
+      <DescriptionsItem label="发起人">
+        {{ ParticipantsDetail.meetBookingVo.personName }}
+      </DescriptionsItem>
+      <DescriptionsItem label="发起单位">
+        {{ ParticipantsDetail.meetBookingVo.unitName }}
+      </DescriptionsItem>
+      <DescriptionsItem label="会议室地点">
+        {{ ParticipantsDetail.meetBookingVo.meetLocation }}
+      </DescriptionsItem>
+
+      <DescriptionsItem label="参会姓名">
+        {{ ParticipantsDetail.residentPersonVo.userName }}
+      </DescriptionsItem>
+      <DescriptionsItem label="证件号">
+        {{ ParticipantsDetail.residentPersonVo.idCard }}
+      </DescriptionsItem>
+      <DescriptionsItem label="所属公司">
+        {{ ParticipantsDetail.residentPersonVo.unitName }}
+      </DescriptionsItem>
+      <DescriptionsItem label="联系电话">
+        {{ ParticipantsDetail.residentPersonVo.phone }}
+      </DescriptionsItem>
+      <DescriptionsItem label="人脸图片" v-if="ParticipantsDetail.residentPersonVo.img" :span="2">
+        <img :src="ParticipantsDetail.residentPersonVo.img" alt="图片加载失败"  class="w-[100px] h-[100px]"/>
+      </DescriptionsItem>
+      <DescriptionsItem label="签到状态">
+        {{ ParticipantsDetail.signState === '0' ? '未签到' : '已签到'}}
+      </DescriptionsItem>
+      <DescriptionsItem label="签到时间">
+        {{ ParticipantsDetail.signTime }}
+      </DescriptionsItem>
+    </Descriptions>
+  </BasicModal>
+</template>

apps/web-antd/src/views/videoSystem/videoWarning/videoWarningHasDone/data.ts

@@ -21,7 +21,7 @@ export const querySchema: FormSchemaGetter = () => [
       options: getDictOptions(DictEnum.alarm_level, true),
     },
     fieldName: 'level',
-    label: '级别',
+    label: '预警级别',
   },
   /*{
     component: 'Select',
@@ -45,7 +45,7 @@ export const columns: VxeGridProps['columns'] = [
     field: 'reportTime',
   },
   {
-    title: '设备ip',
+    title: '设备IP',
     field: 'deviceIp',
   },
   {
@@ -53,7 +53,7 @@ export const columns: VxeGridProps['columns'] = [
     field: 'deviceName',
   },
   {
-    title: '级别',
+    title: '预警级别',
     field: 'level',
     slots: {
       default: ({ row }: any) => {
@@ -138,7 +138,7 @@ export const modalSchema: FormSchemaGetter = () => [
     disabled: true,
   },
   {
-    label: '设备名称',
+    label: '设备IP',
     fieldName: 'deviceIp',
     component: 'Input',
     disabled: true,
@@ -152,7 +152,7 @@ export const modalSchema: FormSchemaGetter = () => [
     rules: 'required',
   },
   {
-    label: '重要级别',
+    label: '预警级别',
     fieldName: 'level',
     component: 'Select',
     disabled: true,
@@ -185,7 +185,7 @@ export const modalSchema: FormSchemaGetter = () => [
     rules: 'selectRequired',
   },
   {
-    label: '描述',
+    label: '预警描述',
     disabled: true,
     fieldName: 'description',
     component: 'Textarea',

apps/web-antd/src/views/videoSystem/videoWarning/videoWarningHasDone/warning-detail.vue

@@ -72,15 +72,24 @@ function loadProcessList() {
       :labelStyle="{ width: '120px' }"
       style="margin-bottom: 30px"
     >
-      <DescriptionsItem label="预警编号">
+      <DescriptionsItem label="预警编码">
         {{ warningDetail.id }}
       </DescriptionsItem>
-
+      <DescriptionsItem label="预警类型">
-      <DescriptionsItem label="预警时间">
+        {{ warningDetail.bigTypeName + ' - ' + warningDetail.smallTypeName }}
-        {{ warningDetail.reportTime }}
       </DescriptionsItem>
 
-      <DescriptionsItem label="级别">
+      <DescriptionsItem label="设备IP"
+      >{{ warningDetail.deviceIp }}
+      </DescriptionsItem>
+
+      <DescriptionsItem label="设备名称"
+      >{{ warningDetail.deviceName }}
+      </DescriptionsItem>
+      <DescriptionsItem label="预警位置" :span="2">
+        {{ warningDetail.deviceName }}
+      </DescriptionsItem>
+      <DescriptionsItem label="预警级别">
         <Tag
           :color="
             warningDetail.level === '特大'
@@ -93,27 +102,15 @@ function loadProcessList() {
           {{ warningDetail.levelName }}
         </Tag>
       </DescriptionsItem>
-
+      <DescriptionsItem label="预警时间">
-      <DescriptionsItem label="预警类型">
+        {{ warningDetail.reportTime }}
-        {{ warningDetail.bigTypeName + ' - ' + warningDetail.smallTypeName }}
       </DescriptionsItem>
 
-      <DescriptionsItem label="设备ip"
+      <DescriptionsItem label="预警描述" :span="2">
-        >{{ warningDetail.deviceIp }}
-      </DescriptionsItem>
-
-      <DescriptionsItem label="设备ip"
-        >{{ warningDetail.deviceName }}
-      </DescriptionsItem>
-
-      <DescriptionsItem label="描述" :span="2">
         {{ warningDetail.description }}
       </DescriptionsItem>
 
-      <DescriptionsItem label="所在位置" :span="2">
+      <DescriptionsItem :span="2" label="相关图片">
-        {{ warningDetail.deviceName }}
-      </DescriptionsItem>
-      <DescriptionsItem :span="2" label="附件信息">
         <div class="file-box">
           <div class="img-box" v-for="item in currFiles">
             <Image

apps/web-antd/src/views/videoSystem/videoWarning/videoWarningProcessing/data.ts

@@ -21,7 +21,7 @@ export const querySchema: FormSchemaGetter = () => [
       options: getDictOptions(DictEnum.alarm_level, true),
     },
     fieldName: 'level',
-    label: '级别',
+    label: '预警级别',
   },
   /*{
     component: 'Select',
@@ -45,7 +45,7 @@ export const columns: VxeGridProps['columns'] = [
     field: 'reportTime',
   },
   {
-    title: '设备ip',
+    title: '设备IP',
     field: 'deviceIp',
   },
   {
@@ -53,7 +53,7 @@ export const columns: VxeGridProps['columns'] = [
     field: 'deviceName',
   },
   {
-    title: '级别',
+    title: '预警级别',
     field: 'level',
     slots: {
       default: ({ row }: any) => {
@@ -138,7 +138,7 @@ export const modalSchema: FormSchemaGetter = () => [
     disabled: true,
   },
   {
-    label: '设备名称',
+    label: '设备IP',
     fieldName: 'deviceIp',
     component: 'Input',
     disabled: true,
@@ -152,7 +152,7 @@ export const modalSchema: FormSchemaGetter = () => [
     rules: 'required',
   },
   {
-    label: '重要级别',
+    label: '预警级别',
     fieldName: 'level',
     component: 'Select',
     disabled: true,
@@ -185,7 +185,7 @@ export const modalSchema: FormSchemaGetter = () => [
     rules: 'selectRequired',
   },
   {
-    label: '描述',
+    label: '预警描述',
     disabled: true,
     fieldName: 'description',
     component: 'Textarea',

apps/web-antd/src/views/videoSystem/videoWarning/videoWarningProcessing/warning-detail.vue

@@ -70,15 +70,23 @@ function loadProcessList() {
       :labelStyle="{ width: '120px' }"
       style="margin-bottom: 30px"
     >
-      <DescriptionsItem label="预警编号">
+      <DescriptionsItem label="预警编码">
         {{ warningDetail.id }}
       </DescriptionsItem>
-
+      <DescriptionsItem label="预警类型">
-      <DescriptionsItem label="预警时间">
+        {{ warningDetail.bigTypeName + ' - ' + warningDetail.smallTypeName }}
-        {{ warningDetail.reportTime }}
+      </DescriptionsItem>
+      <DescriptionsItem label="设备IP"
+      >{{ warningDetail.deviceIp }}
       </DescriptionsItem>
 
-      <DescriptionsItem label="级别">
+      <DescriptionsItem label="设备名称"
+      >{{ warningDetail.deviceName }}
+      </DescriptionsItem>
+      <DescriptionsItem label="预警位置" :span="2">
+        {{ warningDetail.deviceName }}
+      </DescriptionsItem>
+      <DescriptionsItem label="预警级别">
         <Tag
           :color="
             warningDetail.level === '特大'
@@ -91,28 +99,16 @@ function loadProcessList() {
           {{ warningDetail.levelName }}
         </Tag>
       </DescriptionsItem>
-
+      <DescriptionsItem label="预警时间">
-      <DescriptionsItem label="预警类型">
+        {{ warningDetail.reportTime }}
-        {{ warningDetail.bigTypeName + ' - ' + warningDetail.smallTypeName }}
       </DescriptionsItem>
-
+      <DescriptionsItem label="预警描述" :span="2">
-      <DescriptionsItem label="设备ip"
-        >{{ warningDetail.deviceIp }}
-      </DescriptionsItem>
-
-      <DescriptionsItem label="设备ip"
-        >{{ warningDetail.deviceName }}
-      </DescriptionsItem>
-
-      <DescriptionsItem label="描述" :span="2">
         {{ warningDetail.description }}
       </DescriptionsItem>
 
-      <DescriptionsItem label="所在位置">
-        {{ warningDetail.deviceName }}
-      </DescriptionsItem>
 
-      <DescriptionsItem label="处理状态">
+
+      <DescriptionsItem label="处理状态" :span="2">
         <Tag color="processing">
           {{ warningDetail.stateName }}
         </Tag>
@@ -126,7 +122,7 @@ function loadProcessList() {
         {{ warningDetail.processingTime || '-' }}
       </DescriptionsItem>-->
 
-      <DescriptionsItem :span="1" label="附件信息">
+      <DescriptionsItem :span="2" label="相关图片">
         <div class="file-box">
           <div class="img-box" v-for="item in currFiles">
             <Image
@@ -138,7 +134,7 @@ function loadProcessList() {
         </div>
       </DescriptionsItem>
 
-      <DescriptionsItem :span="1" label="报警视频"></DescriptionsItem>
+      <DescriptionsItem :span="2" label="报警视频"></DescriptionsItem>
     </Descriptions>
   </BasicModal>
 </template>

apps/web-antd/src/views/videoSystem/videoWarning/videoWarningToDone/data.ts

@@ -22,7 +22,7 @@ export const querySchema: FormSchemaGetter = () => [
       options: getDictOptions(DictEnum.alarm_level, true),
     },
     fieldName: 'level',
-    label: '级别',
+    label: '预警级别',
   },
   /*{
     component: 'Select',
@@ -46,7 +46,7 @@ export const columns: VxeGridProps['columns'] = [
     field: 'reportTime',
   },
   {
-    title: '设备ip',
+    title: '设备IP',
     field: 'deviceIp',
   },
   {
@@ -54,7 +54,7 @@ export const columns: VxeGridProps['columns'] = [
     field: 'deviceName',
   },
   {
-    title: '级别',
+    title: '预警级别',
     field: 'level',
     slots: {
       default: ({ row }: any) => {
@@ -139,7 +139,7 @@ export const modalSchema: FormSchemaGetter = () => [
     disabled: true,
   },
   {
-    label: '设备名称',
+    label: '设备IP',
     fieldName: 'deviceIp',
     component: 'Input',
     disabled: true,
@@ -153,7 +153,7 @@ export const modalSchema: FormSchemaGetter = () => [
     rules: 'required',
   },
   {
-    label: '重要级别',
+    label: '预警级别',
     fieldName: 'level',
     component: 'Select',
     disabled: true,
@@ -186,7 +186,7 @@ export const modalSchema: FormSchemaGetter = () => [
     rules: 'selectRequired',
   },
   {
-    label: '描述',
+    label: '预警描述',
     disabled: true,
     fieldName: 'description',
     component: 'Textarea',
@@ -196,6 +196,19 @@ export const modalSchema: FormSchemaGetter = () => [
     },
   },
 
+
+  // 插入分割线
+  {
+    component: 'Divider',
+    fieldName: '_divider',
+    formItemClass: 'col-span-2',
+    hideLabel: true,
+    renderComponentContent: () => {
+      return {
+        default: () => h('div', '处理'),
+      };
+    },
+  },
   {
     label: '处理人',
     fieldName: 'solveName',
@@ -212,19 +225,6 @@ export const modalSchema: FormSchemaGetter = () => [
     fieldName: 'solveEmail',
     component: 'Input',
   },
-  // 插入分割线
-  {
-    component: 'Divider',
-    fieldName: '_divider',
-    formItemClass: 'col-span-2',
-    hideLabel: true,
-    renderComponentContent: () => {
-      return {
-        default: () => h('div', '处理'),
-      };
-    },
-  },
-
   {
     label: '备注',
     fieldName: 'remark',

apps/web-antd/src/views/videoSystem/videoWarning/videoWarningToDone/warning-detail.vue

@@ -70,15 +70,23 @@ function loadProcessList() {
       :labelStyle="{ width: '120px' }"
       style="margin-bottom: 30px"
     >
-      <DescriptionsItem label="预警编号">
+      <DescriptionsItem label="预警编码">
         {{ warningDetail.id }}
       </DescriptionsItem>
-
+      <DescriptionsItem label="预警类型">
-      <DescriptionsItem label="预警时间">
+        {{ warningDetail.bigTypeName + ' - ' + warningDetail.smallTypeName }}
-        {{ warningDetail.reportTime }}
+      </DescriptionsItem>
+      <DescriptionsItem label="设备IP"
+      >{{ warningDetail.deviceIp }}
       </DescriptionsItem>
 
-      <DescriptionsItem label="级别">
+      <DescriptionsItem label="设备名称"
+      >{{ warningDetail.deviceName }}
+      </DescriptionsItem>
+      <DescriptionsItem label="预警位置" :span="2">
+        {{ warningDetail.deviceName }}
+      </DescriptionsItem>
+      <DescriptionsItem label="预警级别">
         <Tag
           :color="
             warningDetail.level === '特大'
@@ -91,28 +99,13 @@ function loadProcessList() {
           {{ warningDetail.levelName }}
         </Tag>
       </DescriptionsItem>
-
+      <DescriptionsItem label="预警时间">
-      <DescriptionsItem label="预警类型">
+        {{ warningDetail.reportTime }}
-        {{ warningDetail.bigTypeName + ' - ' + warningDetail.smallTypeName }}
       </DescriptionsItem>
-
+      <DescriptionsItem label="预警描述" :span="2">
-      <DescriptionsItem label="设备ip"
-      >{{ warningDetail.deviceIp }}
-      </DescriptionsItem>
-
-      <DescriptionsItem label="设备ip"
-      >{{ warningDetail.deviceName }}
-      </DescriptionsItem>
-
-      <DescriptionsItem label="描述" :span="2">
         {{ warningDetail.description }}
       </DescriptionsItem>
-
+      <DescriptionsItem label="相关图片"  :span="2">
-      <DescriptionsItem label="所在位置" :span="2">
-        {{ warningDetail.deviceName }}
-      </DescriptionsItem>
-
-      <DescriptionsItem label="附件信息"  :span="2">
         <div class="file-box">
           <div class="img-box" v-for="item in currFiles">
             <Image

apps/web-antd/vite.config.mts

@@ -27,7 +27,7 @@ export default defineConfig(async () => {
             changeOrigin: true,
             rewrite: (path) => path.replace(/^\/api/, ''),
             // mock代理目标地址
-            target: 'http://183.230.235.66:11010/api/',
+            target: 'http://192.168.1.110:8080',
             ws: true,
           },
         },