فهرست منبع

修改tb bug,现场任务修改传参,根据按钮状态查询条件,修改batch分页组件查询数量,BIMID显示

shaun-sheep 4 سال پیش
والد
کامیت
aa5b689a6c

+ 5 - 3
src/components/data_admin/buildTask/dialog/modelTaskDialog.vue

@@ -20,7 +20,7 @@
         <el-table-column prop="EquipLocalName" label="设备本地名称" show-overflow-tooltip width="100"></el-table-column>
         <el-table-column prop="EquipLocalID" label="设备本地编码" show-overflow-tooltip width="100"></el-table-column>
         <el-table-column prop="EquipCategory.EquipName" label="设备类" show-overflow-tooltip width="120"></el-table-column>
-        <el-table-column prop="BimId" label="BIM Id" show-overflow-tooltip width="80"></el-table-column>
+        <el-table-column prop="BIMID" label="BIM Id" show-overflow-tooltip width="80"></el-table-column>
         <el-table-column prop="type" label="现场验证操作规定" width="150">
           <template slot-scope="scope">
             <el-select style="width:100px;" v-model="scope.row.SchemeId" placeholder="请选择">
@@ -122,9 +122,11 @@
 
       if (this.params.isVerification) {
         // params.Filters += `;(TaskState isNull || TaskState=0 || TaskState=-1)`
-        params.Filters += `;(TaskState!=0 || TaskState!=-1 || TaskState!=1)`
+        // params.Filters += `;(TaskState!=0 || TaskState!=-1 || TaskState!=1)`
+        params.Filters += `;TaskState isnull`
       } else {
-        params.Filters += `;(TaskState!=1)`
+        // params.Filters += `;(TaskState!=1)`
+        params.Filters += `;(TaskState isnull or TaskState !=1 )`
       }
 
       if (this.params.device) {

+ 2 - 4
src/components/dialogs/list/batchDialog.vue

@@ -62,11 +62,9 @@
         <div style="margin: 15px "></div>
         <div class="checkbox">
           <p v-for="(item,index) in newEnclosure">
-            <el-checkbox
-              v-model="form[item.Path]"
-            >
-            <span  @click="multiple(item.Path)">{{item.InfoPointName}}</span>
+            <el-checkbox v-model="form[item.Path]">
             </el-checkbox>
+            <span  @click="multiple(item.Path)"  style="cursor: pointer">{{item.InfoPointName}}</span>
             <span
               class="text-color"
               v-for="i in item.value"

+ 2 - 2
src/components/ledger/handsontables/assets.vue

@@ -226,8 +226,8 @@
       return {
         infoType: '',
         batchPage: {
-          size: 50,
-          sizes: [10, 30, 50, 100, 150, 200],
+          size: 100,
+          sizes: [100,  200,500,1000],
           total: 0,
           currentPage: 1
         },

+ 2 - 2
src/components/ledger/handsontables/device.vue

@@ -246,8 +246,8 @@
         },
         pageKey: new Date().getTime(),
         batchPage: {
-          size: 50,
-          sizes: [10, 30, 50, 100, 150, 200],
+          size: 100,
+          sizes: [100,  200,500,1000],
           total: 0,
           currentPage: 1
         },

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

@@ -177,9 +177,12 @@
 
       if(this.params.isVerification !== false){
         // params.Filters += `;(TaskState isNull || TaskState=0)`
-        params.Filters += `;(TaskState!=0 || TaskState!=-1 || TaskState!=1)`
+        // params.Filters += `;(TaskState!=0 || TaskState!=-1 || TaskState!=1)`
+        params.Filters += `;TaskState isnull`
+
       } else {
-        params.Filters += `;(TaskState!=1)`
+        // params.Filters += `;(TaskState!=1)`
+        params.Filters += `;(TaskState isnull or TaskState !=1 )`
 
       }
 

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

@@ -222,9 +222,12 @@
 
       if(this.params.isVerification){
         // params.Filters += `;(TaskState isNull || TaskState=0 || TaskState=-1)`
-        params.Filters += `;(TaskState!=0 || TaskState!=-1 || TaskState!=1)`
+        // params.Filters += `;(TaskState!=0 || TaskState!=-1 || TaskState!=1)`
+        params.Filters += `;TaskState isnull`
+
       } else {
-        params.Filters += `;(TaskState!=1)`
+        // params.Filters += `;(TaskState!=1)`
+        params.Filters += `;(TaskState isnull or TaskState !=1 )`
 
       }