Browse Source

Merge branch 'master' of http://124.70.43.205:3000/yangxiao/sis_zhfx into lining

lining 3 years ago
parent
commit
df665b25b4
1 changed files with 2 additions and 12 deletions
  1. 2 12
      src/views/Status/Status.vue

+ 2 - 12
src/views/Status/Status.vue

@@ -57,7 +57,7 @@ export default {
         column: [
           {
             name: "场站名称",
-            field: "wpName",
+            field: "address",
             unit: "",
             is_num: false,
             is_light: false,
@@ -202,7 +202,7 @@ export default {
         column: [
           {
             // name: "场站名称",
-            field: "wpName",
+            field: "address",
             unit: "",
             is_num: false,
             is_light: false,
@@ -503,7 +503,6 @@ export default {
         subUrl: "monitor/monitor",
         success(res) {
           if (res.data) {
-            // console.log("resData:", res.data);
             let sourceMap = res.data;
             let datas = [];
             let data = [];
@@ -514,7 +513,6 @@ export default {
               that.wpId1 = sourceMap.vos.find((findEle) => {
                 return findEle.wpName === ele.name;
               }).wpId;
-              // console.log('wpid1:',that.wpId1)
               datas.push({
                 title: ele.name,
                 wpId: sourceMap.vos.find((findEle) => {
@@ -603,9 +601,7 @@ export default {
             });
             data2.push(zj[0]);
             fdcArr.push(fdhj[0]);
-            //  console.log(fdcArr)
             fdcArr.forEach((ele) => {
-              // console.log('vos:', sourceMap.vos)
               ele.row_span = [];
               ele.col_span = [];
               ele.is_light = false;
@@ -620,9 +616,7 @@ export default {
               return ele.wpId.includes("-2");
             });
             gdcArr.push(gdhj[0]);
-            //  console.log(gdcArr)
             gdcArr.forEach((ele) => {
-              // console.log('vos:', sourceMap.vos)
               ele.row_span = [];
               ele.col_span = [];
               ele.is_light = false;
@@ -630,7 +624,6 @@ export default {
             });
 
             // sourceMap.vos.forEach((ele) => {
-            //   // console.log('vos:', sourceMap.vos)
             //   ele.row_span = [];
             //   ele.col_span = [];
             //   ele.is_light = false;
@@ -638,7 +631,6 @@ export default {
             // });
 
             //  for(let i=0;i<sourceMap.vos.length;i++){
-            //     //  console.log('vos:',sourceMap.vos)
             //      data.push(sourceMap.vos[0],sourceMap.vos[1],sourceMap.vos[2],sourceMap.vos[3],sourceMap.vos[4],sourceMap.vos[5],sourceMap.vos[11])
             //      data1.push(sourceMap.vos[6],sourceMap.vos[7],sourceMap.vos[8],sourceMap.vos[9],sourceMap.vos[10],sourceMap.vos[11])
             //  }
@@ -646,8 +638,6 @@ export default {
             // //  that.unique(data1,sourceMap.vos.find((findEle) => {
             // //         return findEle.wpName === ele.name;
             // //       }).wpId);
-            //  console.log('vosData:',data);
-            // //  console.log('vosData1:',data1)
 
             that.sourceMap = sourceMap;
             that.datas = datas;