Merge remote-tracking branch 'origin/master'

src/views/pms/device/index.vue

@@ -35,9 +35,9 @@
               class="!w-200px"
             />
           </el-form-item>
-          <el-form-item :label="t('iotDevice.brand')" prop="brand">
+          <el-form-item :label="t('iotDevice.brand')" prop="brandName">
             <el-input
-              v-model="queryParams.brand"
+              v-model="queryParams.brandName"
               :placeholder="t('iotDevice.brandHolder')"
               clearable
               @keyup.enter="handleQuery"
@@ -222,6 +222,7 @@ const queryParams = reactive({
   deviceCode: undefined,
   deviceName: undefined,
   brand: undefined,
+  brandName: undefined,
   model: undefined,
   deptId: undefined,
   deviceStatus: undefined,

src/views/pms/stat/rhkb.vue

@@ -88,10 +88,10 @@
       </el-card>
     </el-col>
     <el-col :span="7">
-      <el-card class="chart-card" shadow="never">
+      <el-card class="chart-card" shadow="never" >
         <template #header>
           <div class="flex items-center">
-            <span class="text-base font-medium text-gray-600">设备类别TOP5数量</span>
+            <span class="text-base font-medium text-gray-600">设备类别TOP数量</span>
           </div>
         </template>
         <div ref="topContainer" class="h-[290px]"></div>