diff --git a/public/images/network/01.jpg b/public/images/network/01.jpg deleted file mode 100644 index 950b64d7..00000000 Binary files a/public/images/network/01.jpg and /dev/null differ diff --git a/public/images/network/01.png b/public/images/network/01.png new file mode 100644 index 00000000..9ec5cdc8 Binary files /dev/null and b/public/images/network/01.png differ diff --git a/public/images/network/02.jpg b/public/images/network/02.jpg index 745ccacc..950b64d7 100644 Binary files a/public/images/network/02.jpg and b/public/images/network/02.jpg differ diff --git a/public/images/network/03.png b/public/images/network/03.png new file mode 100644 index 00000000..a9e8e8d3 Binary files /dev/null and b/public/images/network/03.png differ diff --git a/public/images/network/03.jpg b/public/images/network/04.jpg similarity index 100% rename from public/images/network/03.jpg rename to public/images/network/04.jpg diff --git a/public/images/network/05.jpg b/public/images/network/05.jpg new file mode 100644 index 00000000..e15d4962 Binary files /dev/null and b/public/images/network/05.jpg differ diff --git a/public/images/network/06.jpg b/public/images/network/06.jpg new file mode 100644 index 00000000..e5a2f45a Binary files /dev/null and b/public/images/network/06.jpg differ diff --git a/src/api/notice/config.ts b/src/api/notice/config.ts index d6e29cc5..ccdebc7c 100644 --- a/src/api/notice/config.ts +++ b/src/api/notice/config.ts @@ -1,4 +1,5 @@ import { patch, post, get, remove } from '@/utils/request' +import { TemplateFormData } from '@/views/notice/Template/types' export default { // 列表 @@ -10,8 +11,8 @@ export default { // 修改 update: (data: any) => patch(`/notifier/config`, data), del: (id: string) => remove(`/notifier/config/${id}`), - getTemplate: (data: any, id: string) => post(`/notifier/template/${id}/_query`, data), - getTemplateDetail: (id: string) => get(`/notifier/template/${id}/detail`), + getTemplate: (data: any, id: string) => post(`/notifier/template/${id}/_query`, data), + getTemplateDetail: (id: string) => get(`/notifier/template/${id}/detail`), debug: (data: any, configId: string, templateId: string) => post(`/notifier/${configId}/${templateId}/_send`, data), getHistory: (data: any, id: string) => post(`/notify/history/config/${id}/_query`, data), // 获取所有平台用户 diff --git a/src/api/notice/template.ts b/src/api/notice/template.ts index 7281501f..45c90010 100644 --- a/src/api/notice/template.ts +++ b/src/api/notice/template.ts @@ -16,12 +16,12 @@ export default { debug: (data: any, configId: string, templateId: string) => post(`/notifier/${configId}/${templateId}/_send`, data), getHistory: (data: any, id: string) => post(`/notify/history/template/${id}/_query`, data), // 钉钉/微信, 根据配置获取部门和用户 - getDept: (type: string, id: string) => get(`/notifier/${type}/corp/${id}/departments`), - getUser: (type: string, id: string) => get(`/notifier/${type}/corp/${id}/users`), + getDept: (type: string, id: string) => get(`/notifier/${type}/corp/${id}/departments`), + getUser: (type: string, id: string) => get(`/notifier/${type}/corp/${id}/users`), // 微信获取标签推送 - getTags: (id: string) => get(`/notifier/wechat/corp/${id}/tags`), + getTags: (id: string) => get(`/notifier/wechat/corp/${id}/tags`), // 语音/短信获取阿里云模板 - getAliTemplate: (id: string) => get(`/notifier/sms/aliyun/${id}/templates`), + getAliTemplate: (id: any) => get(`/notifier/sms/aliyun/${id}/templates`), // 短信获取签名 - getSigns: (id: string) => get(`/notifier/sms/aliyun/${id}/signs`) + getSigns: (id: any) => get(`/notifier/sms/aliyun/${id}/signs`) } \ No newline at end of file diff --git a/src/components/AIcon/index.tsx b/src/components/AIcon/index.tsx index 470b1380..152420a0 100644 --- a/src/components/AIcon/index.tsx +++ b/src/components/AIcon/index.tsx @@ -32,7 +32,12 @@ const iconKeys = [ 'DisconnectOutlined', 'LinkOutlined', 'PoweroffOutlined', - 'SwapOutlined' + 'SwapOutlined', + 'BugOutlined', + 'BarsOutlined', + 'ArrowDownOutlined', + 'SmallDashOutlined', + 'TeamOutlined', ] const Icon = (props: {type: string}) => { diff --git a/src/components/ValueItem/index.vue b/src/components/ValueItem/index.vue index 7a01b89e..3e7528ae 100644 --- a/src/components/ValueItem/index.vue +++ b/src/components/ValueItem/index.vue @@ -109,7 +109,7 @@ const props = defineProps({ // 组件类型 itemType: { type: String, - default: () => 'geoPoint', + default: () => 'string', }, // 下拉选择框下拉数据 options: { diff --git a/src/utils/utils.ts b/src/utils/utils.ts index 30e21216..239ee90f 100644 --- a/src/utils/utils.ts +++ b/src/utils/utils.ts @@ -55,4 +55,21 @@ export const downloadObject = (record: Record, fileName: string, fo document.body.removeChild(formElement); }; // 是否不是community版本 -export const isNoCommunity = !(localStorage.getItem(SystemConst.VERSION_CODE) === 'community'); \ No newline at end of file +export const isNoCommunity = !(localStorage.getItem(SystemConst.VERSION_CODE) === 'community'); + + +/** + * 生成随机数 + * @param length + * @returns + */ +export const randomString = (length?: number) => { + const tempLength = length || 32; + const chars = 'ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678'; + const maxPos = chars.length; + let pwd = ''; + for (let i = 0; i < tempLength; i += 1) { + pwd += chars.charAt(Math.floor(Math.random() * maxPos)); + } + return pwd; +}; diff --git a/src/views/link/AccessConfig/Detail/index.vue b/src/views/link/AccessConfig/Detail/index.vue index e8c820a4..f84b13fb 100644 --- a/src/views/link/AccessConfig/Detail/index.vue +++ b/src/views/link/AccessConfig/Detail/index.vue @@ -16,6 +16,12 @@ /> + + @@ -28,6 +34,8 @@ import Provider from '../components/Provider/index.vue'; import { getProviders, detail } from '@/api/link/accessConfig'; import Media from '../components/Media/index.vue'; import Channel from '../components/Channel/index.vue'; +import Edge from '../components/Edge/index.vue'; +import Cloud from '../components/Cloud/index.vue'; // const router = useRouter(); const route = useRoute(); diff --git a/src/views/link/AccessConfig/components/Channel/index.vue b/src/views/link/AccessConfig/components/Channel/index.vue index 658c940d..15b30253 100644 --- a/src/views/link/AccessConfig/components/Channel/index.vue +++ b/src/views/link/AccessConfig/components/Channel/index.vue @@ -82,10 +82,11 @@ - + + diff --git a/src/views/link/AccessConfig/components/Cloud/OneNet.vue b/src/views/link/AccessConfig/components/Cloud/OneNet.vue new file mode 100644 index 00000000..79f91f71 --- /dev/null +++ b/src/views/link/AccessConfig/components/Cloud/OneNet.vue @@ -0,0 +1,736 @@ + + + + + diff --git a/src/views/link/AccessConfig/components/Cloud/index.vue b/src/views/link/AccessConfig/components/Cloud/index.vue new file mode 100644 index 00000000..dfa6dc39 --- /dev/null +++ b/src/views/link/AccessConfig/components/Cloud/index.vue @@ -0,0 +1,37 @@ + + + + + diff --git a/src/views/link/AccessConfig/components/Edge/index.vue b/src/views/link/AccessConfig/components/Edge/index.vue new file mode 100644 index 00000000..6798e357 --- /dev/null +++ b/src/views/link/AccessConfig/components/Edge/index.vue @@ -0,0 +1,492 @@ + + + + + diff --git a/src/views/link/AccessConfig/components/Media/GB28181.vue b/src/views/link/AccessConfig/components/Media/GB28181.vue index 239486ec..77540348 100644 --- a/src/views/link/AccessConfig/components/Media/GB28181.vue +++ b/src/views/link/AccessConfig/components/Media/GB28181.vue @@ -6,7 +6,7 @@
- + 配置设备信令参数
@@ -511,7 +511,12 @@ import { message, Form } from 'ant-design-vue'; import type { FormInstance } from 'ant-design-vue'; import { getResourcesCurrent, getClusters } from '@/api/link/accessConfig'; -import { DeleteOutlined, PlusOutlined } from '@ant-design/icons-vue'; +import { + DeleteOutlined, + PlusOutlined, + QuestionCircleOutlined, + InfoCircleOutlined, +} from '@ant-design/icons-vue'; import { update, save } from '@/api/link/accessConfig'; interface Form2 { diff --git a/src/views/link/AccessConfig/components/Network.vue b/src/views/link/AccessConfig/components/Network.vue index edd2c5c1..04bebf34 100644 --- a/src/views/link/AccessConfig/components/Network.vue +++ b/src/views/link/AccessConfig/components/Network.vue @@ -6,7 +6,7 @@
- + 选择与设备通信的网络组件
@@ -93,7 +93,7 @@
- + 使用选择的消息协议，对网络组件通信数据进行编解码、认证等操作
@@ -326,7 +326,7 @@ import AccessCard from './AccessCard/index.vue'; import { message, Form } from 'ant-design-vue'; import type { FormInstance, TableColumnType } from 'ant-design-vue'; import Markdown from 'vue3-markdown-it'; -import { QuestionCircleOutlined } from '@ant-design/icons-vue'; +import { InfoCircleOutlined } from '@ant-design/icons-vue'; //测试数据1 const resultList1 = [ { diff --git a/src/views/notice/Config/Debug/index.vue b/src/views/notice/Config/Debug/index.vue new file mode 100644 index 00000000..4da9e494 --- /dev/null +++ b/src/views/notice/Config/Debug/index.vue @@ -0,0 +1,201 @@ + + + + + diff --git a/src/views/notice/Config/Log/index.vue b/src/views/notice/Config/Log/index.vue new file mode 100644 index 00000000..a3e86cd8 --- /dev/null +++ b/src/views/notice/Config/Log/index.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/views/notice/Config/SyncUser/index.vue b/src/views/notice/Config/SyncUser/index.vue new file mode 100644 index 00000000..a3e86cd8 --- /dev/null +++ b/src/views/notice/Config/SyncUser/index.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/views/notice/Config/index.vue b/src/views/notice/Config/index.vue index 691b1c42..e901e2ca 100644 --- a/src/views/notice/Config/index.vue +++ b/src/views/notice/Config/index.vue @@ -1,22 +1,371 @@ - - +/** + * 根据通知方式展示对应logo + */ +const getLogo = (type: string, provider: string) => { + return MSG_TYPE[type].find((f: any) => f.value === provider)?.logo; +}; +/** + * 通知方式字段展示对应文字 + */ +const getMethodTxt = (type: string) => { + return NOTICE_METHOD.find((f) => f.value === type)?.label; +}; + +/** + * 新增 + */ +const handleAdd = () => { + router.push(`/notice/Config/detail/:id`); +}; + +/** + * 导入 + */ +const beforeUpload = () => {}; + +/** + * 导出 + */ +const handleExport = () => {}; + +/** + * 查看 + */ +const handleView = (id: string) => { + message.warn(id + '暂未开发'); +}; + +const syncVis = ref(false); +const debugVis = ref(false); +const logVis = ref(false); +const currentConfig = ref>>(); +const getActions = ( + data: Partial>, + type: 'card' | 'table', +): ActionsType[] => { + if (!data) return []; + const actions = [ + { + key: 'edit', + text: '编辑', + tooltip: { + title: '编辑', + }, + icon: 'EditOutlined', + onClick: () => { + // visible.value = true; + // current.value = data; + router.push(`/notice/Config/detail/${data.id}`); + }, + }, + { + key: 'debug', + text: '调试', + tooltip: { + title: '调试', + }, + icon: 'BugOutlined', + onClick: () => { + debugVis.value = true; + currentConfig.value = data; + }, + }, + { + key: 'debug', + text: '通知记录', + tooltip: { + title: '通知记录', + }, + icon: 'BarsOutlined', + onClick: () => { + logVis.value = true; + currentConfig.value = data; + }, + }, + { + key: 'debug', + text: '导出', + tooltip: { + title: '导出', + }, + icon: 'ArrowDownOutlined', + onClick: () => { + // debugVis.value = true; + }, + }, + { + key: 'delete', + text: '删除', + // disabled: data.state.value !== 'notActive', + // tooltip: { + // title: + // data.state.value !== 'notActive' + // ? '已启用的设备不能删除' + // : '删除', + // }, + popConfirm: { + title: '确认删除?', + onConfirm: async () => { + const resp = await configApi.del(data.id); + if (resp.status === 200) { + message.success('操作成功！'); + // instanceRef.value?.reload(); + } else { + message.error('操作失败！'); + } + }, + }, + icon: 'DeleteOutlined', + }, + ]; + if (type === 'card') + return actions.filter((i: ActionsType) => i.key !== 'view'); + return actions; +}; + + diff --git a/src/views/notice/Template/Detail/components/ToOrg.vue b/src/views/notice/Template/Detail/components/ToOrg.vue new file mode 100644 index 00000000..103c40bf --- /dev/null +++ b/src/views/notice/Template/Detail/components/ToOrg.vue @@ -0,0 +1,46 @@ + + + + + diff --git a/src/views/notice/Template/Detail/components/ToTag.vue b/src/views/notice/Template/Detail/components/ToTag.vue new file mode 100644 index 00000000..28f469b7 --- /dev/null +++ b/src/views/notice/Template/Detail/components/ToTag.vue @@ -0,0 +1,46 @@ + + + + + diff --git a/src/views/notice/Template/Detail/components/ToUser.vue b/src/views/notice/Template/Detail/components/ToUser.vue new file mode 100644 index 00000000..21bd9aa2 --- /dev/null +++ b/src/views/notice/Template/Detail/components/ToUser.vue @@ -0,0 +1,46 @@ + + + + + diff --git a/src/views/notice/Template/Detail/index.vue b/src/views/notice/Template/Detail/index.vue index 4db6e5ec..82ce27eb 100644 --- a/src/views/notice/Template/Detail/index.vue +++ b/src/views/notice/Template/Detail/index.vue @@ -50,6 +50,7 @@ - - - {{ item.label }} - - + :type="formData.type" + :config-id="formData.configId" + /> - - - {{ item.label }} - - + :type="formData.type" + :config-id="formData.configId" + /> - - - {{ item.label }} - - + @@ -325,11 +301,11 @@ /> - {{ item.label }} + {{ item.templateName }} @@ -377,10 +353,18 @@ label="签名" v-bind="validateInfos['template.signName']" > - + placeholder="请选择签名" + > + + {{ item.signName }} + + @@ -416,7 +400,8 @@ label="模版内容" v-if=" formData.type !== 'sms' && - formData.type !== 'webhook' + formData.type !== 'webhook' && + formData.type !== 'voice' " > { }; getConfigList(); +/** + * 配置选择改变 + */ +const handleConfigChange = () => { + getTemplateList(); + getSignsList(); +}; + +/** + * 获取阿里模板 + */ +const templateList = ref(); +const getTemplateList = async () => { + const { result } = await templateApi.getAliTemplate( + formData.value.configId, + ); + templateList.value = result; +}; +getTemplateList(); + +/** + * 获取签名 + */ +const signsList = ref(); +const getSignsList = async () => { + const { result } = await templateApi.getSigns(formData.value.configId); + signsList.value = result; +}; +getSignsList(); + /** * 表单提交 */ @@ -638,6 +656,8 @@ const handleSubmit = () => { validate() .then(async () => { // console.log('formData.value: ', formData.value); + formData.value.template.ttsCode = + formData.value.template.templateCode; btnLoading.value = true; let res; if (!formData.value.id) { diff --git a/src/views/notice/Template/types.d.ts b/src/views/notice/Template/types.d.ts index 160924a2..54aad7ff 100644 --- a/src/views/notice/Template/types.d.ts +++ b/src/views/notice/Template/types.d.ts @@ -14,6 +14,7 @@ interface IVariableDefinitions { name: string; type: string; format: string; + value?: string; } interface IMarkDown {