Merge branch 'master' of https://github.com/java110/MicroCommunity

WebService/src/main/resources/components/inspectionPointPackage/add-inspectionPoint/addInspectionPoint.html

@@ -0,0 +1,63 @@
+<div id="addInspectionPointModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
+     aria-hidden="true">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <div class="modal-body">
+                <h3 class="m-t-none m-b ">添加巡检点</h3>
+                <div class="ibox-content">
+                    <div>
+                        <div>
+                            <!--<div class="form-group row">
+                                <label class="col-sm-2 col-form-label">楼名称</label>
+                                <div class="col-sm-10"><input v-model="addFloorInfo.name" type="text" placeholder="必填，请填写名称" class="form-control"></div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">楼编号</label>
+                                <div class="col-sm-10"><input v-model="addFloorInfo.floorNum" type="email" placeholder="必填，请填写编号" class="form-control"></div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">备注</label>
+                                <div class="col-sm-10"><input v-model="addFloorInfo.remark" type="tel" placeholder="可填，请填写备注" class="form-control"></div>
+                            </div>-->
+
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">巡检点名称</label>
+                                <div class="col-sm-10">
+                                    <input v-model="addInspectionPointInfo.inspectionName" type="text"
+                                           placeholder="必填，请填写巡检点名称" class="form-control">
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">巡检设备</label>
+                                <div class="col-sm-10">
+                                    <vc:create name="machineSelect2"
+                                               parentModal="addInspectionPointModel"
+                                               callBackListener="addInspectionPointInfo"
+                                               callBackFunction="notify"
+                                               namespace="addInspectionPoint"
+                                    ></vc:create>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">备注</label>
+                                <div class="col-sm-10">
+                                    <input v-model="addInspectionPointInfo.remark" type="text" placeholder="选填，请填写备注"
+                                           class="form-control">
+                                </div>
+                            </div>
+
+                            <div class="ibox-content">
+                                <button class="btn btn-primary float-right" type="button"
+                                        v-on:click="saveInspectionPointInfo()"><i class="fa fa-check"></i>&nbsp;保存
+                                </button>
+                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
+                                        data-dismiss="modal">取消
+                                </button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>

WebService/src/main/resources/components/inspectionPointPackage/add-inspectionPoint/addInspectionPoint.js

