feat:优化产品与设备搜索条件

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

@@ -4,13 +4,13 @@
       <div class="system-user-search mb15">
         <el-form :model="tableData.param" ref="queryRef" inline>
           <el-form-item label="名称" prop="name">
-            <el-input v-model="tableData.param.name" placeholder="请输入设备名称" clearable style="width: 170px" @keyup.enter.native="typeList" />
-          </el-form-item>
-          <el-form-item label="标识" prop="key">
-            <el-input v-model="tableData.param.key" placeholder="请输入设备标识" clearable style="width: 165px" @keyup.enter.native="typeList" />
+            <el-input v-model="tableData.param.name" placeholder="输入名称或标识" clearable style="width: 150px" @keyup.enter.native="typeList" />
           </el-form-item>
+<!--          <el-form-item label="标识" prop="key">-->
+<!--            <el-input v-model="tableData.param.key" placeholder="请输入设备标识" clearable style="width: 150px" @keyup.enter.native="typeList" />-->
+<!--          </el-form-item>-->
           <el-form-item label="所属产品" prop="productKey">
-            <el-select v-model="tableData.param.productKey" style="width: 140px" filterable placeholder="请选择产品">
+            <el-select v-model="tableData.param.productKey" style="width: 140px" filterable placeholder="选择产品">
               <el-option v-for="item in productData" :key="item.key" :label="item.name" :value="item.key" value-key="id"> </el-option>
             </el-select>
           </el-form-item>
@@ -23,9 +23,9 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="创建时间" prop="dateRange">
-            <el-date-picker v-model="tableData.param.dateRange" style="width: 240px" value-format="YYYY-MM-DD" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-          </el-form-item>
+<!--          <el-form-item label="创建时间" prop="dateRange">-->
+<!--            <el-date-picker v-model="tableData.param.dateRange" style="width: 240px" value-format="YYYY-MM-DD" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>-->
+<!--          </el-form-item>-->
           <el-form-item>
             <el-button type="primary" class="ml10" @click="typeList">
               <el-icon>
@@ -105,8 +105,8 @@
           </template>
         </el-table-column>
         <el-table-column label="设备名称" prop="name" min-width="160" show-overflow-tooltip v-col="'name'" />
-        <el-table-column label="设备类型" prop="product.deviceType" min-width="120" align="center" show-overflow-tooltip v-col="'deviceType'" />
-        <el-table-column label="产品名称" prop="productName" min-width="120" align="center" show-overflow-tooltip v-col="'productName'" />
+        <el-table-column label="设备类型" prop="product.deviceType" min-width="100" align="center" show-overflow-tooltip v-col="'deviceType'" />
+        <el-table-column label="所属产品" prop="productName" min-width="120" align="center" show-overflow-tooltip v-col="'productName'" />
         <el-table-column prop="status" label="状态" min-width="80" align="center" v-col="'status'">
           <template #default="scope">
             <el-tag type="info" size="small" v-if="scope.row.status == 1">离线</el-tag>
@@ -114,7 +114,7 @@
             <el-tag type="info" size="small" v-if="scope.row.status == 0">未启用</el-tag>
           </template>
         </el-table-column>
-        <el-table-column prop="createdAt" label="创建时间" align="center" width="160" v-col="'registryTime'"></el-table-column>
+        <el-table-column prop="lastOnlineTime" label="最后上线时间" align="center" width="160" v-col="'lastOnlineTime'"></el-table-column>
         <el-table-column prop="desc" label="说明" show-overflow-tooltip v-col="'desc'"></el-table-column>
 
         <el-table-column label="操作" width="180" align="center" fixed="right">

src/views/iot/device/product/component/editPro.vue

@@ -80,10 +80,10 @@
 
 				<el-form-item label="设备类型" prop="deviceType">
 					<el-radio-group v-model="ruleForm.deviceType">
-						<el-radio label="设备">设备</el-radio>
-						<el-radio label="网关">网关</el-radio>
-						<el-radio label="子设备">子设备</el-radio>
-					</el-radio-group>
+						<el-radio label="设备">直连设备</el-radio>
+						<el-radio label="子设备">网关子设备</el-radio>
+            <el-radio label="网关">网关设备</el-radio>
+          </el-radio-group>
 				</el-form-item>
 				<el-form-item label="产品描述	" prop="desc">
 					<el-input v-model="ruleForm.desc" type="textarea" placeholder="请输入产品描述"></el-input>

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

@@ -2,21 +2,21 @@
   <div class="page">
     <el-card shadow="nover">
       <el-form :model="tableData.param" ref="queryRef" inline label-width="68px">
-        <el-form-item label="产品名称" prop="name">
-          <el-input v-model="tableData.param.name" placeholder="请输入产品名称" clearable style="width: 240px" @keyup.enter.native="typeList" />
+        <el-form-item label="名称" prop="name">
+          <el-input v-model="tableData.param.name" placeholder="输入名称或标识" clearable style="width: 150px" @keyup.enter.native="typeList" />
         </el-form-item>
-        <el-form-item label="设备类型" prop="deviceType">
-          <el-input v-model="tableData.param.deviceType" placeholder="请输入设备类型" clearable style="width: 240px" @keyup.enter.native="typeList" />
+        <el-form-item label="类型" prop="deviceType">
+          <el-input v-model="tableData.param.deviceType" placeholder="请输入设备类型" clearable style="width: 150px" @keyup.enter.native="typeList" />
         </el-form-item>
-        <el-form-item label="发布状态" prop="status" style="width: 200px;">
+        <el-form-item label="发布状态" prop="status" style="width: 180px;">
           <el-select v-model="tableData.param.status" placeholder="发布状态" clearable style="width: 240px">
             <el-option label="已发布" :value="1" />
             <el-option label="未发布" :value="0" />
           </el-select>
         </el-form-item>
-        <el-form-item label="创建时间" prop="dateRange">
-          <el-date-picker v-model="tableData.param.dateRange" style="width: 240px" value-format="YYYY-MM-DD" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-        </el-form-item>
+<!--        <el-form-item label="创建时间" prop="dateRange">-->
+<!--          <el-date-picker v-model="tableData.param.dateRange" style="width: 240px" value-format="YYYY-MM-DD" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>-->
+<!--        </el-form-item>-->
         <el-form-item>
           <el-button type="primary" class="ml10" @click="typeList">
             <el-icon>
@@ -51,7 +51,7 @@
         </el-table-column>
         <el-table-column label="名称" prop="name" min-width="160" show-overflow-tooltip v-col="'name'" />
         <el-table-column label="分类" prop="categoryName" align="center" width="140" show-overflow-tooltip v-col="'categoryName'" />
-        <el-table-column label="消息协议" prop="messageProtocol" align="center" min-width="150" show-overflow-tooltip v-col="'messageProtocol'" />
+<!--        <el-table-column label="消息协议" prop="messageProtocol" align="center" min-width="150" show-overflow-tooltip v-col="'messageProtocol'" />-->
         <el-table-column label="接入方式" prop="transportProtocol" min-width="120" align="center" show-overflow-tooltip v-col="'transportProtocol'" />
         <el-table-column label="类型" prop="deviceType" min-width="90" align="center" show-overflow-tooltip v-col="'deviceType'" />
         <el-table-column prop="status" label="状态" min-width="90" align="center" v-col="'status'">