判定标准管理

application/admin/controller/item/Judge.php

@@ -5,7 +5,7 @@ namespace app\admin\controller\item;
 use app\common\controller\Backend;
 
 /**
- * 判定标准管理
+ * 判定标准详情管理
  *
  * @icon fa fa-circle-o
  */

application/admin/lang/zh-cn/item/judge.php

@@ -1,17 +1,11 @@
 <?php
 
 return [
-    'No'            => '判定标准编号',
-    'Name'          => '判定标准名称',
-    'Userid'        => '用户id',
-    'Pro_name'      => '项目名称',
-    'Params'        => '参数名称',
-    'Standard'      => '标准值类型',
-    'Max_character' => '上限数学符号',
-    'Max'           => '上限值',
-    'Min_character' => '下限数学符号',
-    'Min'           => '下限值',
-    'Create'        => '创建时间',
-    'Update'        => '更新时间',
-    'Deletetime'    => '删除时间'
+    'No'        => '判定标准编号',
+    'Name'      => '判定标准名称',
+    'List_name' => '检测项目集',
+    'Userid'    => '用户id',
+    'Create'    => '创建时间',
+    'Update'    => '更新时间',
+    'Delete'    => '删除时间'
 ];

application/admin/model/item/Judge.php

@@ -3,12 +3,12 @@
 namespace app\admin\model\item;
 
 use think\Model;
-use traits\model\SoftDelete;
+
 
 class Judge extends Model
 {
 
-    use SoftDelete;
+    
 
     
 
@@ -21,7 +21,7 @@ class Judge extends Model
     // 定义时间戳字段名
     protected $createTime = false;
     protected $updateTime = false;
-    protected $deleteTime = 'deletetime';
+    protected $deleteTime = false;
 
     // 追加属性
     protected $append = [

application/admin/view/item/judge/add.html

@@ -13,63 +13,33 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Userid')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-userid" class="form-control" name="row[userid]" type="number">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Pro_name')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-pro_name" class="form-control" name="row[pro_name]" type="text">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Params')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-params" class="form-control" name="row[params]" type="text">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Standard')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('List_name')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-standard" class="form-control" name="row[standard]" type="text">
+            <input id="c-list_name" class="form-control" name="row[list_name]" type="text">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Max_character')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-max_character" class="form-control" name="row[max_character]" type="text">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Max')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-max" class="form-control" name="row[max]" type="text">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Min_character')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Userid')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-min_character" class="form-control" name="row[min_character]" type="text">
+            <input id="c-userid" class="form-control" name="row[userid]" type="number">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Min')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Create')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-min" class="form-control" name="row[min]" type="text">
+            <input id="c-create" class="form-control" name="row[create]" type="text">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Create')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Update')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-create" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[create]" type="text" value="{:date('Y-m-d H:i:s')}">
+            <input id="c-update" class="form-control" name="row[update]" type="text">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Update')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Delete')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-update" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[update]" type="text" value="{:date('Y-m-d H:i:s')}">
+            <input id="c-delete" class="form-control" name="row[delete]" type="text">
         </div>
     </div>
     <div class="form-group layer-footer">

application/admin/view/item/judge/edit.html

@@ -13,63 +13,33 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Userid')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-userid" class="form-control" name="row[userid]" type="number" value="{$row.userid|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Pro_name')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-pro_name" class="form-control" name="row[pro_name]" type="text" value="{$row.pro_name|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Params')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-params" class="form-control" name="row[params]" type="text" value="{$row.params|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Standard')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('List_name')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-standard" class="form-control" name="row[standard]" type="text" value="{$row.standard|htmlentities}">
+            <input id="c-list_name" class="form-control" name="row[list_name]" type="text" value="{$row.list_name|htmlentities}">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Max_character')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-max_character" class="form-control" name="row[max_character]" type="text" value="{$row.max_character|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Max')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-max" class="form-control" name="row[max]" type="text" value="{$row.max|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Min_character')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Userid')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-min_character" class="form-control" name="row[min_character]" type="text" value="{$row.min_character|htmlentities}">
+            <input id="c-userid" class="form-control" name="row[userid]" type="number" value="{$row.userid|htmlentities}">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Min')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Create')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-min" class="form-control" name="row[min]" type="text" value="{$row.min|htmlentities}">
+            <input id="c-create" class="form-control" name="row[create]" type="text" value="{$row.create|htmlentities}">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Create')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Update')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-create" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[create]" type="text" value="{$row.create}">
+            <input id="c-update" class="form-control" name="row[update]" type="text" value="{$row.update|htmlentities}">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Update')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Delete')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-update" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[update]" type="text" value="{$row.update}">
+            <input id="c-delete" class="form-control" name="row[delete]" type="text" value="{$row.delete|htmlentities}">
         </div>
     </div>
     <div class="form-group layer-footer">

application/admin/view/item/judge/index.html

@@ -20,7 +20,7 @@
                             </ul>
                         </div>
 
-                        <a class="btn btn-success btn-recyclebin btn-dialog {:$auth->check('item/judge/recyclebin')?'':'hide'}" href="item/judge/recyclebin" title="{:__('Recycle bin')}"><i class="fa fa-recycle"></i> {:__('Recycle bin')}</a>
+                        
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
                            data-operate-edit="{:$auth->check('item/judge/edit')}"

