diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/meet/TdMeetingController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/meet/TdMeetingController.java
index dd77099..7168f39 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/meet/TdMeetingController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/meet/TdMeetingController.java
@@ -95,6 +95,17 @@ public class TdMeetingController extends BaseController {
         return toAjax(meetingManager.saveOrUpdate(tdMeeting));
     }
 
+    /**
+     * 修改会议
+     */
+    @RequiresPermissions("system:tdmeeting:detail")
+    @GetMapping("/detail/{id}")
+    public String detail(@PathVariable("id") String id, ModelMap mmap) {
+        TdMeeting meeting = meetingManager.selectTdMeeting(id);
+        mmap.put("meeting", meeting);
+        return prefix + "/detail";
+    }
+
     /**
      * 删除会议
      */
diff --git a/ruoyi-admin/src/main/resources/templates/system/tdmeeting/add.html b/ruoyi-admin/src/main/resources/templates/system/tdmeeting/add.html
new file mode 100644
index 0000000..aec551e
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/system/tdmeeting/add.html
@@ -0,0 +1,160 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增涉密会议')" />
+    <th:block th:include="include :: datetimepicker-css" />
+    <th:block th:include="include :: jasny-bootstrap-css" />
+</head>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content" id="app">
+    <form class="form-horizontal m" id="form-meeting-add">
+        <div class="row">
+            <div class="col-sm-12">
+                <div class="form-group">
+                    <label class="col-sm-2 control-label is-required">会议主题:</label>
+                    <div class="col-sm-10">
+                        <input name="meetingTitle" required placeholder="请输入会议主题" class="form-control m-b" type="text">
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label is-required">会议时间:</label>
+                    <div class="col-sm-8">
+                        <input type="text" class="form-control m-b" placeholder="请选择会议时间" name="meetingTime"></input>
+                    </div>
+                </div>
+            </div>
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">会议地点:</label>
+                    <div class="col-sm-8">
+                        <input type="text" class="form-control m-b" placeholder="请输入会议地点" name="meetingAddress"></input>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">参会人数:</label>
+                    <div class="col-sm-8">
+                        <input type="text" class="form-control m-b" digits="true" placeholder="请输入参会人数" name="meetingUsernum"></input>
+                    </div>
+                </div>
+            </div>
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">主办方:</label>
+                    <div class="col-sm-8">
+                        <input type="text" class="form-control m-b" placeholder="请输入主办方" name="meetingHost"></input>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label is-required">会议类型:</label>
+                    <div class="col-sm-8">
+                        <select name="meetingType" required class="form-control m-b" th:with="type=${@dict.getType('sys_meeting_type')}">
+                            <option value="">---请选择---</option>
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label is-required">会议状态:</label>
+                    <div class="col-sm-8">
+                        <select name="meetingState" required class="form-control m-b" th:with="type=${@dict.getType('sys_meeting_state')}">
+                            <option value="">---请选择---</option>
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-sm-12">
+                <div class="form-group">
+                    <label class="col-sm-2 control-label is-required">上传文件:</label>
+                    <div class="fileinput fileinput-new col-sm-10" data-provides="fileinput">
+                        <span class="btn btn-white btn-file">
+                            <span class="fileinput-new">选择文件</span>
+                            <span class="fileinput-exists">更改</span>
+                            <input type="file" id="fileUrlId" name="..." required>
+                            <input type="hidden" id="fileUrl" name="fileUrl">
+                            <input type="hidden" id="fileName" name="fileName">
+                        </span>
+                        <span class="fileinput-filename"></span>
+                        <a href="#" class="close fileinput-exists" data-dismiss="fileinput" style="float: none">&times;</a>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-sm-12">
+                <div class="form-group">
+                    <label class="col-sm-2 control-label">会议纪要:</label>
+                    <div class="col-sm-10">
+                        <textarea name="summary" placeholder="请输入会议纪要" class="form-control"></textarea>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </form>
+</div>
+<th:block th:include="include :: footer" />
+<th:block th:include="include :: datetimepicker-js" />
+<th:block th:include="include :: jasny-bootstrap-js" />
+<script th:inline="javascript">
+    var prefix = ctx + "system/tdmeeting"
+    $("#form-meeting-add").validate({
+        focusCleanup: true
+    });
+    function submitHandler() {
+        if ($.validate.form()) {
+            $.operate.save(prefix + "/add", $('#form-meeting-add').serialize());
+        }
+    }
+    $("input[name='meetingTime']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+    //文件上传
+    $('#fileUrlId').on('change.bs.fileinput ', function (e) {
+        // 处理自己的业务
+        var file = e.target.files[0];
+        var data = new FormData();
+        data.append("file", file);
+        $.ajax({
+            type: "POST",
+            url: ctx + "common/upload",
+            data: data,
+            cache: false,
+            contentType: false,
+            processData: false,
+            dataType: 'json',
+            success: function(result) {
+                if (result.code == web_status.SUCCESS) {
+                    $("#fileUrl").val(result.url);
+                    $("#fileName").val(result.originalFilename);
+                } else {
+                    $("#fileUrl").val("");
+                    $("#fileName").val("");
+                }
+            },
+            error: function(error) {
+                $.modal.alertWarning("文件上传失败。");
+            }
+        });
+
+    });
+</script>
+</body>
+</html>
diff --git a/ruoyi-admin/src/main/resources/templates/system/tdmeeting/detail.html b/ruoyi-admin/src/main/resources/templates/system/tdmeeting/detail.html
new file mode 100644
index 0000000..5b231be
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/system/tdmeeting/detail.html
@@ -0,0 +1,160 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+  <th:block th:include="include :: header('新增涉密会议')" />
+  <th:block th:include="include :: datetimepicker-css" />
+  <th:block th:include="include :: jasny-bootstrap-css" />
+</head>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content" id="app">
+  <form class="form-horizontal m" id="form-meeting-add" th:object="${meeting}">
+    <input name="userId"  type="hidden" th:field="*{id}" />
+    <div class="row">
+      <div class="col-sm-12">
+        <div class="form-group">
+          <label class="col-sm-2 control-label is-required">会议主题:</label>
+          <div class="col-sm-10">
+            <input name="meetingTitle" disabled="disabled" required placeholder="请输入会议主题" th:field="*{meetingTitle}" class="form-control m-b" type="text">
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-sm-6">
+        <div class="form-group">
+          <label class="col-sm-4 control-label is-required">会议时间:</label>
+          <div class="col-sm-8">
+            <input type="text" class="form-control m-b" disabled="disabled" placeholder="请选择会议时间" th:value="${#dates.format(meeting.meetingTime, 'yyyy-MM-dd')}" name="meetingTime"></input>
+          </div>
+        </div>
+      </div>
+      <div class="col-sm-6">
+        <div class="form-group">
+          <label class="col-sm-4 control-label">会议地点:</label>
+          <div class="col-sm-8">
+            <input type="text" class="form-control m-b" disabled="disabled" placeholder="请输入会议地点" th:field="*{meetingAddress}" name="meetingAddress"></input>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-sm-6">
+        <div class="form-group">
+          <label class="col-sm-4 control-label">参会人数:</label>
+          <div class="col-sm-8">
+            <input type="text" class="form-control m-b" disabled="disabled" placeholder="请输入参会人数" th:field="*{meetingUsernum}" name="meetingUsernum"></input>
+          </div>
+        </div>
+      </div>
+      <div class="col-sm-6">
+        <div class="form-group">
+          <label class="col-sm-4 control-label">主办方:</label>
+          <div class="col-sm-8">
+            <input type="text" class="form-control m-b" disabled="disabled" placeholder="请输入主办方" th:field="*{meetingHost}" name="meetingHost"></input>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-sm-6">
+        <div class="form-group">
+          <label class="col-sm-4 control-label is-required">会议类型:</label>
+          <div class="col-sm-8">
+            <select name="meetingType" disabled="disabled" required class="form-control m-b" th:with="type=${@dict.getType('sys_meeting_type')}">
+              <option value="">---请选择---</option>
+              <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{meetingType}"></option>
+            </select>
+          </div>
+        </div>
+      </div>
+      <div class="col-sm-6">
+        <div class="form-group">
+          <label class="col-sm-4 control-label is-required">会议状态:</label>
+          <div class="col-sm-8">
+            <select name="meetingState" disabled="disabled" required class="form-control m-b" th:with="type=${@dict.getType('sys_meeting_state')}">
+              <option value="">---请选择---</option>
+              <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{meetingState}"></option>
+            </select>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-sm-12">
+        <div class="form-group">
+          <label class="col-sm-2 control-label is-required">上传文件:</label>
+          <div class="fileinput fileinput-new col-sm-10" data-provides="fileinput">
+            <span class="btn btn-white btn-file">
+                <span disabled="disabled" class="fileinput-new">选择文件</span>
+                <span disabled="disabled" class="fileinput-exists">更改</span>
+                <input disabled="disabled" type="file" id="fileUrlId" name="...">
+                <input disabled="disabled" type="hidden" id="fileUrl" name="fileUrl" th:field="*{fileUrl}">
+                <input disabled="disabled" type="hidden" id="fileName" name="fileName" th:field="*{fileName}">
+            </span>
+            <span disabled="disabled" class="fileinput-filename">[[*{fileName}]]</span>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-sm-12">
+        <div class="form-group">
+          <label class="col-sm-2 control-label">会议纪要:</label>
+          <div class="col-sm-10">
+            <textarea name="summary" disabled="disabled" placeholder="请输入会议纪要" th:field="*{summary}" class="form-control"></textarea>
+          </div>
+        </div>
+      </div>
+    </div>
+  </form>
+</div>
+<th:block th:include="include :: footer" />
+<th:block th:include="include :: datetimepicker-js" />
+<th:block th:include="include :: jasny-bootstrap-js" />
+<script th:inline="javascript">
+  var prefix = ctx + "system/tdmeeting"
+  $("#form-meeting-add").validate({
+    focusCleanup: true
+  });
+  function submitHandler() {
+    if ($.validate.form()) {
+      $.operate.save(prefix + "/edit", $('#form-meeting-add').serialize());
+    }
+  }
+  $("input[name='meetingTime']").datetimepicker({
+    format: "yyyy-mm-dd",
+    minView: "month",
+    autoclose: true
+  });
+  //文件上传
+  $('#fileUrlId').on('change.bs.fileinput ', function (e) {
+    // 处理自己的业务
+    var file = e.target.files[0];
+    var data = new FormData();
+    data.append("file", file);
+    $.ajax({
+      type: "POST",
+      url: ctx + "common/upload",
+      data: data,
+      cache: false,
+      contentType: false,
+      processData: false,
+      dataType: 'json',
+      success: function(result) {
+        if (result.code == web_status.SUCCESS) {
+          $("#fileUrl").val(result.url);
+          $("#fileName").val(result.originalFilename);
+        } else {
+          $("#fileUrl").val("");
+          $("#fileName").val("");
+        }
+      },
+      error: function(error) {
+        $.modal.alertWarning("文件上传失败。");
+      }
+    });
+
+  });
+</script>
+</body>
+</html>
diff --git a/ruoyi-admin/src/main/resources/templates/system/tdmeeting/edit.html b/ruoyi-admin/src/main/resources/templates/system/tdmeeting/edit.html
new file mode 100644
index 0000000..f5c6399
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/system/tdmeeting/edit.html
@@ -0,0 +1,161 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增涉密会议')" />
+    <th:block th:include="include :: datetimepicker-css" />
+    <th:block th:include="include :: jasny-bootstrap-css" />
+</head>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content" id="app">
+    <form class="form-horizontal m" id="form-meeting-add" th:object="${meeting}">
+        <input name="userId"  type="hidden" th:field="*{id}" />
+        <div class="row">
+            <div class="col-sm-12">
+                <div class="form-group">
+                    <label class="col-sm-2 control-label is-required">会议主题:</label>
+                    <div class="col-sm-10">
+                        <input name="meetingTitle" required placeholder="请输入会议主题" th:field="*{meetingTitle}" class="form-control m-b" type="text">
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label is-required">会议时间:</label>
+                    <div class="col-sm-8">
+                        <input type="text" class="form-control m-b" placeholder="请选择会议时间" th:value="${#dates.format(meeting.meetingTime, 'yyyy-MM-dd')}" name="meetingTime"></input>
+                    </div>
+                </div>
+            </div>
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">会议地点:</label>
+                    <div class="col-sm-8">
+                        <input type="text" class="form-control m-b" placeholder="请输入会议地点" th:field="*{meetingAddress}" name="meetingAddress"></input>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">参会人数:</label>
+                    <div class="col-sm-8">
+                        <input type="text" class="form-control m-b" digits="true" placeholder="请输入参会人数" th:field="*{meetingUsernum}" name="meetingUsernum"></input>
+                    </div>
+                </div>
+            </div>
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">主办方:</label>
+                    <div class="col-sm-8">
+                        <input type="text" class="form-control m-b" placeholder="请输入主办方" th:field="*{meetingHost}" name="meetingHost"></input>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label is-required">会议类型:</label>
+                    <div class="col-sm-8">
+                        <select name="meetingType" required class="form-control m-b" th:with="type=${@dict.getType('sys_meeting_type')}">
+                            <option value="">---请选择---</option>
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{meetingType}"></option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-4 control-label is-required">会议状态:</label>
+                    <div class="col-sm-8">
+                        <select name="meetingState" required class="form-control m-b" th:with="type=${@dict.getType('sys_meeting_state')}">
+                            <option value="">---请选择---</option>
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{meetingState}"></option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-sm-12">
+                <div class="form-group">
+                    <label class="col-sm-2 control-label is-required">上传文件:</label>
+                    <div class="fileinput fileinput-new col-sm-10" data-provides="fileinput">
+                        <span class="btn btn-white btn-file">
+                            <span class="fileinput-new">选择文件</span>
+                            <span class="fileinput-exists">更改</span>
+                            <input type="file" id="fileUrlId" name="...">
+                            <input type="hidden" id="fileUrl" name="fileUrl" th:field="*{fileUrl}">
+                            <input type="hidden" id="fileName" name="fileName" th:field="*{fileName}">
+                        </span>
+                        <span class="fileinput-filename">[[*{fileName}]]</span>
+                        <a href="#" class="close fileinput-exists" data-dismiss="fileinput" style="float: none">&times;</a>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-sm-12">
+                <div class="form-group">
+                    <label class="col-sm-2 control-label">会议纪要:</label>
+                    <div class="col-sm-10">
+                        <textarea name="summary" placeholder="请输入会议纪要" th:field="*{summary}" class="form-control"></textarea>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </form>
+</div>
+<th:block th:include="include :: footer" />
+<th:block th:include="include :: datetimepicker-js" />
+<th:block th:include="include :: jasny-bootstrap-js" />
+<script th:inline="javascript">
+    var prefix = ctx + "system/tdmeeting"
+    $("#form-meeting-add").validate({
+        focusCleanup: true
+    });
+    function submitHandler() {
+        if ($.validate.form()) {
+            $.operate.save(prefix + "/edit", $('#form-meeting-add').serialize());
+        }
+    }
+    $("input[name='meetingTime']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+    //文件上传
+    $('#fileUrlId').on('change.bs.fileinput ', function (e) {
+        // 处理自己的业务
+        var file = e.target.files[0];
+        var data = new FormData();
+        data.append("file", file);
+        $.ajax({
+            type: "POST",
+            url: ctx + "common/upload",
+            data: data,
+            cache: false,
+            contentType: false,
+            processData: false,
+            dataType: 'json',
+            success: function(result) {
+                if (result.code == web_status.SUCCESS) {
+                    $("#fileUrl").val(result.url);
+                    $("#fileName").val(result.originalFilename);
+                } else {
+                    $("#fileUrl").val("");
+                    $("#fileName").val("");
+                }
+            },
+            error: function(error) {
+                $.modal.alertWarning("文件上传失败。");
+            }
+        });
+
+    });
+</script>
+</body>
+</html>
diff --git a/ruoyi-admin/src/main/resources/templates/system/tdmeeting/tdmeeting.html b/ruoyi-admin/src/main/resources/templates/system/tdmeeting/tdmeeting.html
index 9cacba8..9b4312d 100644
--- a/ruoyi-admin/src/main/resources/templates/system/tdmeeting/tdmeeting.html
+++ b/ruoyi-admin/src/main/resources/templates/system/tdmeeting/tdmeeting.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
-    <th:block th:include="include :: header('涉密人员培训列表')" />
+    <th:block th:include="include :: header('涉密会议登记')" />
 </head>
 <body class="gray-bg">
      <div class="container-div" id="app">
@@ -11,26 +11,19 @@
                     <div class="select-list">
                         <ul>
                             <li>
-                                <label>人员名称:</label>
-                                <input type="text" name="trainName"/>
+                                <label>主题:</label>
+                                <input type="text" name="meetingTitle"/>
                             </li>
-                             <li>
-                                 <label>所属地区:</label>
-                                 <select id="City" name="AREAID" @change="getAreaList()" v-model="City">
-                                     <option value="">请选择</option>
-                                     <option v-for="option in CityList" :value="option.id" :key="option.id">
-                                         {{ option.name }}
-                                     </option>
-                                 </select>
-                             </li>
                             <li>
-                                <label>培训日期:</label>
-                                <input type="text" class="time-input" placeholder="请选择培训日期" name="trainDate"/>
+                                <label>会议类型:</label>
+                                <select name="meetingType" th:with="type=${@dict.getType('sys_meeting_type')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
                             </li>
-
                             <li>
-                                <label>培训状态:</label>
-                                <select name="trainState" th:with="type=${@dict.getType('sys_examine_state')}">
+                                <label>会议状态:</label>
+                                <select name="meetingState" th:with="type=${@dict.getType('sys_meeting_state')}">
                                     <option value="">所有</option>
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                                 </select>
@@ -45,18 +38,18 @@
             </div>
 
             <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:train:add">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:tdmeeting:add">
                     <i class="fa fa-plus"></i> 记录
                 </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:train:edit">
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:tdmeeting:edit">
                     <i class="fa fa-edit"></i> 修改
                 </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:train:remove">
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:tdmeeting:remove">
                     <i class="fa fa-remove"></i> 删除
                 </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:train:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
+<!--                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:tdmeeting:export">-->
+<!--                    <i class="fa fa-download"></i> 导出-->
+<!--                </a>-->
             </div>
             <div class="col-sm-12 select-table table-striped">
                 <table id="bootstrap-table"></table>
@@ -65,31 +58,12 @@
     </div>
     <th:block th:include="include :: footer" />
     <script th:inline="javascript">
-        var detailFlag = [[${@permission.hasPermi('system:train:detail')}]];
-        var editFlag = [[${@permission.hasPermi('system:train:edit')}]];
-        var examineFlag = [[${@permission.hasPermi('system:train:examine')}]];
-        var removeFlag = [[${@permission.hasPermi('system:train:remove')}]];
-        var trainTypeDatas = [[${@dict.getType('sys_usertrain_typer')}]];
-        var trainSubjectDatas = [[${@dict.getType('sys_usertrain_obj')}]];
-        var trainStateDatas = [[${@dict.getType('sys_examine_state')}]];
-        var prefix = ctx + "system/train";
-        let datas = []
-        $.ajax({
-            url: ctx + "system/area/getAllList",
-            type: 'GET',
-            data:{parentId:''} ,
-            success:((res)=>{
-                datas = res.data
-            }) ,
-        });
-        let userList = []
-        $.ajax({
-            url: ctx + "system/user/list",
-            type: 'POST',
-            success:((res)=>{
-                userList = res.rows
-            }) ,
-        });
+        var detailFlag = [[${@permission.hasPermi('system:tdmeeting:detail')}]];
+        var editFlag = [[${@permission.hasPermi('system:tdmeeting:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('system:tdmeeting:remove')}]];
+        var meetingState = [[${@dict.getType('sys_meeting_state')}]];
+        var meetingType = [[${@dict.getType('sys_meeting_type')}]];
+        var prefix = ctx + "system/tdmeeting";
         $(function() {
             var options = {
                 url: prefix + "/list",
@@ -98,7 +72,7 @@
                 detailUrl: prefix + "/detail/{id}",
                 removeUrl: prefix + "/remove",
                 exportUrl: prefix + "/export",
-                modalName: "涉密人员培训",
+                modalName: "涉密会议登记",
                 columns: [{
                     checkbox: true
                 },
@@ -108,179 +82,60 @@
                     visible: false
                 },
                 {
-                    field: 'areaid',
-                    title: '所属地市',
-                    visible: false,
-                    formatter: function(value, row, index) {
-                        return getCity(datas, value)
-                    }
-
+                    field: 'meetingTitle',
+                    title: '主题',
                 },
                 {
-                    field: 'trainName',
-                    title: '培训人员'
-                },
-                {
-                    field: 'framework',
-                    title: '所属区县',
-                    visible: false,
+                    field: 'meetingTime',
+                    title: '时间',
                     formatter: function(value, row, index) {
-                        return getCity(datas, value)
+                        if (value !== null){
+                            // 将字符串转换为日期对象
+                            var date = new Date(value);
+                            // 格式化日期为 YYYY-MM-DD
+                            var year = date.getFullYear();
+                            var month = ('0' + (date.getMonth() + 1)).slice(-2);
+                            var day = ('0' + date.getDate()).slice(-2);
+                            return year + '-' + month + '-' + day;
+                        }
                     }
                 },
                 {
-                    field: 'username',
-                    title: '人员姓名',
-                    formatter:function (value, row, index) {
-                        return getUser(userList,value)
-                    }
+                    field: 'meetingAddress',
+                    title: '地点',
                 },
                 {
-                    field: 'deptName',
-                    title: '单位名称',
-                    visible: false
+                    field: 'meetingUsernum',
+                    title: '参会人数',
                 },
                 {
-                    field: 'trainType',
-                    title: '培训类型',
+                    field: 'meetingType',
+                    title: '会议类型',
                     formatter: function(value, row, index) {
-                       return $.table.selectDictLabel(trainTypeDatas, value);
+                       return $.table.selectDictLabel(meetingType, value);
                     }
                 },
                 {
-                    field: 'trainSubject',
-                    title: '培训对象',
+                    field: 'meetingState',
+                    title: '会议状态',
                     formatter: function(value, row, index) {
-                       return $.table.selectDictLabel(trainSubjectDatas, value);
+                       return $.table.selectDictLabel(meetingState, value);
                     }
                 },
-                {
-                    field: 'trainAddress',
-                    title: '培训地点'
-                },
-                {
-                    field: 'trainDate',
-                    title: '培训开始日期'
-                },
-                {
-                    field: 'trainTimeend',
-                    title: '培训结束日期'
-                },
-                {
-                    field: 'createStaffid',
-                    title: '创建人',
-                    visible: false
-                },
-                {
-                    field: 'createDepartid',
-                    title: '创建单位',
-                    visible: false
-                },
-                {
-                    field: 'createDate',
-                    title: '创建日期',
-                    visible: false
-                },
-                {
-                    field: 'updateDepartid',
-                    title: '更新单位',
-                    visible: false
-                },
-                {
-                    field: 'updateStaffid',
-                    title: '审核人员'//
-                },
-                {
-                    field: 'updateDate',
-                    title: '审核时间',
-                    visible: false
-                },
-                {
-                    field: 'trainState',
-                    title: '培训状态',//
-                    formatter: function(value, row, index) {
-                       return $.table.selectDictLabel(trainStateDatas, value);
-                    }
-                },
-                {
-                    field: 'part',
-                    title: '部门',
-                    visible: false
-                },
-                {
-                    field: 'traininfo',
-                    title: '培训评价',//
-                    visible: false
-                },
                 {
                     title: '操作',
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
-                        if (row.trainState === 2){
-                            actions.push('<a class="btn btn-warning btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-search"></i>详细</a> ');
-                            actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                            actions.push('<a class="btn btn-success btn-xs ' + examineFlag + '" href="javascript:void(0)" onclick="examine(\'' + row.id + '\')"><i class="fa fa-edit"></i>审核</a> ');
-                            actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
-                        }else{
-                            actions.push('<a class="btn btn-warning btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-search"></i>详细</a> ');
-                            actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                            actions.push('<a disabled class="btn btn-success btn-xs ' + examineFlag + '" href="javascript:void(0)"><i class="fa fa-edit"></i>审核</a> ');
-                            actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
-                        }
+                        actions.push('<a class="btn btn-warning btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-search"></i>详细</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
                         return actions.join('');
                     }
                 }]
             };
             $.table.init(options);
         });
-        function examine(id) {
-            var url = prefix + '/examine/' + id;
-            $.modal.open("涉密人员培训审核", url);
-        }
-        function getUser(datas,value){
-            if ($.common.isEmpty(datas) || $.common.isEmpty(value)) {
-                return '';
-            }
-            var actions = []
-            $.each(datas, function(index, user) {
-                if (user.userId ==  value) {
-                    actions.push($.common.sprintf("<span>%s</span>", user.userName));
-                    return false;
-                }
-            });
-            if (actions.length === 0) {
-                actions.push($.common.sprintf("<span>%s</span>", value))
-            }
-            return actions.join('');
-        }
-
-        var app = new Vue({
-            el: '#app',
-            data: {
-                CityList: [],
-                City:'',
-                params:{
-                    parentId:'',
-                }
-            },
-            mounted(){
-                // 初始化地市列表
-                this.getCityList();
-            },
-            methods:{
-                getCityList(){
-                    $.ajax({
-                        url: ctx + "system/area/getSysAreaList",
-                        type: 'GET',
-                        data:this.params ,
-                        success:((res)=>{
-                            this.CityList = res.data
-                        }) ,
-                    });
-                },
-            }
-        })
     </script>
 </body>
 </html>