@@ -0,0 +1,115 @@
+(function (vc) {
+
+    vc.extends({
+        propTypes: {
+            callBackListener: vc.propTypes.string, //父组件名称
+            callBackFunction: vc.propTypes.string //父组件监听方法
+        },
+        data: {
+            addInspectionPointInfo: {
+                inspectionId: '',
+                machineId: '',
+                inspectionName: '',
+                remark: ''
+            }
+        },
+        _initMethod: function () {
+
+        },
+        _initEvent: function () {
+            vc.on('addInspectionPoint', 'openAddInspectionPointModal', function () {
+                $('#addInspectionPointModel').modal('show');
+            });
+            vc.on("addInspectionPointInfo", "notify", function (_param) {
+                if (_param.hasOwnProperty("machineId")) {
+                    vc.component.addInspectionPointInfo.machineId = _param.machineId;
+                }
+            });
+        },
+        methods: {
+            addInspectionPointValidate() {
+                return vc.validate.validate({
+                    addInspectionPointInfo: vc.component.addInspectionPointInfo
+                }, {
+                    'addInspectionPointInfo.inspectionName': [
+                        {
+                            limit: "required",
+                            param: "",
+                            errInfo: "巡检点名称不能为空"
+                        },
+                        {
+                            limit: "maxLength",
+                            param: "100",
+                            errInfo: "巡检点名称不能超过100位"
+                        },
+                    ],
+                    'addInspectionPointInfo.machineId': [
+                        {
+                            limit: "required",
+                            param: "",
+                            errInfo: "设备信息不能为空"
+                        },
+                    ],
+                    'addInspectionPointInfo.remark': [
+                        {
+                            limit: "maxLength",
+                            param: "200",
+                            errInfo: "备注信息不能超过200位"
+                        },
+                    ],
+
+                });
+            },
+            saveInspectionPointInfo: function () {
+                if (!vc.component.addInspectionPointValidate()) {
+                    vc.toast(vc.validate.errInfo);
+                    return;
+                }
+
+                vc.component.addInspectionPointInfo.communityId = vc.getCurrentCommunity().communityId;
+                vc.component.addInspectionPointInfo.machineId = vc.component.addInspectionPointInfo.machineId;
+                //不提交数据将数据 回调给侦听处理
+                if (vc.notNull($props.callBackListener)) {
+                    vc.emit($props.callBackListener, $props.callBackFunction, vc.component.addInspectionPointInfo);
+                    $('#addInspectionPointModel').modal('hide');
+                    return;
+                }
+
+                vc.http.post(
+                    'addInspectionPoint',
+                    'save',
+                    JSON.stringify(vc.component.addInspectionPointInfo),
+                    {
+                        emulateJSON: true
+                    },
+                    function (json, res) {
+                        //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
+                        if (res.status == 200) {
+                            //关闭model
+                            $('#addInspectionPointModel').modal('hide');
+                            vc.component.clearAddInspectionPointInfo();
+                            vc.emit('inspectionPointManage', 'listInspectionPoint', {});
+
+                            return;
+                        }
+                        vc.message(json);
+
+                    },
+                    function (errInfo, error) {
+                        console.log('请求失败处理');
+
+                        vc.message(errInfo);
+
+                    });
+            },
+            clearAddInspectionPointInfo: function () {
+                vc.component.addInspectionPointInfo = {
+                    inspectionName: '',
+                    remark: '',
+
+                };
+            }
+        }
+    });
+
+})(window.vc);

WebService/src/main/resources/components/inspectionPointPackage/choose-inspectionPoint/chooseInspectionPoint.html

@@ -0,0 +1,58 @@
+<div id = "chooseInspectionPointModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="chooseInspectionPointModelLabel" aria-hidden="true" >
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h3 class="modal-title" id="chooseInspectionPointModelLabel">选择巡检点</h3>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <div class=" row">
+                    <div class="col-lg-12">
+                        <div class="ibox ">
+                            <div class="row">
+
+                                <div class="col-sm-7 m-b-xs">
+                                </div>
+                                <div class="col-sm-5">
+                                    <div class="input-group">
+                                        <input placeholder="输入巡检点名称" type="text" v-model="chooseInspectionPointInfo._currentInspectionPointName" class="form-control form-control-sm">
+                                        <span class="input-group-append">
+                                                <button type="button" class="btn btn-sm btn-primary" v-on:click="queryInspectionPoints()">查询</button>
+                                            </span>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="table-responsive" style="margin-top:15px">
+                                <table class="table table-striped">
+                                    <thead>
+                                        <tr>
+                                                                        <th class="text-center">巡检点ID</th>
+                            <th class="text-center">巡检点名称</th>
+                            <th class="text-center">备注</th>
+                            <th class="text-center">操作</th>
+
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        <tr v-for="inspectionPoint in chooseInspectionPointInfo.inspectionPoints">
+                                                                        <td class="text-center">{{inspectionPoint.inspectionId}}</td>
+                            <td class="text-center">{{inspectionPoint.inspection_name}}</td>
+                            <td class="text-center">{{inspectionPoint.remark}}</td>
+
+                                            <td>
+                                                <button class="btn btn-primary btn-xs" v-on:click="chooseInspectionPoint(inspectionPoint)">选择</button>
+                                            </td>
+                                        </tr>
+                                    </tbody>
+                                </table>
+                            </div>
+
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>

WebService/src/main/resources/components/inspectionPointPackage/choose-inspectionPoint/chooseInspectionPoint.js

