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/views/property/businessManagement/workOrdersType/data.ts b/apps/web-antd/src/views/property/businessManagement/workOrdersType/data.ts
index b2accd85..c9c20b4c 100644
--- a/apps/web-antd/src/views/property/businessManagement/workOrdersType/data.ts
+++ b/apps/web-antd/src/views/property/businessManagement/workOrdersType/data.ts
@@ -1,7 +1,7 @@
import type { FormSchemaGetter } from '#/adapter/form';
import type { VxeGridProps } from '#/adapter/vxe-table';
-import {renderDict} from "#/utils/render";
-import {getDictOptions} from "#/utils/dict";
+import { renderDict } from '#/utils/render';
+import { getDictOptions } from '#/utils/dict';
export const querySchema: FormSchemaGetter = () => [
// {
@@ -34,7 +34,12 @@ export const columns: VxeGridProps['columns'] = [
title: '类型名称',
field: 'orderTypeName',
treeNode: true,
- minWidth:180,
+ minWidth: 180,
+ },
+ {
+ title: '部门名称',
+ field: 'deptName',
+ width: 180,
},
{
title: '运作模式',
@@ -44,14 +49,16 @@ export const columns: VxeGridProps['columns'] = [
return renderDict(row.operationMode, 'pro_operation_pattern');
},
},
- width:180,
+ width: 180,
},
{
title: '处理优先级',
field: 'processingWeight',
slots: {
- default: ({row}) => {
- return row.processingWeight!=null?renderDict(row.processingWeight, 'pro_processing_weight'):'';
+ default: ({ row }) => {
+ return row.processingWeight != null
+ ? renderDict(row.processingWeight, 'pro_processing_weight')
+ : '';
},
},
width: 100,
@@ -59,12 +66,12 @@ export const columns: VxeGridProps['columns'] = [
{
title: '排序值',
field: 'sort',
- width:180,
+ width: 180,
},
{
title: '累计工单数量',
field: 'number',
- width:180,
+ width: 180,
},
{
title: '是否支持转单',
@@ -74,7 +81,7 @@ export const columns: VxeGridProps['columns'] = [
return renderDict(row.isTransfers, 'support_transferring_orders');
},
},
- width:180,
+ width: 180,
},
{
field: 'action',
@@ -101,6 +108,12 @@ export const modalSchema: FormSchemaGetter = () => [
component: 'Input',
rules: 'required',
},
+ {
+ label: '部门名称',
+ fieldName: 'deptId',
+ component: 'TreeSelect',
+ rules: 'required',
+ },
{
label: '父级类型',
fieldName: 'parentId',
diff --git a/apps/web-antd/src/views/property/businessManagement/workOrdersType/workOrdersType-detail.vue b/apps/web-antd/src/views/property/businessManagement/workOrdersType/workOrdersType-detail.vue
index c1f8e772..2831fc0c 100644
--- a/apps/web-antd/src/views/property/businessManagement/workOrdersType/workOrdersType-detail.vue
+++ b/apps/web-antd/src/views/property/businessManagement/workOrdersType/workOrdersType-detail.vue
@@ -1,10 +1,10 @@
-
-
+
+
{{ workOrdersTypeInfoDetail.orderTypeName }}
-
-
+ {{ workOrdersTypeInfoDetail.deptName }}
+
+
+
-
@@ -53,9 +78,17 @@ async function handleOpenChange(open: boolean) {
{{ workOrdersTypeInfoDetail.number }}
-
+
diff --git a/apps/web-antd/src/views/property/businessManagement/workOrdersType/workOrdersType-modal.vue b/apps/web-antd/src/views/property/businessManagement/workOrdersType/workOrdersType-modal.vue
index 86d7ea95..7045a7b6 100644
--- a/apps/web-antd/src/views/property/businessManagement/workOrdersType/workOrdersType-modal.vue
+++ b/apps/web-antd/src/views/property/businessManagement/workOrdersType/workOrdersType-modal.vue
@@ -1,16 +1,18 @@
-
+
-
diff --git a/apps/web-antd/src/views/sis/acAdmin/index.vue b/apps/web-antd/src/views/sis/acAdmin/index.vue
index 469f79fa..96d7d07c 100644
--- a/apps/web-antd/src/views/sis/acAdmin/index.vue
+++ b/apps/web-antd/src/views/sis/acAdmin/index.vue
@@ -162,12 +162,11 @@ function streamProxy(nodeData: any, cb: Function) {
pwd: nodeData.devicePwd,
channelId: nodeData.channelNo,
};
-
- if (isSupportH265) {
- addStreamProxy(params).then((res) => cb(res));
- } else {
- addFFmpegStreamProxy(params).then((res) => cb(res));
- }
+ }
+ if (isSupportH265) {
+ addStreamProxy(params).then((res) => cb(res));
+ } else {
+ addStreamProxy(params).then((res) => cb(res));
}
}
@@ -181,7 +180,7 @@ function doPlayer(nodeData: any, index: number = 0) {
if (mpegts.isSupported()) {
streamProxy(nodeData, (res: AddStreamProxyResult) => {
const host = window.location.host;
- const url = `http://${host}/${res.app}/${res.streamId}.live.flv`;
+ const url = `ws://${host}/${res.app}/${res.streamId}.live.flv`;
// 将url 绑定到 nodeData
nodeData.url = url;
closePlayer(index);
diff --git a/apps/web-antd/src/views/sis/video/index.vue b/apps/web-antd/src/views/sis/video/index.vue
index 950723b5..57206b85 100644
--- a/apps/web-antd/src/views/sis/video/index.vue
+++ b/apps/web-antd/src/views/sis/video/index.vue
@@ -308,7 +308,7 @@ function doPlayer(nodeData: any, index: number = 0) {
if (mpegts.isSupported()) {
streamProxy(nodeData, (res: AddStreamProxyResult) => {
const host = window.location.host;
- const url = `http://${host}/${res.app}/${res.streamId}.live.flv`;
+ const url = `ws://${host}/${res.app}/${res.streamId}.live.flv`;
// 将url 绑定到 nodeData
nodeData.url = url;
closePlayer(index);