Explorar o código

框架代码调整

hurugang %!s(int64=6) %!d(string=hai) anos
pai
achega
a5cb3eddbd

+ 8 - 0
src/main/java/cn/hnthyy/thmz/controller/NavigationController.java

@@ -43,4 +43,12 @@ public class NavigationController {
     public String unitCode() {
         return "unit_code";
     }
+    /**
+     * 打开挂号管理页面
+     * @return
+     */
+    @RequestMapping("/registration")
+    public String registration() {
+        return "registration";
+    }
 }

+ 2 - 19
src/main/resources/static/html/profile.html

@@ -1,20 +1,3 @@
-<!--<div class="page-title">-->
-    <!--<div class="title_left">-->
-        <!--<h3>Form Validation</h3>-->
-    <!--</div>-->
-
-    <!--<div class="title_right">-->
-        <!--<div class="col-md-5 col-sm-5 col-xs-12 form-group pull-right top_search">-->
-            <!--<div class="input-group">-->
-                <!--<input type="text" class="form-control" placeholder="Search for...">-->
-                <!--<span class="input-group-btn">-->
-                              <!--<button class="btn btn-default" type="button">Go!</button>-->
-                          <!--</span>-->
-            <!--</div>-->
-        <!--</div>-->
-    <!--</div>-->
-<!--</div>-->
-<!--<div class="clearfix"></div>-->
 <meta http-equiv="pragma" content="no-cache">
 <meta http-equiv="cache-control" content="no-cache">
 <meta http-equiv="expires" content="0">
@@ -42,7 +25,7 @@
                         <label class="control-label col-md-3 col-sm-3 col-xs-12" for="userName">姓名 <span class="required">*</span>
                         </label>
                         <div class="col-md-6 col-sm-6 col-xs-12">
-                            <input id="userName" class="form-control col-md-7 col-xs-12" data-validate-length-range="4" readonly name="userName" placeholder="身份证姓名,如张三" required="required" type="text">
+                            <input id="userName" class="form-control col-md-7 col-xs-12" data-validate-length-range="2,10" readonly name="userName" placeholder="身份证姓名,如张三" required="required" type="text">
                         </div>
                     </div>
                     <div class="item form-group">
@@ -63,7 +46,7 @@
                         <label class="control-label col-md-3 col-sm-3 col-xs-12" for="phoneNumber">电话 <span class="required">*</span>
                         </label>
                         <div class="col-md-6 col-sm-6 col-xs-12">
-                            <input type="tel" id="phoneNumber" name="phoneNumber" readonly  data-validate-length-range="8,20" class="form-control col-md-7 col-xs-12">
+                            <input type="tel" id="phoneNumber" name="phoneNumber" readonly  data-validate-length-range="11,12"  class="form-control col-md-7 col-xs-12">
                         </div>
                     </div>
                     <div class="ln_solid"></div>

+ 2 - 1
src/main/resources/static/js/common/date-util.js

@@ -148,4 +148,5 @@ var nowString = function () {
     }
     var dateTime =year + "-" + month + "-"+day;
     return dateTime;
-}
+}
+

+ 1 - 1
src/main/resources/static/js/common/string-util.js

@@ -52,4 +52,4 @@ function executeScript(html) {
 
         }
     }
-}
+}

+ 72 - 67
src/main/resources/static/js/custom-from-min.js

