Merge remote-tracking branch 'origin/2.0' into 2.0

luodangjia

2024-07-22 eeebf2d723433f916ba9c33cce92431165dd64c7

 ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/platform/watter.html

@@ -59,14 +59,21 @@
                    <div class="col-sm-12">
                        <div class="row">
                            <div class="col-sm-3">
                                <#SelectCon id="time" name="时间" >
                                <option value="">今日</option>
                                <option value="1">今日</option>
                                <option value="2">本周</option>
                                <option value="3">本月</option>
                                <option value="4">全年</option>
                            </#SelectCon>
                        </div>
                                <div class="input-group">
                                    <div class="input-group-btn open">
                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button" aria-expanded="true">
                                            时间
                                        </button>
                                    </div>
                                    <select class="form-control" id="time" onchange="tradeYse()">
                                        <option value="1">今日</option>
                                        <option value="2">本周</option>
                                        <option value="3">本月</option>
                                        <option value="4">全年</option>
                                        <option value="5">全部</option>
                                    </select>
                                </div>
                            </div>
                            <div class="col-sm-3">
                                <#TimeCon id="insertTime" name="时间" isTime="false"/>
                            </div>
@@ -143,5 +150,16 @@
        elem: '#insertTime'
        ,range: true
    });
    function tradeYse() {
        var time =document.getElementById("insertTime");

        if ("5" == $("#time").val()){
            time.value="";
            time.disabled = true;
        }else{
            time.value="";
            time.disabled = false;
        }
    }
</script>
@}