From 8a6a1f340e249ca4e253f52a99a46ef44e7f0f00 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 21 Feb 2023 15:39:33 +0800
Subject: [PATCH] 洪水淹没-样式修改,删除tip;选择河段时弹框关闭

---
 themes/FoldableTheme/widgets/HeaderController/Widget.js |   65 ++++----------------------------
 1 files changed, 8 insertions(+), 57 deletions(-)

diff --git a/themes/FoldableTheme/widgets/HeaderController/Widget.js b/themes/FoldableTheme/widgets/HeaderController/Widget.js
index cc798dd..23b8cf3 100644
--- a/themes/FoldableTheme/widgets/HeaderController/Widget.js
+++ b/themes/FoldableTheme/widgets/HeaderController/Widget.js
@@ -47,7 +47,6 @@
 			flag: false,
 			flags: false,
 			megflag: false,
-			floodAnalysisFlag:false,
 
 			postCreate: function () {
 				this.inherited(arguments);
@@ -98,7 +97,12 @@
 				this.resize();
 				setTimeout(lang.hitch(this, this.resize), 100);
 				//根据部件名称启动部件
-				topic.subscribe('runWidgetByName', lang.hitch(this, this._runWidgetByName));
+				var reg = new RegExp("(^|&)"+ 'path' +"=([^&]*)(&|$)"); //构造一个含有目标参数的正则表达式对象
+				var r = window.location.search.substr(1).match(reg);  //匹配目标参数
+				if (r!=null) //如果有参数跳转洪水淹没分析部件
+					topic.subscribe('runWidgetByName', lang.hitch(this, this._runWidgetByName('FloodAnalysis')));
+				else
+					topic.subscribe('runWidgetByName', lang.hitch(this, this._runWidgetByName('ComprehensiveSupervise')));
 			},
 			_runWidgetByName: function (name) {
 				for (i = 0; i < this.appConfig.widgetPool.widgets.length; i++) {
@@ -737,7 +741,7 @@
 				} else {
 					iconUrl = iconConfig.icon;
 				}
-				if (iconConfig.name == "AnalysisOfBarrierLake" || iconConfig.name == 'ThematicDynamicRiver' || iconConfig.name == "MapSection" || iconConfig.name == "FloodAnalysis") {
+				if (iconConfig.name == "AnalysisOfBarrierLake" || iconConfig.name == 'ThematicDynamicRiver' || iconConfig.name == "MapSection") {
 					node = null;
 					return;
 				} else {
@@ -760,7 +764,7 @@
 							'position': "absolute",
 							'top': "45px",
 							'left': "0px",
-							'height': '180px',
+							'height': '90px',
 							'width': '126px',
 							'background': 'rgb(0,23,54)',
 							'z-index': '50'
@@ -815,7 +819,6 @@
 										}
 										that.flag = true;
 										that.megflag = true;
-										that.floodAnalysisFlag = true;
 									}
 								})
 								firstNode.config = iconNode[i];
@@ -866,7 +869,6 @@
 										}
 										that.flags = true;
 										that.megflag = true;
-										that.floodAnalysisFlag = true
 									}
 								})
 								middleNode.config = iconNode[i];
@@ -917,7 +919,6 @@
 										}
 										that.flag = true;
 										that.flags = true;
-										that.floodAnalysisFlag = true;
 									}
 								})
 								lastNode.config = iconNode[i];
@@ -927,56 +928,6 @@
 								}
 							}
 
-							if (iconNode[i].name == 'FloodAnalysis'){
-								finalNode = html.create('li', {
-									'class': 'icon-node jimu-float-trailing openli',
-									title: iconNode[i].label,
-									settingId: iconNode[i].id,
-									'data-widget-name': iconNode[i].name,
-									innerHTML: iconNode[i].label
-								}, optionLi[0]);
-								var self = this;
-								$(node).on('click', finalNode, function (event) {
-									if (event.target.innerText == "洪水淹没分析") {
-										$(event.target).parent().parent().stop().hide();
-										if (!finalNode.config.widgets || finalNode.config.widgets.length === 1 ||
-											finalNode.config.openType === 'openAll') {
-											//widget or group with 'openAll' open type
-											if (!that.floodAnalysisFlag) {
-												$(event.target).parent().parent().siblings().toggleClass('click-icon-node');
-											}
-											if (self.openedId && self.openedId === finalNode.config.id) {
-												self._switchNodeToClose(self.openedId);
-												return;
-											} else {
-												if (self.openedId) {
-													self._switchNodeToClose(self.openedId).then(lang.hitch(self, function () {
-														self._closeDropMenu();
-														self._switchNodeToOpen(finalNode.config.id);
-													}));
-												} else {
-													self._switchNodeToOpen(finalNode.config.id);
-												}
-											}
-										} else {
-											if (self.dropMenuNode) {
-												self._closeDropMenu();
-
-											} else {
-												self._openDropMenu(finalNode);
-											}
-										}
-										that.flag = true;
-										that.flags = true;
-										that.megflag = true;
-									}
-								})
-								finalNode.config = iconNode[i];
-								if (finalNode.config.widgets && finalNode.config.widgets.length > 1 &&
-									finalNode.config.openType === 'dropDown') {
-									this._createDropTriangle(finalNode);
-								}
-							}
 
 						}
 						$(node).mouseover(function () {

--
Gitblit v1.9.3