Skip to content

G
gs1-admin
Commit a90cfb66 by Lyan
Options

统计展示时间

parent f1374abd
Showing with 51 additions and 29 deletions
src/views/modules/dataStatistics/dataInfo.vue
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
url: this.$http.adornUrl(`/office/clickDetail/getClickDetailList`), url: this.$http.adornUrl(`/office/clickDetail/getClickDetailList`),
method: 'post', method: 'post',
data: this.$http.adornData({ data: this.$http.adornData({
'cId': this.cId, 'cid': this.cId,
'typeValue': this.typeValue, 'typeValue': this.typeValue,
"page": this.pageIndex, "page": this.pageIndex,
"limit": this.pageSize "limit": this.pageSize
......
src/views/modules/planbranch/annual-add-or-update.vue
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<el-dialog <el-dialog
title="修改年度培训计划" title="修改年度培训计划"
:close-on-click-modal="false" :close-on-click-modal="false"
:visible.sync="visible"> :visible.sync="visible" v-if="visible">
<el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="120px" > <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="120px" >
<el-form-item label="分支机构名称：" prop="name"> <el-form-item label="分支机构名称：" prop="name">
<el-input v-model="dataForm.name" placeholder="请输入显示标题" disabled></el-input> <el-input v-model="dataForm.name" placeholder="请输入显示标题" disabled></el-input>
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
}, },
fileUrl: new FormData(), fileUrl: new FormData(),
fileUrlStr: '' fileUrlStr: ''
} }
}, },
...@@ -60,6 +60,7 @@ ...@@ -60,6 +60,7 @@
this.visible = true this.visible = true
this.dataForm.name = name this.dataForm.name = name
this.dataForm.docfile = ppth this.dataForm.docfile = ppth
this.fileUrl=new FormData()
}, },
// 表单提交 // 表单提交
......
src/views/modules/visitsmanage/totalclicks.vue
...@@ -29,6 +29,18 @@ ...@@ -29,6 +29,18 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
header-align="center" header-align="center"
prop="createStartTime"
align="center"
label="开始时间">
</el-table-column>
<el-table-column
header-align="center"
prop="createEndTime"
align="center"
label="结束时间">
</el-table-column>
<el-table-column
header-align="center"
prop="total" prop="total"
align="center" align="center"
label="总量"> label="总量">
...@@ -84,7 +96,13 @@ ...@@ -84,7 +96,13 @@
if (data && data.code === 0) { if (data && data.code === 0) {
console.log(data) console.log(data)
this.dataList=[] this.dataList=[]
this.dataList.push({total:data.data}) this.dataList.push(
{
total:data.data.hitCount?data.data.hitCount:'',
createEndTime:data.data.createEndTime?data.data.createEndTime.substring(0,19):'',
createStartTime:data.data.createStartTime?data.data.createStartTime.substring(0,19):'',
}
)
this.totalPage = 1 this.totalPage = 1
} else { } else {
this.$message.error(data.msg) this.$message.error(data.msg)
......
static/config/index.js
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
// api接口请求地址 // api接口请求地址
// window.SITE_CONFIG['baseUrl'] = 'http://95zvp8.natappfree.cc' // window.SITE_CONFIG['baseUrl'] = 'http://95zvp8.natappfree.cc'
// window.SITE_CONFIG['baseUrl'] = 'http://192.168.0.77:9091' window.SITE_CONFIG['baseUrl'] = 'http://192.168.0.77:9091'
window.SITE_CONFIG['baseUrl'] = ' http://dynamic.gs1cn.org' // window.SITE_CONFIG['baseUrl'] = ' http://dynamic.gs1cn.org'
// cdn地址 = 域名 + 版本号 // cdn地址 = 域名 + 版本号
window.SITE_CONFIG['domain'] = './' // 域名 window.SITE_CONFIG['domain'] = './' // 域名
window.SITE_CONFIG['version'] = '' // 版本号(年月日时分) window.SITE_CONFIG['version'] = '' // 版本号(年月日时分)
......
static/plugins/ueditor-1.4.3.3/dialogs/image/image.js
...@@ -231,6 +231,7 @@ ...@@ -231,6 +231,7 @@
$G("width").value = img.width || ''; $G("width").value = img.width || '';
$G("height").value = img.height || ''; $G("height").value = img.height || '';
$G("border").value = img.getAttribute("border") || '0'; $G("border").value = img.getAttribute("border") || '0';
$G("vhSpace").value = img.getAttribute("hspace") || '0';
$G("vhSpace").value = img.getAttribute("vspace") || '0'; $G("vhSpace").value = img.getAttribute("vspace") || '0';
$G("title").value = img.title || img.alt || ''; $G("title").value = img.title || img.alt || '';
setAlign(align); setAlign(align);
...@@ -278,9 +279,10 @@ ...@@ -278,9 +279,10 @@
border: data['border'] || '', border: data['border'] || '',
floatStyle: data['align'] || '', floatStyle: data['align'] || '',
vspace: data['vhSpace'] || '', vspace: data['vhSpace'] || '',
hspace: data['vhSpace'] || '',
title: data['title'] || '', title: data['title'] || '',
alt: data['title'] || '', alt: data['title'] || '',
style: "width:" + data['width'] + "px;height:" + data['height'] + "px;margin-right:20px;margin-left:0;" style: "width:" + data['width'] + "px;height:" + data['height'] + "px;margin-right:20px;margin-left:20px;"
}]; }];
}else if(data['align']=='right'){ }else if(data['align']=='right'){
...@@ -292,9 +294,10 @@ ...@@ -292,9 +294,10 @@
border: data['border'] || '', border: data['border'] || '',
floatStyle: data['align'] || '', floatStyle: data['align'] || '',
vspace: data['vhSpace'] || '', vspace: data['vhSpace'] || '',
hspace: data['vhSpace'] || '',
title: data['title'] || '', title: data['title'] || '',
alt: data['title'] || '', alt: data['title'] || '',
style: "width:" + data['width'] + "px;height:" + data['height'] + "px;;margin-left:20px;margin-right:0;" style: "width:" + data['width'] + "px;height:" + data['height'] + "px;margin-left:20px;margin-right:20px;"
}]; }];
}else{ }else{
...@@ -306,6 +309,7 @@ ...@@ -306,6 +309,7 @@
border: data['border'] || '', border: data['border'] || '',
floatStyle: data['align'] || '', floatStyle: data['align'] || '',
vspace: data['vhSpace'] || '', vspace: data['vhSpace'] || '',
hspace: data['vhSpace'] || '',
title: data['title'] || '', title: data['title'] || '',
alt: data['title'] || '', alt: data['title'] || '',
style: "width:" + data['width'] + "px;height:" + data['height'] + "px;margin:0;" style: "width:" + data['width'] + "px;height:" + data['height'] + "px;margin:0;"
...@@ -815,7 +819,7 @@ ...@@ -815,7 +819,7 @@
title: data.title, title: data.title,
alt: data.original, alt: data.original,
floatStyle: align, floatStyle: align,
style:'margin-right:20px;margin-left:0;' style:'margin-right:20px;margin-left:20px;'
}); });
}else if(align=='right'){ }else if(align=='right'){
list.push({ list.push({
...@@ -824,7 +828,7 @@ ...@@ -824,7 +828,7 @@
title: data.title, title: data.title,
alt: data.original, alt: data.original,
floatStyle: align, floatStyle: align,
style:'margin-left:20px;margin-right:0;' style:'margin-left:20px;margin-right:20px;'
}); });
}else{ }else{
list.push({ list.push({
...@@ -1015,7 +1019,7 @@ ...@@ -1015,7 +1019,7 @@
_src: src, _src: src,
alt: src.substr(src.lastIndexOf('/') + 1), alt: src.substr(src.lastIndexOf('/') + 1),
floatStyle: align, floatStyle: align,
style:'margin-right:20px;margin-left:0;' style:'margin-right:20px;margin-left:20px;'
}); });
}else if(align=='right'){ }else if(align=='right'){
list.push({ list.push({
...@@ -1023,7 +1027,7 @@ ...@@ -1023,7 +1027,7 @@
_src: src, _src: src,
alt: src.substr(src.lastIndexOf('/') + 1), alt: src.substr(src.lastIndexOf('/') + 1),
floatStyle: align, floatStyle: align,
style:'margin-left:20px;margin-right:0;' style:'margin-left:20px;margin-right:20px;'
}); });
}else{ }else{
list.push({ list.push({
...@@ -1208,7 +1212,7 @@ ...@@ -1208,7 +1212,7 @@
_src: src, _src: src,
alt: src.substr(src.lastIndexOf('/') + 1), alt: src.substr(src.lastIndexOf('/') + 1),
floatStyle: align, floatStyle: align,
style:'margin-right:20px;margin-left:0;' style:'margin-right:20px;margin-left:20px;'
}); });
}else if(align=='right'){ }else if(align=='right'){
list.push({ list.push({
...@@ -1216,7 +1220,7 @@ ...@@ -1216,7 +1220,7 @@
_src: src, _src: src,
alt: src.substr(src.lastIndexOf('/') + 1), alt: src.substr(src.lastIndexOf('/') + 1),
floatStyle: align, floatStyle: align,
style:'margin-left:20px;margin-right:0' style:'margin-left:20px;margin-right:20px;'
}); });
}else{ }else{
list.push({ list.push({
......
static/plugins/ueditor-1.4.3.3/ueditor.all.min.js
...@@ -3498,8 +3498,8 @@ ...@@ -3498,8 +3498,8 @@
if (f) { if (f) {
var s = m; var s = m;
switch (i.imageBlockLine) { switch (i.imageBlockLine) {
case 'left':domUtils.setStyle(e, 'margin-right', '20px'),domUtils.setStyle(e, 'margin-left', '0') case 'left':domUtils.setStyle(e, 'margin-right', '20px'),domUtils.setStyle(e, 'margin-left', '20px')
case 'right':domUtils.setStyle(e, 'margin-left', '20px'),domUtils.setStyle(e, 'margin-right', '0') case 'right':domUtils.setStyle(e, 'margin-left', '20px'),domUtils.setStyle(e, 'margin-right', '20px')
case 'none': case 'none':
for (var p, t, q, u = s.parentNode; dtd.$inline[u.tagName] || u.tagName == 'A';) u = u.parentNode; for (var p, t, q, u = s.parentNode; dtd.$inline[u.tagName] || u.tagName == 'A';) u = u.parentNode;
if (p = u, p.tagName == 'P' && domUtils.getStyle(p, 'text-align') == 'center' && !domUtils.isBody(p) && domUtils.getChildCount(p, function(a) { if (p = u, p.tagName == 'P' && domUtils.getStyle(p, 'text-align') == 'center' && !domUtils.isBody(p) && domUtils.getChildCount(p, function(a) {
...@@ -3513,7 +3513,6 @@ ...@@ -3513,7 +3513,6 @@
break; break;
case 'center': case 'center':
if (l.queryCommandValue('imagefloat') != 'center') { if (l.queryCommandValue('imagefloat') != 'center') {
console.log(1111)
for (u = s.parentNode, domUtils.setStyle(s, 'float', 'none'), p = s; u && domUtils.getChildCount(u, function(a) { for (u = s.parentNode, domUtils.setStyle(s, 'float', 'none'), p = s; u && domUtils.getChildCount(u, function(a) {
return !domUtils.isBr(a) && !domUtils.isWhitespace(a) return !domUtils.isBr(a) && !domUtils.isWhitespace(a)
}) == 1 && (dtd.$inline[u.tagName] || u.tagName == 'A');) p = u, u = u.parentNode; }) == 1 && (dtd.$inline[u.tagName] || u.tagName == 'A');) p = u, u = u.parentNode;
...@@ -3707,8 +3706,8 @@ ...@@ -3707,8 +3706,8 @@
var e = d.getClosedNode(); var e = d.getClosedNode();
if (e && e.tagName == 'IMG') switch (b) { if (e && e.tagName == 'IMG') switch (b) {
case 'left':domUtils.setStyle(e, 'margin-right', '20px'),domUtils.setStyle(e, 'margin-left', '0') case 'left':domUtils.setStyle(e, 'margin-right', '20px'),domUtils.setStyle(e, 'margin-left', '20px')
case 'right':domUtils.setStyle(e, 'margin-left', '20px'),domUtils.setStyle(e, 'margin-right', '0') case 'right':domUtils.setStyle(e, 'margin-left', '20px'),domUtils.setStyle(e, 'margin-right', '20px')
case 'none': case 'none':
for (var f, g, h, i = e.parentNode; dtd.$inline[i.tagName] || i.tagName == 'A';) i = i.parentNode; for (var f, g, h, i = e.parentNode; dtd.$inline[i.tagName] || i.tagName == 'A';) i = i.parentNode;
if (f = i, f.tagName == 'P' && domUtils.getStyle(f, 'text-align') == 'center') { if (f = i, f.tagName == 'P' && domUtils.getStyle(f, 'text-align') == 'center') {
...@@ -4990,7 +4989,7 @@ ...@@ -4990,7 +4989,7 @@
} }
var e = this, var e = this,
f = b.keyCode || b.which; f = b.keyCode || b.which;
if (!(l[f] || b.ctrlKey || b.metaKey || b.shiftKey || b.altKey)) { if (!(l[f] || b.ctrlKey || b.metaKey || b.altKey)) {
if (n) return; if (n) return;
if (!e.selection.getRange().collapsed) return e.undoManger.save(!1, !0), void(o = !1); if (!e.selection.getRange().collapsed) return e.undoManger.save(!1, !0), void(o = !1);
e.undoManger.list.length == 0 && e.undoManger.save(!0), clearTimeout(d), d = setTimeout(function() { e.undoManger.list.length == 0 && e.undoManger.save(!0), clearTimeout(d), d = setTimeout(function() {
......
static/plugins/ueditor-1.4.3.3/ueditor.config.js
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
// 首行缩进距离,默认是2em // 首行缩进距离,默认是2em
//, indentValue:'2em' //, indentValue:'2em'
//, initialFrameWidth:1000 //初始化编辑器宽度,默认1000 // initialFrameWidth:'100%', //初始化编辑器宽度,默认1000
initialFrameHeight: 420, // 初始化编辑器高度,默认320 initialFrameHeight: 420, // 初始化编辑器高度,默认320
//, readonly : false //编辑器初始化结束后,编辑区域是否是只读的，默认是false //, readonly : false //编辑器初始化结束后,编辑区域是否是只读的，默认是false
...@@ -255,13 +255,13 @@ ...@@ -255,13 +255,13 @@
// insertunorderedlist // insertunorderedlist
// 无序列表的下拉配置，值留空时支持多语言自动识别，若配置值，则以此值为准 // 无序列表的下拉配置，值留空时支持多语言自动识别，若配置值，则以此值为准
//, insertunorderedlist : { //自定的样式 insertunorderedlist : { //自定的样式
// 'dash' :'— 破折号', //-破折号 'dash' :'— 破折号', //-破折号
// 'dot':' 。 小圆圈', //系统自带 'dot':' 。 小圆圈', //系统自带
// 'circle' : '', // '○ 小圆圈' 'circle' : '', // '○ 小圆圈'
// 'disc' : '', // '● 小圆点' 'disc' : '', // '● 小圆点'
// 'square' : '' //'■ 小方块' 'square' : '' //'■ 小方块'
// } },
//, listDefaultPaddingLeft : '30'//默认的左边缩进的基数倍 //, listDefaultPaddingLeft : '30'//默认的左边缩进的基数倍
// listiconpath : 'http://bs.baidu.com/listicon/' ,//自定义标号的路径 // listiconpath : 'http://bs.baidu.com/listicon/' ,//自定义标号的路径
//, maxListLevel : 3 //限制可以tab的级数, 设置-1为不限制 //, maxListLevel : 3 //限制可以tab的级数, 设置-1为不限制
...@@ -498,7 +498,7 @@ ...@@ -498,7 +498,7 @@
mark: [], mark: [],
nav: [], nav: [],
ol: ['class', 'style'], ol: ['class', 'style'],
p: ['class', 'style'], p: ['class', 'style','data-background'],
pre: ['class', 'style'], pre: ['class', 'style'],
s: [], s: [],
section: [], section: [],
......
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