Commit 4c11ac8a4e10fe638152d8c7e01c63935a6a67cf
1 parent
3c4b79d0
--项目设备
Showing
5 changed files
with
25 additions
and
253 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/Equipment/Index" class="sys-a-det">切换到设备列表</a> | |
| 82 | + <a href="/equipment/BaseEquipment/Index" class="sys-a-det">切换到设备列表</a> | |
| 83 | 83 | </div> |
| 84 | 84 | </div> |
| 85 | 85 | </div> |
| ... | ... |
web/WebMvc/Areas/equipment/Controllers/BaseEquipmentTypeController.cs
| ... | ... | @@ -32,10 +32,22 @@ 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 | + } | |
| 35 | 47 | #endregion |
| 36 | - | |
| 48 | + | |
| 37 | 49 | #region 数据操作 |
| 38 | - | |
| 50 | + | |
| 39 | 51 | /// <summary> |
| 40 | 52 | /// 加载及分页查询 |
| 41 | 53 | /// </summary> |
| ... | ... |
web/WebMvc/Areas/equipment/Views/BaseEquipment/Index.cshtml
| ... | ... | @@ -4,9 +4,14 @@ |
| 4 | 4 | Layout = "~/Views/Shared/_Layout.cshtml"; |
| 5 | 5 | } |
| 6 | 6 | @section header |
| 7 | - { | |
| 7 | +{ | |
| 8 | + | |
| 8 | 9 | } |
| 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/Index">设备列表</a> | |
| 13 | +</span> | |
| 14 | +<br /> | |
| 10 | 15 | <div id="listForm" class="layui-tab-item layui-show"> |
| 11 | 16 | <form class="layui-form layui-form-pane" action="" lay-filter="listForm"> |
| 12 | 17 | <div class="layui-form-item" id="panelSearch" hidden> |
| ... | ... |
web/WebMvc/Areas/equipment/Views/Equipment/Index.cshtml deleted
| 1 | -@{ | |
| 2 | - Layout = "~/Views/Shared/_Layout.cshtml"; | |
| 3 | -} | |
| 4 | -@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers | |
| 5 | -@section header | |
| 6 | -{ | |
| 7 | - <style type="text/css"> | |
| 8 | - .layui-form-label { | |
| 9 | - width: 45% !important; | |
| 10 | - text-align: right !important; | |
| 11 | - } | |
| 12 | - | |
| 13 | - .hidden { | |
| 14 | - display: none; | |
| 15 | - } | |
| 16 | - | |
| 17 | - .show { | |
| 18 | - display: block; | |
| 19 | - } | |
| 20 | - | |
| 21 | - .layui-breadcrumb > * { | |
| 22 | - font-size: 18px; | |
| 23 | - } | |
| 24 | - </style> | |
| 25 | -} | |
| 26 | - | |
| 27 | -<span class="layui-breadcrumb" lay-separator=">" lay-filter="demo"> | |
| 28 | - <a href="/configure/BaseProject/ProjectOverview" style="padding-left: 18px;">项目概述</a> | |
| 29 | - <a href="/equipment/Equipment/Index">设备列表</a> | |
| 30 | -</span> | |
| 31 | -<br /> | |
| 32 | - | |
| 33 | - | |
| 34 | -<div id="listForm" class="layui-tab-item layui-show"> | |
| 35 | - <form class="layui-form layui-form-pane" action="" lay-filter="listForm"> | |
| 36 | - <div class="layui-form-item" id="panelSearch" hidden> | |
| 37 | - <fieldset class="layui-elem-field"> | |
| 38 | - <div class="layui-field-box" id="qform"> | |
| 39 | - <div class="layui-form-item layui-col-sm12"> | |
| 40 | - <div class="layui-inline toolList"> | |
| 41 | - <a href="javascript:;" class="layui-btn layui-btn-sm layui-btn-radius" data-type="btnQuery"><i class="layui-icon"></i>查询</a> | |
| 42 | - <a href="javascript:;" class="layui-btn layui-btn-sm layui-btn-radius layui-btn-warm" data-type="btnReset"><i class="layui-icon"></i>重置</a> | |
| 43 | - <a href="javascript:;" class="layui-btn layui-btn-sm layui-btn-radius layui-btn-danger" data-type="btnClose"><i class="layui-icon"></i>关闭</a> | |
| 44 | - </div> | |
| 45 | - </div> | |
| 46 | - <div class="layui-row"> | |
| 47 | - <div class="layui-col-sm4"> | |
| 48 | - <label class="layui-form-label">设备编号</label> | |
| 49 | - <div class="layui-input-inline"> | |
| 50 | - <input name="code" type="text" autocomplete="off" lay-verify="required" maxlength="32" class="layui-input"> | |
| 51 | - </div> | |
| 52 | - </div> | |
| 53 | - <div class="layui-col-sm4"> | |
| 54 | - <label class="layui-form-label">设备名称</label> | |
| 55 | - <div class="layui-input-inline"> | |
| 56 | - <input name="name" type="text" autocomplete="off" lay-verify="required" maxlength="32" class="layui-input"> | |
| 57 | - </div> | |
| 58 | - </div> | |
| 59 | - | |
| 60 | - <div class="layui-col-sm4"> | |
| 61 | - <label class="layui-form-label">工位</label> | |
| 62 | - <div class="layui-input-inline"> | |
| 63 | - <select name="stationCode" class="Selector_Equipment ClearSelector_Equipment" lay-filter="eform"></select> | |
| 64 | - </div> | |
| 65 | - </div> | |
| 66 | - </div> | |
| 67 | - </div> | |
| 68 | - </fieldset> | |
| 69 | - </div> | |
| 70 | - <table id="mainList" lay-filter="mainList"></table> | |
| 71 | - </form> | |
| 72 | -</div> | |
| 73 | - | |
| 74 | -<div id="modifyForm" class="layui-tab-item"> | |
| 75 | - <form class="layui-form layui-form-pane" action="" lay-filter="modifyForm" onsubmit="return false;"> | |
| 76 | - <div class="layui-card"> | |
| 77 | - <div class="layui-row"> | |
| 78 | - <div class="layui-col-sm6"> | |
| 79 | - <label class="layui-form-label layui-col-sm3">设备编号<label class="lable-required">*</label></label> | |
| 80 | - <div class="layui-input-inline layui-col-sm6"> | |
| 81 | - <input name="code" type="text" autocomplete="off" lay-verify="required" maxlength="32" class="layui-input"> | |
| 82 | - </div> | |
| 83 | - </div> | |
| 84 | - <div class="layui-col-sm6"> | |
| 85 | - <label class="layui-form-label layui-col-sm3">设备名称<label class="lable-required">*</label></label> | |
| 86 | - <div class="layui-input-inline layui-col-sm6"> | |
| 87 | - <input name="name" type="text" autocomplete="off" lay-verify="required" maxlength="32" class="layui-input"> | |
| 88 | - </div> | |
| 89 | - </div> | |
| 90 | - <div class="layui-col-sm6"> | |
| 91 | - <label class="layui-form-label layui-col-sm3">添加类型</label> | |
| 92 | - <div class="layui-input-inline layui-col-sm6"> | |
| 93 | - <select name="addtypeindex" class="Selector_Equipment ClearSelector_Equipment" lay-filter="eform"> | |
| 94 | - <option value="1" selected>固定设备</option> | |
| 95 | - <option value="2">行走小车</option> | |
| 96 | - </select> | |
| 97 | - </div> | |
| 98 | - </div> | |
| 99 | - <div class="layui-col-sm6" id="StationCode"> | |
| 100 | - <label class="layui-form-label layui-col-sm3">工位<label class="lable-required">*</label></label> | |
| 101 | - <div class="layui-input-inline layui-col-sm6"> | |
| 102 | - <select name="stationCode" class="Selector_Equipment ClearSelector_Equipment" lay-filter="eform"></select> | |
| 103 | - </div> | |
| 104 | - </div> | |
| 105 | - <div class="layui-col-sm6 hidden" id="LineCode"> | |
| 106 | - <label class="layui-form-label layui-col-sm3">线体<label class="lable-required">*</label></label> | |
| 107 | - <div class="layui-input-inline layui-col-sm6"> | |
| 108 | - <select name="lineId" class="Selector_Equipment ClearSelector_Equipment" lay-filter="eform"></select> | |
| 109 | - </div> | |
| 110 | - </div> | |
| 111 | - <div class="layui-col-sm6"> | |
| 112 | - <label class="layui-form-label layui-col-sm3">设备IP地址</label> | |
| 113 | - <div class="layui-input-inline layui-col-sm6"> | |
| 114 | - <input name="ip" type="text" autocomplete="off" lay-verify="" maxlength="32" class="layui-input"> | |
| 115 | - </div> | |
| 116 | - </div> | |
| 117 | - <div class="layui-col-sm6"> | |
| 118 | - <label class="layui-form-label layui-col-sm3">OPC连接名</label> | |
| 119 | - <div class="layui-input-inline layui-col-sm6"> | |
| 120 | - <input name="connectName" type="text" autocomplete="off" lay-verify="" maxlength="32" class="layui-input"> | |
| 121 | - </div> | |
| 122 | - </div> | |
| 123 | - <div class="layui-col-sm6"> | |
| 124 | - <label class="layui-form-label layui-col-sm5">对应IED的IP</label> | |
| 125 | - <div class="layui-input-inline layui-col-sm6"> | |
| 126 | - <input name="ledip" type="text" autocomplete="off" lay-verify="" maxlength="32" class="layui-input"> | |
| 127 | - </div> | |
| 128 | - </div> | |
| 129 | - <div class="layui-col-sm6"> | |
| 130 | - <label class="layui-form-label layui-col-sm3">设备类型<label class="lable-required">*</label></label> | |
| 131 | - <div class="layui-input-inline layui-col-sm6"> | |
| 132 | - <select name="equipmentTypeId" class="Selector_Equipment ClearSelector_Equipment" lay-verify="required" lay-filter="eform"></select> | |
| 133 | - </div> | |
| 134 | - </div> | |
| 135 | - <div class="layui-col-sm6"> | |
| 136 | - <label class="layui-form-label layui-col-sm3">是否启用<label class="lable-required">*</label></label> | |
| 137 | - <div class="layui-input-inline layui-col-sm6"> | |
| 138 | - <select name="enable" class="Selector_Equipment ClearSelector_Equipment" lay-verify="required" lay-filter="eform"></select> | |
| 139 | - </div> | |
| 140 | - </div> | |
| 141 | - <div class="layui-col-sm6"> | |
| 142 | - <label class="layui-form-label layui-col-sm3">巷道<label class="lable-required">*</label></label> | |
| 143 | - <div class="layui-input-inline layui-col-sm6"> | |
| 144 | - <input name="roadWay" type="text" autocomplete="off" lay-verify="required" lay-filter="eform" class="layui-input NumText"> | |
| 145 | - </div> | |
| 146 | - </div> | |
| 147 | - <div class="layui-col-sm6"> | |
| 148 | - <label class="layui-form-label layui-col-sm3">目标区域</label> | |
| 149 | - <div class="layui-input-inline layui-col-sm6"> | |
| 150 | - <input name="destinationArea" type="text" autocomplete="off" lay-verify="" maxlength="50" class="layui-input"> | |
| 151 | - </div> | |
| 152 | - </div> | |
| 153 | - <div class="layui-col-sm6"> | |
| 154 | - <label class="layui-form-label layui-col-sm3">目的地址</label> | |
| 155 | - <div class="layui-input-inline layui-col-sm6"> | |
| 156 | - <input name="goAddress" type="text" autocomplete="off" lay-verify="" maxlength="50" class="layui-input"> | |
| 157 | - </div> | |
| 158 | - </div> | |
| 159 | - <div class="layui-col-sm6"> | |
| 160 | - <label class="layui-form-label layui-col-sm3">自身地址</label> | |
| 161 | - <div class="layui-input-inline layui-col-sm6"> | |
| 162 | - <input name="selfAddress" type="text" autocomplete="off" lay-verify="" maxlength="50" class="layui-input"> | |
| 163 | - </div> | |
| 164 | - </div> | |
| 165 | - <div class="layui-col-sm6"> | |
| 166 | - <label class="layui-form-label layui-col-sm3">回退地址</label> | |
| 167 | - <div class="layui-input-inline layui-col-sm6"> | |
| 168 | - <input name="backAddress" type="text" autocomplete="off" lay-verify="" maxlength="50" class="layui-input"> | |
| 169 | - </div> | |
| 170 | - </div> | |
| 171 | - <div class="layui-col-sm6"> | |
| 172 | - <label class="layui-form-label layui-col-sm3">站台编码<label class="lable-required">*</label></label> | |
| 173 | - <div class="layui-input-inline layui-col-sm6"> | |
| 174 | - <input name="stationIndex" type="text" autocomplete="off" lay-verify="required" class="layui-input NumText"> | |
| 175 | - </div> | |
| 176 | - </div> | |
| 177 | - <div class="layui-col-sm6"> | |
| 178 | - <label class="layui-form-label layui-col-sm3">第一台堆垛机排索引<label class="lable-required">*</label></label> | |
| 179 | - <div class="layui-input-inline layui-col-sm6"> | |
| 180 | - <input name="rowIndex1" type="text" autocomplete="off" lay-verify="required" class="layui-input NumText"> | |
| 181 | - </div> | |
| 182 | - </div> | |
| 183 | - <div class="layui-col-sm6"> | |
| 184 | - <label class="layui-form-label layui-col-sm3">第二台堆垛机排索引<label class="lable-required">*</label></label> | |
| 185 | - <div class="layui-input-inline layui-col-sm6"> | |
| 186 | - <input name="rowIndex2" type="text" autocomplete="off" lay-verify="required" class="layui-input NumText"> | |
| 187 | - </div> | |
| 188 | - </div> | |
| 189 | - <div class="layui-col-sm6"> | |
| 190 | - <label class="layui-form-label layui-col-sm3">列<label class="lable-required">*</label></label> | |
| 191 | - <div class="layui-input-inline layui-col-sm6"> | |
| 192 | - <input name="columnIndex" type="text" autocomplete="off" lay-verify="required" class="layui-input NumText"> | |
| 193 | - </div> | |
| 194 | - </div> | |
| 195 | - <div class="layui-col-sm6"> | |
| 196 | - <label class="layui-form-label layui-col-sm3">层<label class="lable-required">*</label></label> | |
| 197 | - <div class="layui-input-inline layui-col-sm6"> | |
| 198 | - <input name="layerIndex" type="text" autocomplete="off" lay-verify="required" class="layui-input NumText"> | |
| 199 | - </div> | |
| 200 | - </div> | |
| 201 | - <div class="layui-col-sm6"> | |
| 202 | - <label class="layui-form-label layui-col-sm3">PLC的DB地址</label> | |
| 203 | - <div class="layui-input-inline layui-col-sm6"> | |
| 204 | - <input name="basePlcDB" type="text" autocomplete="off" lay-verify="" maxlength="50" class="layui-input"> | |
| 205 | - </div> | |
| 206 | - </div> | |
| 207 | - <div class="layui-col-sm6"> | |
| 208 | - <label class="layui-form-label layui-col-sm3">外部编码</label> | |
| 209 | - <div class="layui-input-inline layui-col-sm6"> | |
| 210 | - <input name="otherCode" type="text" autocomplete="off" lay-verify="" maxlength="32" class="layui-input"> | |
| 211 | - </div> | |
| 212 | - </div> | |
| 213 | - <!--表单验证按钮--> | |
| 214 | - <button class="layui-btn" style="display:none" name="fromAdd" lay-filter="fromAdd" lay-submit>fromAdd</button> | |
| 215 | - <button class="layui-btn" style="display:none" name="fromUpdate" lay-filter="fromUpdate" lay-submit>fromUpdate</button> | |
| 216 | - </div> | |
| 217 | - </div> | |
| 218 | - <div hidden> | |
| 219 | - <input name="id" readonly type="text" class="layui-input"> | |
| 220 | - @*<input name="code" type="text" readonly class="layui-input">*@ | |
| 221 | - <input name="workshopId" type="text" readonly class="layui-input"> | |
| 222 | - <input name="factoryId" type="text" readonly class="layui-input"> | |
| 223 | - <input name="lineCode" type="text" readonly class="layui-input"> | |
| 224 | - <input name="WarehouseCode" readonly class="layui-input"> | |
| 225 | - <input name="outAddress" readonly class="layui-input"> | |
| 226 | - | |
| 227 | - | |
| 228 | - <input name="createBy" type="text" readonly class="layui-input"> | |
| 229 | - <input name="createTime" type="text" readonly class="layui-input"> | |
| 230 | - <input name="updateTime" type="text" readonly class="layui-input"> | |
| 231 | - <input name="updateBy" type="text" readonly class="layui-input"> | |
| 232 | - </div> | |
| 233 | - </form> | |
| 234 | -</div> | |
| 235 | - | |
| 236 | -<script type="text/html" id="toolbarTable"> | |
| 237 | - <div class="layui-btn-container"> | |
| 238 | - <a href="javascript:;" class="layui-btn layui-btn-sm layui-btn-mini" lay-event="btnSelect"><i class="layui-icon"></i>检索</a> | |
| 239 | - <a href="javascript:;" class="layui-btn layui-btn-sm layui-btn-mini" lay-event="btnRefresh"><i class="layui-icon"></i>刷新</a> | |
| 240 | - {{ loadMenus("Equipment", 1) }} | |
| 241 | - </div> | |
| 242 | -</script> | |
| 243 | - | |
| 244 | -@section Scripts | |
| 245 | -{ | |
| 246 | - <script type="text/javascript" src="/productjs/equipment/Equipment.js" asp-append-version="true"></script> | |
| 247 | -} | |
| 248 | 0 | \ No newline at end of file |
web/WebMvc/Views/Shared/_Layout.cshtml
| ... | ... | @@ -44,9 +44,11 @@ |
| 44 | 44 | |
| 45 | 45 | .sys-a-det{text-decoration: underline; color: blue; } |
| 46 | 46 | /*面包屑*/ |
| 47 | + .layui-breadcrumb { padding-left: 5px;} | |
| 47 | 48 | .layui-breadcrumb > * {font-size: 18px;} |
| 48 | - .layui-breadcrumb a{border-left: 8px solid #5fb878;padding-left: 18px;} | |
| 49 | + .layui-breadcrumb a{border-left: 8px solid #5fb878;padding-left: 12px;} | |
| 49 | 50 | .layui-breadcrumb :first-child{padding-left: 18px;} |
| 51 | + .layui-breadcrumb a:last-child {font-weight: bold; color: #000 !important; } | |
| 50 | 52 | </style> |
| 51 | 53 | |
| 52 | 54 | <script> |
| ... | ... |