+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/link/AccessConfig/components/Media/index.vue b/src/views/link/AccessConfig/components/Media/index.vue
index df422758..294a29a9 100644
--- a/src/views/link/AccessConfig/components/Media/index.vue
+++ b/src/views/link/AccessConfig/components/Media/index.vue
@@ -78,12 +78,16 @@
+
+
+
+
+
+
+
+ 保存
+
+
+
+
+
+
+ 接入方式
++ {{ provider.name }} +
++ {{ provider.description }} +
+消息协议
++ {{ provider.id === 'fixed-media' ? 'URL' : 'SIP' }} +
+
+
+
+
+
+
+
diff --git a/src/views/rule-engine/Scene/Save/components/ParamsDropdown/Double.vue b/src/views/rule-engine/Scene/Save/components/ParamsDropdown/Double.vue
index 3d65dd01..6c6b3dac 100644
--- a/src/views/rule-engine/Scene/Save/components/ParamsDropdown/Double.vue
+++ b/src/views/rule-engine/Scene/Save/components/ParamsDropdown/Double.vue
@@ -1,17 +1,17 @@
-
+
+
+
点击修改
@@ -345,7 +345,7 @@ const form = reactive({
'base-path': `${window.location.origin}/api`,
logo: '',
ico: '',
- backgroud: '',
+ background: '',
},
rulesFrom: {
title: [
@@ -387,8 +387,8 @@ const form = reactive({
headerTheme: configInfo.front?.headerTheme,
logo: configInfo.front?.logo || '/logo.png',
ico: configInfo.front?.ico || '/favicon.ico',
- backgroud:
- configInfo.front?.backgroud || '/images/login.png',
+ background:
+ configInfo.front?.background || '/images/login.png',
apiKey: configInfo.amap?.apiKey,
'base-path': configInfo.paths?.['base-path'],
};
@@ -497,7 +497,7 @@ const uploader: uploaderType = {
} else if (info.file.status === 'done') {
info.file.url = info.file.response?.result;
form.backLoading = false;
- form.formValue.backgroud = info.file.response?.result;
+ form.formValue.background = info.file.response?.result;
} else if (info.file.status === 'error') {
form.logoLoading = false;
onlyMessage('背景图上传失败，请稍后再试', 'error');
diff --git a/src/views/system/Menu/Detail/BasicInfo.vue b/src/views/system/Menu/Detail/BasicInfo.vue
index bb611fd1..04ea30d1 100644
--- a/src/views/system/Menu/Detail/BasicInfo.vue
+++ b/src/views/system/Menu/Detail/BasicInfo.vue
@@ -4,40 +4,65 @@
+
数据权限控制
-
-
+
不支持
支持
间接控制
-
-
+
-
-
+
+
-
@@ -175,7 +287,6 @@ import { Rule } from 'ant-design-vue/lib/form';
import { isNoCommunity } from '@/utils/utils';
import { onlyMessage } from '@/utils/comm';
-
const permission = 'system/Menu';
// 路由
const route = useRoute();
@@ -191,7 +302,7 @@ const basicFormRef = ref();
const permissFormRef = ref();
const uploadIcon = ref();
//菜单应用选项
-const appOptions = ref([])
+const appOptions = ref([]);
const form = reactive({
data: {
name: '',
@@ -216,7 +327,9 @@ const form = reactive({
getMenuInfo_api(routeParams.id).then((resp: any) => {
form.data = {
...(resp.result as formType),
- permissions: resp.result?.permissions ? resp.result.permissions : [],
+ permissions: resp.result?.permissions
+ ? resp.result.permissions
+ : [],
accessSupport:
resp.result?.accessSupport?.value || 'unsupported',
};
@@ -224,25 +337,34 @@ const form = reactive({
});
if (isNoCommunity) {
- // 获取关联菜单
- getMenuTree_api({ paging: false,terms:[{terms:[{
- terms:[
- {
- value:"%show\":true%",
- termType:"like",
- column:"options"
- }
- ]
- }]}]}).then((resp: any) => {
- form.treeData = resp.result;
- });
- // 获取资产类型
- getAssetsType_api().then((resp: any) => {
- form.assetsType = resp.result.map((item: any) => ({
- label: item.name,
- value: item.id,
- }));
- });
+ // 获取关联菜单
+ getMenuTree_api({
+ paging: false,
+ terms: [
+ {
+ terms: [
+ {
+ terms: [
+ {
+ value: '%show":true%',
+ termType: 'like',
+ column: 'options',
+ },
+ ],
+ },
+ ],
+ },
+ ],
+ }).then((resp: any) => {
+ form.treeData = resp.result;
+ });
+ // 获取资产类型
+ getAssetsType_api().then((resp: any) => {
+ form.assetsType = resp.result.map((item: any) => ({
+ label: item.name,
+ value: item.id,
+ }));
+ });
}
},
checkCode: async (_rule: Rule, value: string): Promise => {
@@ -270,7 +392,7 @@ const form = reactive({
const api = routeParams.id ? saveMenuInfo_api : addMenuInfo_api;
form.saveLoading = true;
const accessSupportValue = form.data.accessSupport;
- const params:any = {
+ const params: any = {
...form.data,
owner: 'iot',
options: { show: true },
@@ -280,8 +402,8 @@ const form = reactive({
accessSupportValue === 'unsupported'
? '不支持'
: accessSupportValue === 'support'
- ? '支持'
- : '间接控制',
+ ? '支持'
+ : '间接控制',
},
};
api(params)
@@ -302,15 +424,20 @@ const form = reactive({
})
.finally(() => (form.saveLoading = false));
})
- .catch((err) => { });
+ .catch((err) => {});
},
});
form.init();
+const checkCh = async (_rule: Rule, value: string) => {
+ if (/[\u4e00-\u9fa5]/.test(value))
+ return Promise.reject('编码不能包含中文');
+ else return Promise.resolve('');
+};
const choseIcon = (typeStr: string) => {
form.data.icon = typeStr;
uploadIcon.value?.clearValidate();
-}
+};
// 弹窗
const dialogVisible = ref(false);
diff --git a/src/views/system/Menu/Detail/ButtonMange.vue b/src/views/system/Menu/Detail/ButtonMange.vue
index 038ef3ea..52b84799 100644
--- a/src/views/system/Menu/Detail/ButtonMange.vue
+++ b/src/views/system/Menu/Detail/ButtonMange.vue
@@ -55,6 +55,7 @@
:menu-info="menuInfo"
:mode="dialogTitle"
:data="selectItem"
+ :menuData="table.tableData"
@confirm="table.getList"
/>
@@ -84,8 +85,6 @@ const openDialog = (mode: '查看' | '新增' | '编辑', row: object) => {
if (!routeParams.id && !paramsId.value) {
return onlyMessage('请先新增菜单基本信息', 'warning');
}
- console.log(3);
-
selectItem.value = { ...row };
dialogTitle.value = mode;
dialogVisible.value = true;
diff --git a/src/views/system/Menu/components/ButtonAddDialog.vue b/src/views/system/Menu/components/ButtonAddDialog.vue
index bf927177..6b474c5c 100644
--- a/src/views/system/Menu/components/ButtonAddDialog.vue
+++ b/src/views/system/Menu/components/ButtonAddDialog.vue
@@ -15,6 +15,7 @@
:rules="[
{ required: true, message: '请输入编码' },
{ max: 64, message: '最多可输入64个字符' },
+ { validator: validateIdRepeat, trigger: 'blur' },
]"
>
基本信息
-
+
-
-
权限配置
-
+ 查看更多
+
@@ -158,6 +161,31 @@
+
+
+
+ ![]()
+
+ {{ item.name }}
+
+
+