Skip to content

G
gk
Commit c46469b4 authored by daniel's avatar daniel
Browse files
Options

feat(func): 功能菜单+外面模块完善+上传改造

parent 9afd7b78
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1337 additions and 1015 deletions
src/main/java/com/dlbridge/jadp/plugins/cmpt/bean/Func.java
View file @ c46469b4
package com.dlbridge.jadp.plugins.cmpt.bean;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
import java.util.Date;
@Setter
@Getter
@ApiModel(value = "功能模块", description = "功能模板")
......@@ -25,7 +28,6 @@ public class Func {
private String appId;
private String url;
private Integer type;
@ApiModelProperty(value = "可见性")
......@@ -37,14 +39,22 @@ public class Func {
private Integer status;
private String style;
// 打开方式配置（0 默认 1 网页 2 小程序(appId,path) 3 短连接(#小程序://) 4 页面(小程序) 5文档word,pdf 6 图片 png）
// 类型配置（0文本 1 网页 2 小程序(appId,path) 3 短连接(#小程序://) 4 页面(小程序) 5文档word,pdf 6 图片 png）
private Integer openType;
// 图标
private String icon;
// 小程序路径，图片路径，文档路径，短连接路径，页面路径
private String path;
// 模块失效时间
private String deadTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date deadTime;
// 模块开始时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date startTime;
// 是否需要开启有效时间
private Integer needTime;
// 富文本
private String content;
}
src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/CmptSettingMapper.xml
View file @ c46469b4
......@@ -40,7 +40,9 @@
del_flag AS "delFlag",
icon,
dead_time AS deadTime,
open_type AS openType
open_type AS openType,
start_time AS startTime,
need_time AS needTime
FROM `gk_cmptsetting`
WHERE cmptid = #{cmptId} order by seq
</select>
......@@ -114,15 +116,23 @@
<if test="func.url != null">
url = #{func.url},
</if>
<if test="func.openType != null">
open_type = #{func.openType},
</if>
<if test="func.icon != null">
icon = #{func.icon}
icon = #{func.icon},
</if>
<if test="func.deadTime != null">
dead_time = #{func.deadTime}
dead_time = #{func.deadTime,jdbcType=TIMESTAMP},
</if>
<if test="func.content != null">
content = #{func.content},
</if>
<if test="func.needTime != null">
need_time = #{func.needTime},
</if>
<if test="func.startTime != null">
start_time = #{func.startTime,jdbcType=TIMESTAMP}
</if>
</set>
WHERE id = #{func.id}
......@@ -143,7 +153,10 @@
url,
open_type,
icon,
dead_time)
dead_time,
content,
need_time,
start_time)
VALUES (#{func.id},
#{func.cmptId},
#{func.nameWeb},
......@@ -159,7 +172,10 @@
#{func.url},
#{func.openType},
#{func.icon},
#{func.deadTime})
now(),
#{func.content},
#{func.needTime},
now())
</insert>
<update id="updateById">
......@@ -176,8 +192,17 @@
<if test="openType != null">
open_type = #{openType},
</if>
<if test="deadTime != null">
dead_time = #{deadTime}
<if test="func.deadTime != null">
dead_time = #{func.deadTime,jdbcType=TIMESTAMP},
</if>
<if test="func.startTime != null">
start_time = #{func.startTime,jdbcType=TIMESTAMP}
</if>
<if test="needTime != null">
need_time = #{needTime},
</if>
<if test="content != null">
content = #{content}
</if>
create_by = #{createBy},
create_date = #{createDate},
......@@ -202,14 +227,23 @@
open_type = #{openType},
</if>
<if test="deadTime != null">
dead_time = #{deadTime}
dead_time = #{deadTime,jdbcType=TIMESTAMP},
</if>
<if test="startTime!= null">
start_time = #{startTime,jdbcType=TIMESTAMP},
</if>
<if test="needTime!= null">
need_time = #{needTime},
</if>
<if test="content!= null">
content = #{content},
</if>
update_date = now()
WHERE cmptId=#{setting.cmptId} and type = #{setting.type} and del_flag = 0
</update>
<select id="queryFuncs" resultType="com.dlbridge.jadp.plugins.cmpt.bean.Func">
select id,cmptid cmptId,name,type,visibility,seq,app_id appId,url,name_web nameWeb,`status`,icon,open_type openType,dead_time deadTime
select id,cmptid cmptId,name,type,visibility,seq,app_id appId,url,name_web nameWeb,`status`,icon,open_type openType,dead_time deadTime,start_time startTime,need_time needTime
from gk_cmptsetting
where cmptid = #{cmptId} and visibility=1 and del_flag=0 and status>0
order by seq
......@@ -217,7 +251,7 @@
</select>
<select id="queryAllFuncs" resultType="com.dlbridge.jadp.plugins.cmpt.bean.Func">
select id,cmptid cmptId,name,type,visibility,seq,app_id appId,url,name_web nameWeb,`status`,icon,open_type openType,dead_time deadTime
select id,cmptid cmptId,name,type,visibility,seq,app_id appId,url,name_web nameWeb,`status`,icon,open_type openType,dead_time deadTime,start_time startTime,need_time needTime
from gk_cmptsetting
where cmptid = #{cmptId} and visibility=1 and del_flag=0 and status=1
order by seq
......@@ -271,7 +305,7 @@
</select>
<select id="queryAllThirdMicros" resultType="com.dlbridge.jadp.plugins.cmpt.bean.Func">
select id,cmptid cmptId,name,type,visibility,seq,app_id appId,url,name_web nameWeb,icon,open_type openType,dead_time deadTime
select id,cmptid cmptId,name,type,visibility,seq,app_id appId,url,name_web nameWeb,icon,open_type openType,dead_time deadTime,start_time startTime,need_time needTime
from gk_cmptsetting
where cmptid = #{cmptId} and type=19
</select>
......@@ -280,7 +314,7 @@
delete from gk_cmptsetting where id = #{id}
</delete>
<select id="getFuncById" resultType="com.dlbridge.jadp.plugins.cmpt.bean.Func">
select id,cmptid cmptId,name,type,visibility,seq,app_id appId,url,name_web nameWeb,icon,open_type openType,dead_time deadTime
select id,cmptid cmptId,name,type,visibility,seq,app_id appId,url,name_web nameWeb,icon,open_type openType,dead_time deadTime,start_time startTime,need_time needTime
from gk_cmptsetting
where id=#{id}
</select>
......
src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/model/CmptSetting.java
View file @ c46469b4
package com.dlbridge.jadp.plugins.cmpt.dao.model;
import com.dlbridge.jadp.common.persistence.JaapRecord;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
public class CmptSetting extends JaapRecord<CmptSetting> {
......@@ -22,13 +25,35 @@ public class CmptSetting extends JaapRecord<CmptSetting> {
// 图标
private String icon;
// 模块失效时间
private String deadTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date deadTime;
// 模块开始时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date startTime;
// 是否需要开启有效时间
private Integer needTime;
public Date getStartTime() {
return startTime;
}
public void setStartTime(Date startTime) {
this.startTime = startTime;
}
public Integer getNeedTime() {
return needTime;
}
public void setNeedTime(Integer needTime) {
this.needTime = needTime;
}
public String getDeadTime() {
public Date getDeadTime() {
return deadTime;
}
public void setDeadTime(String deadTime) {
public void setDeadTime(Date deadTime) {
this.deadTime = deadTime;
}
......
src/main/java/com/dlbridge/jadp/plugins/cmpt/web/ResourcesController.java
View file @ c46469b4
......@@ -108,6 +108,8 @@ public class ResourcesController {
response.addHeader("Content-Disposition", "attachment; filename=qrcode.jpg");
JSONObject obj = new JSONObject();
obj.put("scene", "raceId=" + cmptid);
// 修改为小程序页面路径 by 2025-06-12
obj.put("page", "pages/race/raceHome");
obj.put("width", "1280");
String partnerId = cmptService.getPartnerId(cmptid);
try {
......
src/main/java/com/dlbridge/jadp/plugins/cmpt/web/SureLetterController.java
View file @ c46469b4
......@@ -8,10 +8,7 @@ import com.dlbridge.jadp.plugins.cmpt.service.CmptSettingService;
import com.neusoft.www.utils.web.Result;
import lombok.extern.log4j.Log4j2;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import springfox.documentation.annotations.ApiIgnore;
......@@ -58,7 +55,7 @@ public class SureLetterController {
@RequestMapping("/updateName")
@ResponseBody
public Result updateName(Func func) {
public Result updateName(@RequestBody Func func) {
cmptSettingService.saveOrUpdate(func);
return Result.success().setContent(1);
}
......
src/main/webapp/WEB-INF/views/cmpt/module.jsp
View file @ c46469b4
......@@ -396,6 +396,7 @@
</div>
<script src="${ctxStatic}/vue/vue.js"></script>
<script>
const uploadUrl = '/api-common/v1/upload?folder=' + 'gk/module' + '&cmptId=' + getCId()
var app = new Vue({
el: '#module',
data: {
......@@ -553,19 +554,19 @@
},
//文件上传处理
uploadFile(obj) {
logoFile = obj.target.files[0];
if (logoFile.type && logoFile.type.indexOf("image") == -1) {
file = obj.target.files[0];
if (logoFile.type && file.type.indexOf("image") == -1) {
return layer.msg('请上传图片', { icon: 5 })
}
var reads = new FileReader();
reads.readAsDataURL(logoFile);
reads.readAsDataURL(file);
reads.onload = function () {
//将处理完的图片文件上传到阿里云服务器
//上传LOGO图片
var formData = new FormData();
formData.append("uploadImg", logoFile);
formData.append("file", formData);
$.ajax({
url: 'https://event.geexek.com/upload/file.do', /*接口域名地址*/
url: uploadUrl, /*接口域名地址*/
type: 'post',
data: formData,
contentType: false,
......@@ -573,9 +574,7 @@
success: function (res) {
if (res.code == "1") {
layer.msg('上传成功', { icon: 1, time: 1500 });
app.$data.module.icon = res.result
} else {
console.log(res);
app.$data.module.icon = res.content
}
},
beforeSend: () => {
......
src/main/webapp/WEB-INF/views/cmpt/service.jsp
View file @ c46469b4
......@@ -32,9 +32,6 @@
<link rel="stylesheet"
href="${ctxStatic}/newdermon/css/main.css?v=<%=System.currentTimeMillis()%>">
<link rel="stylesheet" href="${ctxStatic}/cmpt/setting.css?v=<%=System.currentTimeMillis()%>">
<link rel="stylesheet"
href="${ctxStatic}/leaflet/css/leaflet.css?v=<%=System.currentTimeMillis()%>" />
<link rel="stylesheet" href="${ctxStatic}/leaflet/css/leaflet_label.css" />
<script src="${ctxStatic}/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
<script src="${ctxStatic}/newdermon/vendor/jquery/jquery.min.js"></script>
......@@ -524,6 +521,7 @@
</div>
<script src="${ctxStatic}/vue/vue.js"></script>
<script>
const uploadUrl = '/api-common/v1/upload?folder=' + 'gk/service' + '&cmptId=' + getCId()
var app = new Vue({
el: '#service',
data: {
......@@ -880,19 +878,19 @@
},
//文件上传处理
uploadFile(obj) {
logoFile = obj.target.files[0];
if (logoFile.type && logoFile.type.indexOf("image") == -1) {
file = obj.target.files[0];
if (file.type && file.type.indexOf("image") == -1) {
return layer.msg('请上传图片', { icon: 5 })
}
var reads = new FileReader();
reads.readAsDataURL(logoFile);
reads.readAsDataURL(file);
reads.onload = function () {
//将处理完的图片文件上传到阿里云服务器
//上传LOGO图片
var formData = new FormData();
formData.append("uploadImg", logoFile);
formData.append("file", file);
$.ajax({
url: 'https://event.geexek.com/upload/file.do', /*接口域名地址*/
url: uploadUrl, /*接口域名地址*/
type: 'post',
data: formData,
contentType: false,
......@@ -901,10 +899,7 @@
console.log({ res });
if (res.code == "1") {
layer.msg('上传成功', { icon: 1, time: 1500 });
app.$data.service.imgUrl = res.result
console.log(app.$data.service.imgUrl)
} else {
console.log(res);
app.$data.service.imgUrl = res.content
}
},
beforeSend: () => {
......@@ -918,19 +913,19 @@
},
//文件上传处理
uploadIconFile(obj) {
logoFile = obj.target.files[0];
if (logoFile.type && logoFile.type.indexOf("image") == -1) {
file = obj.target.files[0];
if (file.type && file.type.indexOf("image") == -1) {
return layer.msg('请上传图片', { icon: 5 })
}
var reads = new FileReader();
reads.readAsDataURL(logoFile);
reads.readAsDataURL(file);
reads.onload = function () {
//将处理完的图片文件上传到阿里云服务器
//上传LOGO图片
var formData = new FormData();
formData.append("uploadImg", logoFile);
formData.append("file", file);
$.ajax({
url: 'https://event.geexek.com/upload/file.do', /*接口域名地址*/
url: uploadUrl, /*接口域名地址*/
type: 'post',
data: formData,
contentType: false,
......@@ -938,9 +933,7 @@
success: function (res) {
if (res.code == "1") {
layer.msg('上传成功', { icon: 1, time: 1500 });
app.$data.service.iconUrl = res.result
} else {
console.log(res);
app.$data.service.iconUrl = res.content
}
},
beforeSend: () => {
......
src/main/webapp/WEB-INF/views/cmpt/swiper.jsp
View file @ c46469b4
......@@ -433,6 +433,7 @@
</div>
<script src="${ctxStatic}/vue/vue.js"></script>
<script>
const uploadUrl = '/api-common/v1/upload?folder=' + 'gk/swiper' + '&cmptId=' + getCId()
var app = new Vue({
el: '#swiper',
data: {
......@@ -609,7 +610,7 @@
}
setTimeout(() => {
layer.closeAll()
},1500)
}, 1500)
},
complete: () => {
......@@ -641,19 +642,19 @@
},
//文件上传处理
uploadFile(obj) {
logoFile = obj.target.files[0];
if (logoFile.type && logoFile.type.indexOf("image") == -1) {
file = obj.target.files[0];
if (file.type && file.type.indexOf("image") == -1) {
return layer.msg('请上传图片', { icon: 5 })
}
var reads = new FileReader();
reads.readAsDataURL(logoFile);
reads.readAsDataURL(file);
reads.onload = function () {
//将处理完的图片文件上传到阿里云服务器
//上传LOGO图片
var formData = new FormData();
formData.append("uploadImg", logoFile);
formData.append("file", file);
$.ajax({
url: 'https://event.geexek.com/upload/file.do', /*接口域名地址*/
url: uploadUrl, /*接口域名地址*/
type: 'post',
data: formData,
contentType: false,
......@@ -661,7 +662,7 @@
success: function (res) {
if (res.code == "1") {
layer.msg('上传成功', { icon: 1, time: 1500 });
app.$data.service.imgUrl = res.result
app.$data.service.imgUrl = res.content
}
},
beforeSend: () => {
......
src/main/webapp/WEB-INF/views/common/menu.jsp
View file @ c46469b4
......@@ -341,7 +341,7 @@
<span class="menu-txt">分类管理</span>
</a>
</li>
<li class="swiper menu-sub-item" >
<li class="swiper menu-sub-item">
<a
href="/gk/swiper/index/${cmpt.cmptId}?uId=${uId}&cId=${cId}&timestamp=${timestamp}&sign=${sign}">
<span class="left-arrow"></span>
......@@ -415,7 +415,6 @@
var done = false;
for (var i in classes) {
if (url.indexOf(classes[i]) > -1) {
console.log(classes[i])
document.getElementsByClassName(classes[i])[0].classList.add('active');
if (classes[i] != 'cmptSetting') {
let classesStr = document.getElementsByClassName(classes[i])[0].parentNode.parentNode.firstElementChild.classList;
......
src/main/webapp/static/js/banner.js
View file @ c46469b4
const uploadUrl = '/api-common/v1/upload?folder=' + 'gk/banner' + '&cmptId=' + getCId()
$(document).ready(function () {
$('.addTempalte').click(function () {
var length = $('#sortable .banner-item').length;
if(length >= 5){
if (length >= 5) {
layer.msg('图片最多只能上传五张')
return ;
return;
}
$('.template .pic').trigger('click');
});
$('body').on('click','.save',function () {
$('body').on('click', '.save', function () {
var obj = $(this).parents('.banner-item');
$.ajax({
url : '/gk/banner/saveOrUpdate',
type:'post',
data:{url:obj.find('input').attr('data-file-url'),cmptId:getCmptId()},
success:function(data){
if(data.code == 200){
$(obj).attr('data-id',data.content.id)
url: '/gk/banner/saveOrUpdate',
type: 'post',
data: { url: obj.find('input').attr('data-file-url'), cmptId: getCmptId() },
success: function (data) {
if (data.code == 200) {
$(obj).attr('data-id', data.content.id)
}
}
})
......@@ -31,14 +32,14 @@ $(document).ready(function () {
sort(sortIds.join(","));
}
});
$('body').on('click','.delOpt',function () {
$('body').on('click', '.delOpt', function () {
var obj = $(this);
qikoo.dialog.confirm('确认要删除？',
function () {
$.ajax({
url : '/gk/banner/del/'+obj.parents(".banner-item").attr("data-id"),
type:'get',
success:function(data){
url: '/gk/banner/del/' + obj.parents(".banner-item").attr("data-id"),
type: 'get',
success: function (data) {
obj.parents('.banner-item').remove();
}
})
......@@ -52,36 +53,33 @@ $(document).ready(function () {
function uploadFile(obj) {
var reads = new FileReader();
logoFile = obj.files[0];
file = obj.files[0];
var dataId = $(obj).parent().parent().attr('data-id');
reads.readAsDataURL(logoFile);
reads.readAsDataURL(file);
reads.onload = function (e) {
//将处理完的图片文件上传到阿里云服务器
//上传LOGO图片
var formData = new FormData();
formData.append("uploadImg", logoFile);
formData.append("file", file);
$.ajax({
url: 'https://event.geexek.com/upload/file.do', /*接口域名地址*/
url: uploadUrl, /*接口域名地址*/
type: 'post',
data: formData,
contentType: false,
processData: false,
success: function (res) {
console.log(res);
if (res.code == "1") {
var template = $('.template').clone().clone();
layer.msg('上传成功', {icon: 1, time: 1500});
$(template).find('input').attr('data-file-name', logoFile.name);
$(template).find('input').attr('data-file-url', res.result);
$(template).find('input').attr('data-file-size', logoFile.size / 1024);
$(template).find('.banner-img').attr('src',res.result);
layer.msg('上传成功', { icon: 1, time: 1500 });
$(template).find('input').attr('data-file-name', file.name);
$(template).find('input').attr('data-file-url', res.content);
$(template).find('input').attr('data-file-size', file.size / 1024);
$(template).find('.banner-img').attr('src', res.content);
$(template).appendTo($('.equip-container-new'))
$(template).removeClass('template')
$(template).show();
$(template).find('.save').trigger('click');
$(template).find('.save').remove();
} else {
console.log(res);
}
}
})
......@@ -90,13 +88,13 @@ function uploadFile(obj) {
function sort(ids) {
$.ajax({
url:'/gk/banner/order',
data:{ids:ids},
success:function (data) {
url: '/gk/banner/order',
data: { ids: ids },
success: function (data) {
console.log(data);
}
})
}
function del() {
}
\ No newline at end of file
src/main/webapp/static/js/cmptManual.js
View file @ c46469b4
//文件上传处理
var obj = null;
const uploadUrl = '/api-common/v1/upload?folder=' + 'gk/manual' + '&cmptId=' + getCId()
function changeImg(e) {
let reads = new FileReader();
reads.readAsDataURL($(e).get(0).files[0]);
if ($(e).get(0).files[0].size / 1000 > 500) {
layer.alert('上传的图片文件不能超过500KB。', {icon: 5});
layer.alert('上传的图片文件不能超过500KB。', { icon: 5 });
return;
}
reads.onload = function (ee) {
......@@ -13,29 +13,26 @@ function changeImg(e) {
image.src = ee.target.result;
image.onload = function () {
if (this.width > this.height) {
layer.alert("请上传竖图！", {icon: 5});
layer.alert("请上传竖图！", { icon: 5 });
return;
} else {
var img = $(e).prev().get(0);
var formData = new FormData();
formData.append("uploadImg", $(e).get(0).files[0]);
formData.append("file", $(e).get(0).files[0]);
$.ajax({
url: 'https://event.geexek.com/upload/file.do', /*接口域名地址*/
url: uploadUrl, /*接口域名地址*/
type: 'post',
data: formData,
contentType: false,
processData: false,
success: function (res) {
console.log(res);
if (res.code == "1") {
// 获取返回URL
img.src = res.result;
$(img).parent().attr('data-file', res.result);
img.src = res.content
$(img).parent().attr('data-file', res.content);
setTimeout(function () {
$(img).removeClass('add');
}, 500)
} else {
console.log(res);
}
}
})
......@@ -61,11 +58,8 @@ $(function () {
url: '/gk/cmpt/manual/delManual?id=' + id, /*接口域名地址*/
success: function (res) {
parent.remove();
console.log(res);
if (res.code == "1") {
layer.msg('保存成功', {icon: 1, time: 1500});
} else {
console.log(res);
layer.msg('保存成功', { icon: 1, time: 1500 });
}
}
});
......@@ -92,7 +86,7 @@ $(function () {
let filedata = parent.find('.file').attr('data-file');
if (!filedata || !catalogPhotoURL) {
layer.msg('请选择上传的文件', {icon: 1, time: 1500});
layer.msg('请选择上传的文件', { icon: 1, time: 1500 });
return;
}
......@@ -107,14 +101,11 @@ $(function () {
contentType: 'application/json',
processData: false,
success: function (res) {
console.log(res);
if (res.code == 200) {
layer.msg('保存成功', {icon: 1, time: 1500});
layer.msg('保存成功', { icon: 1, time: 1500 });
if (!id) {
parent.find('.manualId').val(res.id);
}
} else {
console.log(res);
}
}
});
......
src/main/webapp/static/js/cmptSetting.js
View file @ c46469b4
$(function () {
// 检查是否有修改banner的权限
$(function () {
......@@ -40,13 +41,13 @@ $(function () {
data: param,
success: function (data) {
console.log(data);
if(data.code == -201){
window.location.href="/gk/banner/index/"+getCmptId()+"?"+window.location.search;
}else if(data.code == -301){
window.location.href="/gk/customer/index/"+getCmptId()+"?"+window.location.search;
}else if(data.code == -401){
if (data.code == -201) {
window.location.href = "/gk/banner/index/" + getCmptId() + "?" + window.location.search;
} else if (data.code == -301) {
window.location.href = "/gk/customer/index/" + getCmptId() + "?" + window.location.search;
} else if (data.code == -401) {
layer.msg("还没设置公告！")
window.location.href="/gk/news/index/"+getCmptId()+"?"+window.location.search;
window.location.href = "/gk/news/index/" + getCmptId() + "?" + window.location.search;
}
}
})
......@@ -67,7 +68,7 @@ $(function () {
if (param.visibility == 1) {
$.ajax({
url: '/gk/cmpt/cmptSetting/check',
data: {'cmptId': getCmptId(), "type": type},
data: { 'cmptId': getCmptId(), "type": type },
async: false,
success: function (data) {
if (data.code == -1) {
......@@ -85,18 +86,18 @@ $(function () {
layer.alert("要启用此功能，需要先上传比赛路线");
} else if (type == 11) {
layer.alert("要启用此功能，需要先联系管理员通过赛事审核");
} else if (type == 12){
} else if (type == 12) {
layer.alert("要启用此功能，请先在计时管理页面完成名单导入");
}else if (type == 15){
} else if (type == 15) {
layer.alert("要启用此功能，请先导入路线，且路线上至少有2个标注点");
setTimeout(function () {
window.location.href="/gk/road/index/"+getCmptId()+"?"+window.location.search;
},3000)
} else if (type == 16){
window.location.href = "/gk/road/index/" + getCmptId() + "?" + window.location.search;
}, 3000)
} else if (type == 16) {
layer.alert("要启用此功能，请先导入路线，且路线上至少有2个标注点");
setTimeout(function () {
window.location.href="/gk/road/index/"+getCmptId()+"?"+window.location.search;
},3000)
window.location.href = "/gk/road/index/" + getCmptId() + "?" + window.location.search;
}, 3000)
}
} else {
......@@ -115,8 +116,8 @@ $(function () {
}
}
})
} else if(type == 15 || type == 12 || type == 16){
if($('#autoscore').val() != '1'){
} else if (type == 15 || type == 12 || type == 16) {
if ($('#autoscore').val() != '1') {
layer.msg("建议启动自动成绩审核，无需组委会操作，选手可以在提交成绩后马上查看完赛证书");
}
......@@ -157,7 +158,7 @@ $(function () {
let status = $(this).parents('.public').attr('data-status');
if (status == 2) return;
let id = $(this).parents('.public').parents('.wzm-content-item').attr('data-id');
let param = {id: id};
let param = { id: id };
if (status == 1) {
param.status = 0;
} else {
......@@ -166,6 +167,9 @@ $(function () {
editSettingStatus(param);
})
initEvent()
});
function sort(param) {
......@@ -191,3 +195,58 @@ function editSettingStatus(param) {
}
})
}
// 初始化事件
function initEvent() {
// 为需要设置有效期的元素添加点击事件
$('.wzm-content-item').on('dblclick', function () {
let id = $(this).data('id')
const func = cmptFuncs.find(v => v.id == id);
if (func?.needTime) {
showTimeSetting(func);
}
});
}
function showTimeSetting(func) {
const index = layer.open({
type: 1,
title: '设置有效期',
content: `
<div style="padding:20px;">
<div class="form-group">
<label>开始时间</label>
<input type="text" class="form-control Wdate" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" id="startTime" value="${func?.startTime || ''}">
</div>
<div class="form-group">
<label>结束时间</label>
<input type="text" class="form-control Wdate" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" id="endTime" value="${func?.deadTime || ''}">
</div>
</div>
`,
btn: ['确定', '取消'],
yes: () => {
let loadIndex = 0
var startTime = $('#startTime').val();
var deadTime = $('#endTime').val();
$.ajax({
url: '/gk/sure-letter/updateName',
data: JSON.stringify({
startTime,
deadTime,
id: func.id
}),
contentType: 'application/json',
type: 'post',
beforeSend: function () {
loadIndex = layer.load()
},
success: () => {
layer.close(loadIndex);
layer.msg('有效期设置成功', () => { layer.close(index) });
}
})
}
});
}
\ No newline at end of file
src/main/webapp/static/js/index.js
View file @ c46469b4
const uploadUrl = '/api-common/v1/upload?folder=' + 'gk/cmptLogo' + '&cmptId=' + getCId()
$(function () {
$('#cmptBgColorInput').bind('keyup', function () {
......@@ -30,28 +33,28 @@ $(function () {
let detailStyle = $('#detailStyle').val();
let isShowTab = $('#isShowInput').val();
let cmptId = getCId();
if(bg.length != 6){
if (bg.length != 6) {
layer.msg('请输入6位合法字符!');
return ;
return;
}
const param = {
detailStyle:detailStyle??'style-1',
detailStyle: detailStyle ?? 'style-1',
cmptId,
logo,
cmptbgColor: "#"+bg,
cmptbgColor: "#" + bg,
isShowTab
};
$.ajax({
url: '/gk/cmpt/saveCmpt',
data: JSON.stringify(param),
contentType:"application/json",
contentType: "application/json",
type: 'post',
success: function (data) {
if (data.status) {
window.location.reload();
layer.msg('保存成功', {icon: 1, time: 1500});
layer.msg('保存成功', { icon: 1, time: 1500 });
} else {
layer.msg('保存失败', {icon: 5, time: 1500});
layer.msg('保存失败', { icon: 5, time: 1500 });
}
}
})
......@@ -60,7 +63,7 @@ $(function () {
$('#download').click(function () {
$.ajax({
url: "/gk/cmpt/getCmpt",
data: {'cmptId': getCmptId()},
data: { 'cmptId': getCmptId() },
success: function (data) {
if (data.content && data.content.logo) {
window.open(window.location.origin + "/img/download/" + getCmptId())
......@@ -128,11 +131,11 @@ function changeLogoImg(imgDomNName, inputDomName, top, left, width, height) {
var reads = new FileReader();
logoFile = document.getElementById(inputDomName).files[0];
if (logoFile.fileSize / 1000 > 500) {
layer.msg('上传的图片文件不能超过500KB。', {icon: 5, time: 1500});
layer.msg('上传的图片文件不能超过500KB。', { icon: 5, time: 1500 });
return;
}
if (logoFile.size / 1000 > 500) {
layer.alert('上传的图片文件不能超过500KB。', {icon: 5});
layer.alert('上传的图片文件不能超过500KB。', { icon: 5 });
return;
}
reads.readAsDataURL(logoFile);
......@@ -143,24 +146,21 @@ function changeLogoImg(imgDomNName, inputDomName, top, left, width, height) {
//将处理完的图片文件上传到阿里云服务器
//上传LOGO图片
var formData = new FormData();
formData.append("uploadImg", logoFile);
formData.append("file", logoFile);
$.ajax({
url: 'https://event.geexek.com/upload/file.do', /*接口域名地址*/
url: uploadUrl, /*接口域名地址*/
type: 'post',
data: formData,
contentType: false,
processData: false,
success: function (res) {
console.log(res);
if (res.code == "1") { // 获取返回URL
document.getElementById(imgDomNName).src = res.result;
document.getElementById(imgDomNName).src = res.content;
$('.logo-div').css('background', 'none');
$("[name='hdcmptLogo']").val(res.result);
$("[name='hdcmptLogo']").val(res.content);
$("#cmptLogoSpan").html("已上传");
$('#cmptLogo').addClass('cmpt-logo');
$('#cmptLogo').removeClass("logo");
} else {
console.log(res);
}
}
})
......
src/main/webapp/static/js/news.js
View file @ c46469b4
const uploadUrl = '/api-common/v1/upload?folder=' + 'gk/news' + '&cmptId=' + getCId()
// 定义 typeDesc 映射
const typeDesc = {
0: {
......@@ -59,11 +60,11 @@ $(document).ready(function () {
url: "/gk/news/save",
type: 'post',
contentType: 'application/json',
data: JSON.stringify({
data: JSON.stringify({
linkUrl,
id: $('.edit-container').attr('data-id'),
title: title,
appId:appId,
appId: appId,
content: editor.getContent(),
userId: getUId(),
cmptId: getCId(),
......@@ -72,8 +73,8 @@ $(document).ready(function () {
// 新增的字段
openType: openType,
path: path,
lat: lat??0,
lng: lng??0
lat: lat ?? 0,
lng: lng ?? 0
}),
success: function (data) {
layer.msg('保存成功')
......@@ -142,16 +143,16 @@ $(document).ready(function () {
$('.sure').click(function () {
var val = $('#newsAlias').val();
if(val.length > 10){
if (val.length > 10) {
layer.msg("不能超过10个字");
return ;
return;
}
$.ajax({
url : '/setting/update',
type:"post",
data:{cmptId:getCmptId(),newsAlias:val},
success:function (data) {
if(data.code == 200){
url: '/setting/update',
type: "post",
data: { cmptId: getCmptId(), newsAlias: val },
success: function (data) {
if (data.code == 200) {
layer.msg('保存成功');
window.location.reload();
$('.edit-mask,.edit-dialog').fadeOut();
......@@ -161,20 +162,20 @@ $(document).ready(function () {
});
$('.edit-btn').click(function () {
var text = $.trim($('.news-title span').text()) == '未命名'? $.trim($('.news-title').text()): '';
var text = $.trim($('.news-title span').text()) == '未命名' ? $.trim($('.news-title').text()) : '';
$('#newsAlias').val();
$('.edit-mask,.edit-dialog').fadeIn();
})
// 监听select选项
// 监听 openType 变化
$('#openType').change(function() {
$('#openType').change(function () {
const openType = $(this).val();
updateViews(openType);
});
});
// 显示/隐藏必要的参数
function updateViews(openType=0){
function updateViews(openType = 0) {
const desc = typeDesc[openType];
if (desc) {
// 修改 path 的 label 和 placeholder
......@@ -205,33 +206,30 @@ function updateViews(openType=0){
//文件上传处理
function uploadFile(obj) {
var reads = new FileReader();
logoFile = obj.files[0];
if(logoFile.type && logoFile.type.indexOf("image") == -1){
layer.msg('请上传图片',{icon:5})
file = obj.files[0];
if (file.type && file.type.indexOf("image") == -1) {
layer.msg('请上传图片', { icon: 5 })
return;
}
reads.readAsDataURL(logoFile);
reads.readAsDataURL(file);
reads.onload = function (e) {
//将处理完的图片文件上传到阿里云服务器
//上传LOGO图片
var formData = new FormData();
formData.append("uploadImg", logoFile);
formData.append("file", file);
$.ajax({
url: 'https://event.geexek.com/upload/file.do', /*接口域名地址*/
url: uploadFile, /*接口域名地址*/
type: 'post',
data: formData,
contentType: false,
processData: false,
success: function (res) {
console.log(res);
if (res.code == "1") {
layer.msg('上传成功', {icon: 1, time: 1500});
$('#file-cover').attr('data-src', res.result);
$('#file-cover').attr('data-src', res.result);
$('.cover').css('background-image', 'url(' + res.result + ')')
layer.msg('上传成功', { icon: 1, time: 1500 });
$('#file-cover').attr('data-src', res.content);
$('#file-cover').attr('data-src', res.content);
$('.cover').css('background-image', 'url(' + res.content + ')')
$('.icon-cover').remove();
} else {
console.log(res);
}
}
})
......
src/main/webapp/static/js/road-new.js
View file @ c46469b4
This diff is collapsed.
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