优化前段代码

This commit is contained in:
java110 2020-07-24 19:33:46 +08:00
parent d17baa54e5
commit d4bdabb3c7
4 changed files with 40 additions and 44 deletions

View File

@ -18,7 +18,7 @@
<div class="form-group row"> <div class="form-group row">
<label class="col-sm-2 col-form-label">巡检类型</label> <label class="col-sm-2 col-form-label">巡检类型</label>
<div class="col-sm-10"> <div class="col-sm-10">
<select class="custom-select" v-model="addInspectionPlanInfo.pointObjType"> <select class="custom-select" v-model="addInspectionPointInfo.pointObjType">
<option selected disabled value="">必填,请选择巡检类型</option> <option selected disabled value="">必填,请选择巡检类型</option>
<option value="2002">环境</option> <option value="2002">环境</option>
<option value="1001">设备</option> <option value="1001">设备</option>
@ -26,14 +26,14 @@
</div> </div>
</div> </div>
<div class="form-group row" v-if="addInspectionPlanInfo.pointObjType == '2002'"> <div class="form-group row" v-show="addInspectionPointInfo.pointObjType == '2002'">
<label class="col-sm-2 col-form-label">位置</label> <label class="col-sm-2 col-form-label">位置</label>
<div class="col-sm-10"> <div class="col-sm-10">
<input v-model="addInspectionPointInfo.pointObjName" type="text" <input v-model="addInspectionPointInfo.pointObjName" type="text"
placeholder="必填,请填写巡检点名称" class="form-control"> placeholder="必填,请填写巡检点名称" class="form-control">
</div> </div>
</div> </div>
<div class="form-group row" v-else> <div class="form-group row" v-show="addInspectionPointInfo.pointObjType == '1001'">
<label class="col-sm-2 col-form-label">巡检设备</label> <label class="col-sm-2 col-form-label">巡检设备</label>
<div class="col-sm-10"> <div class="col-sm-10">
<vc:create path="property/machineSelect2" parentModal="addInspectionPointModel" <vc:create path="property/machineSelect2" parentModal="addInspectionPointModel"

View File

@ -24,14 +24,14 @@
</select> </select>
</div> </div>
</div> </div>
<div class="form-group row" v-if="editInspectionPointInfo.pointObjType == '2002'"> <div class="form-group row" v-show="editInspectionPointInfo.pointObjType == '2002'">
<label class="col-sm-2 col-form-label">位置</label> <label class="col-sm-2 col-form-label">位置</label>
<div class="col-sm-10"> <div class="col-sm-10">
<input v-model="editInspectionPointInfo.pointObjName" type="text" <input v-model="editInspectionPointInfo.pointObjName" type="text"
placeholder="必填,请填写巡检点名称" class="form-control"> placeholder="必填,请填写巡检点名称" class="form-control">
</div> </div>
</div> </div>
<div class="form-group row" v-else> <div class="form-group row" v-show="editInspectionPointInfo.pointObjType == '1001'">
<label class="col-sm-2 col-form-label">巡检设备</label> <label class="col-sm-2 col-form-label">巡检设备</label>
<div class="col-sm-10"> <div class="col-sm-10">
<vc:create path="property/machineSelect2" <vc:create path="property/machineSelect2"

View File

@ -64,7 +64,7 @@
<thead> <thead>
<tr> <tr>
<th class="text-center">巡检点名称</th> <th class="text-center">巡检点名称</th>
<th class="text-center">巡检类型</th> <th class="text-center">巡检类型</th>
<th class="text-center">巡检位置</th> <th class="text-center">巡检位置</th>
<th class="text-center">巡检点ID</th> <th class="text-center">巡检点ID</th>
<th class="text-center">操作</th> <th class="text-center">操作</th>

View File

@ -4,12 +4,12 @@
<div class="ibox-title"> <div class="ibox-title">
<h5>巡检点信息</h5> <h5>巡检点信息</h5>
<div class="ibox-tools" style="top:10px;"> <div class="ibox-tools" style="top:10px;">
<button type="button" class="btn btn-primary btn-sm " <button type="button" class="btn btn-primary btn-sm " v-on:click="_goBack()"
v-on:click="_goBack()" style="margin-right:10px"> style="margin-right:10px">
返回 返回
</button> </button>
<button type="button" class="btn btn-primary btn-sm" <button type="button" class="btn btn-primary btn-sm"
v-on:click="_openAddInspectionRoutePointModal()"> v-on:click="_openAddInspectionRoutePointModal()">
<i class="fa fa-plus"></i> <i class="fa fa-plus"></i>
添加 添加
</button> </button>
@ -17,42 +17,40 @@
</div> </div>
<div class="ibox-content"> <div class="ibox-content">
<table class="footable table table-stripped toggle-arrow-tiny" <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
data-page-size="15"
>
<thead> <thead>
<tr> <tr>
<th class="text-center">巡检点名称</th> <th class="text-center">巡检点名称</th>
<th class="text-center">巡检点ID</th>
<th class="text-center">设备位置</th> <th class="text-center">巡检点类型</th>
<th class="text-center">设备编码</th> <th class="text-center">巡检位置</th>
<th class="text-center">设备名称</th> <th class="text-center">巡检点ID</th>
<th class="text-right">操作</th> <th class="text-right">操作</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr v-for="inspectionPoint in inspectionRoutePointManageInfo.inspectionPoints"> <tr v-for="inspectionPoint in inspectionRoutePointManageInfo.inspectionPoints">
<td class="text-center">{{inspectionPoint.inspectionName}}</td> <td class="text-center">{{inspectionPoint.inspectionName}}</td>
<td class="text-center">{{inspectionPoint.inspectionId}}</td>
<td class="text-center">{{inspectionPoint.locationObjName}}</td>
<td class="text-center">{{inspectionPoint.machineCode}}</td>
<td class="text-center">{{inspectionPoint.machineName}}</td>
<td class="text-right">
<div class="btn-group">
<button class="btn-white btn btn-xs"
v-on:click="_openDeleteInspectionRoutePointModel(inspectionPoint)">删除
</button>
</div>
</td>
</tr> <td class="text-center">{{inspectionPoint.pointObjType=='1001'?'设备':'环境'}}</td>
<td class="text-center">{{inspectionPoint.pointObjName}}</td>
<td class="text-center">{{inspectionPoint.inspectionId}}</td>
<td class="text-right">
<div class="btn-group">
<button class="btn-white btn btn-xs"
v-on:click="_openDeleteInspectionRoutePointModel(inspectionPoint)">删除
</button>
</div>
</td>
</tr>
</tbody> </tbody>
<tfoot> <tfoot>
<tr> <tr>
<td colspan="7"> <td colspan="7">
<ul class="pagination float-right"></ul> <ul class="pagination float-right"></ul>
</td> </td>
</tr> </tr>
</tfoot> </tfoot>
</table> </table>
<!-- 分页 --> <!-- 分页 -->
@ -60,10 +58,8 @@
</div> </div>
</div> </div>
</div> </div>
<vc:create path="property/chooseInspectionRoutePoint" <vc:create path="property/chooseInspectionRoutePoint" emitListener="inspectionRoutePointManage"
emitListener="inspectionRoutePointManage" emitFunction="listInspectionPoint"></vc:create>
emitFunction="listInspectionPoint"
></vc:create>
<vc:create path="property/deleteInspectionRoutePoint"></vc:create> <vc:create path="property/deleteInspectionRoutePoint"></vc:create>
</div> </div>