update
This commit is contained in:
parent
97622c8112
commit
2ec01c70dd
6
assets/css/ace.min.css
vendored
6
assets/css/ace.min.css
vendored
@ -14971,6 +14971,9 @@ th[aria-selected='true'] .ui-jqgrid-sortable {
|
||||
.datarepair {
|
||||
top: 85px !important;
|
||||
}
|
||||
.echarts-time{
|
||||
top: -20px !important;
|
||||
}
|
||||
}
|
||||
|
||||
@media only screen and (max-width:830px) {
|
||||
@ -14980,6 +14983,9 @@ th[aria-selected='true'] .ui-jqgrid-sortable {
|
||||
.datarepair {
|
||||
top: 107px !important;
|
||||
}
|
||||
.echarts-time{
|
||||
top: -20px !important;
|
||||
}
|
||||
}
|
||||
|
||||
@media only screen and (max-width:688px) {
|
||||
|
||||
@ -1 +1 @@
|
||||
{"games":["\u98ce\u66b4\u5947\u5175","\u6b4c\u624bCOCOS","\u4e2d\u53e4\u6218\u9524","\u5996\u7075\u6218\u59ec","\u751f\u5316\u7eaa\u5143","\u8bd9\u8c10\u4e09\u56fd","\u50cf\u7d20\u9879\u76ee","\u5b64\u5c9b\u5947\u5175","\u90e8\u843d\u6218\u9b42","\u90e8\u843d\u7e41\u4f53\u7248","\u90e8\u843d\u97e9\u6587\u7248","\u90e8\u843d\u8d8a\u5357\u7248","\u90e8\u843d\u82f1\u6587\u7248","\u90e8\u843d\u6cf0\u6587\u7248","\u90e8\u843dH5\u7248","\u66d9\u5149\u4e4b\u5883","\u9b54\u6cd5\u95e8H5","\u6b63\u7248\u9b54\u6cd5\u95e8\u539f\u751f","3D\u963f\u51e1\u8fbe","\u5927\u6218\u56fd","\u5927\u4e09\u56fd","\u5927\u4e09\u56fd\u97e9\u6587","\u5766\u514b\u7a81\u88ad","\u5251\u5723\u6302\u673a","\u7cbe\u7075\u7eaa\u5143","\u9b54\u6cd5\u65e0\u654c","\u4e50\u8c37\u519b\u5e08","X\u7cbe\u7075","\u5730\u4ea7\u5927\u4ea8","\u4e50\u8c37MT","\u8d85\u7ea7\u6536\u85cf\u5bb6","\u4e71\u4e16\u957f\u6b4c","\u6b4c\u624b2019","\u6218\u56fd\u4e89\u9e23","\u6697\u9ed1\u5730\u4e0b\u57ce\u7e41\u4f53","\u5c71\u6d77\u7ecf","3D\u751f\u5316","\u5176\u4ed6"],"roles":["\u8212\u5c55","\u9093\u5b9a\u658c","\u9b4f\u6676"],"gxvroles":[""],"gxyyeroles":["\u9b4f\u6676","\u67f3\u94b0\u6ce2","\u6c60\u6e90","\u9093\u6770","\u5434\u660a"],"gxcperoles":["\u9093\u5b9a\u946b","\u9976\u677e","\u91d1\u5143\u5143","\u7f57\u68a6\u83f2","\u9676\u4e39","\u5ed6\u5b50\u9f99"],"gxyferoles":["\u8212\u5c55","\u9093\u5b9a\u658c","\u5510\u51ef","\u55bb\u987a\u745e","\u5218\u601d\u654f"],"xfvroles":["\u8212\u5c55","\u9093\u5b9a\u658c","\u5510\u51ef","\u55bb\u987a\u745e","\u5218\u601d\u654f","\u9b4f\u6676","\u67f3\u94b0\u6ce2","\u6c60\u6e90","\u9093\u6770","\u674e\u4fca","\u9ec4\u6653","\u9093\u5b9a\u946b","\u9976\u677e","\u91d1\u5143\u5143","\u7f57\u68a6\u83f2","\u9676\u4e39","\u5ed6\u5b50\u9f99","\u9093\u5b9a\u5764"],"xfyyeroles":["\u67f3\u94b0\u6ce2","\u6c60\u6e90","\u9093\u6770","\u9b4f\u6676","\u5434\u660a"],"dbyyeroles":[""],"sxyyeroles":[""]}
|
||||
{"games":["\u98ce\u66b4\u5947\u5175","\u6b4c\u624bCOCOS","\u4e2d\u53e4\u6218\u9524","\u5996\u7075\u6218\u59ec","\u751f\u5316\u7eaa\u5143","\u8bd9\u8c10\u4e09\u56fd","\u50cf\u7d20\u9879\u76ee","\u5b64\u5c9b\u5947\u5175","\u90e8\u843d\u6218\u9b42","\u90e8\u843d\u7e41\u4f53\u7248","\u90e8\u843d\u97e9\u6587\u7248","\u90e8\u843d\u8d8a\u5357\u7248","\u90e8\u843d\u82f1\u6587\u7248","\u90e8\u843d\u6cf0\u6587\u7248","\u90e8\u843dH5\u7248","\u66d9\u5149\u4e4b\u5883","\u9b54\u6cd5\u95e8H5","\u6b63\u7248\u9b54\u6cd5\u95e8\u539f\u751f","3D\u963f\u51e1\u8fbe","\u5927\u6218\u56fd","\u5927\u4e09\u56fd","\u5927\u4e09\u56fd\u97e9\u6587","\u5766\u514b\u7a81\u88ad","\u5251\u5723\u6302\u673a","\u7cbe\u7075\u7eaa\u5143","\u9b54\u6cd5\u65e0\u654c","\u4e50\u8c37\u519b\u5e08","X\u7cbe\u7075","\u5730\u4ea7\u5927\u4ea8","\u4e50\u8c37MT","\u8d85\u7ea7\u6536\u85cf\u5bb6","\u4e71\u4e16\u957f\u6b4c","\u6b4c\u624b2019","\u6218\u56fd\u4e89\u9e23","\u6697\u9ed1\u5730\u4e0b\u57ce\u7e41\u4f53","\u5c71\u6d77\u7ecf","3D\u751f\u5316","\u5176\u4ed6"],"roles":["\u8212\u5c55","\u9093\u5b9a\u658c","\u9b4f\u6676"],"gxvroles":[""],"gxyyeroles":["\u9b4f\u6676","\u67f3\u94b0\u6ce2","\u6c60\u6e90","\u9093\u6770","\u5434\u660a","\u7f57\u677e\u67cf"],"gxcperoles":["\u9093\u5b9a\u946b","\u9976\u677e","\u91d1\u5143\u5143","\u7f57\u68a6\u83f2","\u9676\u4e39","\u5ed6\u5b50\u9f99"],"gxyferoles":["\u8212\u5c55","\u9093\u5b9a\u658c","\u5510\u51ef","\u55bb\u987a\u745e","\u5218\u601d\u654f"],"xfvroles":["\u8212\u5c55","\u9093\u5b9a\u658c","\u5510\u51ef","\u55bb\u987a\u745e","\u5218\u601d\u654f","\u9b4f\u6676","\u67f3\u94b0\u6ce2","\u6c60\u6e90","\u9093\u6770","\u674e\u4fca","\u9ec4\u6653","\u9093\u5b9a\u946b","\u9976\u677e","\u91d1\u5143\u5143","\u7f57\u68a6\u83f2","\u9676\u4e39","\u5ed6\u5b50\u9f99","\u9093\u5b9a\u5764"],"xfyyeroles":["\u67f3\u94b0\u6ce2","\u6c60\u6e90","\u9093\u6770","\u9b4f\u6676","\u5434\u660a"],"dbyyeroles":[""],"sxyyeroles":[""]}
|
||||
281
pmcalendar.php
281
pmcalendar.php
@ -2,7 +2,7 @@
|
||||
$user = SESS::get('EVENTUserInfo');
|
||||
// if(isn($user))exit();
|
||||
$user = json_decode($user, true);
|
||||
// $user['name'] = "罗松柏";
|
||||
$user['name'] = "罗松柏";
|
||||
$canEdit = in_array($user['name'], $ROLES);
|
||||
$isgxvrole ='1'; //in_array($user['name'], $GXVROLES); //更新信息查看区浏览权限
|
||||
$isgxyyerole = in_array($user['name'], $GXYYEROLES);//更新运营中心编辑权限
|
||||
@ -331,8 +331,8 @@ if ($act == 'newevent') {
|
||||
</div>
|
||||
|
||||
<div id="gamesbtn" style="padding:0 11px 15px 11px;">
|
||||
<?php if ($canEdit) { ?><a href="./?app=edit" class='btn btn-minier btn-pink'>编辑游戏</a><? } ?>
|
||||
<!-- <a href="./?app=edit" class='btn btn-minier btn-pink'>编辑游戏</a> -->
|
||||
<!-- <?php if ($canEdit) { ?><a href="./?app=edit" class='btn btn-minier btn-pink'>编辑游戏</a><? } ?> -->
|
||||
<a href="./?app=edit" class='btn btn-minier btn-pink'>编辑游戏</a>
|
||||
<button value='' onclick='onlyShowGame(this)' class='btn btn-minier btn-info'>显示全部</button>
|
||||
<?php
|
||||
foreach ($GAMES as $g) {
|
||||
@ -533,6 +533,8 @@ if ($act == 'newevent') {
|
||||
.fc-week {
|
||||
background-color:#f7f7f7;
|
||||
}
|
||||
.echarts-time { width: 100%; position: relative; top: -20px; display: none;}
|
||||
.echarts-time-box { max-width: 500px; height: 30px; margin: 0 auto; justify-content:space-evenly; display: flex; position: absolute; left: 0; right: 0;}
|
||||
</style>
|
||||
<div class='datarepair' id="datarepair" onclick="datarepair()">
|
||||
<img src='assets/images/tongji.png' id="dataimg"/><span id='datarepairname'>查看统计</span>
|
||||
@ -567,22 +569,49 @@ if ($act == 'newevent') {
|
||||
<p class="data-num" id="shangxainnum"></p>
|
||||
</div>
|
||||
</div>
|
||||
<div class='data_box' id='data_box'>
|
||||
<div class='echarts-time' id='echarts-time'>
|
||||
<div class="echarts-time-box">
|
||||
<div style='float: left;'>
|
||||
开始月份：
|
||||
<select name="drop2" class="ui-select" id="startmonth" style="width: 100px;">
|
||||
<option value="1">1月</option>
|
||||
<option value="2">2月</option>
|
||||
<option value="3">3月</option>
|
||||
<option value="4">4月</option>
|
||||
<option value="5">5月</option>
|
||||
<option value="6">6月</option>
|
||||
<option value="7">7月</option>
|
||||
<option value="8">8月</option>
|
||||
<option value="9">9月</option>
|
||||
<option value="10">10月</option>
|
||||
<option value="11">11月</option>
|
||||
<option value="12">12月</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div style='float: right;'>
|
||||
结束月份：
|
||||
<select name="drop2" class="ui-select" id="endmonth" style="width: 100px;">
|
||||
<option value="1">1月</option>
|
||||
<option value="2">2月</option>
|
||||
<option value="3">3月</option>
|
||||
<option value="4">4月</option>
|
||||
<option value="5">5月</option>
|
||||
<option value="6">6月</option>
|
||||
<option value="7">7月</option>
|
||||
<option value="8">8月</option>
|
||||
<option value="9">9月</option>
|
||||
<option value="10">10月</option>
|
||||
<option value="11">11月</option>
|
||||
<option value="12">12月</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<select name="drop2" class="ui-select" id="month" style="position: absolute; margin: 0 auto; left:0; right: 0; top:300px; width: 100px; z-index: 10000; opacity: 0;">
|
||||
<option value="1">1月</option>
|
||||
<option value="2">2月</option>
|
||||
<option value="3">3月</option>
|
||||
<option value="4">4月</option>
|
||||
<option value="5">5月</option>
|
||||
<option value="6">6月</option>
|
||||
<option value="7">7月</option>
|
||||
<option value="8">8月</option>
|
||||
<option value="9">9月</option>
|
||||
<option value="10">10月</option>
|
||||
<option value="11">11月</option>
|
||||
<option value="12">12月</option>
|
||||
</select>
|
||||
|
||||
<div class='data_box' id='data_box'>
|
||||
|
||||
<div id="chart" class="chartbox" style="width:100%;height:400px; margin-top:90px;"></div>
|
||||
|
||||
@ -1003,11 +1032,194 @@ if ($act == 'newevent') {
|
||||
var arryf = [];
|
||||
var starts ='';
|
||||
|
||||
$("#month").change(function(){
|
||||
var month = $("#month").val();
|
||||
console.log(month);
|
||||
// console.log("<?=$user['name']?>")
|
||||
|
||||
$("#startmonth").change(function(){
|
||||
datechoice()
|
||||
})
|
||||
|
||||
$("#endmonth").change(function(){
|
||||
datechoice()
|
||||
})
|
||||
|
||||
function datechoice() {
|
||||
|
||||
var stmonth = $("#startmonth").val();
|
||||
var time = (Math.round(starttime.getTime()) + Math.round(endtime.getTime())) / 2;
|
||||
time = new Date(time);
|
||||
var year = time.getFullYear();
|
||||
var start = year+"-"+moment(stmonth).startOf("month").format("MM-DD")+" " + '00:00:00'
|
||||
var startdate = new Date(start);
|
||||
var startmonth = Date.parse(startdate)/1000;
|
||||
|
||||
var enmonth = $("#endmonth").val();
|
||||
var end = year + "-" + moment(enmonth).endOf('month').format("MM-DD")+" " + "23:59:59"
|
||||
var enddate = new Date(end);
|
||||
var endmonth = Date.parse(enddate)/1000;
|
||||
|
||||
if(stmonth != enmonth){
|
||||
var title = year+"年"+stmonth+"月"+"至"+enmonth+"月";
|
||||
}else {
|
||||
var title = year+"年"+stmonth+"月"
|
||||
}
|
||||
|
||||
$.ajax({
|
||||
url: './?app=pmcalendar&act=getEvents',
|
||||
dataType: 'json',
|
||||
data: {
|
||||
start: startmonth,
|
||||
end: endmonth,
|
||||
game: showGame,
|
||||
type: 'charts'
|
||||
},
|
||||
|
||||
success: function (res) {
|
||||
var myChart = echarts.init(document.getElementById('chart'));
|
||||
var chartsdata = res.charts;
|
||||
|
||||
var option = {
|
||||
title: {
|
||||
text: title,
|
||||
left: 'center',
|
||||
textStyle: {
|
||||
fontWeight: 'normal',
|
||||
color: '#6fb3e0',
|
||||
}
|
||||
},
|
||||
color: ['#ff7f7f', '#a494f9'],
|
||||
toolbox: {
|
||||
show: true,
|
||||
orient: 'vertical',
|
||||
right: '1.5%',
|
||||
top: 'center',
|
||||
feature: {
|
||||
mark: {show: true},
|
||||
dataView: {show: true, readOnly: false},
|
||||
magicType: {show: true, type: ['line', 'bar', 'stack', 'tiled']},
|
||||
restore: {show: true},
|
||||
saveAsImage: {show: true}
|
||||
}
|
||||
},
|
||||
legend: {
|
||||
left: '3%',
|
||||
top: '20',
|
||||
itemHeight: 11,
|
||||
itemWidth: 6,
|
||||
color:"#5f5f5f"
|
||||
},
|
||||
tooltip: {},
|
||||
grid: {
|
||||
left: '3%',
|
||||
right: '3%',
|
||||
bottom: '5%',
|
||||
// top: '0%',
|
||||
containLabel: true
|
||||
},
|
||||
color: ['#ff7f7f', '#a494f9'],
|
||||
dataset: {
|
||||
source: chartsdata
|
||||
},
|
||||
xAxis: {
|
||||
type: 'category',
|
||||
axisLabel:{
|
||||
show: true,
|
||||
textStyle:{
|
||||
color:"#969696"
|
||||
}
|
||||
},
|
||||
axisLine:{
|
||||
lineStyle:{
|
||||
color:'#bfbfbf',
|
||||
}
|
||||
}
|
||||
},
|
||||
yAxis: {
|
||||
axisLabel:{
|
||||
textStyle:{
|
||||
color:"#bfbfbf"
|
||||
}
|
||||
},
|
||||
"axisLine": { //y轴
|
||||
"show": false
|
||||
},
|
||||
"axisTick": { //y轴刻度线
|
||||
"show": false
|
||||
},
|
||||
"splitLine": { //网格线
|
||||
"show": true,
|
||||
'coloe': '#bfbfbf'
|
||||
}
|
||||
},
|
||||
// Declare several bar series, each will be mapped
|
||||
// to a column of dataset.source by default.
|
||||
series: [
|
||||
{
|
||||
type: 'bar',
|
||||
barCategoryGap : 60,
|
||||
itemStyle: {
|
||||
normal: {
|
||||
label: {
|
||||
show: true,
|
||||
position: 'insideBottom',
|
||||
distance: 15,
|
||||
align: 'left',
|
||||
verticalAlign: 'middle',
|
||||
rotate: 1,
|
||||
fontSize: 16,
|
||||
textStyle: { //数值样式
|
||||
color: '#000',
|
||||
fontSize: 13
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
type: 'bar',
|
||||
barCategoryGap : 60,
|
||||
itemStyle: {
|
||||
normal: {
|
||||
label: {
|
||||
show: true,
|
||||
position: 'insideBottom',
|
||||
distance: 15,
|
||||
align: 'left',
|
||||
verticalAlign: 'middle',
|
||||
rotate: 1,
|
||||
fontSize: 16,
|
||||
textStyle: { //数值样式
|
||||
color: '#000',
|
||||
fontSize: 13
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
};
|
||||
myChart.setOption(option);
|
||||
|
||||
var titleAdd = res.table[0];
|
||||
titleAdd[0] = "";
|
||||
var tbdyArr = res.table[1];
|
||||
tbdyArr[2][0] = '占比';
|
||||
tmpltxt = doT.template(document.getElementById("thead-dot").innerHTML);//生成模板方法
|
||||
document.getElementById("thead-title").innerHTML = tmpltxt(titleAdd);//数据渲染
|
||||
|
||||
tmpltxt = doT.template(document.getElementById("tbody-dot").innerHTML);//生成模板方法
|
||||
document.getElementById("tbody-content").innerHTML = tmpltxt(tbdyArr);//数据渲染
|
||||
|
||||
},
|
||||
error: function () {
|
||||
alert('数据异常,请稍后重试!!!')
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
function gamesbtndis(){
|
||||
var type = $("#gamesbtn").css('display');
|
||||
// console.log($("#xsqb").html());
|
||||
@ -1122,7 +1334,7 @@ if ($act == 'newevent') {
|
||||
|
||||
var arr = {}
|
||||
arr['msg'] = cptext,
|
||||
arr['date'] = year + '-' + month + '-' + day + ' ' + branch + ':' + second
|
||||
arr['date'] = year + '-' + month + '-' + day + ' ' + branch + ':' + second
|
||||
arr = JSON.stringify(arr)
|
||||
$.ajax({
|
||||
url: './?app=pmcalendar&act=editchanpin',
|
||||
@ -1160,7 +1372,8 @@ if ($act == 'newevent') {
|
||||
|
||||
var arr = {}
|
||||
arr['msg'] = yytext,
|
||||
arr['date'] = year + '-' + month + '-' + day + ' ' + branch + ':' + second
|
||||
arr['date'] = year + '-' + month + '-' + day + ' ' + branch + ':' + second,
|
||||
arr['user'] = "<?=$user['name']?>"
|
||||
arr = JSON.stringify(arr)
|
||||
$.ajax({
|
||||
url: './?app=pmcalendar&act=edityunying',
|
||||
@ -1638,15 +1851,18 @@ if ($act == 'newevent') {
|
||||
var dis = $("#data_box").css('display');
|
||||
if (dis == 'none') {
|
||||
$('#data_box').show();
|
||||
$('#echarts-time').show();
|
||||
$('#calendardiv').hide();
|
||||
|
||||
|
||||
$('#datarepairname').html('返回Event');
|
||||
$("#dataimg").attr("src",'assets/images/fanhui.png');
|
||||
var time = (Math.round(starttime.getTime()) + Math.round(endtime.getTime())) / 2;
|
||||
time = new Date(time);
|
||||
var year = time.getFullYear() + '年';
|
||||
var month = time.getMonth() + 1 + '月';
|
||||
|
||||
console.log(month);
|
||||
$("#startmonth").val(time.getMonth() + 1);
|
||||
$("#endmonth").val(time.getMonth() + 1);
|
||||
$.ajax({
|
||||
url: './?app=pmcalendar&act=getEvents',
|
||||
dataType: 'json',
|
||||
@ -1801,6 +2017,7 @@ if ($act == 'newevent') {
|
||||
|
||||
} else {
|
||||
$('#data_box').hide();
|
||||
$("#echarts-time").hide();
|
||||
$('#datarepairname').html('查看统计');
|
||||
$("#dataimg").attr("src",'assets/images/tongji.png');
|
||||
$('#calendardiv').show();
|
||||
@ -1832,7 +2049,7 @@ if ($act == 'newevent') {
|
||||
if (res.chanpin_remark != "" && res.chanpin_remark != null) {
|
||||
var chanpin_remark = JSON.parse(res.chanpin_remark)
|
||||
document.getElementById("cptext").value = chanpin_remark.msg;
|
||||
document.getElementById("cptime").value = chanpin_remark.date;
|
||||
document.getElementById("cptime").innerHTML = chanpin_remark.date;
|
||||
if(chanpin_remark.msg.length >= 100){
|
||||
$("#cptext").css('height','150px');
|
||||
}else {
|
||||
@ -1840,15 +2057,17 @@ if ($act == 'newevent') {
|
||||
}
|
||||
}else {
|
||||
document.getElementById("cptext").value = '';
|
||||
document.getElementById("cptime").value = '';
|
||||
document.getElementById("cptime").innerHTML = '';
|
||||
}
|
||||
console.log(res.yunying_remark)
|
||||
if (res.yunying_remark != "" && res.yunying_remark != null) {
|
||||
var yunying_remark = JSON.parse(res.yunying_remark);
|
||||
console.log(yunying_remark);
|
||||
console.log(yunying_remark.msg)
|
||||
var yytime = yunying_remark.user + " " + yunying_remark.date;
|
||||
console.log(yytime);
|
||||
document.getElementById("yytext").value = yunying_remark.msg;
|
||||
document.getElementById("yytime").value = yunying_remark.date;
|
||||
document.getElementById("yytime").innerHTML = yytime;
|
||||
if(yunying_remark.msg.length >= 100){
|
||||
$("#yytext").css('height','150px');
|
||||
}else {
|
||||
@ -1856,12 +2075,12 @@ if ($act == 'newevent') {
|
||||
}
|
||||
}else {
|
||||
document.getElementById("yytext").value = '';
|
||||
document.getElementById("yytime").value = '';
|
||||
document.getElementById("yytime").innerHTML = '';
|
||||
}
|
||||
if (res.yanfa_remark != "" && res.yanfa_remark != null) {
|
||||
var yanfa_remark = JSON.parse(res.yanfa_remark);
|
||||
document.getElementById("yftext").value = yanfa_remark.msg;
|
||||
document.getElementById("yftime").value = yanfa_remark.date;
|
||||
document.getElementById("yftime").innerHTML = yanfa_remark.date;
|
||||
if(yanfa_remark.msg.length >= 100){
|
||||
$("#yftext").css('height','150px');
|
||||
}else {
|
||||
@ -1869,7 +2088,7 @@ if ($act == 'newevent') {
|
||||
}
|
||||
}else {
|
||||
document.getElementById("yftext").value = '';
|
||||
document.getElementById("yftime").value = '';
|
||||
document.getElementById("yftime").innerHTML = '';
|
||||
}
|
||||
|
||||
// if(res.fujian != null){
|
||||
|
||||
Loading…
Reference in New Issue
Block a user