@@ -0,0 +1,64 @@
+(function(vc){
+    vc.extends({
+        propTypes: {
+           emitChooseInspectionPoint:vc.propTypes.string,
+           emitLoadData:vc.propTypes.string
+        },
+        data:{
+            chooseInspectionPointInfo:{
+                inspectionPoints:[],
+                _currentInspectionPointName:'',
+            }
+        },
+        _initMethod:function(){
+        },
+        _initEvent:function(){
+            vc.on('chooseInspectionPoint','openChooseInspectionPointModel',function(_param){
+                $('#chooseInspectionPointModel').modal('show');
+                vc.component._refreshChooseInspectionPointInfo();
+                vc.component._loadAllInspectionPointInfo(1,10,'');
+            });
+        },
+        methods:{
+            _loadAllInspectionPointInfo:function(_page,_row,_name){
+                var param = {
+                    params:{
+                        page:_page,
+                        row:_row,
+                        communityId:vc.getCurrentCommunity().communityId,
+                        name:_name
+                    }
+                };
+
+                //发送get请求
+               vc.http.get('chooseInspectionPoint',
+                            'list',
+                             param,
+                             function(json){
+                                var _inspectionPointInfo = JSON.parse(json);
+                                vc.component.chooseInspectionPointInfo.inspectionPoints = _inspectionPointInfo.inspectionPoints;
+                             },function(){
+                                console.log('请求失败处理');
+                             }
+                           );
+            },
+            chooseInspectionPoint:function(_inspectionPoint){
+                if(_inspectionPoint.hasOwnProperty('name')){
+                     _inspectionPoint.inspectionPointName = _inspectionPoint.name;
+                }
+                vc.emit($props.emitChooseInspectionPoint,'chooseInspectionPoint',_inspectionPoint);
+                vc.emit($props.emitLoadData,'listInspectionPointData',{
+                    inspectionPointId:_inspectionPoint.inspectionPointId
+                });
+                $('#chooseInspectionPointModel').modal('hide');
+            },
+            queryInspectionPoints:function(){
+                vc.component._loadAllInspectionPointInfo(1,10,vc.component.chooseInspectionPointInfo._currentInspectionPointName);
+            },
+            _refreshChooseInspectionPointInfo:function(){
+                vc.component.chooseInspectionPointInfo._currentInspectionPointName = "";
+            }
+        }
+
+    });
+})(window.vc);

WebService/src/main/resources/components/inspectionPointPackage/delete-inspectionPoint/deleteInspectionPoint.html

@@ -0,0 +1,19 @@
+<div class="modal fade" id="deleteInspectionPointModel" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="exampleModalLabel">请确认您的操作!</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <tr align="center"><th>确定删除巡检点</th></tr>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-dismiss="modal" v-on:click="closeDeleteInspectionPointModel()">点错了</button>
+                <button type="button" class="btn btn-primary" v-on:click="deleteInspectionPoint()">确认删除</button>
+            </div>
+        </div>
+    </div>
+</div>

WebService/src/main/resources/components/inspectionPointPackage/delete-inspectionPoint/deleteInspectionPoint.js

@@ -0,0 +1,52 @@
+(function(vc,vm){
+
+    vc.extends({
+        data:{
+            deleteInspectionPointInfo:{
+
+            }
+        },
+         _initMethod:function(){
+
+         },
+         _initEvent:function(){
+             vc.on('deleteInspectionPoint','openDeleteInspectionPointModal',function(_params){
+
+                vc.component.deleteInspectionPointInfo = _params;
+                $('#deleteInspectionPointModel').modal('show');
+
+            });
+        },
+        methods:{
+            deleteInspectionPoint:function(){
+                vc.component.deleteInspectionPointInfo.communityId=vc.getCurrentCommunity().communityId;
+                vc.http.post(
+                    'deleteInspectionPoint',
+                    'delete',
+                    JSON.stringify(vc.component.deleteInspectionPointInfo),
+                    {
+                        emulateJSON:true
+                     },
+                     function(json,res){
+                        //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
+                        if(res.status == 200){
+                            //关闭model
+                            $('#deleteInspectionPointModel').modal('hide');
+                            vc.emit('inspectionPointManage','listInspectionPoint',{});
+                            return ;
+                        }
+                        vc.message(json);
+                     },
+                     function(errInfo,error){
+                        console.log('请求失败处理');
+                        vc.message(json);
+
+                     });
+            },
+            closeDeleteInspectionPointModel:function(){
+                $('#deleteInspectionPointModel').modal('hide');
+            }
+        }
+    });
+
+})(window.vc,window.vc.component);

