Merge branch 'hm' into dev

src/api/unified-access/access-feedback.js

@@ -2,12 +2,74 @@ import request from '@/utils/request'
 // 获取接入反馈列表
 export function getTabAccessFeedbackList (params) {
   return request({
-    url: '/web/tab-access-feedback/getTabAccessFeedbackList',
+    url: '/web/tab-access-ready/list',
     method: 'get',
     params: params
   })
 }
 
+// 
+export function updateIsApplyById (data) {
+  return request({
+    url: `/web/tab-access-ready/updateIsApplyById`,
+    method: 'post',
+    data:data
+  })
+}
+
+// 删除接入反馈列表
+export function delTabAccessFeedbackList (data) {
+  return request({
+    url: `/web/tab-access-feedback/deleteTabAccessFeedbackById`,
+    method: 'delete',
+    data: data
+  })
+}
+
+// 第一步详情查询
+export function getFirstStepTabAccessReadyById (id) {
+  return request({
+    url: `/web/tab-access-ready/getTabAccessAndReadyById/${id}`,
+    method: 'get',
+  })
+}
+
+// 第二步详情查询
+export function getSecondStepTabAccessReadyById (id) {
+  return request({
+    url: `/web/tab-access-feedback/getTabAccessFeedbackListByAccessOnlyId/${id}`,
+    method: 'get',
+  })
+}
+
+// 第三步详情查询
+export function getThirdStepTabAccessReadyById (id) {
+  return request({
+    url: `/web/tab-datasource-msg/getDataSunByAccessOnlyId/${id}`,
+    method: 'post',
+  })
+}
+
+
+export function saveStepTabAccessReadyById (data) {
+  return request({
+    url: `/web/tab-access-ready/updateStatusById`,
+    method: 'post',
+    data:data
+  })
+}
+
+// // 第三步详情查询
+// export function getFourthStepTabAccessReadyById (id) {
+//   return request({
+//     url: `/web/tab-datasource-msg/getDataSunByAccessOnlyId/${id}`,
+//     method: 'post',
+//   })
+// }
+
+
+
+
 // 添加接入基本准备
 export function addFirstStepTabAccessReady (data) {
   return request({
@@ -17,6 +79,8 @@ export function addFirstStepTabAccessReady (data) {
   })
 }
 
+
+
 export function updateFirstStepTabAccessReadyById (data) {
   return request({
     url: '/web/tab-access-ready/updateTabAccessReadyById',
@@ -34,11 +98,27 @@ export function delFirstStepTabAccessReady (id) {
 }
 
 
-// 第二步
+// 第二步 删除子项
 export function delSecondStepTabAccessReady (id) {
   return request({
     url: `/web/tab-access-feedback/falseDeleteTabAccessFeedbackById/${id}`,
-    method: 'post',
+    method: 'delete',
+  })
+}
+
+// 第三步删除  子项
+export function deleteDataSun(id) {
+  return request({
+    url: `/web/tab-datasource-msg/deleteDataSun/${id}`,
+    method: 'delete',
+  })
+}
+
+// 第三步删除 api 子项
+export function deleteUrlSun(id) {
+  return request({
+    url: `/web/tab-datasource-msg/deleteUrlSun/${id}`,
+    method: 'delete',
   })
 }
 

src/components/MyTable/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-table ref="tableRef" :data="tableData" class="table-default" max-height="580" border fit
+    <el-table ref="tableRef" :data="tableData" class="table-default" max-height="1200" border fit
       @selection-change="handleSelectionChange" :row-key="rowKey">
       <el-table-column type="selection" width="55" v-if="selectionShow" :reserve-selection="true"/>
       <el-table-column type="index" label="序号" width="70" align="center" />

src/views/unified-access/access-feedback/dialog/ApiPage.vue

@@ -220,11 +220,11 @@
                 </el-table-column>
 
                 <el-table-column fixed="right" label="操作" width="100">
-                  <template :slot-scope="{ row, $index }">
+                  <template slot-scope="scope">
                     <el-button
                       type="text"
                       size="small"
-                      @click="deleteHeaderRow(props.row, $index)"
+                      @click="deleteHeaderRow(props.row, scope.$index,scope.row)"
                     >删除</el-button>
                   </template>
                 </el-table-column>
@@ -288,7 +288,7 @@
 
                 <el-table-column fixed="right" label="操作" width="100">
                   <template :slot-scope="{ row, $index }">
-                    <el-button type="text" size="small" @click="deleteBodyRow(props.row, $index)">删除</el-button>
+                    <el-button type="text" size="small" @click="deleteBodyRow(props.row, $index,row)">删除</el-button>
                   </template>
                 </el-table-column>
               </el-table>
@@ -354,7 +354,7 @@
                     <el-button
                       type="text"
                       size="small"
-                      @click="deleteQueryRow(props.row, $index)"
+                      @click="deleteQueryRow(props.row, $index,row)"
                     >删除</el-button>
                   </template>
                 </el-table-column>
@@ -421,7 +421,7 @@
                     <el-button
                       type="text"
                       size="small"
-                      @click="deleteResponseRow(props.row, $index)"
+                      @click="deleteResponseRow(props.row, $index,row)"
                     >删除</el-button>
                   </template>
                 </el-table-column>
@@ -535,14 +535,49 @@
   </el-row>
 </template>
 <script>
+import {
+  deleteUrlSun,
+  deleteDataSun
+} from "@/api/unified-access/access-feedback";
 import MyForm from "@/components/MyForm";
 export default {
   name: "",
   components: {
     MyForm
   },
+  props: {
+    thirdStep: {
+      type: Array,
+      default: []
+    },
+    title: {
+      type: String,
+      default: "弹窗标题"
+    }
+  },
+  watch: {
+    thirdStep: {
+      handler(newVal) {
+        console.log(newVal, "newVal==thirdStep");
+        this.rightTableData = newVal;
+        this.leftTableData = this.rightTableData;
+        this.pagination.total = this.leftTableData.length;
+        console.log(rightTableData, "rightTableData==thirdStep");
+      },
+      deep: true, // 深入监听
+      immediate: true
+    },
+    title: {
+      handler(newVal) {
+        this.dialogTitle = newVal;
+      },
+      deep: true, // 深入监听
+      immediate: true
+    }
+  },
   data() {
     return {
+      dialogTitle: "",
       pagination: {
         currentPage: 1,
         pageSize: 10,
@@ -582,12 +617,38 @@ export default {
     },
     // 删除行
     onDeleteClick(row) {
-      const index = this.leftTableData.findIndex(item => item.id === row.id);
-      if (index > -1) {
-        this.leftTableData.splice(index, 1);
-      }
-      // 同步删除右侧表格的对应项
-      this.onDeleteRightClick(row);
+      this.$confirm("此操作将永久删除该项, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        center: true,
+        type: "warning"
+      })
+        .then(() => {
+          deleteDataSun(row.id).then(res => {
+            if (+res.code === 200) {
+              this.$message({
+                message: res.msg,
+                type: "success"
+              });
+              const index = this.leftTableData.findIndex(
+                item => item.id === row.id
+              );
+              if (index > -1) {
+                this.leftTableData.splice(index, 1);
+              }
+              // 同步删除右侧表格的对应项
+              this.onDeleteRightClick(row);
+            } else {
+              this.$message.error(res.msg);
+            }
+          });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除"
+          });
+        });
     },
     // 在右侧表格删除时，删除对应的数据
     onDeleteRightClick(row) {
@@ -603,7 +664,7 @@ export default {
     onExpandChange() {},
     onSearch() {},
     onReset() {
-      this.headerFormData={}
+      this.headerFormData = {};
     },
     addClick() {
       const newItem = {
@@ -686,8 +747,35 @@ export default {
       };
       row.tabEtlHeaderSuns.push(newItem);
     },
-    deleteHeaderRow(row, index) {
-      row.tabEtlHeaderSuns.splice(index, 1);
+    deleteHeaderRow(row, index, itemRow) {
+
+      if (this.dialogTitle === "新增") {
+        row.tabEtlHeaderSuns.splice(index, 1);
+      } else {
+        this.$confirm("此操作将永久删除该文件, 是否继续?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            deleteUrlSun(itemRow.id).then(res => {
+              if (+res.code === 200) {
+                row.tabEtlHeaderSuns.splice(index, 1);
+
+                this.$message({
+                  type: "success",
+                  message: "删除成功!"
+                });
+              }
+            });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消删除"
+            });
+          });
+      }
     },
 
     //  Body
@@ -703,8 +791,34 @@ export default {
       };
       row.tabEtlBodySuns.push(newItem);
     },
-    deleteBodyRow(row, index) {
-      row.tabEtlBodySuns.splice(index, 1);
+    deleteBodyRow(row, index,itemRow) {
+      if (this.dialogTitle === "新增") {
+        row.tabEtlBodySuns.splice(index, 1);
+      } else {
+        this.$confirm("此操作将永久删除该文件, 是否继续?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            deleteUrlSun(itemRow.id).then(res => {
+              if (+res.code === 200) {
+                row.tabEtlBodySuns.splice(index, 1)
+
+                this.$message({
+                  type: "success",
+                  message: "删除成功!"
+                });
+              }
+            });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消删除"
+            });
+          });
+      }
     },
 
     //  Query
