diff --git a/src/assets/css/skincolor.scss b/src/assets/css/skincolor.scss index 7140c70..776f697 100644 --- a/src/assets/css/skincolor.scss +++ b/src/assets/css/skincolor.scss @@ -142,6 +142,9 @@ #UserName { float: right; margin-right: 10px; + cursor: pointer; + color: #fff !important; + font-size: 16px; } .el-dropdown-link { diff --git a/src/assets/css/skincolor.scss b/src/assets/css/skincolor.scss index 7140c70..776f697 100644 --- a/src/assets/css/skincolor.scss +++ b/src/assets/css/skincolor.scss @@ -142,6 +142,9 @@ #UserName { float: right; margin-right: 10px; + cursor: pointer; + color: #fff !important; + font-size: 16px; } .el-dropdown-link { diff --git a/src/components/index.vue b/src/components/index.vue index 2610bb0..7914792 100644 --- a/src/components/index.vue +++ b/src/components/index.vue @@ -29,9 +29,16 @@ id="IndexMessage" style="cursor: pointer" /> - - {{ LoginName }} - + + + + {{ LoginName }} + + + + 修改密码 + +
换肤
@@ -332,4 +339,8 @@ .indexbgc { background: url("../../static/img/bg_img.png") 100% 100% !important; } + +.el-icon-arrow-down { + font-size: 12px; +} diff --git a/src/assets/css/skincolor.scss b/src/assets/css/skincolor.scss index 7140c70..776f697 100644 --- a/src/assets/css/skincolor.scss +++ b/src/assets/css/skincolor.scss @@ -142,6 +142,9 @@ #UserName { float: right; margin-right: 10px; + cursor: pointer; + color: #fff !important; + font-size: 16px; } .el-dropdown-link { diff --git a/src/components/index.vue b/src/components/index.vue index 2610bb0..7914792 100644 --- a/src/components/index.vue +++ b/src/components/index.vue @@ -29,9 +29,16 @@ id="IndexMessage" style="cursor: pointer" /> - - {{ LoginName }} - + + + + {{ LoginName }} + + + + 修改密码 + +
换肤
@@ -332,4 +339,8 @@ .indexbgc { background: url("../../static/img/bg_img.png") 100% 100% !important; } + +.el-icon-arrow-down { + font-size: 12px; +} diff --git a/src/components/site/previewOfSiteStatus.vue b/src/components/site/previewOfSiteStatus.vue index 7d9a712..bdc1504 100644 --- a/src/components/site/previewOfSiteStatus.vue +++ b/src/components/site/previewOfSiteStatus.vue @@ -95,9 +95,13 @@ /> 站点统计
- 全部 - 合同 - 临测 + {{ item.name }}
@@ -161,7 +165,7 @@
-
+
@@ -415,7 +419,12 @@ WaringList: [], NoBaoJingData: true, //有无报警数据，有就为false // 站点实时报警B - map: "" + map: "", + namelist: [ + { name: "全部", platform: "", type: "", select: true }, + { name: "合同", platform: "", type: "0", select: false }, + { name: "临测", platform: "", type: "1", select: false } + ] }; }, methods: { @@ -431,10 +440,8 @@ 999 ) .then(response => { - // console.log(response); if (response.status === 200) { this.ProjectList = this.ProjectList.concat(response.data.data); - // console.log(this.ProjectList); } else { message(response); } @@ -462,9 +469,9 @@ this.Site.EAll = response.data.data.sitecount; this.Site.EOn = response.data.data.onlinecount; this.Site.EOff = response.data.data.offlinecount; - this.Project.EAll = response.data.data.projectcount; - this.Project.EOn = response.data.data.completed; - this.Project.EOff = response.data.data.noncompleted; + // this.Project.EAll = response.data.data.projectcount; + // this.Project.EOn = response.data.data.completed; + // this.Project.EOff = response.data.data.noncompleted; } else { message(response); } @@ -474,13 +481,19 @@ }); }, // 单击显示平台站点 - allpreview(platform) { + allpreview(index, item, event) { + // console.log(index, platform, event.target); + this.namelist.forEach(item => { + item.select = false; + }); + this.namelist[index].select = true; + this.$http - .post(this.nozzle.sysPlatformGetSiteCountAndState, { - data: { platform: platform } + .post(this.nozzle.getSiteNum, { + data: { platform: item.platform, type: item.type } }) .then(response => { - if (response.data.code === 200) { + if (response.status === 200) { // 将当前数据设置成数字滚动的初始值 this.Site.SAll = this.Site.EAll; this.Site.SOn = this.Site.EOn; @@ -489,12 +502,12 @@ this.Project.SOn = this.Project.EOn; this.Project.SOff = this.Project.EOff; // 将新数据设置成数字滚动的结束值 也就是展示值 - this.Site.EAll = response.data.data.sitecount; - this.Site.EOn = response.data.data.onlinecount; - this.Site.EOff = response.data.data.offlinecount; - this.Project.EAll = response.data.data.projectcount; - this.Project.EOn = response.data.data.completed; - this.Project.EOff = response.data.data.noncompleted; + this.Site.EAll = response.data.data.all; + this.Site.EOn = response.data.data.online; + this.Site.EOff = response.data.data.offline; + // this.Project.EAll = response.data.data.projectcount; + // this.Project.EOn = response.data.data.completed; + // this.Project.EOff = response.data.data.noncompleted; } else { message(response); } @@ -610,7 +623,6 @@ this.ProjectList[index]["groupName"] ); - // console.log(this.historyList); this.setItem(this.historyList); // 根据平台渲染站点数量统计及状态统计 @@ -622,7 +634,6 @@ // 根据平台渲染站点实时报警信息 this.loadSiteBaoJing(); // 返回出项目的坐标以及缩放等级************************************************************************************************GIS调用 - //console.log(item.latitude, item.longitude, item.zoomLevel); if ( this.ProjectList[index].latitude != null && this.ProjectList[index].longitude != null && @@ -635,7 +646,6 @@ wkid: 4326 }) ); - // console.log(MapPoint); this.map.centerAndZoom(MapPoint, this.ProjectList[index].zoomLevel); } }, @@ -644,7 +654,6 @@ this.ChecksplatformCodeTest = item; this.ProjectList.forEach(item1 => { if (item1["groupName"] == item) { - // console.log(item1); this.ChecksplatformCode = item1["groupNo"]; // 根据平台渲染站点数量统计及状态统计 this.loadSiteNumForOroject(); @@ -655,7 +664,6 @@ // 根据平台渲染站点实时报警信息 this.loadSiteBaoJing(); // 返回出项目的坐标以及缩放等级**************************GIS调用 - //console.log(item.latitude, item.longitude, item.zoomLevel); if ( item1.latitude != null && item1.longitude != null && @@ -948,11 +956,9 @@ ); _this.map.addLayer(Main_Map); /* _this.map.on("zoom-end", function() { - console.log(_this.map.getLevel()); }); _this.map.on("click", function(e) { - console.log(webMercatorUtils.webMercatorToGeographic(e.mapPoint)); }); */ _this.map.on("load", function() { _this.$http @@ -960,9 +966,7 @@ data: {} }) .then(response => { - // console.log(response); if (response.data.code === 200) { - // console.log(response); let photoInfo = {}; let wgs = new SpatialReference({ wkid: 4326 @@ -971,7 +975,6 @@ response.data.data, function(p) { /* if(p.lon!=null){ - console.log(1); } */ let latlng = new Point( parseFloat(p.lon), @@ -981,15 +984,6 @@ let webMercator = webMercatorUtils.geographicToWebMercator( latlng ); - /* for (let item in p.data) { - //console.log(p.data[item]); - let Record = ""; - for(let key in p.data[item]){ - //console.log(p.data[item][key]) - Record+=p.data[item][key]; - } - console.log(Record) - } */ let attributes = { stName: p.stName, stCode: p.stCode @@ -1057,15 +1051,10 @@ clusterLayer.setRenderer(renderer); _this.map.addLayer(clusterLayer); clusterLayer.on("click", function(res) { - //_this.map.infoWindow.hide(); - /* console.log( - res.graphic._graphicsLayer._singles[0].attributes.stCode - ); */ if (res.graphic._graphicsLayer._singles.length == 0) { return; } let d = res; - // console.log(res); _this.$http .post(_this.nozzle.getTempData, { data: { @@ -1075,7 +1064,6 @@ } }) .then(resP => { - //console.log(resP); let textContent = ""; for (let arr in resP.data.data[item]) { - //console.log(resP.data.data[item][arr]); textContent += ""; } textContent += ""; } - //d.graphic._graphicsLayer._singles[0].attributes.stCode 站点编号 textContent += "
名称" + d.graphic._graphicsLayer._singles[0].attributes @@ -1084,16 +1072,13 @@ for (let item in resP.data.data) { textContent += "
" + resP.data.data[item][arr] + "
历时数据
"; - // console.log(textContent); _this.map.infoWindow.setTitle("详细信息"); _this.map.infoWindow.setContent(textContent); _this.map.infoWindow.show( @@ -1114,7 +1099,7 @@ ) .catch(err => { // handle any script or module loading errors - console.error(err); + // console.error(err); }); } }, @@ -1144,12 +1129,16 @@ this.getItem(); }, destroyed: function() { - // console.log("我已经离开了！"); clearInterval(this.timer); } }; diff --git a/src/components/site/previewOfSiteStatus.vue b/src/components/site/previewOfSiteStatus.vue index 7d9a712..bdc1504 100644 --- a/src/components/site/previewOfSiteStatus.vue +++ b/src/components/site/previewOfSiteStatus.vue @@ -95,9 +95,13 @@ /> 站点统计
- 全部 - 合同 - 临测 + {{ item.name }}
@@ -161,7 +165,7 @@
-
+
@@ -415,7 +419,12 @@ WaringList: [], NoBaoJingData: true, //有无报警数据，有就为false // 站点实时报警B - map: "" + map: "", + namelist: [ + { name: "全部", platform: "", type: "", select: true }, + { name: "合同", platform: "", type: "0", select: false }, + { name: "临测", platform: "", type: "1", select: false } + ] }; }, methods: { @@ -431,10 +440,8 @@ 999 ) .then(response => { - // console.log(response); if (response.status === 200) { this.ProjectList = this.ProjectList.concat(response.data.data); - // console.log(this.ProjectList); } else { message(response); } @@ -462,9 +469,9 @@ this.Site.EAll = response.data.data.sitecount; this.Site.EOn = response.data.data.onlinecount; this.Site.EOff = response.data.data.offlinecount; - this.Project.EAll = response.data.data.projectcount; - this.Project.EOn = response.data.data.completed; - this.Project.EOff = response.data.data.noncompleted; + // this.Project.EAll = response.data.data.projectcount; + // this.Project.EOn = response.data.data.completed; + // this.Project.EOff = response.data.data.noncompleted; } else { message(response); } @@ -474,13 +481,19 @@ }); }, // 单击显示平台站点 - allpreview(platform) { + allpreview(index, item, event) { + // console.log(index, platform, event.target); + this.namelist.forEach(item => { + item.select = false; + }); + this.namelist[index].select = true; + this.$http - .post(this.nozzle.sysPlatformGetSiteCountAndState, { - data: { platform: platform } + .post(this.nozzle.getSiteNum, { + data: { platform: item.platform, type: item.type } }) .then(response => { - if (response.data.code === 200) { + if (response.status === 200) { // 将当前数据设置成数字滚动的初始值 this.Site.SAll = this.Site.EAll; this.Site.SOn = this.Site.EOn; @@ -489,12 +502,12 @@ this.Project.SOn = this.Project.EOn; this.Project.SOff = this.Project.EOff; // 将新数据设置成数字滚动的结束值 也就是展示值 - this.Site.EAll = response.data.data.sitecount; - this.Site.EOn = response.data.data.onlinecount; - this.Site.EOff = response.data.data.offlinecount; - this.Project.EAll = response.data.data.projectcount; - this.Project.EOn = response.data.data.completed; - this.Project.EOff = response.data.data.noncompleted; + this.Site.EAll = response.data.data.all; + this.Site.EOn = response.data.data.online; + this.Site.EOff = response.data.data.offline; + // this.Project.EAll = response.data.data.projectcount; + // this.Project.EOn = response.data.data.completed; + // this.Project.EOff = response.data.data.noncompleted; } else { message(response); } @@ -610,7 +623,6 @@ this.ProjectList[index]["groupName"] ); - // console.log(this.historyList); this.setItem(this.historyList); // 根据平台渲染站点数量统计及状态统计 @@ -622,7 +634,6 @@ // 根据平台渲染站点实时报警信息 this.loadSiteBaoJing(); // 返回出项目的坐标以及缩放等级************************************************************************************************GIS调用 - //console.log(item.latitude, item.longitude, item.zoomLevel); if ( this.ProjectList[index].latitude != null && this.ProjectList[index].longitude != null && @@ -635,7 +646,6 @@ wkid: 4326 }) ); - // console.log(MapPoint); this.map.centerAndZoom(MapPoint, this.ProjectList[index].zoomLevel); } }, @@ -644,7 +654,6 @@ this.ChecksplatformCodeTest = item; this.ProjectList.forEach(item1 => { if (item1["groupName"] == item) { - // console.log(item1); this.ChecksplatformCode = item1["groupNo"]; // 根据平台渲染站点数量统计及状态统计 this.loadSiteNumForOroject(); @@ -655,7 +664,6 @@ // 根据平台渲染站点实时报警信息 this.loadSiteBaoJing(); // 返回出项目的坐标以及缩放等级**************************GIS调用 - //console.log(item.latitude, item.longitude, item.zoomLevel); if ( item1.latitude != null && item1.longitude != null && @@ -948,11 +956,9 @@ ); _this.map.addLayer(Main_Map); /* _this.map.on("zoom-end", function() { - console.log(_this.map.getLevel()); }); _this.map.on("click", function(e) { - console.log(webMercatorUtils.webMercatorToGeographic(e.mapPoint)); }); */ _this.map.on("load", function() { _this.$http @@ -960,9 +966,7 @@ data: {} }) .then(response => { - // console.log(response); if (response.data.code === 200) { - // console.log(response); let photoInfo = {}; let wgs = new SpatialReference({ wkid: 4326 @@ -971,7 +975,6 @@ response.data.data, function(p) { /* if(p.lon!=null){ - console.log(1); } */ let latlng = new Point( parseFloat(p.lon), @@ -981,15 +984,6 @@ let webMercator = webMercatorUtils.geographicToWebMercator( latlng ); - /* for (let item in p.data) { - //console.log(p.data[item]); - let Record = ""; - for(let key in p.data[item]){ - //console.log(p.data[item][key]) - Record+=p.data[item][key]; - } - console.log(Record) - } */ let attributes = { stName: p.stName, stCode: p.stCode @@ -1057,15 +1051,10 @@ clusterLayer.setRenderer(renderer); _this.map.addLayer(clusterLayer); clusterLayer.on("click", function(res) { - //_this.map.infoWindow.hide(); - /* console.log( - res.graphic._graphicsLayer._singles[0].attributes.stCode - ); */ if (res.graphic._graphicsLayer._singles.length == 0) { return; } let d = res; - // console.log(res); _this.$http .post(_this.nozzle.getTempData, { data: { @@ -1075,7 +1064,6 @@ } }) .then(resP => { - //console.log(resP); let textContent = ""; for (let arr in resP.data.data[item]) { - //console.log(resP.data.data[item][arr]); textContent += ""; } textContent += ""; } - //d.graphic._graphicsLayer._singles[0].attributes.stCode 站点编号 textContent += "
名称" + d.graphic._graphicsLayer._singles[0].attributes @@ -1084,16 +1072,13 @@ for (let item in resP.data.data) { textContent += "
" + resP.data.data[item][arr] + "
历时数据
"; - // console.log(textContent); _this.map.infoWindow.setTitle("详细信息"); _this.map.infoWindow.setContent(textContent); _this.map.infoWindow.show( @@ -1114,7 +1099,7 @@ ) .catch(err => { // handle any script or module loading errors - console.error(err); + // console.error(err); }); } }, @@ -1144,12 +1129,16 @@ this.getItem(); }, destroyed: function() { - // console.log("我已经离开了！"); clearInterval(this.timer); } }; diff --git a/src/components/site/previewOfSiteStatus.vue b/src/components/site/previewOfSiteStatus.vue index 7d9a712..bdc1504 100644 --- a/src/components/site/previewOfSiteStatus.vue +++ b/src/components/site/previewOfSiteStatus.vue @@ -95,9 +95,13 @@ /> 站点统计
- 全部 - 合同 - 临测 + {{ item.name }}
@@ -161,7 +165,7 @@
-
+
@@ -415,7 +419,12 @@ WaringList: [], NoBaoJingData: true, //有无报警数据，有就为false // 站点实时报警B - map: "" + map: "", + namelist: [ + { name: "全部", platform: "", type: "", select: true }, + { name: "合同", platform: "", type: "0", select: false }, + { name: "临测", platform: "", type: "1", select: false } + ] }; }, methods: { @@ -431,10 +440,8 @@ 999 ) .then(response => { - // console.log(response); if (response.status === 200) { this.ProjectList = this.ProjectList.concat(response.data.data); - // console.log(this.ProjectList); } else { message(response); } @@ -462,9 +469,9 @@ this.Site.EAll = response.data.data.sitecount; this.Site.EOn = response.data.data.onlinecount; this.Site.EOff = response.data.data.offlinecount; - this.Project.EAll = response.data.data.projectcount; - this.Project.EOn = response.data.data.completed; - this.Project.EOff = response.data.data.noncompleted; + // this.Project.EAll = response.data.data.projectcount; + // this.Project.EOn = response.data.data.completed; + // this.Project.EOff = response.data.data.noncompleted; } else { message(response); } @@ -474,13 +481,19 @@ }); }, // 单击显示平台站点 - allpreview(platform) { + allpreview(index, item, event) { + // console.log(index, platform, event.target); + this.namelist.forEach(item => { + item.select = false; + }); + this.namelist[index].select = true; + this.$http - .post(this.nozzle.sysPlatformGetSiteCountAndState, { - data: { platform: platform } + .post(this.nozzle.getSiteNum, { + data: { platform: item.platform, type: item.type } }) .then(response => { - if (response.data.code === 200) { + if (response.status === 200) { // 将当前数据设置成数字滚动的初始值 this.Site.SAll = this.Site.EAll; this.Site.SOn = this.Site.EOn; @@ -489,12 +502,12 @@ this.Project.SOn = this.Project.EOn; this.Project.SOff = this.Project.EOff; // 将新数据设置成数字滚动的结束值 也就是展示值 - this.Site.EAll = response.data.data.sitecount; - this.Site.EOn = response.data.data.onlinecount; - this.Site.EOff = response.data.data.offlinecount; - this.Project.EAll = response.data.data.projectcount; - this.Project.EOn = response.data.data.completed; - this.Project.EOff = response.data.data.noncompleted; + this.Site.EAll = response.data.data.all; + this.Site.EOn = response.data.data.online; + this.Site.EOff = response.data.data.offline; + // this.Project.EAll = response.data.data.projectcount; + // this.Project.EOn = response.data.data.completed; + // this.Project.EOff = response.data.data.noncompleted; } else { message(response); } @@ -610,7 +623,6 @@ this.ProjectList[index]["groupName"] ); - // console.log(this.historyList); this.setItem(this.historyList); // 根据平台渲染站点数量统计及状态统计 @@ -622,7 +634,6 @@ // 根据平台渲染站点实时报警信息 this.loadSiteBaoJing(); // 返回出项目的坐标以及缩放等级************************************************************************************************GIS调用 - //console.log(item.latitude, item.longitude, item.zoomLevel); if ( this.ProjectList[index].latitude != null && this.ProjectList[index].longitude != null && @@ -635,7 +646,6 @@ wkid: 4326 }) ); - // console.log(MapPoint); this.map.centerAndZoom(MapPoint, this.ProjectList[index].zoomLevel); } }, @@ -644,7 +654,6 @@ this.ChecksplatformCodeTest = item; this.ProjectList.forEach(item1 => { if (item1["groupName"] == item) { - // console.log(item1); this.ChecksplatformCode = item1["groupNo"]; // 根据平台渲染站点数量统计及状态统计 this.loadSiteNumForOroject(); @@ -655,7 +664,6 @@ // 根据平台渲染站点实时报警信息 this.loadSiteBaoJing(); // 返回出项目的坐标以及缩放等级**************************GIS调用 - //console.log(item.latitude, item.longitude, item.zoomLevel); if ( item1.latitude != null && item1.longitude != null && @@ -948,11 +956,9 @@ ); _this.map.addLayer(Main_Map); /* _this.map.on("zoom-end", function() { - console.log(_this.map.getLevel()); }); _this.map.on("click", function(e) { - console.log(webMercatorUtils.webMercatorToGeographic(e.mapPoint)); }); */ _this.map.on("load", function() { _this.$http @@ -960,9 +966,7 @@ data: {} }) .then(response => { - // console.log(response); if (response.data.code === 200) { - // console.log(response); let photoInfo = {}; let wgs = new SpatialReference({ wkid: 4326 @@ -971,7 +975,6 @@ response.data.data, function(p) { /* if(p.lon!=null){ - console.log(1); } */ let latlng = new Point( parseFloat(p.lon), @@ -981,15 +984,6 @@ let webMercator = webMercatorUtils.geographicToWebMercator( latlng ); - /* for (let item in p.data) { - //console.log(p.data[item]); - let Record = ""; - for(let key in p.data[item]){ - //console.log(p.data[item][key]) - Record+=p.data[item][key]; - } - console.log(Record) - } */ let attributes = { stName: p.stName, stCode: p.stCode @@ -1057,15 +1051,10 @@ clusterLayer.setRenderer(renderer); _this.map.addLayer(clusterLayer); clusterLayer.on("click", function(res) { - //_this.map.infoWindow.hide(); - /* console.log( - res.graphic._graphicsLayer._singles[0].attributes.stCode - ); */ if (res.graphic._graphicsLayer._singles.length == 0) { return; } let d = res; - // console.log(res); _this.$http .post(_this.nozzle.getTempData, { data: { @@ -1075,7 +1064,6 @@ } }) .then(resP => { - //console.log(resP); let textContent = ""; for (let arr in resP.data.data[item]) { - //console.log(resP.data.data[item][arr]); textContent += ""; } textContent += ""; } - //d.graphic._graphicsLayer._singles[0].attributes.stCode 站点编号 textContent += "
名称" + d.graphic._graphicsLayer._singles[0].attributes @@ -1084,16 +1072,13 @@ for (let item in resP.data.data) { textContent += "
" + resP.data.data[item][arr] + "
历时数据
"; - // console.log(textContent); _this.map.infoWindow.setTitle("详细信息"); _this.map.infoWindow.setContent(textContent); _this.map.infoWindow.show( @@ -1114,7 +1099,7 @@ ) .catch(err => { // handle any script or module loading errors - console.error(err); + // console.error(err); }); } }, @@ -1144,12 +1129,16 @@ this.getItem(); }, destroyed: function() { - // console.log("我已经离开了！"); clearInterval(this.timer); } };