WebService/src/main/resources/components/inspectionPointPackage/edit-inspectionPoint/editInspectionPoint.html

@@ -0,0 +1,50 @@
+<div id="editInspectionPointModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
+     aria-hidden="true">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <div class="modal-body">
+                <h3 class="m-t-none m-b ">修改巡检点</h3>
+                <div class="ibox-content">
+                    <div>
+                        <div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">巡检点名称</label>
+                                <div class="col-sm-10">
+                                    <input v-model="editInspectionPointInfo.inspectionName" type="text"
+                                           placeholder="必填，请填写巡检点名称" class="form-control">
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">巡检设备</label>
+                                <div class="col-sm-10">
+                                    <vc:create name="machineSelect2"
+                                               parentModal="editInspectionPointModel"
+                                               callBackListener="editInspectionPointInfo"
+                                               callBackFunction="notify"
+                                               namespace="editInspectionPoint"
+                                    ></vc:create>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">备注</label>
+                                <div class="col-sm-10">
+                                    <input v-model="editInspectionPointInfo.remark" type="text" placeholder="选填，请填写备注"
+                                           class="form-control">
+                                </div>
+                            </div>
+
+                            <div class="ibox-content">
+                                <button class="btn btn-primary float-right" type="button"
+                                        v-on:click="editInspectionPoint()"><i class="fa fa-check"></i>&nbsp;保存
+                                </button>
+                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
+                                        data-dismiss="modal">取消
+                                </button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>

WebService/src/main/resources/components/inspectionPointPackage/edit-inspectionPoint/editInspectionPoint.js

@@ -0,0 +1,119 @@
+(function (vc, vm) {
+
+    vc.extends({
+        data: {
+            editInspectionPointInfo: {
+                inspectionId: '',
+                machineId: '',
+                machineName: '',
+                inspectionName: '',
+                communityId:'',
+                remark: '',
+            }
+        },
+        _initMethod: function () {
+
+        },
+        _initEvent: function () {
+            vc.on('editInspectionPoint', 'openEditInspectionPointModal', function (_params) {
+                vc.component.refreshEditInspectionPointInfo();
+                $('#editInspectionPointModel').modal('show');
+                vc.copyObject(_params, vc.component.editInspectionPointInfo);
+                //传输数据到machineSelect2组件
+                vc.emit('editInspectionPoint', 'machineSelect2', 'setMachine', {
+                    machineId: vc.component.editInspectionPointInfo.machineId,
+                    machineName: vc.component.editInspectionPointInfo.machineName,
+                });
+                vc.component.editInspectionPointInfo.communityId = vc.getCurrentCommunity().communityId;
+            });
+
+            vc.on("editInspectionPointInfo", "notify", function (_param) {
+                if (_param.hasOwnProperty("machineId")) {
+                    vc.component.editInspectionPointInfo.machineId = _param.machineId;
+                }
+            });
+        },
+        methods: {
+            editInspectionPointValidate: function () {
+                return vc.validate.validate({
+                    editInspectionPointInfo: vc.component.editInspectionPointInfo
+                }, {
+                    'editInspectionPointInfo.inspectionName': [
+                        {
+                            limit: "required",
+                            param: "",
+                            errInfo: "巡检点名称不能为空"
+                        },
+                        {
+                            limit: "maxLength",
+                            param: "100",
+                            errInfo: "巡检点名称不能超过100位"
+                        },
+                    ],
+                    'editInspectionPointInfo.machineId': [
+                        {
+                            limit: "required",
+                            param: "",
+                            errInfo: "设备信息不能为空"
+                        },
+                    ],
+                    'editInspectionPointInfo.remark': [
+                        {
+                            limit: "maxLength",
+                            param: "200",
+                            errInfo: "备注信息不能超过200位"
+                        },
+                    ],
+                    'editInspectionPointInfo.inspectionId': [
+                        {
+                            limit: "required",
+                            param: "",
+                            errInfo: "巡检点ID不能为空"
+                        }]
+
+                });
+            },
+            editInspectionPoint: function () {
+                if (!vc.component.editInspectionPointValidate()) {
+                    vc.toast(vc.validate.errInfo);
+                    return;
+                }
+
+                vc.http.post(
+                    'editInspectionPoint',
+                    'update',
+                    JSON.stringify(vc.component.editInspectionPointInfo),
+                    {
+                        emulateJSON: true
+                    },
+                    function (json, res) {
+                        //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
+                        if (res.status == 200) {
+                            //关闭model
+                            $('#editInspectionPointModel').modal('hide');
+                            vc.emit('inspectionPointManage', 'listInspectionPoint', {});
+                            return;
+                        }
+                        vc.message(json);
+                    },
+                    function (errInfo, error) {
+                        console.log('请求失败处理');
+
+                        vc.message(errInfo);
+                    });
+            },
+            refreshEditInspectionPointInfo: function () {
+                vc.component.editInspectionPointInfo = {
+                    inspectionId: '',
+                    machineId: '',
+                    machineName: '',
+                    inspectionName: '',
+                    communityId:'',
+                    remark: '',
+
+                }
+            }
+        }
+    });
+
+})(window.vc, window.vc.component);

