From 5d0b4abbd82cc84e404b7c5ad7228973afaec583 Mon Sep 17 00:00:00 2001
From: fuhao <fuhao@ciqihuo.net>
Date: Fri, 6 Sep 2024 09:28:52 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E4=BF=A1=E6=81=AF=E6=A8=A1=E7=89=88?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=AD=E6=83=85=E6=8A=A5=E6=9D=BF=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=B0=BA=E5=AF=B8=E4=BF=A1=E6=81=AF=E8=BF=9E=E8=A1=A8?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2):?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/board/content/index.vue | 28 ++++++++++++++--------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/ruoyi-ui/src/views/board/content/index.vue b/ruoyi-ui/src/views/board/content/index.vue
index 2a12e014..15927470 100644
--- a/ruoyi-ui/src/views/board/content/index.vue
+++ b/ruoyi-ui/src/views/board/content/index.vue
@@ -63,7 +63,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="唯一编号" align="center" prop="id" />
       <el-table-column label="内容模版名称" align="center" prop="name" />
-      <el-table-column label="情报板尺寸" align="center" prop="boardSize" />
+      <el-table-column label="情报板尺寸" align="center" prop="boardSizeTypeName" />
       <el-table-column label="信息类型" align="center" prop="typeName" />
       <el-table-column label="预置内容" align="center" prop="content" />
       <el-table-column label="播放时间" align="center" prop="playTime" />
@@ -109,15 +109,15 @@
             :props="{lable: 'lable', value: 'id', expandTrigger:'hover', emitPath: false}"
           />
         </el-form-item>
-        <el-form-item label="情报板尺寸" prop="boardSize">
+        <el-form-item label="情报板尺寸" prop="boardSizeType">
           <el-select
-            v-model="form.boardSize"
-            placeholder="请选择情报板尺寸">
+            v-model="form.boardSizeType"
+            placeholder="请选择">
             <el-option
-              v-for="dict in dict.type.board_size"
-              :key="dict.value"
-              :label="dict.label + ' ' + dict.value"
-              :value="dict.value"
+              v-for="dict in this.boardTypeOptions"
+              :key="dict.id"
+              :label="dict.name"
+              :value="dict.id"
             />
           </el-select>
         </el-form-item>
@@ -190,6 +190,7 @@
 import { listContent, getContent, delContent, addContent, updateContent } from "@/api/board/content";
 import TextPreview from "@/views/board/component/TextPreview.vue";
 import {planTypeTreeSelect} from "@/api/board/plantype";
+import {listBoardType} from "@/api/board/boardtype";
 
 export default {
   name: "Content",
@@ -216,12 +217,12 @@ export default {
       // 是否显示弹出层
       open: false,
       planTypeOptions: [],
+      boardTypeOptions: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
         name: null,
-        boardSize: null,
         infoType: null,
         content: null,
         previewPath: null,
@@ -241,7 +242,7 @@ export default {
         name: [
           { required: true, message: "预置信息名称不能为空", trigger: "blur" }
         ],
-        boardSize: [
+        boardSizeType: [
           { required: true, message: "情报板尺寸不能为空", trigger: "blur" }
         ],
         infoType: [
@@ -298,6 +299,7 @@ export default {
   created() {
     this.getList();
     this.getPlanTypeTree();
+    this.getBoardTypeList();
   },
   computed:{
     bgSize() {
@@ -422,6 +424,12 @@ export default {
         this.planTypeOptions = response.data;
       });
     },
+    /** 查询情报板类型定义 */
+    getBoardTypeList() {
+      listBoardType().then(response => {
+        this.boardTypeOptions = response.rows;
+      });
+    },
   }
 };
 </script>