Merge remote-tracking branch 'origin/master'

value

2024-05-09 9179bb148443b849a709ffc83464cd316c47eef1

Merge remote-tracking branch 'origin/master'

 src/assets/api/controller.js

@@ -22,6 +22,7 @@
    certification,
    sealScope,
    informationNotification,
    performanceShift,
    }
}

@@ -256,3 +257,9 @@
  triggerModificationStatusToRead:"/informationNotification/triggerModificationStatusToRead",//点击详情触发修改状态为已读
}

const performanceShift = {
  add:"/performanceShift/add",//绩效管理-班次-排班
  page:"/performanceShift/page",//绩效管理-班次-分页查询
  update:"/performanceShift/update/",//绩效管理-班次-班次状态修改
}


 src/components/view/b1-sample.vue

@@ -292,7 +292,7 @@
        <el-button type="primary" @click="confirmExport" :loading="upLoadExport">ç¡® å®š</el-button>
      </span>
    </el-dialog>
    <el-dialog title="库位维护" :visible.sync="keepVisible" width="350px">
    <el-dialog title="库位维护" :visible.sync="keepVisible" width="350px" :append-to-body="true">
      <el-tree :data="warehouse" ref="tree" :props="{ children: 'warehouseShelfList', label: 'name' }" node-key="id"
        :filter-node-method="filterNode" @node-click="handleNodeClick" highlight-current @node-expand="nodeOpen"
        @node-collapse="nodeClose" :default-expanded-keys="expandedKeys" v-if="keepVisible"
@@ -302,7 +302,7 @@
            <el-col :span="20">
              <span><i
                  :class="`node_i ${node.level<2 ? 'el-icon-folder-opened': 'el-icon-tickets'}`"></i>
                {{ data.name }}{{ node.level }}</span>
                {{ data.name }}</span>
            </el-col>
            <el-col :span="4" v-if="node.level<3">
              <el-button type="text" size="mini" icon="el-icon-edit" @click.stop="handleEdit(data,node.level)">
@@ -895,6 +895,12 @@
              this.entity.shelfId = this.shelf[0].id
              this.handleShelf(this.entity.shelfId)
            }
          }else if(this.warehouse.length>0){
            this.warehouseChange(this.entity.warehouseId)
            if(this.shelf.length>0){
              this.entity.shelfId = this.shelf[0].id
              this.handleShelf(this.entity.shelfId)
            }
          }
        })
      },
@@ -979,6 +985,7 @@
                }).then(res => {
            this.upLoadWarehouse = false;
            this.warehouseVisible = false
            // this.keepVisible = false
            this.currentEdit = null;
            if (res.code == 201) {
              this.$message.error('修改失败')
@@ -986,6 +993,8 @@
            }
            this.$message.success('修改成功')
            this.selectList()
            this.name = ''
            this.warehouseChange(this.entity.warehouseId)
          })
        }else{
          // æ–°å¢žä»“库
@@ -1000,10 +1009,10 @@
            }
            this.$message.success('添加成功')
            this.selectList()
            this.name = ''
            this.warehouseChange(this.entity.warehouseId)
          })
        }
        this.name = ''
        this.warehouseChange(this.entity.warehouseId)
      },
      // æ·»åŠ /修改货架
      confirmShelves() {
@@ -1031,11 +1040,12 @@
                }).then(res => {
            this.upLoadShelves = false;
            this.shelvesVisible = false
            // this.keepVisible = false
            if (res.code == 201) {
              this.$message.error('添加失败')
              this.$message.error('修改失败')
              return
            }
            this.$message.success('添加成功')
            this.$message.success('修改成功')
            this.selectList()
            this.currentEdit ={};
          })
