c-zhouhf1/zhgh_jvic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

可以上传压缩包

Browse Source
This commit is contained in:
Paidax
2025-11-18 17:39:58 +08:00
parent 3426df168f
commit 5288cd3bff
5 changed files with 1142 additions and 1154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/v/nutz/fitnessWalk/controller/FitnessWalkStepManageController.java
+52 -62
View File
@@ -1,16 +1,11 @@
package io.v.nutz.fitnessWalk.controller;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateBetween;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import cn.wizzer.framework.base.Result;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import io.v.nutz.annontation.ViReturn;
import io.v.nutz.base.page.Pagination;
import io.v.nutz.base.service.BaseService;
import io.v.nutz.fitnessWalk.model.FitnessWalkActivity;
import io.v.nutz.fitnessWalk.model.FitnessWalkAwardUser;
@@ -20,8 +15,6 @@ import io.v.nutz.fitnessWalk.utils.WeAppCloudUtil;
import org.nutz.aop.interceptor.ioc.TransAop;
import org.nutz.dao.Chain;
import org.nutz.dao.Cnd;
import org.nutz.dao.Sqls;
import org.nutz.dao.sql.Sql;
import org.nutz.integration.jedis.RedisService;
import org.nutz.ioc.aop.Aop;
import org.nutz.ioc.loader.annotation.Inject;
@@ -36,6 +29,8 @@ import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.DecimalFormat;
import java.util.*;
import java.util.function.BinaryOperator;
import java.util.function.Function;
import java.util.stream.Collectors;
@IocBean
@@ -62,86 +57,81 @@ public class FitnessWalkStepManageController {
* @param activityId 活动id
* @param userId 用户id
* @param monthSteps 步数(当天往前推30天)
* @param start_time 活动开始时间
* @param end_time 结束时间
* @return
*/
@At
@Ok("json:full")
@ViReturn
@Aop(TransAop.READ_COMMITTED)
public Object updateStepMonth(String activityId, String userId, String monthSteps, Long start_time, Long end_time) {
if (StrUtil.isBlank(userId)) {
return Result.error("上传步数失败，请重新登录后再次上传!");
public Object updateStepMonth(String activityId, String userId, String monthSteps) {
if (StrUtil.isBlank(userId) || StrUtil.isBlank(monthSteps) || StrUtil.isBlank(activityId)) {
return Result.error("必要参数未传递!");
}
DateTime activityStartDate = DateUtil.date(start_time);
DateTime activityEndDate = DateUtil.date(end_time);
// 获取到的用户的步数数据
List<NutMap> steps = Json.fromJsonAsList(NutMap.class, monthSteps);
/*//前一个月的时间
DateTime dateTime = DateUtil.offsetMonth(new Date(), -1);
String format = DateUtil.format(dateTime, "yyyyMM");
//上一个月的步数
List<NutMap> lastMonthSteps = steps.stream().filter(v -> {
long timestamp = v.getLong("timestamp") * 1000;
String userStep = DateUtil.format(DateUtil.date(timestamp), "yyyyMM");
return userStep.equals(format);
}).collect(Collectors.toList());
List<FitnessWalkStep> lastMonthInsertWxSteps = steps.stream().map(v -> {
FitnessWalkStep step = new FitnessWalkStep();
step.setActivityId(activityId);
step.setUserId(userId);
step.setStep(v.getInt("step"));
DateTime date = DateUtil.date(v.getLong("timestamp") * 1000);
step.setApplyDate(date);
return step;
}).collect(Collectors.toList());
List<Date> applyDates = lastMonthInsertWxSteps.stream().map(v -> v.getApplyDate()).collect(Collectors.toList());
applyDates.remove(applyDates.stream().min(Date::compareTo).orElse(null));
System.out.println(lastMonthInsertWxSteps.size());
System.out.println(applyDates.size());
System.out.println(Json.toJson(applyDates));
baseService.dao().clear("fitness_walk_step_" + format, Cnd.where("activityId", "=", activityId).and("userId", "=", userId).and("applyDate", "in", applyDates));
// baseService.dao().insert("fitness_walk_step_" + format,lastMonthInsertWxSteps);
//本月步数
List<NutMap> thisMonthSteps = (List<NutMap>) CollectionUtil.subtract(steps,lastMonthSteps);*/
//判断数据是否完整 微信运动会在晚上10点多进行步数的更新 会导致31天前的步数获取变为0 所以这里去除掉第一个元素 即为31天前的数据 每次只保存最近30天的数据
if (Lang.isNotEmpty(steps) && steps.size() == 31) {
steps.remove(0);
}
//如果在活动开始之前进来了 就只保存近7天的数据 不然前台展示为空 不好看
List<FitnessWalkStep> insertWxSteps = steps.stream().map(v -> {
// 传递过来的步数数据
List<FitnessWalkStep> wxSteps = steps.stream().map(v -> {
FitnessWalkStep step = new FitnessWalkStep();
step.setActivityId(activityId);
step.setUserId(userId);
step.setStep(v.getInt("step"));
DateTime date = DateUtil.date(v.getLong("timestamp") * 1000);
DateTime date = DateUtil.parse(DateUtil.format(DateUtil.date(v.getLong("timestamp") * 1000), "yyyy-MM-dd"), "yyyy-MM-dd");
step.setApplyDate(date);
return step;
}).collect(Collectors.toList());
//.filter(v -> v.getApplyDate().compareTo(DateUtil.offsetDay(activityStartDate, -7)) >= 0 && v.getApplyDate().compareTo(activityEndDate) <= 0).collect(Collectors.toList());
//.filter(v -> (v.getApplyDate().compareTo(activityStartDate) >= 0) && (v.getApplyDate().compareTo(activityEndDate) <= 0)).collect(Collectors.toList());
List<Date> applyDates = insertWxSteps.stream().map(v -> v.getApplyDate()).collect(Collectors.toList());
applyDates.remove(applyDates.stream().min(Date::compareTo).orElse(null));
// 传递过来的所有日期的集合
List<Date> dateList = wxSteps.stream().map(FitnessWalkStep::getApplyDate).collect(Collectors.toList());
System.out.println(insertWxSteps.size());
System.out.println(applyDates.size());
System.out.println(Json.toJson(applyDates));
// 去数据库查询日期，这个玩意还要保证插入到数据库的单个日期只有一条,并且这个日期数据库之前有步数，传过来没步数那就要保留数据库的步数
// 上面日期集合数据库的步数
List<FitnessWalkStep> stepList = baseService.dao().query(FitnessWalkStep.class, Cnd.where("activityId", "=", activityId)
.and("userId", "=", userId).and("applyDate", "in", dateList));
baseService.dao().clear(FitnessWalkStep.class, Cnd.where("activityId", "=", activityId).and("userId", "=", userId).and("applyDate", "in", applyDates));
baseService.dao().insert(insertWxSteps);
// 这就是保留每天最大步数的集合，那这个集合里面applyDate就是唯一的了
List<FitnessWalkStep> dupStepList = new ArrayList<>(stepList.stream()
.collect(Collectors.toMap(FitnessWalkStep::getApplyDate, Function.identity(),
BinaryOperator.maxBy(Comparator.comparing(FitnessWalkStep::getStep))))
.values());
// 这是过滤的相同的applyDate的集合，这些数据要删除
List<String> delStepIds = stepList.stream()
.filter(step -> !dupStepList.contains(step))
.map(FitnessWalkStep::getId)
.collect(Collectors.toList());
// 数据库的数据 这个map就用于判断数据库的日期和传递过来日期的步数，两个是不是相等的，保留步数多的数据
Map<Date, FitnessWalkStep> dateStepMap = dupStepList.stream().collect(Collectors.toMap(FitnessWalkStep::getApplyDate, v -> v));
List<FitnessWalkStep> resultStepList = new ArrayList<>();
// 这里循环就是，循环的传递过来的数据
for (FitnessWalkStep step : wxSteps) {
// 数据库存储的步数
FitnessWalkStep walkStep = dateStepMap.get(step.getApplyDate());
// 如果数据库没有，那就要新增
if (Lang.isEmpty(walkStep)) {
resultStepList.add(step);
} else {
// 如果数据库有，那就要保留步数多的
if (walkStep.getStep() < step.getStep()) {
walkStep.setStep(step.getStep());
resultStepList.add(walkStep);
}
}
}
// 最后删除重复日期，更新步数数据
baseService.dao().clear(FitnessWalkStep.class, Cnd.where("id", "in", delStepIds));
if (Lang.isNotEmpty(resultStepList)){
baseService.dao().insertOrUpdate(resultStepList);
}
return null;
}
src/main/resources/static/components/plugins/FileUpload.vue
+696 -696
View File
File diff suppressed because it is too large Load Diff
src/main/resources/views/platform/fitnessWalk/activityManage.html
+1 -6
View File
@@ -890,12 +890,7 @@ layout("/layouts/platform.html"){
<script>
let E = window.wangEditor
let noteEditor = null
let icon = new AMap.Icon({
size: new AMap.Size(25, 34),
image: '//a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-default.png',
imageSize: new AMap.Size(140, 30),
imageOffset: new AMap.Pixel(-95, -3)
});
let map = null
let marker = null
src/main/resources/views/platform/jdh/two/apply.html
+391 -388
View File
@@ -2,402 +2,405 @@
layout("/layouts/platform.html"){
#-->
<style>
.box-card {
border-radius: 16px;
padding-right: 80px;
}
.el-divider {
background-color: #409EFF;
}
.el-divider__text.is-left {
color: #409EFF;
font-weight: 600;
font-size: 15px;
}
.el-date-editor.el-input, .el-date-editor.el-input__inner, .el-select {
width: 100%;
}
.item-button {
text-align: center;
}
.item-button .el-button {
padding: 12px 100px;
}
.el-select-dropdown, .el-picker-panel, .el-loading-mask {
z-index: 99999 !important;
}
.box-card {
border-radius: 16px;
padding-right: 80px;
}
.el-divider {
background-color: #409EFF;
}
.el-divider__text.is-left {
color: #409EFF;
font-weight: 600;
font-size: 15px;
}
.el-date-editor.el-input, .el-date-editor.el-input__inner, .el-select {
width: 100%;
}
.item-button {
text-align: center;
}
.item-button .el-button {
padding: 12px 100px;
}
.el-select-dropdown, .el-picker-panel, .el-loading-mask {
z-index: 99999 !important;
}
</style>
<div id="app" v-cloak>
<guava>
<el-card shadow="never">
<template #header>
<h3 style="color:#1867b0">双代会请示</h3>
</template>
<guava>
<el-card shadow="never">
<template #header>
<h3 style="color:#1867b0">双代会请示</h3>
</template>
<el-form ref="addForm" :model="formData" :rules="formRules" label-width="120px">
<el-row :gutter="40">
<el-col :span="12">
<el-form-item prop="jdhjs" label="届数">
<el-select @change="jdhjsChange" v-model="formData.jdhjs" filterable clearable
style="width: 100%"
placeholder="届数">
<el-option v-for="item in jsList" :key="item.id" :label="item.name"
:value="item.code">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="jdhcs" label="次数">
<el-select @change="jdhcsChange" v-model="formData.jdhcs" filterable clearable
style="width: 100%"
placeholder="次数">
<el-option v-for="item in csOptions" :key="item.id" :label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="40">
<el-col :span="12">
<el-form-item label="会议名称" prop="meeting_name">
<el-input
placeholder="请填写会议名称"
v-model="formData.meeting_name"
clearable
maxlength="100">
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<!--<el-form-item label="有无选举事项" prop="have_elect">
<el-radio-group v-model="formData.have_elect">
<el-radio-button :label="true">有</el-radio-button>
<el-radio-button :label="false">无</el-radio-button>
</el-radio-group>
</el-form-item>-->
<el-form-item label="类型" prop="type">
<el-radio-group v-model="formData.type">
<el-radio-button label="换届会">换届会</el-radio-button>
<el-radio-button label="届中会">届中会</el-radio-button>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="40">
<el-col :span="12">
<el-form-item label="申请单位" prop="unit_name">
<el-input placeholder="申请单位"
:clearable="false"
readonly
v-model="formData.unit_name">
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="所在工会" prop="union_name">
<el-input placeholder="所在工会"
:clearable="false"
readonly
v-model="formData.union_name">
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="40">
<el-col :span="12">
<el-form-item label="会议时间" prop="meeting_time">
<el-date-picker
v-model="formData.meeting_time"
type="datetime"
format="yyyy-MM-dd HH:mm"
value-format="yyyy-MM-dd HH:mm"
:clearable="false"
placeholder="选择会议时间">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="申请时间" prop="create_time">
<el-input placeholder="申请时间"
:clearable="false"
readonly
v-model="formData.create_time">
</el-input>
</el-form-item>
</el-col>
<!--<el-col :span="12">
<el-form-item label="上一次会议时间" prop="before_meeting_time">
<el-date-picker
v-model="formData.before_meeting_time"
type="datetime"
format="yyyy-MM-dd HH:mm"
value-format="yyyy-MM-dd HH:mm"
:clearable="false"
placeholder="选择上一次会议时间">
</el-date-picker>
</el-form-item>
</el-col>-->
</el-row>
<!--<el-row :gutter="40">
<el-col :span="12">
<el-form-item label="正式代表人数" prop="official_delegate">
<el-input v-model="formData.official_delegate"
oninput="value=value.replace(/[^\d]/g,'')"
placeholder="请输入正式代表人数"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="其中教师" prop="teacher_delegate">
<el-input v-model="formData.teacher_delegate" oninput="value=value.replace(/[^\d]/g,'')"
placeholder="请输入教师代表人数"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-form ref="addForm" :model="formData" :rules="formRules" label-width="120px">
<el-row :gutter="40">
<el-col :span="12">
<el-form-item prop="jdhjs" label="届数">
<el-select @change="jdhjsChange" v-model="formData.jdhjs" filterable clearable style="width: 100%"
placeholder="届数">
<el-option v-for="item in jsList" :key="item.id" :label="item.name"
:value="item.code">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="jdhcs" label="次数">
<el-select @change="jdhcsChange" v-model="formData.jdhcs" filterable clearable
style="width: 100%"
placeholder="次数">
<el-option v-for="item in csOptions" :key="item.id" :label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="40">
<el-col :span="12">
<el-form-item label="会议名称" prop="meeting_name">
<el-input
placeholder="请填写会议名称"
v-model="formData.meeting_name"
clearable
maxlength="100">
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<!--<el-form-item label="有无选举事项" prop="have_elect">
<el-radio-group v-model="formData.have_elect">
<el-radio-button :label="true">有</el-radio-button>
<el-radio-button :label="false">无</el-radio-button>
</el-radio-group>
</el-form-item>-->
<el-form-item label="类型" prop="type">
<el-radio-group v-model="formData.type">
<el-radio-button label="换届会">换届会</el-radio-button>
<el-radio-button label="届中会">届中会</el-radio-button>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="40">
<el-col :span="12">
<el-form-item label="申请单位" prop="unit_name">
<el-input placeholder="申请单位"
:clearable="false"
readonly
v-model="formData.unit_name">
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="所在工会" prop="union_name">
<el-input placeholder="所在工会"
:clearable="false"
readonly
v-model="formData.union_name">
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="40">
<el-col :span="12">
<el-form-item label="会议时间" prop="meeting_time">
<el-date-picker
v-model="formData.meeting_time"
type="datetime"
format="yyyy-MM-dd HH:mm"
value-format="yyyy-MM-dd HH:mm"
:clearable="false"
placeholder="选择会议时间">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="申请时间" prop="create_time">
<el-input placeholder="申请时间"
:clearable="false"
readonly
v-model="formData.create_time">
</el-input>
</el-form-item>
</el-col>
<!--<el-col :span="12">
<el-form-item label="上一次会议时间" prop="before_meeting_time">
<el-date-picker
v-model="formData.before_meeting_time"
type="datetime"
format="yyyy-MM-dd HH:mm"
value-format="yyyy-MM-dd HH:mm"
:clearable="false"
placeholder="选择上一次会议时间">
</el-date-picker>
</el-form-item>
</el-col>-->
</el-row>
<!--<el-row :gutter="40">
<el-col :span="12">
<el-form-item label="正式代表人数" prop="official_delegate">
<el-input v-model="formData.official_delegate"
oninput="value=value.replace(/[^\d]/g,'')"
placeholder="请输入正式代表人数"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="其中教师" prop="teacher_delegate">
<el-input v-model="formData.teacher_delegate" oninput="value=value.replace(/[^\d]/g,'')"
placeholder="请输入教师代表人数"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="40">
<el-col :span="12">
<el-form-item label="列席代表人数" prop="attend_delegate">
<el-input v-model="formData.attend_delegate" oninput="value=value.replace(/[^\d]/g,'')"
placeholder="请输入列席代表人数"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="其中特邀" prop="special_delegate">
<el-input v-model="formData.special_delegate" oninput="value=value.replace(/[^\d]/g,'')"
placeholder="请输入特邀代表人数"></el-input>
</el-form-item>
</el-col>
</el-row>-->
<el-form-item label="会议议程" prop="meeting_topic" class="is-required">
<div id="meetingTopicRich"></div>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input maxlength="500" type="textarea" :rows="4" placeholder="请输入备注"
v-model="formData.remark"></el-input>
</el-form-item>
<el-form-item prop="files" label="请示附件" class="is-required">
<file-upload :max="10" :files.sync="formData.files">
<template #el-upload__tip>
<div class="el-upload__tip" slot="tip">图片类请上传jpg/png/jpeg等格式，文档类请上传doc/docx/xls/xlsx/pdf等格式，上传数量为10个</div>
</template>
</file-upload>
</el-form-item>
<el-form-item style="text-align: right">
<el-button type="danger" @click="resetForm">重 置
</el-button>
<el-button type="primary" @click="operation" :loading="subLoading">提 交</el-button>
</el-form-item>
</el-form>
</el-card>
</guava>
<el-row :gutter="40">
<el-col :span="12">
<el-form-item label="列席代表人数" prop="attend_delegate">
<el-input v-model="formData.attend_delegate" oninput="value=value.replace(/[^\d]/g,'')"
placeholder="请输入列席代表人数"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="其中特邀" prop="special_delegate">
<el-input v-model="formData.special_delegate" oninput="value=value.replace(/[^\d]/g,'')"
placeholder="请输入特邀代表人数"></el-input>
</el-form-item>
</el-col>
</el-row>-->
<el-form-item label="会议议程" prop="meeting_topic" class="is-required">
<div id="meetingTopicRich"></div>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input maxlength="500" type="textarea" :rows="4" placeholder="请输入备注"
v-model="formData.remark"></el-input>
</el-form-item>
<el-form-item prop="files" label="请示附件" class="is-required">
<file-upload :max="10" :files.sync="formData.files">
<template #el-upload__tip>
<div class="el-upload__tip" slot="tip">
图片类请上传jpg/png/jpeg等格式，文档类请上传doc/docx/xls/xlsx/pdf等格式，压缩包请上传zip/war/rar，上传数量为10个
</div>
</template>
</file-upload>
</el-form-item>
<el-form-item style="text-align: right">
<el-button type="danger" @click="resetForm">重 置
</el-button>
<el-button type="primary" @click="operation" :loading="subLoading">提 交</el-button>
</el-form-item>
</el-form>
</el-card>
</guava>
</div>
<script>
function getQueryVariable(variable) {
let query = window.location.search.substring(1);
let vars = query.split("&");
for (let i = 0; i < vars.length; i++) {
let pair = vars[i].split("=");
if (pair[0] == variable) {
return pair[1];
}
}
return '';
}
let E = window.wangEditor
let meetingTopicRich = null
const vue = new Vue({
el: '#app',
data() {
const meetingTopicValid = (rule, value, callback) => {
if (!this.formData.meeting_topic || !dd3s.html2txt(this.formData.meeting_topic)) {
callback(new Error('请填写会议议题'));
} else {
callback();
}
};
const filesValid = (rule, value, callback) => {
if (!this.formData.files || this.formData.files.length === 0) {
callback(new Error('请上传请示附件'));
} else {
callback();
}
};
return {
jsList: [],
csOptions: [
{id: "一", name: "一次"},
{id: "二", name: "二次"},
{id: "三", name: "三次"},
{id: "四", name: "四次"},
{id: "五", name: "五次"},
{id: "六", name: "六次"},
],
subLoading: false,
sessionOptions: [],
formData: {
meeting_name: '',
have_elect: false,
unit_name: '${@shiro.getPrincipalProperty("unit").getName()}',
union_name: '${@shiro.getPrincipalProperty("union").getUnionname()}',
create_time: moment(new Date()).format("YYYY-MM-DD"),
meeting_time: '',
before_meeting_time: '',
session_num: '',
frequency: '',
official_delegate: '',
teacher_delegate: '',
attend_delegate: '',
special_delegate: '',
meeting_topic: '',
remark: '',
files: [],
type: '届中会'
},
formRules: {
meeting_name: [{required: true, message: '请填写会议标题', trigger: ['blur', 'change']}],
session_id: [{required: true, message: '请选择届次', trigger: ['blur', 'change']}],
jdhjs: [{required: true, message: '请选择届数', trigger: ['blur', 'change']}],
type: [{required: true, message: '请选择类型', trigger: ['blur', 'change']}],
have_elect: [{required: true, message: '请选择有无选举事项', trigger: ['blur', 'change']}],
unit_name: [{required: true, message: '请选择填表单位', trigger: ['blur', 'change']}],
create_time: [{required: true, message: '请选择填表日期', trigger: ['blur', 'change']}],
meeting_time: [{required: true, message: '请选择会议时间', trigger: ['blur', 'change']}],
session_num: [{required: true, message: '请选择届数', trigger: ['blur', 'change']}],
frequency: [{required: true, message: '请选择次数', trigger: ['blur', 'change']}],
official_delegate: [{required: true, message: '请填写正式代表人数', trigger: ['blur', 'change']}],
meeting_topic: [{validator: meetingTopicValid, trigger: ['blur', 'change']}],
files: [{validator: filesValid, trigger: ['blur', 'change']}],
}
}
},
components: {
'file-upload': httpVueLoader('/components/plugins/FileUpload.vue')
},
methods: {
jdhjsChange(o) {
const j = this.formData.jdhjs ? ('第' + this.formData.jdhjs + '届') : ''
const c = this.formData.jdhcs ? ('第' + this.formData.jdhcs + '次') : ''
const str = '关于召开' + this.formData.unit_name + j + c + '教职工代表大会、工会会员代表大会的请示'
this.formData.meeting_name = str
},
jdhcsChange(o) {
const j = this.formData.jdhjs ? ('第' + this.formData.jdhjs + '届') : ''
const c = this.formData.jdhcs ? ('第' + this.formData.jdhcs + '次') : ''
const str = '关于召开' + this.formData.unit_name + j + c + '教职工代表大会、工会会员代表大会的请示'
this.formData.meeting_name = str
},
resetForm() {
this.$refs["addForm"].resetFields();
meetingTopicRich.txt.html('')
meetingTopicRich.create()
},
async openEdit(id) {
const resp = await $.get(loc() + "/findOne", {id})
if(resp.code===0){
const data = resp.data
data.files = JSON.parse(data.files)
this.formData = data
this.$nextTick(() => {
meetingTopicRich = new E('#meetingTopicRich')
meetingTopicRich.config.onchange = (html) => {
this.formData.meeting_topic = html
}
setTimeout(() => {
meetingTopicRich.create()
meetingTopicRich.txt.html(data.meeting_topic)
}, 100)
})
}else{
this.notifyWarning(resp.msg)
}
},
initPage() {
this.$nextTick(() => {
meetingTopicRich = new E('#meetingTopicRich')
meetingTopicRich.config.onchange = (html) => {
this.formData.meeting_topic = html
}
setTimeout(() => {
meetingTopicRich.create()
}, 100)
})
},
async operation() {
if (!this.formData.files || this.formData.files.length === 0) {
this.$notify.warning({title: '提示', message: '请上传请示附件!'});
return
}
let method = this.formData.id ? "/doEdit" : "/doAdd"
this.$refs["addForm"].validate(async (valid) => {
if (valid) {
/*this.subLoading = true
const loading = this.$loading({
lock: true,
text: '正在提交...',
spinner: 'el-icon-loading',
background: COVER_LAYER_COLOR
});*/
this.formData.jdhallname = this.formData.jdhjs + '届'
if(this.formData.jdhcs) {
this.formData.jdhallname += this.formData.jdhcs + '次'
}
const data = clone(this.formData)
data.files = JSON.stringify(data.files)
const resp = await $.post(loc() + method, {jdhLevel2: JSON.stringify(data)})
if (resp.code === 0) {
this.$notify({
title: '成功',
message: resp.msg,
type: 'success',
duration: 1000,
onClose: () => {
sublime.jumpPagePjax('/platform/jdh/level2/reading')
}
});
}
/*requestLaterFun(resp, () => {
window.location.href = '/platform/jdh/level2/reading'
}, () => {
this.$notify.error({title: '失败', message: resp.msg});
}, () => {
loading.close()
this.subLoading = false
})*/
}
});
}
},
async created() {
this.sessionOptions = await getOpenJdhByDb()
let id = getQueryVariable("id")
id ? this.openEdit(id) : this.initPage()
this.jsList = await getJc()
}
})
function getQueryVariable(variable) {
let query = window.location.search.substring(1);
let vars = query.split("&");
for (let i = 0; i < vars.length; i++) {
let pair = vars[i].split("=");
if (pair[0] == variable) {
return pair[1];
}
}
return '';
}
let E = window.wangEditor
let meetingTopicRich = null
const vue = new Vue({
el: '#app',
data() {
const meetingTopicValid = (rule, value, callback) => {
if (!this.formData.meeting_topic || !dd3s.html2txt(this.formData.meeting_topic)) {
callback(new Error('请填写会议议题'));
} else {
callback();
}
};
const filesValid = (rule, value, callback) => {
if (!this.formData.files || this.formData.files.length === 0) {
callback(new Error('请上传请示附件'));
} else {
callback();
}
};
return {
jsList: [],
csOptions: [
{id: "一", name: "一次"},
{id: "二", name: "二次"},
{id: "三", name: "三次"},
{id: "四", name: "四次"},
{id: "五", name: "五次"},
{id: "六", name: "六次"},
],
subLoading: false,
sessionOptions: [],
formData: {
meeting_name: '',
have_elect: false,
unit_name: '${@shiro.getPrincipalProperty("unit").getName()}',
union_name: '${@shiro.getPrincipalProperty("union").getUnionname()}',
create_time: moment(new Date()).format("YYYY-MM-DD"),
meeting_time: '',
before_meeting_time: '',
session_num: '',
frequency: '',
official_delegate: '',
teacher_delegate: '',
attend_delegate: '',
special_delegate: '',
meeting_topic: '',
remark: '',
files: [],
type: '届中会'
},
formRules: {
meeting_name: [{required: true, message: '请填写会议标题', trigger: ['blur', 'change']}],
session_id: [{required: true, message: '请选择届次', trigger: ['blur', 'change']}],
jdhjs: [{required: true, message: '请选择届数', trigger: ['blur', 'change']}],
type: [{required: true, message: '请选择类型', trigger: ['blur', 'change']}],
have_elect: [{required: true, message: '请选择有无选举事项', trigger: ['blur', 'change']}],
unit_name: [{required: true, message: '请选择填表单位', trigger: ['blur', 'change']}],
create_time: [{required: true, message: '请选择填表日期', trigger: ['blur', 'change']}],
meeting_time: [{required: true, message: '请选择会议时间', trigger: ['blur', 'change']}],
session_num: [{required: true, message: '请选择届数', trigger: ['blur', 'change']}],
frequency: [{required: true, message: '请选择次数', trigger: ['blur', 'change']}],
official_delegate: [{required: true, message: '请填写正式代表人数', trigger: ['blur', 'change']}],
meeting_topic: [{validator: meetingTopicValid, trigger: ['blur', 'change']}],
files: [{validator: filesValid, trigger: ['blur', 'change']}],
}
}
},
components: {
'file-upload': httpVueLoader('/components/plugins/FileUpload.vue')
},
methods: {
jdhjsChange(o) {
const j = this.formData.jdhjs ? ('第' + this.formData.jdhjs + '届') : ''
const c = this.formData.jdhcs ? ('第' + this.formData.jdhcs + '次') : ''
const str = '关于召开' + this.formData.unit_name + j + c + '教职工代表大会、工会会员代表大会的请示'
this.formData.meeting_name = str
},
jdhcsChange(o) {
const j = this.formData.jdhjs ? ('第' + this.formData.jdhjs + '届') : ''
const c = this.formData.jdhcs ? ('第' + this.formData.jdhcs + '次') : ''
const str = '关于召开' + this.formData.unit_name + j + c + '教职工代表大会、工会会员代表大会的请示'
this.formData.meeting_name = str
},
resetForm() {
this.$refs["addForm"].resetFields();
meetingTopicRich.txt.html('')
meetingTopicRich.create()
},
async openEdit(id) {
const resp = await $.get(loc() + "/findOne", {id})
if (resp.code === 0) {
const data = resp.data
data.files = JSON.parse(data.files)
this.formData = data
this.$nextTick(() => {
meetingTopicRich = new E('#meetingTopicRich')
meetingTopicRich.config.onchange = (html) => {
this.formData.meeting_topic = html
}
setTimeout(() => {
meetingTopicRich.create()
meetingTopicRich.txt.html(data.meeting_topic)
}, 100)
})
} else {
this.notifyWarning(resp.msg)
}
},
initPage() {
this.$nextTick(() => {
meetingTopicRich = new E('#meetingTopicRich')
meetingTopicRich.config.onchange = (html) => {
this.formData.meeting_topic = html
}
setTimeout(() => {
meetingTopicRich.create()
}, 100)
})
},
async operation() {
if (!this.formData.files || this.formData.files.length === 0) {
this.$notify.warning({title: '提示', message: '请上传请示附件!'});
return
}
let method = this.formData.id ? "/doEdit" : "/doAdd"
this.$refs["addForm"].validate(async (valid) => {
if (valid) {
/*this.subLoading = true
const loading = this.$loading({
lock: true,
text: '正在提交...',
spinner: 'el-icon-loading',
background: COVER_LAYER_COLOR
});*/
this.formData.jdhallname = this.formData.jdhjs + '届'
if (this.formData.jdhcs) {
this.formData.jdhallname += this.formData.jdhcs + '次'
}
const data = clone(this.formData)
data.files = JSON.stringify(data.files)
const resp = await $.post(loc() + method, {jdhLevel2: JSON.stringify(data)})
if (resp.code === 0) {
this.$notify({
title: '成功',
message: resp.msg,
type: 'success',
duration: 1000,
onClose: () => {
sublime.jumpPagePjax('/platform/jdh/level2/reading')
}
});
}
/*requestLaterFun(resp, () => {
window.location.href = '/platform/jdh/level2/reading'
}, () => {
this.$notify.error({title: '失败', message: resp.msg});
}, () => {
loading.close()
this.subLoading = false
})*/
}
});
}
},
async created() {
this.sessionOptions = await getOpenJdhByDb()
let id = getQueryVariable("id")
id ? this.openEdit(id) : this.initPage()
this.jsList = await getJc()
}
})
</script>
<!--#
}
src/main/resources/views/platform/jdh/two/zlgl.html
+2 -2
View File
@@ -223,7 +223,7 @@ layout("/layouts/platform.html"){
<file-upload :files.sync="formData.files">
<template #el-upload__tip>
<div class="el-upload__tip" slot="tip">
图片类请上传jpg/png/jpeg等格式，文档类请上传doc/docx/xls/xlsx/pdf等格式，压缩包请上传zip/war，上传数量为10个
图片类请上传jpg/png/jpeg等格式，文档类请上传doc/docx/xls/xlsx/pdf等格式，压缩包请上传zip/war/rar，上传数量为10个
</div>
</template>
</file-upload>
@@ -278,7 +278,7 @@ layout("/layouts/platform.html"){
<file-upload :files.sync="formData.files" :max="10">
<template #el-upload__tip>
<div class="el-upload__tip" slot="tip">
图片类请上传jpg/png/jpeg等格式，文档类请上传doc/docx/xls/xlsx/pdf等格式，压缩包请上传zip/war，上传数量为10个
图片类请上传jpg/png/jpeg等格式，文档类请上传doc/docx/xls/xlsx/pdf等格式，压缩包请上传zip/war/rar，上传数量为10个
</div>
</template>
</file-upload>