application/admin/view/item/judge/recyclebin.html

@@ -1,25 +0,0 @@
-<div class="panel panel-default panel-intro">
-    {:build_heading()}
-
-    <div class="panel-body">
-        <div id="myTabContent" class="tab-content">
-            <div class="tab-pane fade active in" id="one">
-                <div class="widget-body no-padding">
-                    <div id="toolbar" class="toolbar">
-                        {:build_toolbar('refresh')}
-                        <a class="btn btn-info btn-multi btn-disabled disabled {:$auth->check('item/judge/restore')?'':'hide'}" href="javascript:;" data-url="item/judge/restore" data-action="restore"><i class="fa fa-rotate-left"></i> {:__('Restore')}</a>
-                        <a class="btn btn-danger btn-multi btn-disabled disabled {:$auth->check('item/judge/destroy')?'':'hide'}" href="javascript:;" data-url="item/judge/destroy" data-action="destroy"><i class="fa fa-times"></i> {:__('Destroy')}</a>
-                        <a class="btn btn-success btn-restoreall {:$auth->check('item/judge/restore')?'':'hide'}" href="javascript:;" data-url="item/judge/restore" title="{:__('Restore all')}"><i class="fa fa-rotate-left"></i> {:__('Restore all')}</a>
-                        <a class="btn btn-danger btn-destroyall {:$auth->check('item/judge/destroy')?'':'hide'}" href="javascript:;" data-url="item/judge/destroy" title="{:__('Destroy all')}"><i class="fa fa-times"></i> {:__('Destroy all')}</a>
-                    </div>
-                    <table id="table" class="table table-striped table-bordered table-hover"
-                           data-operate-restore="{:$auth->check('item/judge/restore')}"
-                           data-operate-destroy="{:$auth->check('item/judge/destroy')}"
-                           width="100%">
-                    </table>
-                </div>
-            </div>
-
-        </div>
-    </div>
-</div>

public/assets/js/backend/item/judge.js

@@ -22,24 +22,17 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'id',
-                fixedColumns: true,
-                fixedRightNumber: 1,
                 columns: [
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
                         {field: 'no', title: __('No'), operate: 'LIKE'},
                         {field: 'name', title: __('Name'), operate: 'LIKE'},
+                        {field: 'list_name', title: __('List_name'), operate: 'LIKE'},
                         {field: 'userid', title: __('Userid')},
-                        {field: 'pro_name', title: __('Pro_name'), operate: 'LIKE'},
-                        {field: 'params', title: __('Params'), operate: 'LIKE'},
-                        {field: 'standard', title: __('Standard'), operate: 'LIKE'},
-                        {field: 'max_character', title: __('Max_character'), operate: 'LIKE'},
-                        {field: 'max', title: __('Max'), operate: 'LIKE'},
-                        {field: 'min_character', title: __('Min_character'), operate: 'LIKE'},
-                        {field: 'min', title: __('Min'), operate: 'LIKE'},
-                        {field: 'create', title: __('Create'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
-                        {field: 'update', title: __('Update'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
+                        {field: 'create', title: __('Create'), operate: 'LIKE'},
+                        {field: 'update', title: __('Update'), operate: 'LIKE'},
+                        {field: 'delete', title: __('Delete'), operate: 'LIKE'},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]
@@ -48,67 +41,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             // 为表格绑定事件
             Table.api.bindevent(table);
         },
-        recyclebin: function () {
-            // 初始化表格参数配置
-            Table.api.init({
-                extend: {
-                    'dragsort_url': ''
-                }
-            });
-
-            var table = $("#table");
-
-            // 初始化表格
-            table.bootstrapTable({
-                url: 'item/judge/recyclebin' + location.search,
-                pk: 'id',
-                sortName: 'id',
-                columns: [
-                    [
-                        {checkbox: true},
-                        {field: 'id', title: __('Id')},
-                        {field: 'name', title: __('Name'), align: 'left'},
-                        {
-                            field: 'deletetime',
-                            title: __('Deletetime'),
-                            operate: 'RANGE',
-                            addclass: 'datetimerange',
-                            formatter: Table.api.formatter.datetime
-                        },
-                        {
-                            field: 'operate',
-                            width: '140px',
-                            title: __('Operate'),
-                            table: table,
-                            events: Table.api.events.operate,
-                            buttons: [
-                                {
-                                    name: 'Restore',
-                                    text: __('Restore'),
-                                    classname: 'btn btn-xs btn-info btn-ajax btn-restoreit',
-                                    icon: 'fa fa-rotate-left',
-                                    url: 'item/judge/restore',
-                                    refresh: true
-                                },
-                                {
-                                    name: 'Destroy',
-                                    text: __('Destroy'),
-                                    classname: 'btn btn-xs btn-danger btn-ajax btn-destroyit',
-                                    icon: 'fa fa-times',
-                                    url: 'item/judge/destroy',
-                                    refresh: true
-                                }
-                            ],
-                            formatter: Table.api.formatter.operate
-                        }
-                    ]
-                ]
-            });
-
-            // 为表格绑定事件
-            Table.api.bindevent(table);
-        },
-
         add: function () {
             Controller.api.bindevent();
         },