Merge branch 'main' into f-dev

@@ -37,9 +37,9 @@ export const columns: BasicColumn[] = [
     width: 120,
     width: 120,
   },
   },
   {
   {
-    title: '摄像头编号',
+    title: '摄像头编号/监控点编号',
     dataIndex: 'sn',
     dataIndex: 'sn',
-    width: 120,
+    width: 220,
   },
   },
   {
   {
     title: '视频流',
     title: '视频流',
@@ -54,18 +54,13 @@ export const columns: BasicColumn[] = [
   {
   {
     title: '接受方式',
     title: '接受方式',
     dataIndex: 'accessMode',
     dataIndex: 'accessMode',
-    width: 160,
+    width: 100,
     slots: { customRender: 'accessMode' },
     slots: { customRender: 'accessMode' },
   },
   },
   {
   {
     title: '创建时间',
     title: '创建时间',
     dataIndex: 'createTime',
     dataIndex: 'createTime',
-    width: 180,
-  },
-  {
-    title: '更新时间',
-    dataIndex: 'updateTime',
-    width: 180,
+    width: 140,
   },
   },
 ];
 ];
 
 

@@ -39,13 +39,9 @@
           />
           />
         </template>
         </template>
         <template #accessMode="{ record }">
         <template #accessMode="{ record }">
-          <span>{{
-            record.accessMode === AccessMode.ManuallyEnter
-              ? '手动输入'
-              : record.accessMode === AccessMode.Streaming
-              ? '流媒体获取'
-              : ''
-          }}</span>
+          <Tag :color="record.accessMode === AccessMode.ManuallyEnter ? 'cyan' : 'blue'">{{
+            record.accessMode === AccessMode.ManuallyEnter ? '手动输入' : '流媒体获取'
+          }}</Tag>
         </template>
         </template>
         <template #action="{ record }">
         <template #action="{ record }">
           <TableAction
           <TableAction
@@ -96,6 +92,7 @@
   import { Authority } from '/@/components/Authority';
   import { Authority } from '/@/components/Authority';
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
   import { Popconfirm } from 'ant-design-vue';
   import { Popconfirm } from 'ant-design-vue';
+  import { Tag } from 'ant-design-vue';
 
 
   export default defineComponent({
   export default defineComponent({
     components: {
     components: {
@@ -108,6 +105,7 @@
       TableImg,
       TableImg,
       Authority,
       Authority,
       Popconfirm,
       Popconfirm,
+      Tag,
     },
     },
     setup() {
     setup() {
       const searchInfo = reactive<Recordable>({});
       const searchInfo = reactive<Recordable>({});

 import { BasicColumn, FormSchema } from '/@/components/Table';
 import { BasicColumn, FormSchema } from '/@/components/Table';
 import { getOrganizationList } from '/@/api/system/system';
 import { getOrganizationList } from '/@/api/system/system';
 import { copyTransFun } from '/@/utils/fnUtils';
 import { copyTransFun } from '/@/utils/fnUtils';
+export enum Platform {
+  PHONE = 'phone',
+  PC = 'pc',
+}
 
 
 // 表格列数据
 // 表格列数据
 export const columns: BasicColumn[] = [
 export const columns: BasicColumn[] = [
@@ -15,6 +19,12 @@ export const columns: BasicColumn[] = [
     width: 160,
     width: 160,
   },
   },
   {
   {
+    title: '平台',
+    dataIndex: 'platform',
+    width: 100,
+    slots: { customRender: 'platform' },
+  },
+  {
     title: '备注',
     title: '备注',
     dataIndex: 'remark',
     dataIndex: 'remark',
     width: 200,
     width: 200,
@@ -70,6 +80,20 @@ export const formSchema: FormSchema[] = [
     },
     },
   },
   },
   {
   {
+    field: 'platform',
+    label: '平台',
+    required: true,
+    component: 'RadioGroup',
+    defaultValue: Platform.PC,
+    componentProps: {
+      defaultValue: Platform.PC,
+      options: [
+        { label: 'PC端', value: Platform.PC },
+        { label: '移动端', value: Platform.PHONE },
+      ],
+    },
+  },
+  {
     field: 'remark',
     field: 'remark',
     label: '备注',
     label: '备注',
     component: 'InputTextArea',
     component: 'InputTextArea',

@@ -9,6 +9,11 @@
         :searchInfo="searchInfo"
         :searchInfo="searchInfo"
         class="w-3/4 xl:w-4/5"
         class="w-3/4 xl:w-4/5"
       >
       >
+        <template #platform="{ record }">
+          <Tag :color="record.platform === Platform.PHONE ? 'cyan' : 'blue'">
+            {{ record.platform === Platform.PHONE ? '移动端' : 'PC端' }}
+          </Tag>
+        </template>
         <template #toolbar>
         <template #toolbar>
           <Authority value="api:yt:admin:addConfiguration">
           <Authority value="api:yt:admin:addConfiguration">
             <a-button type="primary" @click="handleCreateOrEdit(null)"> 新增组态 </a-button>
             <a-button type="primary" @click="handleCreateOrEdit(null)"> 新增组态 </a-button>
@@ -73,7 +78,7 @@
   import { useDrawer } from '/@/components/Drawer';
   import { useDrawer } from '/@/components/Drawer';
   import ContactDrawer from './ConfigurationCenterDrawer.vue';
   import ContactDrawer from './ConfigurationCenterDrawer.vue';
   import { useResetOrganizationTree, OrganizationIdTree } from '/@/views/common/organizationIdTree';
   import { useResetOrganizationTree, OrganizationIdTree } from '/@/views/common/organizationIdTree';
-  import { searchFormSchema, columns } from './center.data';
+  import { searchFormSchema, columns, Platform } from './center.data';
   import {
   import {
     getPage,
     getPage,
     deleteConfigurationCenter,
     deleteConfigurationCenter,
@@ -82,7 +87,7 @@
   import { getAppEnvConfig, isDevMode } from '/@/utils/env';
   import { getAppEnvConfig, isDevMode } from '/@/utils/env';
   import { Authority } from '/@/components/Authority';
   import { Authority } from '/@/components/Authority';
   import { Popconfirm } from 'ant-design-vue';
   import { Popconfirm } from 'ant-design-vue';
-
+  import { Tag } from 'ant-design-vue';
   export default defineComponent({
   export default defineComponent({
     components: {
     components: {
       PageWrapper,
       PageWrapper,
@@ -92,6 +97,7 @@
       ContactDrawer,
       ContactDrawer,
       Authority,
       Authority,
       Popconfirm,
       Popconfirm,
+      Tag,
     },
     },
     setup() {
     setup() {
       const { VITE_GLOB_CONFIGURATION } = getAppEnvConfig();
       const { VITE_GLOB_CONFIGURATION } = getAppEnvConfig();
@@ -171,6 +177,7 @@
       };
       };
 
 
       return {
       return {
+        Platform,
         searchInfo,
         searchInfo,
         hasBatchDelete,
         hasBatchDelete,
         handleCreateOrEdit,
         handleCreateOrEdit,