Merge branch 'dev' of gitlab.suntrayoa.com:geqilin/energyai_vue into dev

src/pages/eq/view/query-detail.vue

@@ -2,7 +2,7 @@
 .animation
   .info-title
     | {{ dataForm.name }}
-    <el-button @click='csHandle'>点我</el-button>
+    //- <el-button @click='csHandle'>点我</el-button>
     //- | 空调
     el-button(
       icon="el-icon-close",
@@ -20,7 +20,7 @@
     .quDetailM
       p.leftP 设备编号：&nbsp;&nbsp;&nbsp; {{ dataForm.code }}
     .quDetailM
-      p.leftP 设备品牌：&nbsp;&nbsp;&nbsp; 格力
+      p.leftP 设备品牌：&nbsp;&nbsp;&nbsp; {{ dataForm.brandName }}
     .quDetailM
       p.leftP 设备型号：&nbsp;&nbsp;&nbsp;{{ dataForm.equipmentModel }}
     .quDetailM