From d6803b83a827a62fa29737c31104c3ee9bc194d8 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期一, 08 四月 2024 10:18:41 +0800
Subject: [PATCH] 1、全局菜单栏新增点击父级菜单标题后在导航栏展开父级所有下一级菜单功能 2、登录页面按照新需求调整整体布局及样式 3、优化首页看板页面图表视图

---
 src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue b/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue
index 0b18f26..43395c1 100644
--- a/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue
+++ b/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue
@@ -5,7 +5,7 @@
       <div class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="searchQuery">
           <a-row :gutter="24">
-            <a-col :md="5" :sm="5" :xs="5">
+            <a-col :md="4" :sm="4" :xs="4">
               <a-form-item label="椹卞姩绫诲瀷">
                 <a-auto-complete
                   v-model="queryParam.driveType"
@@ -16,7 +16,19 @@
                 />
               </a-form-item>
             </a-col>
-            <a-col :md="7" :sm="7" :xs="7">
+            <a-col :md="4" :sm="4" :xs="4">
+              <a-form-item label="璁惧绾у埆">
+                <j-dict-select-tag placeholder="璇烽�夋嫨璁惧绾у埆" dictCode="device_level" v-model="queryParam.deviceLevel"
+                                   allow-clear/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="4" :sm="4" :xs="4">
+              <a-form-item label="璁惧绉嶇被">
+                <j-dict-select-tag placeholder="璇烽�夋嫨璁惧绉嶇被" dictCode="device_category" v-model="queryParam.deviceCategory"
+                                   allow-clear/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="5" :sm="5" :xs="5">
               <a-form-item label="鏃堕棿">
                 <a-range-picker
                   :placeholder="['寮�濮嬫椂闂�', '缁撴潫鏃堕棿']"
@@ -28,11 +40,14 @@
                 />
               </a-form-item>
             </a-col>
-            <a-col :md="2" :sm="2" :xs="2">
+            <a-col :md="4" :sm="4" :xs="4">
               <a-space>
                 <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
                 <a-button type="primary" @click="searchReset" icon="reload">閲嶇疆</a-button>
                 <a-button type="primary" @click="exportExcel" icon="download">瀵煎嚭</a-button>
+                <a-button type="primary" icon="printer" v-print="'#EfficiencyShift'" v-has="'efficiencyShift:print'">
+                  鎵撳嵃
+                </a-button>
               </a-space>
             </a-col>
           </a-row>

--
Gitblit v1.9.3