From 53cc414e8d2f52b62b7bc258c14b6e23785c0960 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Fri, 4 Mar 2022 22:34:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A8=A1=E6=9D=BF=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/Menu.php  |  7 ++-----
 app/admin/controller/Queue.php |  1 -
 app/admin/view/menu/form.html  |  2 +-
 app/admin/view/menu/index.html | 12 ++++++------
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/app/admin/controller/Menu.php b/app/admin/controller/Menu.php
index 58df4e578..908b3f86b 100644
--- a/app/admin/controller/Menu.php
+++ b/app/admin/controller/Menu.php
@@ -41,12 +41,9 @@ class Menu extends Controller
      */
     public function index()
     {
+        $this->title = '系统菜单管理';
         $this->type = input('get.type', 'index');
-        SystemMenu::mQuery()->layTable(function () {
-            $this->title = '系统菜单管理';
-        }, function (QueryHelper $query) {
-            $query->order('sort desc,id asc');
-        });
+        SystemMenu::mQuery()->layTable();
     }
 
     /**
diff --git a/app/admin/controller/Queue.php b/app/admin/controller/Queue.php
index c4978f4c3..ce69ded35 100644
--- a/app/admin/controller/Queue.php
+++ b/app/admin/controller/Queue.php
@@ -45,7 +45,6 @@ class Queue extends Controller
         SystemQueue::mQuery()->layTable(function () {
             $this->title = '系统任务管理';
             $this->iswin = ProcessService::instance()->iswin();
-            // 超级管理面板
             if ($this->super = AdminService::instance()->isSuper()) {
                 $process = ProcessService::instance();
                 if ($process->iswin() || empty($_SERVER['USER'])) {
diff --git a/app/admin/view/menu/form.html b/app/admin/view/menu/form.html
index 7cb2aade4..d31ad8377 100644
--- a/app/admin/view/menu/form.html
+++ b/app/admin/view/menu/form.html
@@ -1,4 +1,4 @@
-<form class="layui-form layui-card" data-table-id="MenuData" action="{:sysuri()}" data-auto="true" method="post">
+<form class="layui-form layui-card" data-table-id="MenuTable" action="{:sysuri()}" data-auto="true" method="post">
 
     <div class="layui-card-body">
 
diff --git a/app/admin/view/menu/index.html b/app/admin/view/menu/index.html
index 4a696272a..44dc83f77 100644
--- a/app/admin/view/menu/index.html
+++ b/app/admin/view/menu/index.html
@@ -25,13 +25,13 @@
         {/if}{/foreach}
     </ul>
     <div class="layui-tab-content">
-        <table id="MenuData" data-url="{:sysuri()}" data-target-search="form.form-search"></table>
+        <table id="MenuTable" data-url="{:sysuri()}" data-target-search="form.form-search"></table>
     </div>
 </div>
 
 <script>
     $(function () {
-        $('#MenuData').layTable({
+        $('#MenuTable').layTable({
             even: true, height: 'full', page: false,
             sort: {field: 'sort desc,id', type: 'asc'},
             where: {type: '{$type|default="index"}'},
@@ -43,9 +43,9 @@
             },
             cols: [[
                 {checkbox: true, field: 'sps'},
-                {field: 'sort', title: '排序权重', width: 100, align: 'center', sort: true, templet: '#SortInputTpl'},
+                {field: 'sort', title: '排序权重', width: 100, align: 'center', templet: '#SortInputTpl'},
                 {
-                    field: 'icon', title: '图标', width: 80, align: 'center', templet: function (d) {
+                    field: 'icon', title: '图 标', width: 80, align: 'center', templet: function (d) {
                         return layui.laytpl('<i class="{{d.icon}} font-s18"></i>').render(d);
                     }
                 },
@@ -67,9 +67,9 @@
             if (data.status > 0) data.id += obj.elem.dataset.path.replace(/-/g, ',');
             $.form.load("{:url('state')}", data, 'post', function (ret) {
                 if (ret.code < 1) $.msg.error(ret.info, 3, function () {
-                    $('#MenuData').trigger('reload');
+                    $('#MenuTable').trigger('reload');
                 }); else if (obj.value.split(',').length > 2) {
-                    $('#MenuData').trigger('reload');
+                    $('#MenuTable').trigger('reload');
                 }
                 return false;
             }, false);