Compare commits

..

9 Commits

Author SHA1 Message Date
tianyongbao
6613a0651b fix:功能进一步优化。 2026-01-10 02:02:28 +08:00
tianyongbao
bccb7d93e3 fix: 功能完善。 2026-01-10 02:02:12 +08:00
tianyongbao
621fee41a4 Merge branch 'dev' into test 2025-12-14 23:17:30 +08:00
tianyongbao
d3403d02f9 feat: 新功能开发,页面开发。 2025-11-05 00:45:11 +08:00
tianyongbao
6eefc67046 feat: 新功能开发,设备实时数据查看等。 2025-11-05 00:45:07 +08:00
tianyongbao
7e8ef7aa0f feat: 新功能开发,设备告警信息、设备实时数据查看等。 2025-10-30 11:22:19 +08:00
tianyongbao
6da46f87ad fix: 登录页,去掉租户选择。 2025-10-24 20:42:33 +08:00
tianyongbao
e9be8f13ed fix: 首页功能优化。 2025-10-24 20:42:13 +08:00
tianyongbao
3b39f9f3f3 feat:功能优化,设备报警信息、微信缓存用户,操作记录信息,代码提交。 2025-10-24 20:42:09 +08:00
3 changed files with 12 additions and 24 deletions

View File

@@ -23,6 +23,8 @@ declare module 'vue' {
ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
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']
ElDivider: typeof import('element-plus/es')['ElDivider']
ElDrawer: typeof import('element-plus/es')['ElDrawer']
@@ -34,7 +36,6 @@ declare module 'vue' {
ElFormItem: typeof import('element-plus/es')['ElFormItem']
ElIcon: typeof import('element-plus/es')['ElIcon']
ElInput: typeof import('element-plus/es')['ElInput']
ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
ElMenu: typeof import('element-plus/es')['ElMenu']
ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
ElOption: typeof import('element-plus/es')['ElOption']

View File

@@ -455,8 +455,6 @@ const updateChart = () => {
type: chartType.value,
data: yData,
smooth: chartType.value === 'line',
symbol: 'circle', // 使用圆形标记
symbolSize: chartType.value === 'line' ? 0 : 6, // 折线图默认不显示点,柱状图不受影响
itemStyle: {
color: config.color
},
@@ -465,17 +463,6 @@ const updateChart = () => {
} : undefined,
areaStyle: chartType.value === 'line' ? {
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
}
]

View File

@@ -6,10 +6,10 @@
<lang-select />
</div> -->
<el-form-item v-if="tenantEnabled" prop="tenantId">
<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>
<template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>
</el-select>
<!-- <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>-->
<!-- <template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>-->
<!-- </el-select>-->
</el-form-item>
<el-form-item prop="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>({
tenantId: '111111',
username: 'admin',
password: 'admin123',
username: 'fishery',
password: 'fishery@123',
rememberMe: false,
code: '',
uuid: ''
@@ -216,7 +216,7 @@ const doSocialLogin = (type: string) => {
onMounted(() => {
getCode();
initTenantList();
// initTenantList();
getLoginData();
});
</script>
@@ -301,7 +301,7 @@ onMounted(() => {
backdrop-filter: blur(2px);
text-shadow: 1px 1px 3px rgba(0, 0, 0, 0.8);
z-index: 2;
span {
padding: 5px 15px;
border-radius: 15px;
@@ -309,12 +309,12 @@ onMounted(() => {
backdrop-filter: blur(5px);
border: 1px solid rgba(255, 255, 255, 0.1);
}
a {
color:rgb(255, 255, 255) !important;
text-decoration: none;
transition: color 0.3s ease;
&:hover {
color: #66b1ff !important;
text-shadow: 0 0 5px rgba(64, 158, 255, 0.5);