From a6291fa7ad2fd57d94ad728785156cf288550d85 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 25 八月 2023 11:10:01 +0800
Subject: [PATCH] 接口配置页面

---
 Source/UBCS-WEB/src/views/docking/info.vue                      |  113 +++++++++++++++++++++----------------
 Source/UBCS-WEB/src/views/docking/infoForm.vue                  |    2 
 Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue |   43 ++++++-------
 3 files changed, 86 insertions(+), 72 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue b/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
index eea22b8..12fed90 100644
--- a/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
+++ b/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
@@ -4,7 +4,7 @@
     3銆佺敤鎴疯緭鍏ョ殑鍊间細浠onditionMap[field]鐨勬牸寮忔嫾鎺ュソ杩涜鍥炰紶锛岀劧鍚庡氨闇�瑕佷娇鐢ㄧ殑鍦版柟鑷杩涜鏌ヨ鐨勮皟鐢紱
  -->
 <template>
-    <el-dialog 
+    <el-dialog
         title="楂樼骇鏌ヨ"
         append-to-body
         width="55vw"
@@ -15,15 +15,15 @@
         @close="recoverPage">
         <div class="search-total">
             <!-- 澶撮儴鎸夐挳鍖哄煙 -->
-            <div slot="title" class="dialog-search-button"> 
-                <el-button 
-                    type="primary"  
+            <div slot="title" class="dialog-search-button">
+                <el-button
+                    type="primary"
                     size="small"
                     icon="el-icon-search"
                     @click="searchSubmit">
                     鏌ヨ
                 </el-button>
-                <el-button 
+                <el-button
                     type="warning"
                     size="small"
                     icon="el-icon-refresh"
@@ -33,7 +33,7 @@
             </div>
             <!-- 椤甸潰涓讳綋鍐呭鍖哄煙 -->
             <div class="search-content">
-                <el-row  
+                <el-row
                     v-for="(item,index) in initOptions"
                     :key="item.queryField"
                     :span="24">
@@ -67,9 +67,9 @@
                             <el-select v-else-if="item.fieldType==='combox'" v-model="searchFormArrays[index].fieldValue" placeholder="璇烽�夋嫨">
                                 <el-option
                                     v-for="option in item.data"
-                                    :key="option.itemValue"
-                                    :label="option.itemName"
-                                    :value="option.itemValue">
+                                    :key="option.itemValue || option.value"
+                                    :label="option.itemName || option.label"
+                                    :value="option.itemValue || option.value">
                                 </el-option>
                             </el-select>
                             <el-switch v-else-if="item.fieldType==='truefalse'" v-model="searchFormArrays[index].fieldValue"></el-switch>
@@ -174,7 +174,7 @@
                     label: "涓嶇瓑浜�",
                 },{
                     value: "_ge", //澶т簬锛岄粯璁や负澶т簬绛変簬
-                    label: "澶т簬", 
+                    label: "澶т簬",
                 },{
                     value: "_le", //灏忎簬锛岄粯璁や负灏忎簬绛変簬
                     label: "灏忎簬",
@@ -205,7 +205,7 @@
                     let array = [];
                     this.initOptions.forEach((item,index) => {
                         if(item.fieldType==='combox') {
-                            let enumCach = JSON.parse(localStorage.getItem(item.comboxKey));
+                            let enumCach = item.data || JSON.parse(localStorage.getItem(item.comboxKey));
                             if(enumCach != null) {
                                 item.data = enumCach;
                             }else {
@@ -223,22 +223,22 @@
                                 options: Object.assign(item.referConfig,{width:"80%"}),
                             })
                             //console.log(item.referConfigData.options);
-                            //console.log(item);   
+                            //console.log(item);
                         }
                         // TODO: 杩欏効淇敼涓�涓嬪弬鐓х殑鏌ヨ鏉′欢
                         let conditions = [];
                         if(item.fieldType==='text'){
                             conditions = this.searchConditions;
-                        }else if (item.fieldType==='combox'){
-                            conditions = this.dateConditions;
+                        }else if (item.fieldType==='combox'|| item.fieldType==='truefalse'){
+                          conditions = this.switchSearchConditions;
                         }else if (item.fieldType==='datetime') {
-                            conditions = this.switchSearchConditions;
+                          conditions = this.dateConditions;
                         }else {
                             conditions = this.referSearchConditions;
                         }
                         // console.log(conditions);
                         this.$set(item,"conditions",conditions)
-                        
+
                         let add = {
                             queryField: String(item.queryField),
                             condition: item.fieldType==='text' ? String("_like"):String("_equal"),
@@ -254,13 +254,10 @@
 
         /** 涓哄弬鐓х被鍨嬫椂鍊奸�夋嫨涔嬪悗鐨勫鐞� */
         setReferValue(data,index){
-            // console.log(index);
             if(data.field) {
                 this.searchFormArrays[index][data.fieldValue] = data.value || '';
                 this.initOptions[index][data.showField] = data.text || '';
             }
-            // console.log(this.initOptions[index][data.showField]);
-            // console.log(data);
         },
 
         // 灞炴�у垏鎹㈡椂鏌ヨ鏉′欢鍜屾煡璇㈠�间篃闇�瑕佸杈撳叆妗嗚繘琛屽垏鎹�
@@ -288,7 +285,7 @@
         // },
 
         // 绉婚櫎鎼滅储妗�
-        
+
         removeInput(index){
             //console.log(this.initOptions);
             this.$delete(this.initOptions,index);
@@ -324,7 +321,7 @@
             console.log(condtionParam);
             this.$emit('echoContion',condtionParam)
             this.isShowDialog = false;
-        },    
+        },
     }
 }
 </script>
@@ -336,7 +333,7 @@
         min-height: 70vh;
         // margin-left: 35px;
         margin-top: -8px;
-        overflow-y: auto; 
+        overflow-y: auto;
         height: 70vh;
     }
     .dialog-search-button {
@@ -393,4 +390,4 @@
         width: 100%;
     }
 
-</style>
\ No newline at end of file
+</style>
diff --git a/Source/UBCS-WEB/src/views/docking/info.vue b/Source/UBCS-WEB/src/views/docking/info.vue
index b75f0e7..018416f 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,7 +297,6 @@
             type: "success",
             message:(able == "enbale" ? "鍚敤鎴愬姛" : (able == "disable" ? "鍋滅敤鎴愬姛": "鍙戝竷鎴愬姛"))
           });
-          this.$refs.crud.toggleSelection();
         });
     },
     PUSH(){
@@ -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;
diff --git a/Source/UBCS-WEB/src/views/docking/infoForm.vue b/Source/UBCS-WEB/src/views/docking/infoForm.vue
index 8bd4c89..fd9e3c5 100644
--- a/Source/UBCS-WEB/src/views/docking/infoForm.vue
+++ b/Source/UBCS-WEB/src/views/docking/infoForm.vue
@@ -105,7 +105,7 @@
         <el-form-item  v-if="formData.pushType=='7'" label="鏄惁鏌ヨ闆嗗洟鐮�" prop="isGroupCodeFlag">
           <el-switch v-model="formData.isGroupCodeFlag" ></el-switch>
         </el-form-item>
-        <el-form-item label="绯荤粺鎻忚堪"  style="width: 850px;">
+        <el-form-item label="绯荤粺鎻忚堪"  style="width: 850px;" prop="description">
           <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 5}" v-model="formData.description" style="width: 740px;"></el-input>
         </el-form-item>
         <el-form-item v-if="formData.interfaceType=='http'" label="璇锋眰鏂瑰紡" prop="requestMethod">

--
Gitblit v1.9.3