admingit/MicroCommunityWeb
1
0
Fork 0
mirror of https://gitee.com/java110/MicroCommunityWeb.git synced 2026-02-25 14:17:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

优化巡检执行人功能

Browse Source
This commit is contained in:
java110 2020-05-06 01:05:13 +08:00
parent cc2f49cd2f
commit 59b42a7b5f
11 changed files with 173 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/components/common/viewImage/viewImage.html
View File

@ -1,3 +1,4 @@
<div v-if="viewImageInfo.showImage" style="position:fixed;z-index:3000;left:50%;top:50%;transform:translate(-50%,-50%);">
<img v-on:click="_closeImage()" v-bind:src="viewImageInfo.url" style="width:1000px;height:500px;" />
<img v-bind:src="viewImageInfo.url" style="width:1000px;height:500px;" />
<span v-on:click="_closeImage()" class="fa fa-remove " style="position: absolute;right: 20px;top: 20px;font-size: 20px;color:red"></span>
</div>

2
public/components/frame/validateTel/validateTel.html
View File

@ -1,6 +1,6 @@
<div>
<div class="layui-form-item">
<input class="layui-input" v-model="validateParam.tel" placeholder="请输入用户名" type="text" maxlength="20" lay-verify="required|regexit" autofocus="autofocus" autocomplete="off">
<input class="layui-input" v-model="validateParam.tel" placeholder="请输入手机号" type="text" maxlength="20" lay-verify="required|regexit" autofocus="autofocus" autocomplete="off">
</div>
<div class="layui-form-item form_code">
<input v-model="validateParam.messageCode" class="layui-input" placeholder="请输入短信验证码" type="text" maxlength="6" lay-verify="required|number|msgcode">

4
public/components/property/addInspectionRoute/addInspectionRoute.html
View File

@ -15,13 +15,13 @@
placeholder="必填，请填写路线名称" class="form-control">
</div>
</div>
<div class="form-group row">
<!-- <div class="form-group row">
<label class="col-sm-2 col-form-label">顺序</label>
<div class="col-sm-10">
<input v-model="addInspectionRouteInfo.seq" type="text"
placeholder="必填，请填写检查项数量" class="form-control">
</div>
</div>
</div> -->
<div class="form-group row">
<label class="col-sm-2 col-form-label">备注</label>
<div class="col-sm-10">

2
public/components/property/addInspectionRoute/addInspectionRoute.js
View File

@ -9,7 +9,7 @@
data: {
addInspectionRouteInfo: {
routeName: '',
seq: '',
seq: '1',
remark: '',
}
},

4
public/components/property/editInspectionRoute/editInspectionRoute.html
View File

@ -14,13 +14,13 @@
placeholder="必填，请填写路线名称" class="form-control">
</div>
</div>
<div class="form-group row">
<!-- <div class="form-group row">
<label class="col-sm-2 col-form-label">顺序</label>
<div class="col-sm-10">
<input v-model="editInspectionRouteInfo.seq" type="text"
placeholder="必填，请填写设备数量" class="form-control">
</div>
</div>
</div> -->
<div class="form-group row">
<label class="col-sm-2 col-form-label">备注</label>
<div class="col-sm-10">

2
public/components/property/editInspectionRoute/editInspectionRoute.js
View File

@ -5,7 +5,7 @@
editInspectionRouteInfo: {
inspectionRouteId: '',
routeName: '',
seq: '',
seq: '1',
remark: '',
}

18
public/pages/property/inspectionPlanManage/inspectionPlanManage.html
View File