@@ -1070,6 +1080,7 @@
      },
      nodeOpen(data, node, el) {
        $($(el.$el).find('.node_i')[0]).attr('class', 'node_i el-icon-folder-opened')
        this.selectTree[node.level-1] = data.id;
      },
      nodeClose(data, node, el) {
        $($(el.$el).find('.node_i')[0]).attr('class', 'node_i el-icon-folder')

 src/components/view/b3-classes copy.vue

ÎļþÒÑɾ³ý

 src/components/view/b3-classes.vue

@@ -25,10 +25,10 @@
            :value="item.value">
          </el-option>
        </el-select>
        <el-input v-model="query.name" placeholder="请输入人员名称" size="small" style="width: 140px;margin: 0 16px;" clearable ></el-input>
        <el-select v-model="query.addr" placeholder="请选择实验室" style="width: 140px;" size="small" clearable >
        <el-input v-model="query.userName" placeholder="请输入人员名称" size="small" style="width: 140px;margin: 0 16px;" clearable ></el-input>
        <el-select v-model="query.laboratory" placeholder="请选择实验室" style="width: 140px;" size="small" clearable >
          <el-option
            v-for="item in labOptions"
            v-for="item in laboratory"
            :key="item.value"
            :label="item.label"
            :value="item.value">
@@ -42,53 +42,57 @@
    </div>
    <div class="search_thing btns" style="padding-left: 30px;">
      <el-button size="small" type="primary">导 å‡º</el-button>
      <el-button size="small" type="primary" @click="handleScheduling">排 ç­</el-button>
      <el-button size="small" type="primary" @click="schedulingVisible = true">排 ç­</el-button>
    </div>
  </div>
  <div class="center">
    <div class="fixed-left">
      <div class="content-title" style="padding-left: 16px;box-sizing: border-box;">
        äººå‘˜åç§°
      </div>
      <div class="content-user" :class="{hoverType:currentUserIndex==index}" v-for="(item,index) in userList" :key="'e'+index" v-on:mouseenter="onMouseEnter(index)"
      v-on:mouseleave="currentUserIndex=null">
        <div class="user-pic">{{ item.name.charAt(0) }}</div>
        <div class="user-info">
          <p style="font-size: 14px;color: #3A7BFA;line-height: 24px;">{{ item.name }} ({{ item.part }})</p>
          <p style="color: #999999;font-size: 12px;transform: scale(0.8) translateX(-20px);white-space: nowrap;width: 150px;overflow-x: show;">早:{{ item.day0 }}, ä¸­:{{ item.day1 }}, å¤œ:{{ item.day2 }}, ä¼‘:{{ item.day3 }}, å‡:{{ item.day4 }}</p>
          <p style="margin-top: 4px;"><span style="color: #999999;font-size: 12px;display: inline-block;transform: scale(0.8) translateX(-10px);">合计出勤: </span><span style="font-size: 16px;
color: #FF4902;">{{ item.day5 }}天</span></p>
        </div>
      </div>
    </div>
    <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">
            <span class="month" v-if="item.day==1">{{ item.month }}</span>
            <span class="day">{{ item.day }}</span>
            <span class="week">{{ item.week }}</span>
  <div class="center" v-loading="pageLoading">
    <scroll-pagination @load="init" :finishLoding="finishLoding">
      <div>
        <div class="fixed-left">
          <div class="content-title" style="padding-left: 16px;box-sizing: border-box;">
            äººå‘˜åç§°
          </div>
          <div class="content-user" :class="{hoverType:currentUserIndex==index}" v-for="(item,index) in list" :key="'e'+index" v-on:mouseenter="onMouseEnter(index)"
          v-on:mouseleave="currentUserIndex=null">
            <div class="user-pic">{{ item.name.charAt(0) }}</div>
            <div class="user-info">
              <p style="font-size: 14px;color: #3A7BFA;line-height: 24px;">{{ item.name }}</p>
              <p style="color: #999999;font-size: 12px;transform: scale(0.8) translateX(-20px);white-space: nowrap;width: 150px;overflow-x: show;">早: {{ item.day0 }}，中: {{ item.day1 }}，夜: {{ item.day2 }}，休: {{ item.day3 }}，假: {{ item.day4 }}</p>
              <p style="margin-top: 4px;"><span style="color: #999999;font-size: 12px;display: inline-block;transform: scale(0.8) translateX(-10px);">合计出勤: </span><span style="font-size: 16px;
    color: #FF4902;">{{ item.totalAttendance }}天</span></p>
            </div>
          </div>
        </div>
        <div class="content-body" v-for="(item,index) in 5" :key="'c'+index"
        :class="{hoverType:currentUserIndex==index}"v-on:mouseenter="onMouseEnter(index)"
      v-on:mouseleave="currentUserIndex=null">
          <div class="content-body-item" v-for="(m,i) in workList" :key="'d'+i">
            <div class="work-box" :class="{type0:m.type=='早班',type1:m.type=='中班',type2:m.type=='夜班',}">
              <div class="work-box-left">
                <span>{{ m.type }}</span>
        <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">
                <span class="month">{{ item.weekNum }}周</span>
                <span class="day">{{ item.day }}</span>
                <span class="week">{{ item.week }}</span>
              </div>
              <el-dropdown trigger="click" placement="bottom" @command="e=>handleCommand(e,m)">
                <i class="el-icon-arrow-down el-icon--right" style="font-size: 20px;color: #fff;cursor: pointer;"></i>
                <el-dropdown-menu slot="dropdown">
                  <el-dropdown-item v-for="(n,j) in classType" :key="'h'+j" :command="n.value">{{ n.label }}</el-dropdown-item>
                </el-dropdown-menu>
              </el-dropdown>
            </div>
            <div class="content-body" v-for="(item,index) in list" :key="'c'+index"
            :class="{hoverType:currentUserIndex==index}"v-on:mouseenter="onMouseEnter(index)"
          v-on:mouseleave="currentUserIndex=null">
              <div class="content-body-item" v-for="(m,i) in item.list" :key="'d'+i">
                <div class="work-box" :class="{type0:m.shift==='0',type1:m.shift==='1',type2:m.shift==='2',type3:m.shift==='3',type4:m.shift==='4',}">
                  <div class="work-box-left">
                    <span>{{ getShiftByDic(m.shift) }}</span>
                  </div>
                  <el-dropdown trigger="click" placement="bottom" @command="e=>handleCommand(e,m)">
                    <i class="el-icon-arrow-down el-icon--right" style="font-size: 20px;color: #fff;cursor: pointer;"></i>
                    <el-dropdown-menu slot="dropdown">
                      <el-dropdown-item v-for="(n,j) in classType" :key="'h'+j" :command="n.value">{{ n.label }}</el-dropdown-item>
                    </el-dropdown-menu>
                  </el-dropdown>
                </div>
              </div>
            </div>
          </div>
        </div>
      </div>
    </div>
    </scroll-pagination>
  </div>
  <el-dialog title="排班" :visible.sync="schedulingVisible" width="400px">
    <div class="search_thing">
@@ -105,12 +109,12 @@
    <div class="search_thing">
      <div class="search_label" style="width:90px">人员名称：</div>
      <div class="search_input">
        <el-select v-model="schedulingQuery.person" placeholder="请选择" style="width: 100%;" multiple clearable >
        <el-select v-model="schedulingQuery.userId" placeholder="请选择" style="width: 100%;" multiple clearable collapse-tags >
          <el-option
            v-for="item in personList"
            :key="item.value"
            :label="item.label"
            :value="item.value">
            :key="item.id"
            :label="item.name"
            :value="item.id">
          </el-option>
        </el-select>
      </div>
@@ -118,7 +122,7 @@
    <div class="search_thing">
      <div class="search_label" style="width:90px">班次：</div>
      <div class="search_input">
        <el-select v-model="schedulingQuery.person" placeholder="请选择" style="width: 100%;">
        <el-select v-model="schedulingQuery.shift" placeholder="请选择" style="width: 100%;">
          <el-option
            v-for="item in classType"
            :key="item.value"
@@ -137,14 +141,21 @@
</template>

<script>
import {
        getYearAndMonthAndDays
    } from '../../util/date'
  import ScrollPagination from '../tool/scroll-paging.vue'
export default {
  components: {
    ScrollPagination
  },
  data () {
    return{
      currentYear:new Date().getFullYear(),
      currentMonth:new Date().getMonth()+1,
      query:{
        name:'',
        addr:'',
        userName:'',
        laboratory:'',
        year:'',
        month:''
      },
@@ -198,158 +209,8 @@
          label:'12月'
        },
      ],
      labOptions:[],
      weeks:[
        {
          month:'14周',
          week:'周一',
          day:1,
        },
        {
          month:'14周',
          week:'周二',
          day:2,
        },
        {
          month:'14周',
          week:'周三',
          day:3,
        },
        {
          month:'14周',
          week:'周四',
          day:4,
        },
        {
          month:'14周',
          week:'周五',
          day:5,
        },
        {
          month:'14周',
          week:'周六',
          day:6,
        },
        {
          month:'14周',
          week:'周日',
          day:7,
        },
        {
          month:'14周',
          week:'周一',
          day:8,
        },
        {
          month:'14周',
          week:'周二',
          day:9,
        },
        {
          month:'14周',
          week:'周三',
          day:10,
        },
        {
          month:'14周',
          week:'周四',
          day:11,
        },
        {
          month:'14周',
          week:'周五',
          day:12,
        },
        {
          month:'14周',
          week:'周六',
          day:13,
        },{
          month:'14周',
          week:'周日',
          day:14,
        },
        {
          month:'14周',
          week:'周一',
          day:15,
        },
        {
          month:'14周',
          week:'周一',
          day:16,
        },
        {
          month:'14周',
          week:'周一',
          day:17,
        },
        {
          month:'14周',
          week:'周一',
          day:18,
        },
        {
          month:'14周',
          week:'周一',
          day:19,
        },
        {
          month:'14周',
          week:'周一',
          day:20,
        },
        {
          month:'14周',
          week:'周一',
          day:21,
        },
        {
          month:'14周',
          week:'周一',
          day:22,
        },
        {
          month:'14周',
          week:'周一',
          day:23,
        },
        {
          month:'14周',
          week:'周一',
          day:24,
        },
        {
          month:'14周',
          week:'周一',
          day:25,
        },
        {
          month:'14周',
          week:'周一',
          day:26,
        },
        {
          month:'14周',
          week:'周一',
          day:27,
        },
        {
          month:'14周',
          week:'周一',
          day:28,
        },
        {
          month:'14周',
          week:'周一',
          day:29,
        },
        {
          month:'14周',
          week:'周一',
          day:30,
        },
      ],
      laboratory:[],
      weeks:[],
      workList:[
        {
          type:'早班',
@@ -473,81 +334,138 @@
        },
      ],
      classType:[],
      userList:[
        {
          name:'李媛媛',
          part:'材料',
          day0:12,//早
          day1:12,//中
          day2:12,//夜
          day3:12,//休
          day4:12,//请假
          day5:12,//总计
        },
        {
          name:'李媛媛',
          part:'材料',
          day0:12,//早
          day1:12,//中
          day2:12,//夜
          day3:12,//休
          day4:12,//请假
          day5:12,//总计
        },
        {
          name:'李媛媛',
          part:'材料',
          day0:12,//早
          day1:12,//中
          day2:12,//夜
          day3:12,//休
          day4:12,//请假
          day5:12,//总计
        },
        {
          name:'李媛媛',
          part:'材料',
          day0:12,//早
          day1:12,//中
          day2:12,//夜
          day3:12,//休
          day4:12,//请假
          day5:12,//总计
        },
        {
          name:'李媛媛',
          part:'材料',
          day0:12,//早
          day1:12,//中
          day2:12,//夜
          day3:12,//休
          day4:12,//请假
          day5:12,//总计
        },
      ],
      currentUserIndex:null,
      schedulingVisible:false,
      personList:[],
      loading:false,
      schedulingQuery:{
        week:'',
        person:''
      }
        userId:null,
        shift:''
      },
      list:[],
      currentPage: 1, // å½“前页
      pageSize: 10, // ä¸€é¡µ10条
      total: '',
      pageLoading: true, // ç»„件loading的展示,默认为true
      finishLoding: false // åŠ è½½å®Œæˆï¼Œæ˜¾ç¤ºå·²ç»æ²¡æœ‰æ›´å¤šäº†
    }
  },
  mounted(){
    this.selectEnumByCategory()
    this.obtainItemParameterList()
    this.getUsers()
    this.init()
  },
  methods: {
    refresh(){},
    refreshTable(){},
    refresh(){
      this.list = [];
      this.currentPage = 1
      this.query = {
        userName:'',
        laboratory:'',
        year:'',
        month:''
      }
      this.init()
    },
    refreshTable(){
      this.list = [];
      this.currentPage = 1
      this.init()
    },
    init(){
      if(this.currentPage==1){
        this.pageLoading = true
      }
      this.$axios.post(this.$api.performanceShift.page, {
        size:this.pageSize,
        current:this.currentPage,
        time:this.query.month?this.query.year+'-'+this.query.month:this.query.year,
        userName:this.query.userName,
        laboratory:this.query.laboratory,
        }).then(res => {
          this.pageLoading = false
          if (res.code == 201) return
          this.total = res.data.total
          let list = res.data.records.map(item=>{
            for (let key in item) {
              let type = this.getDayByDic(key)
              if(type!=undefined||type!=null){
                item[`day${type}`] = item[key]
              }
            }
            return item
          });
          // å³ä¾§æ—¥æœŸèŽ·å–
          if(this.currentPage==1){
            if(list&&list.length>0){
              this.weeks = [];
              list[0].list&&list[0].list.forEach(item=>{
                let obj = {
                  weekNum:item.weekly,
                  week:item.headerTime.split(' ')[1],
                  day:item.headerTime.split(' ')[0]
                }
                this.weeks.push(obj)
              })
            }
          }
          if(list.length==0){
            this.finishLoding = true;
          }else{
            if(list.length<this.pageSize){
              this.finishLoding = true;
            }
            this.list = this.list.concat(list)
            if(this.total==this.list.length){
              this.finishLoding = true;
            }
            this.currentPage++;
          }
        })
    },
    onMouseEnter(index){
      this.currentUserIndex = index
    },
    handleScheduling(){
      this.schedulingVisible = true
    confirmScheduling(){
      if(!this.schedulingQuery.week){
        this.$message.error('请选择周次')
        return
      }
      let time = this.schedulingQuery.week.getTime()
      let startWeek  =getYearAndMonthAndDays(new Date(time - 24 * 60 * 60 * 1000)) + ' 00:00:00'
      let endWeek = getYearAndMonthAndDays(new Date(time + 24 * 60 * 60 * 1000 * 5))+ ' 00:00:00'
      if(!this.schedulingQuery.userId||this.schedulingQuery.userId.length==0){
        this.$message.error('请选择人员')
        return
      }
      if(!this.schedulingQuery.shift){
        this.$message.error('请选择班次')
        return
      }
      this.loading = true
      this.$axios.post(this.$api.performanceShift.add, {
            startWeek,
            endWeek,
            userId:this.schedulingQuery.userId.join(','),
            shift:this.schedulingQuery.shift}, {
        headers: {
          'Content-Type': 'application/json'
        }
      }).then(res => {
        this.loading = false
        if (res.code == 201) return
        this.$message.success('操作成功')
        this.schedulingVisible = false
        this.schedulingQuery = {
          week:'',
          userId:null,
          shift:''
        }
        this.refresh()
      })
    },
    confirmScheduling(){},
    selectEnumByCategory() {
      this.$axios.post(this.$api.enums.selectEnumByCategory, {
        category: "班次类型"
@@ -555,8 +473,63 @@
        this.classType = res.data
      })
    },
    obtainItemParameterList() {
      this.$axios.get(this.$api.laboratoryScope.obtainItemParameterList).then(res => {
        let data = []
        res.data.forEach(a => {
          data.push({
            label: a.laboratoryName,
            value: a.id
          })
        })
        this.laboratory = data
      })
    },
    handleCommand(e,m){
      console.log(e,m)
      if(e!=m.shift){
        this.$axios.put(this.$api.performanceShift.update+m.id, {
          id:m.id,
          shift:e
        }).then(res => {
          if (res.code == 201) return
          this.$message.success('操作成功')
          m.shift = e
        })
      }
    },
    getUsers(){
      this.$axios.post(this.$api.user.selectUserList, {
                    page: {
            current: -1,
            size: -1,
          },
                    entity: {
            name: null,
          }
                }, {
                    headers: {
                        'Content-Type': 'application/json'
                    }
                }).then(res => {
                    if (res.code === 201) {
                        return
                    }
          let arr = res.data.body.records
          this.personList = arr
        })
    },
    getDayByDic(e){
      let obj = this.classType.find(m=>m.label==e)
      if(obj){
        return obj.value
      }
    },
    getShiftByDic(e){
      let obj = this.classType.find(m=>m.value==e)
      if(obj){
        return obj.label
      }
      return '未排班'
    }
  }
}
@@ -603,7 +576,7 @@
  left: 0;
  top: 0;
  width: 220px; /* å·¦è¾¹åŒºåŸŸå®½åº¦ */
  min-height: calc(100% - 10px); /* è§†å£é«˜åº¦ */
  /* min-height: calc(100% - 10px); è§†å£é«˜åº¦ */
  background-color: #fff;
  box-shadow: 2px -2px 5px rgba(51,51,51,0.12); /* å·¦è¾¹é˜´å½± */
}
@@ -617,7 +590,7 @@

