个人工作台bug修改

src/widgets/PersonWorkbench/Widget.ts

@@ -106,7 +106,7 @@ class PersonWorkbench extends BaseWidget {
         //显示展示的数据信息
         var pnDom=$("#header .projSel #projSelect option:selected");
         this.pnName=pnDom.text();
-        this.domObj.find('.projectInfo').html(this.pnName+'施工情况综合信息展示')
+        this.showBoardInfo()
         this.domObj.find(".projectScheduleInfo").val(this.pnName)
         //统计数据查询
         this.prjSelectValue = "projectName";//列表初始默认查询值
@@ -152,13 +152,12 @@ class PersonWorkbench extends BaseWidget {
         //Date picker
         this.domObj.find('#' + this.clearDateBtnID).off('click').on('click', function () {
             this.domObj.find('#' + this.pipespeed_dateID + ' span').html('<span>选择日期范围 <i class="fa fa-calendar"></i></span>')
-            let projectName=this.projectSelect?this.projectSelect:this.pnName;
-            this.domObj.find('.projectInfo').html(projectName+'施工情况综合信息展示')
             this.dateShow.startDate="";
             this.dateShow.endDate="";
             this.dateRange.startDate="";
             this.dateRange.endDate="";
             this.domObj.find('.unitNameInfo').val(null).trigger('change');
+            this.showBoardInfo()
             this.getStatistic();
             this.getBuildingProject();
             this.initDateRangePicker();
@@ -183,7 +182,17 @@ class PersonWorkbench extends BaseWidget {
             $(window).trigger('resize');//重新调整列表和图表的长宽
         })
     }
-    
+    //显示面板
+    showBoardInfo(){
+        let projectName=this.projectSelect?this.projectSelect:this.pnName;
+        let stime= this.dateShow.startDate;
+        let etime=this.dateShow.endDate;
+        if(!stime&&!etime){
+            this.domObj.find('.projectInfo').html(projectName+'施工情况综合信息展示')
+        }else{
+            this.domObj.find('.projectInfo').html(projectName+'施工情况综合信息展示:'+stime+'-'+etime)
+        }
+    }
     /**
      * 初始化日期控件 
      */
@@ -195,10 +204,10 @@ class PersonWorkbench extends BaseWidget {
                 '本月': [moment().startOf('month'), moment().endOf('month')],
                 '今年': [moment().startOf('year'), moment().endOf('year')]
             },
-            defaultDate: moment().subtract(6, 'days').format('YYYY/MM/DD') + " - " + moment().format('YYYY/MM/DD'),
+            // defaultDate: moment().subtract(6, 'days').format('YYYY/MM/DD') + " - " + moment().format('YYYY/MM/DD'),
             opens: "left",
-            startDate:  moment().subtract(6, 'days').format('YYYY/MM/DD'), //设置开始日期
-            endDate: moment().format('YYYY/MM/DD'), //设置结束器日期
+            startDate: moment().hours(0).minutes(0).seconds(0), //设置开始日期
+            endDate: moment(new Date()), //设置结束器日期
             maxDate: moment(new Date()), //设置最大日期
             showWeekNumbers: true,
             autoUpdateInput: false,
@@ -214,23 +223,19 @@ class PersonWorkbench extends BaseWidget {
                 firstDay: 1
             }
         },(start, end) => {
-                this.domObj.find('#' + this.pipespeed_dateID + ' span').html(start.format('YYYY/MM/DD') + ' - ' + end.format('YYYY/MM/DD'));
-                this.dateRange.startDate = start.format('YYYYMMDD');
-                this.dateRange.endDate = end.format('YYYYMMDD');
-                this.getStatistic();
-                this.getBuildingProject();
-                //显示展示的数据信息
-                let projectName=this.projectSelect?this.projectSelect:this.pnName;
-                this.domObj.find('.projectInfo').html(projectName+'施工情况综合信息展示:'+start.format('YYYY年MM月D日') + ' - ' + end.format('YYYY年MM月D日'))
-                this.dateShow.startDate=start.format('YYYY年MM月D日');
-                this.dateShow.endDate=start.format('YYYY年MM月D日');
+
             }
         ).on('apply.daterangepicker', function (ev, picker) {
-            this.domObj.find('#' + this.pipespeed_dateID).val(picker.startDate.format('YYYY/MM/DD') + ' - ' + picker.endDate.format('YYYY/MM/DD'));
+            this.domObj.find('#' + this.pipespeed_dateID + ' span').html(picker.startDate.format('YYYY/MM/DD') + ' - ' +  picker.endDate.format('YYYY/MM/DD'));
+            //查询信息
             this.dateRange.startDate = picker.startDate.format('YYYYMMDD');
             this.dateRange.endDate = picker.endDate.format('YYYYMMDD');
+            this.getStatistic();
+            this.getBuildingProject();
+            //显示信息
             this.dateShow.startDate=picker.startDate.format('YYYY年MM月D日');
             this.dateShow.endDate=picker.endDate.format('YYYY年MM月D日');
+            this.showBoardInfo()
         }.bind(this));
     }
     /**
@@ -348,14 +353,15 @@ class PersonWorkbench extends BaseWidget {
             },
             callback: {
                 onClick: function (event, treeId, treeNode) {
-                    var index = treeNode.name.indexOf("\_");
-                    treeNode.name = treeNode.name.substring(0, index);//截取字符串，去掉编码保留工程名称
-                    that.domObj.find(".projectScheduleInfo").val(treeNode.name)
-                    that.projectSelect=treeNode.name;
+                    let index = treeNode.name.indexOf("\_");
+                    let name = treeNode.name.substring(0, index);//截取字符串，去掉编码保留工程名称
+                    that.domObj.find(".projectScheduleInfo").val(name)
+                    that.projectSelect=name;
                     that.valuePid=treeNode.level;
-                    that.domObj.find('.projectInfo').html(that.projectSelect+'施工情况综合信息展示')
+                    that.showBoardInfo()
                     that.getStatistic();
                     that.getBuildingProject();
+                    that.resetTree()
                 },
                 onExpand: (event, treeId, treeNode) => {
                 }
@@ -367,10 +373,7 @@ class PersonWorkbench extends BaseWidget {
             this.ztree = $.fn.zTree.init($("#pbsTreeId"), setting, zNodes);
         }.bind(this));
         this.domObj.find("#resetBtn").off("click").on("click", () => {
-            this.domObj.find("#pbsSearchInput").val("");
-            $.fn.zTree.init($("#pbsTreeId"), this.setting, this.treeNodes);
-            $(".pbsProject").css("display", "none");
-            this.dropInfo=0;
+            this.resetTree()
         });
         this.domObj.find("#" + this.pbsSearchInputID).keyup(function (e) {
             if (e.keyCode === 13) {
@@ -378,6 +381,12 @@ class PersonWorkbench extends BaseWidget {
             }
         }.bind(this));
     }
+    resetTree(){
+        this.domObj.find("#pbsSearchInput").val("");
+        $.fn.zTree.init($("#pbsTreeId"), this.setting, this.treeNodes);
+        $(".pbsProject").css("display", "none");
+        this.dropInfo=0;
+    }
     /**
      * 
      * 查询条件操作