Merge branch 'master' into wxw

wxw

2024-08-17 0464969366317154fdbb51e106ca778b855bdd08

 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) {
         // 创建一个日期对象，用于解析输入的日期时间字符串