From f8c9a8c7e4e99d329aa0bc78ec3407320571da5b Mon Sep 17 00:00:00 2001
From: zrj <646384940@qq.com>
Date: Fri, 19 Jul 2024 10:17:17 +0800
Subject: [PATCH] 动态系统名称
---
src/config/website.js | 2
src/lang/zh.js | 2
src/page/login/index.vue | 14 ++++
src/views/system/dept.vue | 35 +++++++++++
src/store/modules/user.js | 10 +++
src/api/user.js | 7 ++
index.html | 81 +++++++++++++++++---------
src/page/login/userlogin.vue | 1
src/store/getters.js | 1
src/page/index/logo.vue | 7 +
10 files changed, 126 insertions(+), 34 deletions(-)
diff --git a/index.html b/index.html
index bde21f8..5a832d7 100644
--- a/index.html
+++ b/index.html
@@ -1,29 +1,32 @@
<!DOCTYPE html>
-<html lang='en'>
+<html lang="en">
+ <head>
+ <meta charset="UTF-8" />
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+ <meta http-equiv="X-UA-Compatible" content="chrome=1" />
+ <meta name="renderer" content="webkit" />
+ <meta
+ name="viewport"
+ content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0"
+ />
+ <meta name="apple-mobile-web-app-capable" content="yes" />
+ <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+ <meta name="format-detection" content="telephone=no" />
+ <link rel="icon" href="/favicon.png" />
+ <link rel="stylesheet" href="/iconfont/index.css" />
+ <link rel="stylesheet" href="/iconfont/avue/iconfont.css" />
+ <link rel="stylesheet" href="/iconfont/saber/iconfont.css" />
+ <link rel="stylesheet" href="/css/loading.css" />
+ <link rel="stylesheet" href="/css/saber.css" />
+ <script src="https://unpkg.com/axios/dist/axios.min.js"></script>
+ <title>中图智绘低空无人机监测网平台</title>
+ </head>
-<head>
- <meta charset='UTF-8' />
- <meta http-equiv='Content-Type' content='text/html; charset=utf-8'>
- <meta http-equiv='X-UA-Compatible' content='IE=edge'>
- <meta http-equiv='X-UA-Compatible' content='chrome=1' />
- <meta name='renderer' content='webkit'>
- <meta name='viewport' content='width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0'>
- <meta name='apple-mobile-web-app-capable' content='yes'>
- <meta name='apple-mobile-web-app-status-bar-style' content='black'>
- <meta name='format-detection' content='telephone=no'>
- <link rel='icon' href='/favicon.png' />
- <link rel='stylesheet' href='/iconfont/index.css'>
- <link rel='stylesheet' href='/iconfont/avue/iconfont.css'>
- <link rel='stylesheet' href='/iconfont/saber/iconfont.css'>
- <link rel='stylesheet' href='/css/loading.css'>
- <link rel='stylesheet' href='/css/saber.css'>
- <title>中图智绘低空无人机监测网平台</title>
-</head>
-
-<body>
-<div id='app'>
- <div id='loader-wrapper'>
- <div class='loader-box'>
+ <body>
+ <div id="app">
+ <div id="loader-wrapper">
+ <!-- <div class='loader-box'>
<span>无</span>
<span>人</span>
<span>机</span>
@@ -33,11 +36,31 @@
<span>理</span>
<span>系</span>
<span>统</span>
+ </div> -->
+ <div class="loader-title">系统加载中</div>
+ </div>
</div>
- <div class='loader-title'>系统加载中</div>
- </div>
-</div>
-<script type='module' src='/src/main.js'></script>
-</body>
+ <script type="module" src="/src/main.js"></script>
+ </body>
+ <!-- <script>
+ document.addEventListener('DOMContentLoaded', function () {
+ var getData = function (name) {
+ var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)');
+ var r = window.location.search.substr(1).match(reg);
+ if (r != null) return decodeURI(r[2]);
+ return null;
+ };
+ var id = getData('id') || 2;
+
+ console.log(id, 888);
+
+ axios.get('http://127.0.0.1/blade-system/sysConfig/getDetail?id=' + id).then(function (res) {
+ var data = res.data.data;
+ console.log(data, 5555);
+ // window.document.title = data.name;
+ document.title = data.name;
+ });
+ });
+ </script> -->
</html>
diff --git a/src/api/user.js b/src/api/user.js
index 30d06f9..37d8f12 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -171,3 +171,10 @@
phone,
},
});
+
+export const getParentDeptInfo = params =>
+ request({
+ url: '/blade-system/dept/getParentDeptInfo',
+ method: 'get',
+ params: params,
+ });
diff --git a/src/config/website.js b/src/config/website.js
index 736c05e..a0934aa 100644
--- a/src/config/website.js
+++ b/src/config/website.js
@@ -5,7 +5,7 @@
title: 'saber',
logo: 'S',
key: 'saber', //配置主键,目前用于存储
- indexTitle: '中图智绘低空无人机监测网平台',
+ indexTitle: '',
clientId: 'drone', // 客户端id
clientSecret: 'drone_secret', // 客户端密钥
tenantMode: true, // 是否开启租户模式
diff --git a/src/lang/zh.js b/src/lang/zh.js
index 7c040f1..bd3f449 100644
--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -78,7 +78,7 @@
},
login: {
title: '登录 ',
- info: '中图智绘低空无人机监测网平台',
+ info: '',
tenantId: '请输入租户ID',
username: '请输入账号',
password: '请输入密码',
diff --git a/src/page/index/logo.vue b/src/page/index/logo.vue
index f374281..033c648 100644
--- a/src/page/index/logo.vue
+++ b/src/page/index/logo.vue
@@ -7,7 +7,7 @@
</transition>
<transition-group name="fade">
<template v-if="getScreen(!isCollapse)">
- <span class="avue-logo_title" key="1">{{ website.indexTitle }} </span>
+ <span style="font-size: 15px;" class="avue-logo_title" key="1">{{ this.parentDeptInfo.sysName }} </span>
</template>
</transition-group>
</div>
@@ -21,9 +21,12 @@
data() {
return {};
},
- created() {},
+ created() {
+ },
computed: {
...mapGetters(['isCollapse']),
+ ...mapGetters(['userInfo']),
+ ...mapGetters(['parentDeptInfo']),
},
methods: {},
};
diff --git a/src/page/login/index.vue b/src/page/login/index.vue
index d5f49d7..2f3b650 100644
--- a/src/page/login/index.vue
+++ b/src/page/login/index.vue
@@ -5,7 +5,7 @@
<div class="login-time">
{{ time }}
</div>
- <p class="title">{{ $t('login.info') }}</p>
+ <p class="title">{{ login.info }}</p>
</div>
<div class="login-border">
<div class="login-main">
@@ -37,6 +37,7 @@
import { validatenull } from '@/utils/validate';
import topLang from '@/page/index/top/top-lang.vue';
import { getQueryString, getTopUrl } from '@/utils/util';
+import { getDetail } from '@/api/system/sysConfig'
import website from '@/config/website';
export default {
@@ -49,6 +50,9 @@
},
data() {
return {
+ login:{
+ info: '中图智绘低空无人机监测网平台'
+ },
website: website,
time: '',
activeName: 'user',
@@ -68,6 +72,7 @@
created() {
this.handleLogin();
this.getTime();
+ this.getSysConfigInfo();
},
mounted() {},
computed: {
@@ -75,6 +80,13 @@
},
props: [],
methods: {
+ // 动态获取系统名称
+ getSysConfigInfo(){
+ let sysConfigId = this.$route.query?.id || 2;
+ getDetail(sysConfigId).then(res=>{
+ this.login.info = res.data.data.name
+ })
+ },
getTime() {
setInterval(() => {
this.time = this.$dayjs().format('YYYY-MM-DD HH:mm:ss');
diff --git a/src/page/login/userlogin.vue b/src/page/login/userlogin.vue
index ca25a63..ddeaf20 100644
--- a/src/page/login/userlogin.vue
+++ b/src/page/login/userlogin.vue
@@ -70,6 +70,7 @@
</el-form-item> -->
<el-form-item>
<el-button
+ style="width: 100%;"
type="primary"
@click.prevent="handleLogin"
:class="this.registerMode ? 'login-submit' : 'btn-submit'"
diff --git a/src/store/getters.js b/src/store/getters.js
index 3edda43..7b108e0 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -29,6 +29,7 @@
menuId: state => state.user.menuId,
menu: state => state.user.menu,
menuAll: state => state.user.menuAll,
+ parentDeptInfo: state => state.user.parentDeptInfo,
logsList: state => state.logs.logsList,
logsLen: state => state.logs.logsList.length || 0,
logsFlag: (state, getters) => getters.logsLen === 0,
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 57ff4af..91a754a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -18,6 +18,7 @@
refreshToken,
getButtons,
registerUser,
+ getParentDeptInfo
} from '@/api/user';
import { getRoutes, getTopMenu } from '@/api/system/menu';
import { formatPath } from '@/router/avue-router';
@@ -36,6 +37,7 @@
menuAll: getStore({ name: 'menuAll' }) || [],
token: getStore({ name: 'token' }) || '',
refreshToken: getStore({ name: 'refreshToken' }) || '',
+ parentDeptInfo: getStore({ name: 'parentDeptInfo' }) || '',
},
actions: {
//根据用户名登录
@@ -63,6 +65,7 @@
commit('SET_REFRESH_TOKEN', data.refresh_token);
commit('SET_TENANT_ID', data.tenant_id);
commit('SET_USER_INFO', data);
+ commit('SET_PARENT_DEPT_INFO', data.dept_id);
commit('DEL_ALL_TAG');
commit('CLEAR_LOCK');
}
@@ -288,6 +291,13 @@
},
},
mutations: {
+ SET_PARENT_DEPT_INFO(state, deptId){
+ getParentDeptInfo({deptId:deptId}).then(res=>{
+ const data = res.data.data;
+ state.parentDeptInfo = data;
+ setStore({ name: 'parentDeptInfo', content: data });
+ })
+ },
SET_TOKEN: (state, token) => {
setToken(token);
state.token = token;
diff --git a/src/views/system/dept.vue b/src/views/system/dept.vue
index 8284488..eeb9e82 100644
--- a/src/views/system/dept.vue
+++ b/src/views/system/dept.vue
@@ -170,6 +170,41 @@
],
},
{
+ label: '机构性质',
+ type: 'select',
+ dicUrl: '/blade-system/dict/dictionary?code=org_nature',
+ props: {
+ label: 'dictValue',
+ value: 'dictKey',
+ },
+ dataType: 'number',
+ width: 120,
+ labelWidth:120,
+ prop: 'deptNature',
+ slot: true,
+ rules: [
+ {
+ required: true,
+ message: '请输入机构性质',
+ trigger: 'blur',
+ },
+ ],
+ },
+ {
+ label: '绑定编号',
+ width: 120,
+ labelWidth:120,
+ prop: 'bindCode',
+ slot: true,
+ rules: [
+ {
+ required: false,
+ message: '请输入绑定编号',
+ trigger: 'blur',
+ },
+ ],
+ },
+ {
label: '排序',
prop: 'sort',
type: 'number',
--
Gitblit v1.9.3