Pārlūkot izejas kodu

现场验证任务-“只选择未验证过的”开关状态,修改传参

shaun-sheep 4 gadi atpakaļ
vecāks
revīzija
ef16d4ebae

+ 4 - 1
src/components/data_admin/buildTask/dialog/modelTaskDialog.vue

@@ -121,7 +121,10 @@
       }
 
       if (this.params.isVerification) {
-        params.Filters += `;(TaskState isNull || TaskState=0 || TaskState=-1)`
+        // params.Filters += `;(TaskState isNull || TaskState=0 || TaskState=-1)`
+        params.Filters += `;(TaskState!=0 || TaskState!=-1 || TaskState!=1)`
+      } else {
+        params.Filters += `;(TaskState!=1)`
       }
 
       if (this.params.device) {

+ 6 - 2
src/views/data_admin/buildTask/addTask/addAssetsTask.vue

@@ -175,8 +175,12 @@
         PageSize: this.page.pageSize
       }
 
-      if(this.params.isVerification){
-        params.Filters += `;(TaskState isNull || TaskState=0)`
+      if(this.params.isVerification !== false){
+        // params.Filters += `;(TaskState isNull || TaskState=0)`
+        params.Filters += `;(TaskState!=0 || TaskState!=-1 || TaskState!=1)`
+      } else {
+        params.Filters += `;(TaskState!=1)`
+
       }
 
       if(this.keycode){

+ 5 - 1
src/views/data_admin/buildTask/addTask/addDeviceTask.vue

@@ -221,7 +221,11 @@
       }
 
       if(this.params.isVerification){
-        params.Filters += `;(TaskState isNull || TaskState=0 || TaskState=-1)`
+        // params.Filters += `;(TaskState isNull || TaskState=0 || TaskState=-1)`
+        params.Filters += `;(TaskState!=0 || TaskState!=-1 || TaskState!=1)`
+      } else {
+        params.Filters += `;(TaskState!=1)`
+
       }
 
       if(this.keycode){

+ 1 - 0
src/views/data_admin/buildTask/addTask/addModelTask.vue

@@ -75,6 +75,7 @@
     },
   },
   created() {
+
     this.query = this.$route.query
   },
   methods: {

+ 1 - 1
src/views/screen/splitscreen/equipledger/index.vue

@@ -142,4 +142,4 @@ $borderColor: rgba(201, 201, 201, 1);
     }
   }
 }
-</style>
+</style>