Commit 064e891d84f332ec4e958489546cc1bd70b75a27
1 parent
4c11ac8a
--
Showing
4 changed files
with
157 additions
and
15 deletions
web/WebMvc/Areas/configure/Views/BaseProject/ProjectOverview.cshtml
| ... | ... | @@ -79,7 +79,7 @@ |
| 79 | 79 | <div class="head-project-title">{{head.projectName}}</div> |
| 80 | 80 | </div> |
| 81 | 81 | <div class="head-project-route"> |
| 82 | - <a href="/equipment/BaseEquipment/Index" class="sys-a-det">切换到设备列表</a> | |
| 82 | + <a href="/equipment/BaseEquipment/IndexProjextAndEq" class="sys-a-det">切换到设备列表</a> | |
| 83 | 83 | </div> |
| 84 | 84 | </div> |
| 85 | 85 | </div> |
| ... | ... |
web/WebMvc/Areas/equipment/Controllers/BaseEquipmentController.cs
| ... | ... | @@ -32,10 +32,21 @@ namespace WebMvc.Areas.Equipment.Controllers |
| 32 | 32 | { |
| 33 | 33 | return View(); |
| 34 | 34 | } |
| 35 | + | |
| 36 | + /// <summary> | |
| 37 | + /// 默认视图Action | |
| 38 | + /// </summary> | |
| 39 | + /// <returns></returns> | |
| 40 | + [Authenticate] | |
| 41 | + [ServiceFilter(typeof(OperLogFilter))] | |
| 42 | + public ActionResult IndexProjextAndEq() | |
| 43 | + { | |
| 44 | + return View(); | |
| 45 | + } | |
| 35 | 46 | #endregion |
| 36 | - | |
| 47 | + | |
| 37 | 48 | #region 数据操作 |
| 38 | - | |
| 49 | + | |
| 39 | 50 | /// <summary> |
| 40 | 51 | /// 加载及分页查询 |
| 41 | 52 | /// </summary> |
| ... | ... |
web/WebMvc/Areas/equipment/Controllers/BaseEquipmentTypeController.cs
| ... | ... | @@ -32,18 +32,6 @@ namespace WebMvc.Areas.Equipment.Controllers |
| 32 | 32 | { |
| 33 | 33 | return View(); |
| 34 | 34 | } |
| 35 | - | |
| 36 | - | |
| 37 | - /// <summary> | |
| 38 | - /// 默认视图Action | |
| 39 | - /// </summary> | |
| 40 | - /// <returns></returns> | |
| 41 | - [Authenticate] | |
| 42 | - [ServiceFilter(typeof(OperLogFilter))] | |
| 43 | - public ActionResult IndexProjextAndEq() | |
| 44 | - { | |
| 45 | - return View(); | |
| 46 | - } | |
| 47 | 35 | #endregion |
| 48 | 36 | |
| 49 | 37 | #region 数据操作 |
| ... | ... |
web/WebMvc/Areas/equipment/Views/BaseEquipment/IndexProjextAndEq.cshtml
0 → 100644
| 1 | +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers | |
| 2 | +@{ | |
| 3 | + ViewData["title"] = "设备管理"; | |
| 4 | + Layout = "~/Views/Shared/_Layout.cshtml"; | |
| 5 | +} | |
| 6 | +@section header | |
| 7 | +{ | |
| 8 | + | |
| 9 | +} | |
| 10 | +<span class="layui-breadcrumb" lay-separator=">" lay-filter="demo"> | |
| 11 | + <a href="/configure/BaseProject/ProjectOverview" style="padding-left: 18px;">项目概述</a> | |
| 12 | + <a href="/equipment/BaseEquipment/IndexProjextAndEq">设备列表</a> | |
| 13 | +</span> | |
| 14 | +<br /> | |
| 15 | +<div id="listForm" class="layui-tab-item layui-show"> | |
| 16 | + <form class="layui-form layui-form-pane" action="" lay-filter="listForm"> | |
| 17 | + <div class="layui-form-item" id="panelSearch" hidden> | |
| 18 | + <fieldset class="layui-elem-field"> | |
| 19 | + | |
| 20 | + <div class="layui-field-box" id="qform"> | |
| 21 | + <div class="layui-form-item layui-col-sm12"> | |
| 22 | + <div class="layui-inline toolList"> | |
| 23 | + <a href="javascript:;" class="layui-btn layui-btn-sm layui-btn-radius" data-type="btnQuery"><i class="layui-icon"></i>查询</a> | |
| 24 | + <a href="javascript:;" class="layui-btn layui-btn-sm layui-btn-radius layui-btn-warm" data-type="btnReset"><i class="layui-icon"></i>重置</a> | |
| 25 | + <a href="javascript:;" class="layui-btn layui-btn-sm layui-btn-radius layui-btn-danger" data-type="btnClose"><i class="layui-icon"></i>关闭</a> | |
| 26 | + </div> | |
| 27 | + </div> | |
| 28 | + <div class="layui-row"> | |
| 29 | + <div class="layui-col-sm3"> | |
| 30 | + <label class="layui-form-label">设备编码</label> | |
| 31 | + <div class="layui-input-inline"> | |
| 32 | + <input name="equipmentCode" type="text" autocomplete="off" class="layui-input"> | |
| 33 | + </div> | |
| 34 | + </div> | |
| 35 | + <div class="layui-col-sm3"> | |
| 36 | + <label class="layui-form-label">设备名</label> | |
| 37 | + <div class="layui-input-inline"> | |
| 38 | + <input name="equipmentName" type="text" autocomplete="off" class="layui-input"> | |
| 39 | + </div> | |
| 40 | + </div> | |
| 41 | + <div class="layui-col-sm3"> | |
| 42 | + <label class="layui-form-label">项目</label> | |
| 43 | + <div class="layui-input-inline"> | |
| 44 | + <select name="projectKeys" class="layui-select"> | |
| 45 | + </select> | |
| 46 | + </div> | |
| 47 | + </div> | |
| 48 | + | |
| 49 | + </div> | |
| 50 | + </div> | |
| 51 | + </fieldset> | |
| 52 | + </div> | |
| 53 | + </form> | |
| 54 | + <table id="mainList" lay-filter="mainList"></table> | |
| 55 | +</div> | |
| 56 | + | |
| 57 | +<div id="modifyForm" class="layui-tab-item"> | |
| 58 | + <form class="layui-form layui-form-pane" action="" lay-filter="modifyForm" onsubmit="return false;"> | |
| 59 | + <div class="layui-row"> | |
| 60 | + <div class="layui-col-sm6"> | |
| 61 | + <label class="layui-form-label layui-col-sm3">设备编码<span class="lable-required">*</span></label> | |
| 62 | + <div class="layui-input-inline layui-col-sm6"> | |
| 63 | + <input type="text" name="equipmentCode" lay-verify="required" maxlength="20" autocomplete="off" class="layui-input"> | |
| 64 | + </div> | |
| 65 | + </div> | |
| 66 | + <div class="layui-col-sm6"> | |
| 67 | + <label class="layui-form-label layui-col-sm3">设备名<span class="lable-required">*</span></label> | |
| 68 | + <div class="layui-input-inline layui-col-sm6"> | |
| 69 | + <input type="text" name="equipmentName" lay-verify="required" autocomplete="off" class="layui-input"> | |
| 70 | + </div> | |
| 71 | + </div> | |
| 72 | + <div class="layui-col-sm6"> | |
| 73 | + <label class="layui-form-label layui-col-sm3">所属项目<span class="lable-required">*</span></label> | |
| 74 | + <div class="layui-input-inline layui-col-sm6"> | |
| 75 | + <select name="projectKeys" class="layui-select" lay-verify="required"> | |
| 76 | + </select> | |
| 77 | + </div> | |
| 78 | + </div> | |
| 79 | + <div class="layui-col-sm6"> | |
| 80 | + <label class="layui-form-label layui-col-sm3">所属厂房<span class="lable-required">*</span></label> | |
| 81 | + <div class="layui-input-inline layui-col-sm6"> | |
| 82 | + <select name="factoryCode" class="layui-select" lay-verify="required"> | |
| 83 | + </select> | |
| 84 | + </div> | |
| 85 | + </div> | |
| 86 | + <div class="layui-col-sm6"> | |
| 87 | + <label class="layui-form-label layui-col-sm3">设备类型<span class="lable-required">*</span></label> | |
| 88 | + <div class="layui-input-inline layui-col-sm6"> | |
| 89 | + <select name="equipmentTypeCode" lay-verify="required" class="layui-select"></select> | |
| 90 | + </div> | |
| 91 | + </div> | |
| 92 | + <div class="layui-col-sm6"> | |
| 93 | + <label class="layui-form-label layui-col-sm3">保养规则<span class="lable-required">*</span></label> | |
| 94 | + <div class="layui-input-inline layui-col-sm6"> | |
| 95 | + <select name="equipmentMaintainRuleCode" lay-verify="required" class="layui-select"></select> | |
| 96 | + </div> | |
| 97 | + </div> | |
| 98 | + <div class="layui-col-sm6"> | |
| 99 | + <label class="layui-form-label layui-col-sm3">所在区域</label> | |
| 100 | + <div class="layui-input-inline layui-col-sm6"> | |
| 101 | + <input type="text" name="destinationArea" autocomplete="off" class="layui-input"> | |
| 102 | + </div> | |
| 103 | + </div> | |
| 104 | + <div class="layui-col-sm6"> | |
| 105 | + <label class="layui-form-label layui-col-sm3">描述</label> | |
| 106 | + <div class="layui-input-inline layui-col-sm6"> | |
| 107 | + <textarea name="remark" cols="22" rows="5" maxlength="250"></textarea> | |
| 108 | + </div> | |
| 109 | + </div> | |
| 110 | + <div class="layui-col-sm6"> | |
| 111 | + <label class="layui-form-label layui-col-sm3">是否启用</label> | |
| 112 | + <div class="layui-input-inline layui-col-sm6"> | |
| 113 | + <input type="checkbox" name="isEnable" lay-skin="switch" lay-text="启用|禁用" checked="checked" value="1"> | |
| 114 | + </div> | |
| 115 | + </div> | |
| 116 | + <div class="layui-form-item"> | |
| 117 | + <!--表单验证按钮--> | |
| 118 | + <button class="layui-btn" style="display:none" name="fromAdd" lay-filter="fromAdd" lay-submit>fromAdd</button> | |
| 119 | + <button class="layui-btn" style="display:none" name="fromUpdate" lay-filter="fromUpdate" lay-submit>fromUpdate</button> | |
| 120 | + </div> | |
| 121 | + </div> | |
| 122 | + <div hidden> | |
| 123 | + <input name="id" type="text" class="layui-input"> | |
| 124 | + <input type="text" name="ip" autocomplete="off" class="layui-input"> | |
| 125 | + <input name="createBy" type="text" class="layui-input"> | |
| 126 | + <input name="createTime" type="text" class="layui-input"> | |
| 127 | + <input name="updateTime" type="text" class="layui-input"> | |
| 128 | + <input name="updateBy" type="text" class="layui-input"> | |
| 129 | + </div> | |
| 130 | + </form> | |
| 131 | +</div> | |
| 132 | + | |
| 133 | +<script type="text/html" id="toolbarTable"> | |
| 134 | + <div class="layui-btn-container"> | |
| 135 | + <a href="javascript:;" class="layui-btn layui-btn-sm layui-btn-mini" lay-event="btnSelect"><i class="layui-icon"></i>检索</a> | |
| 136 | + <a href="javascript:;" class="layui-btn layui-btn-sm layui-btn-mini" lay-event="btnRefresh"><i class="layui-icon"></i>刷新</a> | |
| 137 | + </div> | |
| 138 | +</script> | |
| 139 | + | |
| 140 | +@section Scripts | |
| 141 | + { | |
| 142 | + <script type="text/javascript" src="/productjs/equipment/BaseEquipment.js" asp-append-version="true"></script> | |
| 143 | +} | |
| 0 | 144 | \ No newline at end of file |
| ... | ... |