合并冲突

licp

2024-07-24 56b7f5dd6fda8c39f0b7038a265d507e0d22227c

合并冲突

 src/components/do/b3-work-time-management/work-time-statistics.vue

@@ -99,6 +99,7 @@
                    requiredAdd: [],
                    requiredUp: [],
          accept: '.xlsx',
        sort: false,
          inputType: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
          cellSpecialStyle:{
            redColorByKey:'Hours'
@@ -114,6 +115,7 @@
                            order: 'desc'
                        }
                    },
        sort: false,
                    isIndex: true,
                    showSelect: false,
                    select: false,

 src/components/tool/value-table.vue

@@ -628,7 +628,7 @@
            this.tableData.map(item => {
              Object.keys(item).forEach(val => {
                if (item[val] === null && val.includes('Hours')) {
                  item[val] = '0'
                  item[val] = 0
                }
              })
            })
@@ -641,7 +641,7 @@
              if (item.value.length === 4) {
                item.width = 120
              } else if (item.value.length === 3){
                item.width = 100
                item.width = this.data.sort === false && item.label.includes('Hours') ? 50 : 100
              } else if (item.value.length === 5){
                item.width = 130
              } else if (item.value.length === 7){
@@ -649,7 +649,7 @@
              } else if (item.value.length === 6){
                item.width = 150
              } else {
                item.width = 86
                item.width = this.data.sort === false && item.label.includes('Hours') ? 46 : 86
              }
            })
          }

 src/components/view/b3-classes.vue

@@ -576,7 +576,16 @@
      })
    },
    obtainItemParameterList() {
      this.$axios.get(this.$api.laboratoryScope.obtainItemParameterList).then(res => {
      if(this.PROJECT == '检测中心') {
        this.laboratory = [{
                            label: '通信产品实验室',
                            value: '通信产品实验室'
                          }, {
                            label: '电力产品实验室',
                            value: '电力产品实验室'
                          }]
      } else {
        this.$axios.get(this.$api.laboratoryScope.obtainItemParameterList).then(res => {
        let data = []
        res.data.forEach(a => {
          data.push({
@@ -586,6 +595,8 @@
        })
        this.laboratory = data
      })
      }

    },
    handleCommand(e,m){
      if(e!=m.shift){