From 30af971b3beedc51ec80a173ed83bf04393db42d Mon Sep 17 00:00:00 2001
From: wangzhibo <wangzhibo@shsening.com>
Date: 星期四, 16 九月 2021 12:11:51 +0800
Subject: [PATCH] change data picker
---
js/function.js | 10 ++
widgetsTS/dataTime/widget.js | 115 ++++++++++++++++++++++-
widgetsTS/dataTime/view.html | 167 ++++-----------------------------
3 files changed, 141 insertions(+), 151 deletions(-)
diff --git a/js/function.js b/js/function.js
index e7bac0b..d6600b0 100644
--- a/js/function.js
+++ b/js/function.js
@@ -243,7 +243,17 @@
}
+function reLoadLayers(){
+ console.log(mars3d.globel_variables.queryDataTStart);
+ console.log(mars3d.globel_variables.queryDataType);
+ console.log('starting to reload layer .');
+}
+function refreshWidgets(){
+ console.log(mars3d.globel_variables.queryDataTStart);
+ console.log(mars3d.globel_variables.queryDataType);
+ console.log('starting to reload widget if widget has been opened.');
+}
diff --git a/widgetsTS/dataTime/view.html b/widgetsTS/dataTime/view.html
index 822034c..cfeedce 100644
--- a/widgetsTS/dataTime/view.html
+++ b/widgetsTS/dataTime/view.html
@@ -1,149 +1,24 @@
-
-
-<div class="input-group input-group-lg append_test" >
- <span style="width: 50px;" class="fa fa-globe input-group-addon dropdown-toggle" data-toggle="dropdown" ><span> </span><span id="current">灏忔椂锛�</span></span>
- <input type='text' class="form-control date" id='appDate' name="appDate"/>
- <ul class="dropdown-menu">
-
- <div class="layui-form">
- <div class="layui-form-item">
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input type="radio" name="datatype" value="hour" title="灏忔椂鏁版嵁" checked>
- <input type="text" class="layui-input" id="datatype_hour" placeholder="yyyy-MM-dd HH">
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input type="radio" name="datatype" value="day" title="澶╂暟鎹�" >
- <input type="text" class="layui-input" id="datatype_day" placeholder="yyyy-MM-dd">
- </div>
- </div>
+<div class="input-group input-group-lg append_test">
+ <span style="width: 50px;" class="fa fa-globe input-group-addon dropdown-toggle"
+ data-toggle="dropdown"><span> </span><span id="current">灏忔椂锛�</span></span>
+ <input type='text' class="form-control date" id='appDate' name="appDate" style="display:none"/>
+ <input type='text' class="form-control date" id='appDateHour' name="appDateHour" />
+ <ul class="dropdown-menu">
+ <div class="layui-form">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input type="radio" name="datatype" value="hour" title="灏忔椂鏁版嵁" checked>
+ <input type="text" class="layui-input" id="datatype_hour" placeholder="yyyy-mm-dd hh">
</div>
</div>
-
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input type="radio" name="datatype" value="day" title="澶╂暟鎹�">
+ <input type="text" class="layui-input" id="datatype_day" placeholder="yyyy-mm-dd">
+ </div>
+ </div>
+ </div>
+ </div>
</ul>
-</div>
-
-
-
-<!-- <div class="btn-group append_test">
-
- <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
-
- <!-- <span class="fa fa-globe" id="current"> 灏忔椂锛� -->
- <input type='button' class="form-control" id='' name="" value="" />
-
- </button>
- <button type="button" class="btn btn-primary">
- <!-- <input type="text" class="layui-input" id="appDate" placeholder="yyyy-MM-dd"> -->
- <!-- <input type='text' class="form-control date" id='appDate' name="appDate"/> -->
- </button>
-
-
-</div> -->
-
-<script>
- $(document).ready(function() {
- initDayHour();
-
-
- //console.log("i am jquery");
- //var currentHour = getDefaultDateTime();
- //$('#currentHour').text(currentHour);
-
-
- $('input[type=radio][name=datatype]').change(function() {
- if (this.value == 'hour') {
- //alert("Allot Thai Gayo Bhai");
- $('#current').text("灏忔椂锛�");
- initDayHour();
- }
- else if (this.value == 'day') {
- //alert("Transfer Thai Gayo");
- $('#current').text("澶╋細");
- initDay();
- }
- reloadTop10();
- });
-
-
-
-
-
- })
-
- function initDayHour(){
- try {
- $("#appDate").datetimepicker('remove');
- } catch (error) {
-
- }
-
- $("#appDate").datetimepicker({
- bootcssVer:3, //bootstrap-datetimepicker锛媌ootstrap v3锛屼絾杩欎釜鎻掍欢浣跨敤鐨勬椂鍊欙紝骞舵病鏈夊拰V3鐩稿尮閰嶏紝浠嶇劧璋冪敤鐨勬槸bootstrap V2鐨勫浘鏍� 鎶奲ootcssVer鐨勫�肩洿鎺ヨ涓�3锛屽惁鍒檇atetimepicker涓嶄細鏄剧ず鍑轰笂銆佷笅涓湀鐨勭澶�
- format: 'yyyy-mm-dd HH:00:00',
- minView: 'day',//璁剧疆鏃堕棿閫夋嫨涓哄勾鏈堟棩 鍘绘帀鏃跺垎绉掗�夋嫨
- todayBtn: true, //濡傛灉姝ゅ�间负true 鎴� "linked"锛屽垯鍦ㄦ棩鏈熸椂闂撮�夋嫨鍣ㄧ粍浠剁殑搴曢儴鏄剧ず涓�涓� "Today" 鎸夐挳鐢ㄤ互閫夋嫨褰撳墠鏃ユ湡銆傚鏋滄槸true鐨勮瘽锛�"Today" 鎸夐挳浠呬粎灏嗚鍥捐浆鍒板綋澶╃殑鏃ユ湡锛屽鏋滄槸"linked"锛屽綋澶╂棩鏈熷皢浼氳閫変腑銆�
- clearBtn:true,
- language: 'zh-CN',
- autoclose: true, //褰撻�夋嫨涓�涓棩鏈熶箣鍚庢槸鍚︾珛鍗冲叧闂鏃ユ湡鏃堕棿閫夋嫨鍣ㄣ��
- keyboardNavigation: true, //鏄惁鍏佽閫氳繃鏂瑰悜閿敼鍙樻棩鏈熴��
- forceParse: true, //褰撻�夋嫨鍣ㄥ叧闂殑鏃跺�欙紝鏄惁寮哄埗瑙ｆ瀽杈撳叆妗嗕腑鐨勫�笺��
- initialDate:new Date(),
- todayHighlight: 1 //濡傛灉涓簍rue, 楂樹寒褰撳墠鏃ユ湡
- }).on("changeDate", function () {
- //瑷疆鍙�夌殑鏈�鍚庢棩鏈熺偤鐣跺墠鏃ユ湡
- //$("#start_time").datetimepicker("setEndDate", getToday())
- reloadTop10();
- });
-
- $("#appDate").datetimepicker("setDate", new Date());
- }
-
- function initDay(){
- try {
- $("#appDate").datetimepicker('remove');
- } catch (error) {
-
- }
- $("#appDate").datetimepicker({
- bootcssVer:3, //bootstrap-datetimepicker锛媌ootstrap v3锛屼絾杩欎釜鎻掍欢浣跨敤鐨勬椂鍊欙紝骞舵病鏈夊拰V3鐩稿尮閰嶏紝浠嶇劧璋冪敤鐨勬槸bootstrap V2鐨勫浘鏍� 鎶奲ootcssVer鐨勫�肩洿鎺ヨ涓�3锛屽惁鍒檇atetimepicker涓嶄細鏄剧ず鍑轰笂銆佷笅涓湀鐨勭澶�
- format: 'yyyy-mm-dd',
- minView: 'month',//璁剧疆鏃堕棿閫夋嫨涓哄勾鏈堟棩 鍘绘帀鏃跺垎绉掗�夋嫨
- todayBtn: true, //濡傛灉姝ゅ�间负true 鎴� "linked"锛屽垯鍦ㄦ棩鏈熸椂闂撮�夋嫨鍣ㄧ粍浠剁殑搴曢儴鏄剧ず涓�涓� "Today" 鎸夐挳鐢ㄤ互閫夋嫨褰撳墠鏃ユ湡銆傚鏋滄槸true鐨勮瘽锛�"Today" 鎸夐挳浠呬粎灏嗚鍥捐浆鍒板綋澶╃殑鏃ユ湡锛屽鏋滄槸"linked"锛屽綋澶╂棩鏈熷皢浼氳閫変腑銆�
- clearBtn:true,
- language: 'zh-CN',
- autoclose: true, //褰撻�夋嫨涓�涓棩鏈熶箣鍚庢槸鍚︾珛鍗冲叧闂鏃ユ湡鏃堕棿閫夋嫨鍣ㄣ��
- keyboardNavigation: true, //鏄惁鍏佽閫氳繃鏂瑰悜閿敼鍙樻棩鏈熴��
- forceParse: true, //褰撻�夋嫨鍣ㄥ叧闂殑鏃跺�欙紝鏄惁寮哄埗瑙ｆ瀽杈撳叆妗嗕腑鐨勫�笺��
- initialDate:new Date(),
- todayHighlight: 1 //濡傛灉涓簍rue, 楂樹寒褰撳墠鏃ユ湡
- }).on("changeDate", function () {
- //瑷疆鍙�夌殑鏈�鍚庢棩鏈熺偤鐣跺墠鏃ユ湡
- //$("#start_time").datetimepicker("setEndDate", getToday())
- reloadTop10();
- });
-
- $("#appDate").datetimepicker("setDate", new Date());
-
- }
-
- function applyDateType(){
- var dateType = $('input[type=radio][name=datatype]').val();
- return dateType;
- }
-
- function reloadTop10(){
- var leftAndRight = mars3d.widget.getClass("widgetsTS/widget_Overall/widget.js");
- if(leftAndRight){
- if(leftAndRight.viewWindowLeft){
- leftAndRight.viewWindowLeft.loadTop10();
- }
- }
- }
-
- function getAppDateTime(){
- return $('#appDate').val();
- }
-</script>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/widgetsTS/dataTime/widget.js b/widgetsTS/dataTime/widget.js
index b62bfd6..47b0dbb 100644
--- a/widgetsTS/dataTime/widget.js
+++ b/widgetsTS/dataTime/widget.js
@@ -1,5 +1,30 @@
-'use script' //寮�鍙戠幆澧冨缓璁紑鍚弗鏍兼ā寮�
-;(function (window, mars3d) {
+'use script'; //寮�鍙戠幆澧冨缓璁紑鍚弗鏍兼ā寮�
+
+function getDefaultDateTime() {
+ var date = new Date;
+ date.setHours(date.getHours() - 2);
+ var year = date.getFullYear();//骞�
+ var month = date.getMonth();//鏈�
+ var day = date.getDate();//鏃�
+ var hours = date.getHours();//鏃�
+ return year + "-" +
+ ((month + 1) > 9 ? (month + 1) : "0" + (month + 1)) + "-" +
+ (day > 9 ? day : ("0" + day)) + " " +
+ (hours > 9 ? hours : ("0" + hours)) + ":00:00";
+}
+function getDefaultDate() {
+ var date = new Date;
+ date.setDate(date.getDate() - 1);
+ var year = date.getFullYear();//骞�
+ var month = date.getMonth();//鏈�
+ var day = date.getDate();//鏃�
+ var hours = date.getHours();//鏃�
+ return year + "-" +
+ ((month + 1) > 9 ? (month + 1) : "0" + (month + 1)) + "-" +
+ (day > 9 ? day : ("0" + day)) + " 00:00:00";
+}
+
+(function (window, mars3d) {
//鍒涘缓widget绫伙紝闇�瑕佺户鎵緽aseWidget
class MyWidget extends mars3d.widget.BaseWidget {
//澶栭儴璧勬簮閰嶇疆
@@ -11,22 +36,102 @@
return {
type: 'append',
url: 'view.html',
+ parent: "#centerDiv"
}
}
//鍒濆鍖朳浠呮墽琛�1娆
- create() {}
+ create() {
+ this.defaultDate = getDefaultDate();
+ this.defaultDateTime = getDefaultDateTime();
+ // 鍒濆鍖� 鍙傛暟
+ let request = haoutil.system.getRequest();
+ if (window.top) {
+ request = $.extend(request, haoutil.system.getRequest(window.top));
+ }
+ mars3d.globel_variables = { userid: request.userid || 2, queryDataType: 'hour' };
+ mars3d.globel_variables.queryDataTStart = this.defaultDateTime;
+ mars3d.globel_variables.queryDataTEnd = this.defaultDateTime;
+ }
+
+
+
//姣忎釜绐楀彛鍒涘缓瀹屾垚鍚庤皟鐢�
winCreateOK(opt, result) {
//姝ゅ鍙互缁戝畾椤甸潰dom浜嬩欢
+ $('input[type=radio][name=datatype]').change(function () {
+ let value = $("input[type=radio][name=datatype]:checked").val()
+ if (value == 'hour') {
+ $('#current').text("灏忔椂锛�");
+ $('#appDate').hide()
+ $('#appDateHour').show()
+ }
+ else if (value == 'day') {
+ $('#current').text("澶╋細");
+ $('#appDate').show()
+ $('#appDateHour').hide()
+ }
+ mars3d.globel_variables.queryDataType = value;
+ });
+
+ $("#appDate").datetimepicker({
+ bootcssVer: 3, //bootstrap-datetimepicker锛媌ootstrap v3锛屼絾杩欎釜鎻掍欢浣跨敤鐨勬椂鍊欙紝骞舵病鏈夊拰V3鐩稿尮閰嶏紝浠嶇劧璋冪敤鐨勬槸bootstrap V2鐨勫浘鏍� 鎶奲ootcssVer鐨勫�肩洿鎺ヨ涓�3锛屽惁鍒檇atetimepicker涓嶄細鏄剧ず鍑轰笂銆佷笅涓湀鐨勭澶�
+ format: 'yyyy-mm-dd',
+ minView: 'month',//璁剧疆鏃堕棿閫夋嫨涓哄勾鏈堟棩 鍘绘帀鏃跺垎绉掗�夋嫨
+ todayBtn: true, //濡傛灉姝ゅ�间负true 鎴� "linked"锛屽垯鍦ㄦ棩鏈熸椂闂撮�夋嫨鍣ㄧ粍浠剁殑搴曢儴鏄剧ず涓�涓� "Today" 鎸夐挳鐢ㄤ互閫夋嫨褰撳墠鏃ユ湡銆傚鏋滄槸true鐨勮瘽锛�"Today" 鎸夐挳浠呬粎灏嗚鍥捐浆鍒板綋澶╃殑鏃ユ湡锛屽鏋滄槸"linked"锛屽綋澶╂棩鏈熷皢浼氳閫変腑銆�
+ clearBtn: true,
+ language: 'zh-CN',
+ autoclose: true, //褰撻�夋嫨涓�涓棩鏈熶箣鍚庢槸鍚︾珛鍗冲叧闂鏃ユ湡鏃堕棿閫夋嫨鍣ㄣ��
+ keyboardNavigation: true, //鏄惁鍏佽閫氳繃鏂瑰悜閿敼鍙樻棩鏈熴��
+ forceParse: true, //褰撻�夋嫨鍣ㄥ叧闂殑鏃跺�欙紝鏄惁寮哄埗瑙ｆ瀽杈撳叆妗嗕腑鐨勫�笺��
+ initialDate: new Date(),
+ todayHighlight: 1 //濡傛灉涓簍rue, 楂樹寒褰撳墠鏃ユ湡
+ }).on("changeDate", function () {
+
+ mars3d.globel_variables.queryDataTStart = $('#appDate').val() + " 00:00:00";
+ console.log(mars3d.globel_variables.queryDataTStart);
+
+ // 鍦� function.js 涓畾涔夌殑 function
+ reLoadLayers();
+ refreshWidgets();
+
+ });
+ $("#appDate").datetimepicker("setDate", new Date(this.defaultDate));
+ $("#appDate").datetimepicker("setEndDate", new Date(this.defaultDate));
+
+ $("#appDateHour").datetimepicker({
+ bootcssVer: 3, //bootstrap-datetimepicker锛媌ootstrap v3锛屼絾杩欎釜鎻掍欢浣跨敤鐨勬椂鍊欙紝骞舵病鏈夊拰V3鐩稿尮閰嶏紝浠嶇劧璋冪敤鐨勬槸bootstrap V2鐨勫浘鏍� 鎶奲ootcssVer鐨勫�肩洿鎺ヨ涓�3锛屽惁鍒檇atetimepicker涓嶄細鏄剧ず鍑轰笂銆佷笅涓湀鐨勭澶�
+ format: 'yyyy-mm-dd hh:00:00',
+ minView: 'day',//璁剧疆鏃堕棿閫夋嫨涓哄勾鏈堟棩 鍘绘帀鏃跺垎绉掗�夋嫨
+ todayBtn: true, //濡傛灉姝ゅ�间负true 鎴� "linked"锛屽垯鍦ㄦ棩鏈熸椂闂撮�夋嫨鍣ㄧ粍浠剁殑搴曢儴鏄剧ず涓�涓� "Today" 鎸夐挳鐢ㄤ互閫夋嫨褰撳墠鏃ユ湡銆傚鏋滄槸true鐨勮瘽锛�"Today" 鎸夐挳浠呬粎灏嗚鍥捐浆鍒板綋澶╃殑鏃ユ湡锛屽鏋滄槸"linked"锛屽綋澶╂棩鏈熷皢浼氳閫変腑銆�
+ clearBtn: true,
+ language: 'zh-CN',
+ autoclose: true, //褰撻�夋嫨涓�涓棩鏈熶箣鍚庢槸鍚︾珛鍗冲叧闂鏃ユ湡鏃堕棿閫夋嫨鍣ㄣ��
+ keyboardNavigation: true, //鏄惁鍏佽閫氳繃鏂瑰悜閿敼鍙樻棩鏈熴��
+ forceParse: true, //褰撻�夋嫨鍣ㄥ叧闂殑鏃跺�欙紝鏄惁寮哄埗瑙ｆ瀽杈撳叆妗嗕腑鐨勫�笺��
+ initialDate: new Date(),
+ todayHighlight: 1 //濡傛灉涓簍rue, 楂樹寒褰撳墠鏃ユ湡
+ }).on("changeDate", function () {
+
+ mars3d.globel_variables.queryDataTStart = $('#appDateHour').val();
+ console.log(mars3d.globel_variables.queryDataTStart);
+ // 鍦� function.js 涓畾涔夌殑 function
+ reLoadLayers();
+ refreshWidgets();
+ });
+ $("#appDateHour").datetimepicker("setDate", new Date(this.defaultDateTime));
+ $('#appDateHour').datetimepicker('setEndDate', new Date(this.defaultDateTime));
+
}
+
//婵�娲绘彃浠�
activate() {
- toastr.info('婵�娲绘彃浠禵example_append')
+
}
+
//閲婃斁鎻掍欢
disable() {
- toastr.info('閲婃斁鎻掍欢_example_append')
+ //toastr.info('閲婃斁鎻掍欢_example_append')
}
}
--
Gitblit v1.9.1