From c3a9e0337c4f380e9b967f3de5682e6196d32cd8 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Wed, 25 Mar 2020 17:15:21 +0800
Subject: [PATCH] a

---
 src/views/BasicData/MenuManagement/index.vue  | 53 +++++++++----------
 .../EquipmentConditionAnalysis/index.vue      |  3 +-
 2 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/src/views/BasicData/MenuManagement/index.vue b/src/views/BasicData/MenuManagement/index.vue
index b685dd09..95b6274a 100644
--- a/src/views/BasicData/MenuManagement/index.vue
+++ b/src/views/BasicData/MenuManagement/index.vue
@@ -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">
diff --git a/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue b/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue
index 5de98a3c..652355e5 100644
--- a/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue
+++ b/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue
@@ -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() {