mirage
/
edu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复bug

This commit is contained in:
Mrtangl 2022-04-25 18:09:41 +08:00
parent 54b33cf609
commit c924a64a20
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
admin/src/views/permission/menu/index.vue
View File

@ -2,7 +2,9 @@
<div class="menu"> <div class="menu">
<el-card shadow="never"> <el-card shadow="never">
<router-link to="/permission/menu/edit"> <router-link to="/permission/menu/edit">
<el-button v-perm="['system:menu:add']" type="primary" size="small">添加菜单</el-button> <el-button v-perm="['system:menu:add']" type="primary" size="small"
>添加菜单</el-button
>
</router-link> </router-link>
<el-table <el-table
@ -24,9 +26,10 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="menuIcon" label="图标"> </el-table-column> <el-table-column prop="menuIcon" label="图标"> </el-table-column>
<el-table-column prop="component" label="组件路径"> </el-table-column>
<el-table-column prop="menuSort" label="排序"> </el-table-column> <el-table-column prop="menuSort" label="排序"> </el-table-column>
<el-table-column prop="perms" label="权限标识"> </el-table-column> <el-table-column prop="perms" label="权限标识"> </el-table-column>
<el-table-column prop="paths" label="组件路径"> </el-table-column> <el-table-column prop="paths" label="路由地址"> </el-table-column>
<el-table-column prop="isDisable" label="状态"> <el-table-column prop="isDisable" label="状态">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.isDisable == 0 ? '启用' : '关闭' }}</span> <span>{{ scope.row.isDisable == 0 ? '启用' : '关闭' }}</span>
@ -48,7 +51,11 @@
<el-button type="text" size="mini">编辑</el-button> <el-button type="text" size="mini">编辑</el-button>
</router-link> </router-link>
<popup v-perm="['system:menu:del']" class="m-r-10 inline" @confirm="handleDelete(scope.row.id)"> <popup
v-perm="['system:menu:del']"
class="m-r-10 inline"
@confirm="handleDelete(scope.row.id)"
>
<template #trigger> <template #trigger>
<el-button type="text" size="mini">删除</el-button> <el-button type="text" size="mini">删除</el-button>
</template> </template>

7
admin/src/views/workbench/index.vue
View File

@ -103,7 +103,7 @@
<v-chart class="chart" :option="workbenchData.visitorOption" /> <v-chart class="chart" :option="workbenchData.visitorOption" />
</div> </div>
</el-card> </el-card>
<el-card class="flex-1 m-l-15" shadow="never"> <!-- <el-card class="flex-1 m-l-15" shadow="never">
<template #header> <template #header>
<div> <div>
<span class="card-title">文章阅读量排名</span> <span class="card-title">文章阅读量排名</span>
@ -144,7 +144,7 @@
<el-table-column prop="visit" label="阅读量"> </el-table-column> <el-table-column prop="visit" label="阅读量"> </el-table-column>
</el-table> </el-table>
</div> </div>
</el-card> </el-card> -->
</div> </div>
<!-- <material-select /> --> <!-- <material-select /> -->
@ -216,9 +216,10 @@ export default defineComponent({
res.visitor.date.reverse().forEach((item: any) => { res.visitor.date.reverse().forEach((item: any) => {
workbenchData.visitorOption.xAxis.data.push(item) workbenchData.visitorOption.xAxis.data.push(item)
}) })
res.visitor.list[0].forEach((item: any) => { res.visitor.list.forEach((item: any) => {
workbenchData.visitorOption.series[0].data.push(item) workbenchData.visitorOption.series[0].data.push(item)
}) })
console.log('res.visitor.list', res.visitor.list)
}) })
.catch((err: any) => { .catch((err: any) => {
console.log('err', err) console.log('err', err)