Compare commits
No commits in common. "d3d93acd0fbf72d8e9520e0b409fd390035f48f1" and "60f6c3a8fe571070b0bcd961795618f7e90904c3" have entirely different histories.
d3d93acd0f
...
60f6c3a8fe
6
.env.dev
6
.env.dev
@ -25,10 +25,8 @@ VUE_APP_BASE_API = 'http://192.168.0.33:48082'
|
|||||||
# VUE_APP_BASE_API = 'http://192.168.1.78:48082'
|
# VUE_APP_BASE_API = 'http://192.168.1.78:48082'
|
||||||
# VUE_APP_BASE_API = 'http://192.168.1.47:48082'
|
# VUE_APP_BASE_API = 'http://192.168.1.47:48082'
|
||||||
# socket地址
|
# socket地址
|
||||||
# VUE_APP_Socket_API = 'ws://10.70.2.2:8080'
|
VUE_APP_Socket_API = 'ws://10.70.2.2:8080'
|
||||||
# VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081'
|
VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081'
|
||||||
VUE_APP_Socket_API = 'ws://192.168.0.33:48082'
|
|
||||||
VUE_APP_Socket_Dcs_API = 'ws://192.168.0.33:8080'
|
|
||||||
|
|
||||||
# 积木报表指向地址
|
# 积木报表指向地址
|
||||||
VUE_APP_JIMU_API = 'http://10.70.2.22:8080'
|
VUE_APP_JIMU_API = 'http://10.70.2.22:8080'
|
||||||
|
|||||||
@ -92,7 +92,7 @@ export default {
|
|||||||
param: 'searchTime',
|
param: 'searchTime',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: this.$auth.hasPermi('extend:cost-energy-search:query')
|
type: this.$auth.hasPermi('cost:energyCost:query')
|
||||||
? 'button'
|
? 'button'
|
||||||
: '',
|
: '',
|
||||||
btnName: '查询',
|
btnName: '查询',
|
||||||
@ -100,7 +100,7 @@ export default {
|
|||||||
color: 'primary',
|
color: 'primary',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: this.$auth.hasPermi('extend:cost-energy-search:export')
|
type: this.$auth.hasPermi('cost:energyCost:export')
|
||||||
? 'button'
|
? 'button'
|
||||||
: '',
|
: '',
|
||||||
btnName: '导出',
|
btnName: '导出',
|
||||||
|
|||||||
@ -116,7 +116,7 @@ export default {
|
|||||||
defaultSelect: [],
|
defaultSelect: [],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: this.$auth.hasPermi('extend:cost-enery-auto-report:query')
|
type: this.$auth.hasPermi('cost:energyCostHis:query')
|
||||||
? 'button'
|
? 'button'
|
||||||
: '',
|
: '',
|
||||||
btnName: '查询',
|
btnName: '查询',
|
||||||
@ -124,7 +124,7 @@ export default {
|
|||||||
color: 'primary',
|
color: 'primary',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: this.$auth.hasPermi('extend:cost-enery-auto-report:export')
|
type: this.$auth.hasPermi('cost:energyCostHis:export')
|
||||||
? 'button'
|
? 'button'
|
||||||
: '',
|
: '',
|
||||||
btnName: '导出',
|
btnName: '导出',
|
||||||
|
|||||||
@ -101,13 +101,13 @@ export default {
|
|||||||
},
|
},
|
||||||
tableProps,
|
tableProps,
|
||||||
tableBtn: [
|
tableBtn: [
|
||||||
this.$auth.hasPermi(`extend:cost-material-set:update`)
|
this.$auth.hasPermi(`cost:rawMaterialConfig:update`)
|
||||||
? {
|
? {
|
||||||
type: 'edit',
|
type: 'edit',
|
||||||
btnName: '编辑',
|
btnName: '编辑',
|
||||||
}
|
}
|
||||||
: undefined,
|
: undefined,
|
||||||
this.$auth.hasPermi(`extend:cost-material-set:delete`)
|
this.$auth.hasPermi(`cost:rawMaterialConfig:delete`)
|
||||||
? {
|
? {
|
||||||
type: 'delete',
|
type: 'delete',
|
||||||
btnName: '删除',
|
btnName: '删除',
|
||||||
@ -124,7 +124,7 @@ export default {
|
|||||||
filterable: true,
|
filterable: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: this.$auth.hasPermi('extend:cost-material-set:query')
|
type: this.$auth.hasPermi('cost:rawMaterialConfig:query')
|
||||||
? 'button'
|
? 'button'
|
||||||
: '',
|
: '',
|
||||||
btnName: '查询',
|
btnName: '查询',
|
||||||
@ -133,13 +133,13 @@ export default {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
type:
|
type:
|
||||||
this.$auth.hasPermi('extend:cost-material-set:create') &&
|
this.$auth.hasPermi('cost:rawMaterialConfig:create') &&
|
||||||
this.$auth.hasPermi('extend:cost-material-set:query')
|
this.$auth.hasPermi('cost:rawMaterialConfig:query')
|
||||||
? 'separate'
|
? 'separate'
|
||||||
: '',
|
: '',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: this.$auth.hasPermi('extend:cost-material-set:create')
|
type: this.$auth.hasPermi('cost:rawMaterialConfig:create')
|
||||||
? 'button'
|
? 'button'
|
||||||
: '',
|
: '',
|
||||||
btnName: '新增',
|
btnName: '新增',
|
||||||
|
|||||||
@ -97,7 +97,7 @@ export default {
|
|||||||
param: 'searchTime',
|
param: 'searchTime',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: this.$auth.hasPermi('extend:cost-material-search:query')
|
type: this.$auth.hasPermi('cost:rawMaterialCost:query')
|
||||||
? 'button'
|
? 'button'
|
||||||
: '',
|
: '',
|
||||||
btnName: '查询',
|
btnName: '查询',
|
||||||
@ -105,7 +105,7 @@ export default {
|
|||||||
color: 'primary',
|
color: 'primary',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: this.$auth.hasPermi('extend:cost-material-search:export')
|
type: this.$auth.hasPermi('cost:rawMaterialCost:export')
|
||||||
? 'button'
|
? 'button'
|
||||||
: '',
|
: '',
|
||||||
btnName: '导出',
|
btnName: '导出',
|
||||||
|
|||||||
@ -115,7 +115,7 @@ export default {
|
|||||||
defaultSelect: [],
|
defaultSelect: [],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: this.$auth.hasPermi('extend:cost-material-auto-report:query')
|
type: this.$auth.hasPermi('cost:rawMaterialCostHis:query')
|
||||||
? 'button'
|
? 'button'
|
||||||
: '',
|
: '',
|
||||||
btnName: '查询',
|
btnName: '查询',
|
||||||
@ -123,7 +123,7 @@ export default {
|
|||||||
color: 'primary',
|
color: 'primary',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: this.$auth.hasPermi('extend:cost-material-auto-report:export')
|
type: this.$auth.hasPermi('cost:rawMaterialCostHis:export')
|
||||||
? 'button'
|
? 'button'
|
||||||
: '',
|
: '',
|
||||||
btnName: '导出',
|
btnName: '导出',
|
||||||
|
|||||||
@ -1,23 +1,24 @@
|
|||||||
|
<!--
|
||||||
|
filename: MaterialCost.vue
|
||||||
|
author: liubin
|
||||||
|
date: 2023-12-06 09:09:27
|
||||||
|
description:
|
||||||
|
-->
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<Container
|
<Container name="原料用量统计" size="middle" style="">
|
||||||
name="原料用量统计"
|
<div style="flex: 1; display: flex; gap: 8px;flex-direction: column;">
|
||||||
size="middle"
|
|
||||||
style="">
|
|
||||||
<div style="flex: 1; display: flex; gap: 8px; flex-direction: column">
|
|
||||||
<div
|
<div
|
||||||
class="absolute"
|
class="absolute"
|
||||||
style="
|
style="
|
||||||
flex: 2;
|
flex:3;
|
||||||
padding: 12px 12px 0 12px;
|
padding: 12px 12px 0 12px;
|
||||||
display: grid;
|
display: grid;
|
||||||
grid-template-columns: repeat(2, 1fr);
|
grid-template-columns: repeat(3, 1fr);
|
||||||
grid-auto-rows: repeat(4, 1fr);
|
grid-auto-rows: repeat(4, 1fr);
|
||||||
gap: 8px;
|
gap: 8px;
|
||||||
">
|
">
|
||||||
<ShadowRect
|
<ShadowRect v-for="(item, index) in materialMsg1" :key="index" :rounded="false">
|
||||||
v-for="(item, index) in materialMsg"
|
|
||||||
:key="index"
|
|
||||||
:rounded="false">
|
|
||||||
<div
|
<div
|
||||||
class="material"
|
class="material"
|
||||||
style="
|
style="
|
||||||
@ -29,24 +30,43 @@
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
">
|
">
|
||||||
<span
|
<span style="color: #0ee8e4; font-weight: 500; font-size: 32px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;">
|
||||||
style="
|
{{item.materialUsed}}
|
||||||
color: #0ee8e4;
|
|
||||||
font-weight: 500;
|
|
||||||
font-size: 32px;
|
|
||||||
white-space: nowrap;
|
|
||||||
overflow: hidden;
|
|
||||||
text-overflow: ellipsis;
|
|
||||||
">
|
|
||||||
{{ item.materialUsed }}
|
|
||||||
</span>
|
</span>
|
||||||
<span style="color: #fff; font-size: 16px; letter-spacing: 1px">
|
<span style="color: #fff; font-size: 16px; letter-spacing: 1px">
|
||||||
- {{ item.materialName }}/kg-
|
- {{item.materialName}}/kg-
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</ShadowRect>
|
||||||
|
</div>
|
||||||
|
<div style="flex:1;
|
||||||
|
padding: 0 12px 12px 12px;
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: repeat(4, 1fr);
|
||||||
|
gap: 8px;">
|
||||||
|
<ShadowRect v-for="(item, index) in materialMsg2" :key="index" :rounded="false">
|
||||||
|
<div
|
||||||
|
class="material"
|
||||||
|
style="
|
||||||
|
flex: 1;
|
||||||
|
padding-bottom: 3px;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 4px;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
">
|
||||||
|
<span style="color: #0ee8e4; font-weight: 500; font-size: 32px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;">
|
||||||
|
{{item.materialUsed}}
|
||||||
|
</span>
|
||||||
|
<span style="color: #fff; font-size: 16px; letter-spacing: 1px">
|
||||||
|
- {{item.materialName}}/kg-
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</ShadowRect>
|
</ShadowRect>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</Container>
|
</Container>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@ -61,9 +81,12 @@ export default {
|
|||||||
return {};
|
return {};
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
materialMsg() {
|
materialMsg1() {
|
||||||
return this.$store.state.websocket.material;
|
return this.$store.state.websocket.material.slice(0,9)
|
||||||
},
|
},
|
||||||
|
materialMsg2() {
|
||||||
|
return this.$store.state.websocket.material.slice(9)
|
||||||
|
}
|
||||||
},
|
},
|
||||||
methods: {},
|
methods: {},
|
||||||
};
|
};
|
||||||
|
|||||||
@ -3,188 +3,76 @@
|
|||||||
<!-- <doc-alert title="功能权限" url="https://doc.iocoder.cn/resource-permission" />
|
<!-- <doc-alert title="功能权限" url="https://doc.iocoder.cn/resource-permission" />
|
||||||
<doc-alert title="菜单路由" url="https://doc.iocoder.cn/vue2/route/" /> -->
|
<doc-alert title="菜单路由" url="https://doc.iocoder.cn/vue2/route/" /> -->
|
||||||
<!-- 搜索工作栏 -->
|
<!-- 搜索工作栏 -->
|
||||||
<el-form
|
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
|
||||||
:model="queryParams"
|
<el-form-item label="菜单名称" prop="name">
|
||||||
ref="queryForm"
|
<el-input v-model="queryParams.name" placeholder="请输入菜单名称" clearable @keyup.enter.native="handleQuery"/>
|
||||||
size="small"
|
|
||||||
:inline="true"
|
|
||||||
v-show="showSearch">
|
|
||||||
<el-form-item
|
|
||||||
label="菜单名称"
|
|
||||||
prop="name">
|
|
||||||
<el-input
|
|
||||||
v-model="queryParams.name"
|
|
||||||
placeholder="请输入菜单名称"
|
|
||||||
clearable
|
|
||||||
@keyup.enter.native="handleQuery" />
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item
|
<el-form-item label="状态" prop="status">
|
||||||
label="状态"
|
<el-select v-model="queryParams.status" placeholder="菜单状态" clearable>
|
||||||
prop="status">
|
<el-option v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
|
||||||
<el-select
|
|
||||||
v-model="queryParams.status"
|
|
||||||
placeholder="菜单状态"
|
|
||||||
clearable>
|
|
||||||
<el-option
|
|
||||||
v-for="dict in statusDictDatas"
|
|
||||||
:key="parseInt(dict.value)"
|
|
||||||
:label="dict.label"
|
|
||||||
:value="parseInt(dict.value)" />
|
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button
|
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
|
||||||
type="primary"
|
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
|
||||||
icon="el-icon-search"
|
|
||||||
@click="handleQuery">
|
|
||||||
搜索
|
|
||||||
</el-button>
|
|
||||||
<el-button
|
|
||||||
icon="el-icon-refresh"
|
|
||||||
@click="resetQuery">
|
|
||||||
重置
|
|
||||||
</el-button>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
|
|
||||||
<el-row
|
<el-row :gutter="10" class="mb8">
|
||||||
:gutter="10"
|
|
||||||
class="mb8">
|
|
||||||
<el-col :span="1.5">
|
<el-col :span="1.5">
|
||||||
<el-button
|
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
|
||||||
type="primary"
|
v-hasPermi="['system:menu:create']">新增</el-button>
|
||||||
plain
|
|
||||||
icon="el-icon-plus"
|
|
||||||
size="mini"
|
|
||||||
@click="handleAdd"
|
|
||||||
v-hasPermi="['system:menu:create']">
|
|
||||||
新增
|
|
||||||
</el-button>
|
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="1.5">
|
<el-col :span="1.5">
|
||||||
<el-button
|
<el-button type="info" plain icon="el-icon-sort" size="mini" @click="toggleExpandAll">展开/折叠</el-button>
|
||||||
type="info"
|
|
||||||
plain
|
|
||||||
icon="el-icon-sort"
|
|
||||||
size="mini"
|
|
||||||
@click="toggleExpandAll">
|
|
||||||
展开/折叠
|
|
||||||
</el-button>
|
|
||||||
</el-col>
|
</el-col>
|
||||||
<right-toolbar
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||||
:showSearch.sync="showSearch"
|
|
||||||
@queryTable="getList"></right-toolbar>
|
|
||||||
</el-row>
|
</el-row>
|
||||||
|
|
||||||
<el-table
|
<el-table v-if="refreshTable" v-loading="loading" :data="menuList" row-key="id" :default-expand-all="isExpandAll"
|
||||||
v-if="refreshTable"
|
:tree-props="{children: 'children', hasChildren: 'hasChildren'}">
|
||||||
v-loading="loading"
|
<el-table-column prop="name" label="菜单名称" :show-overflow-tooltip="true" width="250"></el-table-column>
|
||||||
:data="menuList"
|
|
||||||
row-key="id"
|
|
||||||
:default-expand-all="isExpandAll"
|
|
||||||
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
|
|
||||||
<el-table-column
|
|
||||||
prop="name"
|
|
||||||
label="菜单名称"
|
|
||||||
:show-overflow-tooltip="true"
|
|
||||||
width="250"></el-table-column>
|
|
||||||
<!-- <el-table-column prop="icon" label="图标" align="center" width="100">
|
<!-- <el-table-column prop="icon" label="图标" align="center" width="100">
|
||||||
<template v-slot="scope">
|
<template v-slot="scope">
|
||||||
<svg-icon :icon-class="scope.row.icon" />
|
<svg-icon :icon-class="scope.row.icon" />
|
||||||
</template>
|
</template>
|
||||||
</el-table-column> -->
|
</el-table-column> -->
|
||||||
<el-table-column
|
<el-table-column prop="sort" label="排序" width="60"></el-table-column>
|
||||||
prop="sort"
|
<el-table-column prop="permission" label="权限标识" :show-overflow-tooltip="true" />
|
||||||
label="排序"
|
<el-table-column prop="component" label="组件路径" :show-overflow-tooltip="true" />
|
||||||
width="60"></el-table-column>
|
<el-table-column prop="componentName" label="组件名称" :show-overflow-tooltip="true" />
|
||||||
<el-table-column
|
<el-table-column prop="status" label="状态" width="80">
|
||||||
prop="permission"
|
|
||||||
label="权限标识"
|
|
||||||
:show-overflow-tooltip="true" />
|
|
||||||
<el-table-column
|
|
||||||
prop="component"
|
|
||||||
label="组件路径"
|
|
||||||
:show-overflow-tooltip="true" />
|
|
||||||
<el-table-column
|
|
||||||
prop="componentName"
|
|
||||||
label="组件名称"
|
|
||||||
:show-overflow-tooltip="true" />
|
|
||||||
<el-table-column
|
|
||||||
prop="status"
|
|
||||||
label="状态"
|
|
||||||
width="80">
|
|
||||||
<template v-slot="scope">
|
<template v-slot="scope">
|
||||||
<dict-tag
|
<dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status"/>
|
||||||
:type="DICT_TYPE.COMMON_STATUS"
|
|
||||||
:value="scope.row.status" />
|
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||||
label="操作"
|
|
||||||
align="center"
|
|
||||||
class-name="small-padding fixed-width">
|
|
||||||
<template v-slot="scope">
|
<template v-slot="scope">
|
||||||
<el-button
|
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
|
||||||
size="mini"
|
v-hasPermi="['system:menu:update']">修改</el-button>
|
||||||
type="text"
|
<el-button size="mini" type="text" icon="el-icon-plus" @click="handleAdd(scope.row)"
|
||||||
icon="el-icon-edit"
|
v-hasPermi="['system:menu:create']">新增</el-button>
|
||||||
@click="handleUpdate(scope.row)"
|
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
|
||||||
v-hasPermi="['system:menu:update']">
|
v-hasPermi="['system:menu:delete']">删除</el-button>
|
||||||
修改
|
|
||||||
</el-button>
|
|
||||||
<el-button
|
|
||||||
size="mini"
|
|
||||||
type="text"
|
|
||||||
icon="el-icon-plus"
|
|
||||||
@click="handleAdd(scope.row)"
|
|
||||||
v-hasPermi="['system:menu:create']">
|
|
||||||
新增
|
|
||||||
</el-button>
|
|
||||||
<el-button
|
|
||||||
size="mini"
|
|
||||||
type="text"
|
|
||||||
icon="el-icon-delete"
|
|
||||||
@click="handleDelete(scope.row)"
|
|
||||||
v-hasPermi="['system:menu:delete']">
|
|
||||||
删除
|
|
||||||
</el-button>
|
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
|
|
||||||
<!-- 添加或修改菜单对话框 -->
|
<!-- 添加或修改菜单对话框 -->
|
||||||
<el-dialog
|
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
|
||||||
:title="title"
|
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
|
||||||
:visible.sync="open"
|
|
||||||
width="800px"
|
|
||||||
append-to-body>
|
|
||||||
<el-form
|
|
||||||
ref="form"
|
|
||||||
:model="form"
|
|
||||||
:rules="rules"
|
|
||||||
label-width="100px">
|
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="24">
|
<el-col :span="24">
|
||||||
<el-form-item label="上级菜单">
|
<el-form-item label="上级菜单">
|
||||||
<treeselect
|
<treeselect v-model="form.parentId" :options="menuOptions" :normalizer="normalizer" :show-count="true"
|
||||||
v-model="form.parentId"
|
placeholder="选择上级菜单"/>
|
||||||
:options="menuOptions"
|
|
||||||
:normalizer="normalizer"
|
|
||||||
:show-count="true"
|
|
||||||
placeholder="选择上级菜单" />
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="24">
|
<el-col :span="24">
|
||||||
<el-form-item
|
<el-form-item label="菜单类型" prop="type">
|
||||||
label="菜单类型"
|
|
||||||
prop="type">
|
|
||||||
<el-radio-group v-model="form.type">
|
<el-radio-group v-model="form.type">
|
||||||
<el-radio
|
<el-radio v-for="dict in menuTypeDictDatas" :key="parseInt(dict.value)" :label="parseInt(dict.value)">
|
||||||
v-for="dict in menuTypeDictDatas"
|
{{dict.label}}</el-radio>
|
||||||
:key="parseInt(dict.value)"
|
|
||||||
:label="parseInt(dict.value)">
|
|
||||||
{{ dict.label }}
|
|
||||||
</el-radio>
|
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
@ -201,192 +89,107 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col> -->
|
</el-col> -->
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item
|
<el-form-item label="菜单名称" prop="name">
|
||||||
label="菜单名称"
|
<el-input v-model="form.name" placeholder="请输入菜单名称" />
|
||||||
prop="name">
|
|
||||||
<el-input
|
|
||||||
v-model="form.name"
|
|
||||||
placeholder="请输入菜单名称" />
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item
|
<el-form-item label="显示排序" prop="sort">
|
||||||
label="显示排序"
|
<el-input-number v-model="form.sort" controls-position="right" :min="0" />
|
||||||
prop="sort">
|
|
||||||
<el-input-number
|
|
||||||
v-model="form.sort"
|
|
||||||
controls-position="right"
|
|
||||||
:min="0" />
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item
|
<el-form-item v-if="form.type !== 3" label="路由地址" prop="path">
|
||||||
v-if="form.type !== 3"
|
|
||||||
label="路由地址"
|
|
||||||
prop="path">
|
|
||||||
<span slot="label">
|
<span slot="label">
|
||||||
<el-tooltip
|
<el-tooltip content="访问的路由地址，如：`user`。如需外网地址时，则以 `http(s)://` 开头" placement="top">
|
||||||
content="访问的路由地址，如：`user`。如需外网地址时，则以 `http(s)://` 开头"
|
|
||||||
placement="top">
|
|
||||||
<i class="el-icon-question" />
|
<i class="el-icon-question" />
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
路由地址
|
路由地址
|
||||||
</span>
|
</span>
|
||||||
<el-input
|
<el-input v-model="form.path" placeholder="请输入路由地址" />
|
||||||
v-model="form.path"
|
|
||||||
placeholder="请输入路由地址" />
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item
|
<el-form-item v-if="form.type !== 1" label="权限标识">
|
||||||
v-if="form.type !== 1"
|
|
||||||
label="权限标识">
|
|
||||||
<span slot="label">
|
<span slot="label">
|
||||||
<el-tooltip
|
<el-tooltip content="Controller 方法上的权限字符，如：@PreAuthorize(`@ss.hasPermission('system:user:list')`)" placement="top">
|
||||||
content="Controller 方法上的权限字符，如：@PreAuthorize(`@ss.hasPermission('system:user:list')`)"
|
|
||||||
placement="top">
|
|
||||||
<i class="el-icon-question" />
|
<i class="el-icon-question" />
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
权限字符
|
权限字符
|
||||||
</span>
|
</span>
|
||||||
<el-input
|
<el-input v-model="form.permission" placeholder="请权限标识" maxlength="50" />
|
||||||
v-model="form.permission"
|
|
||||||
placeholder="请权限标识"
|
|
||||||
maxlength="200" />
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col
|
<el-col :span="12" v-if="form.type === 2">
|
||||||
:span="12"
|
<el-form-item label="组件路径" prop="component">
|
||||||
v-if="form.type === 2">
|
<el-input v-model="form.component" placeholder="例如说：system/user/index" />
|
||||||
<el-form-item
|
|
||||||
label="组件路径"
|
|
||||||
prop="component">
|
|
||||||
<el-input
|
|
||||||
v-model="form.component"
|
|
||||||
placeholder="例如说：system/user/index" />
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col
|
<el-col :span="12" v-if="form.type === 2">
|
||||||
:span="12"
|
<el-form-item label="组件名称" prop="componentName">
|
||||||
v-if="form.type === 2">
|
<el-input v-model="form.componentName" placeholder="例如说：SystemUser" />
|
||||||
<el-form-item
|
|
||||||
label="组件名称"
|
|
||||||
prop="componentName">
|
|
||||||
<el-input
|
|
||||||
v-model="form.componentName"
|
|
||||||
placeholder="例如说：SystemUser" />
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item
|
<el-form-item label="菜单状态" prop="status">
|
||||||
label="菜单状态"
|
|
||||||
prop="status">
|
|
||||||
<span slot="label">
|
<span slot="label">
|
||||||
<el-tooltip
|
<el-tooltip content="选择停用时，路由将不会出现在侧边栏，也不能被访问" placement="top">
|
||||||
content="选择停用时，路由将不会出现在侧边栏，也不能被访问"
|
|
||||||
placement="top">
|
|
||||||
<i class="el-icon-question" />
|
<i class="el-icon-question" />
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
菜单状态
|
菜单状态
|
||||||
</span>
|
</span>
|
||||||
<el-radio-group v-model="form.status">
|
<el-radio-group v-model="form.status">
|
||||||
<el-radio
|
<el-radio v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
|
||||||
v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
|
:key="dict.value" :label="parseInt(dict.value)">{{dict.label}}</el-radio>
|
||||||
:key="dict.value"
|
|
||||||
:label="parseInt(dict.value)">
|
|
||||||
{{ dict.label }}
|
|
||||||
</el-radio>
|
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item
|
<el-form-item v-if="form.type !== 3" label="显示状态">
|
||||||
v-if="form.type !== 3"
|
|
||||||
label="显示状态">
|
|
||||||
<span slot="label">
|
<span slot="label">
|
||||||
<el-tooltip
|
<el-tooltip content="选择隐藏时，路由将不会出现在侧边栏，但仍然可以访问" placement="top">
|
||||||
content="选择隐藏时，路由将不会出现在侧边栏，但仍然可以访问"
|
|
||||||
placement="top">
|
|
||||||
<i class="el-icon-question" />
|
<i class="el-icon-question" />
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
是否显示
|
是否显示
|
||||||
</span>
|
</span>
|
||||||
<el-radio-group v-model="form.visible">
|
<el-radio-group v-model="form.visible">
|
||||||
<el-radio
|
<el-radio :key="true" :label="true">显示</el-radio>
|
||||||
:key="true"
|
<el-radio :key="false" :label="false">隐藏</el-radio>
|
||||||
:label="true">
|
|
||||||
显示
|
|
||||||
</el-radio>
|
|
||||||
<el-radio
|
|
||||||
:key="false"
|
|
||||||
:label="false">
|
|
||||||
隐藏
|
|
||||||
</el-radio>
|
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item
|
<el-form-item v-if="form.type !== 3" label="总是显示">
|
||||||
v-if="form.type !== 3"
|
|
||||||
label="总是显示">
|
|
||||||
<span slot="label">
|
<span slot="label">
|
||||||
<el-tooltip
|
<el-tooltip content="选择不是时，当该菜单只有一个子菜单时，不展示自己，直接展示子菜单" placement="top">
|
||||||
content="选择不是时，当该菜单只有一个子菜单时，不展示自己，直接展示子菜单"
|
|
||||||
placement="top">
|
|
||||||
<i class="el-icon-question" />
|
<i class="el-icon-question" />
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
总是显示
|
总是显示
|
||||||
</span>
|
</span>
|
||||||
<el-radio-group v-model="form.alwaysShow">
|
<el-radio-group v-model="form.alwaysShow">
|
||||||
<el-radio
|
<el-radio :key="true" :label="true">总是</el-radio>
|
||||||
:key="true"
|
<el-radio :key="false" :label="false">不是</el-radio>
|
||||||
:label="true">
|
|
||||||
总是
|
|
||||||
</el-radio>
|
|
||||||
<el-radio
|
|
||||||
:key="false"
|
|
||||||
:label="false">
|
|
||||||
不是
|
|
||||||
</el-radio>
|
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item
|
<el-form-item v-if="form.type === 2" label="是否缓存">
|
||||||
v-if="form.type === 2"
|
|
||||||
label="是否缓存">
|
|
||||||
<span slot="label">
|
<span slot="label">
|
||||||
<el-tooltip
|
<el-tooltip content="选择缓存时，则会被 `keep-alive` 缓存，必须填写「组件名称」字段" placement="top">
|
||||||
content="选择缓存时，则会被 `keep-alive` 缓存，必须填写「组件名称」字段"
|
|
||||||
placement="top">
|
|
||||||
<i class="el-icon-question" />
|
<i class="el-icon-question" />
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
是否缓存
|
是否缓存
|
||||||
</span>
|
</span>
|
||||||
<el-radio-group v-model="form.keepAlive">
|
<el-radio-group v-model="form.keepAlive">
|
||||||
<el-radio
|
<el-radio :key="true" :label="true">缓存</el-radio>
|
||||||
:key="true"
|
<el-radio :key="false" :label="false">不缓存</el-radio>
|
||||||
:label="true">
|
|
||||||
缓存
|
|
||||||
</el-radio>
|
|
||||||
<el-radio
|
|
||||||
:key="false"
|
|
||||||
:label="false">
|
|
||||||
不缓存
|
|
||||||
</el-radio>
|
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
</el-form>
|
</el-form>
|
||||||
<div
|
<div slot="footer" class="dialog-footer">
|
||||||
slot="footer"
|
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||||
class="dialog-footer">
|
|
||||||
<el-button
|
|
||||||
type="primary"
|
|
||||||
@click="submitForm">
|
|
||||||
确 定
|
|
||||||
</el-button>
|
|
||||||
<el-button @click="cancel">取 消</el-button>
|
<el-button @click="cancel">取 消</el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
@ -394,23 +197,17 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import {
|
import { listMenu, getMenu, delMenu, addMenu, updateMenu } from "@/api/system/menu";
|
||||||
listMenu,
|
import Treeselect from "@riophae/vue-treeselect";
|
||||||
getMenu,
|
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
||||||
delMenu,
|
import IconSelect from "@/components/IconSelect";
|
||||||
addMenu,
|
|
||||||
updateMenu,
|
|
||||||
} from '@/api/system/menu';
|
|
||||||
import Treeselect from '@riophae/vue-treeselect';
|
|
||||||
import '@riophae/vue-treeselect/dist/vue-treeselect.css';
|
|
||||||
import IconSelect from '@/components/IconSelect';
|
|
||||||
|
|
||||||
import { SystemMenuTypeEnum, CommonStatusEnum } from '@/utils/constants';
|
import { SystemMenuTypeEnum, CommonStatusEnum } from '@/utils/constants'
|
||||||
import { getDictDatas, DICT_TYPE } from '@/utils/dict';
|
import { getDictDatas, DICT_TYPE } from '@/utils/dict'
|
||||||
import { isExternal } from '@/utils/validate';
|
import {isExternal} from "@/utils/validate";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'SystemMenu',
|
name: "SystemMenu",
|
||||||
components: { Treeselect, IconSelect },
|
components: { Treeselect, IconSelect },
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
@ -423,7 +220,7 @@ export default {
|
|||||||
// 菜单树选项
|
// 菜单树选项
|
||||||
menuOptions: [],
|
menuOptions: [],
|
||||||
// 弹出层标题
|
// 弹出层标题
|
||||||
title: '',
|
title: "",
|
||||||
// 是否显示弹出层
|
// 是否显示弹出层
|
||||||
open: false,
|
open: false,
|
||||||
// 是否展开，默认全部折叠
|
// 是否展开，默认全部折叠
|
||||||
@ -433,22 +230,24 @@ export default {
|
|||||||
// 查询参数
|
// 查询参数
|
||||||
queryParams: {
|
queryParams: {
|
||||||
name: undefined,
|
name: undefined,
|
||||||
visible: undefined,
|
visible: undefined
|
||||||
},
|
},
|
||||||
// 表单参数
|
// 表单参数
|
||||||
form: {},
|
form: {},
|
||||||
// 表单校验
|
// 表单校验
|
||||||
rules: {
|
rules: {
|
||||||
name: [
|
name: [
|
||||||
{ required: true, message: '菜单名称不能为空', trigger: 'blur' },
|
{ required: true, message: "菜单名称不能为空", trigger: "blur" }
|
||||||
],
|
],
|
||||||
sort: [
|
sort: [
|
||||||
{ required: true, message: '菜单顺序不能为空', trigger: 'blur' },
|
{ required: true, message: "菜单顺序不能为空", trigger: "blur" }
|
||||||
],
|
],
|
||||||
path: [
|
path: [
|
||||||
{ required: true, message: '路由地址不能为空', trigger: 'blur' },
|
{ required: true, message: "路由地址不能为空", trigger: "blur" }
|
||||||
],
|
],
|
||||||
status: [{ required: true, message: '状态不能为空', trigger: 'blur' }],
|
status: [
|
||||||
|
{ required: true, message: "状态不能为空", trigger: "blur" }
|
||||||
|
]
|
||||||
},
|
},
|
||||||
|
|
||||||
// 枚举
|
// 枚举
|
||||||
@ -456,7 +255,7 @@ export default {
|
|||||||
CommonStatusEnum: CommonStatusEnum,
|
CommonStatusEnum: CommonStatusEnum,
|
||||||
// 数据字典
|
// 数据字典
|
||||||
menuTypeDictDatas: getDictDatas(DICT_TYPE.SYSTEM_MENU_TYPE),
|
menuTypeDictDatas: getDictDatas(DICT_TYPE.SYSTEM_MENU_TYPE),
|
||||||
statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS),
|
statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS)
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
@ -470,8 +269,8 @@ export default {
|
|||||||
/** 查询菜单列表 */
|
/** 查询菜单列表 */
|
||||||
getList() {
|
getList() {
|
||||||
this.loading = true;
|
this.loading = true;
|
||||||
listMenu(this.queryParams).then((response) => {
|
listMenu(this.queryParams).then(response => {
|
||||||
this.menuList = this.handleTree(response.data, 'id');
|
this.menuList = this.handleTree(response.data, "id");
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
@ -483,15 +282,15 @@ export default {
|
|||||||
return {
|
return {
|
||||||
id: node.id,
|
id: node.id,
|
||||||
label: node.name,
|
label: node.name,
|
||||||
children: node.children,
|
children: node.children
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
/** 查询菜单下拉树结构 */
|
/** 查询菜单下拉树结构 */
|
||||||
getTreeselect() {
|
getTreeselect() {
|
||||||
listMenu().then((response) => {
|
listMenu().then(response => {
|
||||||
this.menuOptions = [];
|
this.menuOptions = [];
|
||||||
const menu = { id: 0, name: '主类目', children: [] };
|
const menu = { id: 0, name: '主类目', children: [] };
|
||||||
menu.children = this.handleTree(response.data, 'id');
|
menu.children = this.handleTree(response.data, "id");
|
||||||
this.menuOptions.push(menu);
|
this.menuOptions.push(menu);
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
@ -514,7 +313,7 @@ export default {
|
|||||||
keepAlive: true,
|
keepAlive: true,
|
||||||
alwaysShow: true,
|
alwaysShow: true,
|
||||||
};
|
};
|
||||||
this.resetForm('form');
|
this.resetForm("form");
|
||||||
},
|
},
|
||||||
/** 搜索按钮操作 */
|
/** 搜索按钮操作 */
|
||||||
handleQuery() {
|
handleQuery() {
|
||||||
@ -522,7 +321,7 @@ export default {
|
|||||||
},
|
},
|
||||||
/** 重置按钮操作 */
|
/** 重置按钮操作 */
|
||||||
resetQuery() {
|
resetQuery() {
|
||||||
this.resetForm('queryForm');
|
this.resetForm("queryForm");
|
||||||
this.handleQuery();
|
this.handleQuery();
|
||||||
},
|
},
|
||||||
/** 展开/折叠操作 */
|
/** 展开/折叠操作 */
|
||||||
@ -543,51 +342,49 @@ export default {
|
|||||||
this.form.parentId = 0;
|
this.form.parentId = 0;
|
||||||
}
|
}
|
||||||
this.open = true;
|
this.open = true;
|
||||||
this.title = '添加菜单';
|
this.title = "添加菜单";
|
||||||
},
|
},
|
||||||
/** 修改按钮操作 */
|
/** 修改按钮操作 */
|
||||||
handleUpdate(row) {
|
handleUpdate(row) {
|
||||||
this.reset();
|
this.reset();
|
||||||
this.getTreeselect();
|
this.getTreeselect();
|
||||||
getMenu(row.id).then((response) => {
|
getMenu(row.id).then(response => {
|
||||||
this.form = response.data;
|
this.form = response.data;
|
||||||
this.open = true;
|
this.open = true;
|
||||||
this.title = '修改菜单';
|
this.title = "修改菜单";
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
/** 提交按钮 */
|
/** 提交按钮 */
|
||||||
submitForm: function () {
|
submitForm: function() {
|
||||||
this.$refs['form'].validate((valid) => {
|
this.$refs["form"].validate(valid => {
|
||||||
if (valid) {
|
if (valid) {
|
||||||
// 若权限类型为目录或者菜单时，进行 path 的校验，避免后续拼接出来的路由无法跳转
|
// 若权限类型为目录或者菜单时，进行 path 的校验，避免后续拼接出来的路由无法跳转
|
||||||
if (
|
if (this.form.type === SystemMenuTypeEnum.DIR
|
||||||
this.form.type === SystemMenuTypeEnum.DIR ||
|
|| this.form.type === SystemMenuTypeEnum.MENU) {
|
||||||
this.form.type === SystemMenuTypeEnum.MENU
|
|
||||||
) {
|
|
||||||
// 如果是外链，则不进行校验
|
// 如果是外链，则不进行校验
|
||||||
const path = this.form.path;
|
const path = this.form.path
|
||||||
if (!isExternal(path)) {
|
if (!isExternal(path)) {
|
||||||
// 父权限为根节点，path 必须以 / 开头
|
// 父权限为根节点，path 必须以 / 开头
|
||||||
if (this.form.parentId === 0 && path.charAt(0) !== '/') {
|
if (this.form.parentId === 0 && path.charAt(0) !== '/') {
|
||||||
this.$modal.msgSuccess('前端必须以 / 开头');
|
this.$modal.msgSuccess('前端必须以 / 开头')
|
||||||
return;
|
return
|
||||||
} else if (this.form.parentId !== 0 && path.charAt(0) === '/') {
|
} else if (this.form.parentId !== 0 && path.charAt(0) === '/') {
|
||||||
this.$modal.msgSuccess('前端不能以 / 开头');
|
this.$modal.msgSuccess('前端不能以 / 开头')
|
||||||
return;
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 提交
|
// 提交
|
||||||
if (this.form.id !== undefined) {
|
if (this.form.id !== undefined) {
|
||||||
updateMenu(this.form).then((response) => {
|
updateMenu(this.form).then(response => {
|
||||||
this.$modal.msgSuccess('修改成功');
|
this.$modal.msgSuccess("修改成功");
|
||||||
this.open = false;
|
this.open = false;
|
||||||
this.getList();
|
this.getList();
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
addMenu(this.form).then((response) => {
|
addMenu(this.form).then(response => {
|
||||||
this.$modal.msgSuccess('新增成功');
|
this.$modal.msgSuccess("新增成功");
|
||||||
this.open = false;
|
this.open = false;
|
||||||
this.getList();
|
this.getList();
|
||||||
});
|
});
|
||||||
@ -597,17 +394,13 @@ export default {
|
|||||||
},
|
},
|
||||||
/** 删除按钮操作 */
|
/** 删除按钮操作 */
|
||||||
handleDelete(row) {
|
handleDelete(row) {
|
||||||
this.$modal
|
this.$modal.confirm('是否确认删除名称为"' + row.name + '"的数据项?').then(function() {
|
||||||
.confirm('是否确认删除名称为"' + row.name + '"的数据项?')
|
|
||||||
.then(function () {
|
|
||||||
return delMenu(row.id);
|
return delMenu(row.id);
|
||||||
})
|
}).then(() => {
|
||||||
.then(() => {
|
|
||||||
this.getList();
|
this.getList();
|
||||||
this.$modal.msgSuccess('删除成功');
|
this.$modal.msgSuccess("删除成功");
|
||||||
})
|
}).catch(() => {});
|
||||||
.catch(() => {});
|
}
|
||||||
},
|
}
|
||||||
},
|
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user