+
+ {headerDom.value}
+
+ {slots.default?.()}
+
+
+
+ )
+ }
+ }
+})
+
+
+
+
diff --git a/src/components/Layout/PageContainer.tsx b/src/components/Layout/PageContainer.tsx
new file mode 100644
index 00000000..e69de29b
diff --git a/src/components/Layout/RouteContext.tsx b/src/components/Layout/RouteContext.tsx
new file mode 100644
index 00000000..78f995b4
--- /dev/null
+++ b/src/components/Layout/RouteContext.tsx
@@ -0,0 +1,45 @@
+import type { ComputedRef, VNodeChild, InjectionKey } from 'vue'
+import type { PureSettings } from 'components/Layout/defaultSetting'
+import type { MenuDataItem } from 'components/Layout/typings'
+import { useContext } from 'components/Layout/hooks/context'
+
+export interface Route {
+ path: string;
+ breadcrumbName: string;
+ children?: Omit
+
+ )
+ }
+})
\ No newline at end of file
diff --git a/src/components/Layout/components/Header/index.less b/src/components/Layout/components/Header/index.less
new file mode 100644
index 00000000..54a179ba
--- /dev/null
+++ b/src/components/Layout/components/Header/index.less
@@ -0,0 +1,59 @@
+.header-content {
+
+ &.light {
+ background-color: #fff;
+ }
+
+ &.dark {
+ .header-logo {
+ >a {
+ > h1 {
+ color: #fff !important;
+ }
+ }
+ }
+ }
+
+ .header-main {
+ padding-left: 16px;
+ display: flex;
+ height: 100%;
+
+ .header-main-left {
+ display: flex;
+ min-width: 192px;
+
+ .header-logo {
+ height: 100%;
+ position: relative;
+ display: flex;
+ justify-content: center;
+ min-width: 165px;
+ overflow: hidden;
+
+ > a {
+ color: @primary-color;
+ text-decoration: none;
+ background-color: transparent;
+ outline: none;
+ cursor: pointer;
+ transition: color .3s;
+
+ > h1 {
+ vertical-align: top;
+ display: inline-block;
+ margin: 0 0 0 12px;
+ font-size: 16px;
+ color: rgba(0,0,0,.85);
+ }
+ }
+
+ img {
+ display: inline-block;
+ height: 32px;
+ vertical-align: middle;
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/components/Layout/components/Header/index.tsx b/src/components/Layout/components/Header/index.tsx
new file mode 100644
index 00000000..12534a81
--- /dev/null
+++ b/src/components/Layout/components/Header/index.tsx
@@ -0,0 +1,51 @@
+import type { ExtractPropTypes, PropType } from 'vue'
+import PropTypes from 'ant-design-vue/es/_util/vue-types';
+import type { MenuDataItem, WithFalse, ProProps, CustomRender, RightContentRender } from '../../typings'
+import { siderMenuProps } from '../SiderMenu/SiderMenu'
+import { defaultSettingProps } from 'components/Layout/defaultSetting'
+import Header, { headerProps } from './Header'
+import { useRouteContext } from 'components/Layout/RouteContext'
+import type { RouteRecordRaw } from 'vue-router'
+import { clearMenuItem } from 'components/Layout/utils'
+import DefaultSetting from '../../../../../config/config'
+import { Layout } from 'ant-design-vue'
+
+export const headerViewProps = {
+ ...headerProps
+}
+
+export type HeaderViewProps = Partial
+
+
+
+
+
+
+ {
+ rightSize.value = width
+ }}
+ >
+ {
+ rightContentRender && typeof rightContentRender === 'function' ? (
+
+
+ {rightContentRender({...props})}
+ ) : rightContentRender
+ }
+
+ {collapsedButtonRender !== false ? (
+
+ ) : null}
+
+
+
@@ -105,27 +109,40 @@
import { FormInstance, message } from 'ant-design-vue';
import { DeleteOutlined, PlusOutlined } from '@ant-design/icons-vue';
import { QuestionCircleOutlined } from '@ant-design/icons-vue';
+import { Rule } from 'ant-design-vue/es/form';
+
+import {
+ checkId_api,
+ editPermission_api,
+ addPermission_api,
+} from '@/api/system/permission';
const defaultAction = [
{ action: 'query', name: '查询', describe: '查询' },
{ action: 'save', name: '保存', describe: '保存' },
{ action: 'delete', name: '删除', describe: '删除' },
];
+const emits = defineEmits(['refresh']);
// 弹窗相关
const dialog = reactive({
title: '',
visible: false,
handleOk: () => {
- formRef.value?.validate().then(() => console.log('success'));
+ formRef.value?.validate().then(() => {
+ form.submit();
+ });
},
// 控制弹窗的打开与关闭
changeVisible: (status: boolean, defaultForm: any = {}) => {
- form.data = { name: '', description: '', ...defaultForm };
dialog.title = defaultForm.id ? '编辑' : '新增';
+ form.data = { name: '', ...defaultForm };
table.data = defaultForm.id ? defaultForm.actions : [...defaultAction];
pager.total = table.data.length;
pager.current = 1;
dialog.visible = status;
+ nextTick(() => {
+ formRef.value?.clearValidate();
+ });
},
});
// 表单相关
@@ -136,6 +153,46 @@ const form = reactive({
name: '',
id: '',
},
+ rules: {
+ // 校验标识是否可用
+ idCheck: (_rule: Rule, id: string, cb: Function) => {
+ if (!id) return cb('请输入标识(ID)');
+ if (dialog.title === '编辑') return cb();
+ checkId_api({ id })
+ .then((resp: any) => {
+ if (resp.status === 200 && !resp.result.passed)
+ cb(resp.result.reason);
+ else cb();
+ })
+ .catch(() => cb('验证失败'));
+
+ // return new Promise((resolve) => {
+ // checkId_api({ id })
+ // .then((resp: any) => {
+ // if (resp.status === 200 && !resp.result.passed)
+ // resolve(resp.result.reason);
+ // else resolve('');
+ // })
+ // .catch(() => resolve('验证失败'));
+ // });
+ },
+ },
+ submit: () => {
+ const params = {
+ ...form.data,
+ actions: table.data.filter((item: any) => item.action && item.name),
+ };
+ const api =
+ dialog.title === '编辑' ? editPermission_api : addPermission_api;
+
+ api(params).then((resp) => {
+ if (resp.status === 200) {
+ message.error('操作成功');
+ emits('refresh');
+ dialog.visible = false;
+ }
+ });
+ },
});
const table = reactive({
@@ -144,21 +201,26 @@ const table = reactive({
title: '-',
dataIndex: 'index',
key: 'index',
+ width:80,
+ align:'center'
},
{
title: '操作类型',
dataIndex: 'action',
key: 'action',
+ width: 220
},
{
title: '名称',
dataIndex: 'name',
key: 'name',
+ width: 220
},
{
title: '说明',
dataIndex: 'describe',
key: 'describe',
+ width: 220
},
{
title: '操作',
@@ -230,5 +292,30 @@ defineExpose({
}
}
}
+
+ .ant-table {
+ color: #ff4d4f;
+
+ .ant-table-tbody {
+ color: #ff4d4f;
+ }
+ }
+ .delete-btn {
+ color: #000000d9;
+ &:hover{
+ color: #415ed1;
+ }
+ }
+ .pager {
+ display: flex;
+ justify-content: center;
+ margin-bottom: 12px;
+ .ant-pagination {
+ margin-left: 8px;
+ :deep(.ant-pagination-item) {
+ display: none;
+ }
+ }
+ }
}
diff --git a/src/views/system/Permission/index.vue b/src/views/system/Permission/index.vue
index ec763acd..baa12918 100644
--- a/src/views/system/Permission/index.vue
+++ b/src/views/system/Permission/index.vue
@@ -1,6 +1,6 @@
@@ -89,7 +89,7 @@ import {
StopOutlined,
PlayCircleOutlined,
} from '@ant-design/icons-vue';
-import { getPermission_api, editPermission_api } from '@/api/system/permission';
+import { getPermission_api, editPermission_api, delPermission_api } from '@/api/system/permission';
const editDialogRef = ref(); // 新增弹窗实例
const tableRef = ref>({}); // 表格实例
@@ -138,6 +138,9 @@ const query = reactive({
},
],
params: {},
+ search: (params:object)=>{
+ query.params = params
+ }
});
// 表格
@@ -181,12 +184,12 @@ const table = reactive({
});
},
clickDel: (row: any) => {
- // delRole_api(row.id).then((resp: any) => {
- // if (resp.status === 200) {
- // tableRef.value?.reload();
- // message.success('操作成功!');
- // }
- // });
+ delPermission_api(row.id).then((resp: any) => {
+ if (resp.status === 200) {
+ tableRef.value?.reload();
+ message.success('操作成功!');
+ }
+ });
},
refresh: () => {
tableRef.value.reload();
From c71328aab972ed2f75b516332cd573bfe9ab8005 Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Sun, 29 Jan 2023 14:45:03 +0800
Subject: [PATCH 06/23] =?UTF-8?q?feat:=20=E9=80=9A=E7=9F=A5=E9=85=8D?=
=?UTF-8?q?=E7=BD=AE=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/AIcon/index.tsx | 7 +-
src/views/notice/Config/index.vue | 370 ++++++++++++++++++++-
src/views/notice/Template/Detail/index.vue | 4 +-
3 files changed, 364 insertions(+), 17 deletions(-)
diff --git a/src/components/AIcon/index.tsx b/src/components/AIcon/index.tsx
index ab50cf8c..4d97fdc9 100644
--- a/src/components/AIcon/index.tsx
+++ b/src/components/AIcon/index.tsx
@@ -28,7 +28,12 @@ const iconKeys = [
'ExclamationCircleOutlined',
'UploadOutlined',
'PlusCircleOutlined',
- 'QuestionCircleOutlined'
+ 'QuestionCircleOutlined',
+ 'BugOutlined',
+ 'BarsOutlined',
+ 'ArrowDownOutlined',
+ 'SmallDashOutlined',
+ 'TeamOutlined',
]
const Icon = (props: {type: string}) => {
diff --git a/src/views/notice/Config/index.vue b/src/views/notice/Config/index.vue
index 691b1c42..0408912d 100644
--- a/src/views/notice/Config/index.vue
+++ b/src/views/notice/Config/index.vue
@@ -1,22 +1,364 @@
-
- >,
+ 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;
+ },
+ },
+ {
+ key: 'debug',
+ text: '通知记录',
+ tooltip: {
+ title: '通知记录',
+ },
+ icon: 'BarsOutlined',
+ onClick: () => {
+ // debugVis.value = true;
+ },
+ },
+ {
+ 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/index.vue b/src/views/notice/Template/Detail/index.vue
index abf7e47a..82ce27eb 100644
--- a/src/views/notice/Template/Detail/index.vue
+++ b/src/views/notice/Template/Detail/index.vue
@@ -458,7 +458,7 @@
import { getImage } from '@/utils/comm';
import { Form } from 'ant-design-vue';
import { message } from 'ant-design-vue';
-import { TemplateFormData } from '../types';
+import { IVariableDefinitions, TemplateFormData } from '../types';
import {
NOTICE_METHOD,
TEMPLATE_FIELD_MAP,
@@ -588,7 +588,7 @@ watch(
format: '%s',
},
);
- formData.value.variableDefinitions = result;
+ formData.value.variableDefinitions = result as IVariableDefinitions[];
},
{ deep: true },
);
From 1aa7839a54759a5f151b5c87c1fb3a7f3ea3a43b Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Sun, 29 Jan 2023 16:02:20 +0800
Subject: [PATCH 07/23] =?UTF-8?q?feat:=20=E9=80=9A=E7=9F=A5=E9=85=8D?=
=?UTF-8?q?=E7=BD=AE=E8=B0=83=E8=AF=95=E9=A1=B5=E9=9D=A2+=E6=8E=A5?=
=?UTF-8?q?=E5=8F=A3=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/notice/config.ts | 5 +-
src/components/ValueItem/index.vue | 2 +-
src/views/notice/Config/Debug/index.vue | 201 +++++++++++++++++++++
src/views/notice/Config/Log/index.vue | 13 ++
src/views/notice/Config/SyncUser/index.vue | 13 ++
src/views/notice/Config/index.vue | 19 +-
src/views/notice/Template/types.d.ts | 1 +
7 files changed, 245 insertions(+), 9 deletions(-)
create mode 100644 src/views/notice/Config/Debug/index.vue
create mode 100644 src/views/notice/Config/Log/index.vue
create mode 100644 src/views/notice/Config/SyncUser/index.vue
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/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/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 @@
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+ {{ record[column.dataIndex] }}
+
+
+
+
+
+
+
+
+
+
+
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 @@
+
+
@@ -158,13 +160,12 @@ import configApi from '@/api/notice/config';
import type { ActionsType } from '@/components/Table/index.vue';
import { getImage, LocalStore } from '@/utils/comm';
import { message } from 'ant-design-vue';
-// import Import from './Import/index.vue';
-// import Export from './Export/index.vue';
-// import Process from './Process/index.vue';
-// import Save from './Save/index.vue';
import { BASE_API_PATH, TOKEN_KEY } from '@/utils/variable';
import { NOTICE_METHOD, MSG_TYPE } from '@/views/notice/const';
+import SyncUser from './SyncUser/index.vue'
+import Debug from './Debug/index.vue'
+import Log from './Log/index.vue'
let providerList: any = [];
Object.keys(MSG_TYPE).forEach((key) => {
@@ -274,6 +275,10 @@ const handleView = (id: string) => {
message.warn(id + '暂未开发');
};
+const syncVis = ref(false);
+const debugVis = ref(false);
+const logVis = ref(false);
+const currentConfig = ref
+
+ {{
+ i + 1
+ }}
+
- {{
- i + 1
- }}
-
通知配置
+
+
+
+
+
+
+
+
+ 新增
+
+
+ 导入
+
+ 导出
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+/**
+ * 根据通知方式展示对应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 getActions = (
+ data: Partial+ {{ slotProps.name }} +
+
+ 通知方式
+
+
+ {{ getMethodTxt(slotProps.type) }}
+
+
+ 说明
+
+ {{ slotProps.description }}
+
+
+
+
+
+
+
+
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 0408912d..e901e2ca 100644
--- a/src/views/notice/Config/index.vue
+++ b/src/views/notice/Config/index.vue
@@ -150,6 +150,8 @@
+
+
-
+
+
+ {{ dateFormat(slotProps.modifyTime) }}
+
+
+
+
+
+ 取消
+ 确认
+
+
+
+
+
+
+
diff --git a/src/views/home/components/dialogs/FuncTestDialog.vue b/src/views/home/components/dialogs/FuncTestDialog.vue
deleted file mode 100644
index f04db868..00000000
--- a/src/views/home/components/dialogs/FuncTestDialog.vue
+++ /dev/null
@@ -1,98 +0,0 @@
-
-
-
-
-
-
- 取消
- 确认
-
-
-
-
-
-
-
diff --git a/src/views/home/components/dialogs/AccessMethodDialog.vue b/src/views/home/components/dialogs/ProductChooseDialog.vue
similarity index 96%
rename from src/views/home/components/dialogs/AccessMethodDialog.vue
rename to src/views/home/components/dialogs/ProductChooseDialog.vue
index 6bf83d48..07cb6e95 100644
--- a/src/views/home/components/dialogs/AccessMethodDialog.vue
+++ b/src/views/home/components/dialogs/ProductChooseDialog.vue
@@ -53,7 +53,7 @@ const productList = ref<[productItem] | []>([]);
const getContainer = () => proxy?.$refs.modal as HTMLElement;
const getOptions = () => {
- getProductList_api().then((resp) => {
+ getProductList_api().then((resp:any) => {
productList.value = resp.result
.filter((i: any) => !i?.accessId)
.map((item: { name: any; id: any }) => ({
@@ -63,7 +63,7 @@ const getOptions = () => {
});
};
const handleOk = () => {
- emits('confirm', form.value);
+ emits('confirm', form.value.productId);
visible.value = false;
};
const filterOption = (input: string, option: any) => {
diff --git a/src/views/home/index.d.ts b/src/views/home/index.d.ts
index 6b8a22bb..19b3c366 100644
--- a/src/views/home/index.d.ts
+++ b/src/views/home/index.d.ts
@@ -8,7 +8,11 @@ export interface recommendList {
auth: boolean;
dialogTag?: 'accessMethod' | 'funcTest';
}
-
+// 产品列表里的每项
+export interface productItem {
+ label: string;
+ value: string
+}
export interface deviceInfo {
deviceId: string,
deviceName: string,
diff --git a/src/views/home/modules/config.ts b/src/views/home/modules/config.ts
index 5857b8d0..49b1d104 100644
--- a/src/views/home/modules/config.ts
+++ b/src/views/home/modules/config.ts
@@ -1,9 +1,10 @@
// import {getImage} from '@/utils/comm'
+import { useMenuStore } from "@/store/menu";
import { usePermissionStore } from "@/store/permission";
import { recommendList, bootConfig } from "../index";
-// 权限控制
+// 按钮权限控制
const hasPermission = usePermissionStore().hasPermission;
const productPermission = (action: string) =>
hasPermission(`device/Product:${action}`);
@@ -11,6 +12,8 @@ const devicePermission = (action: string) =>
hasPermission(`device/Instance:${action}`);
const rulePermission = (action: string) =>
hasPermission(`rule-engine/Instance:${action}`);
+// 页面权限控制
+const menuPermission = useMenuStore().hasPermission
// 物联网引导-数据
@@ -18,7 +21,7 @@ export const deviceBootConfig: bootConfig[] = [
{
english: 'STEP1',
label: '创建产品',
- link: '/a',
+ link: '/iot/device/Product',
auth: productPermission('add'),
params: {
save: true,
@@ -27,7 +30,7 @@ export const deviceBootConfig: bootConfig[] = [
{
english: 'STEP2',
label: '创建设备',
- link: '/b',
+ link: '/iot/device/Instance',
auth: devicePermission('add'),
params: {
save: true,
@@ -36,7 +39,7 @@ export const deviceBootConfig: bootConfig[] = [
{
english: 'STEP3',
label: '规则引擎',
- link: '/c',
+ link: '/iot/rule-engine/Instance',
auth: rulePermission('add'),
params: {
save: true,
@@ -50,7 +53,7 @@ export const deviceStepDetails: recommendList[] = [
details:
'产品是设备的集合，通常指一组具有相同功能的设备。物联设备必须通过产品进行接入方式配置。',
iconUrl: '/images/home/bottom-4.png',
- linkUrl: '/a',
+ linkUrl: '/iot/device/Product',
auth: productPermission('add'),
params: {
save: true,
@@ -61,7 +64,7 @@ export const deviceStepDetails: recommendList[] = [
details:
'通过产品对同一类型的设备进行统一的接入方式配置。请参照设备铭牌说明选择匹配的接入方式。',
iconUrl: '/images/home/bottom-1.png',
- linkUrl: '/a',
+ linkUrl: '/iot/device/Product/detail',
auth: productPermission('update'),
dialogTag: 'accessMethod',
},
@@ -69,7 +72,7 @@ export const deviceStepDetails: recommendList[] = [
title: '添加测试设备',
details: '添加单个设备，用于验证产品模型是否配置正确。',
iconUrl: '/images/home/bottom-5.png',
- linkUrl: '/a',
+ linkUrl: '/iot/device/Instance',
auth: devicePermission('add'),
params: {
save: true,
@@ -80,15 +83,16 @@ export const deviceStepDetails: recommendList[] = [
details:
'对添加的测试设备进行功能调试，验证能否连接到平台，设备功能是否配置正确。',
iconUrl: '/images/home/bottom-2.png',
- linkUrl: '/a',
+ linkUrl: '/iot/device/Instance/detail',
auth: devicePermission('update'),
+ // auth: true,
dialogTag: 'funcTest',
},
{
title: '批量添加设备',
details: '批量添加同一产品下的设备',
iconUrl: '/images/home/bottom-3.png',
- linkUrl: '/a',
+ linkUrl: '/iot/device/Instance',
auth: devicePermission('import'),
params: {
import: true,
@@ -102,14 +106,14 @@ export const opsBootConfig: bootConfig[] = [
{
english: 'STEP1',
label: '设备接入配置',
- link: '/a',
- auth: true,
+ link: '/iot/link/accessConfig',
+ auth: menuPermission('link/accessConfig'),
},
{
english: 'STEP2',
label: '日志排查',
- link: '/b',
- auth: true,
+ link: '/iot/link/Log',
+ auth: menuPermission('link/Log'),
params: {
key: 'system',
},
@@ -117,8 +121,8 @@ export const opsBootConfig: bootConfig[] = [
{
english: 'STEP3',
label: '实时监控',
- link: '/c',
- auth: false,
+ link: '/iot/link/dashboard',
+ auth: menuPermission('link/dashboard'),
params: {
save: true,
},
@@ -131,44 +135,38 @@ export const opsStepDetails: recommendList[] = [
details:
'根据业务需求自定义开发对应的产品（设备模型）接入协议，并上传到平台。',
iconUrl: '/images/home/bottom-1.png',
- linkUrl: '/a',
- auth: true,
- params: {
- a: 1,
- save: true,
- },
+ linkUrl: '/iot/link/protocol',
+ auth: menuPermission('link/Protocol'),
+
},
{
title: '证书管理',
details: '统一维护平台内的证书，用于数据通信加密。',
iconUrl: '/images/home/bottom-6.png',
- linkUrl: '/a',
- auth: true,
- params: {
- a: 1,
- save: false,
- },
+ linkUrl: '/iot/link/Certificate',
+ auth: menuPermission('link/Certificate'),
+
},
{
title: '网络组件',
details: '根据不同的传输类型配置平台底层网络组件相关参数。',
iconUrl: '/images/home/bottom-3.png',
- linkUrl: '/a',
- auth: true,
+ linkUrl: '/iot/link/type',
+ auth: menuPermission('link/Type'),
},
{
title: '设备接入网关',
details: '根据不同的传输类型，关联消息协议，配置设备接入网关相关参数。',
iconUrl: '/images/home/bottom-4.png',
- linkUrl: '/a',
- auth: true,
+ linkUrl: '/iot/link/accessConfig',
+ auth: menuPermission('link/AccessConfig'),
},
{
title: '日志管理',
details: '监控系统日志，及时处理系统异常。',
iconUrl: '/images/home/bottom-5.png',
- linkUrl: '/a',
- auth: false,
+ linkUrl: '/iot/link/Log',
+ auth: menuPermission('Log'),
params: {
key: 'system',
}
From f3bc5740afe06fd8e2b8ac179a79ba9b60b36611 Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Sun, 29 Jan 2023 17:16:16 +0800
Subject: [PATCH 09/23] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96Layout=E7=BB=84?=
=?UTF-8?q?=E4=BB=B6=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=8A=A8=E6=80=81=E8=B7=AF?=
=?UTF-8?q?=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
config/config.ts | 12 +-
src/App.vue | 25 +-
src/api/comm.ts | 5 +
src/api/login.ts | 7 +-
src/api/system/menu.ts | 3 +
src/components/AIcon/index.tsx | 3 +-
src/components/Layout/BasicLayout.tsx | 91 ++---
src/components/Layout/BasicLayoutPage.vue | 59 ++++
src/components/Layout/BlankLayoutPage.vue | 13 +
.../Layout/components/Header/Header.tsx | 87 +++--
.../Layout/components/Header/index.less | 5 +
.../Layout/components/Header/index.tsx | 45 ++-
.../Layout/components/SiderMenu/BaseMenu.tsx | 9 +-
.../components/SiderMenu/SiderMenu.less | 16 +
.../Layout/components/SiderMenu/SiderMenu.tsx | 37 ++-
src/components/Layout/index.ts | 4 +-
src/components/Layout/utils.ts | 6 +-
src/components/index.ts | 3 +
src/router/index.ts | 55 +++-
src/router/menu.ts | 310 +++++++++++-------
src/store/menu.ts | 46 ++-
src/store/system.ts | 24 ++
src/store/userInfo.ts | 14 +-
src/utils/encodeQuery.ts | 4 +-
src/utils/menu.ts | 111 +++++++
src/utils/request.ts | 6 +-
tsconfig.json | 2 +-
27 files changed, 716 insertions(+), 286 deletions(-)
create mode 100644 src/api/system/menu.ts
create mode 100644 src/components/Layout/BasicLayoutPage.vue
create mode 100644 src/components/Layout/BlankLayoutPage.vue
create mode 100644 src/components/Layout/components/SiderMenu/SiderMenu.less
create mode 100644 src/store/system.ts
create mode 100644 src/utils/menu.ts
diff --git a/config/config.ts b/config/config.ts
index 11e31a68..9a3c3b8a 100644
--- a/config/config.ts
+++ b/config/config.ts
@@ -2,13 +2,13 @@ export default {
theme: {
'primary-color': '#1d39c4',
},
- logo: '/favicon.ico',
- title: 'Jetlinks',
+ logo: '/favicon.ico', // 浏览器标签页logo
+ title: 'Jetlinks', // 浏览器标签页title
layout: {
- title: '物联网平台',
- logo: '/icons/icon-192x192.png',
- siderWidth: 208,
- headerHeight: 48,
+ title: '物联网平台', // 平台title
+ logo: '/icons/icon-192x192.png', // 平台logo
+ siderWidth: 208, // 左侧菜单栏宽度
+ headerHeight: 48, // 头部高度
collapsedWidth: 48,
mode: 'inline',
theme: 'light', // 'dark' 'light'
diff --git a/src/App.vue b/src/App.vue
index 0bd59e76..02bc5677 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,31 +1,8 @@
-
-
+
-
-
-
-
- {defaultRenderLogo(logo, logoStyle)}
-
-
+
+
+
+
)
}
})
\ No newline at end of file
diff --git a/src/components/Layout/components/SiderMenu/BaseMenu.tsx b/src/components/Layout/components/SiderMenu/BaseMenu.tsx
index ffcb60e9..c73f5002 100644
--- a/src/components/Layout/components/SiderMenu/BaseMenu.tsx
+++ b/src/components/Layout/components/SiderMenu/BaseMenu.tsx
@@ -122,7 +122,9 @@ class MenuUtil {
title={defaultTitle}
key={item.path}
icon={
{ title }
- + <> +
+
-
-
+
)
}
})
\ No newline at end of file
diff --git a/src/components/Layout/components/Header/index.less b/src/components/Layout/components/Header/index.less
index 54a179ba..d9734f2f 100644
--- a/src/components/Layout/components/Header/index.less
+++ b/src/components/Layout/components/Header/index.less
@@ -1,4 +1,9 @@
.header-content {
+ position: relative;
+ width: 100%;
+ height: 100%;
+ box-shadow: 0 1px 4px 0 rgb(0 21 41 / 12%);
+ transition: background .3s,width .2s;
&.light {
background-color: #fff;
diff --git a/src/components/Layout/components/Header/index.tsx b/src/components/Layout/components/Header/index.tsx
index 12534a81..ad2a8461 100644
--- a/src/components/Layout/components/Header/index.tsx
+++ b/src/components/Layout/components/Header/index.tsx
@@ -21,7 +21,7 @@ export const HeaderView = defineComponent({
inheritAttrs: false,
props: headerViewProps,
setup(props) {
- const { headerHeight, navTheme, onCollapse } = toRefs(props);
+ const { headerHeight, onCollapse } = toRefs(props);
const context = useRouteContext();
@@ -30,22 +30,35 @@ export const HeaderView = defineComponent({
);
return () => (
-
-
-
- {
- rightSize.value = width
+
+
+
+ {
+ rightSize.value = width
+ }}
+ >
+ {
+ rightContentRender && typeof rightContentRender === 'function' ? (
+
+
{rightContentRender({...props})}
+ ) : rightContentRender
+ }
+