314637581
/
flossom-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化处理

Browse Source
master
elliott 2 years ago
parent 2fd91833b3
commit ed3177c5ee
3 changed files with 143 additions and 73 deletions
Show Stats Download Patch File Download Diff File

1
flossom-common/flossom-common-core/src/main/resources/mapper/WxScriptMessageMapper.xml
Unescape Escape View File

@ -46,6 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="videoNo != null and videoNo != ''"> and video_no = #{videoNo}</if> <if test="videoNo != null and videoNo != ''"> and video_no = #{videoNo}</if>
<if test="feedId != null and feedId != ''"> and feed_id = #{feedId}</if> <if test="feedId != null and feedId != ''"> and feed_id = #{feedId}</if>
</where> </where>
order by create_time desc
</select> </select>
<select id="selectWxScriptMessageById" parameterType="Long" resultMap="WxScriptMessageResult"> <select id="selectWxScriptMessageById" parameterType="Long" resultMap="WxScriptMessageResult">

122
flossom-ui/src/views/system/scriptMessage/index.vue
Unescape Escape View File

@ -1,14 +1,14 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <!-- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">-->
<el-form-item label="标题" prop="messageTitle"> <!-- <el-form-item label="标题" prop="messageTitle">-->
<el-input <!-- <el-input-->
v-model="queryParams.messageTitle" <!-- v-model="queryParams.messageTitle"-->
placeholder="请输入消息标题" <!-- placeholder="请输入消息标题"-->
clearable <!-- clearable-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<!-- <el-form-item label="仪器ID" prop="machineId">--> <!-- <el-form-item label="仪器ID" prop="machineId">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="queryParams.machineId"--> <!-- v-model="queryParams.machineId"-->
@ -73,11 +73,11 @@
<!-- @keyup.enter.native="handleQuery"--> <!-- @keyup.enter.native="handleQuery"-->
<!-- />--> <!-- />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item> <!-- <el-form-item>-->
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <!-- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>-->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <!-- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>-->
</el-form-item> <!-- </el-form-item>-->
</el-form> <!-- </el-form>-->
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
@ -88,40 +88,40 @@
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['system:scriptMessage:add']" v-hasPermi="['system:scriptMessage:add']"
>新增</el-button> >新增绑定仪器模板</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:scriptMessage:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:scriptMessage:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['system:scriptMessage:export']"
>导出</el-button>
</el-col> </el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="success"-->
<!-- plain-->
<!-- icon="el-icon-edit"-->
<!-- size="mini"-->
<!-- :disabled="single"-->
<!-- @click="handleUpdate"-->
<!-- v-hasPermi="['system:scriptMessage:edit']"-->
<!-- >修改</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="danger"-->
<!-- plain-->
<!-- icon="el-icon-delete"-->
<!-- size="mini"-->
<!-- :disabled="multiple"-->
<!-- @click="handleDelete"-->
<!-- v-hasPermi="['system:scriptMessage:remove']"-->
<!-- >删除</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="warning"-->
<!-- plain-->
<!-- icon="el-icon-download"-->
<!-- size="mini"-->
<!-- @click="handleExport"-->
<!-- v-hasPermi="['system:scriptMessage:export']"-->
<!-- >导出</el-button>-->
<!-- </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
@ -162,13 +162,13 @@
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['system:scriptMessage:edit']" v-hasPermi="['system:scriptMessage:edit']"
>修改</el-button> >修改</el-button>
<el-button <!-- <el-button-->
size="mini" <!-- size="mini"-->
type="text" <!-- type="text"-->
icon="el-icon-delete" <!-- icon="el-icon-delete"-->
@click="handleDelete(scope.row)" <!-- @click="handleDelete(scope.row)"-->
v-hasPermi="['system:scriptMessage:remove']" <!-- v-hasPermi="['system:scriptMessage:remove']"-->
>删除</el-button> <!-- >删除</el-button>-->
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
@ -228,10 +228,10 @@
</el-form-item> </el-form-item>
<el-form-item label="标题" prop="messageTitle"> <el-form-item label="标题" prop="messageTitle">
<el-input v-model="form.messageTitle" placeholder="请输入消息标题" /> <el-input v-model="form.messageTitle" placeholder="请输入消息标题" maxlength="20"/>
</el-form-item> </el-form-item>
<el-form-item label="消息内容" prop="messageContent"> <el-form-item label="消息内容" prop="messageContent">
<el-input type="" v-model="form.messageContent"type="textarea" :rows="5"/> <el-input type="" v-model="form.messageContent"type="textarea" :rows="5" maxlength="50"/>
</el-form-item> </el-form-item>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
@ -267,8 +267,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" v-if="form.type == 4" label-width="90px"> <el-col :span="24" v-if="form.type == 4" label-width="90px">
<el-form-item label="页面链接" prop="redirectUrl"> <el-form-item label="小程序页面" prop="redirectUrl">
<el-input v-model="form.redirectUrl" placeholder="请输入页面链接" /> <el-input v-model="form.redirectUrl" placeholder="请输入小程序页面" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" v-if="form.type == 5 || form.type == 6"> <el-col :span="24" v-if="form.type == 5 || form.type == 6">
@ -284,8 +284,8 @@
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="cancel">重 置</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
@ -442,7 +442,7 @@ export default {
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.open = true; this.open = true;
this.title = "添加消息模版"; this.title = "新建";
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
@ -456,7 +456,7 @@ export default {
this.form.status = true; this.form.status = true;
} }
this.open = true; this.open = true;
this.title = "修改消息模版"; this.title = "编辑";
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */

