wuxw
2019-11-20 a8b6670bff82edb6da8e1a750a344e3e8ceadfff
添加 直接从楼栋 跳转至单元的按钮
3个文件已修改
118 ■■■■■ 已修改文件
WebService/src/main/resources/components/floorPackage/floor-manage/listFloor.html 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/floorPackage/floor-manage/listFloor.js 99 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/unitPackage/unit-manage/unit.js 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebService/src/main/resources/components/floorPackage/floor-manage/listFloor.html
@@ -54,10 +54,10 @@
                            <i class="glyphicon glyphicon-plus"></i>
                            添加楼栋
                        </button>
                        <button type="button" class="btn btn-primary btn-sm" v-on:click="_openBatchAddFloorModal()">
                        <!--<button type="button" class="btn btn-primary btn-sm" v-on:click="_openBatchAddFloorModal()">
                            <i class="glyphicon glyphicon-plus"></i>
                            批量生成
                        </button>
                        </button>-->
                    </div>
                </div>
                <div class="ibox-content">
@@ -94,6 +94,9 @@
                                <div class="btn-group">
                                    <button class="btn-white btn btn-xs" v-on:click="_openDelFloorModel(floor)">删除</button>
                                </div>
                                <div class="btn-group">
                                    <button class="btn-white btn btn-xs" v-on:click="_openAddUnit(floor)">添加单元</button>
                                </div>
                            </td>
                        </tr>
                        </tbody>
@@ -116,10 +119,10 @@
               callBackListener=""
               callBackFunction=""
    ></vc:create>
    <vc:create name="batchAddFloor"
    <!--<vc:create name="batchAddFloor"
               callBackListener=""
               callBackFunction=""
    ></vc:create>
    ></vc:create>-->
    <vc:create name="editFloor"></vc:create>
    <vc:create name="deleteFloor"></vc:create>
WebService/src/main/resources/components/floorPackage/floor-manage/listFloor.js
@@ -1,76 +1,79 @@
(function(vc){
(function (vc) {
    var DEFAULT_PAGE = 1;
    var DEFAULT_ROWS = 10;
    vc.extends({
        data:{
            listFloorInfo:{
                floors:[],
                total:0,
                records:1,
                errorInfo:"",
                conditions:{
                    floorId:'',
                    floorNum:'',
                    floorName:''
        data: {
            listFloorInfo: {
                floors: [],
                total: 0,
                records: 1,
                errorInfo: "",
                conditions: {
                    floorId: '',
                    floorNum: '',
                    floorName: ''
                }
            }
        },
        _initMethod:function(){
            vc.component._listFloorData(DEFAULT_PAGE,DEFAULT_ROWS);
        _initMethod: function () {
            vc.component._listFloorData(DEFAULT_PAGE, DEFAULT_ROWS);
        },
        _initEvent:function(){
            vc.on('listFloor','listFloorData',function(){
                vc.component._listFloorData(DEFAULT_PAGE,DEFAULT_ROWS);
        _initEvent: function () {
            vc.on('listFloor', 'listFloorData', function () {
                vc.component._listFloorData(DEFAULT_PAGE, DEFAULT_ROWS);
            });
            vc.on('pagination','page_event',function(_currentPage){
                vc.component._listFloorData(_currentPage,DEFAULT_ROWS);
            vc.on('pagination', 'page_event', function (_currentPage) {
                vc.component._listFloorData(_currentPage, DEFAULT_ROWS);
            });
        },
        methods:{
            _listFloorData:function(_page,_rows){
        methods: {
            _listFloorData: function (_page, _rows) {
                vc.component.listFloorInfo.conditions.page = _page;
                vc.component.listFloorInfo.conditions.row = _rows;
                vc.component.listFloorInfo.conditions.communityId=vc.getCurrentCommunity().communityId
                vc.component.listFloorInfo.conditions.communityId = vc.getCurrentCommunity().communityId
                var param = {
                    params:vc.component.listFloorInfo.conditions
                    params: vc.component.listFloorInfo.conditions
                };
               //发送get请求
               vc.http.get('listFloor',
                            'list',
                             param,
                             function(json,res){
                                var listFloorData =JSON.parse(json);
                //发送get请求
                vc.http.get('listFloor',
                    'list',
                    param,
                    function (json, res) {
                        var listFloorData = JSON.parse(json);
                                vc.component.listFloorInfo.total = listFloorData.total;
                                vc.component.listFloorInfo.records = listFloorData.records;
                                vc.component.listFloorInfo.floors = listFloorData.apiFloorDataVoList;
                        vc.component.listFloorInfo.total = listFloorData.total;
                        vc.component.listFloorInfo.records = listFloorData.records;
                        vc.component.listFloorInfo.floors = listFloorData.apiFloorDataVoList;
                                vc.emit('pagination','init',{
                                    total:vc.component.listFloorInfo.records,
                                    currentPage:_page
                                });
                             },function(errInfo,error){
                                console.log('请求失败处理');
                             }
                           );
                        vc.emit('pagination', 'init', {
                            total: vc.component.listFloorInfo.records,
                            currentPage: _page
                        });
                    }, function (errInfo, error) {
                        console.log('请求失败处理');
                    }
                );
            },
            _openAddFloorModal:function(){ //打开添加框
                vc.emit('addFloor','openAddFloorModal',{});
            _openAddFloorModal: function () { //打开添加框
                vc.emit('addFloor', 'openAddFloorModal', {});
            },
            _openBatchAddFloorModal:function(){ //打开批量添加框
            /*_openBatchAddFloorModal:function(){ //打开批量添加框
               vc.emit('batchAddFloor','openBatchAddFloorModal',{});
            },*/
            _openDelFloorModel: function (_floor) { // 打开删除对话框
                vc.emit('deleteFloor', 'openFloorModel', _floor);
            },
            _openDelFloorModel:function(_floor){ // 打开删除对话框
                vc.emit('deleteFloor','openFloorModel',_floor);
            _openEditFloorModel: function (_floor) {
                vc.emit('editFloor', 'openEditFloorModal', _floor);
            },
            _openEditFloorModel:function(_floor){
                vc.emit('editFloor','openEditFloorModal',_floor);
            },
            _queryFloorMethod:function(){
            _queryFloorMethod: function () {
                vc.component._listFloorData(DEFAULT_PAGE, DEFAULT_ROWS);
            },
            _openAddUnit: function (_floor) {
                vc.jumpToPage("/flow/unitFlow?floorId=" + _floor.floorId + "&floorName=" + floorName);
            }
        }
    })
WebService/src/main/resources/components/unitPackage/unit-manage/unit.js
@@ -16,7 +16,13 @@
            }
        },
        _initMethod:function(){
            vc.component._loadUnits({'floorId':''});
            var _paramFloorId = vc.getParam("floorId");
            var _paramFloorName = vc.getParam("floorName");
            if(vc.notNull(_paramFloorId)){
                vc.component.unitInfo.conditions.floorId = _paramFloorId;
                vc.component.unitInfo.conditions.floorName = _paramFloorName;
            }
            vc.component._loadUnits({'floorId':_paramFloorId});
        },
        _initEvent:function(){
            vc.on('unit','chooseFloor',function(_param){