冲突解决

src/views/Home/Home.vue

@@ -155,10 +155,6 @@
                     {{ wpId === "0" ? "减排二氧化硫" : "年运行小时" }}
                   </td>
                   <td class="value green">
-<<<<<<< HEAD
-=======
-                    <!-- {{ wpId === "0" ? jczbmap.jpeyhl  : gxkmap.nyxxs }} -->
->>>>>>> b1304280f10e412f55f384f411309a5c63f6d7ad
                     {{ wpId === "0" ? jczbmap.jpeyhl : gxkmap.nyxxs }}
                   </td>
                   <td class="unit gray">
@@ -170,10 +166,6 @@
                     {{ wpId === "0" ? "减排二氧化碳" : "年等效可利用系数" }}
                   </td>
                   <td class="value green">
-<<<<<<< HEAD
-=======
-                    <!-- {{ wpId === "0" ? jczbmap.jpeyht  : gxkmap.ndxkyss }} -->
->>>>>>> b1304280f10e412f55f384f411309a5c63f6d7ad
                     {{ wpId === "0" ? jczbmap.jpeyht : gxkmap.ndxkyss }}
                   </td>
                   <td class="unit gray">{{ wpId === "0" ? "吨" : "%" }}</td>
@@ -183,10 +175,6 @@
                     {{ wpId === "0" ? "节约用水" : "年故障小时" }}
                   </td>
                   <td class="value green">
-<<<<<<< HEAD
-=======
-                    <!-- {{ wpId === "0" ? jczbmap.jys  : gxkmap.ngzxs }} -->
->>>>>>> b1304280f10e412f55f384f411309a5c63f6d7ad
                     {{ wpId === "0" ? jczbmap.jys : gxkmap.ngzxs }}
                   </td>
                   <td class="unit gray">
@@ -198,10 +186,6 @@
                     {{ wpId === "0" ? "节约标煤" : "年待机小时" }}
                   </td>
                   <td class="value green">
-<<<<<<< HEAD
-=======
-                    <!-- {{ wpId === "0" ? jczbmap.jybm  : gxkmap.ndjxs }} -->
->>>>>>> b1304280f10e412f55f384f411309a5c63f6d7ad
                     {{ wpId === "0" ? jczbmap.jybm : gxkmap.ndjxs }}
                   </td>
                   <td class="unit gray">