合并冲突

licp

2024-07-24 56b7f5dd6fda8c39f0b7038a265d507e0d22227c

 src/components/view/b3-classes.vue

@@ -68,7 +68,7 @@
            </div>
          </div>
        </div>
        <div class="scroll-right" id="nav" style="cursor: move;">
        <div class="scroll-right">
          <div class="content">
            <div class="content-title content-title-right" style="border-bottom: 0;">
              <div class="content-title-item" v-for="(item,index) in weeks" :key="'b'+index">
@@ -324,13 +324,13 @@
    }
    this.monthList.reverse()
    // this.getPower()
    this.scrollInit()
  },
  methods: {
    refresh(){
      this.list = [];
      this.yearList = []
      this.keyMap = {};
      this.finishLoding = false;
      this.currentPage = 1
      this.query = {
        userName:'',
@@ -347,6 +347,7 @@
    refreshTable(){
      this.keyMap = {};
      this.currentPage = 1
      this.finishLoding = false;
      if(this.query.month){
        this.list = [];
        this.init()
@@ -575,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({
@@ -585,6 +595,8 @@
        })
        this.laboratory = data
      })
      }

    },
    handleCommand(e,m){
      if(e!=m.shift){
@@ -727,7 +739,6 @@
  margin-left: 220px;
  overflow-x: scroll;
  /* overflow-x: hidden; */
  cursor: move;
}

.content {