update

src/components/dialog/index.vue

@@ -222,7 +222,7 @@ export default {
       font-size: @fontsize-s;
       letter-spacing: 1px;
       cursor: pointer;
-      width: 13%;
+      width: 12.5%;
       height: 30px;
       line-height: 30px;
       text-align: center;

src/views/LightMatrix2/LightMatrix2.vue

@@ -479,7 +479,6 @@ export default {
               });
             }
           }
-<<<<<<< HEAD
           this.sourceMap = sourceMap;
           console.log("sourceMap:", this.sourceMap);
           if (this.fillCategory) {
@@ -489,9 +488,6 @@ export default {
           this.sourceMap = {};
         }
       });
-=======
-      })
->>>>>>> 3b486cbf51a994e6589ad87ac4d58315b74be4f5
     },
 
     // 查看风机详情