Merge branch 'mw2' of http://61.161.152.110:10101/r/electronic-map into mw2

src/views/Decision/Decision1.vue

@@ -230,9 +230,7 @@
 				value3: [],
 				value4: "",
 				value5: "",
-				barColor: [partten.getColor("purple"), partten.getColor("green"), partten.getColor("pink"), partten
-					.getColor("red"), partten.getColor("orange"), partten.getColor("grayl")
-				],
+				barColor:['#4b55ae','#e17e23','#ba3237','#c531c7','#ffffff','#05bb4c'],
 				TypeClass: 1, //风场，项目，集电线路 的按钮颜色，默认第一个
 				bardata: [],
 				lineData: [],

src/views/LightMatrix2/LightMatrix2.vue

@@ -596,6 +596,7 @@ export default {
         flex: 1 0 110px;
       }
       .card {
+		  cursor: pointer;
         margin-right: 4px;
         margin-top: 4px;
         flex: 1 0 110px;

src/views/LightMatrix3/LightMatrix3.vue

@@ -68,7 +68,7 @@
             </div>
           </div>
           <div class="panel-body">
-            <div class="card" v-for="(cItem, cIndex) in pItem" :key="cIndex" :class="cItem.color">
+            <div class="card" v-for="(cItem, cIndex) in pItem" :key="cIndex" :class="cItem.color" @click="goDetails(cItem)">
               <div class="card-panel">
                 <div class="card-left">
                   <div class="tag">{{ cItem.wtnum }}</div>
@@ -385,6 +385,18 @@ export default {
         },
       });
     },
+	// 查看风机详情
+	goDetails(item) {
+	  if (item.wpId.indexOf("FDC") !== -1) {
+	    this.$router.push({
+	      path: `/monitor/windsite/info/${item.wpId}/${item.wtId}`
+	    });
+	  } else {
+	    // this.$router.push({
+	    //   path: `/info/inverter-info/${item.wpId}/${item.wtId}`
+	    // });
+	  }
+	},
   },
 
   created() {
@@ -788,6 +800,7 @@ export default {
         .card-panel {
           display: flex;
           flex-grow: row;
+		  cursor: pointer;
 
           .card-left {
             width: 40px;