Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
finance-manage
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
finance-oa
finance-manage
Commits
19924cd1
Commit
19924cd1
authored
Jun 03, 2021
by
RuoYi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复关闭confirm提示框控制台报错问题
parent
85470a15
Changes
19
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
36 additions
and
36 deletions
+36
-36
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
+1
-1
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
+2
-2
ruoyi-ui/src/layout/components/Navbar.vue
ruoyi-ui/src/layout/components/Navbar.vue
+1
-1
ruoyi-ui/src/utils/request.js
ruoyi-ui/src/utils/request.js
+1
-1
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/monitor/job/index.vue
+3
-3
ruoyi-ui/src/views/monitor/job/log.vue
ruoyi-ui/src/views/monitor/job/log.vue
+3
-3
ruoyi-ui/src/views/monitor/logininfor/index.vue
ruoyi-ui/src/views/monitor/logininfor/index.vue
+3
-3
ruoyi-ui/src/views/monitor/online/index.vue
ruoyi-ui/src/views/monitor/online/index.vue
+1
-1
ruoyi-ui/src/views/monitor/operlog/index.vue
ruoyi-ui/src/views/monitor/operlog/index.vue
+3
-3
ruoyi-ui/src/views/system/config/index.vue
ruoyi-ui/src/views/system/config/index.vue
+2
-2
ruoyi-ui/src/views/system/dept/index.vue
ruoyi-ui/src/views/system/dept/index.vue
+1
-1
ruoyi-ui/src/views/system/dict/data.vue
ruoyi-ui/src/views/system/dict/data.vue
+2
-2
ruoyi-ui/src/views/system/dict/index.vue
ruoyi-ui/src/views/system/dict/index.vue
+2
-2
ruoyi-ui/src/views/system/menu/index.vue
ruoyi-ui/src/views/system/menu/index.vue
+2
-2
ruoyi-ui/src/views/system/notice/index.vue
ruoyi-ui/src/views/system/notice/index.vue
+1
-1
ruoyi-ui/src/views/system/post/index.vue
ruoyi-ui/src/views/system/post/index.vue
+2
-2
ruoyi-ui/src/views/system/role/index.vue
ruoyi-ui/src/views/system/role/index.vue
+2
-2
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/src/views/system/user/index.vue
+2
-2
ruoyi-ui/src/views/tool/gen/index.vue
ruoyi-ui/src/views/tool/gen/index.vue
+2
-2
No files found.
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
View file @
19924cd1
...
@@ -532,7 +532,7 @@ export default {
...
@@ -532,7 +532,7 @@ export default {
}).then(() => {
}).then(() => {
this.getList();
this.getList();
this.msgSuccess("删除成功");
this.msgSuccess("删除成功");
})
})
.catch(() => {});
}
}
}
}
};
};
...
...
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
View file @
19924cd1
...
@@ -590,7 +590,7 @@ export default {
...
@@ -590,7 +590,7 @@ export default {
}).then(() => {
}).then(() => {
this.getList();
this.getList();
this.msgSuccess("删除成功");
this.msgSuccess("删除成功");
})
})
.catch(() => {});
},
},
#if($table.sub)
#if($table.sub)
/** ${subTable.functionName}序号 */
/** ${subTable.functionName}序号 */
...
@@ -639,7 +639,7 @@ export default {
...
@@ -639,7 +639,7 @@ export default {
}).then(response => {
}).then(response => {
this.download(response.msg);
this.download(response.msg);
this.exportLoading = false;
this.exportLoading = false;
})
})
.catch(() => {});
}
}
}
}
};
};
...
...
ruoyi-ui/src/layout/components/Navbar.vue
View file @
19924cd1
...
@@ -104,7 +104,7 @@ export default {
...
@@ -104,7 +104,7 @@ export default {
this
.
$store
.
dispatch
(
'
LogOut
'
).
then
(()
=>
{
this
.
$store
.
dispatch
(
'
LogOut
'
).
then
(()
=>
{
location
.
href
=
'
/index
'
;
location
.
href
=
'
/index
'
;
})
})
})
})
.
catch
(()
=>
{});
}
}
}
}
}
}
...
...
ruoyi-ui/src/utils/request.js
View file @
19924cd1
...
@@ -63,7 +63,7 @@ service.interceptors.response.use(res => {
...
@@ -63,7 +63,7 @@ service.interceptors.response.use(res => {
store
.
dispatch
(
'
LogOut
'
).
then
(()
=>
{
store
.
dispatch
(
'
LogOut
'
).
then
(()
=>
{
location
.
href
=
'
/index
'
;
location
.
href
=
'
/index
'
;
})
})
})
})
.
catch
(()
=>
{});
}
else
if
(
code
===
500
)
{
}
else
if
(
code
===
500
)
{
Message
({
Message
({
message
:
msg
,
message
:
msg
,
...
...
ruoyi-ui/src/views/monitor/job/index.vue
View file @
19924cd1
...
@@ -410,7 +410,7 @@ export default {
...
@@ -410,7 +410,7 @@ export default {
return
runJob
(
row
.
jobId
,
row
.
jobGroup
);
return
runJob
(
row
.
jobId
,
row
.
jobGroup
);
}).
then
(()
=>
{
}).
then
(()
=>
{
this
.
msgSuccess
(
"
执行成功
"
);
this
.
msgSuccess
(
"
执行成功
"
);
})
})
.
catch
(()
=>
{});
},
},
/** 任务详细信息 */
/** 任务详细信息 */
handleView
(
row
)
{
handleView
(
row
)
{
...
@@ -471,7 +471,7 @@ export default {
...
@@ -471,7 +471,7 @@ export default {
}).
then
(()
=>
{
}).
then
(()
=>
{
this
.
getList
();
this
.
getList
();
this
.
msgSuccess
(
"
删除成功
"
);
this
.
msgSuccess
(
"
删除成功
"
);
})
})
.
catch
(()
=>
{});
},
},
/** 导出按钮操作 */
/** 导出按钮操作 */
handleExport
()
{
handleExport
()
{
...
@@ -486,7 +486,7 @@ export default {
...
@@ -486,7 +486,7 @@ export default {
}).
then
(
response
=>
{
}).
then
(
response
=>
{
this
.
download
(
response
.
msg
);
this
.
download
(
response
.
msg
);
this
.
exportLoading
=
false
;
this
.
exportLoading
=
false
;
})
})
.
catch
(()
=>
{});
}
}
}
}
};
};
...
...
ruoyi-ui/src/views/monitor/job/log.vue
View file @
19924cd1
...
@@ -269,7 +269,7 @@ export default {
...
@@ -269,7 +269,7 @@ export default {
}).
then
(()
=>
{
}).
then
(()
=>
{
this
.
getList
();
this
.
getList
();
this
.
msgSuccess
(
"
删除成功
"
);
this
.
msgSuccess
(
"
删除成功
"
);
})
})
.
catch
(()
=>
{});
},
},
/** 清空按钮操作 */
/** 清空按钮操作 */
handleClean
()
{
handleClean
()
{
...
@@ -282,7 +282,7 @@ export default {
...
@@ -282,7 +282,7 @@ export default {
}).
then
(()
=>
{
}).
then
(()
=>
{
this
.
getList
();
this
.
getList
();
this
.
msgSuccess
(
"
清空成功
"
);
this
.
msgSuccess
(
"
清空成功
"
);
})
})
.
catch
(()
=>
{});
},
},
/** 导出按钮操作 */
/** 导出按钮操作 */
handleExport
()
{
handleExport
()
{
...
@@ -297,7 +297,7 @@ export default {
...
@@ -297,7 +297,7 @@ export default {
}).
then
(
response
=>
{
}).
then
(
response
=>
{
this
.
download
(
response
.
msg
);
this
.
download
(
response
.
msg
);
this
.
exportLoading
=
false
;
this
.
exportLoading
=
false
;
})
})
.
catch
(()
=>
{});
}
}
}
}
};
};
...
...
ruoyi-ui/src/views/monitor/logininfor/index.vue
View file @
19924cd1
...
@@ -202,7 +202,7 @@ export default {
...
@@ -202,7 +202,7 @@ export default {
}).
then
(()
=>
{
}).
then
(()
=>
{
this
.
getList
();
this
.
getList
();
this
.
msgSuccess
(
"
删除成功
"
);
this
.
msgSuccess
(
"
删除成功
"
);
})
})
.
catch
(()
=>
{});
},
},
/** 清空按钮操作 */
/** 清空按钮操作 */
handleClean
()
{
handleClean
()
{
...
@@ -215,7 +215,7 @@ export default {
...
@@ -215,7 +215,7 @@ export default {
}).
then
(()
=>
{
}).
then
(()
=>
{
this
.
getList
();
this
.
getList
();
this
.
msgSuccess
(
"
清空成功
"
);
this
.
msgSuccess
(
"
清空成功
"
);
})
})
.
catch
(()
=>
{});
},
},
/** 导出按钮操作 */
/** 导出按钮操作 */
handleExport
()
{
handleExport
()
{
...
@@ -230,7 +230,7 @@ export default {
...
@@ -230,7 +230,7 @@ export default {
}).
then
(
response
=>
{
}).
then
(
response
=>
{
this
.
download
(
response
.
msg
);
this
.
download
(
response
.
msg
);
this
.
exportLoading
=
false
;
this
.
exportLoading
=
false
;
})
})
.
catch
(()
=>
{});
}
}
}
}
};
};
...
...
ruoyi-ui/src/views/monitor/online/index.vue
View file @
19924cd1
...
@@ -120,7 +120,7 @@ export default {
...
@@ -120,7 +120,7 @@ export default {
}).
then
(()
=>
{
}).
then
(()
=>
{
this
.
getList
();
this
.
getList
();
this
.
msgSuccess
(
"
强退成功
"
);
this
.
msgSuccess
(
"
强退成功
"
);
})
})
.
catch
(()
=>
{});
}
}
}
}
};
};
...
...
ruoyi-ui/src/views/monitor/operlog/index.vue
View file @
19924cd1
...
@@ -290,7 +290,7 @@ export default {
...
@@ -290,7 +290,7 @@ export default {
}).
then
(()
=>
{
}).
then
(()
=>
{
this
.
getList
();
this
.
getList
();
this
.
msgSuccess
(
"
删除成功
"
);
this
.
msgSuccess
(
"
删除成功
"
);
})
})
.
catch
(()
=>
{});
},
},
/** 清空按钮操作 */
/** 清空按钮操作 */
handleClean
()
{
handleClean
()
{
...
@@ -303,7 +303,7 @@ export default {
...
@@ -303,7 +303,7 @@ export default {
}).
then
(()
=>
{
}).
then
(()
=>
{
this
.
getList
();
this
.
getList
();
this
.
msgSuccess
(
"
清空成功
"
);
this
.
msgSuccess
(
"
清空成功
"
);
})
})
.
catch
(()
=>
{});
},
},
/** 导出按钮操作 */
/** 导出按钮操作 */
handleExport
()
{
handleExport
()
{
...
@@ -318,7 +318,7 @@ export default {
...
@@ -318,7 +318,7 @@ export default {
}).
then
(
response
=>
{
}).
then
(
response
=>
{
this
.
download
(
response
.
msg
);
this
.
download
(
response
.
msg
);
this
.
exportLoading
=
false
;
this
.
exportLoading
=
false
;
})
})
.
catch
(()
=>
{});
}
}
}
}
};
};
...
...
ruoyi-ui/src/views/system/config/index.vue
View file @
19924cd1
...
@@ -338,7 +338,7 @@ export default {
...
@@ -338,7 +338,7 @@ export default {
}).
then
(()
=>
{
}).
then
(()
=>
{
this
.
getList
();
this
.
getList
();
this
.
msgSuccess
(
"
删除成功
"
);
this
.
msgSuccess
(
"
删除成功
"
);
})
})
.
catch
(()
=>
{});
},
},
/** 导出按钮操作 */
/** 导出按钮操作 */
handleExport
()
{
handleExport
()
{
...
@@ -353,7 +353,7 @@ export default {
...
@@ -353,7 +353,7 @@ export default {
}).
then
(
response
=>
{
}).
then
(
response
=>
{
this
.
download
(
response
.
msg
);
this
.
download
(
response
.
msg
);
this
.
exportLoading
=
false
;
this
.
exportLoading
=
false
;
})
})
.
catch
(()
=>
{});
},
},
/** 刷新缓存按钮操作 */
/** 刷新缓存按钮操作 */
handleRefreshCache
()
{
handleRefreshCache
()
{
...
...
ruoyi-ui/src/views/system/dept/index.vue
View file @
19924cd1
...
@@ -310,7 +310,7 @@ export default {
...
@@ -310,7 +310,7 @@ export default {
}).
then
(()
=>
{
}).
then
(()
=>
{
this
.
getList
();
this
.
getList
();
this
.
msgSuccess
(
"
删除成功
"
);
this
.
msgSuccess
(
"
删除成功
"
);
})
})
.
catch
(()
=>
{});
}
}
}
}
};
};
...
...
ruoyi-ui/src/views/system/dict/data.vue
View file @
19924cd1
...
@@ -337,7 +337,7 @@ export default {
...
@@ -337,7 +337,7 @@ export default {
}).
then
(()
=>
{
}).
then
(()
=>
{
this
.
getList
();
this
.
getList
();
this
.
msgSuccess
(
"
删除成功
"
);
this
.
msgSuccess
(
"
删除成功
"
);
})
})
.
catch
(()
=>
{});
},
},
/** 导出按钮操作 */
/** 导出按钮操作 */
handleExport
()
{
handleExport
()
{
...
@@ -352,7 +352,7 @@ export default {
...
@@ -352,7 +352,7 @@ export default {
}).
then
(
response
=>
{
}).
then
(
response
=>
{
this
.
download
(
response
.
msg
);
this
.
download
(
response
.
msg
);
this
.
exportLoading
=
false
;
this
.
exportLoading
=
false
;
})
})
.
catch
(()
=>
{});
}
}
}
}
};
};
...
...
ruoyi-ui/src/views/system/dict/index.vue
View file @
19924cd1
...
@@ -342,7 +342,7 @@ export default {
...
@@ -342,7 +342,7 @@ export default {
}).
then
(()
=>
{
}).
then
(()
=>
{
this
.
getList
();
this
.
getList
();
this
.
msgSuccess
(
"
删除成功
"
);
this
.
msgSuccess
(
"
删除成功
"
);
})
})
.
catch
(()
=>
{});
},
},
/** 导出按钮操作 */
/** 导出按钮操作 */
handleExport
()
{
handleExport
()
{
...
@@ -357,7 +357,7 @@ export default {
...
@@ -357,7 +357,7 @@ export default {
}).
then
(
response
=>
{
}).
then
(
response
=>
{
this
.
download
(
response
.
msg
);
this
.
download
(
response
.
msg
);
this
.
exportLoading
=
false
;
this
.
exportLoading
=
false
;
})
})
.
catch
(()
=>
{});
},
},
/** 刷新缓存按钮操作 */
/** 刷新缓存按钮操作 */
handleRefreshCache
()
{
handleRefreshCache
()
{
...
...
ruoyi-ui/src/views/system/menu/index.vue
View file @
19924cd1
...
@@ -163,7 +163,7 @@
...
@@ -163,7 +163,7 @@
</el-col>
</el-col>
<el-col
:span=
"12"
>
<el-col
:span=
"12"
>
<el-form-item
v-if=
"form.menuType != 'M'"
label=
"权限标识"
>
<el-form-item
v-if=
"form.menuType != 'M'"
label=
"权限标识"
>
<el-input
v-model=
"form.perms"
placeholder=
"请权限标识"
maxlength=
"100"
/>
<el-input
v-model=
"form.perms"
placeholder=
"请
输入
权限标识"
maxlength=
"100"
/>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"12"
>
<el-col
:span=
"12"
>
...
@@ -393,7 +393,7 @@ export default {
...
@@ -393,7 +393,7 @@ export default {
}).
then
(()
=>
{
}).
then
(()
=>
{
this
.
getList
();
this
.
getList
();
this
.
msgSuccess
(
"
删除成功
"
);
this
.
msgSuccess
(
"
删除成功
"
);
})
})
.
catch
(()
=>
{});
}
}
}
}
};
};
...
...
ruoyi-ui/src/views/system/notice/index.vue
View file @
19924cd1
...
@@ -336,7 +336,7 @@ export default {
...
@@ -336,7 +336,7 @@ export default {
}
).
then
(()
=>
{
}
).
then
(()
=>
{
this
.
getList
();
this
.
getList
();
this
.
msgSuccess
(
"
删除成功
"
);
this
.
msgSuccess
(
"
删除成功
"
);
}
)
}
)
.
catch
(()
=>
{
}
);
}
}
}
}
}
;
}
;
...
...
ruoyi-ui/src/views/system/post/index.vue
View file @
19924cd1
...
@@ -309,7 +309,7 @@ export default {
...
@@ -309,7 +309,7 @@ export default {
}).
then
(()
=>
{
}).
then
(()
=>
{
this
.
getList
();
this
.
getList
();
this
.
msgSuccess
(
"
删除成功
"
);
this
.
msgSuccess
(
"
删除成功
"
);
})
})
.
catch
(()
=>
{});
},
},
/** 导出按钮操作 */
/** 导出按钮操作 */
handleExport
()
{
handleExport
()
{
...
@@ -324,7 +324,7 @@ export default {
...
@@ -324,7 +324,7 @@ export default {
}).
then
(
response
=>
{
}).
then
(
response
=>
{
this
.
download
(
response
.
msg
);
this
.
download
(
response
.
msg
);
this
.
exportLoading
=
false
;
this
.
exportLoading
=
false
;
})
})
.
catch
(()
=>
{});
}
}
}
}
};
};
...
...
ruoyi-ui/src/views/system/role/index.vue
View file @
19924cd1
...
@@ -593,7 +593,7 @@ export default {
...
@@ -593,7 +593,7 @@ export default {
}).
then
(()
=>
{
}).
then
(()
=>
{
this
.
getList
();
this
.
getList
();
this
.
msgSuccess
(
"
删除成功
"
);
this
.
msgSuccess
(
"
删除成功
"
);
})
})
.
catch
(()
=>
{});
},
},
/** 导出按钮操作 */
/** 导出按钮操作 */
handleExport
()
{
handleExport
()
{
...
@@ -608,7 +608,7 @@ export default {
...
@@ -608,7 +608,7 @@ export default {
}).
then
(
response
=>
{
}).
then
(
response
=>
{
this
.
download
(
response
.
msg
);
this
.
download
(
response
.
msg
);
this
.
exportLoading
=
false
;
this
.
exportLoading
=
false
;
})
})
.
catch
(()
=>
{});
}
}
}
}
};
};
...
...
ruoyi-ui/src/views/system/user/index.vue
View file @
19924cd1
...
@@ -631,7 +631,7 @@ export default {
...
@@ -631,7 +631,7 @@ export default {
}).
then
(()
=>
{
}).
then
(()
=>
{
this
.
getList
();
this
.
getList
();
this
.
msgSuccess
(
"
删除成功
"
);
this
.
msgSuccess
(
"
删除成功
"
);
})
})
.
catch
(()
=>
{});
},
},
/** 导出按钮操作 */
/** 导出按钮操作 */
handleExport
()
{
handleExport
()
{
...
@@ -646,7 +646,7 @@ export default {
...
@@ -646,7 +646,7 @@ export default {
}).
then
(
response
=>
{
}).
then
(
response
=>
{
this
.
download
(
response
.
msg
);
this
.
download
(
response
.
msg
);
this
.
exportLoading
=
false
;
this
.
exportLoading
=
false
;
})
})
.
catch
(()
=>
{});
},
},
/** 导入按钮操作 */
/** 导入按钮操作 */
handleImport
()
{
handleImport
()
{
...
...
ruoyi-ui/src/views/tool/gen/index.vue
View file @
19924cd1
...
@@ -283,7 +283,7 @@ export default {
...
@@ -283,7 +283,7 @@ export default {
return
synchDb
(
tableName
);
return
synchDb
(
tableName
);
}).
then
(()
=>
{
}).
then
(()
=>
{
this
.
msgSuccess
(
"
同步成功
"
);
this
.
msgSuccess
(
"
同步成功
"
);
})
})
.
catch
(()
=>
{});
},
},
/** 打开导入表弹窗 */
/** 打开导入表弹窗 */
openImportTable
()
{
openImportTable
()
{
...
@@ -333,7 +333,7 @@ export default {
...
@@ -333,7 +333,7 @@ export default {
}).
then
(()
=>
{
}).
then
(()
=>
{
this
.
getList
();
this
.
getList
();
this
.
msgSuccess
(
"
删除成功
"
);
this
.
msgSuccess
(
"
删除成功
"
);
})
})
.
catch
(()
=>
{});
}
}
}
}
};
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment