From c6890ef64bdac46759ebba6c37f94dd0f8d4ed90 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 02 Jul 2021 09:07:33 +0800
Subject: [PATCH] 部分样式更改,部分逻辑修改完善,飞行路线得添加等

---
 widgets/LeftNavigationBar/Widget.js |  153 ++++++++++++++++++++-------------------------------
 1 files changed, 60 insertions(+), 93 deletions(-)

diff --git a/widgets/LeftNavigationBar/Widget.js b/widgets/LeftNavigationBar/Widget.js
index 3f27068..86a55ff 100644
--- a/widgets/LeftNavigationBar/Widget.js
+++ b/widgets/LeftNavigationBar/Widget.js
@@ -3,16 +3,16 @@
 // 模块描述:显示坐标
 ///////////////////////////////////////////////////////////////////////////
 define([
-    'dojo/_base/declare',
-    'dojo/_base/lang',
-    'dojo/_base/array',
-    'dojo/_base/html',
-    'dojo/topic',
-    'jimu/BaseWidget',
-    'jimu/utils',
-    'jimu/css!libs/zTree_v3/css/zTreeStyle/zTreeStyle.css',
-    'libs/zTree_v3/js/jquery.ztree.all'
-],
+        'dojo/_base/declare',
+        'dojo/_base/lang',
+        'dojo/_base/array',
+        'dojo/_base/html',
+        'dojo/topic',
+        'jimu/BaseWidget',
+        'jimu/utils',
+        'jimu/css!libs/zTree_v3/css/zTreeStyle/zTreeStyle.css',
+        'libs/zTree_v3/js/jquery.ztree.all'
+    ],
     function (declare,
         lang,
         array,
@@ -33,7 +33,7 @@
                 // this.begin(this.data);
                 var that = this;
                 this.getData();
-
+                topic.subscribe("closeNavigation", lang.hitch(this, this.closeNavigation));
                 // $('.left-navigation-bar-but').click(() => {
                 //     this.changeImg = !this.changeImg;
                 //     if (this.changeImg) {
@@ -54,84 +54,39 @@
                 //         });
                 //     }
                 // })
-                var time = null;
-                $('.left-navigation-bar-but').click(() => {
-                    this.changeImg = !this.changeImg;
-                    if (this.changeImg) {
-                        if (time != null) {
-                            clearTimeout(time);
-                            time = null;
-                        }
-                        // $('.l-n-b-b-img').attr("src", "./images/addL/xzuo.png"); //打开
-                        $('.left-navigation-bar-main').css({
-                            'display': 'block',
+                $('.left-navigation-bar-but>div').click(() => {
+                    topic.publish('closeTool', this.name);
+                    topic.publish('closeMap', this.name);
+                    $(".jimu-widget-Layermanagement .layer-list").stop().hide();
+
+                    if ($(".jimu-widget-Layermanagement .layer-list").is(":hidden")) {
+                        $(".jimu-widget-Layermanagement .tree-layer-opcity").stop().hide();
+                    }
+
+                    if ($('.left-navigation-bar-main').is(":hidden")) {
+                        $('.left-navigation-bar-main').stop().css({
                             'width': '300px',
                             'padding': '10px',
-                            'height': 'auto',
-                        });
-                        $('.l-n-b-m-search').css({
-                            'display': 'flex',
-                        })
-                        $('#left-tree-list').css({
-                            'display': 'block',
-                        })
+                            'height': 'auto'
+                        }).show();
 
+                        
                     } else {
-                        // $('.l-n-b-b-img').attr("src", "./images/addL/xyou.png"); //关闭
-                        $('.l-n-b-m-search').css({
-                            'display': 'none',
-                        })
-                        $('#left-tree-list').css({
-                            'display': 'none',
-                        })
-                        $('.left-navigation-bar-main').css({
+                        $('.left-navigation-bar-main').stop().css({
                             'width': '0px',
                             'padding': '0px',
                             'height': '0px',
-                        });
-                        if (time != null) {
-                            clearTimeout(time);
-                            time = null;
-                        }
-                        time = setTimeout(() => {
-                            $('.left-navigation-bar-main').css({
-                                'display': 'none'
-                            });
-                            clearTimeout(time);
-                            time = null;
-                        }, 500);
+                        }).hide();
                     }
+
                 })
                 $('#l-n-b-m-search-closeOUR').click(() => {
-                    this.changeImg = !this.changeImg;
-                    if (!this.changeImg) {
-                        if (time != null) {
-                            clearTimeout(time);
-                            time = null;
-                        }
-                        $('.l-n-b-m-search').css({
-                            'display': 'none',
-                        })
-                        $('#left-tree-list').css({
-                            'display': 'none',
-                        })
-                        $('.left-navigation-bar-main').css({
-                            'width': '0px',
-                            'padding': '0px',
-                            'height': '0px',
-                        });
-                        if (time != null) {
-                            clearTimeout(time);
-                            time = null;
-                        }
-                        time = setTimeout(() => {
-                            $('.left-navigation-bar-main').css({
-                                'display': 'none'
-                            });
-                            clearTimeout(time);
-                            time = null;
-                        }, 500);
-                    }
+
+                    $('.left-navigation-bar-main').stop().css({
+                        'width': '0px',
+                        'padding': '0px',
+                        'height': '0px',
+                    }).hide();
                 })
 
 
@@ -181,13 +136,13 @@
                     var val = $('#left-navigation-bar-main-input').val();
                     if (val != '') {
                         var clearOur = () => {
-                            let dom = $(`[data-id]`);
-                            dom.removeClass('layui-tree-spread');
-                            let domDiv = dom.find('.layui-tree-pack');
-                            domDiv.css({
-                                'display': 'none'
-                            })
-                        },
+                                let dom = $(`[data-id]`);
+                                dom.removeClass('layui-tree-spread');
+                                let domDiv = dom.find('.layui-tree-pack');
+                                domDiv.css({
+                                    'display': 'none'
+                                })
+                            },
                             a, useit = (d) => {
                                 for (var k in d) {
                                     if (d[k].who == 'father') {
@@ -238,7 +193,19 @@
                 }
             },
 
-            closeToolBox: function (item) { },
+            closeNavigation: function (item) {
+                if (item != this.name) {
+
+                    if (!$('.left-navigation-bar-main').is(":hidden")) {
+                        $('.left-navigation-bar-main').stop().css({
+                            'width': '0px',
+                            'padding': '0px',
+                            'height': '0px',
+                        }).hide();
+                    }
+
+                }
+            },
 
             onOpen: function () {
                 //面板打开的时候触发 (when open this panel trigger)
@@ -410,7 +377,7 @@
             },
             begin: function (data) {
                 var that = this;
-                window.mySanweiShujuOpens = {};//全局scene.open资源
+                window.mySanweiShujuOpens = {}; //全局scene.open资源
                 var a = null;
 
                 layui.use(function () {
@@ -422,7 +389,7 @@
 
                     tree.render({
                         elem: '#left-tree-list' //默认是点击节点可进行收缩
-                        ,
+                            ,
                         data: data,
                         id: 'demoId1',
                         showCheckbox: true, //是否显示复选框
@@ -786,15 +753,15 @@
                 title: '采集站点',
                 id: 1,
                 field: '1'
-                // , checked: true
-                ,
+                    // , checked: true
+                    ,
                 spread: true,
                 children: [{
                     title: '南矶山保护区',
                     id: 11,
                     field: '1-1'
-                    // , checked: true
-                    ,
+                        // , checked: true
+                        ,
                     spread: true,
                     children: [{
                         title: '北深渊',

--
Gitblit v1.9.3