@@ -720,8 +834,34 @@ export default {
       };
       row.tabEtlQuerySuns.push(newItem);
     },
-    deleteQueryRow(row, index) {
-      row.tabEtlQuerySuns.splice(index, 1);
+    deleteQueryRow(row, index,itemRow) {
+      if (this.dialogTitle === "新增") {
+        row.tabEtlQuerySuns.splice(index, 1);
+      } else {
+        this.$confirm("此操作将永久删除该文件, 是否继续?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            deleteUrlSun(itemRow.id).then(res => {
+              if (+res.code === 200) {
+                row.tabEtlQuerySuns.splice(index, 1);
+
+                this.$message({
+                  type: "success",
+                  message: "删除成功!"
+                });
+              }
+            });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消删除"
+            });
+          });
+      }
     },
     // Response
     addResponseRow(row) {
@@ -736,8 +876,33 @@ export default {
       };
       row.tabEtlResponseSuns.push(newItem);
     },
-    deleteResponseRow(row, index) {
-      row.tabEtlResponseSuns.splice(index, 1);
+    deleteResponseRow(row, index,itemRow) {
+      if (this.dialogTitle === "新增") {
+         row.tabEtlResponseSuns.splice(index, 1);
+      } else {
+        this.$confirm("此操作将永久删除该文件, 是否继续?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            deleteUrlSun(itemRow.id).then(res => {
+              if (+res.code === 200) {
+                 row.tabEtlResponseSuns.splice(index, 1);
+                this.$message({
+                  type: "success",
+                  message: "删除成功!"
+                });
+              }
+            });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消删除"
+            });
+          });
+      }
     },
     // Data
     addDataRow(row) {
@@ -752,8 +917,33 @@ export default {
       };
       row.tabEtlDataSuns.push(newItem);
     },
