Merge branch 'master' of ssh://139.186.142.91:29418/productDev/dmMes

Mr.Shi

2023-08-22 ff085919d436c198b0810ce8c1befddf219aba89

 screen_standard/src/views/process.vue

@@ -17,13 +17,13 @@
            <div ref="planContainer" class="scroll_container">
              <div v-for="(item, index) in listData" :key="item.id" class="scroll_item"
                :class="index % 2 == 0 ? 'scroll_item scroll_item_bg1' : 'scroll_item scroll_item_bg2'">
                <div class="scroll_item_row">{{ item.name }}</div>
                <div class="scroll_item_row">1</div>
                <div class="scroll_item_row">2</div>
                <div class="scroll_item_row">3</div>
                <div class="scroll_item_row">4</div>
                <div class="scroll_item_row">4</div>
                <div class="scroll_item_row">4</div>
                <div class="scroll_item_row">{{ item.materialName }}</div>
                <div class="scroll_item_row">{{ item.materialCode }}</div>
                <div class="scroll_item_row">{{ item.num }}</div>
                <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>
            </div>
          </div>
@@ -40,7 +40,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">
                  </el-progress>
                </div>
                <div class="content_left_item1_content_row_num">{{ item.doneNum }}</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">
                  </el-progress>
                </div>
                <div class="content_left_item1_content_row_num">{{ item.doneNum }}</div>
@@ -81,15 +81,15 @@
          </div>
          <div @mouseenter="handleMouseEnterReport" @mouseleave="handleMouseLeaveReport" class="tablel_container">
            <div ref="reportLogContainer" class="scroll_container">
              <div v-for="(item, index) in listData" :key="item.id" class="scroll_item"
              <div v-for="(item, index) in reportListData" :key="item.id" class="scroll_item"
                :class="index % 2 == 0 ? 'scroll_item scroll_item_bg1' : 'scroll_item scroll_item_bg2'">
                <div class="scroll_item_row">{{ item.name }}</div>
                <div class="scroll_item_row">1</div>
                <div class="scroll_item_row">2</div>
                <div class="scroll_item_row">3</div>
                <div class="scroll_item_row">4</div>
                <div class="scroll_item_row">4</div>
                <div class="scroll_item_row">4</div>
                <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">{{ item.qualifiedNum }}</div>
                <div class="scroll_item_row">{{ item.unqualifiedNum }}</div>
                <div class="scroll_item_row">{{ item.unqualifiedRate }}%</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,8 +113,8 @@
</template>

<script setup>
import { reactive, ref, toRefs, onMounted, onBeforeUnmount, onUnmounted, nextTick } from 'vue'
import { getProcedurePlanData, getTop } 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 * as echarts from 'echarts'
@@ -119,40 +125,23 @@
let planContainer = ref(null)
let reportLogContainer = ref(null)
const data = reactive({
  listData: [
    { name: 'dom第一个' },
    { name: 'dom第二个' },
    { name: 'dom第三个' },
    { name: 'dom第四个' },
    { name: 'dom第五个' },
    { name: 'dom第六个' },
    { name: 'dom第七个' },
    { name: 'dom第八个' },
    { name: 'dom第九个' },
    { name: 'dom第十个' },
  ],
  listData: [],
  reportListData: [],
  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 } = toRefs(data)

// start()
onBeforeUnmount(() => {
@@ -161,12 +150,6 @@
})
onMounted(() => {
  initData()
  nextTick(() => {
    start()
    reportStart()
    setDayChart()
    setTypeChart()
  })
})


@@ -202,7 +185,29 @@
        }
      }
    })
  
  // 工序计划进度查询
  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()
    })
}

function handleMouseEnter() {
@@ -236,7 +241,7 @@
    scrollDom = planContainer.value
  } else {
    // 如果列表数量过少不进行滚动
    if (scrollDom.children.length <=10) {
    if (scrollDom.children.length <= 10) {
      clearTimeout(planTimer.value)
      return
    }
@@ -296,8 +301,8 @@
  let numList = []

  data.dayDistribution.forEach(item => {
    dateList.push(item.date)
    numList.push(item.num)
    dateList.push(item.createTime)
    numList.push(item.unqualifiedNum)
  })
  let option;
  option = {
@@ -387,8 +392,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: {
@@ -417,7 +422,7 @@
          show: false
        },
        label: {
          formatter:'{dot| } {title|{b} {c}}\n\n{per|{d}%}',
          formatter: '{dot| } {title|{b} {c}}\n\n{per|{d}%}',
          rich: {
            title: {
              color: '#fff'
@@ -600,9 +605,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);
              }
            }
          }

          
        }

      }
    }
  }