whj 1 year ago
parent
commit
74237453ab

+ 8 - 5
src/views/check/checkjob/CheckJob.vue

@@ -16,7 +16,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="设备等级">
-                <a-select v-model="queryParam.sblevel" placeholder="请选择">
+                <a-select mode="multiple" v-model="queryParam.sbLevelList" placeholder="请选择">
                   <a-select-option
                     v-for="(label,value) in levelMap"
                     :key="value"
@@ -42,7 +42,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="维护等级">
-                <a-select v-model="queryParam.standardLevel" placeholder="请选择">
+                <a-select mode="multiple" v-model="queryParam.standardLevelList" placeholder="请选择">
                   <a-select-option
                     v-for="(label,value) in standardLevelMap"
                     :key="value"
@@ -54,7 +54,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="周期类型">
-                <a-select v-model="queryParam.periodType" placeholder="请选择">
+                <a-select mode="multiple" v-model="queryParam.periodTypeList" placeholder="请选择">
                   <a-select-option
                     v-for="(label,value) in periodTypeMap"
                     :key="value"
@@ -406,8 +406,11 @@ export default {
         parameter = {
           ...parameter,
           ...this.queryParam,
-          dataScope: {
-          }
+          record: this.status === 3 ? 1 : null,
+          dataScope: this.status === 3 ? {
+            sortBy: 'desc',
+            sortName: 'actual_start_time'
+          } : {}
         }
         return getCheckJobPage(Object.assign(parameter, this.queryParam))
           .then(res => {

+ 4 - 3
src/views/check/checkstandard/CheckStandard.vue

@@ -35,7 +35,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="设备等级">
-                <a-select v-model="queryParam.sbLevel" placeholder="请选择">
+                <a-select mode="multiple" v-model="queryParam.sbLevelList" placeholder="请选择">
                   <a-select-option
                     v-for="(label,value) in sbLevelMap"
                     :key="value"
@@ -47,7 +47,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="维护等级">
-                <a-select v-model="queryParam.level" placeholder="请选择">
+                <a-select mode="multiple" v-model="queryParam.levelList" placeholder="请选择">
                   <a-select-option
                     v-for="(label,value) in levelMap"
                     :key="value"
@@ -59,7 +59,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="计划周期">
-                <a-select v-model="queryParam.periodType" placeholder="请选择">
+                <a-select mode="multiple" v-model="queryParam.periodTypeList" placeholder="请选择">
                   <a-select-option
                     v-for="(label,value) in periodTypeMap"
                     :key="value"
@@ -349,6 +349,7 @@ export default {
     this.actionTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.CHECK_PLAN_ACTION_TYPE)
     this.levelMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.CHECK_PLAN_LEVEL)
     this.checkUserTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.CHECK_USER_TYPE)
+    this.sbLevelMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SBINFO_LEVEL)
     fetchSbTypeTree().then(res => {
       this.treeData = res.data
     })