From 738f76adfcbf102dfbf890b044ba9a25a034cb8c Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 27 三月 2024 16:17:38 +0800
Subject: [PATCH] 1、用户管理页面修改身份字段名称为首页权限并调整其选项值 2、按照新需求完成客户操作工进入后页面所有布局100% 3、调整全局页脚内容

---
 src/views/mdc/base/modules/DeviceProcessReport/DeviceProcessReportList.vue |   52 +++++++++++++++++++++++++++++++---------------------
 1 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/src/views/mdc/base/modules/DeviceProcessReport/DeviceProcessReportList.vue b/src/views/mdc/base/modules/DeviceProcessReport/DeviceProcessReportList.vue
index f301ebf..10b3f60 100644
--- a/src/views/mdc/base/modules/DeviceProcessReport/DeviceProcessReportList.vue
+++ b/src/views/mdc/base/modules/DeviceProcessReport/DeviceProcessReportList.vue
@@ -5,18 +5,32 @@
         <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"
                     :data-source="driveTypeList"
                     placeholder="璇烽�夋嫨椹卞姩绫诲瀷"
                     :filter-option="filterOption"
+                    allowClear
                   />
                 </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="['寮�濮嬫椂闂�', '缁撴潫鏃堕棿']"
@@ -32,6 +46,7 @@
                   <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="'deviceProcess:print'">鎵撳嵃</a-button>
                 </a-space>
               </a-col>
             </a-row>
@@ -209,9 +224,13 @@
     methods: {
       dateParamChange(value) {
         this.dates = value
-        console.log('value', value)
-        this.queryParam.startTime = moment(this.dates[0]).format('YYYYMMDD')
-        this.queryParam.endTime = moment(this.dates[1]).format('YYYYMMDD')
+        if(!value.length) {
+          delete this.queryParam.startTime
+          delete this.queryParam.endTime
+        }else{
+          this.queryParam.startTime = moment(this.dates[0]).format('YYYYMMDD')
+          this.queryParam.endTime = moment(this.dates[1]).format('YYYYMMDD')
+        }
       },
 
       exportExcel() {
@@ -227,24 +246,15 @@
       },
 
       searchQuery() {
-        if (this.dates != '') {
-          if (this.queryParam.typeTree == '1') {
-            this.queryParam.parentId = this.queryParamEquip.parentId
-            this.queryParam.equipmentId = this.queryParamEquip.equipmentId
-          } else {
-            this.queryParam.parentId = this.queryParamPeople.parentId
-            this.queryParam.equipmentId = ''
-          }
-          this.queryParam.pageNo = 1
-          this.loadData()
+        if (this.queryParam.typeTree == '1') {
+          this.queryParam.parentId = this.queryParamEquip.parentId
+          this.queryParam.equipmentId = this.queryParamEquip.equipmentId
         } else {
-          // this.$message.warning("璇烽�夋嫨鏃堕棿")
-          this.$notification.warning({
-            message: '娑堟伅',
-            description: '璇烽�夋嫨鏃堕棿'
-          })
+          this.queryParam.parentId = this.queryParamPeople.parentId
+          this.queryParam.equipmentId = ''
         }
-        // this.onClearSelected()
+        this.queryParam.pageNo = 1
+        this.loadData()
       },
 
       searchReset() {

--
Gitblit v1.9.3