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-ui/src/views/monitor/job/index.vue
	ruoyi/src/main/resources/mybatis/system/SysMenuMapper.xml
This commit is contained in:
疯狂的狮子li
2020-03-24 15:29:45 +08:00
parent 67657e9f02 e07d4c18ee
commit 39d8723159
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -238,8 +238,8 @@
</el-col>
<el-col :span="12">
<el-form-item label="是否并发：">
<div v-if="form.status == 0">允许</div>
<div v-else-if="form.status == 1">禁止</div>
<div v-if="form.concurrent == 0">允许</div>
<div v-else-if="form.concurrent == 1">禁止</div>
</el-form-item>
</el-col>
<el-col :span="12">
@ -259,7 +259,6 @@
</div>
</template>
<script>
import { listJob, getJob, delJob, addJob, updateJob, exportJob, runJob, changeJobStatus } from "@/api/monitor/job";
@ -486,4 +485,4 @@ export default {
}
}
};
</script>
</script>