|  | @@ -45,15 +45,30 @@
 | 
	
		
			
				|  |  |            </el-select>
 | 
	
		
			
				|  |  |          </el-form-item>
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -        <el-form-item label="年份" prop="year">
 | 
	
		
			
				|  |  | +<!--        <el-form-item label="年份" prop="year">
 | 
	
		
			
				|  |  |            <el-date-picker
 | 
	
		
			
				|  |  |              value-format='yyyy'
 | 
	
		
			
				|  |  |              v-model="queryParams.year"
 | 
	
		
			
				|  |  |              type="year"
 | 
	
		
			
				|  |  |              placeholder="选择年份">
 | 
	
		
			
				|  |  |            </el-date-picker>
 | 
	
		
			
				|  |  | -        </el-form-item>
 | 
	
		
			
				|  |  | +        </el-form-item>-->
 | 
	
		
			
				|  |  | +        <el-form-item label="统计范围" prop="part">
 | 
	
		
			
				|  |  | +          <el-select
 | 
	
		
			
				|  |  | +            style="width: 100%"
 | 
	
		
			
				|  |  | +            v-model="queryParams.part"
 | 
	
		
			
				|  |  | +            placeholder="请选择统计范围"
 | 
	
		
			
				|  |  | +            clearable
 | 
	
		
			
				|  |  | +          >
 | 
	
		
			
				|  |  | +            <el-option
 | 
	
		
			
				|  |  | +              v-for="item in halfYearOptions"
 | 
	
		
			
				|  |  | +              :key="item.value"
 | 
	
		
			
				|  |  | +              :label="item.label"
 | 
	
		
			
				|  |  | +              :value="item.value">
 | 
	
		
			
				|  |  | +            </el-option>
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | +          </el-select>
 | 
	
		
			
				|  |  | +        </el-form-item>
 | 
	
		
			
				|  |  |        </el-form>
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |        <el-row :gutter="10" >
 | 
	
	
		
			
				|  | @@ -112,8 +127,7 @@ import tableList from '@/mixins/tableList'
 | 
	
		
			
				|  |  |  import {listReport, selectAllOrg} from "@/api/core/reportForms/safetyInspectReport";
 | 
	
		
			
				|  |  |  import treeselect from '@riophae/vue-treeselect'
 | 
	
		
			
				|  |  |  import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 | 
	
		
			
				|  |  | -import {deptTreeSelect, businessTreeSelect} from "@/api/system/public";
 | 
	
		
			
				|  |  | -//import orgTree from "@/components/orgTree";
 | 
	
		
			
				|  |  | +import dayjs from "dayjs";
 | 
	
		
			
				|  |  |  import OrgTree from "@/components/orgTree/orgQuerySelector.vue";
 | 
	
		
			
				|  |  |  export default {
 | 
	
		
			
				|  |  |    dicts: ['sys_normal_disable', 'sys_org_type'],
 | 
	
	
		
			
				|  | @@ -161,6 +175,7 @@ export default {
 | 
	
		
			
				|  |  |          pageSize: 10,
 | 
	
		
			
				|  |  |          orgId: null,
 | 
	
		
			
				|  |  |          year: new Date(),
 | 
	
		
			
				|  |  | +        part : 0,
 | 
	
		
			
				|  |  |        },
 | 
	
		
			
				|  |  |        // 表单参数
 | 
	
		
			
				|  |  |        form: {},
 | 
	
	
		
			
				|  | @@ -182,8 +197,14 @@ export default {
 | 
	
		
			
				|  |  |            {required: true, message: '请输入NFC点位名称', trigger: 'change'}
 | 
	
		
			
				|  |  |          ],
 | 
	
		
			
				|  |  |        },
 | 
	
		
			
				|  |  | -      defaultKeys: []
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | +      defaultKeys: [],
 | 
	
		
			
				|  |  | +      halfYearOptions: [{
 | 
	
		
			
				|  |  | +        label: "上半年",
 | 
	
		
			
				|  |  | +        value: 0
 | 
	
		
			
				|  |  | +      }, {
 | 
	
		
			
				|  |  | +        label: "下半年",
 | 
	
		
			
				|  |  | +        value: 1
 | 
	
		
			
				|  |  | +      }],
 | 
	
		
			
				|  |  |      };
 | 
	
		
			
				|  |  |    },
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -195,6 +216,7 @@ export default {
 | 
	
		
			
				|  |  |    },
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |    created() {
 | 
	
		
			
				|  |  | +    this.setInitialPartValue();
 | 
	
		
			
				|  |  |      //this.getDeptTree();
 | 
	
		
			
				|  |  |      // this.getList();
 | 
	
		
			
				|  |  |    },
 | 
	
	
		
			
				|  | @@ -202,6 +224,7 @@ export default {
 | 
	
		
			
				|  |  |      ...mapGetters(["orgId"]),
 | 
	
		
			
				|  |  |    },
 | 
	
		
			
				|  |  |    methods: {
 | 
	
		
			
				|  |  | +    dayjs,
 | 
	
		
			
				|  |  |      getDefaultOrg(node) {
 | 
	
		
			
				|  |  |        this.queryParams.orgId = node.id;
 | 
	
		
			
				|  |  |        this.selectedOrgName = node.shortName;
 | 
	
	
		
			
				|  | @@ -262,7 +285,18 @@ export default {
 | 
	
		
			
				|  |  |        })
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | +    setInitialPartValue() {
 | 
	
		
			
				|  |  | +      const now = dayjs();
 | 
	
		
			
				|  |  | +      const startOfYear = dayjs().startOf('year'); // 1月1日 00:00:00
 | 
	
		
			
				|  |  | +      const endOfFirstHalf = dayjs().month(5).endOf('month'); // 6月30日 23:59:59
 | 
	
		
			
				|  |  | +      console.log("startOfYear", startOfYear)
 | 
	
		
			
				|  |  | +      console.log("endOfFirstHalf", endOfFirstHalf)
 | 
	
		
			
				|  |  | +      if (now.isAfter(startOfYear) && now.isBefore(endOfFirstHalf)) {
 | 
	
		
			
				|  |  | +        this.queryParams.part = 0; // 上半年
 | 
	
		
			
				|  |  | +      } else {
 | 
	
		
			
				|  |  | +        this.queryParams.part = 1; // 下半年
 | 
	
		
			
				|  |  | +      }
 | 
	
		
			
				|  |  | +    },
 | 
	
		
			
				|  |  |      // 取消按钮
 | 
	
		
			
				|  |  |      cancel() {
 | 
	
		
			
				|  |  |        this.open = false;
 |