dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
许允枞 2024-09-14 10:34:07 +08:00
parent bff22a19d5
commit 4025f9ae7f
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
fuintAdmin/src/views/power/page/mode.vue
View File

@ -14,8 +14,9 @@
<el-form-item label="" prop="notificationType"> <el-form-item label="" prop="notificationType">
<el-select v-model="queryParams.notificationType" placeholder="请选择通知类型" clearable <el-select v-model="queryParams.notificationType" placeholder="请选择通知类型" clearable
style="width: 240px;"> style="width: 240px;">
<el-option label="到期提醒" value="到期提醒"></el-option> <el-option label="到期通知" value="到期通知"></el-option>
<el-option label="库存预警" value="库存预警"></el-option> <el-option label="库存预警" value="库存预警"></el-option>
<el-option label="其他" value="其他"></el-option>
<!-- 添加其他选项 --> <!-- 添加其他选项 -->
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -101,17 +102,19 @@
</div> </div>
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="50%" append-to-body> <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="42.5%" append-to-body>
<el-form :model="form" label-width="120px"> <el-form :model="form" label-width="120px">
<!-- 通知名称 --> <!-- 通知名称 -->
<el-form-item label="通知名称" :required="true"> <el-form-item label="通知名称" :required="true">
<el-input v-model="form.notificationName" placeholder="请输入通知名称" style="width: 300px"></el-input> <el-input v-model="form.notificationName" placeholder="请输入通知名称" style="width: 480px"></el-input>
</el-form-item> </el-form-item>
<!-- 通知类型 --> <!-- 通知类型 -->
<el-form-item label="通知类型" :required="true"> <el-form-item label="通知类型" :required="true">
<el-select v-model="form.notificationType" placeholder="请选择通知类型" style="width: 300px"> <el-select v-model="form.notificationType" placeholder="请选择通知类型" style="width: 480px">
<el-option label="到期提醒" value="到期提醒"></el-option> <el-option label="到期通知" value="到期通知"></el-option>
<el-option label="库存预警" value="库存预警"></el-option>
<el-option label="其他" value="其他"></el-option>
<!-- 添加其他选项 --> <!-- 添加其他选项 -->
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -119,7 +122,7 @@
<!-- 通知模板 --> <!-- 通知模板 -->
<el-form-item label="通知模板" :required="true"> <el-form-item label="通知模板" :required="true">
<el-input type="textarea" v-model="form.templateContent" :rows="3" placeholder="请输入通知内容" <el-input type="textarea" v-model="form.templateContent" :rows="3" placeholder="请输入通知内容"
:maxlength="200" show-word-limit style="width: 300px"></el-input> :maxlength="200" show-word-limit style="width: 480px"></el-input>
<div> <div>
<span @click="insertText('{油罐名称}')">{油罐名称}</span> <span @click="insertText('{油罐名称}')">{油罐名称}</span>
<span @click="insertText('{商品名称}')">{商品名称}</span> <span @click="insertText('{商品名称}')">{商品名称}</span>
@ -131,7 +134,7 @@
<!-- 接收角色 --> <!-- 接收角色 -->
<el-form-item label="接收角色" :required="true"> <el-form-item label="接收角色" :required="true">
<el-select v-model="form.recipientRoles" multiple placeholder="请选择角色" style="width: 300px"> <el-select v-model="form.recipientRoles" multiple placeholder="请选择角色" style="width: 480px">
<el-option v-for="item in dutyList1" :label="item.dutyName" :value="item.dutyId"></el-option> <el-option v-for="item in dutyList1" :label="item.dutyName" :value="item.dutyId"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -161,9 +164,9 @@
<el-input v-model="condition.value" placeholder="请输入" style="width: 200px;margin-right: 10px"> <el-input v-model="condition.value" placeholder="请输入" style="width: 200px;margin-right: 10px">
<template slot="append">{{ condition.field != '商品库存量' ? '元' : '件' }}</template> <template slot="append">{{ condition.field != '商品库存量' ? '元' : '件' }}</template>
</el-input> </el-input>
<!-- <el-button @click="removeCondition(index)" type="danger" icon="el-icon-delete" circle></el-button>--> <el-button @click="removeCondition(index)" type="danger" icon="el-icon-delete" circle></el-button>
</div> </div>
<!-- <el-button @click="addCondition(index)" type="primary" icon="el-icon-plus">添加条件</el-button>--> <el-button @click="addCondition(index)" type="primary" icon="el-icon-plus">添加条件</el-button>
</el-form-item> </el-form-item>
<!-- 操作按钮 --> <!-- 操作按钮 -->
@ -253,6 +256,7 @@ export default {
getSysNotifyList(this.queryParams).then(res => { getSysNotifyList(this.queryParams).then(res => {
this.tableData = res.data.records; this.tableData = res.data.records;
this.total = res.data.total this.total = res.data.total
console.log("this.form.conditions",this.form.conditions)
}) })
}, },
changeField(index) { changeField(index) {
@ -412,6 +416,7 @@ export default {
// this.total1 = res.data.total; // this.total1 = res.data.total;
// this.loading = false; // this.loading = false;
}) })
console.log("this.form.conditions",this.form.conditions)
}, },
xunhuanbanduan() { xunhuanbanduan() {
this.dutyList.forEach(item => { this.dutyList.forEach(item => {

2
fuintBackend/fuint-application/src/main/java/com/fuint/common/config/RedissonConfig.java
View File

@ -44,7 +44,7 @@ public class RedissonConfig {
public RedissonClient redissonClient() public RedissonClient redissonClient()
{ {
Config config = new Config(); Config config = new Config();
config.useSingleServer().setPassword(password); // config.useSingleServer().setPassword(password);
config.useSingleServer().setAddress("redis://" + host + ":" + port); // 更多.set config.useSingleServer().setAddress("redis://" + host + ":" + port); // 更多.set
return Redisson.create(config); return Redisson.create(config);
} }