Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmMes

jiangping

2023-08-23 6b30b9fa671bf207b0268749a19b7ccda0ec5d8b

 screen_standard/src/views/process.vue

@@ -23,7 +23,7 @@
                <div class="scroll_item_row">{{ item.qualifiedNum }}</div>
                <div class="scroll_item_row">{{ item.unqualifiedNum }}</div>
                <div class="scroll_item_row">{{ item.undoneNum }}</div>
                <div class="scroll_item_row">{{ item.unqualifiedRate }}%</div>
                <div class="scroll_item_row">{{ (item.unqualifiedRate||0).toFixed(2) }}%</div>
              </div>
            </div>
          </div>
@@ -40,10 +40,10 @@
                  <span>{{ item.userName }}</span>
                </div>
                <div class="content_left_item1_content_row_line">
                  <el-progress :show-text="false" :percentage="item.doneNum/baseNum">
                  <el-progress :show-text="false" :percentage="(item.doneNum||0) / baseNum * 100">
                  </el-progress>
                </div>
                <div class="content_left_item1_content_row_num">{{ item.doneNum }}</div>
                <div class="content_left_item1_content_row_num">{{ item.doneNum||0 }}</div>
              </div>
            </div>
          </div>
@@ -55,7 +55,7 @@
                  <span>{{ item.userName }}</span>
                </div>
                <div class="content_left_item1_content_row_line">
                  <el-progress :show-text="false" :percentage="item.doneNum/baseNum">
                  <el-progress :show-text="false" :percentage="item.doneNum / baseNum * 100">
                  </el-progress>
                </div>
                <div class="content_left_item1_content_row_num">{{ item.doneNum }}</div>
@@ -86,10 +86,10 @@
                <div class="scroll_item_row">{{ item.userName }}</div>
                <div class="scroll_item_row">{{ item.materialName }}</div>
                <div class="scroll_item_row">{{ item.materialCode }}</div>
                <div class="scroll_item_row">{{ item.createTime }}</div>
                <div class="scroll_item_row">{{ dateToSub(item.createTime) }}</div>
                <div class="scroll_item_row">{{ item.qualifiedNum }}</div>
                <div class="scroll_item_row">{{ item.unqualifiedNum }}</div>
                <div class="scroll_item_row">{{ item.unqualifiedRate }}%</div>
                <div class="scroll_item_row">{{ (item.unqualifiedRate||0).toFixed(2) }}%</div>
              </div>
            </div>
          </div>
@@ -99,7 +99,13 @@
        <div class="header-title">近7天不良品分布</div>
        <div class="bad-content">
          <div id="day-distribution"></div>
          <div id="type-distribution"></div>
          <div class="pie">
            <div class="content_right_top_nr_bottom_yuan">
              <span>{{ allBad }}</span>
              <span>不良项分布</span>
            </div>
            <div id="type-distribution"></div>
          </div>
        </div>
      </div>
    </div>
@@ -107,13 +113,15 @@
</template>

<script setup>
import { reactive, ref, toRefs, onMounted, onBeforeUnmount, onUnmounted, nextTick } from 'vue'
import { getProcedurePlanData, getTop, getProcedurePlansList, getRecordLogPage } from '@/utils/apis.js'
import { reactive, ref, toRefs, onMounted, onBeforeUnmount, onUnmounted } from 'vue'
import { getProcedurePlanData, getTop, getProcedurePlansList, getRecordLogPage, getUnqualified7DayData, getUnqualifiedCateData } from '@/utils/api.js'
import { useCounterStore } from '@/stores/counter.js'
import { useRoute } from 'vue-router'
import { dateToSub } from '@/utils'
import * as echarts from 'echarts'
const route = useRoute()
const enterprise = useCounterStore()
let mainTimer = ref(null)
let planTimer = ref(null)
let reportTimer = ref(null)
let planContainer = ref(null)
@@ -124,45 +132,37 @@
  top1: [],
  top2: [],
  baseNum: 0,
  dayDistribution: [
    { date: '8/1', num: '20' },
    { date: '8/2', num: '10' },
    { date: '8/3', num: '20' },
    { date: '8/4', num: '40' },
    { date: '8/5', num: '30' },
    { date: '8/6', num: '10' },
    { date: '8/7', num: '20' },
  ],
  allBad: 0,
  dayDistribution: [],
  typeDistribution: [
    { name: '外观不良', num: 15 },
    { name: '有毛刺', num: 12 },
    { name: '尺寸不良', num: 22 },
    { name: '有划痕', num: 5 },
    { name: '其他', num: 2 },
    { categoryName: '外观不良', unqualifiedNum: 15 },
    { categoryName: '有毛刺', unqualifiedNum: 12 },
    { categoryName: '尺寸不良', unqualifiedNum: 22 },
    { categoryName: '有划痕', unqualifiedNum: 5 },
    { categoryName: '其他', unqualifiedNum: 2 },
  ]
})

let { listData, top1, top2, baseNum } = toRefs(data)
let { listData, top1, top2, baseNum, allBad, reportListData } = toRefs(data)

// start()
onBeforeUnmount(() => {
  clearTimeout(planTimer.value)
  clearTimeout(reportTimer.value)
  clearTimeout(mainTimer.value)
})
onMounted(() => {
  initData()
  nextTick(() => {
    start()
    reportStart()
    setDayChart()
    setTypeChart()
  })
  mainTimer.value = setInterval(() => {
    initData()
  }, 60000)
})


onUnmounted(() => {
  clearTimeout(planTimer.value)
  clearTimeout(reportTimer.value)
  clearTimeout(mainTimer.value)
})

