@@ -70,6 +71,10 @@ const state = reactive({
selectedKeys: [],
});
+const routerBack = () => {
+ router.go(-1)
+}
+
const findRouteMeta = (code: string) => {
let meta = []
let menuItem: any = menu.menus[code]
diff --git a/src/components/ValueItem/index.vue b/src/components/ValueItem/index.vue
index eb05c733..216eea2b 100644
--- a/src/components/ValueItem/index.vue
+++ b/src/components/ValueItem/index.vue
@@ -194,7 +194,7 @@ const timeChange = (e: any) => {
}
const inputChange = (e: any) => {
- emit('change', e.target ? e.target.value : e)
+ emit('change', e && e.target ? e.target.value : e)
}
const dateChange = (e: any) => {
diff --git a/src/router/menu.ts b/src/router/menu.ts
index 93c61abc..823178a7 100644
--- a/src/router/menu.ts
+++ b/src/router/menu.ts
@@ -51,7 +51,7 @@ export const AccountMenu = {
export default [
{ path: '/*', redirect: '/'},
{
- path: '/login',
+ path: LoginPath,
component: () => import('@/views/user/Login/index.vue')
},
{
diff --git a/src/store/department.ts b/src/store/department.ts
new file mode 100644
index 00000000..3bcbbb9b
--- /dev/null
+++ b/src/store/department.ts
@@ -0,0 +1,26 @@
+
+import { defineStore } from "pinia";
+
+type DepartmentStateType = {
+ productId: string;
+ optType: string | undefined;
+}
+
+export const useDepartmentStore = defineStore({
+ id: 'department',
+ state: (): DepartmentStateType => ({
+ productId: '',
+ // 设备资产分配弹窗操作类型:
+ // 1. optType === 'handle': 手动点击资产分配按钮;
+ // 2. optType === ': 产品资产分配后, 自动弹出设备资产分配
+ optType: ''
+ }),
+ actions: {
+ setProductId(value: string) {
+ this.productId = value
+ },
+ setType(value: string | undefined) {
+ this.optType = value
+ }
+ }
+})
\ No newline at end of file
diff --git a/src/store/scene.ts b/src/store/scene.ts
index b58ab447..efc423a9 100644
--- a/src/store/scene.ts
+++ b/src/store/scene.ts
@@ -109,7 +109,7 @@ export const useSceneStore = defineStore('scene', () => {
...result,
trigger: result.trigger || {},
branches: cloneDeep(assignmentKey(branches)),
- options: result.options ? {...defaultOptions, ...result.options } : defaultOptions,
+ options: result.options ? {...cloneDeep(defaultOptions), ...result.options } : cloneDeep(defaultOptions),
}
}
}
diff --git a/src/utils/menu.ts b/src/utils/menu.ts
index 74fb9892..2a08cba4 100644
--- a/src/utils/menu.ts
+++ b/src/utils/menu.ts
@@ -148,6 +148,9 @@ const extraRouteObj = {
'edge/Device': {
children: [{ code: 'Remote', name: '远程控制' }],
},
+ 'rule-engine/Alarm/Log': {
+ children: [{ code: 'Record', name: '处理记录' }]
+ }
};
@@ -206,7 +209,7 @@ const findDetailRoutes = (routes: any[]): any[] => {
export const findCodeRoute = (asyncRouterMap: any[]) => {
const routeMeta = {}
- function getDetail( code: string, url: string) {
+ function getDetail(code: string, url: string) {
const detail = findDetailRouteItem(code, url)
if (!detail) return
routeMeta[(detail as MenuItem).code] = {
@@ -217,7 +220,7 @@ export const findCodeRoute = (asyncRouterMap: any[]) => {
}
}
- function findChildren (data: any[], code: string = '') {
+ function findChildren(data: any[], code: string = '') {
data.forEach(route => {
routeMeta[route.code] = {
path: route.url || route.path,
@@ -254,7 +257,7 @@ export const findCodeRoute = (asyncRouterMap: any[]) => {
return routeMeta
}
-export function filterAsyncRouter(asyncRouterMap: any, parentCode = '', level = 1): { menusData: any, silderMenus: any} {
+export function filterAsyncRouter(asyncRouterMap: any, parentCode = '', level = 1): { menusData: any, silderMenus: any } {
const _asyncRouterMap = cloneDeep(asyncRouterMap)
const menusData: any[] = []
const silderMenus: any[] = []
@@ -270,7 +273,7 @@ export function filterAsyncRouter(asyncRouterMap: any, parentCode = '', level =
},
}
- const silder = {..._route}
+ const silder = { ..._route }
// 查看是否有隐藏子路由
route.children = findChildrenRoute(route.code, route.url, route.children)
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 2d56eed9..5c260845 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -155,12 +155,10 @@ const errorHandler = (error: any) => {
Notification.error({
key: '401',
message: 'Unauthorized',
- description: 'Authorization verification failed'
+ description: '用户未登录'
})
setTimeout(() => {
- router.replace({
- path: LoginPath
- })
+ location.href = `/#${LoginPath}`
}, 0)
}
} else if (error.response === undefined) {
@@ -179,10 +177,13 @@ request.interceptors.request.use(config => {
const token = LocalStore.get(TOKEN_KEY)
// const token = store.$state.tokenAlias
if (!token) {
+ // setTimeout(() => {
+ // router.replace({
+ // path: LoginPath
+ // })
+ // }, 0)
setTimeout(() => {
- router.replace({
- path: LoginPath
- })
+ location.href = `/#${LoginPath}`
}, 0)
return config
}
diff --git a/src/views/device/DashBoard/components/TimeSelect.vue b/src/views/device/DashBoard/components/TimeSelect.vue
index bae04380..a55c28d2 100644
--- a/src/views/device/DashBoard/components/TimeSelect.vue
+++ b/src/views/device/DashBoard/components/TimeSelect.vue
@@ -19,6 +19,7 @@
format="YYYY-MM-DD HH:mm:ss"
valueFormat="YYYY-MM-DD HH:mm:ss"
style="margin-left: 12px"
+ :show-time="{ format: 'HH:mm:ss' }"
@change="rangeChange"
v-model:value="rangeVal"
:allowClear="false"
@@ -110,5 +111,5 @@ const handleBtnChange = (val: string) => {
});
};
handleBtnChange(radioValue.value);
-watch(() => radioValue.value, { deep: true, immediate: true });
+// watch(() => radioValue.value, { deep: true, immediate: true });
diff --git a/src/views/device/DashBoard/index.vue b/src/views/device/DashBoard/index.vue
index bdd884d9..457a1466 100644
--- a/src/views/device/DashBoard/index.vue
+++ b/src/views/device/DashBoard/index.vue
@@ -364,7 +364,7 @@ const setDevMesChartOption = (
grid: {
top: '2%',
bottom: '5%',
- left: maxY > 100000 ? '90px' : '60px',
+ left: maxY > 100000 ? '50px' : '70px',
right: '50px',
},
series: [
diff --git a/src/views/device/Instance/Detail/ChildDevice/index.vue b/src/views/device/Instance/Detail/ChildDevice/index.vue
index d723385f..c39b0489 100644
--- a/src/views/device/Instance/Detail/ChildDevice/index.vue
+++ b/src/views/device/Instance/Detail/ChildDevice/index.vue
@@ -147,6 +147,10 @@ const columns = [
dataIndex: 'id',
key: 'id',
ellipsis: true,
+ search:{
+ type:'string',
+ defaultTermType: 'eq'
+ }
},
{
title: '设备名称',
diff --git a/src/views/device/Instance/Detail/EdgeMap/index.vue b/src/views/device/Instance/Detail/EdgeMap/index.vue
index 4d680514..97d24fed 100644
--- a/src/views/device/Instance/Detail/EdgeMap/index.vue
+++ b/src/views/device/Instance/Detail/EdgeMap/index.vue
@@ -162,7 +162,7 @@ import {
} from '@/api/device/instance';
import MSelect from './MSelect.vue';
import PatchMapping from './PatchMapping.vue';
-import { message } from 'ant-design-vue/es';
+import { onlyMessage } from '@/utils/comm';
const columns = [
{
@@ -280,7 +280,7 @@ const unbind = async (id: string) => {
},
);
if (resp.status === 200) {
- message.success('操作成功！');
+ onlyMessage('操作成功！', 'success');
handleSearch();
}
}
@@ -313,7 +313,7 @@ const onSave = () => {
submitData,
);
if (resp.status === 200) {
- message.success('操作成功！');
+ onlyMessage('操作成功！', 'success');
handleSearch();
}
}
@@ -342,7 +342,7 @@ const onAction = async (record: any) => {
submitData,
);
if (resp.status === 200) {
- message.success('操作成功！');
+ onlyMessage('操作成功！', 'success');
handleSearch();
}
};
diff --git a/src/views/device/Instance/Detail/Running/Property/ValueDetail.vue b/src/views/device/Instance/Detail/Running/Property/ValueDetail.vue
index 51e4bbeb..0c8539da 100644
--- a/src/views/device/Instance/Detail/Running/Property/ValueDetail.vue
+++ b/src/views/device/Instance/Detail/Running/Property/ValueDetail.vue
@@ -13,6 +13,7 @@
import JsonViewer from 'vue-json-viewer';
+import LivePlayer from '@/components/Player/index.vue';
const _data = defineProps({
type: {
diff --git a/src/views/device/Instance/Detail/index.vue b/src/views/device/Instance/Detail/index.vue
index 0df755d7..081b6b96 100644
--- a/src/views/device/Instance/Detail/index.vue
+++ b/src/views/device/Instance/Detail/index.vue
@@ -1,101 +1,91 @@
-
+ {{
+ instanceStore.current?.id
+ }}
+
+
+ {{ instanceStore.current?.productName }}
+
+
+
+
![]()
{
});
};
-watch(
- () => route.params?.id,
- (newId) => {
- if (newId) {
- instanceStore.refresh(String(newId));
- getStatus(String(newId));
- instanceStore.tabActiveKey = 'Info'
- }
- },
- { immediate: true, deep: true },
-);
-
-onMounted(() => {
- instanceStore.tabActiveKey = history.state?.params?.tab || 'Info';
-});
-
-// const onBack = () => {
-// menuStory.jumpPage('device/Instance');
-// };
-
-const onTabChange = (e: string) => {
- instanceStore.tabActiveKey = e;
-};
-
-const handleAction = async () => {
- if (instanceStore.current?.id) {
- const resp = await _deploy(instanceStore.current?.id);
- if (resp.status === 200) {
- message.success('操作成功！');
- instanceStore.refresh(instanceStore.current?.id);
- }
- }
-};
-
-const handleDisconnect = async () => {
- if (instanceStore.current?.id) {
- const resp = await _disconnect(instanceStore.current?.id);
- if (resp.status === 200) {
- message.success('操作成功！');
- instanceStore.refresh(instanceStore.current?.id);
- }
- }
-};
-
-const handleRefresh = async () => {
- if (instanceStore.current?.id) {
- await instanceStore.refresh(instanceStore.current?.id);
- message.success('操作成功');
- }
-};
-
-const jumpProduct = () => {
- menuStory.jumpPage('device/Product/Detail', {
- id: instanceStore.current?.productId,
- });
-};
-
-watchEffect(() => {
+const getDetail = () => {
const keys = list.value.map((i) => i.key);
if (
instanceStore.current?.protocol &&
@@ -309,8 +244,67 @@ watchEffect(() => {
tab: '边缘端映射',
});
}
+};
+
+watch(
+ () => route.params?.id,
+ async (newId) => {
+ if (newId) {
+ await instanceStore.refresh(String(newId));
+ getStatus(String(newId));
+ list.value = [...initList];
+ getDetail();
+ instanceStore.tabActiveKey = 'Info';
+ }
+ },
+ { immediate: true, deep: true },
+);
+
+onMounted(() => {
+ instanceStore.tabActiveKey = history.state?.params?.tab || 'Info';
});
+const onBack = () => {
+ menuStory.jumpPage('device/Instance');
+};
+
+const onTabChange = (e: string) => {
+ instanceStore.tabActiveKey = e;
+};
+
+const handleAction = async () => {
+ if (instanceStore.current?.id) {
+ const resp = await _deploy(instanceStore.current?.id);
+ if (resp.status === 200) {
+ message.success('操作成功！');
+ instanceStore.refresh(instanceStore.current?.id);
+ }
+ }
+};
+
+const handleDisconnect = async () => {
+ if (instanceStore.current?.id) {
+ const resp = await _disconnect(instanceStore.current?.id);
+ if (resp.status === 200) {
+ message.success('操作成功！');
+ instanceStore.refresh(instanceStore.current?.id);
+ }
+ }
+};
+
+const handleRefresh = async () => {
+ if (instanceStore.current?.id) {
+ await instanceStore.refresh(instanceStore.current?.id);
+ message.success('操作成功');
+ }
+};
+
+const jumpProduct = () => {
+ menuStory.jumpPage('device/Product/Detail', {
+ id: instanceStore.current?.productId,
+ });
+};
+
onUnmounted(() => {
statusRef.value && statusRef.value.unsubscribe();
});
diff --git a/src/views/device/Instance/Process/index.vue b/src/views/device/Instance/Process/index.vue
index 1f203be8..64fe7266 100644
--- a/src/views/device/Instance/Process/index.vue
+++ b/src/views/device/Instance/Process/index.vue
@@ -13,7 +13,7 @@
-
+ 启用设备
+
+
+ 断开连接
+
+
+
+
+
+
-
-
-
- 状态：
-
- 启用设备
-
-
- 断开连接
-
-
+ {{ instanceStore.current?.name }}
+
+
+ 状态：
+
-
-
-
-
- {{ instanceStore.current?.name }}
-
-
-
- {{
- instanceStore.current?.id
- }}
-
-
- {{ instanceStore.current?.productName }}
-
-
-
-
+ />
+ {{ instanceStore.current?.state?.text }}
+
+ {{ type === 'active' ? '启用' : '同步' }}成功：{{ count }}条
-启用失败：{{ errCount }}条
启用失败：{{ errCount }}条
-
+
-
\ 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'
>
@@ -70,7 +70,7 @@
:status="slotProps.state?.value"
:statusText="slotProps.state?.text"
:statusNames="{
- online: 'success',
+ online: 'processing',
offline: 'error',
notActive: 'warning',
}"
@@ -147,7 +147,7 @@
:status="slotProps.state.value"
:text="slotProps.state.text"
:statusNames="{
- online: 'success',
+ online: 'processing',
offline: 'error',
notActive: 'warning',
}"
@@ -211,6 +211,9 @@ import { intersection } from 'lodash-es';
import type { dictType, optionsType } from '../typing';
import { message } from 'jetlinks-ui-components';
+import { useDepartmentStore } from '@/store/department';
+
+const departmentStore = useDepartmentStore();
const permission = 'system/Department';
@@ -247,6 +250,9 @@ const columns = [
search: {
rename: 'productId$product-info',
type: 'select',
+ handleValue(value: string) {
+ return `id is ${value}`;
+ },
options: () =>
new Promise((resolve) => {
const params = {
@@ -288,14 +294,9 @@ const columns = [
search: {
type: 'select',
options: [
- {
- label: '正常',
- value: 1,
- },
- {
- label: '禁用',
- value: 0,
- },
+ { label: '禁用', value: 'notActive' },
+ { label: '离线', value: 'offline' },
+ { label: '在线', value: 'online' },
],
},
scopedSlots: true,
@@ -467,7 +468,9 @@ const table = {
};
}
},
- clickAdd: () => {
+ clickAdd: (type?: string) => {
+ // 设备资产分配弹窗操作类型: type = 'handle': 手动点击资产分配按钮, !type产品资产分配后, 自动弹出设备资产分配
+ departmentStore.setType(type)
dialogs.addShow = true;
},
clickEdit: (row?: any) => {
@@ -520,7 +523,7 @@ const dialogs = reactive({
});
table.init();
-nextTick(() => {
+watchEffect(() => {
props.bindBool && table.clickAdd();
emits('update:bindBool', false);
});
diff --git a/src/views/system/Department/product/index.vue b/src/views/system/Department/product/index.vue
index 9537f7ff..0a113a4c 100644
--- a/src/views/system/Department/product/index.vue
+++ b/src/views/system/Department/product/index.vue
@@ -68,9 +68,8 @@
:status="slotProps.state?.value"
:statusText="slotProps.state?.text"
:statusNames="{
- online: 'success',
- offline: 'error',
- notActive: 'warning',
+ 1: 'processing',
+ 0: 'error',
}"
>
@@ -172,9 +171,8 @@
:status="slotProps.state.value"
:text="slotProps.state.text"
:statusNames="{
- online: 'success',
- offline: 'error',
- notActive: 'warning',
+ 1: 'processing',
+ 0: 'error',
}"
>
diff --git a/src/views/system/Platforms/Api/components/ApiTest.vue b/src/views/system/Platforms/Api/components/ApiTest.vue
index df1d8124..14afd101 100644
--- a/src/views/system/Platforms/Api/components/ApiTest.vue
+++ b/src/views/system/Platforms/Api/components/ApiTest.vue
@@ -19,6 +19,7 @@
:dataSource="paramsTable"
:pagination="false"
size="small"
+ bordered
>
@@ -65,8 +66,7 @@
@@ -305,11 +306,15 @@ type requestObj = {
}
}
.table {
+ margin-bottom: 22px;
:deep(.ant-table-cell) {
padding: 0 8px;
height: 56px;
}
}
+ :deep(.ant-form-item) {
+ margin-bottom: 0;
+ }
}
}
}
diff --git a/src/views/system/Platforms/Api/components/ChooseApi.vue b/src/views/system/Platforms/Api/components/ChooseApi.vue
index be147aa1..e6783527 100644
--- a/src/views/system/Platforms/Api/components/ChooseApi.vue
+++ b/src/views/system/Platforms/Api/components/ChooseApi.vue
@@ -79,7 +79,7 @@ const rowSelection = {
},
selectedRowKeys: ref([]),
};
-const save = () => {
+const save = async () => {
const keys = props.selectedRowKeys;
const removeKeys = props.sourceKeys.filter((key) => !keys.includes(key));
@@ -87,13 +87,20 @@ const save = () => {
if (props.mode === 'api') {
// 此时是api配置
- removeKeys.length &&
- delOperations_api(removeKeys)
- .finally(() => addOperations_api(addKeys))
- .then(() => {
- message.success('操作成功');
- emits('refresh')
- });
+ // removeKeys.length &&
+ // delOperations_api(removeKeys)
+ // .finally(() => addOperations_api(addKeys))
+ // .then(() => {
+ // message.success('操作成功');
+ // emits('refresh');
+ // });
+ // fix: bug#10829
+ removeKeys.length && (await delOperations_api(removeKeys));
+ const res = await addOperations_api(addKeys);
+ if (res.success) {
+ message.success('操作成功');
+ emits('refresh');
+ }
} else if (props.mode === 'appManger') {
const removeItems = removeKeys.map((key) => ({
id: key,
diff --git a/src/views/system/Role/Detail/Permiss/index.vue b/src/views/system/Role/Detail/Permiss/index.vue
index 8c1fe792..21898ba0 100644
--- a/src/views/system/Role/Detail/Permiss/index.vue
+++ b/src/views/system/Role/Detail/Permiss/index.vue
@@ -78,12 +78,16 @@ const form = reactive({
});
},
clickSave: () => {
- const updateRole = updateRole_api(form.data);
- const updateTree = updatePrimissTree_api(roleId, { menus: form.menus });
+ formRef.value?.validate().then(() => {
+ const updateRole = updateRole_api(form.data);
+ const updateTree = updatePrimissTree_api(roleId, {
+ menus: form.menus,
+ });
- Promise.all([updateRole, updateTree]).then((resp) => {
- message.success('操作成功');
- router.push('/system/Role');
+ Promise.all([updateRole, updateTree]).then((resp) => {
+ message.success('操作成功');
+ router.push('/system/Role');
+ });
});
},
});
@@ -123,7 +127,7 @@ form.getForm();
:deep(.ant-form-item-required) {
padding-right: 12px;
- &::before{
+ &::before {
right: 0;
}
}
diff --git a/src/views/system/User/index.vue b/src/views/system/User/index.vue
index 8fe8b0a6..2283af2d 100644
--- a/src/views/system/User/index.vue
+++ b/src/views/system/User/index.vue
@@ -4,7 +4,7 @@
{
+
+ 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 }}
+
+
+