合并冲突

licp

2024-03-28 70bf5f310d85c3a0700d75a7a877f5a1e403d83f

 src/view/index.vue

@@ -230,7 +230,7 @@
   }

   .right_key_menu {
      width: 120px;
      width: 130px;
      position: absolute;
      top: 0;
      left: 0;
@@ -249,7 +249,7 @@
   }

   .right_key_menu li i {
      margin-right: 14px;
      margin-right: 10px;
   }

   .right_key_menu li:hover {
@@ -329,6 +329,7 @@
               <ul>
                  <li @click="removeTab(activeIndex)"><i class="el-icon-close"></i>关闭</li>
                  <li @click="allDel"><i class="el-icon-delete"></i>关闭所有</li>
                  <li @click="rightDel(activeIndex)"><i class="el-icon-d-arrow-right"></i>关闭右侧页签</li>
                  <el-divider></el-divider>
                  <li @click="refreshTable"><i class="el-icon-refresh"></i>刷新</li>
               </ul>
@@ -426,10 +427,14 @@
         removeTab(index) {
            this.tabs.splice(index, 1);
            let data = this.tabs[this.tabs.length - 1]
            this.activeP = data.k;
            this.tabActive = data.k;
            this.activeBox = data.k
            this.saveClick()
            this.upTabActive(data.k)
         },
         rightDel(index){
            for (var i = this.tabs.length - 1; i > index; i--) {
               this.tabs.splice(i, 1);
            }
            let data = this.tabs[this.tabs.length - 1]
            this.upTabActive(data.k)
         },
         allDel() {
            this.activeBox = 0