function initData() {
@@ -196,11 +196,24 @@
  getProcedurePlansList(enterprise.companyId, enterprise.departId, { procedureId: route.query.procedureId })
    .then(res => {
      data.listData = res
      start()
    })
  // 报工日志分页查询 
  getRecordLogPage(enterprise.companyId, enterprise.departId, { capacity: 9999, page: 1, model: { procedureId: route.query.procedureId } })
    .then(res => {
      data.reportListData = res.records
      reportStart()
    })
  getUnqualified7DayData(enterprise.companyId, enterprise.departId, route.query.procedureId)
    .then(res => {
      data.dayDistribution = res
      setDayChart()
    })
  getUnqualifiedCateData(enterprise.companyId, enterprise.departId, route.query.procedureId)
    .then(res => {
      data.typeDistribution = res
      data.allBad = res.reduce((accumulator, currentValue) => accumulator + currentValue.unqualifiedNum, 0)
      setTypeChart()
    })
}

@@ -230,12 +243,13 @@
}
function ListScroll() {
  let scrollDom = planContainer.value
  if (!scrollDom) return
  // 判读组件是否渲染完成
  if (scrollDom.offsetHeight == 0) {
    scrollDom = planContainer.value
  } else {
    // 如果列表数量过少不进行滚动
    if (scrollDom.children.length <=10) {
    if (scrollDom.children.length < 10) {
      clearTimeout(planTimer.value)
      return
    }
@@ -263,12 +277,13 @@
}
function reportScroll() {
  let scrollDom = reportLogContainer.value
  if (!scrollDom) return
  // 判读组件是否渲染完成
  if (scrollDom.offsetHeight == 0) {
    scrollDom = reportLogContainer.value
  } else {
    // 如果列表数量过少不进行滚动
    if (scrollDom.children.length <= 10) {
    if (scrollDom.children.length < 10) {
      clearTimeout(reportTimer.value)
      return
    }
@@ -295,13 +310,13 @@
  let numList = []

  data.dayDistribution.forEach(item => {
    dateList.push(item.date)
    numList.push(item.num)
    dateList.push(item.createTime)
    numList.push(item.unqualifiedNum || 0)
  })
  let option;
  option = {
    title: {
      text: '         近七日不良品总数：67',
      text: `        近七日不良品总数：${data.allBad}`,
      textStyle: {
        color: '#fff',
        fontSize: 12
@@ -386,8 +401,8 @@
  let legendData = []
  let seriesData = []
  data.typeDistribution.forEach(item => {
    legendData.push(item.name)
    seriesData.push({name:item.name, value:item.num})
    legendData.push(item.categoryName)
    seriesData.push({ name: item.categoryName, value: item.unqualifiedNum })
  })
  let option = {
    legend: {
@@ -416,13 +431,16 @@
          show: false
        },
        label: {
          formatter:'{dot| } {title|{b} {c}}\n\n{per|{d}%}',
          formatter: '{dot| } {title|{b} {c}}\n{per|{d}%}',
          rich: {
            title: {
              color: '#fff'
              color: '#fff',
              lineHeight: 13,
              fontSize: 10
            },
            per: {
              color: '#01D9FE'
              color: '#01D9FE',
              fontSize: 10
            },
            dot: {
              backgroundColor: 'inherit',
@@ -458,7 +476,7 @@
<style lang="scss" scoped>
.proccess-content {
  display: flex;

  flex: 1;
  .header-title {
    background-image: url('@/assets/img/gongxu_title@2x.png');
    height: 28px;
@@ -476,9 +494,8 @@
  .process-left {
    flex: 1;
    margin-right: 20px;

    .proccess-plan {
      height: 460px;
      height: 424px;
      background: linear-gradient(180deg, rgba(52, 88, 159, 0) 0%, rgba(0, 86, 255, 0.4) 100%);
      margin-bottom: 20px;
    }
@@ -520,6 +537,11 @@
                  font-weight: 400;
                  color: #D2E0FF;
                  margin-left: 9px;
                  width: 50px;
                  white-space: nowrap;
                  text-overflow: ellipsis;
                  -webkit-text-overflow: ellipsis;
                  overflow: hidden;
                }

                .num {
@@ -579,7 +601,7 @@
    flex: 1;

    .report-log {
      height: 460px;
      height: 424px;
      background: linear-gradient(180deg, rgba(52, 88, 159, 0) 0%, rgba(0, 86, 255, 0.4) 100%);
      margin-bottom: 20px;
    }
@@ -599,9 +621,47 @@
          height: 190px;
        }

        #type-distribution {
        .pie {
          flex: 0.4;
          position: relative;
          #type-distribution {
            width: 100%;
            height: 100%;
          } 
          .content_right_top_nr_bottom_yuan {
            position: absolute;
            top: calc(50% - 50px);
            left: calc(50% - 50px);;
            z-index: 999;
            width: 100px;
            height: 100px;
            border-radius: 50%;
            border: 2px dashed #01D9FE;
            display: flex;
            flex-direction: column;
            align-items: center;
            justify-content: center;

            span {
              &:first-child {
                font-size: 26px;
                font-family: SourceHanSansSC-Medium, SourceHanSansSC;
                font-weight: 500;
                color: #FFFFFF;
              }

              &:last-child {
                font-size: 13px;
                font-family: SourceHanSansSC-Regular, SourceHanSansSC;
                font-weight: 400;
                color: rgba(255, 255, 255, 0.8);
              }
            }
          }

          
        }

      }
    }
  }
@@ -670,6 +730,7 @@
          display: flex;
          align-items: center;
          justify-content: center;
          font-size: 13px;
        }
      }
    }