设备页面调整

src/views/system/device/index.vue

@@ -19,16 +19,16 @@
                 <el-input clearable v-model="queryParams.deviceName" placeholder="请输入关键字" maxlength="50"
                           @keyup.enter.native="handleQuery"/>
               </el-form-item>
-              <el-form-item label="设备大类" prop="assetType" label-width="80">
-                <el-select style="width: 100%;" v-model="queryParams.assetType" placeholder="请选择设备大类"
+              <el-form-item label="设备类别" prop="assetType" label-width="80">
+                <el-select style="width: 100%;" v-model="queryParams.assetType" placeholder="请选择设备类别"
                            @change="queryAssetSelectChange" @clear="clearAsset" clearable>
                   <el-option v-for="item in getAssetDict('AssetDeviceType',-1)" :key="item.id" :label="item.name"
                              :value="item.id"></el-option>
                 </el-select>
               </el-form-item>
 
-              <el-form-item label="设备小类" prop="deviceType" label-width="80">
-                <el-select style="width: 100%;" clearable v-model="queryParams.deviceType" placeholder="请选择设备小类">
+              <el-form-item label="设备分类" prop="deviceType" label-width="80">
+                <el-select style="width: 100%;" clearable v-model="queryParams.deviceType" placeholder="请选择设备分类">
                   <el-option v-for="item in assetChildrenDictList" :key="item.id" :label="item.name"
                              :value="item.id"></el-option>
                 </el-select>
@@ -72,8 +72,8 @@
             <el-table-column label="地区" align="left" prop="affiliatedArea"/>
             <el-table-column label="行社" align="left" prop="affiliatedBank"/>
             <el-table-column label="所属机构" align="left" prop="orgName"/>
-            <el-table-column label="设备大类" align="center" key="assetType" prop="assetType"/>
-            <el-table-column label="设备小类" align="center" key="deviceType" prop="deviceType"/>
+            <el-table-column label="设备类别" align="center" key="assetType" prop="assetType"/>
+            <el-table-column label="设备分类" align="center" key="deviceType" prop="deviceType"/>
             <el-table-column label="设备名称" align="center" prop="deviceName"/>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
               <template slot-scope="scope">
@@ -133,36 +133,37 @@
             </el-form-item>
           </el-col> -->
           <el-col :span="12">
-            <el-form-item label="设备名称" prop="deviceName">
-              <el-input
-                v-model="form.deviceName"
-                placeholder="请输入设备名称"
-                maxlength="50"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="设备大类" prop="assetType">
+            <el-form-item label="设备类别" prop="assetType">
               <el-select style="width: 100%" v-model="form.assetType" :popper-append-to-body="false"
-                         placeholder="请选择设备大类" @change="assetSelectChange">
+                         placeholder="请选择设备类别" @change="assetSelectChange">
                 <el-option v-for="item in getAssetDict('AssetDeviceType',-1)" :key="item.id" :label="item.name"
                            :value="item.id"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
 
-        <el-row>
-          
           <el-col :span="12">
-            <el-form-item label="设备小类" prop="deviceType">
+            <el-form-item label="设备分类" prop="deviceType">
               <el-select style="width: 100%" :popper-append-to-body="false" clearable v-model="form.deviceType"
-                         placeholder="请选择设备小类">
+                         placeholder="请选择设备分类">
                 <el-option v-for="item in assetChildrenDictList" :key="item.id" :label="item.name"
                            :value="item.id"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+
+        <el-row>
+          
+          <el-col :span="12">
+            <el-form-item label="设备名称" prop="deviceName">
+              <el-input
+                v-model="form.deviceName"
+                placeholder="请输入设备名称"
+                maxlength="50"
+              />
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="设备品牌" prop="deviceBrand">
               <el-select style="width: 100%" v-model="form.deviceBrand" placeholder="请选择设备品牌"
@@ -325,10 +326,10 @@ export default {
         assetNo: [{required: true, message: "请输入资产编号", trigger: "change"}],
         deviceName: [{required: true, message: "请输入设备名称", trigger: "change"}],
         orgId: [{required: true, message: "请选择所属机构", trigger: "blur"}],
-        assetType: [{required: true, message: '请选择设备大类', trigger: 'change'}],
+        assetType: [{required: true, message: '请选择设备类别', trigger: 'change'}],
         /*  hostId: [{required: true, message: '请选择主机', trigger: 'change'}],
           channel: [{required: true, message: '请输入通道号', trigger: 'change'}],*/
-        deviceType: [{required: true, message: "请选择设备小类", trigger: "change"}],
+        deviceType: [{required: true, message: "请选择设备分类", trigger: "change"}],
         // deviceStatus: [{required: true, message: "请选择资产状态", trigger: "blur"}],
       },
       // 遮罩层