Skip to content

D
dataease
提交 33e2e0c0 authored 作者: 顾杰's avatar 顾杰
浏览文件
操作

fix: icon、title

上级 cbb2e8e6
隐藏空白字符变更
内嵌 并排
正在显示 包含 31 行增加 和 21 行删除
frontend/.env.development
浏览文件 @ 33e2e0c0
...@@ -3,7 +3,7 @@ ENV = 'development' ...@@ -3,7 +3,7 @@ ENV = 'development'
# base api # base api
# VUE_APP_BASE_API = '/dev-api' # VUE_APP_BASE_API = '/dev-api'
VUE_APP_BASE_API = 'http://localhost:8081/' VUE_APP_BASE_API = 'http://222.190.143.210:8000/de-api/'
# vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable, # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
# to control whether the babel-plugin-dynamic-import-node plugin is enabled. # to control whether the babel-plugin-dynamic-import-node plugin is enabled.
# It only does one thing by converting all import() to require(). # It only does one thing by converting all import() to require().
......
frontend/public/index.html
浏览文件 @ 33e2e0c0
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<link rel="icon" href="<%= BASE_URL %>favicon.ico"> <link rel="icon" href="<%= BASE_URL %>icon.ico">
<title><%= webpackConfig.name %></title> <title><%= webpackConfig.name %></title>
</head> </head>
<body> <body>
......
frontend/public/nolic.html
浏览文件 @ 33e2e0c0
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<title>DataEase</title> <title>南京高等职业技术学院</title>
</head> </head>
<body style="height: 100%;"> <body style="height: 100%;">
<div>缺少许可</div> <div>缺少许可</div>
......
frontend/src/lang/en.js
浏览文件 @ 33e2e0c0
...@@ -2019,7 +2019,7 @@ export default { ...@@ -2019,7 +2019,7 @@ export default {
firstOfYear: 'First month of this year' firstOfYear: 'First month of this year'
}, },
wizard: { wizard: {
welcome_title: 'Welcome To Use DataEase', welcome_title: 'Welcome To Use',
welcome_hint: 'Open source data visual analysis tool available to everyone', welcome_hint: 'Open source data visual analysis tool available to everyone',
demo_video: 'Demo', demo_video: 'Demo',
quick_start: 'Quick Start', quick_start: 'Quick Start',
......
frontend/src/lang/tw.js
浏览文件 @ 33e2e0c0
...@@ -2030,7 +2030,7 @@ export default { ...@@ -2030,7 +2030,7 @@ export default {
firstOfYear: '當年首月' firstOfYear: '當年首月'
}, },
wizard: { wizard: {
welcome_title: '歡迎使用DataEase', welcome_title: '歡迎使用',
welcome_hint: '人人可用的開源數據可視化分析工具', welcome_hint: '人人可用的開源數據可視化分析工具',
demo_video: '演示視頻', demo_video: '演示視頻',
quick_start: '快速入門', quick_start: '快速入門',
......
frontend/src/lang/zh.js
浏览文件 @ 33e2e0c0
...@@ -2038,7 +2038,7 @@ export default { ...@@ -2038,7 +2038,7 @@ export default {
firstOfYear: '当年首月' firstOfYear: '当年首月'
}, },
wizard: { wizard: {
welcome_title: '欢迎使用DataEase', welcome_title: '欢迎使用',
welcome_hint: '人人可用的开源数据可视化分析工具', welcome_hint: '人人可用的开源数据可视化分析工具',
demo_video: '演示视频', demo_video: '演示视频',
quick_start: '快速入门', quick_start: '快速入门',
......
frontend/src/layout/components/Topbar.vue
浏览文件 @ 33e2e0c0
<template> <template>
<div class="top-nav"> <div class="top-nav">
<div v-loading="!axiosFinished" class="log"> <div v-loading="!axiosFinished" class="log">
<svg-icon v-if="!logoUrl && axiosFinished" icon-class="DataEase" custom-class="top-nav-logo-icon" /> <!-- <svg-icon v-if="!logoUrl && axiosFinished" icon-class="DataEase" custom-class="top-nav-logo-icon" />
<img v-if="logoUrl && axiosFinished" :src="logoUrl" width="140" alt="" style="padding-top: 10px;"> <img v-if="logoUrl && axiosFinished" :src="logoUrl" width="140" alt="" style="padding-top: 10px;"> -->
<img src="@/assets/nav_icon.png" width="140" alt="" style="padding-top: 10px;" />
</div> </div>
<el-menu <el-menu
class="de-top-menu" class="de-top-menu"
...@@ -25,7 +26,7 @@ ...@@ -25,7 +26,7 @@
<notification class="right-menu-item hover-effect" /> <notification class="right-menu-item hover-effect" />
<lang-select class="right-menu-item hover-effect" /> <lang-select class="right-menu-item hover-effect" />
<div style="height: 100%;padding: 0 8px;" class="right-menu-item hover-effect"> <!-- <div style="height: 100%;padding: 0 8px;" class="right-menu-item hover-effect">
<a <a
:href="helpLink" :href="helpLink"
target="_blank" target="_blank"
...@@ -33,7 +34,7 @@ ...@@ -33,7 +34,7 @@
> >
<svg-icon icon-class="docs" /> <svg-icon icon-class="docs" />
</a> </a>
</div> </div> -->
</template> </template>
<el-dropdown <el-dropdown
...@@ -60,9 +61,9 @@ ...@@ -60,9 +61,9 @@
<el-dropdown-item>{{ $t('user.change_password') }}</el-dropdown-item> <el-dropdown-item>{{ $t('user.change_password') }}</el-dropdown-item>
</router-link> </router-link>
<router-link to="/about/index"> <!-- <router-link to="/about/index">
<el-dropdown-item>{{ $t('commons.about_us') }}</el-dropdown-item> <el-dropdown-item>{{ $t('commons.about_us') }}</el-dropdown-item>
</router-link> </router-link> -->
<el-dropdown-item divided @click.native="logout"> <el-dropdown-item divided @click.native="logout">
<span style="display:block;">{{ $t('commons.exit_system') }}</span> <span style="display:block;">{{ $t('commons.exit_system') }}</span>
</el-dropdown-item> </el-dropdown-item>
......
frontend/src/settings.js
浏览文件 @ 33e2e0c0
...@@ -2,7 +2,7 @@ module.exports = { ...@@ -2,7 +2,7 @@ module.exports = {
TokenKey: 'Authorization', TokenKey: 'Authorization',
RefreshTokenKey: 'refreshauthorization', RefreshTokenKey: 'refreshauthorization',
LinkTokenKey: 'LINK-PWD-TOKEN', LinkTokenKey: 'LINK-PWD-TOKEN',
title: 'DataEase', title: '南京高等职业技术学院',
/* for sso */ /* for sso */
IdTokenKey: 'IdToken', IdTokenKey: 'IdToken',
AccessTokenKey: 'AccessToken', AccessTokenKey: 'AccessToken',
......
frontend/src/styles/deicon/iconfont.json
浏览文件 @ 33e2e0c0
{ {
"id": "2459092", "id": "2459092",
"name": "DataEase", "name": "南京高等职业技术学院",
"font_family": "iconfont", "font_family": "iconfont",
"css_prefix_text": "icon-", "css_prefix_text": "icon-",
"description": "", "description": "",
......
frontend/src/views/login/index.vue
浏览文件 @ 33e2e0c0
...@@ -5,15 +5,17 @@ ...@@ -5,15 +5,17 @@
<el-col :span="12"> <el-col :span="12">
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" size="default"> <el-form ref="loginForm" :model="loginForm" :rules="loginRules" size="default">
<div class="login-logo"> <div class="login-logo">
<svg-icon v-if="!loginLogoUrl && axiosFinished" icon-class="DataEase" custom-class="login-logo-icon" /> <!-- <svg-icon v-if="!loginLogoUrl && axiosFinished" icon-class="DataEase" custom-class="login-logo-icon" />
<img v-if="loginLogoUrl && axiosFinished" :src="loginLogoUrl" alt=""> <img v-if="loginLogoUrl && axiosFinished" :src="loginLogoUrl" alt=""> -->
<!-- <div class="login_title">南京高等职业技术学院</div> -->
<img src="@/assets/nav_icon.png" width="140" alt="" style="padding-top: 10px;" />
</div> </div>
<div v-if="uiInfo && uiInfo['ui.loginTitle'] && uiInfo['ui.loginTitle'].paramValue" class="login-welcome"> <!-- <div v-if="uiInfo && uiInfo['ui.loginTitle'] && uiInfo['ui.loginTitle'].paramValue" class="login-welcome">
{{ uiInfo['ui.loginTitle'].paramValue }} {{ uiInfo['ui.loginTitle'].paramValue }}
</div> </div>
<div v-else class="login-welcome"> <div v-else class="login-welcome">
{{ $t('login.welcome') + (uiInfo && uiInfo['ui.title'] && uiInfo['ui.title'].paramValue || ' DataEase') }} {{ $t('login.welcome') + (uiInfo && uiInfo['ui.title'] && uiInfo['ui.title'].paramValue || ' DataEase') }}
</div> </div> -->
<div class="login-form"> <div class="login-form">
<el-form-item v-if="loginTypes.length > 1"> <el-form-item v-if="loginTypes.length > 1">
<el-radio-group v-if="loginTypes.length > 1" v-model="loginForm.loginType" @change="changeLoginType"> <el-radio-group v-if="loginTypes.length > 1" v-model="loginForm.loginType" @change="changeLoginType">
...@@ -245,6 +247,12 @@ export default { ...@@ -245,6 +247,12 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
@import "../../styles/variables"; @import "../../styles/variables";
.login_title {
color: #409EFF;
font-size: 26px;
font-weight: bold;
}
@mixin login-center { @mixin login-center {
display: flex; display: flex;
justify-content: center; justify-content: center;
...@@ -371,7 +379,8 @@ export default { ...@@ -371,7 +379,8 @@ export default {
} }
.login-image { .login-image {
background: url(../../assets/login-desc.png) no-repeat; // background: url(../../assets/login-desc.png) no-repeat;
background: url(../../assets/login_img.jpg) no-repeat;
background-size: cover; background-size: cover;
width: 100%; width: 100%;
height: 520px; height: 520px;
......
frontend/src/views/wizard/index.vue
浏览文件 @ 33e2e0c0
...@@ -12,11 +12,11 @@ ...@@ -12,11 +12,11 @@
<span class="hint_head">{{ $t('wizard.welcome_title') }}</span> <br> <span class="hint_head">{{ $t('wizard.welcome_title') }}</span> <br>
<span class="hint_content">{{ $t('wizard.welcome_hint') }}</span> <span class="hint_content">{{ $t('wizard.welcome_hint') }}</span>
</el-row> </el-row>
<el-row class="card_container"> <!-- <el-row class="card_container">
<info-card v-for="(cardDetail,index) in cardList" :key="index"> <info-card v-for="(cardDetail,index) in cardList" :key="index">
<component :is="cardDetail.component" :img-index="index" :details="cardDetail" /> <component :is="cardDetail.component" :img-index="index" :details="cardDetail" />
</info-card> </info-card>
</el-row> </el-row> -->
</el-row> </el-row>
</template> </template>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论