diff --git a/ruoyi-ui/src/views/board/content/index.vue b/ruoyi-ui/src/views/board/content/index.vue
index 7a5524e2..944a4a36 100644
--- a/ruoyi-ui/src/views/board/content/index.vue
+++ b/ruoyi-ui/src/views/board/content/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="auto">
-      <el-form-item label="预置信息名称" prop="name">
+      <el-form-item label="内容模版名称" prop="name">
         <el-input
           v-model="queryParams.name"
           placeholder="请输入预置信息名称"
@@ -9,32 +9,13 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="情报板尺寸" prop="boardSize">
-        <el-select
-          v-model="queryParams.boardSize"
-          clearable
-          placeholder="全部">
-          <el-option
-            v-for="dict in dict.type.board_size"
-            :key="dict.value"
-            :label="dict.label + ' ' + dict.value"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
       <el-form-item label="信息类型" prop="type">
-        <el-select
+        <el-cascader
           v-model="queryParams.infoType"
+          :options="planTypeOptions"
+          :props="{lable: 'lable', value: 'id', expandTrigger:'hover', emitPath: false}"
           clearable
-          placeholder="全部"
-        >
-          <el-option
-            v-for="dict in dict.type.alert_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
+        />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -75,23 +56,13 @@
           v-hasPermi="['board:content: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="['board:content:export']"-->
-<!--        >导出</el-button>-->
-<!--      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="contentList" @selection-change="handleSelectionChange">
       <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="name" />
       <el-table-column label="情报板尺寸" align="center" prop="boardSize" />
       <el-table-column label="信息类型" align="center" prop="infoType">
         <template slot-scope="scope">
@@ -99,15 +70,7 @@
         </template>
       </el-table-column>
       <el-table-column label="预置内容" align="center" prop="content" />
-      <el-table-column label="预览路径" align="center" prop="previewPath" />
-<!--      <el-table-column label="字体样式" align="center" prop="fontStyle" />-->
-<!--      <el-table-column label="字体大小" align="center" prop="fontSize" />-->
-<!--      <el-table-column label="字体间距" align="center" prop="letterSpacing" />-->
-<!--      <el-table-column label="字体颜色" align="center" prop="fontColor" />-->
-<!--      <el-table-column label="字体坐标X" align="center" prop="fontPositionX" />-->
-<!--      <el-table-column label="字体坐标Y" align="center" prop="fontPositionY" />-->
       <el-table-column label="播放时间" align="center" prop="playTime" />
-<!--      <el-table-column label="当前预置类型 1：内置模版 0：预发布信息" align="center" prop="presetType" />-->
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -140,21 +103,16 @@
     <!-- 添加或修改预置信息及模版对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="auto">
-        <el-form-item label="预置信息名称" prop="name">
+        <el-form-item label="内容模版名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入预置信息名称" />
         </el-form-item>
         <el-form-item label="预置信息类型" prop="infoType">
-          <el-select
+          <el-cascader
             v-model="form.infoType"
-            placeholder="全部"
-          >
-            <el-option
-              v-for="dict in dict.type.alert_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
+            :options="planTypeOptions"
+            :props="{lable: 'lable', value: 'id', expandTrigger:'hover', emitPath: false}"
+            clearable
+          />
         </el-form-item>
         <el-form-item label="情报板尺寸" prop="boardSize">
           <el-select
@@ -236,6 +194,7 @@
 <script>
 import { listContent, getContent, delContent, addContent, updateContent } from "@/api/board/content";
 import TextPreview from "@/views/board/component/TextPreview.vue";
+import {planTypeTreeSelect} from "@/api/board/plantype";
 
 export default {
   name: "Content",
@@ -261,6 +220,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      planTypeOptions: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -342,6 +302,7 @@ export default {
   },
   created() {
     this.getList();
+    this.getPlanTypeTree();
   },
   computed:{
     bgSize() {
@@ -460,7 +421,13 @@ export default {
       this.download('board/content/export', {
         ...this.queryParams
       }, `content_${new Date().getTime()}.xlsx`)
-    }
+    },
+    /** 查询类型下拉树结构 */
+    getPlanTypeTree() {
+      planTypeTreeSelect().then(response => {
+        this.planTypeOptions = response.data;
+      });
+    },
   }
 };
 </script>