提交 160d97b9 编写于 作者: Skyeye云's avatar Skyeye云

桌面管理,菜单管理,前端服务管理整改

上级 ee76eb4a
...@@ -10,6 +10,7 @@ layui.config({ ...@@ -10,6 +10,7 @@ layui.config({
var index = parent.layer.getFrameIndex(window.name); var index = parent.layer.getFrameIndex(window.name);
var $ = layui.$; var $ = layui.$;
skyeyeClassEnumUtil.showEnumDataListByClassName("commonEnable", 'radio', "enabled", '', form);
// 初始化上传 // 初始化上传
$("#logo").upload(systemCommonUtil.uploadCommon003Config('logo', 12, '', 1)); $("#logo").upload(systemCommonUtil.uploadCommon003Config('logo', 12, '', 1));
matchingLanguage(); matchingLanguage();
...@@ -17,10 +18,9 @@ layui.config({ ...@@ -17,10 +18,9 @@ layui.config({
form.on('submit(formAddBean)', function (data) { form.on('submit(formAddBean)', function (data) {
if (winui.verifyForm(data.elem)) { if (winui.verifyForm(data.elem)) {
var params = { var params = {
desktopName: $("#desktopName").val(), name: $("#name").val(),
desktopCnName: $("#desktopCnName").val(),
desktopCode: $("#code").val(), desktopCode: $("#code").val(),
state: $("input[name='state']:checked").val(), enabled: $("#enabled input:radio:checked").val(),
appPageUrl: $("#appPageUrl").val(), appPageUrl: $("#appPageUrl").val(),
logo: $("#logo").find("input[name='upload']").attr("oldurl") logo: $("#logo").find("input[name='upload']").attr("oldurl")
}; };
......
...@@ -18,7 +18,7 @@ layui.config({ ...@@ -18,7 +18,7 @@ layui.config({
method: "GET", method: "GET",
template: $("#beanTemplate").html(), template: $("#beanTemplate").html(),
ajaxSendAfter:function (json) { ajaxSendAfter:function (json) {
$("input:radio[name=state][value=" + json.bean.state + "]").attr("checked", true); skyeyeClassEnumUtil.showEnumDataListByClassName("commonEnable", 'radio', "enabled", json.bean.enabled, form);
// 初始化上传 // 初始化上传
$("#logo").upload(systemCommonUtil.uploadCommon003Config('logo', 12, json.bean.logo, 1)); $("#logo").upload(systemCommonUtil.uploadCommon003Config('logo', 12, json.bean.logo, 1));
matchingLanguage(); matchingLanguage();
...@@ -27,10 +27,9 @@ layui.config({ ...@@ -27,10 +27,9 @@ layui.config({
if (winui.verifyForm(data.elem)) { if (winui.verifyForm(data.elem)) {
var params = { var params = {
id: parent.rowId, id: parent.rowId,
desktopName: $("#desktopName").val(), name: $("#name").val(),
desktopCnName: $("#desktopCnName").val(),
desktopCode: $("#code").val(), desktopCode: $("#code").val(),
state: $("input[name='state']:checked").val(), enabled: $("#enabled input:radio:checked").val(),
appPageUrl: $("#appPageUrl").val(), appPageUrl: $("#appPageUrl").val(),
logo: $("#logo").find("input[name='upload']").attr("oldurl") logo: $("#logo").find("input[name='upload']").attr("oldurl")
}; };
......
...@@ -25,8 +25,7 @@ layui.config({ ...@@ -25,8 +25,7 @@ layui.config({
limit: getLimit(), limit: getLimit(),
cols: [[ cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
{ field: 'desktopName', title: '桌面名称', align: 'left', width: 150 }, { field: 'name', title: '桌面名称', align: 'left', width: 150 },
{ field: 'desktopCnName', title: '英文名称', align: 'left', width: 150 },
{ field: 'code', title: '编码', align: 'left', width: 120 }, { field: 'code', title: '编码', align: 'left', width: 120 },
{ field: 'logo', title: 'LOGO', align: 'center', width: 60, templet: function (d) { { field: 'logo', title: 'LOGO', align: 'center', width: 60, templet: function (d) {
if(isNull(d.logo)){ if(isNull(d.logo)){
...@@ -37,12 +36,8 @@ layui.config({ ...@@ -37,12 +36,8 @@ layui.config({
}}, }},
{ field: 'allNum', title: '菜单数量', align: 'center', width: 100 }, { field: 'allNum', title: '菜单数量', align: 'center', width: 100 },
{ field: 'orderBy', title: '序号', align: 'center', width: 80 }, { field: 'orderBy', title: '序号', align: 'center', width: 80 },
{ field: 'state', title: '状态', width: 80, align: 'center', templet: function (d) { { field: 'enabled', title: '状态', width: 80, align: 'center', templet: function (d) {
if(d.state == '2'){ return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("commonEnable", 'id', d.enabled, 'name');
return "<span class='state-down'>禁用</span>";
} else if (d.state == '1'){
return "<span class='state-up'>启用</span>";
}
}}, }},
{ field: 'appPageUrl', title: 'APP跳转地址', align: 'left', width: 180 }, { field: 'appPageUrl', title: 'APP跳转地址', align: 'left', width: 180 },
{ field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], width: 120 }, { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], width: 120 },
...@@ -145,8 +140,6 @@ layui.config({ ...@@ -145,8 +140,6 @@ layui.config({
} }
form.render(); form.render();
// 刷新数据
$("body").on("click", "#reloadTable", function() { $("body").on("click", "#reloadTable", function() {
loadTable(); loadTable();
}); });
......
...@@ -26,7 +26,7 @@ layui.config({ ...@@ -26,7 +26,7 @@ layui.config({
// 所属系统 // 所属系统
showGrid({ showGrid({
id: "menuSysWinId", id: "sysWinId",
url: reqBasePath + "querySysEveWinList", url: reqBasePath + "querySysEveWinList",
params: {}, params: {},
pagination: false, pagination: false,
...@@ -39,7 +39,7 @@ layui.config({ ...@@ -39,7 +39,7 @@ layui.config({
}); });
// 菜单类型变化事件 // 菜单类型变化事件
form.on('radio(menuLevel)', function (data) { form.on('radio(level)', function (data) {
var val = data.value; var val = data.value;
if (val == 0) { if (val == 0) {
$("#lockParentSel").html(""); $("#lockParentSel").html("");
...@@ -53,17 +53,16 @@ layui.config({ ...@@ -53,17 +53,16 @@ layui.config({
form.on('submit(formAddMenu)', function (data) { form.on('submit(formAddMenu)', function (data) {
if (winui.verifyForm(data.elem)) { if (winui.verifyForm(data.elem)) {
var menuLevel = $("input[name='menuLevel']:checked").val(); var level = $("input[name='level']:checked").val();
var params = { var params = {
menuName: $("#menuName").val(), name: $("#name").val(),
menuNameEn: $("#menuNameEn").val(), sysWinId: $("#sysWinId").val(),
sysWinId: $("#menuSysWinId").val(),
desktopId: $("#desktop").val(), desktopId: $("#desktop").val(),
menuUrl: $("#menuUrl").val(), pageUrl: $("#pageUrl").val(),
menuType: $("input[name='menuType']:checked").val(), type: $("input[name='type']:checked").val(),
menuLevel: menuLevel, level: level,
parentId: menuLevel == 0 ? "0" : $("#menuParent").val(), parentId: level == 0 ? "0" : $("#menuParent").val(),
menuSysType: $("input[name='menuSysType']:checked").val(), sysType: $("input[name='sysType']:checked").val(),
isShare: $("input[name='isShare']:checked").val(), isShare: $("input[name='isShare']:checked").val(),
}; };
...@@ -72,7 +71,7 @@ layui.config({ ...@@ -72,7 +71,7 @@ layui.config({
if (!params["iconChooseResult"]) { if (!params["iconChooseResult"]) {
return false; return false;
} }
AjaxPostUtil.request({url: reqBasePath + "sys007", params: params, type: 'json', callback: function(json) { AjaxPostUtil.request({url: reqBasePath + "writeMenu", params: params, type: 'json', method: 'POST', callback: function(json) {
parent.layer.close(index); parent.layer.close(index);
parent.refreshCode = '0'; parent.refreshCode = '0';
}}); }});
...@@ -85,7 +84,7 @@ layui.config({ ...@@ -85,7 +84,7 @@ layui.config({
AjaxPostUtil.request({url: reqBasePath + "sys009", params: {parentId: '0'}, type: 'json', method: 'GET', callback: function (json) { AjaxPostUtil.request({url: reqBasePath + "sys009", params: {parentId: '0'}, type: 'json', method: 'GET', callback: function (json) {
var str = '<select id="menuParent" lay-filter="selectParent" win-verify="required" lay-search=""><option value="">请选择</option>'; var str = '<select id="menuParent" lay-filter="selectParent" win-verify="required" lay-search=""><option value="">请选择</option>';
for(var i = 0; i < json.rows.length; i++){ for(var i = 0; i < json.rows.length; i++){
str += '<option value="' + json.rows[i].id + '">' + json.rows[i].desktopName + '---------' + json.rows[i].menuName + '</option>'; str += '<option value="' + json.rows[i].id + '">' + json.rows[i].sysDesktop.name + '---------' + json.rows[i].name + '</option>';
} }
str += '</select>'; str += '</select>';
$("#lockParentSel").append(str); $("#lockParentSel").append(str);
......
...@@ -21,9 +21,9 @@ layui.config({ ...@@ -21,9 +21,9 @@ layui.config({
$("#icon").html(systemCommonUtil.initIconShow(json.bean)); $("#icon").html(systemCommonUtil.initIconShow(json.bean));
if(json.bean.parentId == '0'){ if(json.bean.parentId == '0'){
$("#menuLevel").html("父菜单"); $("#level").html("父菜单");
} else { } else {
$("#menuLevel").html( "子菜单"); $("#level").html( "子菜单");
} }
matchingLanguage(); matchingLanguage();
form.render(); form.render();
......
...@@ -26,7 +26,6 @@ layui.config({ ...@@ -26,7 +26,6 @@ layui.config({
// 桌面信息 // 桌面信息
systemCommonUtil.getSysDesttop(function (data) { systemCommonUtil.getSysDesttop(function (data) {
// 加载账户数据
$("#desktop").html(getDataUseHandlebars(selOption, data)); $("#desktop").html(getDataUseHandlebars(selOption, data));
$("#desktop").val(json.bean.desktopId); $("#desktop").val(json.bean.desktopId);
form.render('select'); form.render('select');
...@@ -34,7 +33,7 @@ layui.config({ ...@@ -34,7 +33,7 @@ layui.config({
// 所属系统 // 所属系统
showGrid({ showGrid({
id: "menuSysWinId", id: "sysWinId",
url: reqBasePath + "querySysEveWinList", url: reqBasePath + "querySysEveWinList",
params: {}, params: {},
pagination: false, pagination: false,
...@@ -42,28 +41,28 @@ layui.config({ ...@@ -42,28 +41,28 @@ layui.config({
template: selOption, template: selOption,
ajaxSendLoadBefore: function(hdb) {}, ajaxSendLoadBefore: function(hdb) {},
ajaxSendAfter: function(j) { ajaxSendAfter: function(j) {
$("#menuSysWinId").val(json.bean.sysWinId); $("#sysWinId").val(json.bean.sysWinId);
form.render('select'); form.render('select');
} }
}); });
// 菜单类型 // 菜单类型
$("input:radio[name='menuLevel'][value='" + json.bean.menuLevel + "']").attr("checked", true); $("input:radio[name='level'][value='" + json.bean.level + "']").attr("checked", true);
if(json.bean.menuLevel == '0'){ if(json.bean.level == '0'){
$("#parentIdBox").addClass("layui-hide"); $("#parentIdBox").addClass("layui-hide");
} else { } else {
loadChildMenu(); loadChildMenu();
$("#menuParent").val(json.bean.parentId); $("#menuParent").val(json.bean.parentId);
} }
$("input:radio[name='menuType'][value='" + json.bean.menuType + "']").attr("checked", true); $("input:radio[name='type'][value='" + json.bean.type + "']").attr("checked", true);
$("input:radio[name='menuSysType'][value='" + json.bean.menuSysType + "']").attr("checked", true); $("input:radio[name='sysType'][value='" + json.bean.sysType + "']").attr("checked", true);
$("input:radio[name='isShare'][value='" + json.bean.isShare + "']").attr("checked", true); $("input:radio[name='isShare'][value='" + json.bean.isShare + "']").attr("checked", true);
matchingLanguage(); matchingLanguage();
form.render(); form.render();
// 菜单类型变化事件 // 菜单类型变化事件
form.on('radio(menuLevel)', function (data) { form.on('radio(level)', function (data) {
var val = data.value; var val = data.value;
if (val == 0) { if (val == 0) {
$("#lockParentSel").html(""); $("#lockParentSel").html("");
...@@ -77,17 +76,16 @@ layui.config({ ...@@ -77,17 +76,16 @@ layui.config({
form.on('submit(formEditMenu)', function (data) { form.on('submit(formEditMenu)', function (data) {
if (winui.verifyForm(data.elem)) { if (winui.verifyForm(data.elem)) {
var menuLevel = $("input[name='menuLevel']:checked").val(); var level = $("input[name='level']:checked").val();
var params = { var params = {
menuName: $("#menuName").val(), name: $("#name").val(),
menuNameEn: $("#menuNameEn").val(), sysWinId: $("#sysWinId").val(),
sysWinId: $("#menuSysWinId").val(),
desktopId: $("#desktop").val(), desktopId: $("#desktop").val(),
menuUrl: $("#menuUrl").val(), pageUrl: $("#pageUrl").val(),
menuType: $("input[name='menuType']:checked").val(), type: $("input[name='type']:checked").val(),
menuLevel: menuLevel, level: level,
parentId: menuLevel == 0 ? "0" : $("#menuParent").val(), parentId: level == 0 ? "0" : $("#menuParent").val(),
menuSysType: $("input[name='menuSysType']:checked").val(), sysType: $("input[name='sysType']:checked").val(),
isShare: $("input[name='isShare']:checked").val(), isShare: $("input[name='isShare']:checked").val(),
id: parent.rowId, id: parent.rowId,
}; };
...@@ -98,7 +96,7 @@ layui.config({ ...@@ -98,7 +96,7 @@ layui.config({
return false; return false;
} }
AjaxPostUtil.request({url: reqBasePath + "sys010", params: params, type: 'json', method: 'PUT', callback: function(json) { AjaxPostUtil.request({url: reqBasePath + "writeMenu", params: params, type: 'json', method: 'POST', callback: function(json) {
parent.layer.close(index); parent.layer.close(index);
parent.refreshCode = '0'; parent.refreshCode = '0';
}}); }});
...@@ -113,7 +111,7 @@ layui.config({ ...@@ -113,7 +111,7 @@ layui.config({
AjaxPostUtil.request({url: reqBasePath + "sys009", params: {parentId: '0'}, type: 'json', method: 'GET', callback: function (json) { AjaxPostUtil.request({url: reqBasePath + "sys009", params: {parentId: '0'}, type: 'json', method: 'GET', callback: function (json) {
var str = '<select id="menuParent" lay-filter="selectParent" win-verify="required" lay-search=""><option value="">请选择</option>'; var str = '<select id="menuParent" lay-filter="selectParent" win-verify="required" lay-search=""><option value="">请选择</option>';
for(var i = 0; i < json.rows.length; i++){ for(var i = 0; i < json.rows.length; i++){
str += '<option value="' + json.rows[i].id + '">' + json.rows[i].desktopName + '---------' + json.rows[i].menuName + '</option>'; str += '<option value="' + json.rows[i].id + '">' + json.rows[i].sysDesktop.name + '---------' + json.rows[i].name + '</option>';
} }
str += '</select>'; str += '</select>';
$("#lockParentSel").append(str); $("#lockParentSel").append(str);
......
...@@ -30,21 +30,25 @@ layui.config({ ...@@ -30,21 +30,25 @@ layui.config({
limits: getLimits(), limits: getLimits(),
limit: getLimit(), limit: getLimit(),
cols: [[ cols: [[
{ field: 'menuName', title: '菜单名称', width: 120 }, { field: 'name', title: '菜单名称', width: 120 },
{ field: 'menuNameEn', title: '英文名称', width: 150 },
{ field: 'id', title: '图标', align: 'center', width: 60, templet: function (d) { { field: 'id', title: '图标', align: 'center', width: 60, templet: function (d) {
return systemCommonUtil.initIconShow(d); return systemCommonUtil.initIconShow(d);
}}, }},
{ field: 'orderNum', title: '排序', align: 'center', width: 80 }, { field: 'orderNum', title: '排序', align: 'center', width: 80 },
{ field: 'menuLevel', title: '菜单类型', align: 'center', width: 100, templet: function (d) { { field: 'level', title: '菜单类型', align: 'center', width: 100, templet: function (d) {
return d.menuLevel == 0 ? '父菜单' : '子菜单'; return d.level == 0 ? '父菜单' : '子菜单';
}}, }},
{ field: 'desktopName', title: '所属桌面', width: 120 }, { field: 'desktopName', title: '所属桌面', width: 120, templet: function (d) {
if (isNull(d.sysDesktop)) {
return '';
}
return d.sysDesktop.name;
}},
{ field: 'isShare', title: '共享', align: 'center', width: 80, templet: function (d) { { field: 'isShare', title: '共享', align: 'center', width: 80, templet: function (d) {
return d.isShare == 0 ? '' : ''; return d.isShare == 0 ? '' : '';
}}, }},
{ field: 'menuParentName', title: '父菜单', width: 100 }, { field: 'parentName', title: '父菜单', width: 100 },
{ field: 'menuUrl', title: '菜单链接', width: 160 }, { field: 'pageUrl', title: '菜单链接', width: 160 },
{ field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], width: 120 }, { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], width: 120 },
{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 }, { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 },
{ field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 120 }, { field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 120 },
...@@ -60,7 +64,7 @@ layui.config({ ...@@ -60,7 +64,7 @@ layui.config({
}, { }, {
keyId: 'id', keyId: 'id',
keyPid: 'parentId', keyPid: 'parentId',
title: 'menuName', title: 'name',
}); });
tableTree.getTable().on('tool(messageTable)', function (obj) { tableTree.getTable().on('tool(messageTable)', function (obj) {
...@@ -109,7 +113,7 @@ layui.config({ ...@@ -109,7 +113,7 @@ layui.config({
function del(data, obj) { function del(data, obj) {
layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) { layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) {
layer.close(index); layer.close(index);
AjaxPostUtil.request({url: reqBasePath + "sys011", params: {rowId: data.id}, type: 'json', callback: function (json) { AjaxPostUtil.request({url: reqBasePath + "deleteMenuById", params: {id: data.id}, type: 'json', method: 'DELETE', callback: function (json) {
winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000}); winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
loadTable(); loadTable();
}}); }});
......
...@@ -19,7 +19,7 @@ layui.config({ ...@@ -19,7 +19,7 @@ layui.config({
form.on('submit(formAddBean)', function (data) { form.on('submit(formAddBean)', function (data) {
if (winui.verifyForm(data.elem)) { if (winui.verifyForm(data.elem)) {
var params = { var params = {
sysName: $("#sysName").val(), name: $("#name").val(),
content: $("#content").val(), content: $("#content").val(),
sysUrl: $("#sysUrl").val(), sysUrl: $("#sysUrl").val(),
}; };
......
...@@ -13,7 +13,7 @@ layui.config({ ...@@ -13,7 +13,7 @@ layui.config({
textool = layui.textool; textool = layui.textool;
AjaxPostUtil.request({url: reqBasePath + "sysevewin003", params: {id: parent.rowId}, type: 'json', method: "GET", callback: function (json) { AjaxPostUtil.request({url: reqBasePath + "sysevewin003", params: {id: parent.rowId}, type: 'json', method: "GET", callback: function (json) {
$("#sysName").val(json.bean.sysName); $("#name").val(json.bean.name);
$("#sysUrl").val(json.bean.sysUrl); $("#sysUrl").val(json.bean.sysUrl);
$("#content").val(json.bean.content); $("#content").val(json.bean.content);
textool.init({eleId: 'content', maxlength: 200}); textool.init({eleId: 'content', maxlength: 200});
...@@ -23,7 +23,7 @@ layui.config({ ...@@ -23,7 +23,7 @@ layui.config({
form.on('submit(formEditBean)', function (data) { form.on('submit(formEditBean)', function (data) {
if (winui.verifyForm(data.elem)) { if (winui.verifyForm(data.elem)) {
var params = { var params = {
sysName: $("#sysName").val(), name: $("#name").val(),
content: $("#content").val(), content: $("#content").val(),
sysUrl: $("#sysUrl").val(), sysUrl: $("#sysUrl").val(),
id: parent.rowId, id: parent.rowId,
......
...@@ -26,7 +26,7 @@ layui.config({ ...@@ -26,7 +26,7 @@ layui.config({
limit: getLimit(), limit: getLimit(),
cols: [[ cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
{ field: 'sysName', title: '名称', width: 180 }, { field: 'name', title: '名称', width: 180 },
{ field: 'sysUrl', title: '地址', width: 240 }, { field: 'sysUrl', title: '地址', width: 240 },
{ field: 'content', title: '介绍', width: 300 }, { field: 'content', title: '介绍', width: 300 },
{ field: 'menuNum', title: '菜单数量', width: 100 }, { field: 'menuNum', title: '菜单数量', width: 100 },
......
...@@ -13,18 +13,11 @@ ...@@ -13,18 +13,11 @@
<span class="hr-title">基本信息</span><hr> <span class="hr-title">基本信息</span><hr>
</div> </div>
<div class="layui-form-item layui-col-xs6"> <div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">中文名称<i class="red">*</i></label> <label class="layui-form-label">名称<i class="red">*</i></label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" id="desktopName" name="desktopName" win-verify="required" placeholder="请输入桌面名称" class="layui-input"/> <input type="text" id="name" name="name" win-verify="required" placeholder="请输入名称" class="layui-input"/>
<div class="layui-form-mid layui-word-aux">该名称在系统中唯一。</div> <div class="layui-form-mid layui-word-aux">该名称在系统中唯一。</div>
</div> </div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">英文名称<i class="red">*</i></label>
<div class="layui-input-block">
<input type="text" id="desktopCnName" name="desktopCnName" win-verify="required" placeholder="请输入英文名称" class="layui-input"/>
<div class="layui-form-mid layui-word-aux">该名称可重复。</div>
</div>
</div> </div>
<div class="layui-form-item layui-col-xs6"> <div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">编码<i class="red">*</i></label> <label class="layui-form-label">编码<i class="red">*</i></label>
...@@ -35,9 +28,8 @@ ...@@ -35,9 +28,8 @@
</div> </div>
<div class="layui-form-item layui-col-xs12"> <div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">状态<i class="red">*</i></label> <label class="layui-form-label">状态<i class="red">*</i></label>
<div class="layui-input-block winui-radio"> <div class="layui-input-block winui-radio" id="enabled">
<input type="radio" name="state" value="1" title="启用" lay-filter="state" checked="checked" />
<input type="radio" name="state" value="2" title="禁用" lay-filter="state" />
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs12"> <div class="layui-form-item layui-col-xs12">
......
...@@ -19,31 +19,23 @@ ...@@ -19,31 +19,23 @@
<span class="hr-title">基本信息</span><hr> <span class="hr-title">基本信息</span><hr>
</div> </div>
<div class="layui-form-item layui-col-xs6"> <div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">中文名称<i class="red">*</i></label> <label class="layui-form-label">名称<i class="red">*</i></label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" id="desktopName" name="desktopName" win-verify="required" placeholder="请输入桌面名称" class="layui-input" value="{{desktopName}}"/> <input type="text" id="name" name="name" win-verify="required" placeholder="请输入名称" class="layui-input" value="{{name}}"/>
<div class="layui-form-mid layui-word-aux">该名称在系统中唯一</div> <div class="layui-form-mid layui-word-aux">该名称在系统中唯一</div>
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">英文名称<i class="red">*</i></label>
<div class="layui-input-block">
<input type="text" id="desktopCnName" name="desktopCnName" win-verify="required" placeholder="请输入英文名称" class="layui-input" value="{{desktopCnName}}"/>
<div class="layui-form-mid layui-word-aux">该名称可重复</div>
</div>
</div>
<div class="layui-form-item layui-col-xs6"> <div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">编码<i class="red">*</i></label> <label class="layui-form-label">编码<i class="red">*</i></label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" id="code" name="code" win-verify="required" placeholder="请输入编码" class="layui-input" value="{{code}}"/> <input type="text" id="code" name="code" win-verify="required" placeholder="请输入编码" class="layui-input" value="{{desktopCode}}"/>
<div class="layui-form-mid layui-word-aux">该编码在系统中唯一例如ERP_DESKTOP</div> <div class="layui-form-mid layui-word-aux">该编码在系统中唯一例如ERP_DESKTOP</div>
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs12"> <div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">状态<i class="red">*</i></label> <label class="layui-form-label">状态<i class="red">*</i></label>
<div class="layui-input-block winui-radio"> <div class="layui-input-block winui-radio" id="enabled">
<input type="radio" name="state" value="1" title="启用" lay-filter="state" />
<input type="radio" name="state" value="2" title="禁用" lay-filter="state" />
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs12"> <div class="layui-form-item layui-col-xs12">
......
...@@ -12,13 +12,7 @@ ...@@ -12,13 +12,7 @@
<div class="layui-form-item layui-col-xs6"> <div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">菜单名称<i class="red">*</i></label> <label class="layui-form-label">菜单名称<i class="red">*</i></label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" id="menuName" name="menuName" win-verify="required" placeholder="请输入菜单名称" class="layui-input" /> <input type="text" id="name" name="name" win-verify="required" placeholder="请输入菜单名称" class="layui-input" />
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">英文名称<i class="red">*</i></label>
<div class="layui-input-block">
<input type="text" id="menuNameEn" name="menuNameEn" win-verify="required" placeholder="请输入英文名称" class="layui-input" />
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs12" id="iconMation"> <div class="layui-form-item layui-col-xs12" id="iconMation">
...@@ -27,7 +21,7 @@ ...@@ -27,7 +21,7 @@
<div class="layui-form-item layui-col-xs12"> <div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">菜单地址<i class="red">*</i></label> <label class="layui-form-label">菜单地址<i class="red">*</i></label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" id="menuUrl" name="menuUrl" win-verify="required" placeholder="请输入菜单地址" class="layui-input" /> <input type="text" id="pageUrl" name="pageUrl" win-verify="required" placeholder="请输入菜单地址" class="layui-input" />
<div class="layui-form-mid layui-word-aux">如果是一级菜单,格式为:--<br>如果是子菜单,格式为:../../tpl/model/modellist.html</div> <div class="layui-form-mid layui-word-aux">如果是一级菜单,格式为:--<br>如果是子菜单,格式为:../../tpl/model/modellist.html</div>
</div> </div>
</div> </div>
...@@ -42,7 +36,7 @@ ...@@ -42,7 +36,7 @@
<div class="layui-form-item layui-col-xs6"> <div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">所属服务<i class="red">*</i></label> <label class="layui-form-label">所属服务<i class="red">*</i></label>
<div class="layui-input-block"> <div class="layui-input-block">
<select id="menuSysWinId" name="menuSysWinId" class="menuSysWinId" win-verify="required" lay-filter="selectMenuSysWinId" lay-search=""> <select id="sysWinId" name="sysWinId" win-verify="required" lay-filter="sysWinId" lay-search="">
</select> </select>
</div> </div>
...@@ -50,8 +44,8 @@ ...@@ -50,8 +44,8 @@
<div class="layui-form-item layui-col-xs6"> <div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">菜单类型<i class="red">*</i></label> <label class="layui-form-label">菜单类型<i class="red">*</i></label>
<div class="layui-input-block winui-radio"> <div class="layui-input-block winui-radio">
<input type="radio" name="menuLevel" value="0" title="父菜单" lay-filter="menuLevel" checked/> <input type="radio" name="level" value="0" title="父菜单" lay-filter="level" checked/>
<input type="radio" name="menuLevel" value="1" title="子菜单" lay-filter="menuLevel" /> <input type="radio" name="level" value="1" title="子菜单" lay-filter="level" />
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs6 layui-hide" id="parentIdBox"> <div class="layui-form-item layui-col-xs6 layui-hide" id="parentIdBox">
...@@ -62,15 +56,15 @@ ...@@ -62,15 +56,15 @@
<div class="layui-form-item layui-col-xs12"> <div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">打开方式<i class="red">*</i></label> <label class="layui-form-label">打开方式<i class="red">*</i></label>
<div class="layui-input-block winui-radio"> <div class="layui-input-block winui-radio">
<input type="radio" name="menuType" value="html" title="当前页面打开" lay-filter="menuType" checked/> <input type="radio" name="type" value="html" title="当前页面打开" lay-filter="type" checked/>
<input type="radio" name="menuType" value="win" title="新窗口打开" lay-filter="menuType" /> <input type="radio" name="type" value="win" title="新窗口打开" lay-filter="type" />
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs6"> <div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">系统菜单<i class="red">*</i></label> <label class="layui-form-label">系统菜单<i class="red">*</i></label>
<div class="layui-input-block winui-radio"> <div class="layui-input-block winui-radio">
<input type="radio" name="menuSysType" value="1" title="是" lay-filter="menuSysType" checked/> <input type="radio" name="sysType" value="1" title="是" lay-filter="sysType" checked/>
<input type="radio" name="menuSysType" value="2" title="否" lay-filter="menuSysType" /> <input type="radio" name="sysType" value="2" title="否" lay-filter="sysType" />
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs6"> <div class="layui-form-item layui-col-xs6">
......
...@@ -21,13 +21,7 @@ ...@@ -21,13 +21,7 @@
<div class="layui-form-item layui-col-xs6"> <div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">菜单名称</label> <label class="layui-form-label">菜单名称</label>
<div class="layui-input-block ver-center"> <div class="layui-input-block ver-center">
{{menuName}} {{name}}
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">英文名称</label>
<div class="layui-input-block ver-center">
{{menuNameEn}}
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs12"> <div class="layui-form-item layui-col-xs12">
...@@ -38,7 +32,7 @@ ...@@ -38,7 +32,7 @@
<div class="layui-form-item layui-col-xs12"> <div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">菜单地址</label> <label class="layui-form-label">菜单地址</label>
<div class="layui-input-block ver-center"> <div class="layui-input-block ver-center">
{{menuUrl}} {{pageUrl}}
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs6"> <div class="layui-form-item layui-col-xs6">
...@@ -55,7 +49,7 @@ ...@@ -55,7 +49,7 @@
</div> </div>
<div class="layui-form-item layui-col-xs6"> <div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">菜单类型</label> <label class="layui-form-label">菜单类型</label>
<div class="layui-input-block ver-center" id="menuLevel"> <div class="layui-input-block ver-center" id="level">
</div> </div>
</div> </div>
...@@ -68,13 +62,13 @@ ...@@ -68,13 +62,13 @@
<div class="layui-form-item layui-col-xs12"> <div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">打开方式</label> <label class="layui-form-label">打开方式</label>
<div class="layui-input-block ver-center"> <div class="layui-input-block ver-center">
{{menuType}} {{type}}
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs6"> <div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">系统菜单</label> <label class="layui-form-label">系统菜单</label>
<div class="layui-input-block ver-center"> <div class="layui-input-block ver-center">
{{menuSysTypeName}} {{sysTypeName}}
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs6"> <div class="layui-form-item layui-col-xs6">
...@@ -98,21 +92,6 @@ ...@@ -98,21 +92,6 @@
{{authpointNum}} {{authpointNum}}
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs12">
<span class="hr-title">创建信息</span><hr>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">创建人</label>
<div class="layui-input-block ver-center">
{{userName}}
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">创建时间</label>
<div class="layui-input-block ver-center">
{{createTime}}
</div>
</div>
{{/bean}} {{/bean}}
</script> </script>
......
...@@ -18,13 +18,7 @@ ...@@ -18,13 +18,7 @@
<div class="layui-form-item layui-col-xs6"> <div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">菜单名称<i class="red">*</i></label> <label class="layui-form-label">菜单名称<i class="red">*</i></label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" id="menuName" name="menuName" win-verify="required" placeholder="请输入菜单名称" class="layui-input" value="{{menuName}}" /> <input type="text" id="name" name="name" win-verify="required" placeholder="请输入菜单名称" class="layui-input" value="{{name}}" />
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">英文名称<i class="red">*</i></label>
<div class="layui-input-block">
<input type="text" id="menuNameEn" name="menuNameEn" win-verify="required" placeholder="请输入英文名称" class="layui-input" value="{{menuNameEn}}" />
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs12" id="iconMation"> <div class="layui-form-item layui-col-xs12" id="iconMation">
...@@ -33,7 +27,7 @@ ...@@ -33,7 +27,7 @@
<div class="layui-form-item layui-col-xs12"> <div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">菜单地址<i class="red">*</i></label> <label class="layui-form-label">菜单地址<i class="red">*</i></label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" id="menuUrl" name="menuUrl" win-verify="required" placeholder="请输入菜单地址" class="layui-input" value="{{menuUrl}}" /> <input type="text" id="pageUrl" name="pageUrl" win-verify="required" placeholder="请输入菜单地址" class="layui-input" value="{{pageUrl}}" />
<div class="layui-form-mid layui-word-aux">如果是一级菜单,格式为--<br>如果是子菜单,格式为../../tpl/model/modellist.html</div> <div class="layui-form-mid layui-word-aux">如果是一级菜单,格式为--<br>如果是子菜单,格式为../../tpl/model/modellist.html</div>
</div> </div>
</div> </div>
...@@ -48,7 +42,7 @@ ...@@ -48,7 +42,7 @@
<div class="layui-form-item layui-col-xs6"> <div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">所属服务<i class="red">*</i></label> <label class="layui-form-label">所属服务<i class="red">*</i></label>
<div class="layui-input-block"> <div class="layui-input-block">
<select id="menuSysWinId" name="menuSysWinId" class="menuSysWinId" win-verify="required" lay-filter="selectMenuSysWinId" lay-search=""> <select id="sysWinId" name="sysWinId" win-verify="required" lay-filter="sysWinId" lay-search="">
</select> </select>
</div> </div>
...@@ -56,8 +50,8 @@ ...@@ -56,8 +50,8 @@
<div class="layui-form-item layui-col-xs6"> <div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">菜单类型<i class="red">*</i></label> <label class="layui-form-label">菜单类型<i class="red">*</i></label>
<div class="layui-input-block winui-radio"> <div class="layui-input-block winui-radio">
<input type="radio" name="menuLevel" value="0" title="父菜单" lay-filter="menuLevel"/> <input type="radio" name="level" value="0" title="父菜单" lay-filter="level"/>
<input type="radio" name="menuLevel" value="1" title="子菜单" lay-filter="menuLevel"/> <input type="radio" name="level" value="1" title="子菜单" lay-filter="level"/>
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs6" id="parentIdBox"> <div class="layui-form-item layui-col-xs6" id="parentIdBox">
...@@ -68,15 +62,15 @@ ...@@ -68,15 +62,15 @@
<div class="layui-form-item layui-col-xs12"> <div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">打开方式<i class="red">*</i></label> <label class="layui-form-label">打开方式<i class="red">*</i></label>
<div class="layui-input-block winui-radio"> <div class="layui-input-block winui-radio">
<input type="radio" name="menuType" value="html" title="当前页面打开" lay-filter="menuType"/> <input type="radio" name="type" value="html" title="当前页面打开" lay-filter="type"/>
<input type="radio" name="menuType" value="win" title="新窗口打开" lay-filter="menuType"/> <input type="radio" name="type" value="win" title="新窗口打开" lay-filter="type"/>
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs6"> <div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">系统菜单<i class="red">*</i></label> <label class="layui-form-label">系统菜单<i class="red">*</i></label>
<div class="layui-input-block winui-radio"> <div class="layui-input-block winui-radio">
<input type="radio" name="menuSysType" value="1" title="" lay-filter="menuSysType" checked/> <input type="radio" name="sysType" value="1" title="" lay-filter="sysType" checked/>
<input type="radio" name="menuSysType" value="2" title="" lay-filter="menuSysType" /> <input type="radio" name="sysType" value="2" title="" lay-filter="sysType" />
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs6"> <div class="layui-form-item layui-col-xs6">
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
</div> </div>
</div> </div>
<script type="text/html" id="tableBar"> <script type="text/html" id="tableBar">
{{# if(auth('1552957449342')){ }} {{# if(auth('1552958167410')){ }}
<a class="layui-btn layui-btn-xs" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a> <a class="layui-btn layui-btn-xs" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
{{# } }} {{# } }}
{{# if(d.orderNum != 0 && auth('1552957498101')){ }} {{# if(d.orderNum != 0 && auth('1552957498101')){ }}
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<div class="layui-form-item layui-col-xs12"> <div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">名称<i class="red">*</i></label> <label class="layui-form-label">名称<i class="red">*</i></label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" id="sysName" name="sysName" win-verify="required" placeholder="请输入名称" class="layui-input" maxlength="75"/> <input type="text" id="name" name="name" win-verify="required" placeholder="请输入名称" class="layui-input" maxlength="75"/>
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs12"> <div class="layui-form-item layui-col-xs12">
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<div class="layui-form-item layui-col-xs12"> <div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">名称<i class="red">*</i></label> <label class="layui-form-label">名称<i class="red">*</i></label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" id="sysName" name="sysName" win-verify="required" placeholder="请输入名称" class="layui-input" maxlength="75"/> <input type="text" id="name" name="name" win-verify="required" placeholder="请输入名称" class="layui-input" maxlength="75"/>
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs12"> <div class="layui-form-item layui-col-xs12">
......
...@@ -1186,4 +1186,72 @@ var dataShowType = { ...@@ -1186,4 +1186,72 @@ var dataShowType = {
} }
} }
};
// 桌面菜单显示工具
var desktopMenuUtil = {
/**
* 获取左下角菜单图标
*
* @param menu
* @returns {{winIcon: string, icon: string}}
*/
getMenuIcon: function (menu) {
var icon, winIcon;
if (parseInt(menu.iconType) == 1) {
// icon
icon = `<i class="fa fa-fw ${menu.icon}" style="color: ${menu.iconColor}"></i>`;
winIcon = `win-icon="${menu.icon}"`;
} else if (parseInt(menu.iconType) == 2) {
// 图片
icon = `<img src="${fileBasePath}${menu.iconPic}" />`;
winIcon = `win-icon="${menu.iconPic}"`;
}
return {
icon: icon,
winIcon: winIcon
};
},
/**
* 获取桌面菜单图标
*
* @param menu
* @returns {{winIcon: string, icon: string}}
*/
getDecktopMenuIcon: function (menu) {
var icon, smallIcon, menuIcon, isFaIcon;
if (parseInt(menu.iconType) == 1) {
// icon
smallIcon = `<i class="fa fa-fw icon-drawer-icon ${menu.icon}" style="color: ${menu.iconColor}; background-color: ${menu.iconBg}" win-i-id="${menu.id}"></i>`;
icon = `<i class="fa fa-fw ${menu.icon}" style="color: ${menu.iconColor}; background-color: ${menu.iconBg}" win-i-id="${menu.id}"></i>`;
menuIcon = `win-icon="${menu.icon}"`;
isFaIcon = "winui-icon-font";
} else if (parseInt(menu.iconType) == 2) {
// 图片
smallIcon = `<i class="fa icon-drawer-icon" win-i-id="${menu.id}"><img src="${fileBasePath}${menu.iconPic}" class="desktop-img"/></i>`;
icon = `<img src="${fileBasePath}${menu.iconPic}" class="desktop-img"/>`;
menuIcon = `win-icon="${menu.iconPic}"`;
isFaIcon = "winui-icon-img";
}
return {
icon: icon,
smallIcon: smallIcon,
menuIcon: menuIcon,
isFaIcon: isFaIcon
};
},
getTraditionPageMenuIcon: function (menu) {
if(menu.iconType === 1){
// icon
return '<i class="fa ' + menu.icon + ' fa-fw"></i>';
} else if (menu.iconType === 2){
// 图片
return '<img src="' + fileBasePath + menu.iconPic + '" />';
}
return '';
}
}; };
\ No newline at end of file
...@@ -20,148 +20,79 @@ layui.define(['jquery', 'layer', 'winui'], function (exports) { ...@@ -20,148 +20,79 @@ layui.define(['jquery', 'layer', 'winui'], function (exports) {
if (this.data === null) return; if (this.data === null) return;
var html = ''; var html = '';
$(this.data).each(function (index, item) { $(this.data).each(function (index, item) {
if(languageType == 'cn'){ var id = 'win-id="' + item.id + '"',
item.name = item.menuNameEn; url = 'win-url="' + item.pageURL + '"',
} title = 'win-title="' + item.name + '"',
var id = isNull(item.id) ? '' : 'win-id="' + item.id + '"', opentype = 'win-opentype="' + item.openType + '"',
url = isNull(item.pageURL) ? '' : 'win-url="' + item.pageURL + '"', maxOpen = 'win-maxOpen="' + item.maxOpen + '"',
title = isNull(item.name) ? '' : 'win-title="' + item.name + '"', iconBg = isNull(item.iconBg) ? '' : 'win-menuIconBg="' + item.iconBg + '"',
opentype = isNull(item.openType) ? '' : 'win-opentype="' + item.openType + '"', iconColor = isNull(item.iconColor) ? '' : 'win-menuIconColor="' + item.iconColor + '"',
maxOpen = isNull(item.maxOpen) ? '' : 'win-maxOpen="' + item.maxOpen + '"', sysWinUrl = isNull(item.sysWinUrl) ? '' : 'win-sysWinUrl="' + item.sysWinUrl + '"';
menuIconBg = isNull(item.menuIconBg) ? '' : 'win-menuIconBg="' + item.menuIconBg + '"', if (item.id == 'c876a6c27094454d914bee1ce57333db'){
menuIconColor = isNull(item.menuIconColor) ? '' : 'win-menuIconColor="' + item.menuIconColor + '"', console.log(item)
menuSysWinUrl = isNull(item.sysWinUrl) ? '' : 'win-sysWinUrl="' + item.sysWinUrl + '"', }
menuIcon = '';
var icon = "", isFaIcon = ""; var iconParams = desktopMenuUtil.getDecktopMenuIcon(item);
if(item.menuIconType === '1'){//icon if (isNull(item.childs) || item.childs.length == 0) {//没有子菜单
menuIcon = isNull(item.icon) ? '' : 'win-icon="' + item.icon + '"';
if (!isNull(item.menuIconColor)){
icon = '<i class="fa ' + item.icon + ' fa-fw" style="color: ' + item.menuIconColor + '" win-i-id="' + item.id + '"></i>';
} else {
icon = '<i class="fa ' + item.icon + ' fa-fw" win-i-id="' + item.id + '"></i>';
}
isFaIcon = "winui-icon-font";
} else if (item.menuIconType === '2'){//图片
menuIcon = isNull(item.menuIconPic) ? '' : 'win-icon="' + item.menuIconPic + '"';
icon = '<img src="' + fileBasePath + item.menuIconPic + '" class="desktop-img"/>';
isFaIcon = "winui-icon-img";
}
if(isNull(item.childs)){//没有子菜单
if(item.pageURL == '--' && item.menuLevel == '0'){ if(item.pageURL == '--' && item.menuLevel == '0'){
html += '<div class="winui-desktop-item win-menu-group" id="' + item.id + '" ' + id + ' ' + url + ' ' + title + ' ' + opentype + ' ' + maxOpen + ' ' + menuIconBg + ' ' + menuIconColor + '>'; html += `<div class="winui-desktop-item win-menu-group" id="${item.id}" ${id} ${url} ${title} ${opentype} ${maxOpen} ${iconBg} ${iconColor}>
html += '<div class="winui-icon ' + isFaIcon + '">'; <div class="winui-icon ${iconParams.isFaIcon}">
html += '<div class="icon-drawer"></div>'; <div class="icon-drawer"></div>
html += '<div class="icon-child"></div>'; <div class="icon-child"></div>
html += '</div>'; </div>
html += '<p>' + item.name + '</p>'; <p>${item.name}</p>
html += '</div>'; </div>`;
} else { } else {
html += '<div class="winui-desktop-item sec-btn" ' + id + ' ' + url + ' ' + title + ' ' + opentype + ' ' + maxOpen + ' ' + menuIconBg + ' ' + menuIconColor + ' ' + menuIcon + ' ' + menuSysWinUrl + '>'; html += `<div class="winui-desktop-item sec-btn" ${id} ${url} ${title} ${opentype} ${maxOpen} ${iconBg} ${iconColor} ${iconParams.menuIcon} ${sysWinUrl}>`;
if (!isNull(item.menuIconBg)){ if (!isNull(item.iconBg)){
html += '<div class="winui-icon ' + isFaIcon + '" style="background-color: ' + item.menuIconBg + '">'; html += '<div class="winui-icon ' + iconParams.isFaIcon + '" style="background-color: ' + item.iconBg + '">';
} else { } else {
html += '<div class="winui-icon ' + isFaIcon + '">'; html += '<div class="winui-icon ' + iconParams.isFaIcon + '">';
} }
html += icon; html += iconParams.icon;
html += '</div>'; html += '</div>';
html += '<p>' + item.name + '</p>'; html += '<p>' + item.name + '</p>';
html += '</div>'; html += '</div>';
} }
} else {//有子菜单 } else {//有子菜单
html += '<div class="winui-desktop-item win-menu-group" id="' + item.id + '" ' + id + ' ' + url + ' ' + title + ' ' + opentype + ' ' + maxOpen + ' ' + menuIconBg + ' ' + menuIconColor + ' ' + menuSysWinUrl + '>'; html += `<div class="winui-desktop-item win-menu-group" id="${item.id}" ${id} ${url} ${title} ${opentype} ${maxOpen} ${iconBg} ${iconColor} ${sysWinUrl}>`;
html += '<div class="winui-icon ' + isFaIcon + '">'; html += '<div class="winui-icon ' + iconParams.isFaIcon + '">';
html += '<div class="icon-drawer">'; html += '<div class="icon-drawer">';
var childsIconContent = ''; var childsIconContent = '';
var childsHtml = ''; var childsHtml = '';
$(item.childs).each(function (index, bean) { $(item.childs).each(function (index, bean) {
if(languageType == 'cn'){ var cId = 'win-id="' + bean.id + '"',
bean.name = bean.menuNameEn; cPageUrl = 'win-url="' + bean.pageURL + '"',
} cTitle = 'win-title="' + bean.name + '"',
var childsid = isNull(bean.id) ? '' : 'win-id="' + bean.id + '"', cOpenType = 'win-opentype="' + bean.openType + '"',
childsurl = isNull(bean.pageURL) ? '' : 'win-url="' + bean.pageURL + '"', cMaxOpen = 'win-maxOpen="' + bean.maxOpen + '"',
childstitle = isNull(bean.name) ? '' : 'win-title="' + bean.name + '"', cIconBg = isNull(bean.iconBg) ? '' : 'win-menuIconBg="' + bean.iconBg + '"',
childsopentype = isNull(bean.openType) ? '' : 'win-opentype="' + bean.openType + '"', cIconColor = isNull(bean.iconColor) ? '' : 'win-menuIconColor="' + bean.iconColor + '"',
childsmaxOpen = isNull(bean.maxOpen) ? '' : 'win-maxOpen="' + bean.maxOpen + '"', cSysWinUrl = isNull(bean.sysWinUrl) ? '' : 'win-sysWinUrl="' + bean.sysWinUrl + '"';
childsmenuIconBg = isNull(bean.menuIconBg) ? '' : 'win-menuIconBg="' + bean.menuIconBg + '"',
childsmenuIconColor = isNull(bean.menuIconColor) ? '' : 'win-menuIconColor="' + bean.menuIconColor + '"', var childIconParams = desktopMenuUtil.getDecktopMenuIcon(bean);
childsmenuSysWinUrl = isNull(bean.sysWinUrl) ? '' : 'win-sysWinUrl="' + bean.sysWinUrl + '"', // 如果子菜单的所属桌面和父菜单的一样
childsmenuIcon = ''; if(bean.deskTopId === item.deskTopId){
//如果子菜单的所属桌面和父菜单的一样或者该菜单所属桌面不存在 childsIconContent += childIconParams.smallIcon;
if(bean.deskTopId === item.deskTopId || $('.winui-desktop').find("article[id='" + bean.deskTopId + "']").length == 0 childsHtml += `<div class="winui-desktop-item sec-clsss-btn sec-btn" ${cId} ${cPageUrl} ${cTitle} ${cOpenType} ${cMaxOpen} ${cIconBg} ${cIconColor} + ${childIconParams.menuIcon} ${cSysWinUrl}>`;
|| bean.deskTopId === 'winfixedpage00000000'){ if (!isNull(bean.iconBg)){
var childsicon; childsHtml += '<div class="winui-icon ' + childIconParams.isFaIcon + '" style="background-color: ' + bean.iconBg + '">';
var childsiconsmall;
var childsisFaIcon = "";
if(bean.menuIconType === '1'){//icon
childsmenuIcon = isNull(bean.icon) ? '' : 'win-icon="' + bean.icon + '"';
if (!isNull(bean.menuIconColor)){
if (!isNull(bean.menuIconBg)){
childsiconsmall = '<i class="fa ' + bean.icon + ' fa-fw icon-drawer-icon" style="color: ' + bean.menuIconColor + ';background-color: ' + bean.menuIconBg + '" win-i-id="' + bean.id + '"></i>';
childsicon = '<i class="fa ' + bean.icon + ' fa-fw" style="color: ' + bean.menuIconColor + ';background-color: ' + bean.menuIconBg + '" win-i-id="' + bean.id + '"></i>';
} else {
childsiconsmall = '<i class="fa ' + bean.icon + ' fa-fw icon-drawer-icon" style="color: ' + bean.menuIconColor + '" win-i-id="' + bean.id + '"></i>';
childsicon = '<i class="fa ' + bean.icon + ' fa-fw" style="color: ' + bean.menuIconColor + '" win-i-id="' + bean.id + '"></i>';
}
} else {
if (!isNull(bean.menuIconBg)){
childsiconsmall = '<i class="fa ' + bean.icon + ' fa-fw icon-drawer-icon" style="background-color: ' + bean.menuIconBg + '" win-i-id="' + bean.id + '"></i>';
childsicon = '<i class="fa ' + bean.icon + ' fa-fw" style="background-color: ' + bean.menuIconBg + '" win-i-id="' + bean.id + '"></i>';
} else {
childsiconsmall = '<i class="fa ' + bean.icon + ' fa-fw icon-drawer-icon" win-i-id="' + bean.id + '"></i>';
childsicon = '<i class="fa ' + bean.icon + ' fa-fw" win-i-id="' + bean.id + '"></i>';
}
}
childsisFaIcon = "winui-icon-font";
} else if (bean.menuIconType === '2'){//图片
childsmenuIcon = isNull(bean.menuIconPic) ? '' : 'win-icon="' + bean.menuIconPic + '"';
childsiconsmall = '<i class="fa icon-drawer-icon" win-i-id="' + bean.id + '"><img src="' + fileBasePath + bean.menuIconPic + '" class="desktop-img"/></i>';
childsicon = '<img src="' + fileBasePath + bean.menuIconPic + '" class="desktop-img"/>';
childsisFaIcon = "winui-icon-img";
}
childsIconContent += childsiconsmall;
childsHtml += '<div class="winui-desktop-item sec-clsss-btn sec-btn" ' + childsid + ' ' + childsurl + ' ' + childstitle + ' ' + childsopentype + ' ' + childsmaxOpen + ' ' + childsmenuIconBg + ' ' + childsmenuIconColor + ' ' + childsmenuIcon + ' ' + childsmenuSysWinUrl + '>';
if (!isNull(bean.menuIconBg)){
childsHtml += '<div class="winui-icon ' + childsisFaIcon + '" style="background-color: ' + bean.menuIconBg + '">';
} else { } else {
childsHtml += '<div class="winui-icon ' + childsisFaIcon + '">'; childsHtml += '<div class="winui-icon ' + childIconParams.isFaIcon + '">';
} }
childsHtml += childsicon; childsHtml += childIconParams.icon;
childsHtml += '</div>'; childsHtml += '</div>';
childsHtml += '<p>' + bean.name + '</p>'; childsHtml += '<p>' + bean.name + '</p>';
childsHtml += '</div>'; childsHtml += '</div>';
} else {//如果子菜单的所属桌面和父菜单的不一样 } else {//如果子菜单的所属桌面和父菜单的不一样
var childDeskHtml = ""; var childDeskHtml = "";
var childsicon; childDeskHtml += `<div class="winui-desktop-item sec-btn" ${cId} ${cPageUrl} ${cTitle} ${cOpenType} ${cMaxOpen} ${cIconBg} ${cIconColor} ${childIconParams.childsmenuIcon} ${cSysWinUrl}>`;
var childsisFaIcon = ""; if (!isNull(bean.iconBg)){
if(bean.menuIconType === '1'){//icon childDeskHtml += '<div class="winui-icon ' + childIconParams.isFaIcon + '" style="background-color: ' + bean.iconBg + '">';
childsmenuIcon = isNull(bean.icon) ? '' : 'win-icon="' + bean.icon + '"';
if (!isNull(bean.menuIconColor)){
if (!isNull(bean.menuIconBg)){
childsicon = '<i class="fa ' + bean.icon + ' fa-fw" style="color: ' + bean.menuIconColor + ';background-color: ' + bean.menuIconBg + '" win-i-id="' + bean.id + '"></i>';
} else {
childsicon = '<i class="fa ' + bean.icon + ' fa-fw" style="color: ' + bean.menuIconColor + '" win-i-id="' + bean.id + '"></i>';
}
} else {
if (!isNull(bean.menuIconBg)){
childsicon = '<i class="fa ' + bean.icon + ' fa-fw" style="background-color: ' + bean.menuIconBg + '" win-i-id="' + bean.id + '"></i>';
} else {
childsicon = '<i class="fa ' + bean.icon + ' fa-fw" win-i-id="' + bean.id + '"></i>';
}
}
childsisFaIcon = "winui-icon-font";
} else if (bean.menuIconType === '2'){//图片
childsmenuIcon = isNull(bean.menuIconPic) ? '' : 'win-icon="' + bean.menuIconPic + '"';
childsicon = '<img src="' + fileBasePath + bean.menuIconPic + '" class="desktop-img"/>';
childsisFaIcon = "winui-icon-img";
}
childDeskHtml += '<div class="winui-desktop-item sec-btn" ' + childsid + ' ' + childsurl + ' ' + childstitle + ' ' + childsopentype + ' ' + childsmaxOpen + ' ' + childsmenuIconBg + ' ' + childsmenuIconColor + ' ' + childsmenuIcon + ' ' + childsmenuSysWinUrl + '>';
if (!isNull(bean.menuIconBg)){
childDeskHtml += '<div class="winui-icon ' + childsisFaIcon + '" style="background-color: ' + bean.menuIconBg + '">';
} else { } else {
childDeskHtml += '<div class="winui-icon ' + childsisFaIcon + '">'; childDeskHtml += '<div class="winui-icon ' + childIconParams.isFaIcon + '">';
} }
childDeskHtml += childsicon; childDeskHtml += childIconParams.icon;
childDeskHtml += '</div>'; childDeskHtml += '</div>';
childDeskHtml += '<p>' + bean.name + '</p>'; childDeskHtml += '<p>' + bean.name + '</p>';
childDeskHtml += '</div>'; childDeskHtml += '</div>';
......
...@@ -21,86 +21,57 @@ layui.define(['jquery', 'element', 'layer', 'winui'], function (exports) { ...@@ -21,86 +21,57 @@ layui.define(['jquery', 'element', 'layer', 'winui'], function (exports) {
if (this.data === null) return; if (this.data === null) return;
var html = ''; var html = '';
$(this.data).each(function (index, item) { $(this.data).each(function (index, item) {
if(languageType == 'cn'){ var id = 'win-id="' + item.id + '"',
item.name = item.menuNameEn; url = 'win-url="' + item.pageURL + '"',
} title = 'win-title="' + item.name + '"',
var id = isNull(item.id) ? '' : 'win-id="' + item.id + '"', opentype = 'win-opentype="' + item.openType + '"',
url = isNull(item.pageURL) ? '' : 'win-url="' + item.pageURL + '"', maxopen = 'win-maxopen="' + item.maxOpen + '"',
title = isNull(item.name) ? '' : 'win-title="' + item.name + '"',
opentype = isNull(item.openType) ? '' : 'win-opentype="' + item.openType + '"',
maxopen = isNull(item.maxOpen) ? '' : 'win-maxopen="' + item.maxOpen + '"',
winIcon = isNull(item.icon) ? '' : 'win-icon="' + item.icon + '"',
isParent = item.childs ? ' parent' : '', isParent = item.childs ? ' parent' : '',
menuIconBg = isNull(item.menuIconBg) ? '' : 'win-menuIconBg="' + item.menuIconBg + '"', menuIconBg = isNull(item.iconBg) ? '' : 'win-menuIconBg="' + item.iconBg + '"',
menuIconColor = isNull(item.menuIconColor) ? '' : 'win-menuIconColor="' + item.menuIconColor + '"', menuIconColor = isNull(item.iconColor) ? '' : 'win-menuIconColor="' + item.iconColor + '"',
menuSysWinUrl = isNull(item.sysWinUrl) ? '' : 'win-sysWinUrl="' + item.sysWinUrl + '"', menuSysWinUrl = isNull(item.sysWinUrl) ? '' : 'win-sysWinUrl="' + item.sysWinUrl + '"',
menuDeskTopId = 'win-menuDeskTopId="' + item.deskTopId + '"'; menuDeskTopId = 'win-menuDeskTopId="' + item.deskTopId + '"';
var icon = ""; var iconParams = desktopMenuUtil.getMenuIcon(item);
if(item.menuIconType === '1' || item.menuIconType == 1){//icon var extend
if (!isNull(item.menuIconColor)){ if (index == 0) {
icon = '<i class="fa ' + item.icon + ' fa-fw" style="color: ' + item.menuIconColor + '"></i>'; extend = item.extend ? ' layui-nav-itemed' : '';
} else {
icon = '<i class="fa ' + item.icon + ' fa-fw"></i>';
}
winIcon = (item.icon == '' || item.icon == undefined) ? '' : 'win-icon="' + item.icon + '"';
} else if (item.menuIconType === '2' || item.menuIconType == 2){//图片
icon = '<img src="' + fileBasePath + item.menuIconPic + '" />';
winIcon = (item.menuIconPic == '' || item.menuIconPic == undefined) ? '' : 'win-icon="' + item.menuIconPic + '"';
}
if(index == 0){
var extend = item.extend ? ' layui-nav-itemed' : '';
} else { } else {
var extend = ''; extend = '';
} }
html += '<li class="layui-nav-item ' + isParent + ' ' + extend + '" ' + id + ' ' + url + ' ' + title + ' ' + opentype + ' ' + maxopen + ' ' + winIcon + ' ' + menuIconBg + ' ' + menuIconColor + ' ' + menuSysWinUrl + ' ' + menuDeskTopId + '>'; html += `<li class="layui-nav-item ${isParent} ${extend}" ${id} ${url} ${title} ${opentype} ${maxopen} ${iconParams.winIcon} ${menuIconBg} ${menuIconColor} ${menuSysWinUrl} ${menuDeskTopId}>`;
if (!isNull(item.menuIconBg)){ if (!isNull(item.menuIconBg)){
html += '<a><div class="winui-menu-icon" style="background-color: ' + item.menuIconBg + '!important;">'; html += '<a><div class="winui-menu-icon" style="background-color: ' + item.menuIconBg + '!important;">';
} else { } else {
html += '<a><div class="winui-menu-icon">'; html += '<a><div class="winui-menu-icon">';
} }
html += icon; html += iconParams.icon;
html += '</div>'; html += '</div>';
html += '<span class="winui-menu-name">' + item.name + '</span></a>'; html += '<span class="winui-menu-name">' + item.name + '</span></a>';
if (item.childs) { if (item.childs) {
html += '<dl class="layui-nav-child">'; html += '<dl class="layui-nav-child">';
$(item.childs).each(function (cIndex, cItem) { $(item.childs).each(function (cIndex, cItem) {
if(languageType == 'cn'){ var cId = 'win-id="' + cItem.id + '"',
cItem.name = cItem.menuNameEn; cUrl = 'win-url="' + cItem.pageURL + '"',
} cTitle = 'win-title="' + cItem.name + '"',
var cId = (cItem.id == '' || cItem.id == undefined) ? '' : 'win-id="' + cItem.id + '"', cOpentype = 'win-opentype="' + cItem.openType + '"',
cUrl = (cItem.pageURL == '' || cItem.pageURL == undefined) ? '' : 'win-url="' + cItem.pageURL + '"', cMaxopen = 'win-maxopen="' + cItem.maxOpen + '"',
cTitle = isNull(cItem.name) ? '' : 'win-title="' + cItem.name + '"', cmenuIconBg = 'win-menuIconBg="' + cItem.menuIconBg + '"',
cOpentype = (cItem.openType == '' || cItem.openType == undefined) ? '' : 'win-opentype="' + cItem.openType + '"',
cMaxopen = (cItem.maxOpen == '' || cItem.maxOpen == undefined) ? '' : 'win-maxopen="' + cItem.maxOpen + '"',
cWinIcon = (cItem.icon == '' || cItem.icon == undefined) ? '' : 'win-icon="' + cItem.icon + '"',
cmenuIconBg = (cItem.menuIconBg == '' || cItem.menuIconBg == undefined) ? '' : 'win-menuIconBg="' + cItem.menuIconBg + '"',
cmenuIconColor = (cItem.menuIconColor == '' || cItem.menuIconColor == undefined) ? '' : 'win-menuIconColor="' + cItem.menuIconColor + '"', cmenuIconColor = (cItem.menuIconColor == '' || cItem.menuIconColor == undefined) ? '' : 'win-menuIconColor="' + cItem.menuIconColor + '"',
cmenuSysWinUrl = isNull(cItem.sysWinUrl) ? '' : 'win-sysWinUrl="' + cItem.sysWinUrl + '"', cmenuSysWinUrl = isNull(cItem.sysWinUrl) ? '' : 'win-sysWinUrl="' + cItem.sysWinUrl + '"',
menuDeskTopId = 'win-menuDeskTopId="' + cItem.deskTopId + '"';; menuDeskTopId = 'win-menuDeskTopId="' + cItem.deskTopId + '"';;
var cicon = ""; var cIconParams = desktopMenuUtil.getMenuIcon(cItem);
if(cItem.menuIconType === '1' || cItem.menuIconType == 1){//icon html += `<dd ${cId} ${cUrl} ${cTitle} ${cOpentype} ${cMaxopen} ${cIconParams.winIcon} ${cmenuIconBg} ${cmenuIconColor} ${cmenuSysWinUrl} ${ menuDeskTopId}>`;
cWinIcon = (cItem.icon == '' || cItem.icon == undefined) ? '' : 'win-icon="' + cItem.icon + '"';
if (!isNull(cItem.menuIconColor)){
cicon = '<i class="fa ' + cItem.icon + ' fa-fw" style="color: ' + cItem.menuIconColor + '"></i>';
} else {
cicon = '<i class="fa ' + cItem.icon + ' fa-fw"></i>';
}
} else if (cItem.menuIconType === '2' || cItem.menuIconType == 2){//图片
cicon = '<img src="' + fileBasePath + cItem.menuIconPic + '" />';
cWinIcon = (cItem.menuIconPic == '' || cItem.menuIconPic == undefined) ? '' : 'win-icon="' + cItem.menuIconPic + '"'
}
html += '<dd ' + cId + ' ' + cUrl + ' ' + cTitle + ' ' + cOpentype + ' ' + cMaxopen + ' ' + cWinIcon + ' ' + cmenuIconBg + ' ' + cmenuIconColor + ' ' + cmenuSysWinUrl + ' ' + menuDeskTopId + '>';
if (!isNull(cItem.menuIconBg)){ if (!isNull(cItem.menuIconBg)){
html += '<a><div class="winui-menu-icon" style="background-color: ' + cItem.menuIconBg + '!important;">'; html += '<a><div class="winui-menu-icon" style="background-color: ' + cItem.menuIconBg + '!important;">';
} else { } else {
html += '<a><div class="winui-menu-icon">'; html += '<a><div class="winui-menu-icon">';
} }
html += cicon; html += cIconParams.icon;
html += '</div>'; html += '</div>';
html += '<span class="winui-menu-name">' + cItem.name + '</span></a>'; html += '<span class="winui-menu-name">' + cItem.name + '</span></a>';
}); });
html += '</dl>'; html += '</dl>';
} }``
html += '</li>'; html += '</li>';
}); });
$('.winui-menu').html(html); $('.winui-menu').html(html);
......
...@@ -25,6 +25,7 @@ layui.config({ ...@@ -25,6 +25,7 @@ layui.config({
var $ = layui.jquery, var $ = layui.jquery,
form = layui.form, form = layui.form,
element = layui.element; element = layui.element;
var selOption = getFileContent('tpl/template/select-option-must.tpl');
var winuiLoad; var winuiLoad;
layim = layui.layim; layim = layui.layim;
...@@ -88,17 +89,14 @@ layui.config({ ...@@ -88,17 +89,14 @@ layui.config({
} }
// 获取桌面消息 // 获取桌面消息
AjaxPostUtil.request({url: reqBasePath + "login009", params: {language: languageType}, type: 'json', method: "GET", callback: function(l){ AjaxPostUtil.request({url: reqBasePath + "login009", params: {}, type: 'json', method: "GET", callback: function(desktopResult){
var deskTopName = new Array(); var deskTopName = new Array();
var defaultName = (languageType == "zh" ? "默认桌面" : "Default desktop");
deskTopName.push(defaultName);
var desktopSel = '<option value="winfixedpage00000000">' + defaultName + '</option>';
//初始化桌面 //初始化桌面
$.each(l.rows, function(i, item) { $.each(desktopResult.rows, function(i, item) {
deskTopName.push(item.name); deskTopName.push(item.name);
desktopSel += '<option value="' + item.id + '">' + item.name + '</option>';
$("#winui-desktop").append('<article class="desktop-item-page section" id="' + item.id + '" art-title="' + item.name + '"></article>'); $("#winui-desktop").append('<article class="desktop-item-page section" id="' + item.id + '" art-title="' + item.name + '"></article>');
}); });
$('#winui-desktop').fullpage({ $('#winui-desktop').fullpage({
'navigation': true, 'navigation': true,
scrollingSpeed: 500, scrollingSpeed: 500,
...@@ -109,7 +107,7 @@ layui.config({ ...@@ -109,7 +107,7 @@ layui.config({
$("#desktop-sel").val(id); $("#desktop-sel").val(id);
} }
}); });
$("#desktop-sel").html(desktopSel); $("#desktop-sel").html(getDataUseHandlebars(selOption, desktopResult));
$("#winui-desktop").find(".desktop-item-page").html(""); $("#winui-desktop").find(".desktop-item-page").html("");
$("body").on('change', '#desktop-sel', function (e) { $("body").on('change', '#desktop-sel', function (e) {
var val = $("#desktop-sel").prop('selectedIndex'); var val = $("#desktop-sel").prop('selectedIndex');
...@@ -923,7 +921,7 @@ layui.config({ ...@@ -923,7 +921,7 @@ layui.config({
var url = $this.attr('win-url'); var url = $this.attr('win-url');
var menuIconBg = $this.attr("win-menuiconbg"); var menuIconBg = $this.attr("win-menuiconbg");
var menuIconColor = $this.attr("win-menuiconcolor"); var menuIconColor = $this.attr("win-menuiconcolor");
var menuIcon = $this.attr("win-icon"); var menuIcon = isNull($this.attr("win-icon")) ? '' : $this.attr("win-icon");
var menuSysWinUrl = $this.attr("win-sysWinUrl"); var menuSysWinUrl = $this.attr("win-sysWinUrl");
var str = '', iconStr = ''; var str = '', iconStr = '';
if(menuIcon.indexOf('fa-') != -1){//icon图标 if(menuIcon.indexOf('fa-') != -1){//icon图标
......
...@@ -53,24 +53,16 @@ layui.config({ ...@@ -53,24 +53,16 @@ layui.config({
//加载菜单数据 //加载菜单数据
function loadMenuListToShow(){ function loadMenuListToShow(){
//获取桌面消息 //获取桌面消息
AjaxPostUtil.request({url: reqBasePath + "login009", params: {language: languageType}, type: 'json', method: "GET", callback: function(l){ AjaxPostUtil.request({url: reqBasePath + "login009", params: {}, type: 'json', method: "GET", callback: function(l){
var str = "";//顶部桌面字符串 var str = "";//顶部桌面字符串
var menuBoxStr = "";//多个菜单的字符串 var menuBoxStr = "";//多个菜单的字符串
var jsonStr = {};
var defaultName = (languageType == "zh" ? "默认桌面" : "Default desktop");
jsonStr = {
bean: {
id: 'winfixedpage00000000',
name: defaultName,
show: 'block',
chooseDeskTop: ' select'
}
};
str += getDataUseHandlebars(desktopTemplate, jsonStr);
menuBoxStr += getDataUseHandlebars(menuBoxTemplate, jsonStr);
$.each(l.rows, function(i, row){ $.each(l.rows, function(i, row){
row.show = 'none'; row.show = 'none';
jsonStr = { if (i == 0) {
row.show = 'block';
row.chooseDeskTop = ' select';
}
var jsonStr = {
bean: row bean: row
}; };
str += getDataUseHandlebars(desktopTemplate, jsonStr); str += getDataUseHandlebars(desktopTemplate, jsonStr);
...@@ -87,14 +79,7 @@ layui.config({ ...@@ -87,14 +79,7 @@ layui.config({
var menuStr; var menuStr;
$.each(json.rows, function(i, row){ $.each(json.rows, function(i, row){
menuStr = ""; menuStr = "";
if(row.menuIconType === 1){//icon row.icon = desktopMenuUtil.getTraditionPageMenuIcon(row);
row.icon = '<i class="fa ' + row.icon + ' fa-fw"></i>';
} else if (row.menuIconType === 2){//图片
row.icon = '<img src="' + fileBasePath + row.menuIconPic + '" />';
}
if(languageType == 'cn'){
row.name = row.menuNameEn;
}
if(row.pageURL != '--'){ if(row.pageURL != '--'){
//一级菜单 //一级菜单
menuStr = getDataUseHandlebars(menuTemplate, {bean: row}); menuStr = getDataUseHandlebars(menuTemplate, {bean: row});
...@@ -108,14 +93,7 @@ layui.config({ ...@@ -108,14 +93,7 @@ layui.config({
//二级菜单 //二级菜单
if (!isNull(row.childs)){ if (!isNull(row.childs)){
$.each(row.childs, function(j, child){ $.each(row.childs, function(j, child){
if(child.menuIconType === 1){//icon child.icon = desktopMenuUtil.getTraditionPageMenuIcon(child);
child.icon = '<i class="fa ' + child.icon + ' fa-fw"></i>';
} else if (child.menuIconType === 2){//图片
child.icon = '<img src="' + fileBasePath + child.menuIconPic + '" />';
}
if(languageType == 'cn'){
child.name = child.menuNameEn;
}
data.push({id: child.id, name: child.name, pageURL: child.pageURL, winName: isNull(row.deskTopId) ? defaultName : $(".desktop-menu-box").find("li[rowid='" + row.deskTopId + "']").find('span').html()}); data.push({id: child.id, name: child.name, pageURL: child.pageURL, winName: isNull(row.deskTopId) ? defaultName : $(".desktop-menu-box").find("li[rowid='" + row.deskTopId + "']").find('span').html()});
}); });
} }
......
...@@ -42,8 +42,7 @@ ...@@ -42,8 +42,7 @@
<!-- 桌面 --> <!-- 桌面 -->
<section class="winui-desktop" id="winui-desktop"> <section class="winui-desktop" id="winui-desktop">
<article class="desktop-item-page section fixed-page" id="winfixedpage00000000" art-title="默认桌面">
</article>
</section> </section>
<!-- 开始菜单 --> <!-- 开始菜单 -->
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册