Merge remote-tracking branch 'origin/v0.1.1' into v0.1.1

src/views/iot/deviceInfo/index.vue

@@ -177,6 +177,7 @@ export default {
         { label: "DO8小时控电", value: "16"},
         { label: "三相电电压传感器", value: "17"},
         { label: "盗情传感器", value: "18"},
+        { label: "DO8小时采集", value: "21"},
       ],
       // 遮罩层
       loading: true,
@@ -262,7 +263,7 @@ export default {
         this.queryParams.deviceTypeList = ["4"];
         this.deviceTypeSelectList = this.AlarmHostDeviceTypeList;
       }else if ("fsu" === this.activeName){
-        this.queryParams.deviceTypeList = ["5","6","7","8","9","10","11","12","13","14","15","16","17","18"];
+        this.queryParams.deviceTypeList = ["5","6","7","8","9","10","11","12","13","14","15","16","17","18","21"];
         this.deviceTypeSelectList = this.FsuDeviceTypeList;
       }
       this.getList();