diff --git a/src/components/site/previewOfSiteStatus.vue b/src/components/site/previewOfSiteStatus.vue
index 2bf75bd..4d6b522 100644
--- a/src/components/site/previewOfSiteStatus.vue
+++ b/src/components/site/previewOfSiteStatus.vue
@@ -62,7 +62,7 @@
@@ -240,7 +240,7 @@
{{ item.ShortName }}{{ item.groupName }}
-
{{ item.siteName }}
-
{{
- item.factorsName
- }}
+
{{ item.createTime }}
+
{{ item.siteName }}
{
- if (response.data.code === 200) {
- this.ProjectList = this.ProjectList.concat(
- response.data.data.records
- );
+ console.log(response);
+ if (response.status === 200) {
+ this.ProjectList = this.ProjectList.concat(response.data.data);
// console.log(this.ProjectList);
} else {
message(response);
@@ -527,9 +529,14 @@
this.NoBaoJingData = true;
this.WaringList = [];
this.$http
- .post(this.nozzle.warnLogGetWarnLogOfPlatform, {
+ .post(this.nozzle.warnLogListWarnLog, {
+ current: 1,
+ size: 99,
data: {
- platform: this.ChecksplatformCode
+ platForm: this.ChecksplatformCode,
+ endTime: "",
+ startTime: "",
+ siteName: ""
}
})
.then(response => {
@@ -549,14 +556,14 @@
},
// 点击项目ZZJ
ListClick(index) {
- this.ChecksplatformCode = this.ProjectList[index]["platformCode"];
+ this.ChecksplatformCode = this.ProjectList[index]["groupNo"];
// 限制数组的长度不超过10个
if (this.historyList.length > 10) {
this.historyList.pop();
}
this.historyList = this.selectTag(
this.historyList,
- this.ProjectList[index]["shortName"]
+ this.ProjectList[index]["groupName"]
);
// console.log(this.historyList);
@@ -592,9 +599,9 @@
HistoryClick(item) {
this.ChecksplatformCodeTest = item;
this.ProjectList.forEach(item1 => {
- if (item1["shortName"] == item) {
+ if (item1["groupName"] == item) {
// console.log(item1);
- this.ChecksplatformCode = item1["platformCode"];
+ this.ChecksplatformCode = item1["groupNo"];
// 根据平台渲染站点数量统计及状态统计
this.loadSiteNumForOroject();
// 根据平台渲染项目设备总览
@@ -649,7 +656,7 @@
// 绘制图表
this.myChart.clear();
this.myChart.setOption({
- color:['red'],
+ color: ["red"],
tooltip: {
trigger: "axis"
},
@@ -664,10 +671,10 @@
radius: 70,
shape: "circle",
name: {
- formatter: '{value}',
- textStyle: {
- color: 'red'
- }
+ formatter: "{value}",
+ textStyle: {
+ color: "red"
+ }
}
}
],
@@ -1504,17 +1511,17 @@
cursor: pointer;
}
.GIsRightWaringListNo {
- width: 50%;
+ width: 40%;
float: left;
font-size: 14px;
}
.GIsRightWaringListName {
- width: 25%;
+ width: 45%;
float: left;
font-size: 14px;
}
.GIsRightWaringListType {
- width: 25%;
+ width: 15%;
float: left;
font-size: 14px;
}
diff --git a/src/components/site/previewOfSiteStatus.vue b/src/components/site/previewOfSiteStatus.vue
index 2bf75bd..4d6b522 100644
--- a/src/components/site/previewOfSiteStatus.vue
+++ b/src/components/site/previewOfSiteStatus.vue
@@ -62,7 +62,7 @@
@@ -240,7 +240,7 @@
{{ item.ShortName }}{{ item.groupName }}
-
{{ item.siteName }}
-
{{
- item.factorsName
- }}
+
{{ item.createTime }}
+
{{ item.siteName }}
{
- if (response.data.code === 200) {
- this.ProjectList = this.ProjectList.concat(
- response.data.data.records
- );
+ console.log(response);
+ if (response.status === 200) {
+ this.ProjectList = this.ProjectList.concat(response.data.data);
// console.log(this.ProjectList);
} else {
message(response);
@@ -527,9 +529,14 @@
this.NoBaoJingData = true;
this.WaringList = [];
this.$http
- .post(this.nozzle.warnLogGetWarnLogOfPlatform, {
+ .post(this.nozzle.warnLogListWarnLog, {
+ current: 1,
+ size: 99,
data: {
- platform: this.ChecksplatformCode
+ platForm: this.ChecksplatformCode,
+ endTime: "",
+ startTime: "",
+ siteName: ""
}
})
.then(response => {
@@ -549,14 +556,14 @@
},
// 点击项目ZZJ
ListClick(index) {
- this.ChecksplatformCode = this.ProjectList[index]["platformCode"];
+ this.ChecksplatformCode = this.ProjectList[index]["groupNo"];
// 限制数组的长度不超过10个
if (this.historyList.length > 10) {
this.historyList.pop();
}
this.historyList = this.selectTag(
this.historyList,
- this.ProjectList[index]["shortName"]
+ this.ProjectList[index]["groupName"]
);
// console.log(this.historyList);
@@ -592,9 +599,9 @@
HistoryClick(item) {
this.ChecksplatformCodeTest = item;
this.ProjectList.forEach(item1 => {
- if (item1["shortName"] == item) {
+ if (item1["groupName"] == item) {
// console.log(item1);
- this.ChecksplatformCode = item1["platformCode"];
+ this.ChecksplatformCode = item1["groupNo"];
// 根据平台渲染站点数量统计及状态统计
this.loadSiteNumForOroject();
// 根据平台渲染项目设备总览
@@ -649,7 +656,7 @@
// 绘制图表
this.myChart.clear();
this.myChart.setOption({
- color:['red'],
+ color: ["red"],
tooltip: {
trigger: "axis"
},
@@ -664,10 +671,10 @@
radius: 70,
shape: "circle",
name: {
- formatter: '{value}',
- textStyle: {
- color: 'red'
- }
+ formatter: "{value}",
+ textStyle: {
+ color: "red"
+ }
}
}
],
@@ -1504,17 +1511,17 @@
cursor: pointer;
}
.GIsRightWaringListNo {
- width: 50%;
+ width: 40%;
float: left;
font-size: 14px;
}
.GIsRightWaringListName {
- width: 25%;
+ width: 45%;
float: left;
font-size: 14px;
}
.GIsRightWaringListType {
- width: 25%;
+ width: 15%;
float: left;
font-size: 14px;
}
diff --git a/src/components/welcome.vue b/src/components/welcome.vue
index d01b4c0..49f25b5 100644
--- a/src/components/welcome.vue
+++ b/src/components/welcome.vue
@@ -1,6 +1,6 @@
@@ -9,10 +9,16 @@
name: "welcome",
props: ["flag"],
data: function() {
- return {};
+ return {
+ newList: true
+ };
},
- methods: {},
- mounted: function() {}
+ mounted: function() {},
+ watch: {
+ flag: function(newval, oldval) {
+ this.newList = newval;
+ }
+ }
};