From 8eb0c79dce085b8b86b908a4f7fdeef2fcfff54a Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期五, 19 十一月 2021 17:20:40 +0800
Subject: [PATCH] 删减代码
---
src/layouts/components/VabNavBar/index.vue | 13 +------------
/dev/null | 4 ----
src/views/login/index.vue | 8 ++++----
package.json | 1 -
src/plugins/index.js | 2 --
src/views/project/index.vue | 4 +++-
6 files changed, 8 insertions(+), 24 deletions(-)
diff --git a/package.json b/package.json
index 948ee96..f380e8c 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,6 @@
"qs": "^6.10.1",
"screenfull": "^5.1.0",
"sortablejs": "^1.14.0",
- "vab-icon": "^0.0.1",
"vue": "^2.6.14",
"vue-router": "^3.5.2",
"vuex": "^3.6.2",
diff --git a/src/layouts/components/VabNavBar/index.vue b/src/layouts/components/VabNavBar/index.vue
index c6fb8f8..f7645bb 100644
--- a/src/layouts/components/VabNavBar/index.vue
+++ b/src/layouts/components/VabNavBar/index.vue
@@ -14,20 +14,9 @@
</el-col>
<el-col :xs="20" :sm="12" :md="12" :lg="12" :xl="12">
<div class="right-panel">
- <vab-error-log />
<vab-full-screen-bar @refresh="refreshRoute" />
- <vab-icon
- title="閲嶈浇鎵�鏈夎矾鐢�"
- :pulse="pulse"
- :icon="['fas', 'redo']"
- @click="refreshRoute"
- />
+
<vab-avatar />
- <!-- <vab-icon
- title="閫�鍑虹郴缁�"
- :icon="['fas', 'sign-out-alt']"
- @click="logout"
- />-->
</div>
</el-col>
</el-row>
diff --git a/src/layouts/components/VabThemeBar/index.vue b/src/layouts/components/VabThemeBar/index.vue
deleted file mode 100644
index 22c9df5..0000000
--- a/src/layouts/components/VabThemeBar/index.vue
+++ /dev/null
@@ -1,255 +0,0 @@
-<template>
- <span v-if="themeBar">
- <vab-icon title="涓婚閰嶇疆" :icon="['fas', 'palette']" @click="handleOpenThemeBar" />
- <div class="theme-bar-setting">
- <div @click="handleOpenThemeBar">
- <vab-icon :icon="['fas', 'palette']" />
- <p>涓婚閰嶇疆</p>
- </div>
- <div @click="handleGetCode">
- <vab-icon :icon="['fas', 'laptop-code']"></vab-icon>
- <p>鎷疯礉婧愮爜</p>
- </div>
- </div>
-
- <el-drawer
- title="涓婚閰嶇疆"
- :visible.sync="drawerVisible"
- direction="rtl"
- append-to-body
- size="470px"
- >
- <el-scrollbar style="height: 94vh; overflow: hidden">
- <div class="el-drawer__body">
- <el-form ref="form" :model="theme" label-position="top">
- <el-form-item label="涓婚">
- <el-radio-group v-model="theme.name">
- <el-radio-button label="default">榛樿</el-radio-button>
- <el-radio-button label="green">缁胯崼鑽夊満</el-radio-button>
- <el-radio-button label="glory">鑽ｈ��鍏歌棌</el-radio-button>
- <!-- <el-radio-button label="orean">娴锋磱涔嬪績</el-radio-button>
- <el-radio-button label="red">鏈堜笂閲嶇伀</el-radio-button>-->
- </el-radio-group>
- </el-form-item>
- <el-form-item label="甯冨眬">
- <el-radio-group v-model="theme.layout">
- <el-radio-button label="vertical">绾靛悜甯冨眬</el-radio-button>
- <el-radio-button label="horizontal">妯悜甯冨眬</el-radio-button>
- </el-radio-group>
- </el-form-item>
- <el-form-item label="澶撮儴">
- <el-radio-group v-model="theme.header">
- <el-radio-button label="fixed">鍥哄畾澶撮儴</el-radio-button>
- <el-radio-button label="noFixed">涓嶅浐瀹氬ご閮�</el-radio-button>
- </el-radio-group>
- </el-form-item>
- <el-form-item label="澶氭爣绛�">
- <el-radio-group v-model="theme.tabsBar">
- <el-radio-button label="true">寮�鍚�</el-radio-button>
- <el-radio-button label="false">涓嶅紑鍚�</el-radio-button>
- </el-radio-group>
- </el-form-item>
- <el-form-item>
- <el-button type="primary" @click="handleSaveTheme">淇濆瓨</el-button>
- </el-form-item>
- </el-form>
- </div>
- </el-scrollbar>
- </el-drawer>
- </span>
-</template>
-
-<script>
-import variables from '@/styles/variables.scss'
-import { mapActions, mapGetters } from 'vuex'
-import { layout as defaultLayout } from '@/config'
-export default {
- name: 'VabThemeBar',
- data() {
- return {
- drawerVisible: false,
- theme: {
- name: 'default',
- layout: '',
- header: 'fixed',
- tabsBar: '',
- },
- }
- },
- computed: {
- ...mapGetters({
- layout: 'settings/layout',
- header: 'settings/header',
- tabsBar: 'settings/tabsBar',
- themeBar: 'settings/themeBar',
- }),
- },
- created() {
- this.$baseEventBus.$on('theme', () => {
- this.handleOpenThemeBar()
- })
- const theme = localStorage.getItem('vue-admin-beautiful-theme')
- if (null !== theme) {
- this.theme = JSON.parse(theme)
- this.handleSetTheme()
- } else {
- this.theme.layout = this.layout
- this.theme.header = this.header
- this.theme.tabsBar = this.tabsBar
- }
- },
- methods: {
- ...mapActions({
- changeLayout: 'settings/changeLayout',
- changeHeader: 'settings/changeHeader',
- changeTabsBar: 'settings/changeTabsBar',
- }),
- handleIsMobile() {
- return document.body.getBoundingClientRect().width - 1 < 992
- },
- handleOpenThemeBar() {
- this.drawerVisible = true
- },
- handleSetTheme() {
- let { name, layout, header, tabsBar } = this.theme
- localStorage.setItem(
- 'vue-admin-beautiful-theme',
- `{
- "name":"${name}",
- "layout":"${layout}",
- "header":"${header}",
- "tabsBar":"${tabsBar}"
- }`
- )
- if (!this.handleIsMobile()) this.changeLayout(layout)
- this.changeHeader(header)
- this.changeTabsBar(tabsBar)
- document.getElementsByTagName(
- 'body'
- )[0].className = `vue-admin-beautiful-theme-${name}`
- this.drawerVisible = false
- },
- handleSaveTheme() {
- this.handleSetTheme()
- },
- handleSetDfaultTheme() {
- let { name } = this.theme
- document
- .getElementsByTagName('body')[0]
- .classList.remove(`vue-admin-beautiful-theme-${name}`)
- localStorage.removeItem('vue-admin-beautiful-theme')
- this.$refs['form'].resetFields()
- Object.assign(this.$data, this.$options.data())
- this.changeHeader(defaultLayout)
- this.theme.name = 'default'
- this.theme.layout = this.layout
- this.theme.header = this.header
- this.theme.tabsBar = this.tabsBar
- this.drawerVisible = false
- location.reload()
- },
- handleGetCode() {
- const url =
- 'https://github.com/chuzhixin/vue-admin-beautiful/tree/master/src/views'
- let path = this.$route.path + '/index.vue'
- if (path === '/vab/menu1/menu1-1/menu1-1-1/index.vue') {
- path = '/vab/nested/menu1/menu1-1/menu1-1-1/index.vue'
- }
- if (path === '/vab/icon/awesomeIcon/index.vue') {
- path = '/vab/icon/index.vue'
- }
- if (path === '/vab/icon/remixIcon/index.vue') {
- path = '/vab/icon/remixIcon.vue'
- }
- if (path === '/vab/icon/colorfulIcon/index.vue') {
- path = '/vab/icon/colorfulIcon.vue'
- }
- if (path === '/vab/table/comprehensiveTable/index.vue') {
- path = '/vab/table/index.vue'
- }
- if (path === '/vab/table/inlineEditTable/index.vue') {
- path = '/vab/table/inlineEditTable.vue'
- }
- window.open(url + path)
- },
- },
-}
-</script>
-
-<style lang="scss" scoped>
-@mixin right-bar {
- position: fixed;
- right: 0;
- z-index: $base-z-index;
- width: 60px;
- min-height: 60px;
- text-align: center;
- cursor: pointer;
- background: $base-color-blue;
- border-radius: $base-border-radius;
-
- > div {
- padding-top: 10px;
- border-bottom: 0 !important;
-
- &:hover {
- opacity: 0.9;
- }
-
- & + div {
- border-top: 1px solid $base-color-white;
- }
-
- p {
- padding: 0;
- margin: 0;
- font-size: $base-font-size-small;
- line-height: 30px;
- color: $base-color-white;
- }
- }
-}
-
-.theme-bar-setting {
- @include right-bar;
-
- top: calc((100vh - 110px) / 2);
-
- ::v-deep {
- svg:not(:root).svg-inline--fa {
- display: block;
- margin-right: auto;
- margin-left: auto;
- color: $base-color-white;
- }
-
- .svg-icon {
- display: block;
- margin-right: auto;
- margin-left: auto;
- font-size: 20px;
- color: $base-color-white;
- fill: $base-color-white;
- }
- }
-}
-
-.el-drawer__body {
- padding: 20px;
-}
-</style>
-<style lang="scss">
-.el-drawer__wrapper {
- outline: none !important;
-
- * {
- outline: none !important;
- }
-}
-
-.vab-color-picker {
- .el-color-dropdown__link-btn {
- display: none;
- }
-}
-</style>
diff --git a/src/plugins/index.js b/src/plugins/index.js
index d56a1fc..9ff3aa4 100644
--- a/src/plugins/index.js
+++ b/src/plugins/index.js
@@ -1,13 +1,11 @@
/* 鍏叡寮曞叆,鍕块殢鎰忎慨鏀�,淇敼鏃堕渶缁忚繃纭 */
import Vue from "vue";
import "./element";
-import "./support";
import "@/styles/vab.scss";
import "@/remixIcon";
import "@/colorfulIcon";
import "@/config/permission";
import "@/utils/errorLog";
-import "./vabIcon";
import VabPermissions from "zx-layouts/Permissions";
import Vab from "@/utils/vab";
import VabCount from "zx-count";
diff --git a/src/plugins/support.js b/src/plugins/support.js
deleted file mode 100644
index 3910649..0000000
--- a/src/plugins/support.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import { MessageBox } from 'element-ui'
-import { donation } from '@/config'
-import { dependencies, repository } from '../../package.json'
-
-if (!!window.ActiveXObject || 'ActiveXObject' in window) {
- MessageBox({
- title: '娓╅Θ鎻愮ず',
- message:
- '鑷�2015骞�3鏈堣捣锛屽井杞凡瀹ｅ竷寮冪敤IE锛屼笖涓嶅啀瀵笽E鎻愪緵浠讳綍鏇存柊缁存姢锛岃<a target="_blank" style="color:blue" href="https://www.microsoft.com/zh-cn/edge/">鐐瑰嚮姝ゅ</a>璁块棶寰蒋瀹樼綉鏇存柊娴忚鍣紝濡傛灉鎮ㄤ娇鐢ㄧ殑鏄弻鏍告祻瑙堝櫒,璇锋偍鍒囨崲娴忚鍣ㄥ唴鏍镐负鏋侀�熸ā寮�',
- type: 'warning',
- showClose: false,
- showConfirmButton: false,
- closeOnClickModal: false,
- closeOnPressEscape: false,
- closeOnHashChange: false,
- dangerouslyUseHTMLString: true,
- })
-}
-if (!dependencies['vab-icon'] || !dependencies['zx-layouts'])
- document.body.innerHTML = ''
diff --git a/src/plugins/vabIcon.js b/src/plugins/vabIcon.js
deleted file mode 100644
index 634bca7..0000000
--- a/src/plugins/vabIcon.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import Vue from 'vue'
-import VabIcon from 'vab-icon'
-
-Vue.component('VabIcon', VabIcon)
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 9839af0..b650325 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -15,7 +15,7 @@
<div class="title-tips">娆㈣繋浣跨敤{{ title }}锛�</div>
<el-form-item style="margin-top: 40px" prop="username">
<span class="svg-container svg-container-admin">
- <vab-icon :icon="['fas', 'user']" />
+ <i class="el-icon-s-custom"></i>
</span>
<el-input
v-model.trim="form.username"
@@ -27,7 +27,7 @@
</el-form-item>
<el-form-item prop="password">
<span class="svg-container">
- <vab-icon :icon="['fas', 'lock']" />
+ <i class="el-icon-lock"></i>
</span>
<el-input
:key="passwordType"
@@ -43,10 +43,10 @@
class="show-password"
@click="handlePassword"
>
- <vab-icon :icon="['fas', 'eye-slash']"></vab-icon>
+ <i class="el-icon-view"></i>
</span>
<span v-else class="show-password" @click="handlePassword">
- <vab-icon :icon="['fas', 'eye']"></vab-icon>
+ <i class="el-icon-view"></i>
</span>
</el-form-item>
<el-button
diff --git a/src/views/project/index.vue b/src/views/project/index.vue
index b016eb0..2746022 100644
--- a/src/views/project/index.vue
+++ b/src/views/project/index.vue
@@ -102,18 +102,20 @@
</template>
</el-table-column>
<!-- <el-table-column show-overflow-tooltip type="selection" width="55"></el-table-column> -->
- <el-table-column show-overflow-tooltip label="搴忓彿" width="95">
+ <el-table-column show-overflow-tooltip label="搴忓彿" width="50">
<template #default="scope">{{ scope.$index + 1 }}</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="name"
label="椤圭洰鍚嶇О"
+ width="150"
></el-table-column>
<el-table-column
show-overflow-tooltip
prop="srcUrl"
label="椤圭洰鍦板潃"
+ width="500"
></el-table-column>
<el-table-column show-overflow-tooltip prop="type" label="绫诲瀷">
<template #default="{ row }">
--
Gitblit v1.8.0