zhouhui
/
lcny-vue3-antd-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

develop
ihzero 2023-10-31 12:12:04 +08:00
parent 93f73bb246
commit 3cc434a8bc
9 changed files with 64 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/store/modules/user.ts
View File

@ -127,6 +127,17 @@ export const useUserStore = defineStore({
router.addRoute(PAGE_NOT_FOUND_ROUTE as unknown as RouteRecordRaw)
permissionStore.setDynamicAddedRoute(true)
}
const isAuthData = userInfo?.permissions.includes('endpoint.data_dashboard')
if (!isAuthData && homeRouter == '/v') {
const { notification } = useMessage()
notification.error({
message: '登陆失败',
description: `没有权限`,
duration: 3,
})
return this.logout()
}
goHome && (await router.replace(homeRouter ?? PageEnum.BASE_HOME))
}
return userInfo

12
src/views/base/estate/materiels/materiels.data.ts
View File

@ -184,7 +184,11 @@ export const accountFormSchema: FormSchema[] = [
component: 'InputNumber',
componentProps: {
formatter: (value) => {
let reg = /^(-)*(\d+)\.(\d\d).*$/
const reg = /^(-)*(\d+)\.(\d\d).*$/
return `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, '').replace(reg, '$1$2.$3')
},
parser: (value) => {
const reg = /^(-)*(\d+)\.(\d\d).*$/
return `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, '').replace(reg, '$1$2.$3')
},
},
@ -196,7 +200,11 @@ export const accountFormSchema: FormSchema[] = [
component: 'InputNumber',
componentProps: {
formatter: (value) => {
let reg = /^(-)*(\d+)\.(\d\d).*$/
const reg = /^(-)*(\d+)\.(\d\d).*$/
return `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, '').replace(reg, '$1$2.$3')
},
parser: (value) => {
const reg = /^(-)*(\d+)\.(\d\d).*$/
return `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, '').replace(reg, '$1$2.$3')
},
},

4
src/views/base/estate/shrim-price/shrim-price-week.ts
View File

@ -106,6 +106,10 @@ export const accountFormSchema: FormSchema[] = [
const reg = /^(-)*(\d+)\.(\d\d).*$/
return `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, '').replace(reg, '$1$2.$3')
},
parser: (value) => {
const reg = /^(-)*(\d+)\.(\d\d).*$/
return `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, '').replace(reg, '$1$2.$3')
},
},
},
]

6
src/views/base/estate/shrim-price/shrim-price.ts
View File

@ -102,7 +102,11 @@ export const accountFormSchema: FormSchema[] = [
component: 'InputNumber',
componentProps: {
formatter: (value) => {
let reg = /^(-)*(\d+)\.(\d\d).*$/
const reg = /^(-)*(\d+)\.(\d\d).*$/
return `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, '').replace(reg, '$1$2.$3')
},
parser: (value) => {
const reg = /^(-)*(\d+)\.(\d\d).*$/
return `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, '').replace(reg, '$1$2.$3')
},
},

6
src/views/base/estate/shrimp-flows/shrimp-flows.ts
View File

@ -115,7 +115,11 @@ export const accountFormSchema: FormSchema[] = [
component: 'InputNumber',
componentProps: {
formatter: (value) => {
let reg = /^(-)*(\d+)\.(\d\d).*$/
const reg = /^(-)*(\d+)\.(\d\d).*$/
return `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, '').replace(reg, '$1$2.$3')
},
parser: (value) => {
const reg = /^(-)*(\d+)\.(\d\d).*$/
return `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, '').replace(reg, '$1$2.$3')
},
},

18
src/views/base/estate/shrimp-industries/shrimp-industries.ts
View File

@ -119,7 +119,11 @@ export const accountFormSchema: FormSchema[] = [
component: 'InputNumber',
componentProps: {
formatter: (value) => {
let reg = /^(-)*(\d+)\.(\d\d).*$/
const reg = /^(-)*(\d+)\.(\d\d).*$/
return `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, '').replace(reg, '$1$2.$3')
},
parser: (value) => {
const reg = /^(-)*(\d+)\.(\d\d).*$/
return `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, '').replace(reg, '$1$2.$3')
},
},
@ -132,7 +136,11 @@ export const accountFormSchema: FormSchema[] = [
component: 'InputNumber',
componentProps: {
formatter: (value) => {
let reg = /^(-)*(\d+)\.(\d\d).*$/
const reg = /^(-)*(\d+)\.(\d\d).*$/
return `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, '').replace(reg, '$1$2.$3')
},
parser: (value) => {
const reg = /^(-)*(\d+)\.(\d\d).*$/
return `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, '').replace(reg, '$1$2.$3')
},
},
@ -145,7 +153,11 @@ export const accountFormSchema: FormSchema[] = [
component: 'InputNumber',
componentProps: {
formatter: (value) => {
let reg = /^(-)*(\d+)\.(\d\d).*$/
const reg = /^(-)*(\d+)\.(\d\d).*$/
return `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, '').replace(reg, '$1$2.$3')
},
parser: (value) => {
const reg = /^(-)*(\d+)\.(\d\d).*$/
return `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, '').replace(reg, '$1$2.$3')
},
},

3
src/views/system/account/AccountDrawer.vue
View File

@ -35,6 +35,7 @@
...res,
role_id: res?.roles.map((e) => e.id)[0],
base_ids: res?.bases.map((e) => e.id),
view_all_bases: res?.view_all_bases == 0 ? false : true,
})
}
})
@ -43,8 +44,10 @@
try {
const values = await validate()
setDrawerProps({ confirmLoading: true })
values.view_all_bases = values.view_all_bases ? 1 : 0
if (values.id) {
values.role_id = values?.role_id
// 修改
await editUser(values.id, values)
} else {

11
src/views/system/account/account.data.ts
View File

@ -202,12 +202,21 @@ export const accountFormSchema: FormSchema[] = [
},
],
},
{
field: 'view_all_bases',
label: '全部基地',
component: 'Checkbox',
defaultValue: true,
componentProps: {},
},
{
field: 'base_ids',
label: '基地数据',
required: false,
component: 'ApiSelect',
ifShow: ({ values }) => {
return !values.view_all_bases
},
componentProps: {
api: async () => {
const { data } = await getAgriculturalBasic()

2
src/views/visualization/components/CQJC.vue
View File

@ -130,7 +130,7 @@
left: '2%',
right: '4%',
bottom: '4%',
top: '16%',
top: '18%',
containLabel: true,
},
xAxis: {