qdintc/fishery-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: qdintc:dev
Branches Tags
qdintc:master qdintc:test qdintc:dev
...
compare: qdintc:621fee41a4d3a0fbbb501d353b7f856fd95cc880
Branches Tags
qdintc:test qdintc:dev qdintc:master

7 Commits
dev ... 621fee41a4

Author SHA1 Message Date
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
2 changed files with 11 additions and 12 deletions
Expand all files Collapse all files

3
src/types/components.d.ts vendored
View File

@@ -40,13 +40,13 @@ declare module 'vue' {
ElImage: typeof import('element-plus/es')['ElImage'] ElImage: typeof import('element-plus/es')['ElImage']
ElInput: typeof import('element-plus/es')['ElInput'] ElInput: typeof import('element-plus/es')['ElInput']
ElInputNumber: typeof import('element-plus/es')['ElInputNumber'] ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
ElLink: typeof import('element-plus/es')['ElLink']
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']
ElPagination: typeof import('element-plus/es')['ElPagination'] ElPagination: typeof import('element-plus/es')['ElPagination']
ElPopover: typeof import('element-plus/es')['ElPopover'] ElPopover: typeof import('element-plus/es')['ElPopover']
ElRadio: typeof import('element-plus/es')['ElRadio'] ElRadio: typeof import('element-plus/es')['ElRadio']
ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
ElRow: typeof import('element-plus/es')['ElRow'] ElRow: typeof import('element-plus/es')['ElRow']
ElScrollbar: typeof import('element-plus/es')['ElScrollbar'] ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
@@ -70,7 +70,6 @@ declare module 'vue' {
IconSelect: typeof import('./../components/IconSelect/index.vue')['default'] IconSelect: typeof import('./../components/IconSelect/index.vue')['default']
IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default'] IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default']
IEpCaretTop: typeof import('~icons/ep/caret-top')['default'] IEpCaretTop: typeof import('~icons/ep/caret-top')['default']
IEpUploadFilled: typeof import('~icons/ep/upload-filled')['default']
IFrame: typeof import('./../components/iFrame/index.vue')['default'] IFrame: typeof import('./../components/iFrame/index.vue')['default']
ImagePreview: typeof import('./../components/ImagePreview/index.vue')['default'] ImagePreview: typeof import('./../components/ImagePreview/index.vue')['default']
ImageUpload: typeof import('./../components/ImageUpload/index.vue')['default'] ImageUpload: typeof import('./../components/ImageUpload/index.vue')['default']

14
src/views/login.vue
View File

@@ -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>