Merge branch 'develop' into single-develop

src/views/ems/site/sblb/index.vue

@@ -24,20 +24,20 @@
       </el-form-item>
     </el-form>
     <el-button type="primary" @click="addDevice" native-type="button">新增设备</el-button>
-    <!--    <el-dropdown @command="(val)=>downloadPointDetail(val,false)">-->
+    <el-dropdown @command="(val)=>downloadPointDetail(val,false)">
-    <!--      <el-button-->
+      <el-button
-    <!--          style="margin-left:10px;"-->
+          style="margin-left:10px;"
-    <!--          type="primary"-->
+          type="primary"
-    <!--          plain>-->
+          plain>
-    <!--        下载点位清单-->
+        下载点位清单
-    <!--      </el-button>-->
+      </el-button>
-    <!--      <el-dropdown-menu slot="dropdown">-->
+      <el-dropdown-menu slot="dropdown">
-    <!--        <el-dropdown-item v-for="(item,index) in deviceCategoryList" :key="index+'deviceCategoryList'"-->
+        <el-dropdown-item v-for="(item,index) in deviceCategoryList" :key="index+'deviceCategoryList'"
-    <!--                          :command="item">-->
+                          :command="item">
-    <!--          {{ item.name }}-->
+          {{ item.name }}
-    <!--        </el-dropdown-item>-->
+        </el-dropdown-item>
-    <!--      </el-dropdown-menu>-->
+      </el-dropdown-menu>
-    <!--    </el-dropdown>-->
+    </el-dropdown>
     <!--    <el-dropdown @command="(val)=>uploadPointDetail(val,false)">-->
     <!--      <el-button-->
     <!--          style="margin-left:10px;"-->