diff --git a/ruoyi-ui/src/views/board/plan/index.vue b/ruoyi-ui/src/views/board/plan/index.vue
index 72e222d4..28444b5b 100644
--- a/ruoyi-ui/src/views/board/plan/index.vue
+++ b/ruoyi-ui/src/views/board/plan/index.vue
@@ -50,16 +50,6 @@
               v-hasPermi="['board:plan: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:plan:export']"-->
-          <!--        >导出</el-button>-->
-          <!--      </el-col>-->
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
         <el-table v-loading="loading" :data="planList" @selection-change="handleSelectionChange">
@@ -69,7 +59,7 @@
           <el-table-column label="等级" align="center" prop="level" />
           <el-table-column label="最大值" align="center" prop="maxValue" />
           <el-table-column label="最小值" align="center" prop="minValue" />
-          <el-table-column label="显示内容" align="center" prop="displayContent" />
+          <el-table-column label="显示内容" align="center" prop="presetContentName" />
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <el-button
@@ -115,7 +105,16 @@
           <el-input-number :min="form.minValue" :precision="2" v-model="form.maxValue" placeholder="请输入最大值" />
         </el-form-item>
         <el-form-item label="显示内容">
-          <el-input v-model="form.displayContent" :min-height="192"/>
+          <el-select
+            v-model="form.presetContentId"
+            placeholder="请选择">
+            <el-option
+              v-for="dict in this.contentModelOptions"
+              :key="dict.id"
+              :label="dict.name"
+              :value="dict.id"
+            />
+          </el-select>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -130,6 +129,7 @@
 import { listPlan, getPlan, delPlan, addPlan, updatePlan } from "@/api/board/plan";
 import PlanTypeTree from "@/views/board/plan/planTypeTree.vue";
 import {planTypeTreeSelect} from "@/api/board/plantype";
+import {listContent} from "@/api/board/content";
 
 export default {
   name: "Plan",
@@ -152,6 +152,7 @@ export default {
       total: 0,
       // 警报计划表格数据
       planList: [],
+      contentModelOptions: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -186,7 +187,7 @@ export default {
         minValue: [
           { required: true, message: "最小值不能为空", trigger: "blur" }
         ],
-        displayContent: [
+        presetContentId: [
           { required: true, message: "显示内容不能为空", trigger: "blur" }
         ]
       }
@@ -218,7 +219,7 @@ export default {
         level: null,
         maxValue: null,
         minValue: null,
-        displayContent: null
+        presetContentId: null
       };
       this.resetForm("form");
     },
@@ -295,12 +296,26 @@ export default {
       this.clickNodeData = data;
       this.queryParams.type = data.id;
       this.handleQuery();
+      this.getContentList();
     },
     getPlanTypeTree() {
       planTypeTreeSelect().then(response => {
         this.clickNodeData = response.data[0].children[0];
         this.queryParams.type = response.data[0].children[0].id;
         this.getList();
+        this.getContentList();
+      });
+    },
+    getContentList() {
+      this.contentModelOptions = [];
+      listContent({infoType: this.queryParams.type}).then(response => {
+        response.rows.forEach(row => {
+          let model = {
+            name: row.name + " - " + row.boardSizeTypeName + " - " + row.content,
+            id: row.id
+          }
+          this.contentModelOptions.push(model)
+        });
       });
     },
   },