mirror of
https://gitee.com/java110/MicroCommunityWeb.git
synced 2026-06-12 10:00:56 +08:00
优化巡检功能
This commit is contained in:
java110
parent
3fcd85e93f
commit
36148f0475
@ -1,5 +1,4 @@
|
|||||||
<div id="addInspectionPlanModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
|
<div id="addInspectionPlanModel" class="modal fade" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
|
||||||
aria-hidden="true">
|
|
||||||
<div class="modal-dialog modal-lg">
|
<div class="modal-dialog modal-lg">
|
||||||
<div class="modal-content">
|
<div class="modal-content">
|
||||||
<div class="modal-body">
|
<div class="modal-body">
|
||||||
@ -10,17 +9,13 @@
|
|||||||
<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">
|
||||||
<input v-model="addInspectionPlanInfo.inspectionPlanName" type="text"
|
<input v-model="addInspectionPlanInfo.inspectionPlanName" type="text" placeholder="必填，请填写计划名称" class="form-control">
|
||||||
placeholder="必填，请填写计划名称" class="form-control">
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<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">
|
||||||
<vc:create path="property/inspectionRouteSelect2"
|
<vc:create path="property/inspectionRouteSelect2" parentModal="addInspectionPlanModel" callBackListener="addInspectionPlanInfo" callBackFunction="notify" namespace="addInspectionPlan">
|
||||||
parentModal="addInspectionPlanModel"
|
|
||||||
callBackListener="addInspectionPlanInfo" callBackFunction="notify"
|
|
||||||
namespace="addInspectionPlan">
|
|
||||||
</vc:create>
|
</vc:create>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -38,15 +33,13 @@
|
|||||||
<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">
|
||||||
<input v-model="addInspectionPlanInfo.startTime" type="text"
|
<input v-model="addInspectionPlanInfo.startTime" type="text" placeholder="必填，请填写开始时间" class="form-control addInspectionPlanStartTime">
|
||||||
placeholder="必填，请填写开始时间" class="form-control addInspectionPlanStartTime">
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<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">
|
||||||
<input v-model="addInspectionPlanInfo.endTime" type="text" placeholder="必填，请填写结束时间"
|
<input v-model="addInspectionPlanInfo.endTime" type="text" placeholder="必填，请填写结束时间" class="form-control addInspectionPlanEndTime">
|
||||||
class="form-control addInspectionPlanEndTime">
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group row">
|
<div class="form-group row">
|
||||||
@ -74,19 +67,15 @@
|
|||||||
<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">
|
||||||
<textarea v-model="addInspectionPlanInfo.remark" type="text" placeholder="选填，请填写备注"
|
<textarea v-model="addInspectionPlanInfo.remark" type="text" placeholder="选填，请填写备注" class="form-control">
|
||||||
class="form-control">
|
|
||||||
</textarea>
|
</textarea>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="ibox-content">
|
<div class="ibox-content">
|
||||||
<button class="btn btn-primary float-right" type="button"
|
<button class="btn btn-primary float-right" type="button" v-on:click="saveInspectionPlanInfo()">
|
||||||
v-on:click="saveInspectionPlanInfo()">
|
|
||||||
<i class="fa fa-check"></i> 保存
|
<i class="fa fa-check"></i> 保存
|
||||||
</button>
|
</button>
|
||||||
<button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
|
<button type="button" class="btn btn-warning float-right" style="margin-right:20px;" v-on:click="cleanInspectionPlanAddModel()" data-dismiss="modal">
|
||||||
v-on:click="cleanInspectionPlanAddModel()"
|
|
||||||
data-dismiss="modal">
|
|
||||||
<i class="fa fa-close"></i> 取消
|
<i class="fa fa-close"></i> 取消
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
(function (vc) {
|
(function(vc) {
|
||||||
vc.extends({
|
vc.extends({
|
||||||
propTypes: {
|
propTypes: {
|
||||||
parentModal: vc.propTypes.string,
|
parentModal: vc.propTypes.string,
|
||||||
@ -16,23 +16,23 @@
|
|||||||
watch: {
|
watch: {
|
||||||
inspectionRouteSelect2Info: {
|
inspectionRouteSelect2Info: {
|
||||||
deep: true,
|
deep: true,
|
||||||
handler: function () {
|
handler: function() {
|
||||||
vc.emit($props.callBackListener, $props.callBackFunction, this.inspectionRouteSelect2Info);
|
vc.emit($props.callBackListener, $props.callBackFunction, this.inspectionRouteSelect2Info);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
_initMethod: function () {
|
_initMethod: function() {
|
||||||
this._initInspectionRouteSelect2();
|
this._initInspectionRouteSelect2();
|
||||||
},
|
},
|
||||||
_initEvent: function () {
|
_initEvent: function() {
|
||||||
vc.on('inspectionRouteSelect2', 'setInspectionRoute', function (_param) {
|
vc.on('inspectionRouteSelect2', 'setInspectionRoute', function(_param) {
|
||||||
vc.copyObject(_param, this.inspectionRouteSelect2Info);
|
vc.copyObject(_param, this.inspectionRouteSelect2Info);
|
||||||
var option = new Option(_param.routeName,_param.inspectionRouteId, true, true);
|
var option = new Option(_param.routeName, _param.inspectionRouteId, true, true);
|
||||||
this.inspectionRouteSelect2Info.inspectionRouteSelector.append(option);
|
this.inspectionRouteSelect2Info.inspectionRouteSelector.append(option);
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
vc.on('inspectionRouteSelect2', 'clearInspectionRoute', function (_param) {
|
vc.on('inspectionRouteSelect2', 'clearInspectionRoute', function(_param) {
|
||||||
this.inspectionRouteSelect2Info = {
|
this.inspectionRouteSelect2Info = {
|
||||||
inspectionRoutes: [],
|
inspectionRoutes: [],
|
||||||
inspectionRouteId: '',
|
inspectionRouteId: '',
|
||||||
@ -42,27 +42,27 @@
|
|||||||
});
|
});
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
_initInspectionRouteSelect2: function () {
|
_initInspectionRouteSelect2: function() {
|
||||||
$.fn.modal.Constructor.prototype.enforceFocus = function () {};
|
$.fn.modal.Constructor.prototype.enforceFocus = function() {};
|
||||||
$.fn.select2.defaults.set('width', '100%');
|
$.fn.select2.defaults.set('width', '100%');
|
||||||
this.inspectionRouteSelect2Info.inspectionRouteSelector = $('#inspectionRouteSelector').select2({
|
this.inspectionRouteSelect2Info.inspectionRouteSelector = $('#inspectionRouteSelector').select2({
|
||||||
placeholder: '必填，请选择巡检路线',
|
placeholder: '必填，请选择巡检路线',
|
||||||
allowClear: true,//允许清空
|
allowClear: true, //允许清空
|
||||||
//multiple: true,//允许多选
|
//multiple: true,//允许多选
|
||||||
escapeMarkup: function (markup) {
|
escapeMarkup: function(markup) {
|
||||||
return markup;
|
return markup;
|
||||||
}, // 自定义格式化防止xss注入
|
}, // 自定义格式化防止xss注入
|
||||||
ajax: {
|
ajax: {
|
||||||
url: "/callComponent/inspectionRouteManage/list",
|
url: "/callComponent/inspectionRouteManage/list",
|
||||||
dataType: 'json',
|
dataType: 'json',
|
||||||
delay: 250,
|
delay: 250,
|
||||||
headers:{
|
headers: {
|
||||||
'APP-ID': '8000418004',
|
'APP-ID': '8000418004',
|
||||||
'TRANSACTION-ID' : vc.uuid(),
|
'TRANSACTION-ID': vc.uuid(),
|
||||||
'REQ-TIME': vc.getDateYYYYMMDDHHMISS(),
|
'REQ-TIME': vc.getDateYYYYMMDDHHMISS(),
|
||||||
'SIGN' : ''
|
'SIGN': ''
|
||||||
},
|
},
|
||||||
data: function (params) {
|
data: function(params) {
|
||||||
console.log("param", params);
|
console.log("param", params);
|
||||||
var _term = "";
|
var _term = "";
|
||||||
if (params.hasOwnProperty("term")) {
|
if (params.hasOwnProperty("term")) {
|
||||||
@ -71,11 +71,11 @@
|
|||||||
return {
|
return {
|
||||||
routeName: _term,
|
routeName: _term,
|
||||||
page: 1,
|
page: 1,
|
||||||
row: 10,
|
row: 300,
|
||||||
communityId: vc.getCurrentCommunity().communityId
|
communityId: vc.getCurrentCommunity().communityId
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
processResults: function (data) {
|
processResults: function(data) {
|
||||||
return {
|
return {
|
||||||
results: this._filterInspectionRouteData(data.inspectionRoutes)
|
results: this._filterInspectionRouteData(data.inspectionRoutes)
|
||||||
};
|
};
|
||||||
@ -83,14 +83,14 @@
|
|||||||
cache: true
|
cache: true
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
$('#inspectionRouteSelector').on("select2:select", function (evt) {
|
$('#inspectionRouteSelector').on("select2:select", function(evt) {
|
||||||
//这里是选中触发的事件
|
//这里是选中触发的事件
|
||||||
//evt.params.data 是选中项的信息
|
//evt.params.data 是选中项的信息
|
||||||
this.inspectionRouteSelect2Info.inspectionRouteId = evt.params.data.id;
|
this.inspectionRouteSelect2Info.inspectionRouteId = evt.params.data.id;
|
||||||
this.inspectionRouteSelect2Info.routeName = evt.params.data.text;
|
this.inspectionRouteSelect2Info.routeName = evt.params.data.text;
|
||||||
});
|
});
|
||||||
|
|
||||||
$('#inspectionRouteSelector').on("select2:unselect", function (evt) {
|
$('#inspectionRouteSelector').on("select2:unselect", function(evt) {
|
||||||
//这里是取消选中触发的事件
|
//这里是取消选中触发的事件
|
||||||
//如配置allowClear: true后，触发
|
//如配置allowClear: true后，触发
|
||||||
this.inspectionRouteSelect2Info.inspectionRouteId = '';
|
this.inspectionRouteSelect2Info.inspectionRouteId = '';
|
||||||
@ -98,7 +98,7 @@
|
|||||||
|
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
_filterInspectionRouteData: function (_InspectionRoute) {
|
_filterInspectionRouteData: function(_InspectionRoute) {
|
||||||
var _tmpInspectionRoutes = [];
|
var _tmpInspectionRoutes = [];
|
||||||
for (var i = 0; i < _InspectionRoute.length; i++) {
|
for (var i = 0; i < _InspectionRoute.length; i++) {
|
||||||
var _tmpInspectionRoute = {
|
var _tmpInspectionRoute = {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user