.content {
  min-height: calc(100% - 10px); /* è§†å£é«˜åº¦ */
  min-width: 2000px;
  /* min-width: 2000px; */
}
.content-title{
  height: 52px;
@@ -625,7 +598,7 @@
  border-bottom: 1px solid #EEEEEE;
}
.content-title-right{
  min-width: 2000px;
  /* min-width: 2000px; */
  display: flex;
  align-items: center;
}
@@ -678,9 +651,9 @@
  display: flex;
  align-items: center;
  justify-content: space-around;
  background: rgba(58,123,250,0.15);
  background: #F5F7FB;
  border-radius: 8px 8px 8px 8px;
  color: #3A7BFA;
  color: #999;
  font-size: 14px;
}
.work-box.type0{
@@ -695,6 +668,14 @@
  background: #FAE2CA;
  color: #BC8D5E;
}
.work-box.type3{
  background: #E1F3D8;
  color: #67C23A;
}
.work-box.type4{
  background: #FDE2E2;
  color: #F56C6C;
}
.work-box-left{
  display: flex;
  justify-content: center;

 src/components/view/b4-daily-business-statistics.vue

@@ -147,10 +147,12 @@
      },
      pageData:{},
      loading:false,
      timers:null,
    }
  },
  mounted(){
    this.init()
    this.timers&&clearInterval(this.timers);
    setInterval(this.init,1000*60*5)
  },
  methods:{
    init(){
@@ -181,6 +183,9 @@
        return '0'
      }
    }
  },
  deactivated(){
    this.timers&&clearInterval(this.timers);
  }
}
</script>

 src/components/view/b4-inspection-item-statistics.vue

