提交代码

fhKeeper/formulahousekeeper/timesheet/src/views/corpreport/list.vue

@@ -153,7 +153,7 @@
         </template>
 
         <template v-if="ins == 27">
-          <el-radio v-model="isWarn" label="1">仅显示预警数据</el-radio>
+          <el-checkbox v-model="isWarn" @change="groupChange()">仅显示预警数据</el-checkbox>
         </template>
 
         <el-select v-if="ins == 24 && tabPosition == 1" v-model="groupConsumptionName" placeholder="请选择任务分组" :clearable="tabsType == 'all' ? true : false" filterable size="small" @change="getList(true)" :multiple="tabsType == 'all' ? true : false" collapse-tags style="margin-left:10px; width: 250px" :key="groupTaskKey">
@@ -2017,7 +2017,7 @@ export default {
       selectStageName: '',
 
       estimatedWorkingHoursType: '按项目查看',
-      isWarn: '0'
+      isWarn: false
     };
   },
   computed: {},
@@ -2733,7 +2733,7 @@ export default {
           // url = "/project/exportProjectEstimatedWorkTime"
           url = "/project/exportProjectEstimatedWorkNew"
           this.proJuctId ? sl.projectId = this.proJuctId : ''
-          this.isWarn == '1' ? sl.isWarn = 1 : ''
+          this.isWarn ? sl.isWarn = 1 : ''
           this.estimatedWorkingHoursType == '按项目查看' ? sl.type = 0 : sl.type = 1
         }else if(this.ins == 28) {
           fName = this.$t('yuanGongRenWuWanChengQingKuangBiao') + '.xlsx'
@@ -4439,7 +4439,7 @@ export default {
         pageSize: this.size,
         type: this.estimatedWorkingHoursType == '按项目查看' ? 0 : 1
       }
-      this.isWarn == '1' ? parameter.isWarn = '1' : ''
+      this.isWarn ? parameter.isWarn = '1' : ''
       this.proJuctId ? parameter.projectId = this.proJuctId : ''
       this.listLoading = true
       // let { data } = await this.postData('/project/getProjectEstimatedWork', {

fhKeeper/formulahousekeeper/timesheet_h5/src/views/deviceManagement/useRegistration.vue

@@ -148,11 +148,11 @@ export default {
     },
     scanClick() {
       this.showQrcode = true
-      setTimeout(() => {
-        // const val = '{"id":3,"deviceCode":"设备编号1","deviceName":"设备名称1","deviceModel":"设备型号1","manufacturer":"制造商1","purchaseDate":"2024-10-09","maintenanceDate":"2024-10-10","companyId":10,"usageStatus":false,"usageUserId":null,"usageUserName":null,"projectId":null,"projectName":null,"startTime":null,"endTime":null,"startOrEnd":null,"deviceLogId":null,"useTime":null}'
-        const val = localStorage.getItem('scanCodeData')
-        this.determineQrcode(val)
-      }, 3000)
+      // setTimeout(() => {
+      //   // const val = '{"id":3,"deviceCode":"设备编号1","deviceName":"设备名称1","deviceModel":"设备型号1","manufacturer":"制造商1","purchaseDate":"2024-10-09","maintenanceDate":"2024-10-10","companyId":10,"usageStatus":false,"usageUserId":null,"usageUserName":null,"projectId":null,"projectName":null,"startTime":null,"endTime":null,"startOrEnd":null,"deviceLogId":null,"useTime":null}'
+      //   const val = localStorage.getItem('scanCodeData')
+      //   this.determineQrcode(val)
+      // }, 3000)
     },
     determineQrcode(val) {
       console.log(val, '<=========== val')