From 4025f9ae7f7a95ab6023cc458f9a7558eae05cff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com>
Date: Sat, 14 Sep 2024 10:34:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fuintAdmin/src/views/power/page/mode.vue      | 23 +++++++++++--------
 .../fuint/common/config/RedissonConfig.java   |  2 +-
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/fuintAdmin/src/views/power/page/mode.vue b/fuintAdmin/src/views/power/page/mode.vue
index 280cf70d0..25076c7d3 100644
--- a/fuintAdmin/src/views/power/page/mode.vue
+++ b/fuintAdmin/src/views/power/page/mode.vue
@@ -14,8 +14,9 @@
         <el-form-item label="" prop="notificationType">
           <el-select v-model="queryParams.notificationType" placeholder="请选择通知类型" clearable
                      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-select>
         </el-form-item>
@@ -101,17 +102,19 @@
 
     </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-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 label="通知类型" :required="true">
-          <el-select v-model="form.notificationType" placeholder="请选择通知类型" style="width: 300px">
-            <el-option label="到期提醒" value="到期提醒"></el-option>
+          <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-select>
         </el-form-item>
@@ -119,7 +122,7 @@
         <!-- 通知模板 -->
         <el-form-item label="通知模板" :required="true">
           <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>
             <span @click="insertText('{油罐名称}')">{油罐名称}</span>
             <span @click="insertText('{商品名称}')">{商品名称}</span>
@@ -131,7 +134,7 @@
 
         <!-- 接收角色 -->
         <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-select>
         </el-form-item>
@@ -161,9 +164,9 @@
             <el-input v-model="condition.value" placeholder="请输入" style="width: 200px;margin-right: 10px">
               <template slot="append">{{ condition.field != '商品库存量' ? '元' : '件' }}</template>
             </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>
-          <!--          <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>
 
         <!-- 操作按钮 -->
@@ -253,6 +256,7 @@ export default {
       getSysNotifyList(this.queryParams).then(res => {
         this.tableData = res.data.records;
         this.total = res.data.total
+        console.log("this.form.conditions",this.form.conditions)
       })
     },
     changeField(index) {
@@ -412,6 +416,7 @@ export default {
         // this.total1 = res.data.total;
         // this.loading = false;
       })
+      console.log("this.form.conditions",this.form.conditions)
     },
     xunhuanbanduan() {
       this.dutyList.forEach(item => {
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/common/config/RedissonConfig.java b/fuintBackend/fuint-application/src/main/java/com/fuint/common/config/RedissonConfig.java
index 0dffa8e4b..89beff795 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/common/config/RedissonConfig.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/common/config/RedissonConfig.java
@@ -44,7 +44,7 @@ public class RedissonConfig {
     public RedissonClient redissonClient()
     {
         Config config = new Config();
-        config.useSingleServer().setPassword(password);
+//        config.useSingleServer().setPassword(password);
         config.useSingleServer().setAddress("redis://" + host + ":" + port); // 更多.set
         return Redisson.create(config);
     }