Compare commits
2 Commits
31751acf18
...
459becb1a9
| Author | SHA1 | Date | |
|---|---|---|---|
| 459becb1a9 | |||
| 1a38151b9a |
@ -481,7 +481,7 @@ namespace Learun.Application.Web.AppApi
|
||||
}
|
||||
else
|
||||
{
|
||||
prop.EnumDataCode += detail.DataItemName + GlobalObject.enum_separator + detail.DataItemNameEN + ",";//同时带出属性的中文和英文
|
||||
prop.EnumDataCode += detail.DataItemName + GlobalObject.enum_separator + detail.DataItemNameEN + ",";//右侧属性列表，同时带出属性的中文和英文
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -774,7 +774,7 @@ namespace Learun.Application.Web.AppApi
|
||||
}
|
||||
else
|
||||
{
|
||||
prop.EnumDataCode += detail.DataItemName + GlobalObject.enum_separator + detail.DataItemNameEN + ",";//同时带出属性的中文和英文
|
||||
prop.EnumDataCode += detail.DataItemName + GlobalObject.enum_separator + detail.DataItemNameEN + ",";//右侧属性列表，同时带出属性的中文和英文
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -29,6 +29,7 @@
|
||||
<input id="F_EnabledMark" type="checkbox" checked="checked" />
|
||||
有效
|
||||
</label>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-12 lr-form-item">
|
||||
|
||||
@ -29,6 +29,10 @@
|
||||
<input id="IsEnabled" type="checkbox" checked="checked" />
|
||||
有效
|
||||
</label>
|
||||
<label>
|
||||
<input id="ShowEN" type="checkbox" checked="checked" />
|
||||
同时显示英文
|
||||
</label>
|
||||
<label id="divIsAllowEdit" style="display:none;">
|
||||
<input id="IsAllowEdit" type="checkbox" checked="checked" />
|
||||
是否允许编辑
|
||||
|
||||
@ -100,6 +100,12 @@ var bootstrap = function ($, learun) {
|
||||
return cellvalue == 1 ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
|
||||
}
|
||||
},
|
||||
{
|
||||
label: "是否同时显示英文", name: "ShowEN", width: 50, align: "center",
|
||||
formatter: function (cellvalue) {
|
||||
return cellvalue == 1 ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
|
||||
}
|
||||
},
|
||||
{
|
||||
label: "是否允许编辑", name: "IsAllowEdit", width: 90, align: "center", ishide: ProjectId ? true : false,
|
||||
formatter: function (cellvalue) {
|
||||
|
||||
@ -3433,6 +3433,7 @@
|
||||
<Content Include="SQL\250307\Project\ec_archive_enginedata_3.sql" />
|
||||
<Content Include="SQL\250307\Project\ec_archive_property_3.sql" />
|
||||
<Content Include="SQL\250307\Project\ec_archive_rel_3.sql" />
|
||||
<Content Include="SQL\250829\Project\ec_dataItem.sql" />
|
||||
<Content Include="SQL\250829\NoProject\ec_project.sql" />
|
||||
<Content Include="SQL\250825\Project\DWG_PUBLISH.sql" />
|
||||
<Content Include="SQL\250728\Project\ec_layoutFilterP.sql" />
|
||||
@ -3659,7 +3660,6 @@
|
||||
<Folder Include="SQL\250328\NoProject\" />
|
||||
<Folder Include="SQL\250728\NoProject\" />
|
||||
<Folder Include="SQL\250825\NoProject\" />
|
||||
<Folder Include="SQL\250829\Project\" />
|
||||
<Folder Include="Views\PlotLayout\" />
|
||||
<Folder Include="Views\Property\" />
|
||||
</ItemGroup>
|
||||
|
||||
@ -0,0 +1 @@
|
||||
ALTER TABLE ec_dataitem ADD ShowEN int NULL COMMENT '是否同时显示英文';
|
||||
@ -184,21 +184,10 @@ var bootstrap = function ($, learun) {
|
||||
|
||||
|
||||
});
|
||||
//监测系统表导出 lr_export
|
||||
$('#lr_export').on('click', function () {
|
||||
|
||||
learun.loading(true, "导出中...");
|
||||
var iframeUrl = top.$.rootUrl + '/ZZDT_EC/ec_Wire_Group/IOModuleExportExcel?ProjId=' + ProjectId;
|
||||
var body = document.getElementsByTagName("body")[0];
|
||||
var downloadIframe = document.createElement("iframe");
|
||||
downloadIframe.setAttribute("src", iframeUrl);
|
||||
downloadIframe.setAttribute("style", "display:none;")
|
||||
body.appendChild(downloadIframe);
|
||||
learun.loading(false);
|
||||
});
|
||||
|
||||
|
||||
//数据导入
|
||||
|
||||
//信号数据导入
|
||||
$('#lr_import').on('click', function () {
|
||||
learun.layerForm({
|
||||
id: 'form',//窗口id
|
||||
@ -285,5 +274,7 @@ var bootstrap = function ($, learun) {
|
||||
refreshGirdData = function () {
|
||||
$('#gridtable').jfGridSet('reload');
|
||||
};
|
||||
|
||||
|
||||
page.init();
|
||||
}
|
||||
@ -80,6 +80,39 @@ var bootstrap = function ($, learun) {
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
//监测系统表导出 lr_export
|
||||
$('#lr_export').on('click', function () {
|
||||
|
||||
learun.loading(true, "导出中...");
|
||||
var iframeUrl = top.$.rootUrl + '/ZZDT_EC/ec_Wire_Group/IOModuleExportExcel?ProjId=' + ProjectId;
|
||||
var body = document.getElementsByTagName("body")[0];
|
||||
var downloadIframe = document.createElement("iframe");
|
||||
downloadIframe.setAttribute("src", iframeUrl);
|
||||
downloadIframe.setAttribute("style", "display:none;")
|
||||
body.appendChild(downloadIframe);
|
||||
learun.loading(false);
|
||||
});
|
||||
//监测数据表导入
|
||||
$('#lr_import').on('click', function () {
|
||||
var format = 'xlsx';
|
||||
var uploadKeyValue = Guid.NewGuid().toString();
|
||||
|
||||
learun.layerForm({
|
||||
id: 'import_IO',
|
||||
title: '监测表数据导入',
|
||||
url: top.$.rootUrl + '/LR_SystemModule/Annexes/UploadForm?keyVaule=' + uploadKeyValue + "&multiple=false" + "&format=" + format,
|
||||
width: 600,
|
||||
height: 400,
|
||||
maxmin: true,
|
||||
btn: ['确认'],
|
||||
callBack: function (id) {
|
||||
learun.layerClose('import_IO');
|
||||
import_IO(uploadKeyValue);
|
||||
}
|
||||
});
|
||||
});
|
||||
},
|
||||
initGird: function () {
|
||||
$('#gridtable').jfGrid({
|
||||
@ -106,5 +139,41 @@ var bootstrap = function ($, learun) {
|
||||
refreshGirdData = function () {
|
||||
$('#gridtable').jfGridSet('reload');
|
||||
};
|
||||
|
||||
|
||||
//监测数据表导入
|
||||
function import_IO(fileId) {
|
||||
var learun = top.learun;
|
||||
learun.loading(true, "监测表数据导入中...");
|
||||
$.ajax({
|
||||
type: 'POST',
|
||||
url: top.$.rootUrl + "/ZZDT_EC/ec_Wire_Group/IOModuleImportExcel?rdo=" + Math.random(),
|
||||
data: {
|
||||
fileId: fileId,
|
||||
ProjId: ProjectId
|
||||
},
|
||||
traditional: true,
|
||||
success: function (data) {
|
||||
var data = JSON.parse(data);
|
||||
if (data.code == '200') {
|
||||
learun.alert.success(data.info);
|
||||
} else {
|
||||
learun.alert.error(data.info);
|
||||
}
|
||||
|
||||
},
|
||||
error: function (msg) {
|
||||
learun.alert.error(msg);
|
||||
},
|
||||
complete: function (data) {
|
||||
learun.loading(false);
|
||||
if (!!thiscall) {
|
||||
thiscall();
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
page.init();
|
||||
}
|
||||
|
||||
@ -44,9 +44,14 @@ namespace Learun.Application.TwoDevelopment.ZZDT_EC
|
||||
/// </summary>
|
||||
public int? IsTree { get; set; }
|
||||
/// <summary>
|
||||
/// 是否允许编辑
|
||||
/// 是否允许编辑（一些系统自带的就不让编辑，比如be drawing type）
|
||||
/// </summary>
|
||||
public int? IsAllowEdit { get; set; }
|
||||
/// <summary>
|
||||
/// #Task 6599
|
||||
/// 是否需要换行（同时显示中英文）
|
||||
/// </summary>
|
||||
public int? ShowEN { get; set; }
|
||||
/// <summary>
|
||||
/// 备注
|
||||
/// </summary>
|
||||
|
||||
@ -175,7 +175,7 @@ namespace Learun.Application.TwoDevelopment.ZZDT_EC
|
||||
}
|
||||
else
|
||||
{
|
||||
objectTypeProp.EnumDataCode += detail.DataItemName + GlobalObject.enum_separator + detail.DataItemNameEN + ",";//同时带出属性的中文和英文
|
||||
objectTypeProp.EnumDataCode += detail.DataItemName + GlobalObject.enum_separator + detail.DataItemNameEN + ",";//右侧属性列表，同时带出属性的中文和英文
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user