WebService/src/main/resources/components/inspectionPointPackage/inspectionPoint-manage/inspectionPointManage.html

@@ -0,0 +1,114 @@
+<div id="component" class="wrapper wrapper-content animated fadeInRight ecommerce">
+    <div class="row">
+        <div class="col-lg-12">
+            <div class="ibox ">
+                <div class="ibox-title">
+                    <h5>查询条件</h5>
+                    <div class="ibox-tools" style="top:10px;">
+
+                    </div>
+                </div>
+                <div class="ibox-content">
+                    <div class="row">
+                        <div class="col-sm-4">
+                            <div class="form-group">
+                                <input type="text" placeholder="请输入设备编码"
+                                       v-model="inspectionPointManageInfo.conditions.machineCode" class=" form-control">
+                            </div>
+                        </div>
+                        <div class="col-sm-3">
+                            <div class="form-group">
+                                <input type="text" placeholder="请输入巡检点名称"
+                                       v-model="inspectionPointManageInfo.conditions.inspectionName"
+                                       class=" form-control">
+                            </div>
+                        </div>
+                        <div class="col-sm-1">
+                            <button type="button" class="btn btn-primary btn-sm"
+                                    v-on:click="_queryInspectionPointMethod()">
+                                <i class="glyphicon glyphicon-search"></i> 查询
+                            </button>
+                        </div>
+                    </div>
+
+
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-lg-12">
+            <div class="ibox">
+                <div class="ibox-title">
+                    <h5>巡检点信息</h5>
+                    <div class="ibox-tools" style="top:10px;">
+                        <button type="button" class="btn btn-primary btn-sm"
+                                v-on:click="_openAddInspectionPointModal()">
+                            <i class="glyphicon glyphicon-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-center">备注</th>
+                            <th class="text-center">操作</th>
+
+
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <tr v-for="inspectionPoint in inspectionPointManageInfo.inspectionPoints">
+                            <td class="text-center">{{inspectionPoint.inspectionName}}</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-center">{{inspectionPoint.remark}}</td>
+                            <td class="text-center">
+                                <div class="btn-group">
+                                    <button class="btn-white btn btn-xs"
+                                            v-on:click="_openEditInspectionPointModel(inspectionPoint)">修改
+                                    </button>
+                                </div>
+                                <div class="btn-group">
+                                    <button class="btn-white btn btn-xs"
+                                            v-on:click="_openDeleteInspectionPointModel(inspectionPoint)">删除
+                                    </button>
+                                </div>
+                            </td>
+
+                        </tr>
+                        </tbody>
+                        <tfoot>
+                        <tr>
+                            <td colspan="7">
+                                <ul class="pagination float-right"></ul>
+                            </td>
+                        </tr>
+                        </tfoot>
+                    </table>
+                    <!-- 分页 -->
+                    <vc:create name="pagination"></vc:create>
+                </div>
+            </div>
+        </div>
+    </div>
+
+
+    <vc:create name="addInspectionPoint"
+               callBackListener=""
+               callBackFunction=""
+    ></vc:create>
+    <vc:create name="editInspectionPoint"></vc:create>
+    <vc:create name="deleteInspectionPoint"></vc:create>
+
+</div>

