From 722ca77449c7a383f8d141d54f8041cebd7b9546 Mon Sep 17 00:00:00 2001 From: weizhiqiang <598748873@qq.com> Date: Sat, 17 Dec 2022 12:52:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=AF=B9=E8=B1=A1=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E4=BF=A1=E6=81=AF=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/js/classServer/classServer.js | 11 +-- .../js/classServer/classServerDetails.js | 36 ++++++++++ .../template/tpl/classServer/classServer.html | 2 +- .../tpl/classServer/classServerDetails.html | 67 +++++++++++++++++++ .../layui/customer/common/systemCommonUtil.js | 3 + .../winui/css/customer/ztree/common-tree.css | 2 +- .../template/json/skyeyeClassEnum.json | 2 + 7 files changed, 116 insertions(+), 7 deletions(-) create mode 100644 base-server/src/main/resources/template/js/classServer/classServerDetails.js create mode 100644 base-server/src/main/resources/template/tpl/classServer/classServerDetails.html diff --git a/base-server/src/main/resources/template/js/classServer/classServer.js b/base-server/src/main/resources/template/js/classServer/classServer.js index df4f19e68..d384860c5 100644 --- a/base-server/src/main/resources/template/js/classServer/classServer.js +++ b/base-server/src/main/resources/template/js/classServer/classServer.js @@ -26,18 +26,19 @@ layui.config({ // 异步加载的方法 function onClickTree(event, treeId, treeNode) { - console.log(treeNode); + if (treeNode.level != 3) { + return false; + } tabPageUtil.init({ id: 'tab', prefixData: [{ title: '详情', - pageUrl: '../../tpl/customerManage/customerDetails.html' + pageUrl: '../../tpl/classServer/classServerDetails.html' }], + suffixData: null, element: layui.element, - objectType: "1", object: { - objectId: objectId, - objectKey: objectKey, + objectId: treeNode.id } }); } diff --git a/base-server/src/main/resources/template/js/classServer/classServerDetails.js b/base-server/src/main/resources/template/js/classServer/classServerDetails.js new file mode 100644 index 000000000..59ccf3dec --- /dev/null +++ b/base-server/src/main/resources/template/js/classServer/classServerDetails.js @@ -0,0 +1,36 @@ + +var objectId = ""; + +layui.config({ + base: basePath, + version: skyeyeVersion +}).extend({ + window: 'js/winui.window' +}).define(['window', 'jquery', 'winui', 'form'], function (exports) { + winui.renderColor(); + var index = parent.layer.getFrameIndex(window.name); + var $ = layui.$, + form = layui.form; + + objectId = GetUrlParam("objectId"); + if (isNull(objectId)) { + winui.window.msg("请传入适用对象信息", {icon: 2, time: 2000}); + return false; + } + + showGrid({ + id: "showForm", + url: reqBasePath + "queryServiceClass", + params: {className: objectId}, + pagination: false, + method: 'GET', + template: $("#beanTemplate").html(), + ajaxSendLoadBefore: function (hdb, json) { + json.bean.tenantName = skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("tenantEnum", 'enumFiledName', json.bean.tenant, 'name'); + }, + ajaxSendAfter: function (json) { + matchingLanguage(); + form.render(); + } + }); +}); \ No newline at end of file diff --git a/base-server/src/main/resources/template/tpl/classServer/classServer.html b/base-server/src/main/resources/template/tpl/classServer/classServer.html index 0efdaf5f5..5a0ca884e 100644 --- a/base-server/src/main/resources/template/tpl/classServer/classServer.html +++ b/base-server/src/main/resources/template/tpl/classServer/classServer.html @@ -10,7 +10,7 @@
-
+
    diff --git a/base-server/src/main/resources/template/tpl/classServer/classServerDetails.html b/base-server/src/main/resources/template/tpl/classServer/classServerDetails.html new file mode 100644 index 000000000..588b668be --- /dev/null +++ b/base-server/src/main/resources/template/tpl/classServer/classServerDetails.html @@ -0,0 +1,67 @@ + + + + + + + + + +
    +
    + +
    +
    + + + + + + + + \ No newline at end of file diff --git a/web/src/main/resources/template/assets/lib/layui/customer/common/systemCommonUtil.js b/web/src/main/resources/template/assets/lib/layui/customer/common/systemCommonUtil.js index f2fdba9bc..2de478b7d 100644 --- a/web/src/main/resources/template/assets/lib/layui/customer/common/systemCommonUtil.js +++ b/web/src/main/resources/template/assets/lib/layui/customer/common/systemCommonUtil.js @@ -781,6 +781,9 @@ var tabPageUtil = { init: function (_config) { tabPageUtil.config = $.extend(true, tabPageUtil.config, _config); + if (_config.suffixData == null) { + tabPageUtil.config.suffixData = []; + } // 获取页面信息 var pageList = teamObjectPermissionUtil.getPageUrl(tabPageUtil.config.objectType); diff --git a/web/src/main/resources/template/assets/lib/winui/css/customer/ztree/common-tree.css b/web/src/main/resources/template/assets/lib/winui/css/customer/ztree/common-tree.css index ae683753a..09bd9e0db 100644 --- a/web/src/main/resources/template/assets/lib/winui/css/customer/ztree/common-tree.css +++ b/web/src/main/resources/template/assets/lib/winui/css/customer/ztree/common-tree.css @@ -3,7 +3,7 @@ color: white; padding: 0px; margin-top: 10px; - height: calc(100% - 10px); + height: calc(100% - 45px); overflow-y: auto; overflow-x: hidden; } diff --git a/web/src/main/resources/template/json/skyeyeClassEnum.json b/web/src/main/resources/template/json/skyeyeClassEnum.json index 7f2f82d4b..5dbcf7636 100644 --- a/web/src/main/resources/template/json/skyeyeClassEnum.json +++ b/web/src/main/resources/template/json/skyeyeClassEnum.json @@ -23,6 +23,8 @@ "skyeyeView": {"name": "视图枚举", "className": "skyeye-pro#com.skyeye.common.SkyeyeViewEnum"}, + "tenantEnum": {"name": "租户枚举", "className": "skyeye-pro#com.skyeye.common.enumeration.TenantEnum"}, + "teamObjectType": {"name": "团队适用对象枚举", "className": "skyeye-pro#com.skyeye.team.classenum.TeamObjectTypeEnum"}, "contactsAuthEnum": {"name": "联系人权限", "className": "skyeye-pro#com.skyeye.contacts.classenum.ContactsAuthEnum", "pageUrl": "../../tpl/contacts/contactsList.html"}, "catalogAuthEnum": {"name": "目录权限", "className": "skyeye-pro#com.skyeye.catalog.classenum.CatalogAuthEnum"}, -- GitLab