Compare commits
9 Commits
dev
...
6613a0651b
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6613a0651b | ||
|
|
bccb7d93e3 | ||
|
|
621fee41a4 | ||
|
|
d3403d02f9 | ||
|
|
6eefc67046 | ||
|
|
7e8ef7aa0f | ||
|
|
6da46f87ad | ||
|
|
e9be8f13ed | ||
|
|
3b39f9f3f3 |
3
src/types/components.d.ts
vendored
3
src/types/components.d.ts
vendored
@@ -23,6 +23,8 @@ declare module 'vue' {
|
|||||||
ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
|
ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
|
||||||
ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
|
ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
|
||||||
ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
|
ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
|
||||||
|
ElDescriptions: typeof import('element-plus/es')['ElDescriptions']
|
||||||
|
ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem']
|
||||||
ElDialog: typeof import('element-plus/es')['ElDialog']
|
ElDialog: typeof import('element-plus/es')['ElDialog']
|
||||||
ElDivider: typeof import('element-plus/es')['ElDivider']
|
ElDivider: typeof import('element-plus/es')['ElDivider']
|
||||||
ElDrawer: typeof import('element-plus/es')['ElDrawer']
|
ElDrawer: typeof import('element-plus/es')['ElDrawer']
|
||||||
@@ -34,7 +36,6 @@ declare module 'vue' {
|
|||||||
ElFormItem: typeof import('element-plus/es')['ElFormItem']
|
ElFormItem: typeof import('element-plus/es')['ElFormItem']
|
||||||
ElIcon: typeof import('element-plus/es')['ElIcon']
|
ElIcon: typeof import('element-plus/es')['ElIcon']
|
||||||
ElInput: typeof import('element-plus/es')['ElInput']
|
ElInput: typeof import('element-plus/es')['ElInput']
|
||||||
ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
|
|
||||||
ElMenu: typeof import('element-plus/es')['ElMenu']
|
ElMenu: typeof import('element-plus/es')['ElMenu']
|
||||||
ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
|
ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
|
||||||
ElOption: typeof import('element-plus/es')['ElOption']
|
ElOption: typeof import('element-plus/es')['ElOption']
|
||||||
|
|||||||
@@ -455,8 +455,6 @@ const updateChart = () => {
|
|||||||
type: chartType.value,
|
type: chartType.value,
|
||||||
data: yData,
|
data: yData,
|
||||||
smooth: chartType.value === 'line',
|
smooth: chartType.value === 'line',
|
||||||
symbol: 'circle', // 使用圆形标记
|
|
||||||
symbolSize: chartType.value === 'line' ? 0 : 6, // 折线图默认不显示点,柱状图不受影响
|
|
||||||
itemStyle: {
|
itemStyle: {
|
||||||
color: config.color
|
color: config.color
|
||||||
},
|
},
|
||||||
@@ -465,17 +463,6 @@ const updateChart = () => {
|
|||||||
} : undefined,
|
} : undefined,
|
||||||
areaStyle: chartType.value === 'line' ? {
|
areaStyle: chartType.value === 'line' ? {
|
||||||
opacity: 0.1
|
opacity: 0.1
|
||||||
} : undefined,
|
|
||||||
emphasis: chartType.value === 'line' ? {
|
|
||||||
symbol: 'circle',
|
|
||||||
symbolSize: 12,
|
|
||||||
itemStyle: {
|
|
||||||
color: config.color,
|
|
||||||
borderColor: '#fff',
|
|
||||||
borderWidth: 3,
|
|
||||||
shadowBlur: 8,
|
|
||||||
shadowColor: config.color
|
|
||||||
}
|
|
||||||
} : undefined
|
} : undefined
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -6,10 +6,10 @@
|
|||||||
<lang-select />
|
<lang-select />
|
||||||
</div> -->
|
</div> -->
|
||||||
<el-form-item v-if="tenantEnabled" prop="tenantId">
|
<el-form-item v-if="tenantEnabled" prop="tenantId">
|
||||||
<el-select v-model="loginForm.tenantId" filterable :placeholder="proxy.$t('login.selectPlaceholder')" style="width: 100%">
|
<!-- <el-select v-model="loginForm.tenantId" filterable :placeholder="proxy.$t('login.selectPlaceholder')" style="width: 100%">-->
|
||||||
<el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"></el-option>
|
<!-- <el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"></el-option>-->
|
||||||
<template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>
|
<!-- <template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>-->
|
||||||
</el-select>
|
<!-- </el-select>-->
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item prop="username">
|
<el-form-item prop="username">
|
||||||
<el-input v-model="loginForm.username" type="text" size="large" auto-complete="off" :placeholder="proxy.$t('login.username')">
|
<el-input v-model="loginForm.username" type="text" size="large" auto-complete="off" :placeholder="proxy.$t('login.username')">
|
||||||
@@ -87,8 +87,8 @@ const { t } = useI18n();
|
|||||||
|
|
||||||
const loginForm = ref<LoginData>({
|
const loginForm = ref<LoginData>({
|
||||||
tenantId: '111111',
|
tenantId: '111111',
|
||||||
username: 'admin',
|
username: 'fishery',
|
||||||
password: 'admin123',
|
password: 'fishery@123',
|
||||||
rememberMe: false,
|
rememberMe: false,
|
||||||
code: '',
|
code: '',
|
||||||
uuid: ''
|
uuid: ''
|
||||||
@@ -216,7 +216,7 @@ const doSocialLogin = (type: string) => {
|
|||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
getCode();
|
getCode();
|
||||||
initTenantList();
|
// initTenantList();
|
||||||
getLoginData();
|
getLoginData();
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
@@ -301,7 +301,7 @@ onMounted(() => {
|
|||||||
backdrop-filter: blur(2px);
|
backdrop-filter: blur(2px);
|
||||||
text-shadow: 1px 1px 3px rgba(0, 0, 0, 0.8);
|
text-shadow: 1px 1px 3px rgba(0, 0, 0, 0.8);
|
||||||
z-index: 2;
|
z-index: 2;
|
||||||
|
|
||||||
span {
|
span {
|
||||||
padding: 5px 15px;
|
padding: 5px 15px;
|
||||||
border-radius: 15px;
|
border-radius: 15px;
|
||||||
@@ -309,12 +309,12 @@ onMounted(() => {
|
|||||||
backdrop-filter: blur(5px);
|
backdrop-filter: blur(5px);
|
||||||
border: 1px solid rgba(255, 255, 255, 0.1);
|
border: 1px solid rgba(255, 255, 255, 0.1);
|
||||||
}
|
}
|
||||||
|
|
||||||
a {
|
a {
|
||||||
color:rgb(255, 255, 255) !important;
|
color:rgb(255, 255, 255) !important;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
transition: color 0.3s ease;
|
transition: color 0.3s ease;
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
color: #66b1ff !important;
|
color: #66b1ff !important;
|
||||||
text-shadow: 0 0 5px rgba(64, 158, 255, 0.5);
|
text-shadow: 0 0 5px rgba(64, 158, 255, 0.5);
|
||||||
|
|||||||
Reference in New Issue
Block a user