修改新增学校设施的功能

ruoyi-admin/src/main/resources/templates/system/icon/add.html

@@ -19,9 +19,14 @@
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label is-required">设施对应的图片序号：</label>
+                <label class="col-sm-3 control-label is-required">设施图标：</label>
                 <div class="col-sm-8">
-                    <input name="icon" class="form-control" type="text" required>
+                    <input name="icon" id="icon" class="form-control" type="text" placeholder="选择图标" required>
+                    <div class="ms-parent" style="width: 100%;">
+                        <div class="icon-drop animated flipInX" style="display: none;max-height:200px;overflow-y:auto">
+                            <div data-th-include="system/major/icon"></div>
+                        </div>
+                    </div>
                 </div>
             </div>
         </form>
@@ -38,6 +43,21 @@
                 $.operate.save(prefix + "/add", $('#form-icon-add').serialize());
             }
         }
+
+        $(function() {
+            $("input[name='icon']").focus(function() {
+                $(".icon-drop").show();
+            });
+            $("#form-icon-add").click(function(event) {
+                var obj = event.srcElement || event.target;
+                if (!$(obj).is("input[name='icon']")) {
+                    $(".icon-drop").hide();
+                }
+            });
+            $(".icon-drop").find(".ico-list img").on("click", function() {
+                $('#icon').val($(this).attr('class'));
+            });
+        });
     </script>
 </body>
 </html>
\ No newline at end of file

ruoyi-admin/src/main/resources/templates/system/icon/edit.html

@@ -22,7 +22,12 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">设施对应的图片：</label>
                 <div class="col-sm-8">
-                    <input name="icon" th:field="*{icon}" class="form-control" type="text" required>
+                    <input id="icon" th:field="*{icon}" class="form-control" type="text" required>
+                    <div class="ms-parent" style="width: 100%;">
+                        <div class="icon-drop animated flipInX" style="display: none;max-height:200px;overflow-y:auto">
+                            <div data-th-include="system/major/icon"></div>
+                        </div>
+                    </div>
                 </div>
             </div>
         </form>
@@ -39,6 +44,21 @@
                 $.operate.save(prefix + "/edit", $('#form-icon-edit').serialize());
             }
         }
+
+        $(function() {
+            $("input[name='icon']").focus(function() {
+                $(".icon-drop").show();
+            });
+            $("#form-icon-edit").click(function(event) {
+                var obj = event.srcElement || event.target;
+                if (!$(obj).is("input[name='icon']")) {
+                    $(".icon-drop").hide();
+                }
+            });
+            $(".icon-drop").find(".ico-list img").on("click", function() {
+                $('#icon').val($(this).attr('class'));
+            });
+        });
     </script>
 </body>
 </html>
\ No newline at end of file

ruoyi-admin/src/main/resources/templates/system/icon/icon.html

@@ -18,10 +18,10 @@
                                 <label>设施名称：</label>
                                 <input type="text" name="facilitiesName"/>
                             </li>
-                            <li>
-                                <label>设施对应的图片序号：</label>
-                                <input type="text" name="icon"/>
-                            </li>
+<!--                            <li>-->
+<!--                                <label>设施对应的图片序号：</label>-->
+<!--                                <input type="text" name="icon"/>-->
+<!--                            </li>-->
                             <li>
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                                 <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>

ruoyi-admin/src/main/resources/templates/system/menu/add.html

@@ -147,7 +147,7 @@
         	    	$(".icon-drop").hide();
         	    }
         	});
-        	$(".icon-drop").find(".ico-list i").on("click", function() {
+        	$(".icon-drop").find(".ico-list img").on("click", function() {
         		$('#icon').val($(this).attr('class'));
             });
         	$('input').on('ifChecked', function(event){  

ruoyi-system/src/main/java/com/ruoyi/system/domain/TbSchoolFacilitiesContrastIcon.java

@@ -28,7 +28,7 @@ public class TbSchoolFacilitiesContrastIcon extends BaseEntity
 
     /** 设施对应的图片 */
     @Excel(name = "设施对应的图片")
-    private Integer icon;
+    private String icon;
 
     public void setId(Long id) 
     {
@@ -57,12 +57,12 @@ public class TbSchoolFacilitiesContrastIcon extends BaseEntity
     {
         return facilitiesName;
     }
-    public void setIcon(Integer icon) 
+    public void setIcon(String icon)
     {
         this.icon = icon;
     }
 
-    public Integer getIcon() 
+    public String getIcon()
     {
         return icon;
     }