@ -1,5 +1,5 @@
<div class=" animated fadeInRight ecommerce">
<div class="row">
<div class="row" v-if="inspectionPlanManageInfo.inspectionPlanStaffModel == false">
<div class="col-lg-12">
<div class="ibox ">
<div class="ibox-title">
@ -43,7 +43,7 @@
</div>
</div>
</div>
<div class="row">
<div class="row" v-if="inspectionPlanManageInfo.inspectionPlanStaffModel == false">
<div class="col-lg-12">
<div class="ibox">
<div class="ibox-title">
@ -65,9 +65,9 @@
<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">开始时间</th> -->
<th class="text-center">开始时间</th>
<th class="text-center">结束时间</th>
<th class="text-center">制定人</th>
<th class="text-center">制定时间</th>
@ -80,15 +80,17 @@
<td class="text-center">{{inspectionPlan.inspectionPlanName}}</td>
<td class="text-center">{{inspectionPlan.inspectionRouteName}}</td>
<td class="text-center">{{inspectionPlan.inspectionPlanPeriodName}}</td>
<td class="text-center">{{inspectionPlan.staffName}}</td>
<!-- <td class="text-center">{{inspectionPlan.staffName}}</td> -->
<td class="text-center">{{inspectionPlan.signTypeName}}</td>
<!-- <td class="text-center">{{inspectionPlan.startTime}}</td> -->
<td class="text-center">{{inspectionPlan.startTime}}</td>
<td class="text-center">{{inspectionPlan.endTime}}</td>
<td class="text-center">{{inspectionPlan.createUserName}}</td>
<td class="text-center">{{inspectionPlan.createTime}}</td>
<td class="text-center">{{inspectionPlan.stateName}}</td>
<td class="text-right">
<div class="btn-group">
<button class="btn-white btn btn-xs" v-on:click="_openPlanStaff(inspectionPlan)">设置巡检人
</button>
<button class="btn-white btn btn-xs dropdown-toggle" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false">变更
</button>
@ -131,6 +133,10 @@
</div>
</div>
<div v-if="inspectionPlanManageInfo.inspectionPlanStaffModel == true">
<vc:create path="/pages/property/inspectionPlanStaffManage"></vc:create>
</div>
<vc:create path="property/addInspectionPlan"
callBackListener=""

8
public/pages/property/inspectionPlanManage/inspectionPlanManage.js
View File

@ -13,6 +13,7 @@
moreCondition: false,
inspectionPlanName: '',
states:'',
inspectionPlanStaffModel:false,
conditions: {
inspectionPlanName: '',
staffName:'',
@ -32,6 +33,9 @@
vc.on('inspectionPlanManage', 'listInspectionPlan', function (_param) {
vc.component._listInspectionPlans(DEFAULT_PAGE, DEFAULT_ROWS);
});
vc.on('inspectionPlanManage','goBack',function(_param){
vc.component.inspectionPlanManageInfo.inspectionPlanStaffModel = false;
});
vc.on('pagination', 'page_event', function (_currentPage) {
vc.component._listInspectionPlans(_currentPage, DEFAULT_ROWS);
});
@ -98,6 +102,10 @@
} else {
vc.component.inspectionPlanManageInfo.moreCondition = true;
}
},
_openPlanStaff:function(_inspectionPlan){
$that.inspectionPlanManageInfo.inspectionPlanStaffModel = true;
vc.emit('inspectionPlanStaffManage','listInspectionPoint',_inspectionPlan);
}

65
public/pages/property/inspectionPlanStaffManage/inspectionPlanStaffManage.html Normal file
View File

@ -0,0 +1,65 @@
<div class="row">
<div class="col-lg-12">
<div class="ibox">
<div class="ibox-title">
<h5>{{inspectionPlanStaffManageInfo.inspectionPlanName}}信息</h5>
<div class="ibox-tools" style="top:10px;">
<button type="button" class="btn btn-primary btn-sm " v-on:click="_goBack()"
style="margin-right:10px">
返回
</button>
<button type="button" class="btn btn-primary btn-sm"
v-on:click="_openAddInspectionPlanStaffModal()">
<i class="fa fa-plus"></i>
添加
</button>
</div>
</div>
<div class="ibox-content">
<table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
<thead>
<tr>
<th class="text-center">巡检人</th>
<th class="text-center">巡检周期</th>
<th class="text-center">开始时间</th>
<th class="text-center">结束时间</th>
<th class="text-right">操作</th>
</tr>
</thead>
<tbody>
<tr v-for="inspectionPlanStaff in inspectionPlanStaffManageInfo.inspectionPlanStaffs">
<td class="text-center">{{inspectionPlanStaff.inspectionName}}</td>
<td class="text-center">{{inspectionPlanStaff.inspectionId}}</td>
<td class="text-center">{{inspectionPlanStaff.locationObjName}}</td>
<td class="text-center">{{inspectionPlanStaff.machineCode}}</td>
<td class="text-center">{{inspectionPlanStaff.machineName}}</td>
<td class="text-right">
<div class="btn-group">
<button class="btn-white btn btn-xs"
v-on:click="_openDeleteInspectionPlanStaffModel(inspectionPlanStaff)">删除
</button>
</div>
</td>
</tr>
</tbody>
<tfoot>
<tr>
<td colspan="7">
<ul class="pagination float-right"></ul>
</td>
</tr>
</tfoot>
</table>
<!-- 分页 -->
<vc:create path="frame/pagination"></vc:create>
</div>
</div>
</div>
<!-- <vc:create path="property/chooseInspectionRoutePoint" emitListener="inspectionRoutePointManage"
emitFunction="listInspectionPoint"></vc:create>
<vc:create path="property/deleteInspectionRoutePoint"></vc:create> -->
</div>

