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

src/components/chart/line/table-line-chart.vue

@@ -46,13 +46,13 @@ export default {
   },
   computed: {
     xdata() {
-      return this.list.map((t) => {
-        return t.text;
+      return this.list.map((t,index) => {
+        return t.text || index;
       });
     },
     values() {
       return this.list.map((t) => {
-        return t.value;
+        return t.value || t;
       });
     },
   },

src/views/HealthControl/Health5.vue

@@ -89,6 +89,7 @@ export default {
     },
     // 跳转按钮
     onClickJump(item){
+      console.warn(item);
        this.$router.push({
         path: `/health/health0/${item.wpId}/${item.wtId}`
       });

src/views/LightMatrix3/LightMatrix3.vue

@@ -81,22 +81,23 @@
                 <div class="card-right">
                   <div class="num">
                     <i class="svg-icon svg-icon-sm" :class="cItem.color != 'red' ? 'svg-icon-' + cItem.color : 'svg-icon-white'">
-                      <SvgIcon svgid="svg-W"></SvgIcon>
+                      <SvgIcon svgid="svg-P"></SvgIcon>
                     </i>
-                    <span>{{ cItem.gl }}</span>
+                    <span>{{ cItem.fs }}</span>
                   </div>
                   <div class="num">
                     <i class="svg-icon svg-icon-sm" :class="cItem.color != 'red' ? 'svg-icon-' + cItem.color : 'svg-icon-white'">
-                      <SvgIcon svgid="svg-R"></SvgIcon>
+                      <SvgIcon svgid="svg-W"></SvgIcon>
                     </i>
-                    <span>{{ cItem.fdjzs.toFixed(2) }}</span>
+                    <span>{{ cItem.gl }}</span>
                   </div>
                   <div class="num">
                     <i class="svg-icon svg-icon-sm" :class="cItem.color != 'red' ? 'svg-icon-' + cItem.color : 'svg-icon-white'">
-                      <SvgIcon svgid="svg-P"></SvgIcon>
+                      <SvgIcon svgid="svg-R"></SvgIcon>
                     </i>
-                    <span>{{ cItem.fs }}</span>
+                    <span>{{ cItem.fdjzs.toFixed(2) }}</span>
                   </div>
+             
                 </div>
               </div>
             </div>

src/views/Status/Status.vue

@@ -7,7 +7,7 @@
     <div class="table-box">
       <ComTable :data="tableData"></ComTable>
     </div>
-  </div>
+  </div> 
 </template>
 
 <script>