Merge branch 'hhhhh' of shuzhihua/pms-iot-vue into master

src/views/pms/device/index.vue

@@ -192,19 +192,22 @@
                 style="display: inline-block"
                 class="text-[#ad9399] w-[70px] text-[12px] cursor-pointer z-[999] justify-center flex items-center"
               >
-                <el-popover placement="bottom" :width="200" trigger="hover">
+                <el-popover placement="bottom" :width="250" trigger="hover">
                   <template #reference>
                     <div class="flex items-center">
                       <span> 油服编码 </span> <Icon icon="ep:arrow-down" />
                     </div>
                   </template>
-                  <el-input
-                    v-model="queryParams.yfDeviceCode"
-                    placeholder="请输入油服编码"
-                    style="width: 150px"
-                    clearable
-                    @keyup.enter="handleQuery"
-                  />
+                  <div class="flex items-center gap-2">
+                    <el-input
+                      v-model="queryParams.yfDeviceCode"
+                      placeholder="请输入油服编码"
+                      style="width: 180px"
+                      clearable
+                      @keyup.enter="handleQuery"
+                    />
+                    <el-button type="primary" :icon="Search" @click="handleQuery">搜索</el-button>
+                  </div>
                 </el-popover>
               </span>
             </template>
@@ -222,31 +225,27 @@
                 style="display: inline-block"
                 class="text-[#ad9399] w-[70px] text-[12px] cursor-pointer z-[999] justify-center flex items-center"
               >
-                <el-popover placement="bottom" :width="200" trigger="hover">
+                <el-popover placement="bottom" :width="250" trigger="hover">
                   <template #reference>
                     <div class="flex items-center">
                       <span> 历史编码 </span> <Icon icon="ep:arrow-down" />
                     </div>
                   </template>
-                  <el-input
-                    v-model="queryParams.deviceCode"
-                    placeholder="请输入历史编码"
-                    style="width: 150px"
-                    clearable
-                    @keyup.enter="handleQuery"
-                  />
+                  <div class="flex items-center gap-2">
+                    <el-input
+                      v-model="queryParams.deviceCode"
+                      placeholder="请输入历史编码"
+                      style="width: 180px"
+                      clearable
+                      @keyup.enter="handleQuery"
+                    />
+                    <el-button type="primary" :icon="Search" @click="handleQuery">搜索</el-button>
+                  </div>
                 </el-popover>
               </span>
             </template>
           </el-table-column>
-          <el-table-column
-            label="设备号"
-            sortable
-            align="center"
-            prop="deviceNo"
-            width="120"
-            fixed="left"
-          />
+
           <el-table-column
             :label="t('iotDevice.name')"
             sortable
@@ -259,19 +258,22 @@
                 style="display: inline-block"
                 class="text-[#ad9399] w-[70px] text-[12px] cursor-pointer z-[999] justify-center flex items-center"
               >
-                <el-popover placement="bottom" :width="200" trigger="hover">
+                <el-popover placement="bottom" :width="250" trigger="hover">
                   <template #reference>
                     <div class="flex items-center">
                       <span> 设备名称 </span> <Icon icon="ep:arrow-down" />
                     </div>
                   </template>
-                  <el-input
-                    v-model="queryParams.deviceName"
-                    placeholder="请输入设备名称"
-                    style="width: 150px"
-                    clearable
-                    @keyup.enter="handleQuery"
-                  />
+                  <div class="flex items-center gap-2">
+                    <el-input
+                      v-model="queryParams.deviceName"
+                      placeholder="请输入设备名称"
+                      style="width: 180px"
+                      clearable
+                      @keyup.enter="handleQuery"
+                    />
+                    <el-button type="primary" :icon="Search" @click="handleQuery">搜索</el-button>
+                  </div>
                 </el-popover>
               </span>
             </template>
@@ -282,6 +284,7 @@
               </el-link>
             </template>
           </el-table-column>
+          <el-table-column label="设备号" sortable align="center" prop="deviceNo" width="120" />
           <el-table-column
             :label="t('iotDevice.dept')"
             align="center"
@@ -354,7 +357,7 @@
           />
 
           <el-table-column label="车牌号" align="center" prop="carNo" min-width="170" />
-          <el-table-column label="所在地点" align="center" prop="address" min-width="170" />
+
           <el-table-column
             :label="t('deviceForm.mfg')"
             align="center"
@@ -391,6 +394,7 @@
             prop="assetOwnership"
             min-width="170"
           />
+          <el-table-column label="所在地点" align="center" prop="address" min-width="170" />
           <el-table-column
             :label="t('operationFill.operation')"
             align="center"
@@ -444,6 +448,7 @@ import { buildSortingField } from '@/utils'
 import { defaultProps, handleTree } from '@/utils/tree'
 import * as ProductClassifyApi from '@/api/pms/productclassify'
 import { useRefreshStore } from '@/store/modules/pms/refreshStore'
+import { Search } from '@element-plus/icons-vue'
 
 /** 设备台账 列表 */
 defineOptions({ name: 'IotDevicePms' })