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

src/views/pms/device/index.vue

@@ -380,81 +380,22 @@
             </template>
           </el-table-column>
           <el-table-column
-            :label="t('iotDevice.assets')"
-            align="center"
-            prop="assetProperty"
-            min-width="110"
-          >
-            <template #header>
-              <div class="flex items-center justify-center pb-[1px]">
-                <el-dropdown @command="handleAssetProperty">
-                  <span class="text-[#ad9399] text-[12px] cursor-pointer flex items-center gap-1">
-                    <span> 资产性质 </span> <Icon icon="ep:arrow-down" />
-                  </span>
-                  <template #dropdown>
-                    <el-dropdown-menu>
-                      <el-dropdown-item
-                        v-for="item in getStrDictOptions(DICT_TYPE.PMS_ASSET_PROPERTY)"
-                        :key="item.label"
-                        :command="item.value"
-                        >{{ item.label }}</el-dropdown-item
-                      >
-                    </el-dropdown-menu>
-                  </template>
-                </el-dropdown>
-              </div>
-            </template>
-            <template #default="scope">
-              <dict-tag :type="DICT_TYPE.PMS_ASSET_PROPERTY" :value="scope.row.assetProperty" />
-            </template>
-          </el-table-column>
-          <el-table-column
-            :label="t('iotDevice.assetClass')"
+            :label="t('deviceForm.model')"
             align="center"
-            prop="assetClassName"
+            prop="model"
             min-width="170"
           >
-            <template #header>
-              <span
-                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="250" trigger="click">
-                  <template #reference>
-                    <div class="flex items-center cursor-pointer gap-1" @click.stop>
-                      <span> {{ t('iotDevice.assetClass') }} </span> <Icon icon="ep:arrow-down" />
-                    </div>
-                  </template>
-                  <div class="flex items-center gap-2">
-                    <el-tree-select
-                      :teleported="false"
-                      v-model="queryParams.assetClass"
-                      :data="productClassifyList"
-                      :props="defaultProps"
-                      check-strictly
-                      node-key="id"
-                      :placeholder="t('deviceForm.categoryHolder')"
-                      filterable
-                      @change="handleQuery"
-                    />
-                  </div>
-                </el-popover>
-              </span>
-            </template>
-          </el-table-column>
-
-          <el-table-column label="车牌号" align="center" prop="carNo" min-width="170">
             <template #header>
               <el-popover placement="bottom" :width="250" trigger="click">
                 <template #reference>
                   <div class="flex items-center cursor-pointer gap-1" @click.stop>
-                    <span> 车牌号 </span> <Icon icon="ep:arrow-down" />
+                    <span> {{ t('deviceForm.model') }} </span> <Icon icon="ep:arrow-down" />
                   </div>
                 </template>
                 <div class="flex items-center gap-2">
                   <el-input
-                    v-model="queryParams.carNo"
-                    placeholder="请输入车牌号"
+                    v-model="queryParams.model"
+                    placeholder="请输入规格型号"
                     style="width: 180px"
                     clearable
                   />
@@ -498,23 +439,19 @@
               </el-popover>
             </template>
           </el-table-column>
-          <el-table-column
-            :label="t('deviceForm.brand')"
-            align="center"
-            prop="brandName"
-            min-width="150"
-          >
+
+          <el-table-column label="车牌号" align="center" prop="carNo" min-width="170">
             <template #header>
               <el-popover placement="bottom" :width="250" trigger="click">
                 <template #reference>
                   <div class="flex items-center cursor-pointer gap-1" @click.stop>
-                    <span> {{ t('deviceForm.brand') }} </span> <Icon icon="ep:arrow-down" />
+                    <span> 车牌号 </span> <Icon icon="ep:arrow-down" />
                   </div>
                 </template>
                 <div class="flex items-center gap-2">
                   <el-input
-                    v-model="queryParams.brandName"
-                    placeholder="请输入品牌"
+                    v-model="queryParams.carNo"
+                    placeholder="请输入车牌号"
                     style="width: 180px"
                     clearable
                   />
@@ -523,23 +460,24 @@
               </el-popover>
             </template>
           </el-table-column>
+
           <el-table-column
-            :label="t('deviceForm.model')"
+            :label="t('deviceForm.brand')"
             align="center"
-            prop="model"
-            min-width="170"
+            prop="brandName"
+            min-width="150"
           >
             <template #header>
               <el-popover placement="bottom" :width="250" trigger="click">
                 <template #reference>
                   <div class="flex items-center cursor-pointer gap-1" @click.stop>
-                    <span> {{ t('deviceForm.model') }} </span> <Icon icon="ep:arrow-down" />
+                    <span> {{ t('deviceForm.brand') }} </span> <Icon icon="ep:arrow-down" />
                   </div>
                 </template>
                 <div class="flex items-center gap-2">
                   <el-input
-                    v-model="queryParams.model"
-                    placeholder="请输入规格型号"
+                    v-model="queryParams.brandName"
+                    placeholder="请输入品牌"
                     style="width: 180px"
                     clearable
                   />
@@ -548,6 +486,72 @@
               </el-popover>
             </template>
           </el-table-column>
+
+          <el-table-column
+            :label="t('iotDevice.assetClass')"
+            align="center"
+            prop="assetClassName"
+            min-width="170"
+          >
+            <template #header>
+              <span
+                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="250" trigger="click">
+                  <template #reference>
+                    <div class="flex items-center cursor-pointer gap-1" @click.stop>
+                      <span> {{ t('iotDevice.assetClass') }} </span> <Icon icon="ep:arrow-down" />
+                    </div>
+                  </template>
+                  <div class="flex items-center gap-2">
+                    <el-tree-select
+                      :teleported="false"
+                      v-model="queryParams.assetClass"
+                      :data="productClassifyList"
+                      :props="defaultProps"
+                      check-strictly
+                      node-key="id"
+                      :placeholder="t('deviceForm.categoryHolder')"
+                      filterable
+                      @change="handleQuery"
+                    />
+                  </div>
+                </el-popover>
+              </span>
+            </template>
+          </el-table-column>
+
+          <el-table-column
+            :label="t('iotDevice.assets')"
+            align="center"
+            prop="assetProperty"
+            min-width="110"
+          >
+            <template #header>
+              <div class="flex items-center justify-center pb-[1px]">
+                <el-dropdown @command="handleAssetProperty">
+                  <span class="text-[#ad9399] text-[12px] cursor-pointer flex items-center gap-1">
+                    <span> 资产性质 </span> <Icon icon="ep:arrow-down" />
+                  </span>
+                  <template #dropdown>
+                    <el-dropdown-menu>
+                      <el-dropdown-item
+                        v-for="item in getStrDictOptions(DICT_TYPE.PMS_ASSET_PROPERTY)"
+                        :key="item.label"
+                        :command="item.value"
+                        >{{ item.label }}</el-dropdown-item
+                      >
+                    </el-dropdown-menu>
+                  </template>
+                </el-dropdown>
+              </div>
+            </template>
+            <template #default="scope">
+              <dict-tag :type="DICT_TYPE.PMS_ASSET_PROPERTY" :value="scope.row.assetProperty" />
+            </template>
+          </el-table-column>
+
           <el-table-column
             :label="t('devicePerson.rp')"
             align="center"