master
lion 4 years ago
commit e6e0326a19

@ -28,6 +28,7 @@
"view-design": "^4.7.0",
"vue": "2.6.10",
"vue-count-to": "^1.0.13",
"vue-particles": "^1.0.9",
"vue-router": "3.0.6",
"vuex": "3.1.0"
},

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 47 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

@ -19,7 +19,7 @@ import load from './dynamicLoadScript'
// why use this cdn, detail see https://github.com/PanJiaChen/tinymce-all-in-one
// const tinymceCDN = 'https://cdn.jsdelivr.net/npm/tinymce-all-in-one@4.9.3/tinymce.min.js'
const tinymceCDN = '/tinymce/tinymce.min.js'
const tinymceCDN = '/admin/tinymce/tinymce.min.js'
export default {
name: 'Tinymce',
components: { editorImage },

@ -7,7 +7,7 @@
<div class="right-menu">
<el-dropdown class="avatar-container" trigger="click">
<div class="avatar-wrapper">
<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">
<img src="../../assets/face.png" class="user-avatar">
<i class="el-icon-caret-bottom" />
</div>
<el-dropdown-menu slot="dropdown" class="user-dropdown">

@ -37,7 +37,7 @@
}
.sidebar-name-logo {
width: 200px;
height: 20px;
height: 50px;
}
.sidebarLogoFade-enter,

