diff --git a/src/api/system/tenant.ts b/src/api/system/tenant.ts
index 386cd18..e0ee5c9 100644
--- a/src/api/system/tenant.ts
+++ b/src/api/system/tenant.ts
@@ -1,7 +1,6 @@
/*
* 项目管理接口
*/
-import qs from 'qs'
import request from '../index'
const prefix = 'sys'
@@ -41,15 +40,12 @@
}
// 删除项目管理
-export function delTenantSys(ids: any) {
+export function delTenantSys(ids: string[]) {
return request({
url: `${prefix}/tenant/delete`,
method: 'post',
- params: {
+ data: {
ids,
},
- paramsSerializer: (params) => {
- return qs.stringify(params, { indices: false })
- },
})
}
diff --git a/src/api/system/tenant.ts b/src/api/system/tenant.ts
index 386cd18..e0ee5c9 100644
--- a/src/api/system/tenant.ts
+++ b/src/api/system/tenant.ts
@@ -1,7 +1,6 @@
/*
* 项目管理接口
*/
-import qs from 'qs'
import request from '../index'
const prefix = 'sys'
@@ -41,15 +40,12 @@
}
// 删除项目管理
-export function delTenantSys(ids: any) {
+export function delTenantSys(ids: string[]) {
return request({
url: `${prefix}/tenant/delete`,
method: 'post',
- params: {
+ data: {
ids,
},
- paramsSerializer: (params) => {
- return qs.stringify(params, { indices: false })
- },
})
}
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index ae803be..84e7833 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -78,7 +78,7 @@
- {{ userStore.account }}
+ {{ userStore.username }}
diff --git a/src/api/system/tenant.ts b/src/api/system/tenant.ts
index 386cd18..e0ee5c9 100644
--- a/src/api/system/tenant.ts
+++ b/src/api/system/tenant.ts
@@ -1,7 +1,6 @@
/*
* 项目管理接口
*/
-import qs from 'qs'
import request from '../index'
const prefix = 'sys'
@@ -41,15 +40,12 @@
}
// 删除项目管理
-export function delTenantSys(ids: any) {
+export function delTenantSys(ids: string[]) {
return request({
url: `${prefix}/tenant/delete`,
method: 'post',
- params: {
+ data: {
ids,
},
- paramsSerializer: (params) => {
- return qs.stringify(params, { indices: false })
- },
})
}
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index ae803be..84e7833 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -78,7 +78,7 @@
- {{ userStore.account }}
+ {{ userStore.username }}
diff --git a/src/main.ts b/src/main.ts
index 3afe8f9..50dbe9f 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -25,7 +25,6 @@
app.use(ElementPlus)
app.use(pinia)
app.use(router)
-app.use(hasPermission)
directive(app)
app.mount('#app')
diff --git a/src/api/system/tenant.ts b/src/api/system/tenant.ts
index 386cd18..e0ee5c9 100644
--- a/src/api/system/tenant.ts
+++ b/src/api/system/tenant.ts
@@ -1,7 +1,6 @@
/*
* 项目管理接口
*/
-import qs from 'qs'
import request from '../index'
const prefix = 'sys'
@@ -41,15 +40,12 @@
}
// 删除项目管理
-export function delTenantSys(ids: any) {
+export function delTenantSys(ids: string[]) {
return request({
url: `${prefix}/tenant/delete`,
method: 'post',
- params: {
+ data: {
ids,
},
- paramsSerializer: (params) => {
- return qs.stringify(params, { indices: false })
- },
})
}
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index ae803be..84e7833 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -78,7 +78,7 @@
- {{ userStore.account }}
+ {{ userStore.username }}
diff --git a/src/main.ts b/src/main.ts
index 3afe8f9..50dbe9f 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -25,7 +25,6 @@
app.use(ElementPlus)
app.use(pinia)
app.use(router)
-app.use(hasPermission)
directive(app)
app.mount('#app')
diff --git a/src/views/personal/edit.password.vue b/src/views/personal/edit.password.vue
index 7246b42..cc26b64 100644
--- a/src/views/personal/edit.password.vue
+++ b/src/views/personal/edit.password.vue
@@ -47,20 +47,20 @@
function onSubmit() {
formRef.value && formRef.value.validate((valid) => {
if (valid) {
- userStore.editPassword(form.value).then(() => {
- ElMessage({
- type: 'success',
- message: '模拟修改成功,请重新登录',
- })
- userStore.logout().then(() => {
- router.push({
- name: 'login',
- query: {
- redirect: route.fullPath,
- },
- })
- })
- })
+ // userStore.editPassword(form.value).then(() => {
+ // ElMessage({
+ // type: 'success',
+ // message: '模拟修改成功,请重新登录',
+ // })
+ // userStore.logout().then(() => {
+ // router.push({
+ // name: 'login',
+ // query: {
+ // redirect: route.fullPath,
+ // },
+ // })
+ // })
+ // })
}
})
}
diff --git a/src/api/system/tenant.ts b/src/api/system/tenant.ts
index 386cd18..e0ee5c9 100644
--- a/src/api/system/tenant.ts
+++ b/src/api/system/tenant.ts
@@ -1,7 +1,6 @@
/*
* 项目管理接口
*/
-import qs from 'qs'
import request from '../index'
const prefix = 'sys'
@@ -41,15 +40,12 @@
}
// 删除项目管理
-export function delTenantSys(ids: any) {
+export function delTenantSys(ids: string[]) {
return request({
url: `${prefix}/tenant/delete`,
method: 'post',
- params: {
+ data: {
ids,
},
- paramsSerializer: (params) => {
- return qs.stringify(params, { indices: false })
- },
})
}
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index ae803be..84e7833 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -78,7 +78,7 @@
- {{ userStore.account }}
+ {{ userStore.username }}
diff --git a/src/main.ts b/src/main.ts
index 3afe8f9..50dbe9f 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -25,7 +25,6 @@
app.use(ElementPlus)
app.use(pinia)
app.use(router)
-app.use(hasPermission)
directive(app)
app.mount('#app')
diff --git a/src/views/personal/edit.password.vue b/src/views/personal/edit.password.vue
index 7246b42..cc26b64 100644
--- a/src/views/personal/edit.password.vue
+++ b/src/views/personal/edit.password.vue
@@ -47,20 +47,20 @@
function onSubmit() {
formRef.value && formRef.value.validate((valid) => {
if (valid) {
- userStore.editPassword(form.value).then(() => {
- ElMessage({
- type: 'success',
- message: '模拟修改成功,请重新登录',
- })
- userStore.logout().then(() => {
- router.push({
- name: 'login',
- query: {
- redirect: route.fullPath,
- },
- })
- })
- })
+ // userStore.editPassword(form.value).then(() => {
+ // ElMessage({
+ // type: 'success',
+ // message: '模拟修改成功,请重新登录',
+ // })
+ // userStore.logout().then(() => {
+ // router.push({
+ // name: 'login',
+ // query: {
+ // redirect: route.fullPath,
+ // },
+ // })
+ // })
+ // })
}
})
}
diff --git a/src/views/system/area/editArea.vue b/src/views/system/area/editArea.vue
index 12645b7..b300494 100644
--- a/src/views/system/area/editArea.vue
+++ b/src/views/system/area/editArea.vue
@@ -22,8 +22,8 @@
num: 99, // 排序
}) // 表单
const areaSelectShow = ref(false)
-const areaLevelList = ref([]) // 区域树列表数据
-const textMap = {
+const areaLevelList = ref([]) as any // 区域树列表数据
+const textMap: { [key: string]: string } = {
update: '编辑',
create: '新增',
} // 表头显示标题
@@ -37,10 +37,10 @@
num: [{ required: true, message: '排序必填' }, { type: 'number', message: '必须为数字值' }],
} // 前端校验规则
-const areaTree = computed(() => {
- const tree = toTreeList(areaTreeList)
- return tree
-})
+// const areaTree = computed(() => {
+// const tree = toTreeList(areaTreeList)
+// return tree
+// })
// 重置表单
const resetForm = () => {
areaForm.value = {
diff --git a/src/api/system/tenant.ts b/src/api/system/tenant.ts
index 386cd18..e0ee5c9 100644
--- a/src/api/system/tenant.ts
+++ b/src/api/system/tenant.ts
@@ -1,7 +1,6 @@
/*
* 项目管理接口
*/
-import qs from 'qs'
import request from '../index'
const prefix = 'sys'
@@ -41,15 +40,12 @@
}
// 删除项目管理
-export function delTenantSys(ids: any) {
+export function delTenantSys(ids: string[]) {
return request({
url: `${prefix}/tenant/delete`,
method: 'post',
- params: {
+ data: {
ids,
},
- paramsSerializer: (params) => {
- return qs.stringify(params, { indices: false })
- },
})
}
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index ae803be..84e7833 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -78,7 +78,7 @@
- {{ userStore.account }}
+ {{ userStore.username }}
diff --git a/src/main.ts b/src/main.ts
index 3afe8f9..50dbe9f 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -25,7 +25,6 @@
app.use(ElementPlus)
app.use(pinia)
app.use(router)
-app.use(hasPermission)
directive(app)
app.mount('#app')
diff --git a/src/views/personal/edit.password.vue b/src/views/personal/edit.password.vue
index 7246b42..cc26b64 100644
--- a/src/views/personal/edit.password.vue
+++ b/src/views/personal/edit.password.vue
@@ -47,20 +47,20 @@
function onSubmit() {
formRef.value && formRef.value.validate((valid) => {
if (valid) {
- userStore.editPassword(form.value).then(() => {
- ElMessage({
- type: 'success',
- message: '模拟修改成功,请重新登录',
- })
- userStore.logout().then(() => {
- router.push({
- name: 'login',
- query: {
- redirect: route.fullPath,
- },
- })
- })
- })
+ // userStore.editPassword(form.value).then(() => {
+ // ElMessage({
+ // type: 'success',
+ // message: '模拟修改成功,请重新登录',
+ // })
+ // userStore.logout().then(() => {
+ // router.push({
+ // name: 'login',
+ // query: {
+ // redirect: route.fullPath,
+ // },
+ // })
+ // })
+ // })
}
})
}
diff --git a/src/views/system/area/editArea.vue b/src/views/system/area/editArea.vue
index 12645b7..b300494 100644
--- a/src/views/system/area/editArea.vue
+++ b/src/views/system/area/editArea.vue
@@ -22,8 +22,8 @@
num: 99, // 排序
}) // 表单
const areaSelectShow = ref(false)
-const areaLevelList = ref([]) // 区域树列表数据
-const textMap = {
+const areaLevelList = ref([]) as any // 区域树列表数据
+const textMap: { [key: string]: string } = {
update: '编辑',
create: '新增',
} // 表头显示标题
@@ -37,10 +37,10 @@
num: [{ required: true, message: '排序必填' }, { type: 'number', message: '必须为数字值' }],
} // 前端校验规则
-const areaTree = computed(() => {
- const tree = toTreeList(areaTreeList)
- return tree
-})
+// const areaTree = computed(() => {
+// const tree = toTreeList(areaTreeList)
+// return tree
+// })
// 重置表单
const resetForm = () => {
areaForm.value = {
diff --git a/src/views/system/tenant/editTenant.vue b/src/views/system/tenant/editTenant.vue
index 1ef620c..bfae46c 100644
--- a/src/views/system/tenant/editTenant.vue
+++ b/src/views/system/tenant/editTenant.vue
@@ -4,7 +4,7 @@
import { ElMessage, ElMessageBox } from 'element-plus'
import type { IdeviceForm } from './tenant_interface'
import DeptSelect from '@/components/DeptSelect/index.vue'
-import { addTenant, getDevice, updateTenant } from '@/api/system/tenant'
+import { addTenant, updateTenant } from '@/api/system/tenant'
const emits = defineEmits(['watchChild'])
const dataFormRef = ref()