diff --git a/web/WebMvc/Areas/configure/Views/BaseProject/ProjectOverview.cshtml b/web/WebMvc/Areas/configure/Views/BaseProject/ProjectOverview.cshtml
index 7648499..b7156cd 100644
--- a/web/WebMvc/Areas/configure/Views/BaseProject/ProjectOverview.cshtml
+++ b/web/WebMvc/Areas/configure/Views/BaseProject/ProjectOverview.cshtml
@@ -79,7 +79,7 @@
<div class="head-project-title">{{head.projectName}}</div>
</div>
<div class="head-project-route">
- <a href="/equipment/Equipment/Index" class="sys-a-det">切换到设备列表</a>
+ <a href="/equipment/BaseEquipment/Index" class="sys-a-det">切换到设备列表</a>
</div>
</div>
</div>
diff --git a/web/WebMvc/Areas/equipment/Controllers/BaseEquipmentTypeController.cs b/web/WebMvc/Areas/equipment/Controllers/BaseEquipmentTypeController.cs
index 083e726..3384ed8 100644
--- a/web/WebMvc/Areas/equipment/Controllers/BaseEquipmentTypeController.cs
+++ b/web/WebMvc/Areas/equipment/Controllers/BaseEquipmentTypeController.cs
@@ -32,10 +32,22 @@ namespace WebMvc.Areas.Equipment.Controllers
{
return View();
}
+
+
+ /// <summary>
+ /// 默认视图Action
+ /// </summary>
+ /// <returns></returns>
+ [Authenticate]
+ [ServiceFilter(typeof(OperLogFilter))]
+ public ActionResult IndexProjextAndEq()
+ {
+ return View();
+ }
#endregion
-
+
#region 数据操作
-
+
/// <summary>
/// 加载及分页查询
/// </summary>
diff --git a/web/WebMvc/Areas/equipment/Views/BaseEquipment/Index.cshtml b/web/WebMvc/Areas/equipment/Views/BaseEquipment/Index.cshtml
index 850c843..bfb2a91 100644
--- a/web/WebMvc/Areas/equipment/Views/BaseEquipment/Index.cshtml
+++ b/web/WebMvc/Areas/equipment/Views/BaseEquipment/Index.cshtml
@@ -4,9 +4,14 @@
Layout = "~/Views/Shared/_Layout.cshtml";
}
@section header
- {
+{
+
}
-
+<span class="layui-breadcrumb" lay-separator=">" lay-filter="demo">
+ <a href="/configure/BaseProject/ProjectOverview" style="padding-left: 18px;">项目概述</a>
+ <a href="/equipment/BaseEquipment/Index">设备列表</a>
+</span>
+<br />
<div id="listForm" class="layui-tab-item layui-show">
<form class="layui-form layui-form-pane" action="" lay-filter="listForm">
<div class="layui-form-item" id="panelSearch" hidden>
diff --git a/web/WebMvc/Areas/equipment/Views/Equipment/Index.cshtml b/web/WebMvc/Areas/equipment/Views/Equipment/Index.cshtml
deleted file mode 100644
index 0ae36d9..0000000
--- a/web/WebMvc/Areas/equipment/Views/Equipment/Index.cshtml
+++ /dev/null
@@ -1,247 +0,0 @@
-@{
- Layout = "~/Views/Shared/_Layout.cshtml";
-}
-@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
-@section header
-{
- <style type="text/css">
- .layui-form-label {
- width: 45% !important;
- text-align: right !important;
- }
-
- .hidden {
- display: none;
- }
-
- .show {
- display: block;
- }
-
- .layui-breadcrumb > * {
- font-size: 18px;
- }
- </style>
-}
-
-<span class="layui-breadcrumb" lay-separator=">" lay-filter="demo">
- <a href="/configure/BaseProject/ProjectOverview" style="padding-left: 18px;">项目概述</a>
- <a href="/equipment/Equipment/Index">设备列表</a>
-</span>
-<br />
-
-
-<div id="listForm" class="layui-tab-item layui-show">
- <form class="layui-form layui-form-pane" action="" lay-filter="listForm">
- <div class="layui-form-item" id="panelSearch" hidden>
- <fieldset class="layui-elem-field">
- <div class="layui-field-box" id="qform">
- <div class="layui-form-item layui-col-sm12">
- <div class="layui-inline toolList">
- <a href="javascript:;" class="layui-btn layui-btn-sm layui-btn-radius" data-type="btnQuery"><i class="layui-icon"></i>查询</a>
- <a href="javascript:;" class="layui-btn layui-btn-sm layui-btn-radius layui-btn-warm" data-type="btnReset"><i class="layui-icon"></i>重置</a>
- <a href="javascript:;" class="layui-btn layui-btn-sm layui-btn-radius layui-btn-danger" data-type="btnClose"><i class="layui-icon"></i>关闭</a>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-col-sm4">
- <label class="layui-form-label">设备编号</label>
- <div class="layui-input-inline">
- <input name="code" type="text" autocomplete="off" lay-verify="required" maxlength="32" class="layui-input">
- </div>
- </div>
- <div class="layui-col-sm4">
- <label class="layui-form-label">设备名称</label>
- <div class="layui-input-inline">
- <input name="name" type="text" autocomplete="off" lay-verify="required" maxlength="32" class="layui-input">
- </div>
- </div>
-
- <div class="layui-col-sm4">
- <label class="layui-form-label">工位</label>
- <div class="layui-input-inline">
- <select name="stationCode" class="Selector_Equipment ClearSelector_Equipment" lay-filter="eform"></select>
- </div>
- </div>
- </div>
- </div>
- </fieldset>
- </div>
- <table id="mainList" lay-filter="mainList"></table>
- </form>
-</div>
-
-<div id="modifyForm" class="layui-tab-item">
- <form class="layui-form layui-form-pane" action="" lay-filter="modifyForm" onsubmit="return false;">
- <div class="layui-card">
- <div class="layui-row">
- <div class="layui-col-sm6">
- <label class="layui-form-label layui-col-sm3">设备编号<label class="lable-required">*</label></label>
- <div class="layui-input-inline layui-col-sm6">
- <input name="code" type="text" autocomplete="off" lay-verify="required" maxlength="32" class="layui-input">
- </div>
- </div>
- <div class="layui-col-sm6">
- <label class="layui-form-label layui-col-sm3">设备名称<label class="lable-required">*</label></label>
- <div class="layui-input-inline layui-col-sm6">
- <input name="name" type="text" autocomplete="off" lay-verify="required" maxlength="32" class="layui-input">
- </div>
- </div>
- <div class="layui-col-sm6">
- <label class="layui-form-label layui-col-sm3">添加类型</label>
- <div class="layui-input-inline layui-col-sm6">
- <select name="addtypeindex" class="Selector_Equipment ClearSelector_Equipment" lay-filter="eform">
- <option value="1" selected>固定设备</option>
- <option value="2">行走小车</option>
- </select>
- </div>
- </div>
- <div class="layui-col-sm6" id="StationCode">
- <label class="layui-form-label layui-col-sm3">工位<label class="lable-required">*</label></label>
- <div class="layui-input-inline layui-col-sm6">
- <select name="stationCode" class="Selector_Equipment ClearSelector_Equipment" lay-filter="eform"></select>
- </div>
- </div>
- <div class="layui-col-sm6 hidden" id="LineCode">
- <label class="layui-form-label layui-col-sm3">线体<label class="lable-required">*</label></label>
- <div class="layui-input-inline layui-col-sm6">
- <select name="lineId" class="Selector_Equipment ClearSelector_Equipment" lay-filter="eform"></select>
- </div>
- </div>
- <div class="layui-col-sm6">
- <label class="layui-form-label layui-col-sm3">设备IP地址</label>
- <div class="layui-input-inline layui-col-sm6">
- <input name="ip" type="text" autocomplete="off" lay-verify="" maxlength="32" class="layui-input">
- </div>
- </div>
- <div class="layui-col-sm6">
- <label class="layui-form-label layui-col-sm3">OPC连接名</label>
- <div class="layui-input-inline layui-col-sm6">
- <input name="connectName" type="text" autocomplete="off" lay-verify="" maxlength="32" class="layui-input">
- </div>
- </div>
- <div class="layui-col-sm6">
- <label class="layui-form-label layui-col-sm5">对应IED的IP</label>
- <div class="layui-input-inline layui-col-sm6">
- <input name="ledip" type="text" autocomplete="off" lay-verify="" maxlength="32" class="layui-input">
- </div>
- </div>
- <div class="layui-col-sm6">
- <label class="layui-form-label layui-col-sm3">设备类型<label class="lable-required">*</label></label>
- <div class="layui-input-inline layui-col-sm6">
- <select name="equipmentTypeId" class="Selector_Equipment ClearSelector_Equipment" lay-verify="required" lay-filter="eform"></select>
- </div>
- </div>
- <div class="layui-col-sm6">
- <label class="layui-form-label layui-col-sm3">是否启用<label class="lable-required">*</label></label>
- <div class="layui-input-inline layui-col-sm6">
- <select name="enable" class="Selector_Equipment ClearSelector_Equipment" lay-verify="required" lay-filter="eform"></select>
- </div>
- </div>
- <div class="layui-col-sm6">
- <label class="layui-form-label layui-col-sm3">巷道<label class="lable-required">*</label></label>
- <div class="layui-input-inline layui-col-sm6">
- <input name="roadWay" type="text" autocomplete="off" lay-verify="required" lay-filter="eform" class="layui-input NumText">
- </div>
- </div>
- <div class="layui-col-sm6">
- <label class="layui-form-label layui-col-sm3">目标区域</label>
- <div class="layui-input-inline layui-col-sm6">
- <input name="destinationArea" type="text" autocomplete="off" lay-verify="" maxlength="50" class="layui-input">
- </div>
- </div>
- <div class="layui-col-sm6">
- <label class="layui-form-label layui-col-sm3">目的地址</label>
- <div class="layui-input-inline layui-col-sm6">
- <input name="goAddress" type="text" autocomplete="off" lay-verify="" maxlength="50" class="layui-input">
- </div>
- </div>
- <div class="layui-col-sm6">
- <label class="layui-form-label layui-col-sm3">自身地址</label>
- <div class="layui-input-inline layui-col-sm6">
- <input name="selfAddress" type="text" autocomplete="off" lay-verify="" maxlength="50" class="layui-input">
- </div>
- </div>
- <div class="layui-col-sm6">
- <label class="layui-form-label layui-col-sm3">回退地址</label>
- <div class="layui-input-inline layui-col-sm6">
- <input name="backAddress" type="text" autocomplete="off" lay-verify="" maxlength="50" class="layui-input">
- </div>
- </div>
- <div class="layui-col-sm6">
- <label class="layui-form-label layui-col-sm3">站台编码<label class="lable-required">*</label></label>
- <div class="layui-input-inline layui-col-sm6">
- <input name="stationIndex" type="text" autocomplete="off" lay-verify="required" class="layui-input NumText">
- </div>
- </div>
- <div class="layui-col-sm6">
- <label class="layui-form-label layui-col-sm3">第一台堆垛机排索引<label class="lable-required">*</label></label>
- <div class="layui-input-inline layui-col-sm6">
- <input name="rowIndex1" type="text" autocomplete="off" lay-verify="required" class="layui-input NumText">
- </div>
- </div>
- <div class="layui-col-sm6">
- <label class="layui-form-label layui-col-sm3">第二台堆垛机排索引<label class="lable-required">*</label></label>
- <div class="layui-input-inline layui-col-sm6">
- <input name="rowIndex2" type="text" autocomplete="off" lay-verify="required" class="layui-input NumText">
- </div>
- </div>
- <div class="layui-col-sm6">
- <label class="layui-form-label layui-col-sm3">列<label class="lable-required">*</label></label>
- <div class="layui-input-inline layui-col-sm6">
- <input name="columnIndex" type="text" autocomplete="off" lay-verify="required" class="layui-input NumText">
- </div>
- </div>
- <div class="layui-col-sm6">
- <label class="layui-form-label layui-col-sm3">层<label class="lable-required">*</label></label>
- <div class="layui-input-inline layui-col-sm6">
- <input name="layerIndex" type="text" autocomplete="off" lay-verify="required" class="layui-input NumText">
- </div>
- </div>
- <div class="layui-col-sm6">
- <label class="layui-form-label layui-col-sm3">PLC的DB地址</label>
- <div class="layui-input-inline layui-col-sm6">
- <input name="basePlcDB" type="text" autocomplete="off" lay-verify="" maxlength="50" class="layui-input">
- </div>
- </div>
- <div class="layui-col-sm6">
- <label class="layui-form-label layui-col-sm3">外部编码</label>
- <div class="layui-input-inline layui-col-sm6">
- <input name="otherCode" type="text" autocomplete="off" lay-verify="" maxlength="32" class="layui-input">
- </div>
- </div>
- <!--表单验证按钮-->
- <button class="layui-btn" style="display:none" name="fromAdd" lay-filter="fromAdd" lay-submit>fromAdd</button>
- <button class="layui-btn" style="display:none" name="fromUpdate" lay-filter="fromUpdate" lay-submit>fromUpdate</button>
- </div>
- </div>
- <div hidden>
- <input name="id" readonly type="text" class="layui-input">
- @*<input name="code" type="text" readonly class="layui-input">*@
- <input name="workshopId" type="text" readonly class="layui-input">
- <input name="factoryId" type="text" readonly class="layui-input">
- <input name="lineCode" type="text" readonly class="layui-input">
- <input name="WarehouseCode" readonly class="layui-input">
- <input name="outAddress" readonly class="layui-input">
-
-
- <input name="createBy" type="text" readonly class="layui-input">
- <input name="createTime" type="text" readonly class="layui-input">
- <input name="updateTime" type="text" readonly class="layui-input">
- <input name="updateBy" type="text" readonly class="layui-input">
- </div>
- </form>
-</div>
-
-<script type="text/html" id="toolbarTable">
- <div class="layui-btn-container">
- <a href="javascript:;" class="layui-btn layui-btn-sm layui-btn-mini" lay-event="btnSelect"><i class="layui-icon"></i>检索</a>
- <a href="javascript:;" class="layui-btn layui-btn-sm layui-btn-mini" lay-event="btnRefresh"><i class="layui-icon"></i>刷新</a>
- {{ loadMenus("Equipment", 1) }}
- </div>
-</script>
-
-@section Scripts
-{
- <script type="text/javascript" src="/productjs/equipment/Equipment.js" asp-append-version="true"></script>
-}
\ No newline at end of file
diff --git a/web/WebMvc/Views/Shared/_Layout.cshtml b/web/WebMvc/Views/Shared/_Layout.cshtml
index 70aa944..899b916 100644
--- a/web/WebMvc/Views/Shared/_Layout.cshtml
+++ b/web/WebMvc/Views/Shared/_Layout.cshtml
@@ -44,9 +44,11 @@
.sys-a-det{text-decoration: underline; color: blue; }
/*面包屑*/
+ .layui-breadcrumb { padding-left: 5px;}
.layui-breadcrumb > * {font-size: 18px;}
- .layui-breadcrumb a{border-left: 8px solid #5fb878;padding-left: 18px;}
+ .layui-breadcrumb a{border-left: 8px solid #5fb878;padding-left: 12px;}
.layui-breadcrumb :first-child{padding-left: 18px;}
+ .layui-breadcrumb a:last-child {font-weight: bold; color: #000 !important; }
</style>
<script>