admingit/MicroCommunityWeb
1
0
Fork 0
mirror of https://gitee.com/java110/MicroCommunityWeb.git synced 2026-02-24 05:46:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunityWeb

Browse Source
This commit is contained in:
shane 2022-06-24 15:58:11 +08:00
commit e89fbbc742
13 changed files with 94 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/components/frame/breadcrumb/breadcrumb.html
View File

@ -1,4 +1,4 @@
<div id="breadcrumb" class="border-bottom white-bg" v-if="breadCrumbs.length > 0 && indexPage == '1'">
<div id="breadcrumb" class="border-bottom white-bg breadcrumb" v-if="breadCrumbs.length > 0 && indexPage == '1'">
<ul class="nav nav-tabs">
<li class="nav-item" v-for="(item,index) in breadCrumbs">
<span class="nav-link nav-link-breadcrumb" v-bind:class="{'active':item.active=='1'}" aria-current="page" @click="_changeSmallTab(item)">{{item.pageName}}
@ -6,4 +6,4 @@
</span>
</li>
</ul>
</div>
</div>

1
public/components/frame/menu2/menu2.html
View File

@ -14,6 +14,7 @@
<li v-for="subMenu in subMenus" v-if="subMenu.isShow == 'Y'" v-bind:class="{ active: subMenu.active }" v-on:click="_gotoPage(subMenu.href,subMenu.name)">
{{vc.i18n(subMenu.name)}}
</li>
<li class="sub-footer" @click="_closeSubMenu()"><i class="fa fa-dedent"></i></li>
</ul>
</div>
</div>

44
public/components/frame/menu2/menu2.js
View File

