From 79743608b85a34dbc9372b381515e22c2aba3cb3 Mon Sep 17 00:00:00 2001
From: xuziqiang <1344691446@qq.com>
Date: Thu, 23 May 2024 17:09:08 +0800
Subject: [PATCH 1/2] fix: modal close
---
.../src/view/organizationManage/usermanage/index.vue | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/hx-ai-intelligent/src/view/organizationManage/usermanage/index.vue b/hx-ai-intelligent/src/view/organizationManage/usermanage/index.vue
index d321538..865fd93 100644
--- a/hx-ai-intelligent/src/view/organizationManage/usermanage/index.vue
+++ b/hx-ai-intelligent/src/view/organizationManage/usermanage/index.vue
@@ -301,6 +301,7 @@
title: '是否冻结该账户',
icon: createVNode(ExclamationCircleOutlined),
content: createVNode('div', { style: 'color:red;' }, ''),
+
onOk() {
// http
// .post('/api/parking_merchant/objs/gateInfo/delete', {
@@ -309,10 +310,9 @@
// .then((res) => {
// mainRef.value.nsTableRef.reload();
// });
- NsMessage.success('冻结成功');
- },
- onCancel() {
- console.log('Cancel');
+ return new Promise((resolve, reject) => {
+ NsMessage.success('冻结成功');
+ }).catch(() => console.log('Oops errors!'));
},
class: 'test',
});
@@ -465,9 +465,6 @@
{
label: '删除',
name: 'RoleTypeEdit',
- dynamicParams: {
- uuid: 'uuid',
- },
confirm: true,
handle: (record: any, name, reload) => {
console.log(record, name, reload, 'record');
From 576f313b2fcb1c9fae3cb66fe4d3ccaaacdb7c06 Mon Sep 17 00:00:00 2001
From: xuziqiang <1344691446@qq.com>
Date: Thu, 23 May 2024 17:49:25 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E8=A1=A5=E5=85=85=E5=A4=B4?=
=?UTF-8?q?=E9=83=A8=E4=B8=8B=E6=8B=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
hx-ai-intelligent/src/config/app.config.ts | 17 +++++++++++++++++
lib/saas/view/system/layout/header.vue | 12 +++++++++++-
lib/saas/view/system/layout/tags.vue | 2 +-
lib/use/use-action.ts | 6 +++++-
4 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/hx-ai-intelligent/src/config/app.config.ts b/hx-ai-intelligent/src/config/app.config.ts
index 0143e6b..202c731 100644
--- a/hx-ai-intelligent/src/config/app.config.ts
+++ b/hx-ai-intelligent/src/config/app.config.ts
@@ -1,6 +1,8 @@
/** @format */
import { dateUtil } from '/nerv-lib/util/date-util';
import mockResource from './resource.json';
+import { ref } from 'vue';
+const value = ref('1');
export const appConfig = {
projectType: 'web',
@@ -16,6 +18,21 @@ export const appConfig = {
// },
// customUpdatePwd: () => import('/@/view/updatePassword/updatePassword.vue'),
+ headerSlotConfig: {
+ component: 'NsSelect',
+ componentProps: {
+ style: { width: '200px' },
+ placeholder: '请选择',
+ value,
+ onChange: (cur) => {
+ value.value = cur;
+ },
+ options: [
+ { label: '济阳', value: '1' },
+ { label: '临沂', value: '2' },
+ ],
+ },
+ },
timeout: 60 * 1000,
userLoginApi: () => {
return {
diff --git a/lib/saas/view/system/layout/header.vue b/lib/saas/view/system/layout/header.vue
index 2ff2876..51b489f 100644
--- a/lib/saas/view/system/layout/header.vue
+++ b/lib/saas/view/system/layout/header.vue
@@ -9,6 +9,9 @@
style="width: 192px; height: 48px; object-fit: contain" />
+
+
+