93
flossom-ui/src/views/system/siteInfo/index.vue
Unescape Escape View File

@ -29,16 +29,16 @@
<el-form-item label="开启时间" prop="siteStartTime"> <el-form-item label="开启时间" prop="siteStartTime">
<el-date-picker clearable <el-date-picker clearable
v-model="queryParams.siteStartTime" v-model="queryParams.siteStartTime"
type="date" type="datetime"
value-format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择开启开始时间"> placeholder="请选择开启开始时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="" prop="siteEndTime"> <el-form-item label="" prop="siteEndTime">
<el-date-picker clearable <el-date-picker clearable
v-model="queryParams.siteEndTime" v-model="queryParams.siteEndTime"
type="date" type="datetime"
value-format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择开启结束时间"> placeholder="请选择开启结束时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -132,6 +132,13 @@
<span v-show="scope.row.operate == 2">关闭</span> <span v-show="scope.row.operate == 2">关闭</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="弹窗类型" align="center" prop="openType" >
<template slot-scope="scope">
<span v-show="scope.row.openType == 1">首页</span>
<span v-show="scope.row.openType == 2">发现模块</span>
<span v-show="scope.row.openType == 3">我的模块</span>
</template>
</el-table-column>
<el-table-column label="推送频次" align="center" prop="pushType" > <el-table-column label="推送频次" align="center" prop="pushType" >
<template slot-scope="scope"> <template slot-scope="scope">
<span v-show="scope.row.pushType == 1">永久一次</span> <span v-show="scope.row.pushType == 1">永久一次</span>
@ -218,7 +225,7 @@
</el-upload> </el-upload>
</el-form-item> </el-form-item>
<el-form-item label="标题" prop="siteName"> <el-form-item label="标题" prop="siteName">
<el-input v-model="form.siteName" placeholder="请输入标题" style="width: 80%" /> <el-input v-model="form.siteName" placeholder="请输入标题" style="width: 80%" maxlength="21"/>
</el-form-item> </el-form-item>
<el-form-item label="开启时间" prop="siteStartTime"> <el-form-item label="开启时间" prop="siteStartTime">
<el-date-picker <el-date-picker
@ -249,7 +256,7 @@
<el-option label="活动模块" :value="3" :key="3"></el-option> <el-option label="活动模块" :value="3" :key="3"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="推送次数" prop="pushNumber"> <el-form-item label="推送次数" prop="pushType">
<el-radio-group v-model="form.pushType"> <el-radio-group v-model="form.pushType">
<el-radio :label="1">永久一次</el-radio> <el-radio :label="1">永久一次</el-radio>
<el-radio :label="2">每次进入</el-radio> <el-radio :label="2">每次进入</el-radio>
@ -373,8 +380,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" v-if="form.type == 4" label-width="90px"> <el-col :span="24" v-if="form.type == 4" label-width="90px">
<el-form-item label="页面链接" prop="redirectUrl"> <el-form-item label="小程序页面" prop="redirectUrl">
<el-input v-model="form.redirectUrl" placeholder="请输入页面链接" /> <el-input v-model="form.redirectUrl" placeholder="请输入小程序页面" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" v-if="form.type == 5 || form.type == 6"> <el-col :span="24" v-if="form.type == 5 || form.type == 6">
@ -459,7 +466,7 @@ export default {
siteEndTime: null, siteEndTime: null,
userRegisterStartTime: null, userRegisterStartTime: null,
userRegisterEndTime: null, userRegisterEndTime: null,
openType: null, openType: "",
pushType: null, pushType: null,
pushNumber: null, pushNumber: null,
pushTimer: null, pushTimer: null,
@ -476,7 +483,7 @@ export default {
machineName: null, machineName: null,
machineId: null, machineId: null,
userType: null, userType: null,
operate: null, operate: "",
signNumber: null, signNumber: null,
orderNumber: null, orderNumber: null,
type: null, type: null,
@ -491,10 +498,57 @@ export default {
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
fileUrl: [
{ required: true, message: "弹窗封面不能为空", trigger: "blur" }
],
pushType: [
{ required: true, message: "推送频次不能为空", trigger: "blur" }
],
siteName: [
{ required: true, message: "标题不能为空", trigger: "blur" }
],
openType: [
{ required: true, message: "弹窗类型不能为空", trigger: "blur" }
],
userType: [
{ required: true, message: "用户类型不能为空", trigger: "blur" }
],
orderNumber: [
{ required: true, message: "排序不能为空", trigger: "blur" }
],
type: [
{ required: true, message: "跳转类型不能为空", trigger: "blur" }
],
link: [
{ required: true, message: "参数不能为空", trigger: "blur" }
],
redirectAppid: [
{ required: true, message: "APPID不能为空", trigger: "blur" }
],
linkParams: [
{ required: true, message: "跳转参数不能为空", trigger: "blur" }
],
redirectUrl: [
{ required: true, message: "页面链接不能为空", trigger: "blur" }
],
videoNo: [
{ required: true, message: "视频号ID不能为空", trigger: "blur" }
],
feedId: [
{ required: true, message: "视频号feedId不能为空", trigger: "blur" }
],
pushTimer: [
{ required: true, message: "自定义频次时间不能为空", trigger: "blur" }
],
pushNumber: [
{ required: true, message: "每天推送次数不能为空", trigger: "blur" }
],
} }
}; };
}, },
created() { created() {
this.queryParams.siteStartTime = this.dateUtil(new Date(new Date().toLocaleDateString()));
this.queryParams.siteEndTime = this.dateUtil(new Date(new Date(new Date().toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000 - 1));
this.getList(); this.getList();
this.getDeptTree(); this.getDeptTree();
}, },
@ -562,6 +616,16 @@ export default {
}; };
this.resetForm("form"); this.resetForm("form");
}, },
dateUtil(date){
// 获取年份、月份和日期
const year = date.getFullYear().toString(); // 四位数表示的年份
const months = (date.getMonth() + 1).toString().padStart(2, '0'); // 补零后的两位数表示的月份
const day = date.getDate().toString().padStart(2, '0'); // 补零后的两位数表示的日期
const hours = date.getHours().toString().padStart(2, '0'); // 补全两位数的小时
const minutes = date.getMinutes().toString().padStart(2, '0'); // 补全两位数的分钟
const seconds = date.getSeconds().toString().padStart(2, '0');
return `${year}-${months}-${day} ${hours}:${minutes}:${seconds}`;
},
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.queryParams.pageNum = 1;
@ -583,6 +647,7 @@ export default {
this.reset(); this.reset();
this.open = true; this.open = true;
this.title = "添加站点管理"; this.title = "添加站点管理";
this.form.orderNumber = 1000;
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row, operate) { handleUpdate(row, operate) {
@ -621,12 +686,16 @@ export default {
submitForm() { submitForm() {
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
if (!this.form.fileUrl) {
this.$modal.msgError("弹窗封面不能为空");
return;
}
// 处理时间 // 处理时间
if(this.form.startTime.length > 0) { if(this.form.startTime && this.form.startTime.length > 0) {
this.form.siteStartTime = this.form.startTime[0]; this.form.siteStartTime = this.form.startTime[0];
this.form.siteEndTime = this.form.startTime[1]; this.form.siteEndTime = this.form.startTime[1];
} }
if(this.form.registerTime.length > 0) { if(this.form.registerTime && this.form.registerTime.length > 0) {
this.form.userRegisterStartTime = this.form.registerTime[0]; this.form.userRegisterStartTime = this.form.registerTime[0];
this.form.userRegisterEndTime = this.form.registerTime[1]; this.form.userRegisterEndTime = this.form.registerTime[1];
} }

Write Preview
Loading…
Cancel
Save