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

---
 Source/UBCS-WEB/src/views/docking/loge.vue |   62 ++++++++++++++++++++++++------
 1 files changed, 49 insertions(+), 13 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/docking/loge.vue b/Source/UBCS-WEB/src/views/docking/loge.vue
index 023a104..cc83e39 100644
--- a/Source/UBCS-WEB/src/views/docking/loge.vue
+++ b/Source/UBCS-WEB/src/views/docking/loge.vue
@@ -5,7 +5,6 @@
                :table-loading="loading"
                :data="data || getList"
                :page.sync="page"
-               :permission="permissionList"
                ref="crud"
                @cell-dblclick="cellDbClick"
                @search-change="searchChange"
@@ -18,12 +17,25 @@
       <template slot-scope="scope" slot="menuLeft">
         <vci-docking-search :SearchObject="SearchObject" :page="page" :formInline="formInline" :status="status" @getList="dockingGetList"></vci-docking-search>
       </template>
+      <template slot="paramString" slot-scope="scope">
+        <avue-text-ellipsis :text="scope.row.paramString" :height="50">
+          <small slot="more">...</small>
+        </avue-text-ellipsis>
+      </template>
+      <template slot="returnString" slot-scope="scope">
+        <avue-text-ellipsis :text="scope.row.returnString" :height="50">
+          <small slot="more">...</small>
+        </avue-text-ellipsis>
+      </template>
+      <template slot="menu" slot-scope="scope">
+        <el-button type="text" icon="el-icon-view" size="mini" @click="rowView(scope.row)">鏌ョ湅</el-button>
+      </template>
     </avue-crud>
   </basic-container>
 </template>
 
 <script>
-import {getLogoList} from "@/api/docking/loge";
+import {getLogoList,gridLogeDetail} from "@/api/docking/loge";
 import {validatenull} from "@/util/validate";
 import {mapGetters} from "vuex";
 
@@ -117,16 +129,22 @@
       data:[],
       option: {
         height:'auto',
-        calcHeight: 0,
-        columnBtn:false,
+        calcHeight: 20,
+        menuWidth:120,
         tip: false,
         searchShow: false,
         border: true,
         index: true,
-        viewBtn: true,
+        indexFixed:false,
         selection: false,
         dialogClickModal: false,
-        menu:false,
+        menuFixed:'right',
+        dialogType: 'drawer',
+        viewBtn: false,
+        stripe: true,
+        addBtn:false,
+        editBtn:false,
+        delBtn:false,
         column: [
           {
             label: "鏁版嵁缂栫爜",
@@ -176,6 +194,7 @@
           {
             label: '闆嗘垚绯荤粺缂栧彿',
             prop: 'systemCode',
+            labelWidth:150,
             sortable:true,
             width: 130
           },
@@ -183,6 +202,7 @@
             label: '闆嗘垚绯荤粺鍚嶇О',
             prop: 'systemName',
             sortable:true,
+            labelWidth:150,
             width: 150
           },
           {
@@ -194,20 +214,26 @@
           {
             label:'鎺ュ彛鍙傛暟',
             prop:'paramString',
-            overHidden:true,
             sortable:true,
-            width: 150
+            minRows: 20,
+            width: 150,
+            type: "textarea",
+            slot: true,
+            hide:true,
           },
           {
             label:'杩斿洖鍙傛暟',
             prop:'returnString',
-            overHidden:true,
             sortable:true,
-            width: 150
+            minRows: 20,
+            width: 150,
+            type: "textarea",
+            slot: true,
           },
           {
             label: '杩斿洖msg',
             prop: 'msg',
+            width: 150,
             overHidden: true
           },
           {
@@ -250,6 +276,16 @@
     }
   },
   methods: {
+    rowView(row){
+      this.loading = true;
+      gridLogeDetail({oid:row.oid}).then(res =>{
+        console.log(res)
+        if(res.data.data){
+          this.loading = false
+          this.$refs.crud.rowView(res.data.data)
+        }
+      })
+    },
     dockingGetList(val){
       this.data=val.records;
       this.page.pageSize=val.size;
@@ -297,13 +333,13 @@
     },
     onLoad(page, params={}) {
       this.loading = true;
-      var query={}
+      var queryCondition={}
       if (this.query) {
         for (var key in this.query) {
-          query['conditionMap["' + key + '"]'] = this.query[key];
+          queryCondition['conditionMap["' + key + '"]'] = this.query[key];
         }
       }
-      getLogoList(page.currentPage, page.pageSize, Object.assign(params,this.params, query,this.query)).then(res => {
+      getLogoList(page.currentPage, page.pageSize,'createTime','desc',Object.assign(params,this.params, queryCondition,this.query),).then(res => {
         const data = res.data.data;
         this.page.total = data.total;
         this.data = data.records;

--
Gitblit v1.9.3