弹框

suishenbang-admin/src/main/resources/templates/system/alertConfiguration/add.html

@@ -10,7 +10,7 @@
         <div class="form-group">
             <label class="col-sm-3 control-label">弹框内容：</label>
             <div class="col-sm-8">
-                <input name="alertContent" class="form-control" type="text">
+                <textarea name="alertContent" class="form-control"></textarea>
             </div>
         </div>
         <div class="form-group">
@@ -38,13 +38,11 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">用户类型默认0立邦员工1经销商：</label>
+            <label class="col-sm-3 control-label">用户类型：</label>
             <div class="col-sm-8">
-                <select name="userType" class="form-control m-b">
-                    <option value="1">经销商</option>
-                    <option value="0">立邦员工</option>
+                <select title="请选择" name="userType" class="form-control m-b" th:with="type=${@dict.getType('sys_lantern_permission')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                 </select>
-                <!--                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>-->
             </div>
         </div>
         <div class="form-group">
@@ -76,14 +74,12 @@
     }
 
     $("input[name='alertStartTime']").datetimepicker({
-        format: "yyyy-mm-dd",
-        minView: "month",
+        format: "yyyy-mm-dd hh:ii",
         autoclose: true
     });
 
     $("input[name='alertEndTime']").datetimepicker({
-        format: "yyyy-mm-dd",
-        minView: "month",
+        format: "yyyy-mm-dd hh:ii",
         autoclose: true
     });
 </script>

suishenbang-admin/src/main/resources/templates/system/alertConfiguration/edit.html

@@ -8,18 +8,19 @@
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
         <form class="form-horizontal m" id="form-configuration-edit" th:object="${alertConfiguration}">
             <input name="alertId" th:field="*{alertId}" type="hidden">
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">弹框内容：</label>
                 <div class="col-sm-8">
-                    <input name="alertContent" th:field="*{alertContent}" class="form-control" type="text">
+                    <textarea name="alertContent" class="form-control">[[*{alertContent}]]</textarea>
                 </div>
             </div>
+
             <div class="form-group">    
                 <label class="col-sm-3 control-label">弹框开始时间：</label>
                 <div class="col-sm-8">
                     <div class="input-group date">
                         <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                        <input name="alertStartTime" th:value="${#dates.format(alertConfiguration.alertStartTime, 'yyyy-MM-dd HH:mm')}" class="form-control" placeholder="yyyy-MM-dd HH:mm" type="text">
+                        <input name="alertStartTime" th:value="${#dates.format(alertConfiguration.alertStartTime, 'yyyy-MM-dd hh:mm')}" class="form-control" placeholder="yyyy-MM-dd hh:mm" type="text">
                     </div>
                 </div>
             </div>
@@ -28,7 +29,7 @@
                 <div class="col-sm-8">
                     <div class="input-group date">
                         <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                        <input name="alertEndTime" th:value="${#dates.format(alertConfiguration.alertEndTime, 'yyyy-MM-dd HH:mm')}" class="form-control" placeholder="yyyy-MM-dd HH:mm" type="text">
+                        <input name="alertEndTime" th:value="${#dates.format(alertConfiguration.alertEndTime, 'yyyy-MM-dd hh:mm')}" class="form-control" placeholder="yyyy-MM-dd hh:mm" type="text">
                     </div>
                 </div>
             </div>
@@ -38,23 +39,16 @@
                     <input name="alertNum" th:field="*{alertNum}" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">用户类型默认0立邦员工1经销商：</label>
-<!--                <div class="col-sm-8">-->
-<!--                    <select name="userType" class="form-control m-b">-->
-<!--                        <option value="1">经销商</option>-->
-<!--                        <option value="0">立邦员工</option>-->
-<!--                    </select>-->
-<!--                </div>-->
+            <div class="form-group">
+                <label class="col-sm-3 control-label">用户类型：</label>
                 <div class="col-sm-8">
-                    <select title="请选择" id="userType" name="userType" class="form-control m-b selectpicker" th:with="type=${@dict.getType('sys_lantern_permission')}" multiple>
+                    <select title="请选择" id="userType" name="userType" class="form-control m-b" th:with="type=${@dict.getType('sys_lantern_permission')}" multiple="multiple">
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                     </select>
-                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">是否启动默认0未启动，1启动：</label>
+                <label class="col-sm-3 control-label">是否启动：</label>
                 <div class="col-sm-8">
                     <label class="radio-box">
                         <input type="radio" name="alertStatus" value="0">未启动
@@ -82,14 +76,12 @@
         }
 
         $("input[name='alertStartTime']").datetimepicker({
-            format: "yyyy-mm-dd HH:mm",
-            minView: "month",
+            format: "yyyy-mm-dd hh:ii",
             autoclose: true
         });
 
         $("input[name='alertEndTime']").datetimepicker({
-            format: "yyyy-mm-dd HH:mm",
-            minView: "month",
+            format: "yyyy-mm-dd hh:ii",
             autoclose: true
         });
     </script>