设备筛选bug处理

vue/src/views/iot/device/index.vue

@@ -259,11 +259,13 @@ export default {
         let productId = this.$route.query.productId
         if (productId != null) {
             this.queryParams.productId = Number(productId);
+            this.queryParams.groupId=null;
         }
         // 分组筛选
         let groupId = this.$route.query.groupId
         if (groupId != null) {
             this.queryParams.groupId = Number(groupId);
+            this.queryParams.productId=null;
         }
         this.getList();
 
@@ -278,11 +280,13 @@ export default {
             let productId = this.$route.query.productId
             if (productId != null) {
                 this.queryParams.productId = Number(productId);
+                this.queryParams.groupId=null;
             }
             // 分组筛选
             let groupId = this.$route.query.groupId
             if (groupId != null) {
                 this.queryParams.groupId = Number(groupId);
+                this.queryParams.productId=null;
             }
             this.getList();
         }

vue/src/views/iot/device/running-status.vue

@@ -331,14 +331,14 @@ export default {
         updateDeviceStatus(device) {
             if (device.status == 3) {
                 this.statusColor.background = '#12d09f';
-                this.title = "设备控制（在线）";
+                this.title = "在线模式";
             } else {
                 if (device.isShadow == 1) {
                     this.statusColor.background = '#409EFF';
-                    this.title = "设备控制（影子模式）";
+                    this.title = "影子模式";
                 } else {
                     this.statusColor.background = '#909399';
-                    this.title = "设备控制（设备不在线 未启用影子）";
+                    this.title = "离线模式";
                     this.shadowUnEnable = true;
                 }
             }

vue/src/views/iot/product/product-authorize.vue

@@ -41,17 +41,12 @@
 
     <el-table v-loading="loading" :data="authorizeList" @selection-change="handleSelectionChange" @cell-dblclick="celldblclick" size="small">
         <el-table-column type="selection" :selectable="selectable" width="55" align="center" />
-        <el-table-column label="状态" align="center" prop="active" width="100">
-            <template slot-scope="scope">
-                <dict-tag :options="dict.type.iot_auth_status" :value="scope.row.status" />
-            </template>
-        </el-table-column>
-        <el-table-column label="状态" align="center" prop="active" width="100">
-            <template slot-scope="scope">
-                <dict-tag :options="dict.type.iot_auth_status" :value="scope.row.status" />
-            </template>
-        </el-table-column>
         <el-table-column label="授权码" width="320" align="center" prop="authorizeCode" />
+        <el-table-column label="状态" align="center" prop="active" width="100">
+            <template slot-scope="scope">
+                <dict-tag :options="dict.type.iot_auth_status" :value="scope.row.status" />
+            </template>
+        </el-table-column>
         <el-table-column label="设备ID" width="75" align="center" prop="deviceId" />
         <el-table-column label="设备编号" width="150" align="center" prop="serialNumber" />
         <el-table-column label="授权时间" align="center" prop="updateTime" width="180">
@@ -186,7 +181,7 @@ export default {
             // 编辑类型，remark=备注、auth=设备授权
             editType: '',
             // 编辑界面宽度
-            editWidth:'500px',
+            editWidth: '500px',
             // 遮罩层
             loading: true,
             // 选中数组
@@ -365,10 +360,10 @@ export default {
                 this.open = true;
                 if (this.editType == 'auth') {
                     this.title = "选择设备";
-                    this.editWidth="800px";
+                    this.editWidth = "800px";
                 } else {
                     this.title = "备注信息";
-                    this.editWidth="500px";
+                    this.editWidth = "500px";
                 }
                 // 取消选中