isoftstone/lc_frontend
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
yang chen
2025-11-27 08:49:20 +08:00
parent f5f0b4ac42 6fc69bc42a
commit bbc5ef3471
7 changed files with 4657 additions and 1767 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/api/index.ts Normal file
View File

@@ -0,0 +1,6 @@
import request from '@/config/axios'
// 获取外协管理数据
export const getOutsourcingManagementData = (data) => {
return request.post({ url: '/jeelowcode/report-data/list/kb_wx_jt', data })
}

35
src/router/modules/remaining.ts
View File

@@ -57,12 +57,45 @@ const remainingRouter: AppRouteRecordRaw[] = [
name: 'Home',
meta: {},
children: [
// {
// path: 'index',
// component: () => import('@/views/Home/Index10.vue'),
// name: 'Index',
// meta: {
// title: t('router.home'),
// icon: 'ep:home-filled',
// noCache: false,
// affix: true
// }
// },
{
path: 'index',
component: () => import('@/views/Home/Index10.vue'),
name: 'Index',
meta: {
title: t('router.home'),
title: '集团视角数据看板',
icon: 'ep:home-filled',
noCache: false,
affix: true
}
},
{
path: 'region', // 区域数据看板
component: () => import('@/views/Home/Index12.vue'),
name: 'RegionIndex',
meta: {
title: '区域视角数据看板',
icon: 'ep:home-filled',
noCache: false,
affix: true
}
},
{
path: 'park', // 园区数据看板
component: () => import('@/views/Home/Index13.vue'),
name: 'ParkIndex',
meta: {
title: '园区视角数据看板',
icon: 'ep:home-filled',
noCache: false,
affix: true

2618
src/views/Home/Index10.vue
View File

File diff suppressed because it is too large Load Diff

1800
src/views/Home/Index12.vue Normal file
View File

File diff suppressed because it is too large Load Diff

1800
src/views/Home/Index13.vue Normal file
View File

File diff suppressed because it is too large Load Diff

79
src/views/Login/components/LoginForm.vue
View File

@@ -1,14 +1,6 @@
<template>
<el-form
v-show="getShow"
ref="formLogin"
:model="loginData.loginForm"
:rules="LoginRules"
class="login-form login-form-default"
label-position="top"
label-width="120px"
size="large"
>
<el-form v-show="getShow" ref="formLogin" :model="loginData.loginForm" :rules="LoginRules"
class="login-form login-form-default" label-position="top" label-width="120px" size="large">
<el-row style="margin-right: -10px; margin-left: -10px">
<el-col :span="24" style="padding-right: 10px; padding-left: 10px">
<el-form-item>
@@ -17,40 +9,23 @@
</el-col>
<el-col :span="24" style="padding-right: 10px; padding-left: 10px">
<el-form-item v-if="loginData.tenantEnable === 'true'" prop="tenantName">
<el-input
v-model="loginData.loginForm.tenantName"
:placeholder="t('login.tenantNamePlaceholder')"
:prefix-icon="iconHouse"
link
type="primary"
/>
<el-input v-model="loginData.loginForm.tenantName" :placeholder="t('login.tenantNamePlaceholder')"
:prefix-icon="iconHouse" link type="primary" />
</el-form-item>
</el-col>
<el-col :span="24" style="padding-right: 10px; padding-left: 10px">
<el-form-item prop="username">
<el-input
v-model="loginData.loginForm.username"
:placeholder="t('login.usernamePlaceholder')"
:prefix-icon="iconAvatar"
/>
<el-input v-model="loginData.loginForm.username" :placeholder="t('login.usernamePlaceholder')"
:prefix-icon="iconAvatar" />
</el-form-item>
</el-col>
<el-col :span="24" style="padding-right: 10px; padding-left: 10px">
<el-form-item prop="password">
<el-input
v-model="loginData.loginForm.password"
:placeholder="t('login.passwordPlaceholder')"
:prefix-icon="iconLock"
show-password
type="password"
@keyup.enter="getCode()"
/>
<el-input v-model="loginData.loginForm.password" :placeholder="t('login.passwordPlaceholder')"
:prefix-icon="iconLock" show-password type="password" @keyup.enter="getCode()" />
</el-form-item>
</el-col>
<el-col
:span="24"
style="padding-right: 10px; padding-left: 10px; margin-top: -20px; margin-bottom: -20px"
>
<el-col :span="24" style="padding-right: 10px; padding-left: 10px; margin-top: -20px; margin-bottom: -20px">
<el-form-item>
<el-row justify="space-between" style="width: 100%">
<el-col :span="6">
@@ -66,13 +41,8 @@
</el-col>
<el-col :span="24" style="padding-right: 10px; padding-left: 10px" class="login-btn-col">
<el-form-item>
<XButton
:loading="loginLoading"
:title="t('login.login')"
class="w-[100%]"
type="primary"
@click="getCode()"
/>
<XButton :loading="loginLoading" :title="t('login.login')" class="w-[100%]" type="primary"
@click="getCode()" />
<div v-if="loginType == 'easy'" class="w-100% mt-6px flex justify-end">
<el-dropdown @command="easyCommand">
<div class="mt--2px cursor-pointer">
@@ -95,13 +65,8 @@
</div>
</el-form-item>
</el-col>
<Verify
ref="verify"
:captchaType="captchaType"
:imgSize="{ width: '400px', height: '200px' }"
mode="pop"
@success="handleLogin"
/>
<Verify ref="verify" :captchaType="captchaType" :imgSize="{ width: '400px', height: '200px' }" mode="pop"
@success="handleLogin" />
<template v-if="!loginType">
<el-col :span="24" style="padding-right: 10px; padding-left: 10px">
<!-- <el-form-item>
@@ -127,15 +92,8 @@
<el-col :span="24" style="padding-right: 10px; padding-left: 10px">
<el-form-item>
<div class="w-[100%] flex justify-center">
<Icon
v-for="(item, key) in socialList"
:key="key"
:icon="item.icon"
:size="50"
class="anticon cursor-pointer"
color="#999"
@click="doSocialLogin(item.type)"
/>
<Icon v-for="(item, key) in socialList" :key="key" :icon="item.icon" :size="50"
class="anticon cursor-pointer" color="#999" @click="doSocialLogin(item.type)" />
</div>
</el-form-item>
</el-col>
@@ -310,7 +268,12 @@ const handleLogin = async (params) => {
} else {
push({ path: redirect.value || permissionStore.addRouters[0].path })
}
} finally {
}
catch (e) {
loginLoading.value = false
loading.value?.close()
}
finally {
loginLoading.value = false
loading.value?.close()
}

2
vite.config.ts
View File

@@ -32,7 +32,7 @@ export default ({ command, mode }: ConfigEnv): UserConfig => {
// 本地跨域代理. 目前注释的原因：暂时没有用途，server 端已经支持跨域
proxy: {
['/admin-api']: {
target: env.VITE_BASE_URL,
target: 'http://10.28.117.100:48080',
ws: false,
changeOrigin: true,
rewrite: (path) => path.replace(new RegExp(`^/admin-api`), ''),