Skip to content

T
tl_estate
Commit 4c2c5f58 authored by duxinyuan's avatar duxinyuan
Browse files
Options

提交，修改人杜欣源，作品，未完成，样式，左侧目录，调整滚动条（多个）

parent e6df2238
Hide whitespace changes
Inline Side-by-side
Showing with 268 additions and 89 deletions
application/index/controller/MainIndex.php 0 → 100644
View file @ 4c2c5f58
<?php
namespace app\index\controller;
/**
* Created by PhpStorm.
* User: liu yin ping
* Date: 2018/3/13
* Time: 15:48
*/
use app\index\extend\Basic;
class MainIndex extends Basic
{
public function mainIndex()
{
if (!$this->request->isAjax()) {
return view('main_index/main_index');
}
}
}
application/index/view/global/frame_tpl.html
View file @ 4c2c5f58
......@@ -40,7 +40,7 @@
}
</style>
</head>
<body>
<body style="margin: 0 auto !important">
<div class="navbar" style="background: #ff9419 !important;">
<div class="container-fluid">
......@@ -79,7 +79,7 @@
</div>
</div>
<div id="wrapper" style="width:98% !important;float:right !important;display:inline">
<div id="wrapper" style="width:98% !important;float:left !important;display:inline">
{__CONTENT__}
{include file="global/footer_tpl" /}
</div>
......
application/index/view/global/frame_two_tpl.html
View file @ 4c2c5f58
......@@ -46,7 +46,7 @@
--><!--添加隐藏按钮-->
<div id="wrapper" style="width:98% !important;float:right !important;display:inline">
<div id="wrapper" style="width:100% !important;float:left !important;display:inline">
{__CONTENT__}
{include file="global/footer_tpl" /}
</div>
......
application/index/view/main_index/main_index.html 0 → 100644
View file @ 4c2c5f58
{layout name="global/frame_tpl" /}
{include file="global/navigation" /}
<input type="hidden" class="page-load" id="mainIndex" />
<style>
/*定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸*/
html{
font-size:640%;
/*overflow:hidden !important;*/
}
body {
overflow: hidden;;
}
.container{
width: 100%;
height:100%;
padding:0px;
}
#page-content-wrapper{
height:100%;
}
iframe {
overflow: hidden;;
}
#mainFrameTabs {
padding-left:1%;
/*width:99%;*/
}
.nav-tabs {
border : none ;
}
#topList {
background-color : #ffffff;
padding : 0px;
padding-bottom:10px;
margin:0px;
}
#topList > li {
background-color : #F6F7FC ;
}
#topList > li > a{
background-color : #F6F7FC ;
}
#topList > .active{
background : #F3E8CE ;
}
#topList > .active > a {
background : #F3E8CE ;
border : none ;
}
.tab-content{
border: none ;
}
</style>
<!--<div class="backer"></div>-->
<!--切换不同的页面 框架-->
<div id="mainFrameTabs">
<ul class="nav nav-tabs" role="tablist" id="topList">
<li class="active">
<a href="#bTabs_indexperformanceRanking" data-toggle="tab" aria-expanded="true">首页</a>
</li>
</ul>
<div class="tab-content">
<div class="tab-pane active" style="width:100%;" id="bTabs_indexperformanceRanking">
<div id="page-content-wrapper">
<div class="container">
<iframe frameborder="0" class="iframe-type" scrolling="yes" style="width:100%;height:100%;border:0px;overflow-x:hidden" src="/index/PerformanceRanking">
</iframe>
</div>
</div>
</div>
</div>
</div>
<!--加载图标-->
<!--<div id="main_loading_pic">
<img src="/resource/image/jz2.gif">
</div>-->
application/index/view/performance_ranking/performance_ranking.html
View file @ 4c2c5f58
{layout name="global/frame_tpl" /}
{include file="global/navigation" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="performance_ranking" />
<style>
/*定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸*/
......@@ -128,6 +128,18 @@
border-radius: .05rem;
/*margin-top:0.05rem;*/
float:right;
}
.more-news-long-1 {
/*width : 0.8rem !important;*/
/*height : .3rem;*/
background-color: #FF9318;
font-family: PingFangSC-Medium;
font-size: 11px;
color: #ffffff;
border-radius: .05rem;
/*margin-top:0.05rem;*/
/*float:right;*/
padding : 1px 5px !important
}
.title-time{
font-family: PingFangSC-Medium;
......@@ -179,16 +191,9 @@
font-size:.15rem;
margin-left:.1rem;
}
</style>
<!--<div class="backer"></div>-->
<!--切换不同的页面 框架-->
<div id="mainFrameTabs">
<ul class="nav nav-tabs" role="tablist">
</ul>
<div class="tab-content">
<div class="tab-pane active">
<div id="page-content-wrapper">
<div id="page-content-wrapper">
<div class="container">
<div class="row">
<div class="col-xs-12 p-a-0" id="paihang">
......@@ -299,8 +304,9 @@
<div class="col-xs-4 p-a-10 p-t-0">
<div class="panel panel-default">
<div class="area-title p-a-15 p-b-10">
<a><span id="table-title" class="active table-choose"></span></a>
<a><span id="group-title" class="table-choose left-padding ">团队Q档</span></a>
<a><span id="table-title" class="active table-choose">职称</span></a>
<a><span id="group-title" class="table-choose left-padding ">团队</span></a>
<a><span class="btn more-news-long-1" id="initOder" style="font-size:15px;">加载</span></a>
<a><span class="title-time" id="table-time"></span></a>
</div>
......@@ -337,10 +343,6 @@
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<!--加载图标-->
<!--<div id="main_loading_pic">
......@@ -449,4 +451,4 @@
<!-- /.modal-content -->
</div>
<!-- /.modal -->
</div>
</div>
\ No newline at end of file
application/route.php
View file @ 4c2c5f58
......@@ -341,7 +341,7 @@ Route::group('index', [
'getPerformanceExcel' => ['index/Performance/getPerformanceExcel', ['method' => 'POST|GET']],
'pictureShow' => ['index/PictureShow/pictureShow', ['method' => 'POST|GET']], //商铺图库 杜欣源 2018-08-31
'PerformanceRanking' => ['index/PerformanceRanking/performanceRanking', ['method' => 'POST|GET']], //效绩排行 杜欣源 2018-11-12
'mainIndex' => ['index/MainIndex/mainIndex', ['method' => 'POST|GET']], //首页 杜欣源 2018-11-12
//c端商铺图库相关
'addImageDepot' => ['index/ImageDepot/addImageDepot', ['method' => 'get | post']],//上传保存图片
......
public/resource/css/b-liu.tabs.css
View file @ 4c2c5f58
@CHARSET "UTF-8";
.bTabs{
margin-top: 10px;
/*margin-top: 10px;*/
height: 100%;
width: 88%;
float: left;
}
.bTabs button.navTabsCloseBtn {
font-size: 23px !important;
......@@ -43,10 +44,10 @@
.bTabs .nav-tabs>li>a {
padding-top: 5px;
padding-bottom: 5px;
color: #666666;
color: #333333;
}
.bTabs .nav-tabs li.active a {
color: #227AD7;
color: #131E42;
font-weight: bold;
}
.bTabs .nav-tabs li.active a button.navTabsCloseBtn{
......@@ -56,6 +57,6 @@
height: 100%;
overflow-y: hidden;
}
.bTabs div.tab-content div.tab-pane {
.bTabs div.tab-content div.tab-pane {
height: 100%;
}
\ No newline at end of file
public/resource/css/public.css
View file @ 4c2c5f58
......@@ -2,13 +2,19 @@ body {
/*width: 1335px !important;*/
/*min-width: 1335px !important;*/
width: 1230px !important;
/*width: 1230px !important;*/
/*min-width:1160px !important;*/
margin: 0;
margin: 0 auto;
/*margin: 0 auto;*/
background-color: #F2F2F2;
list-style:none;
padding-right:0px!important;
/*margin-left:0px;
margin-right:0px;*/
}
iframe > html > body {
margin:0px;
padding:0px;
}
/*适配 不同屏幕*/
@media (min-width:1680px){
......@@ -90,7 +96,11 @@ a:hover{
-moz-transition: all 0.5s ease;
-o-transition: all 0.5s ease;
-webkit-transition: all 0.5s ease;
background: #1a1a1a;
background: -webkit-linear-gradient(#0B1223, #172452); /* Safari 5.1 - 6.0 */
background: -o-linear-gradient(#0B1223, #172452); /* Opera 11.1 - 12.0 */
background: -moz-linear-gradient(#0B1223, #172452); /* Firefox 3.6 - 15 */
background: linear-gradient(#0B1223, #172452); /* 标准的语法 */
/*background: #1a1a1a;*/
height: 100%;
overflow-x: hidden;
overflow-y: auto;
......@@ -126,7 +136,7 @@ a:hover{
}*/
/*新版本 样式*/
#page-content-wrapper {
width: 88%;
width: 100%;
float: left;
}
/*隐藏按钮 样式*/
......@@ -180,12 +190,18 @@ a:hover{
.sidebar-nav li{
border-bottom: 1px solid #1a1a1a;
}
.dropdown li {
background-color : #22345E;
border : none
}
.navbar{
border: none;
}
.container{
width: 100%;
padding:0px !important;
}
/*-------------------------------*/
/* Sidebar nav styles */
......@@ -710,6 +726,7 @@ p{margin: 0;}
/*去掉 内容区距离 顶部的距离*/
.breadcrumb{
margin-bottom: 0px!important;
display: none !important;
}
/*去掉每个页面的 表格头部的边框 宽度*/
.table-bordered > thead > tr > th, .table-bordered > thead > tr > td{
......
public/resource/js/login.js
View file @ 4c2c5f58
......@@ -145,7 +145,8 @@ $(function() {
if(typeof data === 'object') {
if(data.code == 200) {
localStorage.setItem('pcUserInfo', encodeURIComponent(JSON.stringify(data.data))); //存储PC后台登录用户所有信息
location.href = '/admin.php/index/performanceRanking';
// location.href = '/admin.php/index/performanceRanking';
location.href = '/admin.php/index/mainIndex';
localStorage.removeItem('id_details_str');
} else {
alert(data['msg']);
......
public/resource/js/mainIndex.js 0 → 100644
View file @ 4c2c5f58
define (['doT', 'text!temp/menu_template_tpl.html','ckfinder','ckfinderStart', 'css!style/home.css',"datetimepicker",'pagination','bootstrapJs'], function (doT,template) {
var performanceRanking = {
pageNo: 1, /*第几页*/
pageSize: 15, /*每页显示多少条*/
user_id : 0,
urls: '',
agent_id_two:'',
agent_id2 : 0,
modal_btn_id : '' ,
init: function () {
//初始化dot
performanceRanking.event ();
},
event: function () {
var that = this ;
//只在首页显示 菜单
menu_bar(function(){
//回调部分
//记录tab的点击状态，对应的标签内容展开，并高亮显示
var _hash = location.pathname.replace('/admin.php/', '/');
var _tempObj = $('[href="'+_hash+'"]');
_tempObj.addClass('active-a').siblings().removeClass('active-a');
_tempObj.closest('.dropdown-menu').prev().attr('aria-expanded', true).parents().addClass('open').siblings().removeClass('open');
});
function menu_bar(fn) {
var user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo'))); //读取缓存
//登录时间无效 直接跳转登录页面
if(!user_info_obj){
alert('登录失效，请您重新登录');
window.location.href="login.html";
}
$ ("#menu_bar").append (template);
if (user_info_obj) {
var temp = document.getElementById ('menu_tpl').innerHTML;
var doTtmpl = doT.template (temp);
$ ("#dropdownMenu1").append(user_info_obj['name']);
$ ("#menu_bar").html (doTtmpl (user_info_obj['menu']));
//回调
fn && fn();
} else {
$.ajax ({
url: '/index/getMenu',
type: 'POST',
async: true,
data: "",
dataType: 'json',
success: function (data) {
var temp = document.getElementById ('menu_tpl').innerHTML;
var doTtmpl = doT.template (temp);
$ ("#menu_bar").html (doTtmpl (data.data.menu));
//回调
fn && fn();
}
});
}
}
},
};
return performanceRanking;
});
//$('#bTabs_indexperformanceRanking .navbar').hide()
$(".iframe-type").contents().find(".navbar").hide();
\ No newline at end of file
public/resource/js/performance_ranking.js
View file @ 4c2c5f58
define (['doT', 'text!temp/menu_template_tpl.html','ckfinder','ckfinderStart', 'css!style/home.css',"datetimepicker",'pagination','bootstrapJs'], function (doT,template) {
define (['doT', 'ckfinder','ckfinderStart', 'css!style/home.css',"datetimepicker",'pagination','bootstrapJs'], function (doT) {
var performanceRanking = {
pageNo: 1, /*第几页*/
......@@ -10,10 +13,10 @@ define (['doT', 'text!temp/menu_template_tpl.html','ckfinder','ckfinderStart', '
modal_btn_id : '' ,
init: function () {
//初始化dot
performanceRanking.addDark();
// performanceRanking.addDark();
performanceRanking.event ();
performanceRanking.loadTableData();
performanceRanking.loadTable2Data();
// performanceRanking.loadTableData();
// performanceRanking.loadTable2Data();
performanceRanking.loadBusinessSchool();
performanceRanking.loadNotice();
performanceRanking.loadWinerData();
......@@ -21,54 +24,6 @@ define (['doT', 'text!temp/menu_template_tpl.html','ckfinder','ckfinderStart', '
event: function () {
var that = this ;
that.initDate();
//只在首页显示 菜单
menu_bar(function(){
//回调部分
//记录tab的点击状态，对应的标签内容展开，并高亮显示
var _hash = location.pathname.replace('/admin.php/', '/');
var _tempObj = $('[href="'+_hash+'"]');
_tempObj.addClass('active-a').siblings().removeClass('active-a');
_tempObj.closest('.dropdown-menu').prev().attr('aria-expanded', true).parents().addClass('open').siblings().removeClass('open');
});
function menu_bar(fn) {
var user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo'))); //读取缓存
//登录时间无效 直接跳转登录页面
if(!user_info_obj){
alert('登录失效，请您重新登录');
window.location.href="login.html";
}
$ ("#menu_bar").append (template);
if (user_info_obj) {
var temp = document.getElementById ('menu_tpl').innerHTML;
var doTtmpl = doT.template (temp);
$ ("#dropdownMenu1").append(user_info_obj['name']);
$ ("#menu_bar").html (doTtmpl (user_info_obj['menu']));
//回调
fn && fn();
} else {
$.ajax ({
url: '/index/getMenu',
type: 'POST',
async: true,
data: "",
dataType: 'json',
success: function (data) {
var temp = document.getElementById ('menu_tpl').innerHTML;
var doTtmpl = doT.template (temp);
$ ("#menu_bar").html (doTtmpl (data.data.menu));
//回调
fn && fn();
}
});
}
}
//只在首页显示 菜单
$(document).on('click','.business_more', function(e){
var id = $(this).attr("id");
console.log(id);
......@@ -119,6 +74,11 @@ define (['doT', 'text!temp/menu_template_tpl.html','ckfinder','ckfinderStart', '
}
});
$(document).on('click','#initOder',function(){
performanceRanking.loadTableData();
performanceRanking.loadTable2Data();
})
},
initDate : function(){
......@@ -372,9 +332,11 @@ define (['doT', 'text!temp/menu_template_tpl.html','ckfinder','ckfinderStart', '
} else if (name == 5 ){
text = "无职称职称" + value + "档"
}
$('#table-title').empty();
$('#table-title').text(text);
} else {
$('#table-title').text('职称排行');
$('#tbody1').empty();
var tableDat = '<tr><td colspan="4" >您还没有职称</td></tr>';
tableDat += "<tr></tr>"
$('#tbody1').append(tableDat);
......@@ -385,6 +347,7 @@ define (['doT', 'text!temp/menu_template_tpl.html','ckfinder','ckfinderStart', '
$('#table-title').text('职称排行');
var tableDat = '<tr><td colspan="4" >您还没有职称</td></tr>';
tableDat += "<tr></tr>"
$('#tbody1').empty();
$('#tbody1').append(tableDat);
$('#overlay').fadeOut('')
}
......@@ -429,6 +392,7 @@ define (['doT', 'text!temp/menu_template_tpl.html','ckfinder','ckfinderStart', '
$('#group-title').text(text);
}else {
console.log(false);
$('#tbody2').empty();
$('#group-title').text('团队A档');
var tableDat = '<tr><td colspan="4" >您还没有团队</td></tr>';
tableDat += "<tr></tr>"
......@@ -438,6 +402,7 @@ define (['doT', 'text!temp/menu_template_tpl.html','ckfinder','ckfinderStart', '
} else {
$('#group-title').text('团队A档');
$('#tbody2').empty();
var tableDat = '<tr><td colspan="4" >您还没有职称</td></tr>';
tableDat += "<tr></tr>"
$('#tbody2').append(tableDat);
......@@ -445,10 +410,11 @@ define (['doT', 'text!temp/menu_template_tpl.html','ckfinder','ckfinderStart', '
}
},
error : function(data){
$('#tbody2').empty();
var tableDat = '<tr><td colspan="4" >您还没有职称</td></tr>';
tableDat += "<tr></tr>"
$('#tbody2').append(tableDat);
// $('#overlay').fadeOut('');
$('#overlay').fadeOut('');
}
});
},
......@@ -473,6 +439,7 @@ define (['doT', 'text!temp/menu_template_tpl.html','ckfinder','ckfinderStart', '
tbody = '<tr><td colspan="4" >您还没有职称</td></tr>';
tbody += "<tr></tr>"
}
$('#tbody1').empty();
$('#tbody1').append(tbody);
$('#overlay').fadeOut('')
......@@ -496,9 +463,10 @@ define (['doT', 'text!temp/menu_template_tpl.html','ckfinder','ckfinderStart', '
tbody += '</tr>' ;
}
} else {
tbody = '<tr><td colspan="4" >您还没有职称</td></tr>';
tbody = '<tr><td colspan="4" >您还没有团队</td></tr>';
tbody += "<tr></tr>"
}
$('#tbody2').empty();
$('#tbody2').append(tbody);
$('#overlay').fadeOut('')
......@@ -506,5 +474,3 @@ define (['doT', 'text!temp/menu_template_tpl.html','ckfinder','ckfinderStart', '
};
return performanceRanking;
});
//$('#bTabs_indexperformanceRanking .navbar').hide()
$(".iframe-type").contents().find(".navbar").hide();
\ No newline at end of file
public/resource/lib/js/b-liu.tabs.js
View file @ 4c2c5f58
......@@ -15,6 +15,7 @@
*/
!function ($) {
"use strict";
var maxWin = 10 ;
var defaults = {
/**
......@@ -61,7 +62,17 @@
$('ul.nav-tabs a',$($tabs)).each(function(i,row){
var li = $(this).closest('li');
if(li && !$(li).hasClass(c.noCloseClass)) $(row).append(c.closeBtnTemplate);
if(li && !$(li).hasClass(c.noCloseClass)){
if ( $(row).html() == '首页' ){
// $(row).attr("aria-expanded","true");
openTabs.push('bTabs_indexperformanceRanking');
// never close this modal
} else {
$(row).append(c.closeBtnTemplate);
}
// console.log($(row).html())
}
});
$('div.tab-content div.tab-pane',$tabs).each(function(i,row){
openTabs.push($(this).attr('id'));
......@@ -89,6 +100,8 @@
if(!id || !title || !url) console.error('新增tab时，id,title,url参数为必须传递参数！');
var c = constants, $tabs = this.$container, openTabs = this.openTabs, p = this.p;
var tabId = c.prefixKey + id;
console.log(openTabs);
if(openTabs && $.isArray(openTabs) && openTabs.length>0){
var exist = false;//是否已存在
$.each(openTabs,function(i,row){
......@@ -101,8 +114,16 @@
if(exist){
$('ul.nav-tabs a[href="#'+tabId+'"]',$tabs).tab('show');
return;
} else {
if ( maxWin < openTabs.length){
alert("最多可以同时打开"+ maxWin +"个窗口")
return false ;
}
}
}else openTabs = new Array();
}else {
openTabs = new Array();
}
$('ul.nav-tabs',$tabs).append('<li><a href="#'+tabId+'" data-toggle="tab">'+title+c.closeBtnTemplate+'</a></li>');
var content = $('<div class="tab-pane" id="'+tabId+'"></div>');
$('div.tab-content',$tabs).append(content);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment