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

src/api/index.ts

@@ -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 })
+}

src/router/modules/remaining.ts

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

src/views/Login/components/LoginForm.vue

@@ -1,14 +1,6 @@
 <template>
-  <el-form
+  <el-form v-show="getShow" ref="formLogin" :model="loginData.loginForm" :rules="LoginRules"
-    v-show="getShow"
+    class="login-form login-form-default" label-position="top" label-width="120px" size="large">
-    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
+          <el-input v-model="loginData.loginForm.tenantName" :placeholder="t('login.tenantNamePlaceholder')"
-            v-model="loginData.loginForm.tenantName"
+            :prefix-icon="iconHouse" link type="primary" />
-            :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
+          <el-input v-model="loginData.loginForm.username" :placeholder="t('login.usernamePlaceholder')"
-            v-model="loginData.loginForm.username"
+            :prefix-icon="iconAvatar" />
-            :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
+          <el-input v-model="loginData.loginForm.password" :placeholder="t('login.passwordPlaceholder')"
-            v-model="loginData.loginForm.password"
+            :prefix-icon="iconLock" show-password type="password" @keyup.enter="getCode()" />
-            :placeholder="t('login.passwordPlaceholder')"
-            :prefix-icon="iconLock"
-            show-password
-            type="password"
-            @keyup.enter="getCode()"
-          />
         </el-form-item>
       </el-col>
-      <el-col
+      <el-col :span="24" style="padding-right: 10px; padding-left: 10px; margin-top: -20px; margin-bottom: -20px">
-        :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
+          <XButton :loading="loginLoading" :title="t('login.login')" class="w-[100%]" type="primary"
-            :loading="loginLoading"
+            @click="getCode()" />
-            :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
+      <Verify ref="verify" :captchaType="captchaType" :imgSize="{ width: '400px', height: '200px' }" mode="pop"
-        ref="verify"
+        @success="handleLogin" />
-        :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
+              <Icon v-for="(item, key) in socialList" :key="key" :icon="item.icon" :size="50"
-                v-for="(item, key) in socialList"
+                class="anticon cursor-pointer" color="#999" @click="doSocialLogin(item.type)" />
-                :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()
   }

vite.config.ts

@@ -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`), ''),