@ -23,6 +23,8 @@ Vue.prototype.base = base;
import '@/icons' // icon
import '@/permission' // permission control
import VueParticles from 'vue-particles'
Vue.use(VueParticles)
/**
* If you don't want to use mock-server
* you want to use MockJs for mock api

@ -51,7 +51,7 @@ export const constantRoutes = [{
component: () => import('@/views/dashboard/index'),
meta: {
title: '系统首页',
icon: 'dashboard'
icon: 'iconfont/icon-houtaitubiao-01'
}
}]
}

@ -1,8 +1,11 @@
@font-face {
font-family: 'iconfont'; /* Project id 3356385 */
src: url('//at.alicdn.com/t/font_3356385_p1159rz3ar.woff2?t=1650945259111') format('woff2'),
url('//at.alicdn.com/t/font_3356385_p1159rz3ar.woff?t=1650945259111') format('woff'),
url('//at.alicdn.com/t/font_3356385_p1159rz3ar.ttf?t=1650945259111') format('truetype');
font-family: 'iconfont'; /* project id 3397834 */
src: url('');
src: url('?#iefix') format('embedded-opentype'),
url('//at.alicdn.com/t/font_3397834_7rrnwaxi4pk.woff2') format('woff2'),
url('//at.alicdn.com/t/font_3397834_7rrnwaxi4pk.woff') format('woff'),
url('//at.alicdn.com/t/font_3397834_7rrnwaxi4pk.ttf') format('truetype'),
url('#iconfont') format('svg');
}
.iconfont {
@ -13,47 +16,163 @@
-moz-osx-font-smoothing: grayscale;
}
.icon-shuzhuangtu:before {
content: "\e600";
.icon-tuandui:before {
content: "\e603";
}
.icon-tuanduiguanli:before {
content: "\e7b2";
}
.icon-yuyue:before {
content: "\e60d";
}
.icon-gerenshuju:before {
content: "\e602";
}
.icon-jifangcanguanjiaoliushenqing:before {
content: "\e6a2";
}
.icon-houtaitubiao-01:before {
content: "\e639";
}
.icon-houtaitubiao-17:before {
content: "\e63a";
}
.icon-zhuceyaoqing:before {
content: "\e60f";
}
.icon-zhinan:before {
content: "\e8d0";
.icon-Reply:before {
content: "\e60a";
}
.icon-dingdan:before {
content: "\e645";
.icon-back:before {
content: "\e670";
}
.icon-mingxinghuodong:before {
content: "\e8b3";
.icon-dianzan:before {
content: "\ec7f";
}
.icon-yuyuezhongxin:before {
content: "\e626";
.icon-fenxiang:before {
content: "\e617";
}
.icon-huodongzhongxin:before {
content: "\e628";
.icon-dayin:before {
content: "\e620";
}
.icon-weizhixiangqing:before {
content: "\e8ab";
.icon-yanjing:before {
content: "\e68d";
}
.icon-tingchewei:before {
content: "\e655";
.icon-yanjing1:before {
content: "\e6cf";
}
.icon-ziyuanzhongxin:before {
content: "\e604";
.icon-zuzhiguanli:before {
content: "\e60e";
}
.icon-tuijian:before {
.icon-lianjie:before {
content: "\e609";
}
.icon-guanbi:before {
content: "\e600";
}
.icon-geren:before {
content: "\e61e";
}
.icon-lujing16221:before {
content: "\e7d2";
}
.icon-hezuo1:before {
content: "\e61c";
}
.icon-shehuizuzhi_shequzhiyuanfuwu:before {
content: "\e699";
}
.icon-fabuxuqiu:before {
content: "\e627";
}
.icon-icon-jiantou2:before {
content: "\e603";
.icon-chengjiaokehu:before {
content: "\e657";
}
.icon-jine:before {
content: "\e658";
}
.icon-gongyingshangguanli:before {
content: "\e623";
}
.icon-wodehuodong:before {
content: "\e601";
}
.icon-chengjiao:before {
content: "\eb91";
}
.icon-gongyingshangguanli_icox:before {
content: "\e6ce";
}
.icon-huati:before {
content: "\e8b1";
}
.icon-huodongshuju:before {
content: "\e635";
}
.icon-fabuxuqiu1:before {
content: "\e667";
}
.icon-qiyeguanli:before {
content: "\e62f";
}
.icon-huati1:before {
content: "\e665";
}
.icon-zhaopinxuqiu:before {
content: "\eabd";
}
.icon-shequfuwu:before {
content: "\ea69";
}
.icon-shequfuwu1:before {
content: "\f74b";
}
.icon-zhuceyonghu:before {
content: "\e68c";
}
.icon-shehuizuzhiguanli:before {
content: "\e614";
}
.icon-10:before {
content: "\e61d";
}

@ -10,7 +10,9 @@
.sidebar-container {
transition: width 0.28s;
width: $sideBarWidth !important;
background-color: $menuBg;
//background-color: $menuBg;
background: linear-gradient(0deg, #2885E1, #46CED3);
box-shadow: 1px 1px 15px 0px rgba(17, 76, 157, 0.2);
height: 100%;
position: fixed;
font-size: 0px;
@ -83,7 +85,7 @@
.is-active{
background-color: $menuActiveBg !important;
//background-color: $menuActiveBg !important;
//border-right: 5px solid $subMenuActiveText !important;
}
.is-active>.el-submenu__title {
@ -103,7 +105,7 @@
&.is-active{
background-color: $submenuActiveBg !important;
border-right: 5px solid $subMenuActiveText !important;
color: $subMenuActiveText !important;
color: $subMenuActiveText !important;
}
}
}
@ -227,6 +229,7 @@
>.el-menu--popup {
max-height: 100vh;
overflow-y: auto;
background: #46CED3 !important;
&::-webkit-scrollbar-track-piece {
background: #d3dce6;

@ -1,16 +1,16 @@
// sidebar
$menuText:#606266;
$menuActiveText:#319bdd;
$subMenuActiveText:#319bdd; //https://github.com/ElemeFE/element/issues/12951
$menuText:#ffffff;
$menuActiveText:#ffffff;
$subMenuActiveText:#ffffff; //https://github.com/ElemeFE/element/issues/12951
$menuBg:#ffffff;//#304156
$menuHover:#4ad8d1;
$menuActiveBg:#4ad8d1;
$menuBg:rgb(255, 255, 255,0);//#304156
$menuHover:rgba(242, 242, 242, .4);
$menuActiveBg:rgba(242, 242, 242, .4);
$subMenuBg:#ffffff;//#1f2d3d
$subMenuHover:#4ad8d1;
$submenuActiveBg:#4ad8d1;
$subMenuBg:rgb(255, 255, 255,0);//#304156
$subMenuHover:rgba(242, 242, 242, .4);
$submenuActiveBg:rgba(242, 242, 242, .4);
$sideBarWidth: 210px;
$primaryColor: #319bdd;

@ -22,7 +22,7 @@
</div>
<div class="card-panel-description">
<div class="card-panel-text">
团队数量
企业主体
</div>
<count-to :start-val="0" :end-val="countsData.client_count" :duration="3000" class="card-panel-num" />
</div>
@ -35,7 +35,7 @@
</div>
<div class="card-panel-description">
<div class="card-panel-text">
预约数量
个人用户
</div>
<count-to :start-val="0" :end-val="countsData.tool_count" :duration="3200" class="card-panel-num" />
</div>
@ -48,7 +48,7 @@
</div>
<div class="card-panel-description">
<div class="card-panel-text">
游客数量
认定企业
</div>
<count-to :start-val="0" :end-val="countsData.user_count" :duration="3600" class="card-panel-num" />
</div>

@ -1,10 +1,15 @@
<template>
<div class="login-container">
<vue-particles color="#ffffff" :particleOpacity="0.7" :particlesNumber="80" shapeType="circle" :particleSize="4"
linesColor="#ffffff" :linesWidth="1" :lineLinked="true" :lineOpacity="0.4" :linesDistance="150" :moveSpeed="3"
:hoverEffect="true" hoverMode="grab" :clickEffect="true" clickMode="push"> </vue-particles>
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on"
label-position="left">
<div class="title-container">
<h3 class="title">一网共治基层治理智慧平台</h3>
<h3 class="title">一网共治础智慧治理平台</h3>
</div>
<el-form-item prop="username">
@ -101,7 +106,7 @@
this.$refs.loginForm.validate(valid => {
if (valid) {
this.loading = true
this.$store.dispatch('user/login', this.loginForm).then(() => {
this.$store.dispatch('user/login', this.loginForm).then(() => {
this.$router.push({
path: this.redirect || '/'
@ -121,12 +126,18 @@
</script>
<style lang="scss">
#particles-js {
width: 100%;
height: 99%;
position: absolute;
}
/* 修复input 背景不协调 和光标变色 */
/* Detail see https://github.com/PanJiaChen/vue-element-admin/pull/927 */
$bg:#283443;
$light_gray:#fff;
$cursor: #fff;
$bg:#122583;
$light_gray:#122583;
$cursor: #122583;
@supports (-webkit-mask: none) and (not (cater-color: $cursor)) {
.login-container .el-input input {
@ -168,23 +179,25 @@
</style>
<style lang="scss" scoped>
$bg:#2d3a4b;
$dark_gray:#889aa4;
$light_gray:#eee;
$bg:#122583;
$dark_gray:#122583;
$light_gray:#122583;
.login-container {
min-height: 100%;
width: 100%;
background-color: $bg;
//background-color: $bg;
background: url("../../assets/bg.jpg") no-repeat;
overflow: hidden;
.login-form {
position: relative;
width: 520px;
max-width: 100%;
padding: 160px 35px 0;
margin: 0 auto;
padding: 20px 35px 0;
margin: 160px auto;
overflow: hidden;
background-color: #fff;
}
.tips {

@ -24,8 +24,8 @@ module.exports = {
* In most cases please use '/' !!!
* Detail: https://cli.vuejs.org/config/#publicpath
*/
publicPath: '/',
outputDir: 'dist',
publicPath: '/admin/',
outputDir: '/Users/liuxiangyu/Work/langchao/app/yiwanggongzhi-service/public/admin',
assetsDir: 'static',
css: {
loaderOptions: { // 向 CSS 相关的 loader 传递选项

Loading…
Cancel
Save