bug

src/views/system/device/index.vue

@@ -16,7 +16,7 @@
             <el-form-item label="资产类别" prop="assetType">
 
               <el-select style="width: 100%;"  v-model="queryParams.assetType" placeholder="请选择"
-                @change="changeSelectDevice">
+                @change="searchChangeSelectDevice">
                 <el-option v-for="dict in dict.type.sys_asset_type" :key="dict.value" :label="dict.label"
                   :value="`${dict.value}`"></el-option>
               </el-select>
@@ -25,7 +25,7 @@
             <el-form-item label="设备分类" prop="deviceType">
 
               <el-select style="width: 100%;"  v-model="queryParams.deviceType" placeholder="请选择">
-                <el-option v-for="item in devices" :key="item.dictValue" :label="item.dictLabel"
+                <el-option v-for="item in searchDevices" :key="item.dictValue" :label="item.dictLabel"
                   :value="item.dictValue"></el-option>
               </el-select>
             </el-form-item>
@@ -275,6 +275,7 @@ export default {
       // 【请填写功能名称】表格数据
       deviceList: [],
       devices: null,
+      searchDevices:null,
       //主机集合
       hostList: [],
       deviceType: 0,
@@ -302,6 +303,7 @@ export default {
         channel: null,
         checkSub: true
       },
+
         // 设备导入参数
         upload: {
         // 是否显示弹出层（用户导入）
@@ -532,6 +534,15 @@ export default {
         })
       }
     },
+    searchChangeSelectDevice(val) {
+      if (val) {
+        getDeviceType(val).then(response => {
+          this.searchDevices = response.data;
+          this.form.deviceType = null;
+          this.queryParams.deviceType = null;
+        })
+      }
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();

src/views/system/user/extend.vue

@@ -32,6 +32,14 @@
                   :value="dict.value" />
               </el-select>
             </el-form-item>
+          </el-col> 
+
+          <el-col :xs="24" :sm="12" :md="8" :lg="8">
+            <el-form-item label="初级以上相关专业技术职业资格" v-if="formData.certificateWork != 0" label-width="240" prop="professionalQualifications">
+              <el-input style="width: 280px;" maxlength="50" v-model="formData.professionalQualifications"
+                placeholder="请输入初级以上相关专业技术职业资格">
+              </el-input>
+            </el-form-item>
           </el-col>
         </el-row>
         <el-row>
@@ -82,25 +90,16 @@
             </el-form-item>
           </el-col>
 
-          <el-col :xs="24" :sm="12" :md="8" :lg="8">
-            <el-form-item label="初级以上相关专业技术职业资格" label-width="240" prop="professionalQualifications">
+          <!-- <el-col :xs="24" :sm="12" :md="8" :lg="8">
+            <el-form-item label="初级以上相关专业技术职业资格" v-if="formData.certificateWork != 0" label-width="240" prop="professionalQualifications">
               <el-input style="width: 280px;" maxlength="50" v-model="formData.professionalQualifications"
                 placeholder="请输入初级以上相关专业技术职业资格">
               </el-input>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
-
         <el-row>
 
-          <!-- <el-col :xs="24" :sm="12" :md="8" :lg="6">
-            <el-form-item label="持证上岗未通过原因" v-if="formData.certificateWork==0" label-width="180" prop="certificateFailReason">
-              <el-select style="width: 190px;" v-model="formData.certificateFailReason" placeholder="请选择持证上岗未通过原因">
-                <el-option v-for="dict in dict.type.post_no_pass" :key="dict.value" :label="dict.label"
-                  :value="dict.value" />
-              </el-select>
-            </el-form-item>
-          </el-col> -->
             <el-col :xs="24" :sm="12" :md="8" :lg="6">
             <el-form-item prop="bornTime" label="出生日期">
               <el-date-picker v-model="formData.bornTime" @change="startDateChanged"