关闭优化

src/views/Info/subAccountAdd.vue

@@ -41,7 +41,7 @@
         </ul>
         </ul>
       </section>
       </section>
       <el-row>
       <el-row>
-        <el-button @click="$router.push('/subAccount')">取消</el-button>
+        <el-button @click="canel()">取消</el-button>
         <el-button type="primary" @click="submitForm('ruleForm')">确 定</el-button>
         <el-button type="primary" @click="submitForm('ruleForm')">确 定</el-button>
       </el-row>
       </el-row>
     </el-form>
     </el-form>
@@ -137,6 +137,45 @@ export default {
       }
       }
     },
     },
     /**
     /**
+     * 取消
+     */
+    canel() {
+      this.closetab('/subAccountadd')
+    },
+    /**
+     * 关闭当前页面
+     * @param path
+     */
+    closetab(path) {
+      let tab_arr = JSON.parse(sessionStorage.getItem('tabs'))
+      for (var i = 0; i < tab_arr.length; i++) {
+        if (tab_arr[i].path == path) {
+          tab_arr.splice(i, 1);
+          sessionStorage.setItem('tabs', JSON.stringify(tab_arr));
+          if (path == this.$route.path) {
+            if (i == 0) {
+              this.$router.push({
+                path: "/"
+              })
+            } else {
+              if (tab_arr[i - 1].query) {
+                this.$router.push({
+                  path: tab_arr[i - 1].path,
+                  query: tab_arr[i - 1].query
+                })
+              } else {
+                this.$router.push({
+                  path: tab_arr[i - 1].path,
+                })
+              }
+            }
+          }
+          break;
+        }
+      }
+      this.$router.push('/subAccount');
+    },
+    /**
      * 获取当前用户的权限菜单
      * 获取当前用户的权限菜单
      */
      */
     getMenu() {
     getMenu() {
@@ -228,7 +267,7 @@ export default {
                 type: 'success'
                 type: 'success'
               });
               });
               setTimeout(() => {
               setTimeout(() => {
-                this.$router.push('/subAccount')
+                this.closetab('/subAccountadd')
               }, 2000)
               }, 2000)
             } else {
             } else {
               this.formParam.user_rule = JSON.parse(this.formParam.user_rule);
               this.formParam.user_rule = JSON.parse(this.formParam.user_rule);

src/views/Info/subAccountEdit.vue

@@ -41,7 +41,7 @@
         </ul>
         </ul>
       </section>
       </section>
       <el-row>
       <el-row>
-        <el-button @click="$router.push('/subAccount')">取消</el-button>
+        <el-button @click="canel()">取消</el-button>
         <el-button type="primary" @click="submitForm('ruleForm')">确 定</el-button>
         <el-button type="primary" @click="submitForm('ruleForm')">确 定</el-button>
       </el-row>
       </el-row>
     </el-form>
     </el-form>
@@ -107,6 +107,45 @@ export default {
     this.getMessageMenu();
     this.getMessageMenu();
   },
   },
   methods: {
   methods: {
+    /**
+     * 取消
+     */
+    canel() {
+      this.closetab('/subAccountEdit')
+    },
+    /**
+     * 关闭当前页面
+     * @param path
+     */
+    closetab(path) {
+      let tab_arr = JSON.parse(sessionStorage.getItem('tabs'))
+      for (var i = 0; i < tab_arr.length; i++) {
+        if (tab_arr[i].path == path) {
+          tab_arr.splice(i, 1);
+          sessionStorage.setItem('tabs', JSON.stringify(tab_arr));
+          if (path == this.$route.path) {
+            if (i == 0) {
+              this.$router.push({
+                path: "/"
+              })
+            } else {
+              if (tab_arr[i - 1].query) {
+                this.$router.push({
+                  path: tab_arr[i - 1].path,
+                  query: tab_arr[i - 1].query
+                })
+              } else {
+                this.$router.push({
+                  path: tab_arr[i - 1].path,
+                })
+              }
+            }
+          }
+          break;
+        }
+      }
+      this.$router.push('/subAccount');
+    },
     getData() {
     getData() {
       this.$http('GET', "/api/subAccount/getSubAccountInfo", {sbat_id: this.formParam.sbat_id}).then(res => {
       this.$http('GET', "/api/subAccount/getSubAccountInfo", {sbat_id: this.formParam.sbat_id}).then(res => {
         if (res.code === 0) {
         if (res.code === 0) {
@@ -276,7 +315,7 @@ export default {
                 type: 'success'
                 type: 'success'
               });
               });
               setTimeout(() => {
               setTimeout(() => {
-                this.$router.push('/subAccount')
+                this.closetab('/subAccountEdit')
               }, 2000)
               }, 2000)
             } else {
             } else {
               this.$message({
               this.$message({