@ -1,7 +1,7 @@
/**
菜单 处理
**/
(function (vc) {
(function(vc) {
var vm = new Vue({
el: '#menu-nav',
data: {
@ -10,16 +10,18 @@
curMenuName: '',
logo: '',
},
mounted: function () {
mounted: function() {
this._initSysInfo();
//监听 菜单目录改变
document.body.addEventListener('loadMenu', function (_param) {
document.body.addEventListener('loadMenu', function(_param) {
vm.curMenuName = '';
vm.subMenus = [];
vm.getMenus(_param.detail);
}, false);
},
methods: {
_initSysInfo: function () {
_initSysInfo: function() {
let sysInfo = vc.getData("_sysInfo");
if (sysInfo == null) {
this.logo = "HC";
@ -27,20 +29,20 @@
}
this.logo = sysInfo.logo;
},
_gotoIndex: function () {
_gotoIndex: function() {
vc.jumpToPage("/")
},
getMenus: function (_catalog) {
getMenus: function(_catalog) {
let _param = {
params: {
caId: _catalog.caId,
communityId: vc.getCurrentCommunity().communityId
params: {
caId: _catalog.caId,
communityId: vc.getCurrentCommunity().communityId
}
}
}
//发送get请求
//发送get请求
vc.http.apiGet('/menu.listCatalogMenus',
_param,
function (json, res) {
function(json, res) {
let _menuData = JSON.parse(json);
if (_menuData.code != 0) {
return;
@ -49,25 +51,26 @@
if (_menus == null || _menus.length == 0) {
return;
}
_menus.sort(function (a, b) {
_menus.sort(function(a, b) {
return a.seq - b.seq
});
//var _currentMenusId = vc.getCurrentMenu() == null ? _menus[0].id : vc.getCurrentMenu();
//let _currentMenusId = _menus[0].id;
vm.menus = vm.refreshMenuActive(_menus, '');
vc.setMenus(vm.menus);
// vm.switchMenu(_menus[0]);
},
function (errInfo, error) {
function(errInfo, error) {
console.log('请求失败处理');
}
);
},
refreshMenuActive: function (jsonArray, _id) {
refreshMenuActive: function(jsonArray, _id) {
for (var menuIndex = 0; menuIndex < jsonArray.length; menuIndex++) {
if (jsonArray[menuIndex].hasOwnProperty('childs')) {
let _childs = jsonArray[menuIndex].childs;
_childs.sort(function (_child, _newChild) {
_childs.sort(function(_child, _newChild) {
return _child.seq - _newChild.seq
});
jsonArray[menuIndex].childs = _childs;
@ -82,7 +85,7 @@
}
return jsonArray;
},
switchMenu: function (_menu) {
switchMenu: function(_menu) {
//设置菜单ID
vc.setCurrentMenu(_menu.id);
vm.menus = vm.refreshMenuActive(vm.menus, _menu.id);
@ -91,7 +94,7 @@
vm.curMenuName = _menu.name;
//vc._fix_height()
},
miniMenu: function () {
miniMenu: function() {
//菜单默认为打开方式
if (!vc.notNull(vc.getMenuState())) {
@ -105,7 +108,7 @@
$("body").toggleClass("mini-navbar");
vc.setMenuState('OFF');
},
_gotoPage: function (_href, _tabName) {
_gotoPage: function(_href, _tabName) {
// 子菜单默认选中
this._setSelectedMenusChild(_href);
if (_href.indexOf('?') > -1) {
@ -131,6 +134,9 @@
}
}
this.$forceUpdate();
},
_closeSubMenu: function() {
vm.curMenuName = '';
}
},

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

@ -1,4 +1,4 @@
<div class="bg-white margin-top-xs padding">
<div class="bg-white margin-top-xs padding border-radius">
<div id="jstree_floorUnit">
</div>
</div>
</div>

2
public/components/property/roomTreeDiv/roomTreeDiv.html
View File

@ -1,5 +1,5 @@
<!-- 弹出层 modal -->
<div class="bg-white margin-top-xs padding">
<div class="bg-white margin-top-xs padding border-radius">
<div id="jstree_floorUnitRoomDiv">
</div>
<!-- end 弹出层 moda -->

6
public/css/vc-ui.css
View File

@ -773,12 +773,6 @@ ul.nav-second-level {
font-size: inherit;
}
.btn-primary {
color: #fff;
background-color: #1ab394;
border-color: #1ab394;
}
.btn-xs {
font-size: 0.7rem;
padding: 0.2rem 0.4rem;

71
public/css/vc.css
View File

@ -1,22 +1,19 @@
:root {
--vc-page-bg-color: #F6F6F7;
--vc-menu-main-bg: #1D1F2D;
--vc-menu-main-font-color: #7F848F;
--vc-menu-main-font-color: #808590;
--vc-menu-main-bg-active-color: #4979F4;
--vc-menu-main-active-font-color: #FFFFFF;
--vc-menu-main-title-font-color: #FFFFFF;
--vc-menu-sub-bg: #FFFFFF;
--vc-menu-sub-font-color: #545761;
--vc-menu-sub-bg-active-color: #EBF0FE;
--vc-menu-sub-bg-active-color: #EAF0FE;
--vc-menu-sub-active-font-color: #4979F4;
--vc-menu-sub-title-font-color: #A8A9AE;
--vc-menu-sub-title-font-color: #4F525C;
--vc-menu-sub-footer: #F6F6F7;
--vc-nav-bg: #FFFFFF;
--vc-nav-color: #888888;
--vc-nav-active-color: #4979F4;
}
.margin-0 {
@ -485,6 +482,17 @@ ul li {
text-align: right;
}
.white-bg {
background-color: #ffffff;
}
.border-bottom {
border-bottom: 1px solid #e7eaec !important;
}
.border-radius {
border-radius: 10px;
}
html,
body,
@ -503,17 +511,16 @@ body,
color: var(--vc-menu-main-font-color);
text-align: center;
width: 80px;
font-size: 12px;
font-size: 14px;
height: 100%;
overflow-x: hidden;
overflow-y: scroll;
}
.vc-menu-main::-webkit-scrollbar{
.vc-menu-main::-webkit-scrollbar {
display: none;
}
.vc-menu-main .active {
background-color: var(--vc-menu-main-bg-active-color);
color: var(--vc-menu-main-active-font-color);
@ -532,27 +539,24 @@ body,
line-height: 60px;
}
.vc-menu-main ul li.title a {
text-decoration: none;
cursor: pointer;
color: var(--vc-menu-main-title-font-color);
}
.vc-menu-sub {
background-color: var(--vc-menu-sub-bg);
color: var(--vc-menu-sub-font-color);
text-align: start;
width: 150px;
font-size: 12px;
height: 100%;
width: 160px;
font-size: 14px;
height: 95%;
overflow-x: hidden;
overflow-y: scroll;
}
.vc-menu-sub::-webkit-scrollbar{
.vc-menu-sub::-webkit-scrollbar {
display: none;
}
@ -579,6 +583,14 @@ body,
margin-bottom: 10px;
}
.vc-menu-sub ul li.sub-footer {
background-color: var(--vc-menu-sub-footer);
text-align: center;
position: fixed;
bottom: 0;
width: 160px;
}
.vc-main {
height: 100%;
width: 100%;
@ -588,7 +600,7 @@ body,
height: 40px;
width: 100%;
background-color: var(--vc-nav-bg);
font-size: 12px;
font-size: 14px;
line-height: 40px;
color: var(--vc-nav-color);
}
@ -596,8 +608,8 @@ body,
.vc-main .vc-nav ul li {
padding-left: 10px;
padding-right: 10px;
margin-left:5px;
margin-right:5px;
margin-left: 5px;
margin-right: 5px;
cursor: pointer;
}
@ -610,13 +622,28 @@ body,
border-bottom: 2px solid var(--vc-nav-active-color) !important;
}
.vc-main .vc-main-content{
.vc-main .vc-main-content {
width: 100%;
height: 95%;
overflow-x: hidden;
overflow-y: scroll;
}
.vc-menu-sub.vc-main .vc-main-content::-webkit-scrollbar{
.vc-menu-sub.vc-main .vc-main-content::-webkit-scrollbar {
display: none;
}
.vc-main .breadcrumb {
border-radius: 10px;
box-shadow: 0px 2px 5px #888888;
}
.vc-main .ibox .ibox-title {
border-top-left-radius: 10px;
border-top-right-radius: 10px;
}
.vc-main .ibox .ibox-content {
border-bottom-left-radius: 10px;
border-bottom-right-radius: 10px;
}

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

@ -5,7 +5,7 @@
<vc:create path="property/floorUnitTree" callBackListener="carStructure"></vc:create>
</div>
<div class="col-md-10 margin-bottom">
<div class="row margin-top-xs bg-white">
<div class="row margin-top-xs bg-white border-radius">
<div class="col-md-1 text-center margin-sm padding-xs" title="vc.i18n('双击查看详情','carStructure')" @dblclick="_toSimplifyAcceptance(car)" v-for="(car,index) in carStructureInfo.cars" :style="{'background-color': _getBgColor(car)}" style="color: #fff;border-radius: 5px;cursor:pointer">
<div>{{car.areaNum}}-{{car.num}}</div>
@ -19,4 +19,4 @@
</div>
</div>
</div>

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

@ -129,11 +129,11 @@
</div>
<div class="form-group row">
<div class="col-sm-6">
<button type="button" class="btn btn-primary btn-lg btn-block" @click="_openPayFee('qrCode')"><span><span><vc:i18n name="扫码收费" namespace="payFeeOrder"></vc:i18n></span></span>
<button type="button" class="btn btn-success btn-lg btn-block" @click="_openPayFee('qrCode')"><span><span><vc:i18n name="扫码收费" namespace="payFeeOrder"></vc:i18n></span></span>
</button>
</div>
<div class="col-sm-6">
<button type="button" class="btn btn-warning btn-lg btn-block" v-if="payFeeOrderInfo.offlinePayFeeSwitch !='2'" @click="_openPayFee('common')"><span><span><vc:i18n name="提交收费" namespace="payFeeOrder"></vc:i18n></span></span>
<button type="button" class="btn btn-primary btn-lg btn-block" v-if="payFeeOrderInfo.offlinePayFeeSwitch !='2'" @click="_openPayFee('common')"><span><span><vc:i18n name="提交收费" namespace="payFeeOrder"></vc:i18n></span></span>
</button>
</div>
</div>

2
public/pages/property/room/room.html
View File

@ -90,7 +90,7 @@
<div class="row">
<div class="col-lg-12">
<div class="ibox">
<div class="ibox-content">
<div class="ibox-content border-radius">
<table class="footable table table-stripped toggle-arrow-tiny" style="margin-top:10px" data-page-size="10">
<thead>
<tr>

6
public/pages/property/roomCreateFee/roomCreateFee.html
View File

@ -1,10 +1,10 @@
<div>
<div class="bg-white padding-sm">
<div class="bg-white padding-sm border-radius">
<button type="button" class="btn btn-white btn-sm" style="margin-left:10px" v-on:click="_openFeeImportExcel()">
<vc:i18n name="自定义模板" namespace="roomCreateFee"></vc:i18n>
</button>
<button type="button" class="btn btn-white btn-sm" style="margin-left:10px" v-on:click="_openDoCreateRoomFee()">
<vc:i18n name="自定义创建" namespace="roomCreateFee"></vc:i18n>
<vc:i18n name="自定义导入" namespace="roomCreateFee"></vc:i18n>
</button>
<button type="button" class="btn btn-white btn-sm" style="margin-left:10px" v-on:click="_openRoomCreateFeeAddModal(null,true)">
<i class="fa fa-plus"></i> <span><vc:i18n name="批量创建" namespace="roomCreateFee"></vc:i18n></span>
@ -14,7 +14,7 @@
</button>
</div>
<div class="row">
<div class="col-md-2" style="padding-right:0px">
<div class="col-md-2 " style="padding-right:0px">
<vc:create path="property/roomTreeDiv" callBackListener="roomCreateFee"></vc:create>
</div>
<div class="col-md-10 margin-top-xs">

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

@ -33,7 +33,7 @@
<button type="button" class="btn btn-primary btn-sm" v-on:click="_queryRoomRenovationMethod()">
<i class="fa fa-search"></i> <span><vc:i18n name="查询" namespace="roomRenovationManage"></vc:i18n></span>
</button>
<button type="button" class="btn btn-info btn-sm" v-on:click="_resetRoomRenovationMethod()" style="margin-left: 20px;">
<button type="button" class="btn btn-white btn-sm" v-on:click="_resetRoomRenovationMethod()" style="margin-left: 20px;">
<i class="fa fa-repeat"></i> <span><vc:i18n name="重置" namespace="roomRenovationManage"></vc:i18n></span>
</button>
</div>
@ -215,4 +215,4 @@
<vc:create path="property/deleteRoomRenovation"></vc:create>
<vc:create path="property/roomRenovationCompleted"></vc:create>
<!---->
</div>
</div>

8
public/pages/property/roomStructure/roomStructure.html
View File

@ -4,8 +4,8 @@
<div class="col-md-2">
<vc:create path="property/floorUnitTree" callBackListener="roomStructure"></vc:create>
</div>
<div class="col-md-10 margin-bottom" v-if="roomStructureInfo.layerRoomCount < 5">
<div class="row margin-top-xs bg-white">
<div class="col-md-10 margin-bottom " v-if="roomStructureInfo.layerRoomCount < 5">
<div class="row margin-top-xs bg-white border-radius">
<div class="col-md-1 text-center margin-sm padding-xs" :title="vc.i18n('双击查看详情','roomStructure')" @dblclick="_toSimplifyAcceptance(room)" v-for="(room,index) in roomStructureInfo.rooms" :style="{'background-color': _getBgColor(room)}" style="color: #fff;border-radius: 5px;cursor:pointer">
<div>{{room.floorNum}}-{{room.unitNum}}-{{room.roomNum}}</div>
@ -18,10 +18,10 @@
</div>
</div>
</div>
<div class="col-md-10 margin-bottom" v-else>
<div class="col-md-10 margin-bottom " v-else>
<div v-for="(val, key, index) in roomStructureInfo.parkRooms">
<span class=" padding-xs">{{key}}F</span>
<div class="row margin-top-xs bg-white">
<div class="row margin-top-xs bg-white border-radius">
<div class="col-md-1 text-center margin-sm padding-xs" :title="vc.i18n('双击查看详情','roomStructure')" @dblclick="_toSimplifyAcceptance(room)" v-for="(room,index) in val" :style="{'background-color': _getBgColor(room)}" style="color: #fff;border-radius: 5px;cursor:pointer">
<div>{{room.floorNum}}-{{room.unitNum}}-{{room.roomNum}}</div>
<div>{{room.stateName}}</div>