mt-fe-group/yudao-dev
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'projects/mesxc-zjl' (#321) from projects/mesxc-zjl into projects/mesxc-test

Browse Source 
Reviewed-on: #321
This commit is contained in:
朱菊兰 2024-04-09 13:09:55 +08:00
commit a4fceeb981
3 changed files with 602 additions and 416 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.env.dev
View File

@ -25,8 +25,10 @@ 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'

67
src/views/databoard/kiln/MaterialCost.vue
View File

@ -1,24 +1,23 @@
<!--
filename: MaterialCost.vue
author: liubin
date: 2023-12-06 09:09:27
description:
-->
<template> <template>
<Container name="原料用量统计" size="middle" style=""> <Container
<div style="flex: 1; display: flex; gap: 8px;flex-direction: column;"> name="原料用量统计"
size="middle"
style="">
<div style="flex: 1; display: flex; gap: 8px; flex-direction: column">
<div <div
class="absolute" class="absolute"
style=" style="
flex:3; flex: 2;
padding: 12px 12px 0 12px; padding: 12px 12px 0 12px;
display: grid; display: grid;
grid-template-columns: repeat(3, 1fr); grid-template-columns: repeat(2, 1fr);
grid-auto-rows: repeat(4, 1fr); grid-auto-rows: repeat(4, 1fr);
gap: 8px; gap: 8px;
"> ">
<ShadowRect v-for="(item, index) in materialMsg1" :key="index" :rounded="false"> <ShadowRect
v-for="(item, index) in materialMsg"
:key="index"
:rounded="false">
<div <div
class="material" class="material"
style=" style="
@ -30,43 +29,24 @@
align-items: center; align-items: center;
justify-content: center; justify-content: center;
"> ">
<span style="color: #0ee8e4; font-weight: 500; font-size: 32px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;"> <span
{{item.materialUsed}}
</span>
<span style="color: #fff; font-size: 16px; letter-spacing: 1px">
- {{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=" style="
flex: 1; color: #0ee8e4;
padding-bottom: 3px; font-weight: 500;
display: flex; font-size: 32px;
flex-direction: column; white-space: nowrap;
gap: 4px; overflow: hidden;
align-items: center; text-overflow: ellipsis;
justify-content: center;
"> ">
<span style="color: #0ee8e4; font-weight: 500; font-size: 32px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;"> {{ item.materialUsed }}
{{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> </span>
</div> </div>
</ShadowRect> </ShadowRect>
</div> </div>
</div> </div>
</Container> </Container>
</template> </template>
@ -81,12 +61,9 @@ export default {
return {}; return {};
}, },
computed: { computed: {
materialMsg1() { materialMsg() {
return this.$store.state.websocket.material.slice(0,9) return this.$store.state.websocket.material;
}, },
materialMsg2() {
return this.$store.state.websocket.material.slice(9)
}
}, },
methods: {}, methods: {},
}; };

439
src/views/system/menu/index.vue
View File

@ -3,76 +3,188 @@
<!-- <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 :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"> <el-form
<el-form-item label="菜单名称" prop="name"> :model="queryParams"
<el-input v-model="queryParams.name" placeholder="请输入菜单名称" clearable @keyup.enter.native="handleQuery"/> ref="queryForm"
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 label="状态" prop="status"> <el-form-item
<el-select v-model="queryParams.status" placeholder="菜单状态" clearable> label="状态"
<el-option v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/> prop="status">
<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 type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button> <el-button
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button> type="primary"
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 :gutter="10" class="mb8"> <el-row
:gutter="10"
class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <el-button
v-hasPermi="['system:menu:create']">新增</el-button> type="primary"
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 type="info" plain icon="el-icon-sort" size="mini" @click="toggleExpandAll">展开/折叠</el-button> <el-button
type="info"
plain
icon="el-icon-sort"
size="mini"
@click="toggleExpandAll">
展开/折叠
</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-if="refreshTable" v-loading="loading" :data="menuList" row-key="id" :default-expand-all="isExpandAll" <el-table
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"> v-if="refreshTable"
<el-table-column prop="name" label="菜单名称" :show-overflow-tooltip="true" width="250"></el-table-column> v-loading="loading"
: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 prop="sort" label="排序" width="60"></el-table-column> <el-table-column
<el-table-column prop="permission" label="权限标识" :show-overflow-tooltip="true" /> prop="sort"
<el-table-column prop="component" label="组件路径" :show-overflow-tooltip="true" /> label="排序"
<el-table-column prop="componentName" label="组件名称" :show-overflow-tooltip="true" /> width="60"></el-table-column>
<el-table-column prop="status" label="状态" width="80"> <el-table-column
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 :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status"/> <dict-tag
:type="DICT_TYPE.COMMON_STATUS"
:value="scope.row.status" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width">
<template v-slot="scope"> <template v-slot="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <el-button
v-hasPermi="['system:menu:update']">修改</el-button> size="mini"
<el-button size="mini" type="text" icon="el-icon-plus" @click="handleAdd(scope.row)" type="text"
v-hasPermi="['system:menu:create']">新增</el-button> icon="el-icon-edit"
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['system:menu:delete']">删除</el-button> v-hasPermi="['system:menu:update']">
修改
</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 :title="title" :visible.sync="open" width="800px" append-to-body> <el-dialog
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> :title="title"
: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 v-model="form.parentId" :options="menuOptions" :normalizer="normalizer" :show-count="true" <treeselect
placeholder="选择上级菜单"/> v-model="form.parentId"
: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 label="菜单类型" prop="type"> <el-form-item
label="菜单类型"
prop="type">
<el-radio-group v-model="form.type"> <el-radio-group v-model="form.type">
<el-radio v-for="dict in menuTypeDictDatas" :key="parseInt(dict.value)" :label="parseInt(dict.value)"> <el-radio
{{dict.label}}</el-radio> v-for="dict in menuTypeDictDatas"
: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>
@ -89,107 +201,192 @@
</el-form-item> </el-form-item>
</el-col> --> </el-col> -->
<el-col :span="12"> <el-col :span="12">
<el-form-item label="菜单名称" prop="name"> <el-form-item
<el-input v-model="form.name" placeholder="请输入菜单名称" /> label="菜单名称"
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 label="显示排序" prop="sort"> <el-form-item
<el-input-number v-model="form.sort" controls-position="right" :min="0" /> label="显示排序"
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 v-if="form.type !== 3" label="路由地址" prop="path"> <el-form-item
v-if="form.type !== 3"
label="路由地址"
prop="path">
<span slot="label"> <span slot="label">
<el-tooltip content="访问的路由地址，如：`user`。如需外网地址时，则以 `http(s)://` 开头" placement="top"> <el-tooltip
content="访问的路由地址，如：`user`。如需外网地址时，则以 `http(s)://` 开头"
placement="top">
<i class="el-icon-question" /> <i class="el-icon-question" />
</el-tooltip> </el-tooltip>
路由地址 路由地址
</span> </span>
<el-input v-model="form.path" placeholder="请输入路由地址" /> <el-input
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 v-if="form.type !== 1" label="权限标识"> <el-form-item
v-if="form.type !== 1"
label="权限标识">
<span slot="label"> <span slot="label">
<el-tooltip content="Controller 方法上的权限字符，如：@PreAuthorize(`@ss.hasPermission('system:user:list')`)" placement="top"> <el-tooltip
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 v-model="form.permission" placeholder="请权限标识" maxlength="50" /> <el-input
v-model="form.permission"
placeholder="请权限标识"
maxlength="200" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" v-if="form.type === 2"> <el-col
<el-form-item label="组件路径" prop="component"> :span="12"
<el-input v-model="form.component" placeholder="例如说：system/user/index" /> v-if="form.type === 2">
<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 :span="12" v-if="form.type === 2"> <el-col
<el-form-item label="组件名称" prop="componentName"> :span="12"
<el-input v-model="form.componentName" placeholder="例如说：SystemUser" /> v-if="form.type === 2">
<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 label="菜单状态" prop="status"> <el-form-item
label="菜单状态"
prop="status">
<span slot="label"> <span slot="label">
<el-tooltip content="选择停用时，路由将不会出现在侧边栏，也不能被访问" placement="top"> <el-tooltip
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 v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)" <el-radio
:key="dict.value" :label="parseInt(dict.value)">{{dict.label}}</el-radio> v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
: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 v-if="form.type !== 3" label="显示状态"> <el-form-item
v-if="form.type !== 3"
label="显示状态">
<span slot="label"> <span slot="label">
<el-tooltip content="选择隐藏时，路由将不会出现在侧边栏，但仍然可以访问" placement="top"> <el-tooltip
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 :key="true" :label="true">显示</el-radio> <el-radio
<el-radio :key="false" :label="false">隐藏</el-radio> :key="true"
: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 v-if="form.type !== 3" label="总是显示"> <el-form-item
v-if="form.type !== 3"
label="总是显示">
<span slot="label"> <span slot="label">
<el-tooltip content="选择不是时，当该菜单只有一个子菜单时，不展示自己，直接展示子菜单" placement="top"> <el-tooltip
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 :key="true" :label="true">总是</el-radio> <el-radio
<el-radio :key="false" :label="false">不是</el-radio> :key="true"
: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 v-if="form.type === 2" label="是否缓存"> <el-form-item
v-if="form.type === 2"
label="是否缓存">
<span slot="label"> <span slot="label">
<el-tooltip content="选择缓存时，则会被 `keep-alive` 缓存，必须填写「组件名称」字段" placement="top"> <el-tooltip
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 :key="true" :label="true">缓存</el-radio> <el-radio
<el-radio :key="false" :label="false">不缓存</el-radio> :key="true"
: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 slot="footer" class="dialog-footer"> <div
<el-button type="primary" @click="submitForm">确 定</el-button> slot="footer"
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>
@ -197,17 +394,23 @@
</template> </template>
<script> <script>
import { listMenu, getMenu, delMenu, addMenu, updateMenu } from "@/api/system/menu"; import {
import Treeselect from "@riophae/vue-treeselect"; listMenu,
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; getMenu,
import IconSelect from "@/components/IconSelect"; delMenu,
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 {
@ -220,7 +423,7 @@ export default {
// 菜单树选项 // 菜单树选项
menuOptions: [], menuOptions: [],
// 弹出层标题 // 弹出层标题
title: "", title: '',
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
// 是否展开，默认全部折叠 // 是否展开，默认全部折叠
@ -230,24 +433,22 @@ 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: [ status: [{ required: true, message: '状态不能为空', trigger: 'blur' }],
{ required: true, message: "状态不能为空", trigger: "blur" }
]
}, },
// 枚举 // 枚举
@ -255,7 +456,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() {
@ -269,8 +470,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;
}); });
}, },
@ -282,15 +483,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);
}); });
}, },
@ -313,7 +514,7 @@ export default {
keepAlive: true, keepAlive: true,
alwaysShow: true, alwaysShow: true,
}; };
this.resetForm("form"); this.resetForm('form');
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
@ -321,7 +522,7 @@ export default {
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.resetForm('queryForm');
this.handleQuery(); this.handleQuery();
}, },
/** 展开/折叠操作 */ /** 展开/折叠操作 */
@ -342,49 +543,51 @@ 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 (this.form.type === SystemMenuTypeEnum.DIR if (
|| this.form.type === SystemMenuTypeEnum.MENU) { this.form.type === SystemMenuTypeEnum.DIR ||
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();
}); });
@ -394,13 +597,17 @@ export default {
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
this.$modal.confirm('是否确认删除名称为"' + row.name + '"的数据项?').then(function() { this.$modal
.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>