From 0316a18c450d79c356509f96767854f008e1a2a6 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期五, 25 八月 2023 14:52:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/views/docking/info.vue |  115 +++++++++++++++++++++++++++++++++------------------------
 1 files changed, 66 insertions(+), 49 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/docking/info.vue b/Source/UBCS-WEB/src/views/docking/info.vue
index b75f0e7..0360a59 100644
--- a/Source/UBCS-WEB/src/views/docking/info.vue
+++ b/Source/UBCS-WEB/src/views/docking/info.vue
@@ -116,13 +116,13 @@
             return this.pushTypeList[d.pushType]
           }
         }, {
-          label: '绯荤粺鍚嶇О',
-          prop: 'sysBaseName',
+          label: '绯荤粺缂栧彿',
+          prop: 'id',
           sortable: true,
           width: 150
         }, {
-          label: '绯荤粺缂栧彿',
-          prop: 'sysBaseId',
+          label: '绯荤粺鍚嶇О',
+          prop: 'name',
           sortable: true,
           width: 150
         }, {
@@ -171,6 +171,10 @@
           formatter:function (d){
             return this.returnTypeList[d.returnType]
           }
+        }, {
+          label: '绯荤粺鎻忚堪',
+          prop: 'description',
+          width: 150
         }]
       },
       // 楂樼骇鏌ヨ瀵硅瘽妗嗙浉鍏冲弬鏁�
@@ -266,18 +270,18 @@
     },
     ENABLE(row,index){
       //鍚敤
-      this.updateStatus("enable");
+      this.updateStatus(row,"enable");
     },
     DISABLE(row,index){
       //鍋滅敤
-      this.updateStatus("disable");
+      this.updateStatus(row,"disable");
     },
-    updateStatus(able){
+    updateStatus(selectRow,able){
       var that = this;
       var paramTemp = {
         update:able,
-        oid:this.selectRow.oid,
-        ts:this.selectRow.ts
+        oid:selectRow.oid,
+        ts:selectRow.ts
       };
       this.$confirm("鏄惁瑕�"+(able == "enbale" ? "鍚敤" : (able == "disable" ? "鍋滅敤": "鍙戝竷")) +"杩欐潯鏁版嵁锛�", {
         confirmButtonText: "纭畾",
@@ -293,12 +297,11 @@
             type: "success",
             message:(able == "enbale" ? "鍚敤鎴愬姛" : (able == "disable" ? "鍋滅敤鎴愬姛": "鍙戝竷鎴愬姛"))
           });
-          this.$refs.crud.toggleSelection();
         });
     },
     PUSH(){
       if (this.selectionList.length != 1) {
-        this.$message.error('璇烽�夋嫨鏁版嵁')
+        this.$message.warning('璇烽�夋嫨鏁版嵁')
         return false;
       }
       this.$confirm("鏄惁瑕�"+ (this.selectionList[0].pushType == "1" ? "鎺ㄩ�佹暟鎹�" : "鎺ㄩ�佸垎绫�"), {
@@ -322,10 +325,10 @@
       this.loading = true;
       getList(this.page.currentPage, this.page.pageSize, Object.assign(params, this.query)).then(res => {
         const data = res.data.data;
+        debugger;
         this.page.total = data.total;
         this.data = data.records;
         this.loading = false;
-        this.data = res.data.data.records;
       });
     },
     rowClick(row) {
@@ -341,43 +344,57 @@
       }
     },
     openAdvancedQuery(){
-        this.advancedQueryParam.options = [
-          {
-            data: [],
-            title: '缂栧彿',
-            fieldType: 'text',
-            queryField: 'id',
-          },{
-            data: [],
-            title: '鍚嶇О',
-            fieldType: 'text',
-            queryField: 'name',
-          },{
-            data: [],
-            title: '鎻忚堪',
-            fieldType: 'text',
-            queryField: 'description',
-          },{
-            data: [
-              // {
-              //   key: '缂栬緫涓�',
-              //   value: 'Editing',
-              // },
-              // {
-              //   key: '宸插彂甯�',
-              //   value: 'Released',
-              // },
-              // {
-              //   key: '鍋滅敤',
-              //   value: 'Disabled',
-              // },
-            ],
-            title: '鐘舵��',
-            fieldType: 'combox',
-            queryField: 'lcStatus',
-            comboxKey: 'codeSearchLCStatus',
-          },
-        ]
+        this.advancedQueryParam.options = [{
+          data: this.pushTypeList,
+          title: '鎺ㄩ�佺被鍨�',
+          queryField: 'pushType',
+          fieldType: 'combox',
+          comboxKey: 'searchPushType'
+        }, {
+          title: '绯荤粺鍚嶇О',
+          queryField: 'sysBaseName',
+          fieldType: 'text'
+        }, {
+          title: '绯荤粺缂栧彿',
+          queryField: 'sysBaseId',
+          fieldType: 'text'
+        }, {
+          title: '鎺ュ彛鍑芥暟',
+          queryField: 'interfaceFunction',
+          fieldType: 'text'
+        }, {
+          title: '鍛藉悕绌洪棿',
+          queryField: 'nameSpace',
+          fieldType: 'text'
+        }, {
+          title: 'soapAction',
+          queryField: 'soapAction',
+          fieldType: 'text'
+        }, {
+          title: '鍙傛暟鍚嶇О',
+          queryField: 'targName',
+          fieldType: 'text'
+        }, {
+          title: '璋冪敤鏂瑰紡',
+          queryField: 'cxfaxis',
+          fieldType: 'text'
+        }, {
+          title: '璇锋眰鍦板潃',
+          queryField: 'requestUrl',
+          fieldType: 'text'
+        }, {
+          title: '鍙傛暟绫诲瀷',
+          queryField: 'paramType',
+          fieldType: 'combox',
+          comboxKey: 'searchparamType',
+          data:this.paramTypeList
+        }, {
+          title: '杩斿洖鍊肩被鍨�',
+          queryField: 'returnType',
+          fieldType: 'combox',
+          comboxKey: 'searchreturnType',
+          data:this.returnTypeList
+        }]
 
       this.advancedQueryParam.currentOpen = 'info';
       this.advancedQueryParam.advancedQuerySettingBox = true;

--
Gitblit v1.9.3