@@ -129,7 +129,7 @@
        },
        chartData2:{
          title:'今日项目合格率',
          percentage:'68%',
          percentage:'0',
          color:['#1CCAB8','#E1E4E8'],
          data:[
            {
@@ -150,16 +150,16 @@
        },
        chartData3:{
          title:'今日项目完成率',
          percentage:'68%',
          percentage:'0',
          color:['#FBB647','#E1E4E8'],
          data:[
            {
              name:'完成',
              value:'68'
              value:'0'
            },
            {
              name:'未完成',
              value:'32'
              value:'0'
            },
          ]
        },
@@ -171,25 +171,28 @@
        },
        chartData4:{
          title:'今日项延期率',
          percentage:'68%',
          percentage:'0',
          color:['#FF3838','#E1E4E8'],
          data:[
            {
              name:'延期',
              value:'68'
              value:'0'
            },
            {
              name:'未延期',
              value:'32'
              value:'0'
            },
          ]
        },
        loading:false,
        pageData:{}
        pageData:{},
        timers:null
      }
    },
    mounted(){
      this.init()
      // this.init()
      this.timers&&clearInterval(this.timers);
      setInterval(this.init,1000*60*5)
    },
    methods:{
      init(){
@@ -227,7 +230,7 @@
        this.chartConfig3.isLoading = true
        this.chartConfig4.isLoading = true
      })
    },
      },
      handleData(val){
        if(val){
          return Math.abs(val)*100;
@@ -235,6 +238,9 @@
          return '0'
        }
      }
    },
    deactivated(){
      this.timers&&clearInterval(this.timers);
    }
  }
  </script>