RuoYi
2021-06-03 d8d8758cfa2be580e02949a8266cb3c68da97efa
修复关闭confirm提示框控制台报错问题
18 files modified
50 ■■■■ changed files
ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm 2 ●●● patch | view | raw | blame | history
ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm 2 ●●● patch | view | raw | blame | history
ruoyi-ui/src/layout/components/Navbar.vue 2 ●●● patch | view | raw | blame | history
ruoyi-ui/src/utils/request.js 2 ●●● patch | view | raw | blame | history
ruoyi-ui/src/views/monitor/job/index.vue 2 ●●● patch | view | raw | blame | history
ruoyi-ui/src/views/monitor/online/index.vue 2 ●●● patch | view | raw | blame | history
ruoyi-ui/src/views/system/config/index.vue 2 ●●● patch | view | raw | blame | history
ruoyi-ui/src/views/system/dept/index.vue 4 ●●●● patch | view | raw | blame | history
ruoyi-ui/src/views/system/dict/data.vue 4 ●●●● patch | view | raw | blame | history
ruoyi-ui/src/views/system/dict/index.vue 2 ●●● patch | view | raw | blame | history
ruoyi-ui/src/views/system/logininfor/index.vue 4 ●●●● patch | view | raw | blame | history
ruoyi-ui/src/views/system/menu/index.vue 2 ●●● patch | view | raw | blame | history
ruoyi-ui/src/views/system/notice/index.vue 4 ●●●● patch | view | raw | blame | history
ruoyi-ui/src/views/system/operlog/index.vue 6 ●●●● patch | view | raw | blame | history
ruoyi-ui/src/views/system/post/index.vue 2 ●●● patch | view | raw | blame | history
ruoyi-ui/src/views/system/role/index.vue 2 ●●● patch | view | raw | blame | history
ruoyi-ui/src/views/system/user/index.vue 2 ●●● patch | view | raw | blame | history
ruoyi-ui/src/views/tool/gen/index.vue 4 ●●●● patch | view | raw | blame | history
ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm
@@ -532,7 +532,7 @@
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
        }).catch((err)=>{})
        }).catch(() => {});
    }
  }
};
ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm
@@ -587,7 +587,7 @@
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
        }).catch((err)=>{})
        }).catch(() => {});
    },
#if($table.sub)
    /** ${subTable.functionName}序号 */
ruoyi-ui/src/layout/components/Navbar.vue
@@ -104,7 +104,7 @@
        this.$store.dispatch('LogOut').then(() => {
          location.href = '/index';
        })
      })
      }).catch(() => {});
    }
  }
}
ruoyi-ui/src/utils/request.js
@@ -65,7 +65,7 @@
        store.dispatch('LogOut').then(() => {
          location.href = '/index';
        })
      })
      }).catch(() => {});
    } else if (code === 500) {
      Message({
        message: msg,
ruoyi-ui/src/views/monitor/job/index.vue
@@ -407,7 +407,7 @@
          return runJob(row.jobId, row.jobGroup);
        }).then(() => {
          this.msgSuccess("执行成功");
        })
        }).catch(() => {});
    },
    /** 任务详细信息 */
    handleView(row) {
ruoyi-ui/src/views/monitor/online/index.vue
@@ -116,7 +116,7 @@
        }).then(() => {
          this.getList();
          this.msgSuccess("强退成功");
        })
        }).catch(() => {});
    }
  }
};
ruoyi-ui/src/views/system/config/index.vue
@@ -335,7 +335,7 @@
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
        })
        }).catch(() => {});
    },
    /** 导出按钮操作 */
    handleExport() {
ruoyi-ui/src/views/system/dept/index.vue
@@ -178,7 +178,7 @@
          { required: true, message: "部门名称不能为空", trigger: "blur" }
        ],
        orderNum: [
          { required: true, message: "菜单顺序不能为空", trigger: "blur" }
          { required: true, message: "显示排序不能为空", trigger: "blur" }
        ],
        email: [
          {
@@ -310,7 +310,7 @@
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
        })
        }).catch(() => {});
    }
  }
};
ruoyi-ui/src/views/system/dict/data.vue
@@ -1,6 +1,6 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" v-show="showSearch" :inline="true">
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
      <el-form-item label="字典名称" prop="dictType">
        <el-select v-model="queryParams.dictType" size="small">
          <el-option
@@ -334,7 +334,7 @@
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
        })
        }).catch(() => {});
    },
    /** 导出按钮操作 */
    handleExport() {
ruoyi-ui/src/views/system/dict/index.vue
@@ -339,7 +339,7 @@
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
        })
        }).catch(() => {});
    },
    /** 导出按钮操作 */
    handleExport() {
ruoyi-ui/src/views/system/logininfor/index.vue
@@ -196,7 +196,7 @@
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
        })
        }).catch(() => {});
    },
    /** 清空按钮操作 */
    handleClean() {
@@ -209,7 +209,7 @@
        }).then(() => {
          this.getList();
          this.msgSuccess("清空成功");
        })
        }).catch(() => {});
    },
    /** 导出按钮操作 */
    handleExport() {
ruoyi-ui/src/views/system/menu/index.vue
@@ -393,7 +393,7 @@
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
        })
        }).catch(() => {});
    }
  }
};
ruoyi-ui/src/views/system/notice/index.vue
@@ -224,7 +224,7 @@
          { required: true, message: "公告标题不能为空", trigger: "blur" }
        ],
        noticeType: [
          { required: true, message: "公告类型不能为空", trigger: "blur" }
          { required: true, message: "公告类型不能为空", trigger: "change" }
        ]
      }
    };
@@ -336,7 +336,7 @@
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
        })
        }).catch(() => {});
    }
  }
};
ruoyi-ui/src/views/system/operlog/index.vue
@@ -100,7 +100,7 @@
          icon="el-icon-download"
          size="mini"
          @click="handleExport"
          v-hasPermi="['system:config:export']"
          v-hasPermi="['system:operlog:export']"
        >导出</el-button>
      </el-col>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -286,7 +286,7 @@
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
        })
        }).catch(() => {});
    },
    /** 清空按钮操作 */
    handleClean() {
@@ -299,7 +299,7 @@
        }).then(() => {
          this.getList();
          this.msgSuccess("清空成功");
        })
        }).catch(() => {});
    },
    /** 导出按钮操作 */
    handleExport() {
ruoyi-ui/src/views/system/post/index.vue
@@ -306,7 +306,7 @@
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
        })
        }).catch(() => {});
    },
    /** 导出按钮操作 */
    handleExport() {
ruoyi-ui/src/views/system/role/index.vue
@@ -590,7 +590,7 @@
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
        })
        }).catch(() => {});
    },
    /** 导出按钮操作 */
    handleExport() {
ruoyi-ui/src/views/system/user/index.vue
@@ -628,7 +628,7 @@
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
        })
        }).catch(() => {});
    },
    /** 导出按钮操作 */
    handleExport() {
ruoyi-ui/src/views/tool/gen/index.vue
@@ -283,7 +283,7 @@
          return synchDb(tableName);
      }).then(() => {
          this.msgSuccess("同步成功");
      })
      }).catch(() => {});
    },
    /** 打开导入表弹窗 */
    openImportTable() {
@@ -333,7 +333,7 @@
      }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
      })
      }).catch(() => {});
    }
  }
};