Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7b64c27a21 | ||
|
|
c9f38a190c |
+8
-8
@@ -8,34 +8,34 @@ export const getRouters = () => {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
// 保存自定义列表列(后端未实现,返回空)
|
// 保存自定义列表列
|
||||||
export function addColumnList(data) {
|
export function addColumnList(data) {
|
||||||
return request({
|
return request({
|
||||||
url: '/system/columnConfig/addColumnConfig',
|
url: '/system/columnConfig/addColumnConfig',
|
||||||
method: 'post',
|
method: 'post',
|
||||||
data: data
|
data: data
|
||||||
}).catch(() => Promise.resolve({ code: 200, data: null }))
|
})
|
||||||
}
|
}
|
||||||
// 获取自定义列表列(后端未实现,返回空)
|
// 获取自定义列表列
|
||||||
export function getColumnList(data) {
|
export function getColumnList(data) {
|
||||||
return request({
|
return request({
|
||||||
url: '/system/columnConfig/getColumnConfigByUserId',
|
url: '/system/columnConfig/getColumnConfigByUserId',
|
||||||
method: 'post',
|
method: 'post',
|
||||||
data: data
|
data: data
|
||||||
}).catch(() => Promise.resolve({ code: 200, data: [] }))
|
})
|
||||||
}
|
}
|
||||||
// 点击菜单 计数(后端未实现,返回空)
|
// 点击菜单 计数
|
||||||
export function clicMenuCount(data) {
|
export function clicMenuCount(data) {
|
||||||
return request({
|
return request({
|
||||||
url: '/system/sysMenuClick',
|
url: '/system/sysMenuClick',
|
||||||
method: 'post',
|
method: 'post',
|
||||||
data: data
|
data: data
|
||||||
}).catch(() => Promise.resolve({ code: 200, data: null }))
|
})
|
||||||
}
|
}
|
||||||
// 获取最受欢迎的前八位菜单(后端未实现,返回空)
|
// 获取最受欢迎的前八位菜单
|
||||||
export function getMenuTopEight() {
|
export function getMenuTopEight() {
|
||||||
return request({
|
return request({
|
||||||
url: '/system/sysMenuClick/getMenuListTopEight',
|
url: '/system/sysMenuClick/getMenuListTopEight',
|
||||||
method: 'get'
|
method: 'get'
|
||||||
}).catch(() => Promise.resolve({ code: 200, data: [] }))
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<template v-for="(formItem,index) of formList">
|
<template v-for="(formItem,index) of formList">
|
||||||
<h4 v-if="formItem && formItem.config && formItem.config.title" style="color: #000;" class="form-header h4">{{formItem.config.title}}</h4>
|
<h4 v-if="formItem && formItem.config && formItem.config.title" style="color: #000;" class="form-header h4">{{formItem.config.title}}</h4>
|
||||||
<el-row style="color: #606266;">
|
<el-row style="color: #606266;">
|
||||||
<el-col v-for="(formVal,key,index) of formItem['controls']" :key="key" :span="formVal.span" v-if="!formVal.hidden" :class="formItem.config.colSpan" :style="formVal.style" style="vertical-align: top;">
|
<el-col v-for="(formVal,key,index) of formItem['controls']" :span="formVal.span" v-if="!formVal.hidden" :class="formItem.config.colSpan" :style="formVal.style" style="vertical-align: top;">
|
||||||
<template v-if="formVal.type === 'button'">
|
<template v-if="formVal.type === 'button'">
|
||||||
<el-button :type="formVal.btnType || 'primary'" size="mini" class="ml10" @click="(val) => handleChange(key,val,formVal)">{{formVal.label}}</el-button>
|
<el-button :type="formVal.btnType || 'primary'" size="mini" class="ml10" @click="(val) => handleChange(key,val,formVal)">{{formVal.label}}</el-button>
|
||||||
</template>
|
</template>
|
||||||
@@ -312,7 +312,7 @@
|
|||||||
<div style="float: right;margin-right: 20px;">
|
<div style="float: right;margin-right: 20px;">
|
||||||
<template v-if="config['buttonGroup'] && config['buttonGroup'].length > 0">
|
<template v-if="config['buttonGroup'] && config['buttonGroup'].length > 0">
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button v-for="(item, index) of config['buttonGroup']" :key="item.title || index" :type="item.type" @click="fnEventChange(item)">{{item.title}}</el-button>
|
<el-button v-for="item of config['buttonGroup']" :type="item.type" @click="fnEventChange(item)">{{item.title}}</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</template>
|
</template>
|
||||||
<template v-else-if="!config['buttonGroup'] || config['buttonGroup'] && config['buttonGroup'].length !== 0">
|
<template v-else-if="!config['buttonGroup'] || config['buttonGroup'] && config['buttonGroup'].length !== 0">
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
<!-- 表格头部按钮 -->
|
<!-- 表格头部按钮 -->
|
||||||
<el-row :gutter="10" style="margin: 0 0 8px 0;">
|
<el-row :gutter="10" style="margin: 0 0 8px 0;">
|
||||||
<template v-if="config && config.tableButton && config.tableButton.top">
|
<template v-if="config && config.tableButton && config.tableButton.top">
|
||||||
<el-col :span="1.5" v-for="(item, index) of config.tableButton.top" :key="item.content || index">
|
<el-col :span="1.5" v-for="item of config.tableButton.top">
|
||||||
<!-- <el-button :type="item.type" plain size="mini" :icon="item.icon" @click="handleClick(item,{})" :hasPermi="[item.hasPermi]">{{item.content}}</el-button>-->
|
<!-- <el-button :type="item.type" plain size="mini" :icon="item.icon" @click="handleClick(item,{})" :hasPermi="[item.hasPermi]">{{item.content}}</el-button>-->
|
||||||
<el-button style="padding: 7px 6px;" :ref="`${item.content}`" :type="item.type" plain size="mini" :icon="item.icon" @click="handleClick(item,{})" v-if="item && item.hasPermi ? checkPermi([item.hasPermi]) : true">{{item.content}}</el-button>
|
<el-button style="padding: 7px 6px;" :ref="`${item.content}`" :type="item.type" plain size="mini" :icon="item.icon" @click="handleClick(item,{})" v-if="item && item.hasPermi ? checkPermi([item.hasPermi]) : true">{{item.content}}</el-button>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ import { mapGetters, mapState } from "vuex"
|
|||||||
import Logo from "./Logo"
|
import Logo from "./Logo"
|
||||||
import SidebarItem from "./SidebarItem"
|
import SidebarItem from "./SidebarItem"
|
||||||
import variables from "@/assets/styles/variables.scss"
|
import variables from "@/assets/styles/variables.scss"
|
||||||
// import {clicMenuCount} from "@/api/menu"; // 后端未实现该接口
|
import {clicMenuCount} from "@/api/menu";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
components: { SidebarItem, Logo },
|
components: { SidebarItem, Logo },
|
||||||
@@ -64,10 +64,10 @@ export default {
|
|||||||
this.menuHandle(this.sidebarRouters);
|
this.menuHandle(this.sidebarRouters);
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
// 点击菜单 计数(后端未实现)
|
// 点击菜单 计数
|
||||||
handleMenuSelect(index, indexPath) {
|
handleMenuSelect(index, indexPath) {
|
||||||
// let params = {pageRoute: index, pageName: this.menuList[index]};
|
let params = {pageRoute: index, pageName: this.menuList[index]};
|
||||||
// clicMenuCount(params).then(res => {});
|
clicMenuCount(params).then(res => {});
|
||||||
},
|
},
|
||||||
// 处理菜单
|
// 处理菜单
|
||||||
menuHandle(menu) {
|
menuHandle(menu) {
|
||||||
|
|||||||
+8
-11
@@ -36,8 +36,7 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
// TODO: 后端未实现 getMenuTopEight / clicMenuCount 接口,暂时隐藏
|
import {clicMenuCount, getMenuTopEight} from "@/api/menu";
|
||||||
// import {clicMenuCount, getMenuTopEight} from "@/api/menu";
|
|
||||||
export default {
|
export default {
|
||||||
name: "welcome",
|
name: "welcome",
|
||||||
data() {
|
data() {
|
||||||
@@ -87,18 +86,16 @@
|
|||||||
// });
|
// });
|
||||||
// }
|
// }
|
||||||
// });
|
// });
|
||||||
// TODO: 后端未实现 getMenuTopEight 接口,暂时用空列表
|
getMenuTopEight().then(res => {
|
||||||
// getMenuTopEight().then(res => {
|
if (res && res.data) {
|
||||||
// if (res && res.data) {
|
this.menuList = res.data
|
||||||
// this.menuList = res.data
|
}
|
||||||
// }
|
});
|
||||||
// });
|
|
||||||
// 后端未实现,菜单列表由路由自动生成
|
|
||||||
},
|
},
|
||||||
// 菜单跳转
|
// 菜单跳转
|
||||||
menuRouter(menuLink) {
|
menuRouter(menuLink) {
|
||||||
// let params = {pageRoute: menuLink.pageRoute, pageName: menuLink.pageName};
|
let params = {pageRoute: menuLink.pageRoute, pageName: menuLink.pageName};
|
||||||
// clicMenuCount(params).then(res => {}); // 后端未实现该接口
|
clicMenuCount(params).then(res => {});
|
||||||
this.$router.push({
|
this.$router.push({
|
||||||
path: menuLink.pageRoute
|
path: menuLink.pageRoute
|
||||||
});
|
});
|
||||||
|
|||||||
+1
-1
@@ -33,7 +33,7 @@ module.exports = {
|
|||||||
proxy: {
|
proxy: {
|
||||||
// detail: https://cli.vuejs.org/config/#devserver-proxy http://192.168.9.141:8080
|
// detail: https://cli.vuejs.org/config/#devserver-proxy http://192.168.9.141:8080
|
||||||
[process.env.VUE_APP_BASE_API]: {
|
[process.env.VUE_APP_BASE_API]: {
|
||||||
target: `http://localhost:8080`,
|
target: `http://192.168.9.141:8080`,
|
||||||
changeOrigin: true,
|
changeOrigin: true,
|
||||||
pathRewrite: {
|
pathRewrite: {
|
||||||
['^' + process.env.VUE_APP_BASE_API]: ''
|
['^' + process.env.VUE_APP_BASE_API]: ''
|
||||||
|
|||||||
Reference in New Issue
Block a user