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 827cdb0..bdc1504 100644 --- a/src/components/site/previewOfSiteStatus.vue +++ b/src/components/site/previewOfSiteStatus.vue @@ -98,7 +98,7 @@ {{ item.name }} @@ -165,7 +165,7 @@ -
+
@@ -421,9 +421,9 @@ // 站点实时报警B map: "", namelist: [ - { name: "全部", platform: "", select: true }, - { name: "合同", platform: "", select: false }, - { name: "临测", platform: "", select: false } + { name: "全部", platform: "", type: "", select: true }, + { name: "合同", platform: "", type: "0", select: false }, + { name: "临测", platform: "", type: "1", select: false } ] }; }, @@ -440,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); } @@ -471,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); } @@ -483,18 +481,19 @@ }); }, // 单击显示平台站点 - allpreview(index, platform, event) { + 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; @@ -503,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); } @@ -624,7 +623,6 @@ this.ProjectList[index]["groupName"] ); - // console.log(this.historyList); this.setItem(this.historyList); // 根据平台渲染站点数量统计及状态统计 @@ -636,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 && @@ -649,7 +646,6 @@ wkid: 4326 }) ); - // console.log(MapPoint); this.map.centerAndZoom(MapPoint, this.ProjectList[index].zoomLevel); } }, @@ -658,7 +654,6 @@ this.ChecksplatformCodeTest = item; this.ProjectList.forEach(item1 => { if (item1["groupName"] == item) { - // console.log(item1); this.ChecksplatformCode = item1["groupNo"]; // 根据平台渲染站点数量统计及状态统计 this.loadSiteNumForOroject(); @@ -669,7 +664,6 @@ // 根据平台渲染站点实时报警信息 this.loadSiteBaoJing(); // 返回出项目的坐标以及缩放等级**************************GIS调用 - //console.log(item.latitude, item.longitude, item.zoomLevel); if ( item1.latitude != null && item1.longitude != null && @@ -962,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 @@ -974,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 @@ -985,7 +975,6 @@ response.data.data, function(p) { /* if(p.lon!=null){ - console.log(1); } */ let latlng = new Point( parseFloat(p.lon), @@ -995,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 @@ -1071,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: { @@ -1089,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 @@ -1098,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( @@ -1128,7 +1099,7 @@ ) .catch(err => { // handle any script or module loading errors - console.error(err); + // console.error(err); }); } }, @@ -1158,7 +1129,6 @@ this.getItem(); }, destroyed: function() { - // console.log("我已经离开了！"); clearInterval(this.timer); } }; 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 827cdb0..bdc1504 100644 --- a/src/components/site/previewOfSiteStatus.vue +++ b/src/components/site/previewOfSiteStatus.vue @@ -98,7 +98,7 @@ {{ item.name }} @@ -165,7 +165,7 @@ -
+
@@ -421,9 +421,9 @@ // 站点实时报警B map: "", namelist: [ - { name: "全部", platform: "", select: true }, - { name: "合同", platform: "", select: false }, - { name: "临测", platform: "", select: false } + { name: "全部", platform: "", type: "", select: true }, + { name: "合同", platform: "", type: "0", select: false }, + { name: "临测", platform: "", type: "1", select: false } ] }; }, @@ -440,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); } @@ -471,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); } @@ -483,18 +481,19 @@ }); }, // 单击显示平台站点 - allpreview(index, platform, event) { + 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; @@ -503,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); } @@ -624,7 +623,6 @@ this.ProjectList[index]["groupName"] ); - // console.log(this.historyList); this.setItem(this.historyList); // 根据平台渲染站点数量统计及状态统计 @@ -636,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 && @@ -649,7 +646,6 @@ wkid: 4326 }) ); - // console.log(MapPoint); this.map.centerAndZoom(MapPoint, this.ProjectList[index].zoomLevel); } }, @@ -658,7 +654,6 @@ this.ChecksplatformCodeTest = item; this.ProjectList.forEach(item1 => { if (item1["groupName"] == item) { - // console.log(item1); this.ChecksplatformCode = item1["groupNo"]; // 根据平台渲染站点数量统计及状态统计 this.loadSiteNumForOroject(); @@ -669,7 +664,6 @@ // 根据平台渲染站点实时报警信息 this.loadSiteBaoJing(); // 返回出项目的坐标以及缩放等级**************************GIS调用 - //console.log(item.latitude, item.longitude, item.zoomLevel); if ( item1.latitude != null && item1.longitude != null && @@ -962,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 @@ -974,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 @@ -985,7 +975,6 @@ response.data.data, function(p) { /* if(p.lon!=null){ - console.log(1); } */ let latlng = new Point( parseFloat(p.lon), @@ -995,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 @@ -1071,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: { @@ -1089,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 @@ -1098,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( @@ -1128,7 +1099,7 @@ ) .catch(err => { // handle any script or module loading errors - console.error(err); + // console.error(err); }); } }, @@ -1158,7 +1129,6 @@ this.getItem(); }, destroyed: function() { - // console.log("我已经离开了！"); clearInterval(this.timer); } }; diff --git a/src/components/sys/user.vue b/src/components/sys/user.vue index eb377a8..562a984 100644 --- a/src/components/sys/user.vue +++ b/src/components/sys/user.vue @@ -151,7 +151,6 @@ }, fieldList: [ { label: "登录名", value: "login", type: "input", required: true }, - { label: "登录密码", value: "pwd", type: "password" }, { label: "用户名称", value: "realName", @@ -162,7 +161,8 @@ label: "电话", value: "mobile", type: "input", - validator: checkPhone + validator: checkPhone, + required: true }, { label: "用户类型", @@ -254,12 +254,6 @@ case "AddUser": dialogInfo.type = event; dialogInfo.visible = true; - this.formInfo.fieldList.forEach(item => { - if (item.value === "pwd") { - item.required = true; - } - }); - this.initRules(); setTimeout(() => { this.formInfo.ref.clearValidate(); }, 0); @@ -272,12 +266,6 @@ formInfo.data[key] = data[key]; } } - this.formInfo.fieldList.forEach(item => { - if (item.value === "pwd") { - item.required = false; - } - }); - this.initRules(); dialogInfo.visible = true; break; //删除用户 @@ -393,7 +381,6 @@ this.formInfo.data = { id: undefined, login: "", - pwd: "", realName: "", //用户名称 userType: 0, //类型 mobile: "", //电话 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 827cdb0..bdc1504 100644 --- a/src/components/site/previewOfSiteStatus.vue +++ b/src/components/site/previewOfSiteStatus.vue @@ -98,7 +98,7 @@ {{ item.name }} @@ -165,7 +165,7 @@ -
+
@@ -421,9 +421,9 @@ // 站点实时报警B map: "", namelist: [ - { name: "全部", platform: "", select: true }, - { name: "合同", platform: "", select: false }, - { name: "临测", platform: "", select: false } + { name: "全部", platform: "", type: "", select: true }, + { name: "合同", platform: "", type: "0", select: false }, + { name: "临测", platform: "", type: "1", select: false } ] }; }, @@ -440,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); } @@ -471,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); } @@ -483,18 +481,19 @@ }); }, // 单击显示平台站点 - allpreview(index, platform, event) { + 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; @@ -503,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); } @@ -624,7 +623,6 @@ this.ProjectList[index]["groupName"] ); - // console.log(this.historyList); this.setItem(this.historyList); // 根据平台渲染站点数量统计及状态统计 @@ -636,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 && @@ -649,7 +646,6 @@ wkid: 4326 }) ); - // console.log(MapPoint); this.map.centerAndZoom(MapPoint, this.ProjectList[index].zoomLevel); } }, @@ -658,7 +654,6 @@ this.ChecksplatformCodeTest = item; this.ProjectList.forEach(item1 => { if (item1["groupName"] == item) { - // console.log(item1); this.ChecksplatformCode = item1["groupNo"]; // 根据平台渲染站点数量统计及状态统计 this.loadSiteNumForOroject(); @@ -669,7 +664,6 @@ // 根据平台渲染站点实时报警信息 this.loadSiteBaoJing(); // 返回出项目的坐标以及缩放等级**************************GIS调用 - //console.log(item.latitude, item.longitude, item.zoomLevel); if ( item1.latitude != null && item1.longitude != null && @@ -962,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 @@ -974,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 @@ -985,7 +975,6 @@ response.data.data, function(p) { /* if(p.lon!=null){ - console.log(1); } */ let latlng = new Point( parseFloat(p.lon), @@ -995,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 @@ -1071,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: { @@ -1089,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 @@ -1098,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( @@ -1128,7 +1099,7 @@ ) .catch(err => { // handle any script or module loading errors - console.error(err); + // console.error(err); }); } }, @@ -1158,7 +1129,6 @@ this.getItem(); }, destroyed: function() { - // console.log("我已经离开了！"); clearInterval(this.timer); } }; diff --git a/src/components/sys/user.vue b/src/components/sys/user.vue index eb377a8..562a984 100644 --- a/src/components/sys/user.vue +++ b/src/components/sys/user.vue @@ -151,7 +151,6 @@ }, fieldList: [ { label: "登录名", value: "login", type: "input", required: true }, - { label: "登录密码", value: "pwd", type: "password" }, { label: "用户名称", value: "realName", @@ -162,7 +161,8 @@ label: "电话", value: "mobile", type: "input", - validator: checkPhone + validator: checkPhone, + required: true }, { label: "用户类型", @@ -254,12 +254,6 @@ case "AddUser": dialogInfo.type = event; dialogInfo.visible = true; - this.formInfo.fieldList.forEach(item => { - if (item.value === "pwd") { - item.required = true; - } - }); - this.initRules(); setTimeout(() => { this.formInfo.ref.clearValidate(); }, 0); @@ -272,12 +266,6 @@ formInfo.data[key] = data[key]; } } - this.formInfo.fieldList.forEach(item => { - if (item.value === "pwd") { - item.required = false; - } - }); - this.initRules(); dialogInfo.visible = true; break; //删除用户 @@ -393,7 +381,6 @@ this.formInfo.data = { id: undefined, login: "", - pwd: "", realName: "", //用户名称 userType: 0, //类型 mobile: "", //电话 diff --git a/src/util/projectSet.js b/src/util/projectSet.js index ef05450..ba4eb94 100644 --- a/src/util/projectSet.js +++ b/src/util/projectSet.js @@ -6,6 +6,8 @@ let host = "/projectApi"; let nozzle = { + getSiteNum: "/userGroupRela/getSiteNum", //站点状况预览图//站点统计右边三个 + saveOrupdate: "/sys/stationbase/saveOrupdate", //添加和保存站点弹框的信息 delete: "/sys/file/delete", //站点管理//删除图片接口 upload: "/sys/file/upload", //站点管理//上传图片接口 @@ -26,12 +28,12 @@ sysEquipList: "/sys/equipinfo/list", //设备管理----设备列表 sysEquipAddUpdate: "/sys/equipinfo/addOrupdate", //设备管理----新增设备 - sysEquipDelete: "/sys/equipinfo/delete", //设备管理----删除设备 - sysEquipFactorList: "/sys/equipconfig/equiplist", //设备管理----关联因子列表 - sysEquipIsRelatedFactor: "/sys/equipconfig/addbatch", //设备管理----绑定设备与因子 - sysEquipUnRelatedFactor: "/sys/equipconfig/removebatch", //设备管理----解绑设备与因子 + sysEquipDelete: "/sys/equipinfo/delete", //设备管理----删除设备 + sysEquipFactorList: "/sys/equipconfig/equiplist", //设备管理----关联因子列表 + sysEquipIsRelatedFactor: "/sys/equipconfig/addbatch", //设备管理----绑定设备与因子 + sysEquipUnRelatedFactor: "/sys/equipconfig/removebatch", //设备管理----解绑设备与因子 - sysEquipConfigList: "/sys/equipconfig/list", //因子管理----因子列表 + sysEquipConfigList: "/sys/equipconfig/list" //因子管理----因子列表 }; for (let item in nozzle) {