From ad3c45b9c747769945dac8c4d8ce035118dc4b7e Mon Sep 17 00:00:00 2001
From: xuhubin <1269286451@qq.com>
Date: Fri, 6 Nov 2020 15:11:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E8=A7=86=E9=A2=91=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=B8=83=E5=B1=80=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/front/courses/add.html          |  7 +++++-
 .../templates/front/courses/courses.html      | 18 +++++++++++---
 .../templates/front/courses/edit.html         | 24 ++++++++++++++++++-
 3 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/ruoyi-front/src/main/resources/templates/front/courses/add.html b/ruoyi-front/src/main/resources/templates/front/courses/add.html
index 9460d7899..090aa1e00 100644
--- a/ruoyi-front/src/main/resources/templates/front/courses/add.html
+++ b/ruoyi-front/src/main/resources/templates/front/courses/add.html
@@ -38,8 +38,13 @@
             </div>
             <div class="form-group">    
                 <label class="col-sm-3 control-label is-required">课程难度等级：</label>
-                <div class="col-sm-8">
+                <!--<div class="col-sm-8">
                     <input name="coursesLevel" class="form-control" type="text" required>
+                </div>-->
+                <div class="col-sm-8">
+                    <select  class="form-control">
+                        <option th:each="dict : ${@dict.getType('course_level')}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
+                    </select>
                 </div>
             </div>
             <div class="form-group">
diff --git a/ruoyi-front/src/main/resources/templates/front/courses/courses.html b/ruoyi-front/src/main/resources/templates/front/courses/courses.html
index dbf1e2a47..9e469e1c0 100644
--- a/ruoyi-front/src/main/resources/templates/front/courses/courses.html
+++ b/ruoyi-front/src/main/resources/templates/front/courses/courses.html
@@ -32,7 +32,11 @@
                             </li>
                             <li>
                                 <label>课程难度等级：</label>
-                                <input type="text" name="coursesLevel"/>
+                                <!--<input type="text" name="coursesLevel"/>-->
+                                <select name="coursesLevel" th:with="type=${@dict.getType('course_level')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
                             </li>
                             <li>
                                 <!--<label>状态：</label>
@@ -82,6 +86,8 @@
     <script th:inline="javascript">
         var editFlag = [[${@permission.hasPermi('front:courses:edit')}]];
         var removeFlag = [[${@permission.hasPermi('front:courses:remove')}]];
+        var dictStatus = [[${@dict.getType('sys_normal_disable')}]];
+        var courseLevel = [[${@dict.getType('course_level')}]];
         var prefix = ctx + "front/courses";
         function toEvaluateList() {
             var url = ctx +"front/evaluate";
@@ -125,7 +131,10 @@
                 },
                 {
                     field: 'coursesLevel',
-                    title: '课程难度等级'
+                    title: '课程难度等级',
+                    formatter: function(value, item, index) {
+                        return $.table.selectDictLabel(courseLevel, item.coursesLevel);
+                    }
                 },
                 {
                     field: 'pictureUrl',
@@ -145,7 +154,10 @@
                 },
                 {
                     field: 'status',
-                    title: '状态'
+                    title: '状态',
+                    formatter: function(value, item, index) {
+                        return $.table.selectDictLabel(dictStatus, item.status);
+                    }
                 },
                 {
                     title: '操作',
diff --git a/ruoyi-front/src/main/resources/templates/front/courses/edit.html b/ruoyi-front/src/main/resources/templates/front/courses/edit.html
index b814a35fd..3cab9e865 100644
--- a/ruoyi-front/src/main/resources/templates/front/courses/edit.html
+++ b/ruoyi-front/src/main/resources/templates/front/courses/edit.html
@@ -39,9 +39,31 @@
             </div>
             <div class="form-group">    
                 <label class="col-sm-3 control-label is-required">课程难度等级：</label>
+                <!--<div class="col-sm-8">-->
+                    <!--<input name="coursesLevel" th:field="*{coursesLevel}" class="form-control" type="text" required>-->
+                <!--</div>-->
+                <!--<div class="col-sm-8">
+                    <div class="radio-box" th:each="dict : ${@dict.getType('course_level')}" th:field="*{coursesLevel}">
+                        <input type="radio" th:id="${dict.dictCode}" name="coursesLevel" th:value="${dict.dictValue}" th:checked="${dict.default}">
+                        <label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                    </div>
+                </div>-->
+                <!--<select name="coursesLevel" th:with="type=${@dict.getType('course_level')}" class="col-sm-8">-->
+                    <!--<th:block th:each="dict : ${type}">-->
+                        <!--<th:block th:if="${dict.dictValue ne '0'}">-->
+                            <!--<option th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:selected="${dict.dictValue eq coursesLevel}"/>-->
+                        <!--</th:block>-->
+                    <!--</th:block>-->
+                <!--</select>-->
                 <div class="col-sm-8">
-                    <input name="coursesLevel" th:field="*{coursesLevel}" class="form-control" type="text" required>
+                    <select th:field="*{coursesLevel}" class="form-control">
+                        <option th:each="dict : ${@dict.getType('course_level')}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
+                    </select>
                 </div>
+                <!--<select name="coursesLevel" th:with="type=${@dict.getType('course_level')}">-->
+                    <!--<option value="">所有</option>-->
+                    <!--<option th:selected="${dict.dictValue eq *{coursesLevel}}" th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>-->
+                <!--</select>-->
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">图片：</label>