meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

a

Browse Source
This commit is contained in:
Vergil
2020-03-25 17:15:21 +08:00
parent 888f5938a3
commit c3a9e0337c
2 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/views/BasicData/MenuManagement/index.vue
View File

@@ -2,14 +2,14 @@
<div class="app-container">
<el-row>
<el-col :span="7">
<el-card style="margin-bottom: 20px">
<el-card style="margin-bottom: 10px">
<el-button size="small" type="distribution" @click="addFisrtLevel">创建一级菜单</el-button>
</el-card>
<el-card>
<div slot="header">
<el-input v-model="filterTextLeft" size="small" placeholder="输入关键字进行过滤" clearable/>
</div>
<el-table ref="multipleTableLeft" :data="fisrtLevelFilter" stripe highlight-current-row size="mini" height="calc(100vh - 330px)" style="height:calc(100vh - 330px);" @selection-change="handleSelectionChangeLeft">
<el-table ref="multipleTableLeft" :data="fisrtLevelFilter" stripe highlight-current-row size="mini" height="500" style="height:calc(100vh - 330px);" @selection-change="handleSelectionChangeLeft">
<el-table-column :selectable="selectable" align="center" type="selection" width="55"/>
<el-table-column align="center" label="模块名称">
<template slot-scope="scope">
@@ -25,7 +25,7 @@
</el-tooltip>
</el-col>
<el-col :span="8">
<el-card style="margin-bottom: 20px">
<el-card style="margin-bottom: 10px">
<span>角色:</span>
<el-select v-model="roleName" placeholder="请选择" size="small" style="width:200px;margin-left:10px" filterable @change="getModule">
<el-option
@@ -35,20 +35,11 @@
:value="item.value"/>
</el-select>
</el-card>
<el-card style="height:calc(100vh - 220px);overflow: auto">
<el-card style="height: 550px;overflow: auto">
<div slot="header">
<el-input v-model="filterText" size="small" placeholder="输入关键字进行过滤" clearable/>
</div>
<el-tree
ref="moduleTree"
:data="moduleTree"
:filter-node-method="filterNode"
check-strictly
class="moduleTree"
show-checkbox
node-key="id"
default-expand-all
@check-change="treeCheck">
<el-tree ref="moduleTree" :data="moduleTree" :filter-node-method="filterNode" check-strictly class="moduleTree" show-checkbox node-key="id" default-expand-all @check-change="treeCheck">
<span slot-scope="{ node, data }" class="custom-tree-node">
<span>{{ node.label }}</span>
<span>
@@ -70,27 +61,15 @@
</el-tooltip>
</el-col>
<el-col :span="7">
<el-card style="margin-bottom: 20px">
<el-card style="margin-bottom: 10px">
<el-button size="small" type="distribution" @click="addSecondLevel">创建二级菜单</el-button>
</el-card>
<el-card>
<div slot="header">
<el-input v-model="filterTextRight" size="small" placeholder="输入关键字进行过滤" clearable/>
</div>
<el-table
ref="multipleTableRight"
:data="secondLevelFilter"
stripe
highlight-current-row
size="mini"
height="calc(100vh - 330px)"
style="height:calc(100vh - 330px);"
@selection-change="handleSelectionChangeRight">
<el-table-column
:selectable="selectable"
align="center"
type="selection"
width="55"/>
<el-table ref="multipleTableRight" :data="secondLevelFilter" stripe highlight-current-row size="mini" height="500" style="height:calc(100vh - 330px);" @selection-change="handleSelectionChangeRight">
<el-table-column :selectable="selectable" align="center" type="selection" width="55"/>
<el-table-column align="center" label="模块名称">
<template slot-scope="scope">
{{ scope.row.title }}
@@ -101,6 +80,22 @@
</el-col>
</el-row>
<el-row v-if="false">
<el-card>
<div slot="header">
<el-input v-model="filterTextRight" size="small" placeholder="输入关键字进行过滤" clearable/>
</div>
<el-table :data="secondLevelFilter" stripe size="mini" height="200" border>
<el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column align="center" label="模块名称">
<template slot-scope="scope">
{{ scope.row.title }}
</template>
</el-table-column>
</el-table>
</el-card>
</el-row>
<el-dialog :visible.sync="dialogVisible1" title="新增一级模块" center style="min-height: 300px" width="400px">
<el-form ref="form1" :model="form1" :rules="rules1" label-position="left" label-width="110px" class="demo-ruleForm">
<el-form-item label="模块名称" prop="moduleName">

3
src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue
View File

@@ -161,7 +161,8 @@
</div>
</template>
<script>import { getData, getData1, getData2, getData3, getMachine, searchState } from '@/api/ManufacturingCenter/EquipmentConditionAnalysis'
<script>
import { getData, getData1, getData2, getData3, getMachine, searchState } from '@/api/ManufacturingCenter/EquipmentConditionAnalysis'
export default {
data() {