WebService/src/main/resources/components/inspectionPointPackage/inspectionPoint-manage/inspectionPointManage.js

@@ -0,0 +1,87 @@
+/**
+ 入驻小区
+ **/
+(function (vc) {
+    var DEFAULT_PAGE = 1;
+    var DEFAULT_ROWS = 10;
+    vc.extends({
+        data: {
+            inspectionPointManageInfo: {
+                inspectionPoints: [],
+                total: 0,
+                records: 1,
+                moreCondition: false,
+                inspectionName: '',
+                conditions: {
+                    inspectionId: '',
+                    machineId: '',
+                    inspectionName: '',
+                    machineCode:'',
+
+                }
+            }
+        },
+        _initMethod: function () {
+            vc.component._listInspectionPoints(DEFAULT_PAGE, DEFAULT_ROWS);
+        },
+        _initEvent: function () {
+
+            vc.on('inspectionPointManage', 'listInspectionPoint', function (_param) {
+                vc.component._listInspectionPoints(DEFAULT_PAGE, DEFAULT_ROWS);
+            });
+            vc.on('pagination', 'page_event', function (_currentPage) {
+                vc.component._listInspectionPoints(_currentPage, DEFAULT_ROWS);
+            });
+        },
+        methods: {
+            _listInspectionPoints: function (_page, _rows) {
+
+                vc.component.inspectionPointManageInfo.conditions.page = _page;
+                vc.component.inspectionPointManageInfo.conditions.row = _rows;
+                var param = {
+                    params: vc.component.inspectionPointManageInfo.conditions
+                };
+
+                //发送get请求
+                vc.http.get('inspectionPointManage',
+                    'list',
+                    param,
+                    function (json, res) {
+                        var _inspectionPointManageInfo = JSON.parse(json);
+                        vc.component.inspectionPointManageInfo.total = _inspectionPointManageInfo.total;
+                        vc.component.inspectionPointManageInfo.records = _inspectionPointManageInfo.records;
+                        vc.component.inspectionPointManageInfo.inspectionPoints = _inspectionPointManageInfo.inspectionPoints;
+                        vc.emit('pagination', 'init', {
+                            total: vc.component.inspectionPointManageInfo.records,
+                            currentPage: _page
+                        });
+                    }, function (errInfo, error) {
+                        console.log('请求失败处理');
+                    }
+                );
+            },
+            _openAddInspectionPointModal: function () {
+                vc.emit('addInspectionPoint', 'openAddInspectionPointModal', {});
+            },
+            _openEditInspectionPointModel: function (_inspectionPoint) {
+                vc.emit('editInspectionPoint', 'openEditInspectionPointModal', _inspectionPoint);
+            },
+            _openDeleteInspectionPointModel: function (_inspectionPoint) {
+                vc.emit('deleteInspectionPoint', 'openDeleteInspectionPointModal', _inspectionPoint);
+            },
+            _queryInspectionPointMethod: function () {
+                vc.component._listInspectionPoints(DEFAULT_PAGE, DEFAULT_ROWS);
+
+            },
+            _moreCondition: function () {
+                if (vc.component.inspectionPointManageInfo.moreCondition) {
+                    vc.component.inspectionPointManageInfo.moreCondition = false;
+                } else {
+                    vc.component.inspectionPointManageInfo.moreCondition = true;
+                }
+            }
+
+
+        }
+    });
+})(window.vc);

