Merge branch '20210406-maqv2' into 20210412-youhua

linzhijie

2021-04-12 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd

 src/main/resources/static/ots/js/common.js

@@ -26,9 +26,22 @@
   // laydate 时间控件绑定
   if ($(".select-time").length > 0) {
      layui.use('laydate', function() {
          var lobj = {"zh_CN":"cn","en_US":"en"}

          var lang = "en_US";
            var query = top.window.location.search.substring(1);
            var vars = query.split("&");
            for (var i=0;i<vars.length;i++) {
                var pair = vars[i].split("=");
                if(pair[0] == 'lang'){
                    lang = pair[1];
                }
            }

          var laydate = layui.laydate;
          var startDate = laydate.render({
              elem: '#startTime',
                lang: lobj[lang],
              max: $('#endTime').val(),
              theme: 'molv',
              trigger: 'click',
@@ -47,6 +60,7 @@
          });
          var endDate = laydate.render({
              elem: '#endTime',
                lang: lobj[lang],
              min: $('#startTime').val(),
              theme: 'molv',
              trigger: 'click',