diff --git a/web/WebMvc/Areas/configure/Views/BaseProject/ProjectOverview.cshtml b/web/WebMvc/Areas/configure/Views/BaseProject/ProjectOverview.cshtml
index b7156cd..b69e897 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/BaseEquipment/Index" class="sys-a-det">切换到设备列表</a>
+ <a href="/equipment/BaseEquipment/IndexProjextAndEq" class="sys-a-det">切换到设备列表</a>
</div>
</div>
</div>
diff --git a/web/WebMvc/Areas/equipment/Controllers/BaseEquipmentController.cs b/web/WebMvc/Areas/equipment/Controllers/BaseEquipmentController.cs
index f176e32..11ce5a6 100644
--- a/web/WebMvc/Areas/equipment/Controllers/BaseEquipmentController.cs
+++ b/web/WebMvc/Areas/equipment/Controllers/BaseEquipmentController.cs
@@ -32,10 +32,21 @@ 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/Controllers/BaseEquipmentTypeController.cs b/web/WebMvc/Areas/equipment/Controllers/BaseEquipmentTypeController.cs
index 3384ed8..6fbe572 100644
--- a/web/WebMvc/Areas/equipment/Controllers/BaseEquipmentTypeController.cs
+++ b/web/WebMvc/Areas/equipment/Controllers/BaseEquipmentTypeController.cs
@@ -32,18 +32,6 @@ namespace WebMvc.Areas.Equipment.Controllers
{
return View();
}
-
-
- /// <summary>
- /// 默认视图Action
- /// </summary>
- /// <returns></returns>
- [Authenticate]
- [ServiceFilter(typeof(OperLogFilter))]
- public ActionResult IndexProjextAndEq()
- {
- return View();
- }
#endregion
#region 数据操作
diff --git a/web/WebMvc/Areas/equipment/Views/BaseEquipment/IndexProjextAndEq.cshtml b/web/WebMvc/Areas/equipment/Views/BaseEquipment/IndexProjextAndEq.cshtml
new file mode 100644
index 0000000..4b3e3da
--- /dev/null
+++ b/web/WebMvc/Areas/equipment/Views/BaseEquipment/IndexProjextAndEq.cshtml
@@ -0,0 +1,143 @@
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@{
+ ViewData["title"] = "设备管理";
+ 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/IndexProjextAndEq">设备列表</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-sm3">
+ <label class="layui-form-label">设备编码</label>
+ <div class="layui-input-inline">
+ <input name="equipmentCode" type="text" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-col-sm3">
+ <label class="layui-form-label">设备名</label>
+ <div class="layui-input-inline">
+ <input name="equipmentName" type="text" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-col-sm3">
+ <label class="layui-form-label">项目</label>
+ <div class="layui-input-inline">
+ <select name="projectKeys" class="layui-select">
+ </select>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </fieldset>
+ </div>
+ </form>
+ <table id="mainList" lay-filter="mainList"></table>
+</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-row">
+ <div class="layui-col-sm6">
+ <label class="layui-form-label layui-col-sm3">设备编码<span class="lable-required">*</span></label>
+ <div class="layui-input-inline layui-col-sm6">
+ <input type="text" name="equipmentCode" lay-verify="required" maxlength="20" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-col-sm6">
+ <label class="layui-form-label layui-col-sm3">设备名<span class="lable-required">*</span></label>
+ <div class="layui-input-inline layui-col-sm6">
+ <input type="text" name="equipmentName" lay-verify="required" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-col-sm6">
+ <label class="layui-form-label layui-col-sm3">所属项目<span class="lable-required">*</span></label>
+ <div class="layui-input-inline layui-col-sm6">
+ <select name="projectKeys" class="layui-select" lay-verify="required">
+ </select>
+ </div>
+ </div>
+ <div class="layui-col-sm6">
+ <label class="layui-form-label layui-col-sm3">所属厂房<span class="lable-required">*</span></label>
+ <div class="layui-input-inline layui-col-sm6">
+ <select name="factoryCode" class="layui-select" lay-verify="required">
+ </select>
+ </div>
+ </div>
+ <div class="layui-col-sm6">
+ <label class="layui-form-label layui-col-sm3">设备类型<span class="lable-required">*</span></label>
+ <div class="layui-input-inline layui-col-sm6">
+ <select name="equipmentTypeCode" lay-verify="required" class="layui-select"></select>
+ </div>
+ </div>
+ <div class="layui-col-sm6">
+ <label class="layui-form-label layui-col-sm3">保养规则<span class="lable-required">*</span></label>
+ <div class="layui-input-inline layui-col-sm6">
+ <select name="equipmentMaintainRuleCode" lay-verify="required" class="layui-select"></select>
+ </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 type="text" name="destinationArea" autocomplete="off" 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">
+ <textarea name="remark" cols="22" rows="5" maxlength="250"></textarea>
+ </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 type="checkbox" name="isEnable" lay-skin="switch" lay-text="启用|禁用" checked="checked" value="1">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <!--表单验证按钮-->
+ <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" type="text" class="layui-input">
+ <input type="text" name="ip" autocomplete="off" class="layui-input">
+ <input name="createBy" type="text" class="layui-input">
+ <input name="createTime" type="text" class="layui-input">
+ <input name="updateTime" type="text" class="layui-input">
+ <input name="updateBy" type="text" 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>
+ </div>
+</script>
+
+@section Scripts
+ {
+ <script type="text/javascript" src="/productjs/equipment/BaseEquipment.js" asp-append-version="true"></script>
+}
\ No newline at end of file