From fdd2bc530e9d5bd02f72c1ddca046ca92e9ae458 Mon Sep 17 00:00:00 2001 From: duxp Date: Tue, 5 Sep 2023 17:17:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=B8=B8=E5=92=8C=E5=B9=B4=E5=BA=A6?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=91=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/static/ruoyi/js/ry-ui.js | 2 +- .../templates/base/affairs/affairs.html | 175 +++++----------- .../resources/templates/base/affairs/day.html | 185 ++++++++++++----- .../templates/base/affairs/year.html | 187 +++++++++++++----- 4 files changed, 322 insertions(+), 227 deletions(-) diff --git a/cyx-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/cyx-admin/src/main/resources/static/ruoyi/js/ry-ui.js index 2a306cb..1c0ab1f 100644 --- a/cyx-admin/src/main/resources/static/ruoyi/js/ry-ui.js +++ b/cyx-admin/src/main/resources/static/ruoyi/js/ry-ui.js @@ -1391,7 +1391,7 @@ var table = { view: options.view, data: options.data }; - $.get(options.url, function(data) { + $.get(options.url,options.data?options.data:{}, function(data) { var treeId = $("#treeId").val(); tree = $.fn.zTree.init($("#" + options.id), setting, data); $._tree = tree; diff --git a/cyx-admin/src/main/resources/templates/base/affairs/affairs.html b/cyx-admin/src/main/resources/templates/base/affairs/affairs.html index f9ba565..13f215f 100644 --- a/cyx-admin/src/main/resources/templates/base/affairs/affairs.html +++ b/cyx-admin/src/main/resources/templates/base/affairs/affairs.html @@ -2,83 +2,59 @@ - - -
-
-
-
- 组织机构 +
+
+
+
+
+
    + + + +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
-
- - - - -
-
-
-
-
+
-
-
-
-
-
-
-
-
    - - - -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • -  搜索 -  重置 -
    • -
-
-
-
- -
-
-
-
+ +
+
+
- - diff --git a/cyx-admin/src/main/resources/templates/base/affairs/day.html b/cyx-admin/src/main/resources/templates/base/affairs/day.html index 9fc7a05..4b4cf72 100644 --- a/cyx-admin/src/main/resources/templates/base/affairs/day.html +++ b/cyx-admin/src/main/resources/templates/base/affairs/day.html @@ -2,60 +2,85 @@ + + -
-
-
-
-
-
    - -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • -  搜索 -  重置 -
    • -
-
-
+
+
+
+
+ 组织机构 +
+
+ + + + +
- - -
-
+
+
+
+
+
+
+
+
+
    + +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+
+ + + \ No newline at end of file diff --git a/cyx-admin/src/main/resources/templates/base/affairs/year.html b/cyx-admin/src/main/resources/templates/base/affairs/year.html index 22dfffc..e3df6e5 100644 --- a/cyx-admin/src/main/resources/templates/base/affairs/year.html +++ b/cyx-admin/src/main/resources/templates/base/affairs/year.html @@ -2,60 +2,85 @@ + + -
-
-
-
-
-
    - -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • -  搜索 -  重置 -
    • -
+
+
+
+
+ 组织机构
- -
- - -
-
+
+ + + + +
+
+
+
+
-
+
+
+
+
+
+
+
    + +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+
+ + + \ No newline at end of file