From 7be144b0dae3266db0210fcfcdd08ce0f6834ca4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Wed, 24 Apr 2024 09:54:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4diamagnetic?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/common/utils/file/MultipartFileUtils.java | 2 +-
 ruoyi-ui/src/views/base/magDetail/magDetailDrawer.vue        | 5 +++--
 .../video/service/impl/SurProjectVideoConfigServiceImpl.java | 5 ++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MultipartFileUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MultipartFileUtils.java
index b1177d29..be9cab56 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MultipartFileUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MultipartFileUtils.java
@@ -23,7 +23,7 @@ public class MultipartFileUtils {
             byte[] bytes = Base64.getDecoder().decode(parts[1]);
             return new MockMultipartFile("file","file."+contentType.split("/")[1], contentType, bytes);
         }else{
-            //默认格式为pdf
+            //默认格式为jpeg
             String contentType = "image/jpeg";
             byte[] bytes = Base64.getDecoder().decode(base64);
             return new MockMultipartFile("file", "file"+contentType.split("/")[1], contentType, bytes);
diff --git a/ruoyi-ui/src/views/base/magDetail/magDetailDrawer.vue b/ruoyi-ui/src/views/base/magDetail/magDetailDrawer.vue
index 2d624658..0d61a719 100644
--- a/ruoyi-ui/src/views/base/magDetail/magDetailDrawer.vue
+++ b/ruoyi-ui/src/views/base/magDetail/magDetailDrawer.vue
@@ -65,7 +65,7 @@
                             ></el-image>
                         </div>
                         </div>
-                        <FileUpload @input="doImageInput" v-model="form.imageUrl" :fileSize="5" :limit="5"
+                        <FileUpload @input="doImageInput" v-model="form.imageUrl" :fileSize="5" :limit="20"
                             :fileType="['png', 'jpg', 'jpeg']" />
                     </el-form-item>
                     <el-form-item label="" prop="content" class="fi-editor">
@@ -313,9 +313,10 @@ export default {
             display: none;
         }        
         .img-list{
-            display: flex;
+            display: block;
             .img-item{
                 position: relative;
+                display: inline-block;
                 margin-right: 8px;
                 &:hover{
                     .img-item-del{
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/video/service/impl/SurProjectVideoConfigServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/video/service/impl/SurProjectVideoConfigServiceImpl.java
index e77542e4..18256d27 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/video/service/impl/SurProjectVideoConfigServiceImpl.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/video/service/impl/SurProjectVideoConfigServiceImpl.java
@@ -3,6 +3,7 @@ package com.yanzhu.jh.video.service.impl;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.enums.PublicStateEnum;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.DictUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.service.ISysDictDataService;
@@ -236,9 +237,7 @@ public class SurProjectVideoConfigServiceImpl implements ISurProjectVideoConfigS
     @Override
     public List<Map<String, Object>> selectGroupCountVideoConfig(Map<String, Object> map){
         List<SurProjectVideoConfig> list = surProjectVideoConfigMapper.selectSurProjectVideoConfigByGroupCountParams(map);
-        SysDictData dictData = new SysDictData();
-        dictData.setDictType("aibox_alarm_type");
-        List<SysDictData> dictlist = sysDictDataService.selectDictDataList(dictData);
+        List<SysDictData> dictlist = DictUtils.getDictCache("aibox_alarm_type");
         List<Map<String, Object>> dataList = new ArrayList<>();
         for(SysDictData dict : dictlist){
             Map<String, Object> dataMap = new HashMap<>();