From 0464969366317154fdbb51e106ca778b855bdd08 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 17 八月 2024 15:45:28 +0800
Subject: [PATCH] Merge branch 'master' into wxw
---
HTML/views/SystemSettings/Job.html | 54 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 41 insertions(+), 13 deletions(-)
diff --git a/HTML/views/SystemSettings/Job.html b/HTML/views/SystemSettings/Job.html
index 1b6bb4f..d26a50f 100644
--- a/HTML/views/SystemSettings/Job.html
+++ b/HTML/views/SystemSettings/Job.html
@@ -27,7 +27,7 @@
id="top">
<div class="layui-form-item">
<div class="layui-inline">
- <button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit
+ <button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit id="btnAdd"
lay-filter="LAY-app-contlist-add">
<i class="layui-icon layui-icon-add-1 layuiadmin-button-btn"></i>娣诲姞
</button>
@@ -56,12 +56,13 @@
<a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="Play">
<i class="layui-icon layui-icon-play"></i>寮�濮�</a>
{{# } }}
- <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>缂栬緫</a>
- <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i
+ <a class="layui-btn layui-btn-normal layui-btn-xs btnEdit" lay-event="edit"><i
+ class="layui-icon layui-icon-edit"></i>缂栬緫</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs btnDel" lay-event="del"><i
class="layui-icon layui-icon-delete"></i>鍒犻櫎</a>
- <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="detail"><i
+ <a class="layui-btn layui-btn-normal layui-btn-xs btnLog" lay-event="detail"><i
class="layui-icon layui-icon-log"></i>鏃ュ織</a>
- <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="execute"><i
+ <a class="layui-btn layui-btn-normal layui-btn-xs btnExec" lay-event="execute"><i
class="layui-icon layui-icon-triangle-r"></i>鎵ц</a>
</script>
<script>
@@ -85,7 +86,7 @@
sendData(IP + url, {}, 'get', function (res) {
// console.log(res.data)
- if (res.code == 200) //鎴愬姛
+ if (res.code == 0) //鎴愬姛
{
var list = res.data;
$.extend(infoOptions, {
@@ -153,7 +154,33 @@
{
field: 'caozuo', title: '鎿嶄綔', fixed: 'right', width: 340, align: 'left', toolbar: "#toolBar"
}
- ]]
+ ]],
+ done: function () {
+ //鏉冮檺
+ var listRole = JSON.parse(localStorage.getItem('listRole'));
+ $("#btnAdd").hide();
+ $(".btnEdit").hide();
+ $(".btnDel").hide();
+ $(".btnLog").hide();
+ $(".btnExec").hide();
+ if (listRole) {
+ if (listRole.filter(s => s.MenuName == "娣诲姞浠诲姟").length > 0) {
+ $("#btnAdd").show();
+ }
+ if (listRole.filter(s => s.MenuName == "缂栬緫浠诲姟").length > 0) {
+ $(".btnEdit").show();
+ }
+ if (listRole.filter(s => s.MenuName == "鍒犻櫎浠诲姟").length > 0) {
+ $(".btnDel").show();
+ }
+ if (listRole.filter(s => s.MenuName == "浠诲姟鏃ュ織").length > 0) {
+ $(".btnLog").show();
+ }
+ if (listRole.filter(s => s.MenuName == "鎵ц浠诲姟").length > 0) {
+ $(".btnExec").show();
+ }
+ }
+ }
};
table.on('tool(LAY-app-content-list)', function (obj) {
@@ -162,7 +189,7 @@
case "execute":
sendData(IP + "/Job/TriggerJob", { Name: data.Name, Group: data.GroupName }, 'post', function (res) {
console.log(res);
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 3000 //1绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -199,7 +226,7 @@
layer.confirm('纭畾鍒犻櫎閫変腑鐨勬ā鏉匡紵', function (index) {
sendData(IP + "/Job/RemoveJob", { Name: data.Name, Group: data.GroupName }, 'post', function (res) {
console.log(res);
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 3000 //1绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -225,7 +252,7 @@
case "detail":
sendData(IP + "/Job/GetJobLogs", { Name: data.Name, Group: data.GroupName }, 'post', function (res) {
console.log(res);
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
if (res.data) {
layer.open({
type: 1,
@@ -255,7 +282,7 @@
case "Play":
sendData(IP + "/Job/ResumeJob", { Name: data.Name, Group: data.GroupName }, 'post', function (res) {
console.log(res);
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 3000 //1绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -278,7 +305,7 @@
case "Pause":
sendData(IP + "/Job/StopJob", { Name: data.Name, Group: data.GroupName }, 'post', function (res) {
console.log(res);
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 3000 //1绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -302,7 +329,7 @@
});
//娣诲姞
form.on('submit(LAY-app-contlist-add)', function (obj) {
- objRowsData = {};
+ objRowsData = null;
layer.open({
type: 2,
title: '娣诲姞瀹氭椂浠诲姟淇℃伅',
@@ -314,6 +341,7 @@
}
});
});
+
});
function formatDateTime(inputDateTime) {
// 鍒涘缓涓�涓棩鏈熷璞★紝鐢ㄤ簬瑙ｆ瀽杈撳叆鐨勬棩鏈熸椂闂村瓧绗︿覆
--
Gitblit v1.8.0