-    deleteDataRow(row, index) {
-      row.tabEtlDataSuns.splice(index, 1);
+    deleteDataRow(row, index,itemRow) {
+      if (this.dialogTitle === "新增") {
+         row.tabEtlDataSuns.splice(index, 1);
+      } else {
+        this.$confirm("此操作将永久删除该文件, 是否继续?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            deleteUrlSun(itemRow.id).then(res => {
+              if (+res.code === 200) {
+                 row.tabEtlDataSuns.splice(index, 1);
+                this.$message({
+                  type: "success",
+                  message: "删除成功!"
+                });
+              }
+            });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消删除"
+            });
+          });
+      }
     }
   },
   created() {},

src/views/unified-access/access-feedback/dialog/ETLPage.vue

@@ -186,6 +186,26 @@
 <script>
 export default {
   name: "",
+  props: {
+    thirdStep: {
+      type: Array,
+      default: []
+    }
+
+  },
+  watch: {
+    thirdStep: {
+      handler(newVal) {
+        console.log(newVal, "newVal==thirdStep");
+        this.rightTableData = newVal;
+        this.leftTableData = this.rightTableData;
+        this.pagination.total = this.leftTableData.length;
+        console.log(rightTableData, "rightTableData==thirdStep");
+      },
+      deep: true, // 深入监听
+      immediate: true
+    }
+  },
   data () {
     return {
       pagination: {

src/views/unified-access/access-feedback/dialog/KafkaPage.vue

@@ -383,6 +383,26 @@ export default {
   components: {
     MyForm
   },
+  props: {
+    thirdStep: {
+      type: Array,
+      default: []
+    }
+
+  },
+  watch: {
+    thirdStep: {
+      handler(newVal) {
+        console.log(newVal, "newVal==thirdStep");
+        this.rightTableData = newVal;
+        this.leftTableData = this.rightTableData;
+        this.pagination.total = this.leftTableData.length;
+        console.log(rightTableData, "rightTableData==thirdStep");
+      },
+      deep: true, // 深入监听
+      immediate: true
+    }
+  },
   data() {
     return {
       pagination: {

src/views/unified-access/access-feedback/dialog/SFTPPage.vue

@@ -156,6 +156,26 @@ export default {
   components: {
     MyForm
   },
+  props: {
+    thirdStep: {
+      type: Array,
+      default: []
+    }
+
+  },
+  watch: {
+    thirdStep: {
+      handler(newVal) {
+        console.log(newVal, "newVal==thirdStep");
+        this.rightTableData = newVal;
+        this.leftTableData = this.rightTableData;
+        this.pagination.total = this.leftTableData.length;
+        console.log(rightTableData, "rightTableData==thirdStep");
+      },
+      deep: true, // 深入监听
+      immediate: true
+    }
+  },
   data() {
     return {
       pagination: {

src/views/unified-access/access-feedback/dialog/TableToolsPage.vue

@@ -32,28 +32,44 @@
       </el-table>
       <!-- 分页 -->
       <div class="pagination-container">
-        <el-pagination background layout="prev, pager, next" :current-page="pagination.currentPage"
-          :page-size="pagination.pageSize" :total="pagination.total" @current-change="onPageChange"></el-pagination>
+        <el-pagination
+          background
+          layout="prev, pager, next"
+          :current-page="pagination.currentPage"
+          :page-size="pagination.pageSize"
+          :total="pagination.total"
+          @current-change="onPageChange"
+        ></el-pagination>
       </div>
     </el-col>
     <el-col :span="18" style="padding-left: 20px">
       <div>六统一接入方式为库表接入工具,必填此表</div>
       <!-- 右侧表格 -->
-      <div style="
+      <div
+        style="
           width: 100%;
           display: flex;
           justify-content: end;
           align-items: center;
-        ">
-
+        "
+      >
         <el-button type="primary" @click="addClick">新增</el-button>
         <!-- <el-button type="primary" @click="deleteSelected">删除</el-button> -->
         <el-button type="primary">上传</el-button>
         <el-button type="primary">模版下载</el-button>
       </div>
-      <el-table ref="rightTable" :data="rightTableData" border style="width: 100%" :expand-row-keys="expandedRows"
-        row-key="id" @expand-change="onExpandChange" :show-header="false" max-height="800"
-        @selection-change="handleSelectionChange">
+      <el-table
+        ref="rightTable"
+        :data="rightTableData"
+        border
+        style="width: 100%"
+        :expand-row-keys="expandedRows"
+        row-key="id"
+        @expand-change="onExpandChange"
+        :show-header="false"
+        max-height="800"
+        @selection-change="handleSelectionChange"
+      >
         <!-- 勾选框列 -->
         <el-table-column type="selection" width="55"></el-table-column>
         <!-- 序号列 -->
@@ -64,8 +80,11 @@
           <template slot-scope="scope">
             <div style="display: flex; align-items: center">
               <div>表中文名</div>
-              <el-input style="width: 260px; margin-left: 20px" v-model="scope.row.tableName"
-                placeholder="请输入内容"></el-input>
+              <el-input
+                style="width: 260px; margin-left: 20px"
+                v-model="scope.row.tableName"
+                placeholder="请输入内容"
+              ></el-input>
             </div>
           </template>
         </el-table-column>
@@ -73,8 +92,11 @@
           <template slot-scope="scope">
             <div style="display: flex; align-items: center">
               <span>表英文名</span>
-              <el-input style="width: 260px; margin-left: 20px" v-model="scope.row.tableEnglishName"
-                placeholder="请输入内容"></el-input>
+              <el-input
+                style="width: 260px; margin-left: 20px"
+                v-model="scope.row.tableEnglishName"
+                placeholder="请输入内容"
+              ></el-input>
             </div>
           </template>
         </el-table-column>
@@ -82,8 +104,11 @@
           <template slot-scope="scope">
             <div style="display: flex; align-items: center">
               <span>表描述</span>
-              <el-input style="width: 260px; margin-left: 20px" v-model="scope.row.tableDetail"
-                placeholder="请输入内容"></el-input>
+              <el-input
+                style="width: 260px; margin-left: 20px"
+                v-model="scope.row.tableDetail"
+                placeholder="请输入内容"
+              ></el-input>
             </div>
           </template>
         </el-table-column>
@@ -92,9 +117,12 @@
         <el-table-column type="expand">
           <template slot-scope="props">
             <div class="expanded-content">
-              <el-table ref="rightExpandTable" :data="props.row.tabDatasourceMsgs" border style="width: 100%">
-
-
+              <el-table
+                ref="rightExpandTable"
+                :data="props.row.tabDatasourceMsgs"
+                border
+                style="width: 100%"
+              >
                 <!-- 序号列 -->
                 <el-table-column label="序号" type="index" width="50"></el-table-column>
 
@@ -147,18 +175,24 @@
                 <el-table-column prop="isRequired" label="是否必填">
                   <template slot-scope="scope">
                     <el-select v-model="scope.row.isRequired" placeholder="请选择">
-                      <el-option v-for="item in whetherOptions" :key="item.value" :label="item.label"
-                        :value="item.value">
-                      </el-option>
+                      <el-option
+                        v-for="item in whetherOptions"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                      ></el-option>
                     </el-select>
                   </template>
                 </el-table-column>
                 <el-table-column prop="isSecrecy" label="信息项是否为敏感数据">
                   <template slot-scope="scope">
                     <el-select v-model="scope.row.isSecrecy" placeholder="请选择">
-                      <el-option v-for="item in whetherOptions" :key="item.value" :label="item.label"
-                        :value="item.value">
-                      </el-option>
+                      <el-option
+                        v-for="item in whetherOptions"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                      ></el-option>
                     </el-select>
                   </template>
                 </el-table-column>
@@ -169,13 +203,22 @@
                 </el-table-column>
                 <el-table-column fixed="right" label="操作" width="100">
                   <template :slot-scope="{ row ,$index}">
-
-                    <el-button type="text" size="small" @click="deleteTableRow(props.row, $index)">删除</el-button>
+                    <el-button
+                      type="text"
+                      size="small"
+                      @click="deleteTableRow(props.row, $index)"
+                    >删除</el-button>
                   </template>
                 </el-table-column>
               </el-table>
-              <el-button type="primary" plain class="mt-4" style="width: 100%" icon="el-icon-plus"
-                @click="addTableRow(props.row)"></el-button>
+              <el-button
+                type="primary"
+                plain
+                class="mt-4"
+                style="width: 100%"
+                icon="el-icon-plus"
+                @click="addTableRow(props.row)"
+              ></el-button>
             </div>
           </template>
         </el-table-column>
@@ -186,12 +229,45 @@
 <script>
 export default {
   name: "",
-  data () {
+  props: {
+    thirdStep: {
+      type: Array,
+      default: []
+    }
+    // rowObj: {
+    //   type: Object,
+    //   default: {}
+    // }
+  },
+  watch: {
+    thirdStep: {
+      handler(newVal) {
+        console.log(newVal, "newVal==thirdStep");
+        this.rightTableData = newVal;
+        this.leftTableData = this.rightTableData;
+        this.pagination.total = this.leftTableData.length;
+        console.log(rightTableData, "rightTableData==thirdStep");
+      },
+      deep: true, // 深入监听
+      immediate: true
+    }
+    // rowObj: {
+    //   handler(newVal) {
+    //     this.itemView = newVal;
+    //   },
+    //   deep: true, // 深入监听
+    //   immediate: true
+    // }
+  },
+  data() {
     return {
+      // dialogTitle: "",
+      // isDisabled: false,
+      // itemView: {},
       pagination: {
         currentPage: 1,
         pageSize: 10,
-        total: 0,
+        total: 0
       },
       // 表格选中的数据
       selectedRows: [],
@@ -201,37 +277,43 @@ export default {
       expandedRows: [],
       whetherOptions: [
         { label: "是", value: 1 },
-        { label: "不是", value: 0 },
-      ],
+        { label: "不是", value: 0 }
+      ]
     };
   },
   computed: {
     // 计算当前页要显示的数据
-    currentLeftTableData () {
-      const start = (this.pagination.currentPage - 1) * this.pagination.pageSize;
+    currentLeftTableData() {
+      const start =
+        (this.pagination.currentPage - 1) * this.pagination.pageSize;
       const end = start + this.pagination.pageSize;
       return this.leftTableData.slice(start, end);
-    },
+    }
   },
   methods: {
- 
-    onExpandChange () { },
-    onSearch () { },
-    onReset () { },
-    onEyeClick (row) {
+    // getView(id) {
+    //   getThirdStepTabAccessReadyById(id).then(res => {
+    //     if (+res.code === 200) {
+    //       console.log(res, "res99==");
+    //       this.secondStep = res.data;
+    //     }
+    //   });
+
+    // },
+    onExpandChange() {},
+    onSearch() {},
+    onReset() {},
+    onEyeClick(row) {
       // // 检查右侧表格是否已存在相同项
       // const existing = this.rightTableData.find(item => item.tableName === row.tableName && item.tableEnglishName === row.tableEnglishName);
       // 获取右侧表格对应的数据并展开
       if (!this.expandedRows.includes()) {
         // this.expandedRows.push(row.tableName); // 将左侧表格对应的行名称加入展开行
         this.expandedRows = [row.id]; // 将左侧表格对应的行名称加入展开行
-
-        
       }
-     
     },
     // 点击“删除”按钮时，删除左侧表格的项
-    onDeleteClick (row) {
+    onDeleteClick(row) {
       const index = this.leftTableData.findIndex(item => item.id === row.id);
       if (index > -1) {
         this.leftTableData.splice(index, 1);
@@ -240,103 +322,117 @@ export default {
       this.onDeleteRightClick(row);
     },
     // 在右侧表格删除时，删除对应的数据
-    onDeleteRightClick (row) {
-      const index = this.rightTableData.findIndex(item => item.id === row.id );
+    onDeleteRightClick(row) {
+      const index = this.rightTableData.findIndex(item => item.id === row.id);
       if (index > -1) {
         this.rightTableData.splice(index, 1);
       }
     },
-    onPageChange (page) { 
-      this.pagination.currentPage = page
-     },
-    addClick () {
+    onPageChange(page) {
+      this.pagination.currentPage = page;
+    },
+    addClick() {
       const newItem = {
-        id: Date.now(),  // 使用当前时间戳作为唯一 ID
+        id: Date.now(), // 使用当前时间戳作为唯一 ID
         tableName: "",
         tableEnglishName: "",
         tableDetail: "",
         tabDatasourceMsgs: [
           {
             id: Date.now(), // 使用时间戳作为唯一 ID
-            code: '',
-            name:'',
-            nameEnglish: '',
-            definition: '',
-            dataType: '',
-            dataLenght: '',
-            dataPrecision: '',
-            numberOfDigits: '',
-            defaultValue: '',
-            isRequired: '',
-            isSecrecy: '',
-            status: '',
+            code: "",
+            name: "",
+            nameEnglish: "",
+            definition: "",
+            dataType: "",
+            dataLenght: "",
+            dataPrecision: "",
+            numberOfDigits: "",
+            defaultValue: "",
+            isRequired: "",
+            isSecrecy: "",
+            status: ""
           }
-        ],
-
+        ]
       };
-      this.rightTableData.push({ ...newItem })
-      this.leftTableData = this.rightTableData
-      this.pagination.total = this.leftTableData.length
+      this.rightTableData.push({ ...newItem });
+      this.leftTableData = this.rightTableData;
+      this.pagination.total = this.leftTableData.length;
       // console.log(this.leftTableData.length,'this.leftTableData.lenght')
       // this.pagination.total = this.leftTableData.length
     },
     // 处理选择框勾选变化
-    handleSelectionChange (val) {
+    handleSelectionChange(val) {
       this.selectedRows = val; // 将勾选的行保存到 selectedRows 中
     },
     // 删除选中的行
-    deleteSelected () {
+    deleteSelected() {
       if (this.selectedRows.length === 0) {
-        this.$message.warning('请先选择要删除的项');
+        this.$message.warning("请先选择要删除的项");
         return;
       }
 
-      this.$confirm('确定删除选中的数据吗?', '警告', {
-        type: 'warning',
-      }).then(() => {
-        // 获取选中项的 id
-        const selectedIds = this.selectedRows.map(row => row.id);
+      this.$confirm("确定删除选中的数据吗?", "警告", {
+        type: "warning"
+      })
+        .then(() => {
+          // 获取选中项的 id
+          const selectedIds = this.selectedRows.map(row => row.id);
 
-        // 删除右侧表格中选中的行
-        this.rightTableData = this.rightTableData.filter(row => !selectedIds.includes(row.id));
+          // 删除右侧表格中选中的行
+          this.rightTableData = this.rightTableData.filter(
+            row => !selectedIds.includes(row.id)
+          );
 
-        // 删除左侧表格中对应的行
-        this.leftTableData = this.leftTableData.filter(row => !selectedIds.includes(row.id));
+          // 删除左侧表格中对应的行
+          this.leftTableData = this.leftTableData.filter(
+            row => !selectedIds.includes(row.id)
+          );
 
-        // 清空选中行
-        this.selectedRows = [];
+          // 清空选中行
+          this.selectedRows = [];
 
-        this.$message.success('删除成功');
-      }).catch(() => { });
+          this.$message.success("删除成功");
+        })
+        .catch(() => {});
     },
- 
+
     // 添加一个新项到展开的表格中
-    addTableRow (row) {
+    addTableRow(row) {
       // 新增一项
       const newItem = {
         id: Date.now(), // 使用时间戳作为唯一 ID
-        code: '',
-        name: '',
-        nameEnglish: '',
-        definition: '',
-        dataType: '',
-        dataLenght: '',
-        dataPrecision: '',
-        numberOfDigits: '',
-        defaultValue: '',
-        isRequired: '',
-        isSecrecy: '',
-        status: '',
+        code: "",
+        name: "",
+        nameEnglish: "",
+        definition: "",
+        dataType: "",
+        dataLenght: "",
+        dataPrecision: "",
+        numberOfDigits: "",
+        defaultValue: "",
+        isRequired: "",
+        isSecrecy: "",
+        status: ""
       };
       row.tabDatasourceMsgs.push(newItem);
     },
     // 删除当前行
-    deleteTableRow (row, index) {
+    deleteTableRow(row, index) {
       row.tabDatasourceMsgs.splice(index, 1);
     }
   },
-  created () { },
-  mounted () { },
+  created() {},
+  mounted() {
+    // if (this.dialogTitle === "查看") {
+    //   this.isDisabled = true;
+    // } else {
+    //   this.isDisabled = false;
+    // }
+    // if (this.dialogTitle !== "新增") {
+    //   this.getView(this.itemView.id);
+    // }
+  }
 };
 </script>
 <style lang="scss" scoped></style>

src/views/unified-access/access-feedback/index.vue

@@ -13,31 +13,48 @@
           @buttonClick="handleButtonClick"
         ></MyTableHeader>
 
-        <MyTable :tableData="tableData" :formData="formData" :minWidth="400">
+        <MyTable
+          :tableData="tableData"
+          :formData="formData"
+          :minWidth="400"
+          @selection-change="handleSelectionChange"
+        >
           <!-- 自定义操作按钮，传递 row 和 index -->
-          <template #operation="{ row, index }">
-            <el-button size="mini" @click="handleView(row, index)" type="primary">查看</el-button>
-            <el-button size="mini" @click="handleEdit(row, index)" type="primary">编辑</el-button>
+          <template #operation="{ row ,$index}">
+            <el-button size="mini" @click="handleView(row, $index)" type="primary">查看</el-button>
+            <el-button size="mini" @click="handleEdit(row, $index)" type="primary">编辑</el-button>
             <el-button
               size="mini"
-              @click="handleSubmit(row, index)"
+              @click="handleStop(row, $index)"
               type="primary"
-              v-if="activeTabLable !== 2"
+              v-if="+row.isApply===1"
+            >停用</el-button>
+            <el-button
+              size="mini"
+              @click="handleStart(row, $index)"
+              type="primary"
+              v-if="+row.isApply===0"
+            >启用</el-button>
+            <el-button
+              size="mini"
+              @click="handleSubmit(row, $index)"
+              type="primary"
+              v-if="activeTabLable !== 2&&+row.status===2"
             >提交</el-button>
             <el-button
               size="mini"
-              @click="handleRevoke(row, index)"
+              @click="handleRevoke(row, $index)"
               type="primary"
-              v-if="activeTabLable !== 2"
+              v-if="activeTabLable !== 2&&+row.status===3"
             >撤回</el-button>
-            <el-button size="mini" @click="handleCatalog(row, index)" type="primary">编目</el-button>
+            <el-button size="mini" @click="handleCatalog(row, $index)" type="primary">编目</el-button>
             <el-button
               size="mini"
-              @click="handleUpperChain(row, index)"
+              @click="handleUpperChain(row, $index)"
               type="primary"
               v-if="activeTabLable !== 1"
             >上链</el-button>
-            <el-button size="mini" @click="handleDelete(index)" type="primary">删除</el-button>
+            <el-button size="mini" @click="handleDelete(row)" type="primary">删除</el-button>
           </template>
         </MyTable>
         <MyPagination
@@ -50,17 +67,17 @@
       </el-main>
     </el-container>
     <div v-if="showDialog">
-      <FeedbackDialog
-        v-model="showDialog"
-        :title="title"
-        :rowObj="rowObj"
-        @confirm="confirmHandle"
-      ></FeedbackDialog>
+      <FeedbackDialog v-model="showDialog" :title="title" :rowObj="rowObj" @confirm="confirmHandle"></FeedbackDialog>
     </div>
   </el-container>
 </template>
 <script>
-import {getTabAccessFeedbackList} from '@/api/unified-access/access-feedback.js'
+import {
+  getTabAccessFeedbackList,
+  delTabAccessFeedbackList,
+  saveStepTabAccessReadyById,
+  updateIsApplyById
+} from "@/api/unified-access/access-feedback.js";
 import FeedbackDialog from "./dialog/FeedbackDialog.vue";
 import MyHeader from "@/components/MyHeader";
 import MyTable from "@/components/MyTable";
@@ -82,31 +99,21 @@ export default {
       uploadUrl: process.env.VUE_APP_BASE_API + "/web/tab-file-info/upload",
       showDialog: false,
       searchForm: {},
-      tableData: [
-        { name: "张三", age: 25, address: "北京市" },
-        { name: "李四", age: 30, address: "上海市" },
-        { name: "王五", age: 22, address: "广州市" }
-      ],
+      selectedRows: [], // 存储选中的行数据
+      tableData: [],
       formData: [
         {
-          label: "数据源所需单位",
-          fieldName: "name",
-          type: "input",
-          showInTable: true,
-          value: "",
-          width: ""
-        },
-        {
-          label: "数据源所需部门",
-          fieldName: "age",
+          label: "数据源所属单位部门",
+          fieldName: "offerDept",
           type: "input",
           showInTable: true,
           value: "",
           width: ""
         },
+
         {
           label: "数据源联系人",
-          fieldName: "address",
+          fieldName: "persion",
           type: "input",
           showInTable: true,
           value: "",
@@ -114,7 +121,7 @@ export default {
         },
         {
           label: "数据源联系电话",
-          fieldName: "address",
+          fieldName: "phone",
           type: "input",
           showInTable: true,
           value: "",
@@ -122,63 +129,64 @@ export default {
         },
         {
           label: "数据源所属信息系统",
-          fieldName: "address",
+          fieldName: "offerSystem",
           type: "input",
           showInTable: true,
           value: "",
           width: ""
         },
         {
-          label: "数据源所属信息系统IP端口",
-          fieldName: "address",
+          label: "数据源所属信息系统IP",
+          fieldName: "readyIp",
           type: "input",
           showInTable: true,
           value: "",
           width: ""
         },
         {
-          label: "接收方所属单位",
-          fieldName: "address",
+          label: "数据源所属信息系统端口",
+          fieldName: "readyPort",
           type: "input",
           showInTable: true,
           value: "",
           width: ""
         },
         {
-          label: "接收方所属部门",
-          fieldName: "address",
+          label: "接收方所属单位部门",
+          fieldName: "accessDept",
           type: "input",
           showInTable: true,
           value: "",
           width: ""
         },
+
         {
           label: "接收方所属信息系统",
-          fieldName: "address",
-          type: "input",
-          showInTable: true,
-          value: "",
-          width: ""
-        },
-        {
-          label: "数据项目",
-          fieldName: "address",
-          type: "input",
-          showInTable: true,
-          value: "",
-          width: ""
-        },
-        {
-          label: "拟/正式运行时间",
-          fieldName: "address",
+          fieldName: "accessSystem",
           type: "input",
           showInTable: true,
           value: "",
           width: ""
         },
+        // {
+        //   label: "数据项目",
+        //   fieldName: "address",
+        //   type: "input",
+        //   showInTable: true,
+        //   value: "",
+        //   width: ""
+        // },
+        // {
+        //   label: "拟/正式运行时间",
+        //   fieldName: "address",
+        //   type: "input",
+        //   showInTable: true,
+        //   value: "",
+        //   width: ""
+        // },
         {
           label: "接入方式",
-          fieldName: "address",
+          fieldName: "dataAccessType",
           type: "input",
           showInTable: true,
           value: "",
@@ -186,7 +194,7 @@ export default {
         },
         {
           label: "状态",
-          fieldName: "address",
+          fieldName: "status",
           type: "input",
           showInTable: true,
           value: "",
@@ -198,15 +206,15 @@ export default {
       currentPage: 1,
       treeSearchVal: "",
       tableHeaderTitle: "项目列表",
-      activeTabLable: "全部",
+      activeTabLable: "",
       tabs: [
-        { label: "全部", value: 1, active: true },
+        { label: "全部", value: "", active: true },
         {
           label: "正式运行",
-          value: 2,
+          value: 1,
           active: false
         },
-        { label: "申请反馈", value: 3, active: false }
+        { label: "申请反馈", value: 2, active: false }
       ],
       buttons: [
         {
@@ -221,18 +229,18 @@ export default {
           methodName: "action2",
           icon: "el-icon-remove"
         },
-        {
-          label: "启用",
-          type: "primary",
-          methodName: "action3",
-          icon: "el-icon-video-play"
-        },
-        {
-          label: "停用",
-          type: "primary",
-          methodName: "action4",
-          icon: "el-icon-video-pause"
-        },
+        // {
+        //   label: "启用",
+        //   type: "primary",
+        //   methodName: "action3",
+        //   icon: "el-icon-video-play"
+        // },
+        // {
+        //   label: "停用",
+        //   type: "primary",
+        //   methodName: "action4",
+        //   icon: "el-icon-video-pause"
+        // },
         {
           label: "导入",
           type: "primary",
@@ -264,30 +272,14 @@ export default {
           placeholder: "请输入用户状态"
           // isRequired: true,
         }
-        // {
-        //   label: "用户状态",
-        //   fieldName: "gender",
-        //   type: "select",
-        //   value: "",
-        //   placeholder: "请选择用户状态",
-        //   isRequired: true,
-        //   options: [
-        //     { label: "男", value: "male" },
-        //     { label: "女", value: "female" },
-        //   ],
-        // },
-        // {
-        //   label: "生日",
-        //   fieldName: "birthdate",
-        //   type: "date",
-        //   value: "",
-        //   placeholder: "请选择生日",
-        //   isRequired: false,
-        // },
       ]
     };
   },
   methods: {
+    // 处理选中项变化
+    handleSelectionChange(selectedRows) {
+      this.selectedRows = selectedRows; // 获取选中的行
+    },
     // 头部搜索框
     handleHeaderFormSubmit(form) {
       this.searchForm = form;
@@ -305,21 +297,21 @@ export default {
           this.showDialog = true;
           break;
         case "action2":
-          // 导出
+          // 删除
           if (this.selectedRows.length > 0) {
-            // exportTabAccessConfig().then((res) => {
-            //   if (+res.code === 200) {
-            //   }
-            // });
             let ids = [];
             ids = this.selectedRows.map(item => item.id);
-            this.download(
-              "/web/tab-access-config/export",
-              {
-                ids
-              },
-              `统一接入配置_${new Date().getTime()}.xlsx`
-            );
+            delTabAccessFeedbackList({ ids: [...ids] }).then(res => {
+              if (+res.code === 200) {
+                this.$message({
+                  message: res.msg,
+                  type: "success"
+                });
+                this.getList();
+              } else {
+                this.$message.error(res.msg);
+              }
+            });
           } else {
             this.$confirm("请选择列表项?", "提示", {
               confirmButtonText: "关闭",
@@ -362,13 +354,14 @@ export default {
       getTabAccessFeedbackList({
         pageNum: this.currentPage,
         pageSize: this.pageSize,
-        fileName: this.searchName,
-      }).then((res) => {
+        status: this.activeTabLable,
+        ...this.searchForm
+      }).then(res => {
         if (+res.code === 200) {
-          this.tableData = res.data;
+          this.tableData = res.rows;
           this.tableTotal = +res.total;
         }
-      })
+      });
     },
     // 列表分页
     pagi_changePage(page) {
@@ -386,7 +379,7 @@ export default {
       this.showDialog = true;
     },
     handleEdit(row) {
-      console.log(row, "row");
+      console.log(row, "row===///");
       this.rowObj = row;
       this.title = "编辑";
       this.showDialog = true;
@@ -399,7 +392,7 @@ export default {
         type: "warning"
       })
         .then(() => {
-          delTabAccessList({ ids: [row.id] }).then(res => {
+          delTabAccessFeedbackList({ ids: [row.id] }).then(res => {
             if (+res.code === 200) {
               this.$message({
                 message: res.msg,
@@ -418,14 +411,62 @@ export default {
           });
         });
     },
-    confirmHandle(){
-      this.showDialog=false
-      this.getList()
+    confirmHandle() {
+      this.showDialog = false;
+      this.getList();
+    },
+    // 提交
+    handleSubmit(row) {
+      saveStepTabAccessReadyById({ status: 3, id: row.id }).then(res => {
+        if (+res.code === 200) {
+          this.$message({
+            message: res.msg,
+            type: "success"
+          });
+          this.getList();
+        }
+      });
+    },
+    // 撤回
+    handleRevoke(row) {
+      saveStepTabAccessReadyById({ status: 2, id: row.id }).then(res => {
+        if (+res.code === 200) {
+          this.$message({
+            message: res.msg,
+            type: "success"
+          });
+          this.getList();
+        }
+      });
+    },
+    // 停用
+    handleStop(row) {
+      updateIsApplyById({ isApply: 0, id: row.id }).then(res => {
+        if (+res.code === 200) {
+          this.$message({
+            message: res.msg,
+            type: "success"
+          });
+          this.getList();
+        }
+      });
+    },
+    // 启用
+    handleStart(row) {
+      updateIsApplyById({ isApply: 1, id: row.id }).then(res => {
+        if (+res.code === 200) {
+          this.$message({
+            message: res.msg,
+            type: "success"
+          });
+          this.getList();
+        }
+      });
     }
   },
   created() {},
   mounted() {
-    this.getList()
+    this.getList();
   }
 };
 </script>

src/views/unified-access/access-party-manage/access-party-maintenance/dialog/AccessPartyMaintenanceDialog.vue

@@ -114,7 +114,6 @@ export default {
       isDisabled: false,
       itemView: {},
       dialogTitle: '',
-      isDisabled: false,
     };
   },
   watch: {

src/views/unified-access/access-party-manage/access-party-maintenance/index.vue

@@ -20,7 +20,7 @@
         <MyTable
           :tableData="tableData"
           :formData="formData"
-          :minWidth="100"
+          :minWidth="240"
           :isOperate="isOperate"
           ref="myTableRef"
           @selection-change="handleSelectionChange"