From b96f7c48fa44dd6fdfa6e3f53102af2404444d95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Mon, 31 Jul 2023 10:50:39 +0800
Subject: [PATCH] =?UTF-8?q?IncomingData=E6=81=A2=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{menuList => demo}/IncomingData copy.vue  | 20 +++++++++++++++----
 .../src/views/menuList/IncomingData.vue       | 20 ++++---------------
 2 files changed, 20 insertions(+), 20 deletions(-)
 rename PC/InterFace.Dash/src/views/{menuList => demo}/IncomingData copy.vue (83%)

diff --git a/PC/InterFace.Dash/src/views/menuList/IncomingData copy.vue b/PC/InterFace.Dash/src/views/demo/IncomingData copy.vue
similarity index 83%
rename from PC/InterFace.Dash/src/views/menuList/IncomingData copy.vue
rename to PC/InterFace.Dash/src/views/demo/IncomingData copy.vue
index 3f756d2..e205408 100644
--- a/PC/InterFace.Dash/src/views/menuList/IncomingData copy.vue	
+++ b/PC/InterFace.Dash/src/views/demo/IncomingData copy.vue	
@@ -23,10 +23,14 @@
       :primarySearchOption="primarySearchOption"
       @overallSearchFormClick="overallSearchFormClick"
       :httpOverallSearchData="httpOverallSearchData"
+      :buttonOperationList_left="buttonOperationClick_leftBase"
+      @buttonOperationClick_left="buttonOperationClick_left"
+      :buttonOperationList_right="(data)=>{return buttonOperationList_rightApi(data,'edit')}"
+      @buttonOperationClick_right="buttonOperationClick_right"
     ></tablePagination>
     <!-- :buttonOperationList_left="buttonOperationClick_leftBase"
       @buttonOperationClick_left="buttonOperationClick_left" -->
-    <!-- <curren-Drawer
+    <curren-Drawer
       ref="currenDrawer_Ref"
       :title="apiColumns_DesTions"
       @rowDrop="rowDrop"
@@ -46,13 +50,20 @@
       @alterResultCountDetails="alterResultCountDetails"
       @alertoldSkipCountDetails="alertoldSkipCountDetails"
       :buttonOperationList_left="operationButtonsDetail"
-    ></curren-Drawer> -->
+    ></curren-Drawer>
     <!-- 导出弹窗 -->
     <exportDrop 
       v-if="displayDialog.exportDialog"
       @closeDialog="closeExportDrop"
       @exportDropSubmit="exportDropSubmit"
     ></exportDrop>
+    <!-- Api新增 -->
+    <addEditFromApiPop
+      v-if="displayDialog.addEditApiDialog"
+      :handleType="addEditApiType"
+      :editRowData="editFromApiRowData"
+      @closePop="closeAddEditApiPop"
+    ></addEditFromApiPop>
   </div>
 </template>
 <script>
@@ -60,7 +71,6 @@ import { tableMixins } from "@/mixins/TableMixins";
 import { LoadingMixins } from "@/mixins/LoadingMixins";
 import { drawerMixins } from "@/mixins/drawerMixins"
 import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
-import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
 import { mixins } from "@/mixins/mixins";
 import { filterSelectMixins } from '@/mixins/filter-Select'
 import { getToken } from '@/utils/auth'
@@ -75,12 +85,14 @@ export default {
     TableHeaderMixins,
     mixins,
     filterSelectMixins,
-    newAndEdiDialogMixins
   ],
   data() {
     return {
       //常用按钮数据
       currenButtonData: [
+        this.defaultAddBtn({
+          name:'addFromApi'
+        }),//新增
         this.defaultExportBtn({
           isRedundance:true,
           isDetailExport:true
diff --git a/PC/InterFace.Dash/src/views/menuList/IncomingData.vue b/PC/InterFace.Dash/src/views/menuList/IncomingData.vue
index e205408..3f756d2 100644
--- a/PC/InterFace.Dash/src/views/menuList/IncomingData.vue
+++ b/PC/InterFace.Dash/src/views/menuList/IncomingData.vue
@@ -23,14 +23,10 @@
       :primarySearchOption="primarySearchOption"
       @overallSearchFormClick="overallSearchFormClick"
       :httpOverallSearchData="httpOverallSearchData"
-      :buttonOperationList_left="buttonOperationClick_leftBase"
-      @buttonOperationClick_left="buttonOperationClick_left"
-      :buttonOperationList_right="(data)=>{return buttonOperationList_rightApi(data,'edit')}"
-      @buttonOperationClick_right="buttonOperationClick_right"
     ></tablePagination>
     <!-- :buttonOperationList_left="buttonOperationClick_leftBase"
       @buttonOperationClick_left="buttonOperationClick_left" -->
-    <curren-Drawer
+    <!-- <curren-Drawer
       ref="currenDrawer_Ref"
       :title="apiColumns_DesTions"
       @rowDrop="rowDrop"
@@ -50,20 +46,13 @@
       @alterResultCountDetails="alterResultCountDetails"
       @alertoldSkipCountDetails="alertoldSkipCountDetails"
       :buttonOperationList_left="operationButtonsDetail"
-    ></curren-Drawer>
+    ></curren-Drawer> -->
     <!-- 导出弹窗 -->
     <exportDrop 
       v-if="displayDialog.exportDialog"
       @closeDialog="closeExportDrop"
       @exportDropSubmit="exportDropSubmit"
     ></exportDrop>
-    <!-- Api新增 -->
-    <addEditFromApiPop
-      v-if="displayDialog.addEditApiDialog"
-      :handleType="addEditApiType"
-      :editRowData="editFromApiRowData"
-      @closePop="closeAddEditApiPop"
-    ></addEditFromApiPop>
   </div>
 </template>
 <script>
@@ -71,6 +60,7 @@ import { tableMixins } from "@/mixins/TableMixins";
 import { LoadingMixins } from "@/mixins/LoadingMixins";
 import { drawerMixins } from "@/mixins/drawerMixins"
 import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
+import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
 import { mixins } from "@/mixins/mixins";
 import { filterSelectMixins } from '@/mixins/filter-Select'
 import { getToken } from '@/utils/auth'
@@ -85,14 +75,12 @@ export default {
     TableHeaderMixins,
     mixins,
     filterSelectMixins,
+    newAndEdiDialogMixins
   ],
   data() {
     return {
       //常用按钮数据
       currenButtonData: [
-        this.defaultAddBtn({
-          name:'addFromApi'
-        }),//新增
         this.defaultExportBtn({
           isRedundance:true,
           isDetailExport:true