@@ -1043,74 +1043,79 @@ function init_IonRangeSlider() {
         }))
 }
 function init_daterangepicker() {
-    if ("undefined" != typeof $.fn.daterangepicker) {
-        console.log("init_daterangepicker");
-        var a = function(a, b, c) {
-            console.log(a.toISOString(), b.toISOString(), c),
-                $("#reportrange span").html(a.format("MMMM D, YYYY") + " - " + b.format("MMMM D, YYYY"))
-        }
-            , b = {
-            startDate: moment().subtract(29, "days"),
-            endDate: moment(),
-            minDate: "01/01/2012",
-            maxDate: "12/31/2015",
-            dateLimit: {
-                days: 60
-            },
-            showDropdowns: !0,
-            showWeekNumbers: !0,
-            timePicker: !1,
-            timePickerIncrement: 1,
-            timePicker12Hour: !0,
-            ranges: {
-                Today: [moment(), moment()],
-                Yesterday: [moment().subtract(1, "days"), moment().subtract(1, "days")],
-                "Last 7 Days": [moment().subtract(6, "days"), moment()],
-                "Last 30 Days": [moment().subtract(29, "days"), moment()],
-                "This Month": [moment().startOf("month"), moment().endOf("month")],
-                "Last Month": [moment().subtract(1, "month").startOf("month"), moment().subtract(1, "month").endOf("month")]
-            },
-            opens: "left",
-            buttonClasses: ["btn btn-default"],
-            applyClass: "btn-small btn-primary",
-            cancelClass: "btn-small",
-            format: "MM/DD/YYYY",
-            separator: " to ",
-            locale: {
-                applyLabel: "Submit",
-                cancelLabel: "Clear",
-                fromLabel: "From",
-                toLabel: "To",
-                customRangeLabel: "Custom",
-                daysOfWeek: ["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa"],
-                monthNames: ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"],
-                firstDay: 1
-            }
-        };
-        $("#reportrange span").html(moment().subtract(29, "days").format("MMMM D, YYYY") + " - " + moment().format("MMMM D, YYYY")),
-            $("#reportrange").daterangepicker(b, a),
-            $("#reportrange").on("show.daterangepicker", function() {
-                console.log("show event fired")
-            }),
-            $("#reportrange").on("hide.daterangepicker", function() {
-                console.log("hide event fired")
-            }),
-            $("#reportrange").on("apply.daterangepicker", function(a, b) {
-                console.log("apply event fired, start/end dates are " + b.startDate.format("MMMM D, YYYY") + " to " + b.endDate.format("MMMM D, YYYY"))
-            }),
-            $("#reportrange").on("cancel.daterangepicker", function(a, b) {
-                console.log("cancel event fired")
-            }),
-            $("#options1").click(function() {
-                $("#reportrange").data("daterangepicker").setOptions(b, a)
-            }),
-            $("#options2").click(function() {
-                $("#reportrange").data("daterangepicker").setOptions(optionSet2, a)
-            }),
-            $("#destroy").click(function() {
-                $("#reportrange").data("daterangepicker").remove()
-            })
+
+    if (typeof ($.fn.daterangepicker) === 'undefined') {
+        return;
     }
+    console.log('init_daterangepicker');
+
+    var cb = function (start, end, label) {
+        console.log(start.toISOString(), end.toISOString(), label);
+        $('#reportrange span').html(start.format('YYYY-MM-DD') + ' - ' + end.format('YYYY-MM-DD'));
+    };
+    var optionSet1 = {
+        startDate: moment().subtract(29, 'days'),
+        endDate: moment(),
+        minDate: '2012-01-01',
+        maxDate: nowString(),
+        dateLimit: {
+            days: 60
+        },
+        showDropdowns: true,
+        showWeekNumbers: true,
+        timePicker: false,
+        timePickerIncrement: 1,
+        timePicker12Hour: true,
+        ranges: {
+            '今天': [moment(), moment()],
+            '昨天': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
+            '最近7天': [moment().subtract(6, 'days'), moment()],
+            '最近30天': [moment().subtract(29, 'days'), moment()],
+            '当月': [moment().startOf('month'), moment().endOf('month')],
+            '上个月': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')]
+        },
+        opens: 'left',
+        buttonClasses: ['btn btn-default'],
+        applyClass: 'btn-small btn-primary',
+        cancelClass: 'btn-small',
+        format: 'YYYY-MM-DD',
+        separator: ' to ',
+        locale: {
+            applyLabel: '确定',
+            cancelLabel: '取消',
+            fromLabel: 'From',
+            toLabel: 'To',
+            customRangeLabel: '自定义',
+            daysOfWeek: ['天', '一', '二', '三', '四', '五', '六'],
+            monthNames: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'],
+            firstDay: 1
+        }
+    };
+
+    $('#reportrange span').html(moment().subtract(29, 'days').format('YYYY-MM-DD') + ' - ' + moment().format('YYYY-MM-DD'));
+    $('#reportrange').daterangepicker(optionSet1, cb);
+    $('#reportrange').on('show.daterangepicker', function () {
+        console.log("show event fired");
+    });
+    $('#reportrange').on('hide.daterangepicker', function () {
+        console.log("hide event fired");
+    });
+    $('#reportrange').on('apply.daterangepicker', function (ev, picker) {
+        console.log("apply event fired, start/end dates are " + picker.startDate.format('YYYY-MM-DD') + " to " + picker.endDate.format('YYYY-MM-DD'));
+    });
+    $('#reportrange').on('cancel.daterangepicker', function (ev, picker) {
+        console.log("cancel event fired");
+    });
+    $('#options1').click(function () {
+        $('#reportrange').data('daterangepicker').setOptions(optionSet1, cb);
+    });
+    $('#options2').click(function () {
+        $('#reportrange').data('daterangepicker').setOptions(optionSet2, cb);
+    });
+    $('#destroy').click(function () {
+        $('#reportrange').data('daterangepicker').remove();
+    });
+
 }
 function init_daterangepicker_right() {
     if ("undefined" != typeof $.fn.daterangepicker) {

+ 7 - 6
src/main/resources/static/js/index.js

@@ -16,16 +16,16 @@ var config = {
     data: {
         labels: ["January", "February", "March", "April", "May", "June", "July"],
         datasets: [{
-            label: "My First dataset",
+            label: "就诊金额",
             data: [randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor()],
             /*  fill: false,*/
             borderDash: [5, 5],
         }, {
             hidden: true,
-            label: 'hidden dataset',
+            label: '其他金额',
             data: [randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor()],
         }, {
-            label: "My Second dataset",
+            label: "零售金额",
             data: [randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor(), randomScalingFactor()],
         }]
     },
@@ -35,9 +35,9 @@ var config = {
                    position: 'bottom',
                },*/
         // title: {
-        //     display: true,
-        //     text: '门诊运营趋势',
-        // },
+        //         //     display: true,
+        //         //     text: '门诊运营趋势',
+        //         // },
         tooltips: {
             mode: 'label',
             callbacks: {
@@ -106,6 +106,7 @@ $.each(config.data.datasets, function (i, dataset) {
 $(function () {
     var ctx = $("#canvas").get(0).getContext("2d");
     window.myLine = new Chart(ctx, config);
+    init_daterangepicker();
 });
 
 $('#randomizeData').click(function () {

+ 1 - 4
src/main/resources/static/js/menu.js

@@ -45,6 +45,7 @@ $(function (){
     imgFun("/thmz/download-profile", "headImage,headImage1,headImage2,headImage3,headImage4,headImage5");
     //设置主页
     changeContent('/thmz/index');
+    //$("#home").click();
 });
 
 function loginOut() {
@@ -73,8 +74,6 @@ function editProfile() {
     NProgress.start();
     $("#profileimage").css("display","none");
     $("#content").load("/thmz/html/profile.html");
-    $.getScript('/thmz/js/validator.js');
-    $.getScript('/thmz/js/custom.js');
     $.getScript('/thmz/js/profile.js');
     $.getScript('/thmz/js/message.js');
     NProgress.done();
@@ -87,9 +86,7 @@ function editPassword() {
     NProgress.start();
     $("#profileimage").css("display","none");
     $("#content").load("/thmz/html/password.html");
-    $.getScript('/thmz/js/validator.js');
     $.getScript('/thmz/js/password.js');
-    $.getScript('/thmz/js/custom.js');
     NProgress.done();
 }
 

+ 5 - 0
src/main/resources/static/js/password.js

@@ -1,3 +1,4 @@
+//@ sourceURL=password.js
 $(function (){
 /**
  * 提交按钮点击事件
@@ -34,6 +35,10 @@ $("#send").on("click",function (t) {
 $("#cancel").on("click",function (t) {
     //profileInfo();
 });
+
+
+    //数据校验
+    init_validator();
 });
 
 

+ 2 - 0
src/main/resources/static/js/profile.js

@@ -61,6 +61,8 @@ $(function (){
     $("#cancel").on("click",function (t) {
         profileInfo();
     });
+    //数据校验
+    init_validator();
 });
 
 

+ 2 - 0
src/main/resources/static/js/unit_code.js

@@ -508,6 +508,8 @@ $(function () {
     oButtonInit.Init();
     //changeOrderByCause();
     initSelect();
+    //数据校验
+    init_validator();
     //在刷新按钮前添加新增按钮
     $("button[name='refresh']").before("<button class='btn btn-default' type='button' name='plus' aria-label='' title='新增'>" +
         "<i class='glyphicon glyphicon glyphicon-plus icon-plus'></i></button>");

+ 0 - 3
src/main/resources/templates/index.html

@@ -2,11 +2,8 @@
 <link rel="stylesheet" href="/thmz/css/bootstrap/css/daterangepicker.css"/>
 <link rel="stylesheet" href="/thmz/css/custom.min.css">
 <script src="/thmz/js/chart/Chart.bundle.js"></script>
-<!--<script src="/thmz/js/date.js"></script>-->
 <script src="/thmz/js/moment.min.js"></script>
 <script src="/thmz/js/daterangepicker.js"></script>
-<script src="/thmz/js/common/date-util.js"></script>
-<script src="/thmz/js/custom.js"></script>
 <script src="/thmz/js/index.js"></script>
 <style>
     canvas {

+ 2 - 10
src/main/resources/templates/menu.html

@@ -59,17 +59,9 @@
                     <div class="menu_section">
                         <h3>门诊业务</h3>
                         <ul class="nav side-menu">
-                            <li><a href="#" onclick="changeContent('/thmz/index')"><i class="fa fa-home"></i> 首页 <span class="fa fa-chevron-down"></span></a>
+                            <li><a href="#" onclick="changeContent('/thmz/index')" id="home"><i class="fa fa-home"></i> 首页 </a>
                             </li>
-                            <li><a><i class="fa fa-edit"></i> Forms <span class="fa fa-chevron-down"></span></a>
-                                <ul class="nav child_menu">
-                                    <li><a href="form.html">General Form</a></li>
-                                    <li><a href="form_advanced.html">Advanced Components</a></li>
-                                    <li><a href="form_validation.html">Form Validation</a></li>
-                                    <li><a href="form_wizards.html">Form Wizard</a></li>
-                                    <li><a href="form_upload.html">Form Upload</a></li>
-                                    <li><a href="form_buttons.html">Form Buttons</a></li>
-                                </ul>
+                            <li><a href="#" onclick="changeContent('/thmz/registration')"><i class="fa fa-edit"></i> 挂号 </a>
                             </li>
                             <li><a><i class="fa fa-desktop"></i> UI Elements <span
                                     class="fa fa-chevron-down"></span></a>

+ 4 - 0
src/main/resources/templates/registration.html

@@ -0,0 +1,4 @@
+<div class="row">
+    <div class="col-md-4 col-sm-4 col-xs-12"></div>
+    <div class="col-md-8 col-sm-8 col-xs-12"></div>
+</div>

+ 1 - 2
src/main/resources/templates/unit_code.html

@@ -1,8 +1,7 @@
 <link rel="stylesheet" href="/thmz/css/bootstrap/css/bootstrap-select.css"/>
 <script src="/thmz/js/bootstrap-select.js"></script>
-<script src="/thmz/js/unit_code.js"></script>
 <script src="/thmz/js/validator.js"></script>
-<script src="/thmz/js/custom.js"></script>
+<script src="/thmz/js/unit_code.js"></script>
 <div class="row">
     <div class="col-md-12 col-sm-12 col-xs-12">
         <div class="x_panel">