From ea2e0a63ef8a43ee554cd940c08172fe9522bc87 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 13 九月 2023 15:28:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/views/docking/loge.vue |  111 +++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 94 insertions(+), 17 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/docking/loge.vue b/Source/UBCS-WEB/src/views/docking/loge.vue
index f806110..37333e4 100644
--- a/Source/UBCS-WEB/src/views/docking/loge.vue
+++ b/Source/UBCS-WEB/src/views/docking/loge.vue
@@ -7,6 +7,7 @@
                :page.sync="page"
                :permission="permissionList"
                ref="crud"
+               @cell-dblclick="cellDbClick"
                @search-change="searchChange"
                @search-reset="searchReset"
                @selection-change="selectionChange"
@@ -14,6 +15,9 @@
                @size-change="sizeChange"
                @refresh-change="refreshChange"
                @on-load="onLoad">
+      <template slot-scope="scope" slot="menuLeft">
+        <vci-docking-search :SearchObject="SearchObject" :page="page" :formInline="formInline" :status="status"></vci-docking-search>
+      </template>
     </avue-crud>
   </basic-container>
 </template>
@@ -27,6 +31,67 @@
   name: "loge",
   data(){
     return {
+      value:'',
+      //鍚勪釜绫诲瀷鐘舵��
+      status:{
+        type:'loge',
+        typeFlag:false,
+        dateFlag:false,
+        stateFlag:false,
+      },
+      //model缁戝畾
+      formInline:{
+        type:'',
+        cut:'',
+        text:'',
+        Date:'',
+        state:''
+      },
+      //闆嗘垚绫诲瀷姝绘暟鎹�
+      SearchObject:{
+        searchData:[
+          {
+            label:'鏁版嵁缂栫爜',
+            prop: "id",
+            value:0
+          },
+          {
+            label:'鍒嗙被浠ｅ彿',
+            prop: 'classifyId',
+            value:1
+          },
+          {
+            label:'鍒嗙被鍚嶇О',
+            prop: 'classifyName',
+            value:2
+          },
+          {
+            label:'闆嗘垚绯荤粺缂栧彿',
+            prop: 'systemCode',
+            value:3
+          },
+          {
+            label:'闆嗘垚绯荤粺鍚嶇О',
+            prop: 'systemName',
+            value:4
+          },
+          {
+            label:'绫诲瀷',
+            prop: 'typeText',
+            value:5
+          },
+          {
+            label:'璁板綍鏃堕棿',
+            value:6,
+            prop: 'createTime',
+          },
+          {
+            label:'鏄惁鎴愬姛',
+            prop: 'interfaceStatus',
+            value:7
+          },
+        ],
+      },
       loading: false,
       query: {},
       selectionList: [],
@@ -41,7 +106,7 @@
         calcHeight: 0,
         tip: false,
         searchShow: false,
-        searchMenuSpan: 6,
+        // searchMenuSpan: 12,
         border: true,
         index: true,
         viewBtn: true,
@@ -52,14 +117,12 @@
           {
             label: "鏁版嵁缂栫爜",
             prop: "id",
-            search: true,
             sortable:true,
-            width:150
+            width:130
           },
           {
             label: "鍥惧彿",
             prop: "uniqueCode",
-            search: true,
             hide:true,
             sortable:true,
             width:150
@@ -67,28 +130,32 @@
           {
             label: '鍒嗙被浠ｅ彿',
             prop: 'classifyId',
-            search: true,
             sortable:true,
-            width: 250
+            overHidden:true,
+            width: 150
           },
           {
             label: '鍒嗙被鍚嶇О',
             prop: 'classifyName',
-            search: true,
             sortable:true,
-            overHidden: true
+            overHidden: true,
+            width: 140
           },
           {
             label: '闆嗘垚绯荤粺缂栧彿',
             prop: 'systemCode',
-            search: true,
             sortable:true,
-            width: 150
+            width: 130
           },
           {
             label: '闆嗘垚绯荤粺鍚嶇О',
             prop: 'systemName',
-            search: true,
+            sortable:true,
+            width: 150
+          },
+          {
+            label: '绫诲瀷',
+            prop: 'typeText',
             sortable:true,
             width: 150
           },
@@ -96,7 +163,6 @@
             label:'鎺ュ彛鍙傛暟',
             prop:'paramString',
             overHidden:true,
-            search: true,
             sortable:true,
             width: 150
           },
@@ -104,7 +170,6 @@
             label:'杩斿洖鍙傛暟',
             prop:'returnString',
             overHidden:true,
-            search: true,
             sortable:true,
             width: 150
           },
@@ -120,9 +185,8 @@
             width: 160
           },
           {
-            label: '鏄惁鎺ㄩ�佹垚鍔�',
-            prop: 'interFaceStatus',
-            search: true,
+            label: '鏄惁鎴愬姛',
+            prop: 'interfaceStatus',
             sortable:true,
             width: 120,
             html:true,
@@ -135,7 +199,7 @@
               value: "key"
             },
             formatter : function (row, column) {
-              return row.interFaceStatus == 'true' || row.interFaceStatus == '1' ? '<i class="el-icon-check" style="color: limegreen"></i>' : '<i class="el-icon-close" style="color: red"></i>'
+              return row.interfaceStatus == 'true' || row.interfaceStatus == '' ? '<i class="el-icon-check" style="color: limegreen;font-size: 20px;font-weight: 800"></i>' : '<i class="el-icon-close" style="color: red;font-size: 20px;font-weight: 800"></i>'
             }
           },
         ]
@@ -154,6 +218,19 @@
     }
   },
   methods: {
+    async cellDbClick(row, column, cell, event) {
+      for (const key in row) {
+        if (key === column.property) {
+          this.value = row[key];
+        }
+      }
+      try {
+        await this.$copyText(this.value);
+        this.$message.success('澶嶅埗鎴愬姛');
+      } catch (error) {
+        this.$message.warning('澶嶅埗澶辫触');
+      }
+    },
     searchReset() {
       this.query = {};
       this.onLoad(this.page);

--
Gitblit v1.9.3