WebService/src/main/resources/components/inspectionPointPackage/view-inspectionPoint-info/viewInspectionPointInfo.html

@@ -0,0 +1,48 @@
+<div class="row">
+    <div class="col-lg-12">
+        <div class="ibox ">
+            <div class="ibox-title">
+                <h5>巡检点信息</h5>
+                <div class="ibox-tools" style="top:10px;">
+                    <button type="button" v-if="viewInspectionPointInfo.index != 2" class="btn btn-primary btn-sm"
+                            style="margin-right:10px;" v-on:click="_openSelectInspectionPointInfoModel()">
+                        <i class="glyphicon glyphicon-search"></i> 选择巡检点
+                    </button>
+
+                    <button type="button" v-if="viewInspectionPointInfo.index != 2" class="btn btn-primary btn-sm"
+                            v-on:click="_openAddInspectionPointInfoModel()">
+                        <i class="glyphicon glyphicon-plus"></i> 添加巡检点
+                    </button>
+                </div>
+            </div>
+            <div class="ibox-content">
+                <div class="row">
+                    <div class="col-sm-4">
+                        <div class="form-group">
+                            <label class="col-form-label">巡检点名称：</label>
+                            <label class="">{{viewInspectionPointInfo.inspection_name}}</label>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <div class="form-group">
+                            <label class="col-form-label">备注：</label>
+                            <label class="">{{viewInspectionPointInfo.remark}}</label>
+                        </div>
+                    </div>
+                </div>
+
+            </div>
+        </div>
+    </div>
+
+    <vc:create name="addInspectionPoint"
+               callBackListener="viewInspectionPointInfo"
+               callBackFunction="chooseInspectionPoint"
+    ></vc:create>
+
+
+    <vc:create name="chooseInspectionPoint"
+               emitChooseInspectionPoint="viewInspectionPointInfo"
+               emitLoadData="viewInspectionPointInfo"
+    ></vc:create>
+</div>

WebService/src/main/resources/components/inspectionPointPackage/view-inspectionPoint-info/viewInspectionPointInfo.js

@@ -0,0 +1,49 @@
+/**
+    巡检点 组件
+**/
+(function(vc){
+
+    vc.extends({
+        propTypes: {
+           callBackListener:vc.propTypes.string, //父组件名称
+           callBackFunction:vc.propTypes.string //父组件监听方法
+        },
+        data:{
+            viewInspectionPointInfo:{
+                index:0,
+                flowComponent:'viewInspectionPointInfo',
+                inspection_name:'',
+remark:'',
+
+            }
+        },
+        _initMethod:function(){
+            //根据请求参数查询 查询 业主信息
+            vc.component._loadInspectionPointInfoData();
+        },
+        _initEvent:function(){
+            vc.on('viewInspectionPointInfo','chooseInspectionPoint',function(_app){
+                vc.copyObject(_app, vc.component.viewInspectionPointInfo);
+                vc.emit($props.callBackListener,$props.callBackFunction,vc.component.viewInspectionPointInfo);
+            });
+
+            vc.on('viewInspectionPointInfo', 'onIndex', function(_index){
+                vc.component.viewInspectionPointInfo.index = _index;
+            });
+
+        },
+        methods:{
+
+            _openSelectInspectionPointInfoModel(){
+                vc.emit('chooseInspectionPoint','openChooseInspectionPointModel',{});
+            },
+            _openAddInspectionPointInfoModel(){
+                vc.emit('addInspectionPoint','openAddInspectionPointModal',{});
+            },
+            _loadInspectionPointInfoData:function(){
+
+            }
+        }
+    });
+
+})(window.vc);