77
public/pages/property/inspectionPlanStaffManage/inspectionPlanStaffManage.js Normal file
View File

@ -0,0 +1,77 @@
/**
入驻小区
**/
(function(vc){
var DEFAULT_PAGE = 1;
var DEFAULT_ROWS = 10;
vc.extends({
data:{
inspectionPlanStaffManageInfo:{
inspectionPlanStaffs:[],
inspectionPlanId:'',
inspectionPlanName:'',
total:0,
records:1,
routeName:''
}
},
_initMethod:function(){
//vc.component._listInspectionRoutePoints(DEFAULT_PAGE, DEFAULT_ROWS);
},
_initEvent:function(){
vc.on('inspectionPlanStaffManage','listInspectionPoint',function(_param){
if(!_param.hasOwnProperty('inspectionPlanId')){
return ;
}
vc.component.inspectionPlanStaffManageInfo.inspectionPlanId = _param.inspectionPlanId;
$that.inspectionPlanStaffManageInfo.inspectionPlanName = _param.inspectionPlanName;
vc.component._listInspectionPlanStaffs(DEFAULT_PAGE, DEFAULT_ROWS);
});
vc.on('pagination','page_event',function(_currentPage){
vc.component._listInspectionPlanStaffs(_currentPage,DEFAULT_ROWS);
});
},
methods:{
_listInspectionPlanStaffs:function(_page, _rows){
var param = {
params:{
page:_page,
row:_rows,
communityId:vc.getCurrentCommunity().communityId,
inspectionPlanId:vc.component.inspectionPlanStaffManageInfo.inspectionPlanId
}
};
//发送get请求
vc.http.get('inspectionRoutePointManage',
'list',
param,
function(json,res){
var _inspectionRouteManageInfo=JSON.parse(json);
vc.component.inspectionPlanStaffManageInfo.total = _inspectionRouteManageInfo.total;
vc.component.inspectionPlanStaffManageInfo.records = _inspectionRouteManageInfo.records;
vc.component.inspectionPlanStaffManageInfo.inspectionPlanStaffs = _inspectionRouteManageInfo.inspectionPlanStaffs;
vc.emit('pagination','init',{
total:vc.component.inspectionPlanStaffManageInfo.records,
currentPage:_page
});
},function(errInfo,error){
console.log('请求失败处理');
}
);
},
_openAddInspectionPlanStaffModal:function(){
vc.emit('chooseInspectionRoutePoint','openchooseInspectionRoutePointModal',$that.inspectionPlanStaffManageInfo);
},
_openDeleteInspectionPlanStaffModel:function(_inspectionPoint){
_inspectionPoint.inspectionPlanId = $that.inspectionPlanStaffManageInfo.inspectionPlanId;
vc.emit('deleteInspectionRoutePoint','openDeleteInspectionRoutePointModal', _inspectionPoint);
},
_goBack:function(){
vc.emit('inspectionPlanManage','goBack',{});
}
}
});
})(window.vc);

4
public/pages/property/inspectionRouteManage/inspectionRouteManage.html
View File

@ -64,7 +64,7 @@
<tr>
<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-right">操作</th>
</tr>
@ -73,7 +73,7 @@
<tr v-for="inspectionRoute in inspectionRouteManageInfo.inspectionRoutes">
<td class="text-center">{{inspectionRoute.routeName}}</td>
<td class="text-center">{{inspectionRoute.inspectionRouteId}}</td>
<td class="text-center">{{inspectionRoute.seq}}</td>
<!-- <td class="text-center">{{inspectionRoute.seq}}</td> -->
<td class="text-center">{{inspectionRoute.createTime}}</td>
<td class="text-right">
<div class="btn-group">