diff --git a/web/.eslintrc.js b/web/.eslintrc.js
index f4a9b6e..03c2cc1 100644
--- a/web/.eslintrc.js
+++ b/web/.eslintrc.js
@@ -37,7 +37,7 @@ module.exports = {
'@typescript-eslint/explicit-module-boundary-types': 'off',
'@typescript-eslint/no-redeclare': 'error',
'@typescript-eslint/no-non-null-asserted-optional-chain': 'off',
- '@typescript-eslint/no-unused-vars': [2],
+ '@typescript-eslint/no-unused-vars': ['off'],
'vue/custom-event-name-casing': 'off',
'vue/attributes-order': 'off',
'vue/one-component-per-file': 'off',
@@ -67,7 +67,8 @@ module.exports = {
'generator-star-spacing': 'off',
'no-unreachable': 'off',
'no-multiple-template-root': 'off',
- 'no-unused-vars': 'error',
+ 'no-unused-vars': 'warn',
+ 'vue/no-unused-vars': "off",
'no-v-model-argument': 'off',
'no-case-declarations': 'off',
'no-console': 'error',
diff --git a/web/index.html b/web/index.html
index 736d87e..3f6f08b 100644
--- a/web/index.html
+++ b/web/index.html
@@ -18,11 +18,11 @@
diff --git a/web/src/router/route.ts b/web/src/router/route.ts
index 19dcd20..b6be070 100644
--- a/web/src/router/route.ts
+++ b/web/src/router/route.ts
@@ -158,7 +158,7 @@ export const dynamicRoutes: Array = [
{
path: '/system/configSystem',
name: 'configSystem',
- component: () => import('/@/views/system/dic/index.vue'),
+ component: () => import('/@/views/system/dept/index.vue'),
meta: {
title: 'message.router.configSystem',
isLink: '',
diff --git a/web/src/views/system/log/loginLog/crud.tsx b/web/src/views/system/log/loginLog/crud.tsx
index adc46bc..259243b 100644
--- a/web/src/views/system/log/loginLog/crud.tsx
+++ b/web/src/views/system/log/loginLog/crud.tsx
@@ -54,12 +54,6 @@ export const createCrudOptions = function ({ crudExpose }: { crudExpose: CrudExp
align: 'center',
width: '70px',
columnSetDisabled: true, //禁止在列设置中选择
- formatter: (context) => {
- //计算序号,你可以自定义计算规则，此处为翻页累加
- let index = context.index ?? 1;
- let pagination = crudExpose.crudBinding.value.pagination;
- return ((pagination.currentPage ?? 1) - 1) * pagination.pageSize + index + 1;
- },
},
},
search: {
diff --git a/web/src/views/system/messageCenter/api.ts b/web/src/views/system/messageCenter/api.ts
index e47699c..bba15ee 100644
--- a/web/src/views/system/messageCenter/api.ts
+++ b/web/src/views/system/messageCenter/api.ts
@@ -1,7 +1,8 @@
-import { request } from '/@/utils/service';
-import { PageQuery, AddReq, DelReq, EditReq, InfoReq } from '@fast-crud/fast-crud';
+import {request} from '/@/utils/service';
+import {PageQuery, AddReq, DelReq, EditReq, InfoReq} from '@fast-crud/fast-crud';
export const apiPrefix = '/api/system/message_center/';
+
export function GetList(query: PageQuery) {
return request({
url: apiPrefix,
@@ -9,6 +10,7 @@ export function GetList(query: PageQuery) {
params: query,
});
}
+
export function GetObj(id: InfoReq) {
return request({
url: apiPrefix + id,
@@ -17,7 +19,6 @@ export function GetObj(id: InfoReq) {
}
export function AddObj(obj: AddReq) {
- console.log(20,obj)
return request({
url: apiPrefix,
method: 'post',
@@ -37,6 +38,6 @@ export function DelObj(id: DelReq) {
return request({
url: apiPrefix + id + '/',
method: 'delete',
- data: { id },
+ data: {id},
});
}
diff --git a/web/src/views/system/messageCenter/crud.tsx b/web/src/views/system/messageCenter/crud.tsx
index ffaa802..5b6ba5b 100644
--- a/web/src/views/system/messageCenter/crud.tsx
+++ b/web/src/views/system/messageCenter/crud.tsx
@@ -223,15 +223,7 @@ export const createCrudOptions = function ({crudExpose}: { crudExpose: CrudExpos
required: true,
message: '必填项'
}
- ],
- itemProps: {
- class: {yxtInput: true}
- }
- },
- component: {
- name: 'manyToMany',
- valueBinding: 'dept_info',
- children: 'name'
+ ]
}
},
content: {
@@ -249,9 +241,9 @@ export const createCrudOptions = function ({crudExpose}: { crudExpose: CrudExpos
}
],
component: {
- disabled: compute(({form}) => {
- return form.disabled;
- }),
+ // disabled: compute(({form}) => {
+ // return form.disabled;
+ // }),
id: "1", // 当同一个页面有多个editor时，需要配置不同的id
config: {},
uploader: {
@@ -264,6 +256,6 @@ export const createCrudOptions = function ({crudExpose}: { crudExpose: CrudExpos
}
}
}
- },
+ }
}
}
diff --git a/web/src/views/system/messageCenter/index.vue b/web/src/views/system/messageCenter/index.vue
index 1fa8634..1bfbba4 100644
--- a/web/src/views/system/messageCenter/index.vue
+++ b/web/src/views/system/messageCenter/index.vue
@@ -1,26 +1,26 @@
-
-
-
+
+
+