Commit d4c06eac authored by 黄卓然's avatar 黄卓然

guten-pigx的前端修改

parent ba785c03
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
"build": "vue-cli-service build", "build": "vue-cli-service build",
"lint": "vue-cli-service lint", "lint": "vue-cli-service lint",
"test:unit": "vue-cli-service test:unit", "test:unit": "vue-cli-service test:unit",
"deploy": "npm run build && rsync -avz ./dist/* member@haomo-tech.com:/var/www/html/pigui/" "deploy": "npm run build && rsync -avz ./dist/* haomo@192.168.201.163:/data/docker/guten-pigx/BasicDevDockers/guten-pigx/dist/"
}, },
"dependencies": { "dependencies": {
"@smallwei/avue": "^1.4.7", "@smallwei/avue": "^1.4.7",
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<div id="app"> <div id="app">
<div class="avue-home"> <div class="avue-home">
<div class="avue-home__main"> <div class="avue-home__main">
<img class="avue-home__loading" src="./svg/loading-spin.svg" alt="loading"> <img class="avue-home__loading" src="./pigx/svg/loading-spin.svg" alt="loading">
<div class="avue-home__title"> <div class="avue-home__title">
正在加载资源 正在加载资源
</div> </div>
......
// 配置编译环境和线上环境之间的切换 // 配置编译环境和线上环境之间的切换
const env = process.env const env = process.env
let baseUrl = '' let baseUrl = '/pigx'
// 图表库为avue和pig2套地址 // 图表库为avue和pig2套地址
let iconfontVersion = ['667895_4y8d30c1og', '567566_qo5lxgtishg'] let iconfontVersion = ['667895_4y8d30c1og', '567566_qo5lxgtishg']
let iconfontUrl = `//at.alicdn.com/t/font_$key.css` let iconfontUrl = `//at.alicdn.com/t/font_$key.css`
......
...@@ -23,6 +23,9 @@ export const list = [{ ...@@ -23,6 +23,9 @@ export const list = [{
}, { }, {
key: 'showFullScren', key: 'showFullScren',
commit: 'SET_SHOWFULLSCREN' commit: 'SET_SHOWFULLSCREN'
}, {
key: 'showPageAdd',
commit: 'SET_SHOWPAGEADD'
}, { }, {
key: 'showCollapse', key: 'showCollapse',
commit: 'SET_SHOWCOLLAPSE' commit: 'SET_SHOWCOLLAPSE'
...@@ -37,7 +40,17 @@ export const option = (safe) => { ...@@ -37,7 +40,17 @@ export const option = (safe) => {
const _safe = safe const _safe = safe
return { return {
submitBtn: false, submitBtn: false,
column: [{ column: [
{
label: '添加页面',
prop: 'showPageAdd',
type: 'switch',
span: 24,
dicData: dicData,
click: ({ column }) => {
_safe.set(column.prop)
}
}, {
label: '标签', label: '标签',
prop: 'showTag', prop: 'showTag',
type: 'switch', type: 'switch',
......
...@@ -19,6 +19,15 @@ ...@@ -19,6 +19,15 @@
</span> </span>
</h1> </h1>
<div class="top-bar__right"> <div class="top-bar__right">
<el-tooltip v-if="showPageAdd"
effect="dark"
content="添加页面"
placement="bottom">
<div class="top-bar__item">
<i class="el-icon-circle-plis-outline"
@click="handleScreen"></i>
</div>
</el-tooltip>
<el-tooltip v-if="showColor" <el-tooltip v-if="showColor"
effect="dark" effect="dark"
content="主题色" content="主题色"
...@@ -112,6 +121,7 @@ export default { ...@@ -112,6 +121,7 @@ export default {
showTheme: state => state.common.showTheme, showTheme: state => state.common.showTheme,
showLock: state => state.common.showLock, showLock: state => state.common.showLock,
showFullScren: state => state.common.showFullScren, showFullScren: state => state.common.showFullScren,
showPageAdd: state => state.common.showPageAdd,
showCollapse: state => state.common.showCollapse, showCollapse: state => state.common.showCollapse,
showSearch: state => state.common.showSearch, showSearch: state => state.common.showSearch,
showMenu: state => state.common.showMenu showMenu: state => state.common.showMenu
...@@ -131,6 +141,9 @@ export default { ...@@ -131,6 +141,9 @@ export default {
handleScreen () { handleScreen () {
fullscreenToggel(); fullscreenToggel();
}, },
showPage (){
alert('出页面');
},
setCollapse () { setCollapse () {
this.$store.commit("SET_COLLAPSE"); this.$store.commit("SET_COLLAPSE");
}, },
......
...@@ -45,6 +45,7 @@ export default { ...@@ -45,6 +45,7 @@ export default {
showLock: state => state.common.showLock, showLock: state => state.common.showLock,
showColor: state => state.common.showColor, showColor: state => state.common.showColor,
showFullScren: state => state.common.showFullScren, showFullScren: state => state.common.showFullScren,
showPageAdd: state => state.common.showPageAdd,
showCollapse: state => state.common.showCollapse, showCollapse: state => state.common.showCollapse,
showSearch: state => state.common.showSearch, showSearch: state => state.common.showSearch,
showMenu: state => state.common.showMenu, showMenu: state => state.common.showMenu,
......
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
top: 0; top: 0;
width: 100%; width: 100%;
height: 100%; height: 100%;
background-image: url('/img/login.png'); background-image: url('/pigx/img/login.png');
background-size: cover; background-size: cover;
} }
......
...@@ -15,6 +15,7 @@ const common = { ...@@ -15,6 +15,7 @@ const common = {
showSearch: getStore({ name: 'showSearch' }), showSearch: getStore({ name: 'showSearch' }),
showLock: getStore({ name: 'showLock' }), showLock: getStore({ name: 'showLock' }),
showFullScren: getStore({ name: 'showFullScren' }), showFullScren: getStore({ name: 'showFullScren' }),
showPageAdd: getStore({ name: 'showPageAdd' }),
showTheme: getStore({ name: 'showTheme' }), showTheme: getStore({ name: 'showTheme' }),
showColor: getStore({ name: 'showColor' }), showColor: getStore({ name: 'showColor' }),
showMenu: getStore({ name: 'showMenu' }), showMenu: getStore({ name: 'showMenu' }),
...@@ -76,6 +77,13 @@ const common = { ...@@ -76,6 +77,13 @@ const common = {
content: state.showFullScren content: state.showFullScren
}) })
}, },
SET_SHOWPAGEADD: (state, active) => {
state.showPageAdd = active
setStore({
name: 'showPageAdd',
content: state.showPageAdd
})
},
SET_SHOWDEBUG: (state, active) => { SET_SHOWDEBUG: (state, active) => {
state.showDebug = active state.showDebug = active
setStore({ setStore({
......
const url = 'http://127.0.0.1:19999' const url = 'http://127.0.0.1:19999'
// const url = 'http://pig.haomo-tech.com:9998' // const url = 'http://pig.haomo-tech.com:9998'
module.exports = { module.exports = {
publicPath: 'http://guten-pigx.haomo-tech.com/pigx/',
lintOnSave: true, lintOnSave: true,
productionSourceMap: false, productionSourceMap: false,
chainWebpack: config => { chainWebpack: config => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment