jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

Browse Source 
 Conflicts:
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-ui/package.json
	ruoyi-ui/src/utils/ruoyi.js
	ruoyi-ui/src/views/monitor/job/index.vue
This commit is contained in:
疯狂的狮子li
2020-10-10 09:19:20 +08:00
parent cb92e41b76 69256940df
commit bd39b971cf
11 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-ui/src/utils/ruoyi.js
View File

@ -59,8 +59,8 @@ export function addDateRange(params, dateRange) {
search.beginTime = "";
search.endTime = "";
if (null != dateRange && '' != dateRange) {
search.beginTime = this.dateRange[0];
search.endTime = this.dateRange[1];
search.beginTime = dateRange[0];
search.endTime = dateRange[1];
}
return search;
}

2
ruoyi-ui/src/views/monitor/job/index.vue
View File

@ -111,7 +111,7 @@
type="text"
icon="el-icon-caret-right"
@click="handleRun(scope.row)"
v-hasPermi="['monitor:job:edit']"
v-hasPermi="['monitor:job:changeStatus']"
>执行一次</el-button>
<el-button
size="mini"