From 238121be19655f63a45fc9c9c3d864801eb4471b Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 24 四月 2024 12:44:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/views/monitor/log/operateLog.vue |   49 ++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/monitor/log/operateLog.vue b/Source/UBCS-WEB/src/views/monitor/log/operateLog.vue
index e77e7d9..cbb013c 100644
--- a/Source/UBCS-WEB/src/views/monitor/log/operateLog.vue
+++ b/Source/UBCS-WEB/src/views/monitor/log/operateLog.vue
@@ -19,6 +19,21 @@
         <small slot="more">...</small>
       </avue-text-ellipsis>
     </template>
+      <template slot="menuLeft">
+        <span style="width: 200px;display: inline-block">
+                <el-select slot="prepend" v-model="searchSelect" placeholder="璇烽�夋嫨" size="small">
+                <el-option v-for="item in searchData" :key="item.prop" :label="item.label" :value="item.prop"
+                ></el-option>
+              </el-select>
+            </span>
+        <span style="margin-left: 5px">
+                 <el-input v-model="searchValue" class="attrSearch" clearable placeholder="璇疯緭鍏ュ唴瀹�"
+                           prefix-icon="el-icon-search"
+                           size="small" type="text"></el-input>
+              <el-button  icon="el-icon-search" plain size="small" type="primary"
+                         @click="searchHandler">&nbsp;鎼滅储</el-button>
+              </span>
+      </template>
     </avue-crud>
   </basic-container>
 </template>
@@ -30,6 +45,23 @@
   export default {
     data() {
       return {
+        searchSelect: "userName",
+        searchValue: '',
+        searchData: [
+          {
+            label: "鐢ㄦ埛鍚�",
+            prop: "userName",
+            align: "left",
+            display: false,
+            width: 200,
+            required: true
+          }, {
+            label: "濮撳悕",
+            prop: "realName",
+            align: "left",
+            display: false
+          }
+        ],
         form: {},
         selectionList: [],
         query: {},
@@ -48,7 +80,7 @@
           calcHeight: 20,
           columnBtn:false,
           tip: false,
-          searchShow: true,
+          searchShow: false,
           searchMenuSpan: 6,
           border: true,
           index: true,
@@ -74,22 +106,21 @@
             {
               label: "鐢ㄦ埛ip",
               prop: "ip",
-              width:'130'
             },
             {
               label: "妯″潡",
               prop: "model",
-              width:'140'
+
             },
             {
               label: "鏃堕棿",
               prop: "time",
-              width:'160'
+
             },
             {
               label: "鎿嶄綔缁撴灉",
               prop: "operateResult",
-              width:'110'
+
             },
             {
               label: "鎻忚堪",
@@ -97,6 +128,7 @@
               span: 24,
               minRows: 20,
               type: "textarea",
+              hide:true,
               slot: true,
             },
           ]
@@ -116,6 +148,13 @@
       this.getRouteParam()
     },
     methods: {
+      searchHandler(){
+        let params = {
+          [this.searchSelect]:this.searchValue
+        };
+        this.page.currentPage = 1;
+        this.onLoad(this.page, params);
+      },
       //鑾峰彇鏁版嵁
       getRouteParam() {
         const logType = this.$route.query.log_type; // 鑾峰彇log_type鍙傛暟鐨勫��

--
Gitblit v1.9.3