-
+ 启用设备
+
+
+ 断开连接
+
+
+
+
+
+
-
-
-
- 状态：
-
- 启用设备
-
-
- 断开连接
-
-
+ {{ instanceStore.current?.name }}
+
+
+ 状态：
+
-
-
-
-
- {{ instanceStore.current?.name }}
-
-
-
- {{
- instanceStore.current?.id
- }}
-
-
- {{ instanceStore.current?.productName }}
-
-
-
-
+ />
+ {{ instanceStore.current?.state?.text }}
+
+
@@ -51,6 +51,7 @@
max: 64,
message:
'最多可输入64个字符',
+ trigger: 'blur',
},
]"
>
@@ -75,6 +76,7 @@
max: 64,
message:
'最多可输入64个字符',
+ trigger: 'blur',
},
]"
>
@@ -184,7 +186,11 @@
@@ -63,6 +63,7 @@
max: 64,
message:
'最多可输入64个字符',
+ trigger: 'blur',
},
]"
>
@@ -86,13 +87,14 @@
max: 64,
message:
'最多可输入64个字符',
+ trigger: 'blur',
},
]"
>
通知Token
@@ -266,7 +269,11 @@
@@ -30,7 +30,11 @@
@@ -29,7 +29,8 @@
},
{
max: 64,
- message: '最大可输入64个字符',
+ message: '最多可输入64个字符',
+ trigger: 'blur',
},
]"
>
@@ -50,7 +51,8 @@
},
{
max: 64,
- message: '最大可输入64个字符',
+ message: '最多可输入64个字符',
+ trigger: 'blur',
},
]"
>
@@ -202,7 +204,11 @@
{
};
const addCluster = () => {
- const id = Date.now();
+ const id: any = Date.now();
dynamicValidateForm.cluster.push({
clusterNodeId: undefined,
port: undefined,
@@ -613,7 +619,11 @@ const { resetFields, validate, validateInfos } = useForm(
reactive({
name: [
{ required: true, message: '请输入名称', trigger: 'blur' },
- { max: 64, message: '最多可输入64个字符' },
+ {
+ max: 64,
+ message: '最多可输入64个字符',
+ trigger: 'blur',
+ },
],
description: [{ max: 200, message: '最多可输入200个字符' }],
}),
@@ -628,7 +638,7 @@ const saveData = () => {
transport: 'SIP',
channel: 'gb28181',
};
-
+ params.configuration.sipId = Number(params.configuration?.sipId);
const resp =
id === ':id' ? await save(params) : await update({ ...params, id });
if (resp.status === 200) {
@@ -645,20 +655,32 @@ const next = async () => {
data1.hostPort.port = port;
}
if (!data1?.shareCluster) {
- let data2 = await formRef2.value?.validate();
- if (data2 && data2?.cluster) {
- data2.cluster.forEach((i: any) => {
- i.enabled = true;
- i.port = JSON.parse(i.port).port;
+ await formRef2.value
+ ?.validate()
+ .then((data2) => {
+ if (data2 && data2?.cluster) {
+ data2.cluster.forEach((i: any) => {
+ i.enabled = true;
+ i.port = JSON.parse(i.port).port;
+ });
+ data1 = {
+ ...data1,
+ ...data2,
+ };
+ }
+ current.value = current.value + 1;
+ params.configuration = data1;
+ })
+ .catch((err) => {
+ err.errorFields.forEach((item: any) => {
+ const activeId: any =
+ dynamicValidateForm.cluster[item.name[1]].id;
+ if (!activeKey.value.includes(activeId)) {
+ activeKey.value.push(activeId); // 校验未通过的展开
+ }
+ });
});
- data1 = {
- ...data1,
- ...data2,
- };
- }
}
- current.value = current.value + 1;
- params.configuration = data1;
};
const prev = () => {
current.value = current.value - 1;
@@ -698,11 +720,25 @@ onMounted(() => {
});
if (id !== ':id') {
- formState.value = props.data.configuration;
- formData.value = {
- name: props.data.name,
- description: props.data?.description || '',
- };
+ const { configuration, name, description = '' } = props.data;
+ formData.value = { name, description };
+
+ if (configuration?.shareCluster) {
+ formState.value = {
+ ...formState.value,
+ ...props.data.configuration,
+ };
+ } else {
+ formState.value = {
+ ...formState.value,
+ ...props.data.configuration,
+ };
+ dynamicValidateForm.cluster = configuration.cluster;
+ if (dynamicValidateForm.cluster.length === 1) {
+ activeKey.value = ['1'];
+ dynamicValidateForm.cluster[0].id = 1;
+ }
+ }
}
});
diff --git a/src/views/link/AccessConfig/components/Media/index.vue b/src/views/link/AccessConfig/components/Media/index.vue
index 5f1716f3..916988e8 100644
--- a/src/views/link/AccessConfig/components/Media/index.vue
+++ b/src/views/link/AccessConfig/components/Media/index.vue
@@ -21,7 +21,11 @@
message: '请输入名称',
trigger: 'blur',
},
- { max: 64, message: '最多可输入64个字符' },
+ {
+ max: 64,
+ message: '最多可输入64个字符',
+ trigger: 'blur',
+ },
]"
>
-
-
+
@@ -87,7 +92,11 @@
-
-
+
-
-
+
-
@@ -26,7 +26,11 @@
@@ -112,21 +121,29 @@
@@ -366,7 +383,11 @@ const { resetFields, validate, validateInfos } = useForm(
reactive({
name: [
{ required: true, message: '请输入名称', trigger: 'blur' },
- { max: 64, message: '最多可输入64个字符' },
+ {
+ max: 64,
+ message: '最多可输入64个字符',
+ trigger: 'blur',
+ },
],
description: [{ max: 200, message: '最多可输入200个字符' }],
}),
diff --git a/src/views/link/AccessConfig/index.vue b/src/views/link/AccessConfig/index.vue
index 5564d8ac..5cfdbea5 100644
--- a/src/views/link/AccessConfig/index.vue
+++ b/src/views/link/AccessConfig/index.vue
@@ -186,6 +186,7 @@ const tableRef = ref>({});
const params = ref>({});
let providersList = ref>([]);
+const providersOptions = ref>([]);
const statusMap = new Map();
statusMap.set('enabled', 'success');
@@ -207,13 +208,7 @@ const columns = [
key: 'provider',
search: {
type: 'select',
- options: async () => {
- const res: any = await getProviders();
- return (res?.result || [])?.map((item: any) => ({
- lable: item.name,
- value: item.id,
- }));
- },
+ options: providersOptions,
},
},
{
@@ -315,6 +310,10 @@ const getActions = (data: Partial>): ActionsType[] => {
const getProvidersList = async () => {
const res: any = await getProviders();
providersList.value = res.result;
+ providersOptions.value = (res?.result || [])?.map((item: any) => ({
+ label: item.name,
+ value: item.id,
+ }));
};
getProvidersList();
diff --git a/src/views/link/Certificate/Detail/CertificateFile.vue b/src/views/link/Certificate/Detail/CertificateFile.vue
index 275342ed..4ee0b529 100644
--- a/src/views/link/Certificate/Detail/CertificateFile.vue
+++ b/src/views/link/Certificate/Detail/CertificateFile.vue
@@ -54,12 +54,17 @@ const loading = ref(false);
const handleChange = (info: UploadChangeParam) => {
loading.value = true;
if (info.file.status === 'done') {
- onlyMessage('上传成功！', 'success');
const result = info.file.response?.result;
- keystoreBase64.value = result;
+ const reg = new RegExp(/\.pem$/i);
+ if (reg.test(info.file.name)) {
+ keystoreBase64.value = result;
+ emit('change', result);
+ emit('update:modelValue', result);
+ onlyMessage('上传成功！', 'success');
+ } else {
+ onlyMessage('请上传.pem格式的文件', 'error');
+ }
loading.value = false;
- emit('change', result);
- emit('update:modelValue', result);
}
};
const textChange = (val: any) => {
diff --git a/src/views/link/Certificate/Detail/index.vue b/src/views/link/Certificate/Detail/index.vue
index bc49e208..e6d5aa16 100644
--- a/src/views/link/Certificate/Detail/index.vue
+++ b/src/views/link/Certificate/Detail/index.vue
@@ -9,7 +9,7 @@
:model="formData"
name="basic"
:label-col="{ span: 8 }"
- :wrapper-col="{ span: 16 }"
+ :wrapper-col="{ span: 24 }"
autocomplete="off"
>
2. 配置说明
1、证书文件
- 您可以使用文本编辑工具打开PEM或者CRT格式的证书文件，复制其中的内容并粘贴到该文本框，或者单击该文本框下的上传，并选择存储在本地计算机的证书文件，将文件内容上传到文本框。
+ 您可以使用文本编辑工具打开PEM格式的证书文件，复制其中的内容并粘贴到该文本框，或者单击该文本框下的上传，并选择存储在本地计算机的证书文件，将文件内容上传到文本框。
2、证书私钥
@@ -208,31 +208,4 @@ detail(id);
}
}
}
-
-.doc {
- height: 100%;
- padding: 0 24px;
- overflow-y: auto;
- color: rgba(#000, 0.8);
- font-size: 14px;
- background-color: #fff;
-
- h1 {
- margin: 16px 0;
- color: rgba(#000, 0.85);
- font-weight: bold;
- font-size: 14px;
-
- &:first-child {
- margin-top: 0;
- }
- }
-
- h2 {
- margin: 6px 10px;
- color: rgba(0, 0, 0, 0.8);
- font-weight: 400;
- font-size: 14px;
- }
-}
diff --git a/src/views/link/Certificate/index.vue b/src/views/link/Certificate/index.vue
index 9023a06f..43d90035 100644
--- a/src/views/link/Certificate/index.vue
+++ b/src/views/link/Certificate/index.vue
@@ -76,14 +76,17 @@ const columns = [
width: 200,
ellipsis: true,
search: {
- type: 'select',
- options: [
- {
- label: '证书标准',
- value: 'common',
- },
- ],
+ type: 'string',
},
+ // search: {
+ // type: 'select',
+ // options: [
+ // {
+ // label: '证书标准',
+ // value: 'common',
+ // },
+ // ],
+ // },
scopedSlots: true,
},
{
@@ -118,17 +121,17 @@ const getActions = (data: Partial>): ActionsType[] => {
return [];
}
return [
- {
- key: 'view',
- text: '查看',
- tooltip: {
- title: '查看',
- },
- icon: 'EyeOutlined',
- onClick: async () => {
- handlEye(data.id);
- },
- },
+ // {
+ // key: 'view',
+ // text: '查看',
+ // tooltip: {
+ // title: '查看',
+ // },
+ // icon: 'EyeOutlined',
+ // onClick: async () => {
+ // handlEye(data.id);
+ // },
+ // },
{
key: 'update',
text: '编辑',
@@ -143,6 +146,9 @@ const getActions = (data: Partial>): ActionsType[] => {
{
key: 'delete',
text: '删除',
+ tooltip: {
+ title: '删除',
+ },
popConfirm: {
title: '确认删除?',
okText: ' 确定',
diff --git a/src/views/link/Type/Detail/index.vue b/src/views/link/Type/Detail/index.vue
index 5457b433..d1887f34 100644
--- a/src/views/link/Type/Detail/index.vue
+++ b/src/views/link/Type/Detail/index.vue
@@ -91,17 +91,41 @@
>
+
+
+ ();
const loading = ref(false);
const options = ref([]);
const checked = ref(false);
-const regDomain =
- /[j-zA-Z0-9][-j-zA-Z0-9]{0,62}(\.[j-zA-Z0-9][-j-zA-Z0-9]{0,62})+\.?/;
+
+const Validator = {
+ regIpv4: new RegExp(
+ /^((([01]?[0-9]{1,2})|(2[0-4][0-9])|(25[0-5]))\.){3}(([01]?[0-9]{1,2})|(2[0-4][0-9])|(25[0-5]))$/,
+ ),
+ regIPv6: new RegExp(/^([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$/),
+ regDomain: new RegExp(
+ /^https?:\/\/(([a-zA-Z0-9_-])+(\.)?)*(:\d+)?(\/((\.)?(\?)?=?&?[a-zA-Z0-9_-](\?)?)*)*$/i,
+ ),
+ regOnlyNumber: new RegExp(/^\d+$/),
+};
const formData = ref({
name: '',
diff --git a/src/views/rule-engine/Instance/index.vue b/src/views/rule-engine/Instance/index.vue
index 1a8a5c46..ffa3b192 100644
--- a/src/views/rule-engine/Instance/index.vue
+++ b/src/views/rule-engine/Instance/index.vue
@@ -38,7 +38,7 @@
:statusText="slotProps.state?.text"
@click="openRuleEditor"
:statusNames="{
- started: 'success',
+ started: 'processing',
disable: 'error',
}"
>
@@ -88,17 +88,17 @@
- 定时调用所选功能
+
@@ -66,9 +71,9 @@ const props = defineProps({
const emit = defineEmits()
const invokeForm = ref()
const formModel = reactive({
- functionId: props.functionId
+ functionId: props.functionId,
+ functionData: props.functionParameters
})
-const _value = ref(props.functionParameters)
/**
* 获取当前选择功能属性
@@ -94,13 +99,29 @@ const functionData = computed(() => {
return arrCache
})
+const rules = [{
+ validator(_: string, value: any) {
+ if (!value?.length && functionData.value.length) {
+ return Promise.reject('请输入功能值')
+ } else {
+ let hasValue = value.find((item: { name: string, value: any}) => !item.value)
+ if (hasValue) {
+ const functionItem = functionData.value.find((item: any) => item.id === hasValue.name)
+ return Promise.reject(functionItem?.name ? `请输入${functionItem?.name}值` : '请输入功能值')
+ }
+ }
+ return Promise.resolve();
+ }
+}]
+
const onSelect = (v: string, item: any) => {
+ formModel.functionData = []
emit('update:action', `执行${item.name}`)
emit('update:functionId', v)
+ emit('update:functionParameters', [])
}
const callDataChange = (v: any[]) => {
- _value.value = v
emit('update:functionParameters', v)
}
diff --git a/src/views/rule-engine/Scene/Save/Device/Product.vue b/src/views/rule-engine/Scene/Save/Device/Product.vue
index 73c2a386..b8b42a27 100644
--- a/src/views/rule-engine/Scene/Save/Device/Product.vue
+++ b/src/views/rule-engine/Scene/Save/Device/Product.vue
@@ -3,7 +3,7 @@
:columns="columns"
type='simple'
@search="handleSearch"
- class='search'
+ class="scene-search"
target="scene-triggrt-device-device"
/>
+ {{
+ cluster.serverId
+ ? cluster.serverId
+ : !formData.shareCluster
+ ? `#${index + 1}.配置信息`
+ : ''
+ }}
+
+
+
-
\ No newline at end of file
diff --git a/src/views/rule-engine/Scene/Save/Timer/AddModal.vue b/src/views/rule-engine/Scene/Save/Timer/AddModal.vue
index db8b21a9..82631c0f 100644
--- a/src/views/rule-engine/Scene/Save/Timer/AddModal.vue
+++ b/src/views/rule-engine/Scene/Save/Timer/AddModal.vue
@@ -3,7 +3,7 @@
title='触发规则'
visible
:width='820'
- @click='save'
+ @ok='save'
@cancel='cancel'
>
import Timer from '../components/Timer'
import type { OperationTimer } from '@/views/rule-engine/Scene/typings'
-import {nextTick, PropType} from "vue";
-import {TriggerDevice} from "@/views/rule-engine/Scene/typings";
+import { PropType} from "vue";
import {handleTimerOptions} from "@/views/rule-engine/Scene/Save/components/Timer/util";
type Emit = {
(e: 'cancel'): void
- (e: 'save', data: TriggerDevice, options: Record): void
+ (e: 'save', data: OperationTimer, options: Record): void
}
const props = defineProps({
- timer: {
+ value: {
type: Object as PropType,
default: () => ({})
}
@@ -39,14 +38,14 @@ interface AddModelType {
}
const addModel = reactive({
- timer: props.timer
+ timer: props.value
})
const save = async () => {
const timerData = await timerRef.value?.validateFields()
if (timerData) {
- const options = handleTimerOptions(timerData)
- emit("save", timerData, options)
+ const options = handleTimerOptions(addModel.timer)
+ emit("save", addModel.timer, options)
}
}
@@ -54,9 +53,9 @@ const cancel = () => {
emit("cancel")
}
-nextTick(() => {
- Object.assign(addModel, props.timer)
-})
+// watchEffect(() => {
+// addModel.timer = props.value
+// })
diff --git a/src/views/rule-engine/Scene/Save/Timer/Title.vue b/src/views/rule-engine/Scene/Save/Timer/Title.vue
new file mode 100644
index 00000000..b37d035c
--- /dev/null
+++ b/src/views/rule-engine/Scene/Save/Timer/Title.vue
@@ -0,0 +1,58 @@
+
+
@@ -41,6 +40,7 @@ import { storeToRefs } from 'pinia';
import Action from '../action/index.vue';
import AddModel from './AddModal.vue'
import AddButton from '../components/AddButton.vue'
+import Title from './Title.vue'
import type { OperationTimer, BranchesThen } from '@/views/rule-engine/Scene/typings'
const sceneStore = useSceneStore();
@@ -49,6 +49,7 @@ const visible = ref(false)
const rules = [{
validator(_: any, v: any) {
+ console.log(v)
if (!v) {
return Promise.reject(new Error('请配置定时触发规则'));
}
@@ -85,5 +86,21 @@ const save = (_data: OperationTimer, options: Record) => {
}
-
\ No newline at end of file
diff --git a/src/views/rule-engine/Scene/Save/action/Device/Product.vue b/src/views/rule-engine/Scene/Save/action/Device/Product.vue
index a487395f..a59386ad 100644
--- a/src/views/rule-engine/Scene/Save/action/Device/Product.vue
+++ b/src/views/rule-engine/Scene/Save/action/Device/Product.vue
@@ -3,7 +3,7 @@
:columns="columns"
type="simple"
@search="handleSearch"
- class="search"
+ class="scene-search"
target="scene-trigger-device-product"
/>
{
+ modelRef.message.inputs = []
+}
+
+const functionRules = [{
+ validator(_: string, value: any) {
+ if (!value?.length && functions.value.length) {
+ return Promise.reject('请输入功能值')
+ } else {
+ const hasValue = value.find((item: { name: string, value: any}) => !item.value)
+ if (hasValue) {
+ const functionItem = functions.value.find((item: any) => item.id === hasValue.name)
+ return Promise.reject(functionItem?.name ? `请输入${functionItem.name}值` : '请输入功能值')
+ }
+ }
+ return Promise.resolve();
+ }
+}]
+
const metadata = ref<{
functions: any[];
properties: any[];
diff --git a/src/views/rule-engine/Scene/Save/action/Device/device/Device.vue b/src/views/rule-engine/Scene/Save/action/Device/device/Device.vue
index b5d35ad2..d3a07b0e 100644
--- a/src/views/rule-engine/Scene/Save/action/Device/device/Device.vue
+++ b/src/views/rule-engine/Scene/Save/action/Device/device/Device.vue
@@ -3,7 +3,7 @@
:columns="columns"
type="simple"
@search="handleSearch"
- class="search"
+ class="scene-search"
target="scene-trigger-device-device"
/>
):void
+ (e: 'change', data: Array):void
}
const props = defineProps({
@@ -48,6 +49,7 @@ const change = (number: number) => {
}
rowKeys.value = [..._keys.values()]
emit('update:value', rowKeys.value)
+ emit('change', rowKeys.value)
}
const allActive = computed(() => {
@@ -57,7 +59,9 @@ const allActive = computed(() => {
watch(() => props.type, () => {
const isMonth = props.type === 'month'
const day = isMonth ? 31 : 7
- change(0)
+ if (!props.value.length) {
+ change(0)
+ }
timeOptions.value = new Array(day)
.fill(1)
.map((_, index) => {
diff --git a/src/views/rule-engine/Scene/Save/components/Timer/index.vue b/src/views/rule-engine/Scene/Save/components/Timer/index.vue
index 84eb7e26..7b902b18 100644
--- a/src/views/rule-engine/Scene/Save/components/Timer/index.vue
+++ b/src/views/rule-engine/Scene/Save/components/Timer/index.vue
@@ -15,6 +15,7 @@
]'
option-type='button'
button-style='solid'
+ @change='updateValue'
/>
-
-
-
执行一次
@@ -68,6 +75,7 @@
@change='(v) => {
formModel.period.from = v[0]
formModel.period.to = v[1]
+ updateValue()
}'
/>
@@ -83,6 +91,7 @@
:min='1'
:max='59'
v-model:value='formModel.period.every'
+ @change='updateValue'
>
{
+
+ const newParams = (params?.terms as any[])?.map(item1 => {
+ item1.terms = item1.terms.map((item2: any) => {
+ if (['telephone', 'email'].includes(item2.column)) {
+ return {
+ column: 'id$user-detail',
+ value: [item2]
+ }
+ }
+ return item2
+ })
+ return item1
+ })
+ queryParams.value = { terms: newParams || [] }
+}
+ 点击配置定时触发
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/rule-engine/Scene/Save/Timer/index.vue b/src/views/rule-engine/Scene/Save/Timer/index.vue
index 6d750bb6..81d29554 100644
--- a/src/views/rule-engine/Scene/Save/Timer/index.vue
+++ b/src/views/rule-engine/Scene/Save/Timer/index.vue
@@ -2,7 +2,7 @@
+
+
+ {{ options.when }}
+
+
+ {{ options.time }}
+
+
+ {{ options.extraTime }}
+
+
+