productDev/dmMes.git

Mr.Zhang

2023-08-23 1a74c4ab9c4f1fff15e85e57743f6967c4898b91

大屏适配

已修改9个文件

	screen_standard/index.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	screen_standard/src/assets/main.css	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	screen_standard/src/components/AppLayout.vue	21 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	screen_standard/src/stores/counter.js	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	screen_standard/src/utils/index.js	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	screen_standard/src/utils/request.js	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	screen_standard/src/views/index.vue	243 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	screen_standard/src/views/process.vue	31 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	screen_standard/vite.config.js	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 screen_standard/index.html

@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html lang="en">
<html lang="zh-cn">
  <head>
    <meta charset="UTF-8">
    <link rel="icon" href="/favicon.ico">

 screen_standard/src/assets/main.css

@@ -8,8 +8,11 @@
#app {
  padding: 0;
  margin: 0;
  height: 100%;
  /* height: 100%; */
  height: 100vh;
  /* overflow-y: scroll; */
  font-weight: normal;

}



 screen_standard/src/components/AppLayout.vue

@@ -82,7 +82,7 @@
    return enterprise.deviceNum
})
const unqualifiedRate = computed(() => {
    return enterprise.unqualifiedRate
    return +enterprise.unqualifiedRate.toFixed(2)
})
const title = computed(() => {
    return enterprise.procedureName ? `${enterprise.procedureName}工序数据看板` :  'DM云工厂车间大屏'
@@ -174,18 +174,22 @@
  background-position: center;
  background-size: 100% 100%;
  background-repeat: no-repeat;

  // width: 1920px;
  // height: 1080px;
  width: 100%;
  height: 100%;
  padding: 30px;
  // overflow-y: scroll;
  padding: 20px 30px;
  overflow-y: scroll;
  display: flex;
  flex-direction: column;

  box-sizing: border-box;
  .header {
    background-image: url('@/assets/img/bg_maintitle@2x.png');
    background-size: 100% 74px;
    background-size: 100% 70px;
    width: 100%;
    height: 74px;
    height: 70px;
    display: flex;
    padding-top: 1px;
    padding-left: 20px;
@@ -253,14 +257,15 @@
    }
  }
  .num-list {
    margin-top: 24px;
    margin-bottom: 27px;
    margin-top: 20px;
    margin-bottom: 20px;
    display: flex;
    justify-content: space-between;
    height: 88px;
    height: 80px;
    color: white;
    .num-item {
      width: calc(25% - 50px);
      height: 80px;
      background-size: 100% 100%;
      margin-right: 25px;
      padding-left: 30px;

 screen_standard/src/stores/counter.js

@@ -6,7 +6,7 @@
  state: () => {
    return {
      companyId: '8',
      departId: '178',
      departId: '',
      delayNum: 0, // 延期计划数
      deviceNum: 0, // 今日生产设备数
      ingNum: 0, // 执行中计划数

 screen_standard/src/utils/index.js

@@ -1,4 +1,16 @@
export function getAssets(url) {
  // console.log(url, new URL(`../assets/img/${url}`, import.meta.url).href);
  return new URL(`../assets/img/${url}`, import.meta.url).href
}

export function dateToSub(date) {
  if (!date) {
    return '-'
  }
  let tempDate = new Date(date)
  let month = tempDate.getMonth()+1
  let day = tempDate.getDate()
  let hours = tempDate.getHours()
  let minute = tempDate.getMinutes()
  return `${month<10?`0${month}`:month}-${day<10?`0${day}`:day} ${hours<10?`0${hours}`:hours}:${minute<10?`0${minute}`:minute}`
}

 screen_standard/src/utils/request.js

@@ -3,6 +3,7 @@

const axiosInstance = axios.create({
    baseURL: import.meta.env.VITE_BASE_PATH,
    // baseURL: '/api',
    headers: {'Content-Type': 'application/json'},
    timeout: 60000
});

 screen_standard/src/views/index.vue

@@ -1,26 +1,7 @@
<template>
  <div class="content1">
    <div class="content_left">
      <!-- 当日员工产量TOP10 -->
      <div class="content_left_item1">
        <div class="content_left_item1_head">
          <span>当日员工产量TOP10</span>
        </div>
        <div class="content_left_item1_content">
          <div class="content_left_item1_content_row" v-for="(item, index) in data.production" :key="index">
            <div class="content_left_item1_content_row_name">
              <div :class="index > 2 ? 'num bg1' : 'num bg2'">{{ index + 1 }}</div>
              <span>{{ item.userName }}</span>
            </div>
            <div class="content_left_item1_content_row_line">
              <el-progress :show-text="false" :percentage="item.doneNum / baseNum * 100">
              </el-progress>
            </div>
            <div class="content_left_item1_content_row_num">{{ item.doneNum }}</div>
          </div>
        </div>
      </div>
      <!-- 仓库实时余量统计 -->
    <!-- <div class="content_left">
    
      <div class="content_left_item2">
        <div class="content_left_item2_head">
          <span>仓库实时余量统计</span>
@@ -45,7 +26,7 @@
          </div>
        </div>
      </div>
    </div>
    </div> -->
    <div class="content_center">
      <!-- 成品计划进度/工序进度 -->
      <div class="content_center_top">
@@ -78,8 +59,7 @@
                    :content="'已报工良品数' + child.doneNum + '；工序计划数' + child.planNum" placement="top">
                    <div class="scroll_item_row_item" @click="jump(child.procedureId, child.procedureName)">
                      <div class="scroll_item_row_item_x"></div>
                      <!-- <img v-if="i == 0 || i == 1" src="@/assets/img/ic_complete@2x.png" alt="" /> -->
                      <span v-if="child.rate < 100">{{ child.rate }}%</span>
                      <span v-if="child.rate < 100">{{ child.rate.toFixed(0) }}%</span>
                      <img v-else src="@/assets/img/ic_complete@2x.png" alt="" />
                      <span class="scroll_item_row_item_wz">{{ child.procedureName }}</span>
                    </div>
@@ -110,38 +90,60 @@
                <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>
        </div>
      </div>
      <!-- 报工日志 -->
      <div class="content_center_bottom">
        <div class="content_center_bottom_head">
          <span>报工日志</span>
        </div>
        <div class="content_center_bottom_b">
          <div class="content_center_top_form_head">
            <div class="content_center_top_form_head_item">员工名称</div>
            <div class="content_center_top_form_head_item">物料名称</div>
            <div class="content_center_top_form_head_item">物料编码</div>
            <div class="content_center_top_form_head_item">报工时间</div>
            <div class="content_center_top_form_head_item">良品数</div>
            <div class="content_center_top_form_head_item">不良品数</div>
            <div class="content_center_top_form_head_item">不良率</div>
      <div style="display: flex;">
        <div class="content_left" style="flex: 1;">
          <div class="content_left_item1">
            <div class="content_left_item1_head">
              <span>当日员工产量TOP10</span>
            </div>
            <div class="content_left_item1_content" ref="scrollContainer">
              <div class="content_left_item1_content_row" v-for="(item, index) in data.production" :key="index">
                <div class="content_left_item1_content_row_name">
                  <div :class="index > 2 ? 'num bg1' : 'num bg2'">{{ index + 1 }}</div>
                  <span>{{ item.userName }}</span>
                </div>
                <div class="content_left_item1_content_row_line">
                  <el-progress :show-text="false" :percentage="item.doneNum / baseNum * 100">
                  </el-progress>
                </div>
                <div class="content_left_item1_content_row_num">{{ item.doneNum }}</div>
              </div>
            </div>
          </div>
          <div @mouseenter="handleMouseEnter3" @mouseleave="handleMouseLeave3" class="main_container">
            <div ref="scrollContainer3" class="scroll_container">
              <div v-for="(item, index) in data.log" :key="index"
                :class="index % 2 == 0 ? 'scroll_item scroll_item_bg1' : 'scroll_item scroll_item_bg2'">
                <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 ? item.qualifiedNum : '-' }}</div>
                <div class="scroll_item_row">{{ item.unqualifiedNum }}</div>
                <div class="scroll_item_row">{{ item.unqualifiedRate ? item.unqualifiedRate : '0' }}%</div>
        </div>
        <div class="content_center_bottom">
          <div class="content_center_bottom_head">
            <span>报工日志</span>
          </div>
          <div class="content_center_bottom_b">
            <div class="content_center_top_form_head">
              <div class="content_center_top_form_head_item">员工名称</div>
              <div class="content_center_top_form_head_item">物料名称</div>
              <div class="content_center_top_form_head_item">工序</div>
              <div class="content_center_top_form_head_item">报工时间</div>
              <div class="content_center_top_form_head_item">良品数</div>
              <div class="content_center_top_form_head_item">不良品数</div>
              <div class="content_center_top_form_head_item">不良率</div>
            </div>
            <div @mouseenter="handleMouseEnter3" @mouseleave="handleMouseLeave3" class="main_container">
              <div ref="scrollContainer3" class="scroll_container">
                <div v-for="(item, index) in data.log" :key="index"
                  :class="index % 2 == 0 ? 'scroll_item scroll_item_bg1' : 'scroll_item scroll_item_bg2'">
                  <div class="scroll_item_row">{{ item.userName }}</div>
                  <div class="scroll_item_row">{{ item.procedureName }}</div>
                  <div class="scroll_item_row">{{ item.materialCode }}</div>
                  <div class="scroll_item_row">{{ dateToSub(item.createTime) }}</div>
                  <div class="scroll_item_row">{{ item.qualifiedNum || 0 }}</div>
                  <div class="scroll_item_row">{{ item.unqualifiedNum || 0 }}</div>
                  <div class="scroll_item_row">{{ (item.unqualifiedRate || 0).toFixed(2) }}%</div>
                </div>
              </div>
            </div>
          </div>
@@ -155,12 +157,16 @@
          <span>近7天不良品分布</span>
        </div>
        <div class="content_right_top_nr">
          <div class="content_right_top_nr_bottom_yuan" v-if="data.typeDistribution.length > 0">
            <span>{{ data.num }}</span>
            <span>不良项分布</span>
          </div>
          
          <div class="content_right_top_nr_top" id="lineChrat"></div>
          <div class="content_right_top_nr_bottom" id="pieChart"></div>
          <div class="content_right_top_nr_bottom">
            <div class="content_right_top_nr_bottom_yuan" v-if="data.typeDistribution.length > 0">
              <span>{{ data.num }}</span>
              <span>不良项分布</span>
            </div>
            <div id="pieChart"></div>
          </div>
          
        </div>
      </div>
      <!-- 设备巡检记录 -->
@@ -179,7 +185,7 @@
            <div ref="scrollContainer4" class="scroll_container">
              <div v-for="(item, index) in data.patrolInspection" :key="index"
                :class="index % 2 == 0 ? 'scroll_item scroll_item_bg1' : 'scroll_item scroll_item_bg2'">
                <div class="scroll_item_row">{{ item.checkdate }}</div>
                <div class="scroll_item_row">{{ dateToSub(item.checkdate) }}</div>
                <div class="scroll_item_row">{{ item.deviceName }}</div>
                <div class="scroll_item_row">{{ item.status == 0 ? '合格' : '不合格' }}</div>
                <div class="scroll_item_row">{{ item.userName }}</div>
@@ -193,6 +199,7 @@
</template>

<script setup>
import { dateToSub } from '@/utils'
import { reactive, ref, onMounted, nextTick, onUnmounted, computed, watch, toRefs } from 'vue'
import { getPlanData, getTop, getStockList, getWorkPlansList, getProcedureProcessList, getRecordLogPage, getDeviceCheckPage, getUnqualified7DayData, getUnqualifiedCateData } from '@/utils/api.js'
import { useCounterStore } from '@/stores/counter.js'
@@ -273,27 +280,44 @@
      if (res.length > 0) {
        data.baseNum = res[0].doneNum
        data.production = res
        start()
      }
    })
  // 仓库实时余量统计
  getStockList(companyId.value, departId.value)
    .then(res => {
      data.marginStatistics = res
      nextTick(() => {
        start()
      })
    })
  // 成品计划进度
  getWorkPlansList(companyId.value, departId.value)
    .then(res => {
      data.plannedProgress = res
      nextTick(() => {
        start1()
      })
    })
  // getStockList(companyId.value, departId.value)
  //   .then(res => {
  //     data.marginStatistics = res
  //     nextTick(() => {
  //       start()
  //     })
  //   })
  cate.value.forEach((item, index) => {
    if (item.active) {
      if (index == 1) {
        getProcedureProcessList(companyId.value, departId.value)
          .then(res => {
            data.processProgress = res
            nextTick(() => {
              start2()
            })
          })
      } else {
        // 成品计划进度
        getWorkPlansList(companyId.value, departId.value)
          .then(res => {
            data.plannedProgress = res
            nextTick(() => {
              start1()
            })
          })
      }
    }
  })
 
  
  // 报工日志
  getRecordLogPage(companyId.value, departId.value, {
    capacity: 9999,
    capacity: 20,
    model: {},
    page: 1
  }).then(res => {
@@ -630,12 +654,13 @@
}
function ListScroll() {
  let scrollDom = scrollContainer.value
  if (!scrollDom) return
  // 判读组件是否渲染完成
  if (scrollDom.offsetHeight == 0) {
    scrollDom = scrollContainer.value
  } else {
    // 如果列表数量过少不进行滚动
    if (scrollDom.children.length < 8) {
    if (scrollDom.children.length < 6) {
      clearTimeout(timer.value)
      return
    }
@@ -655,6 +680,7 @@
function ListScroll1() {
  let scrollDom = scrollContainer1.value
  // 判读组件是否渲染完成
  if (!scrollDom) return
  if (scrollDom.offsetHeight == 0) {
    scrollDom = scrollContainer1.value
  } else {
@@ -678,17 +704,20 @@
}
function ListScroll2() {
  let scrollDom = scrollContainer2.value
  if (!scrollDom) return
  // 判读组件是否渲染完成
  if (scrollDom.offsetHeight == 0) {
    scrollDom = scrollContainer2.value
  } else {
    // 如果列表数量过少不进行滚动
    if (scrollDom.children.length < 7) {
    if (scrollDom.children.length < 10) {
      clearTimeout(timer2.value)
      return
    }
    // 组件进行滚动
    scrollDom.scrollTop += 1
    // console.log('scrollDom.scrollTop', scrollDom.scrollTop);
    // console.log('scrollDom.scrollHeight - scrollDom.clientHeight', scrollDom.scrollHeight - scrollDom.clientHeight);
    // 判断是否滚动到底部
    if (scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight)) {
      // 获取组件第一个节点
@@ -702,12 +731,13 @@
}
function ListScroll3() {
  let scrollDom = scrollContainer3.value
  if (!scrollDom) return
  // 判读组件是否渲染完成
  if (scrollDom.offsetHeight == 0) {
    scrollDom = scrollContainer3.value
  } else {
    // 如果列表数量过少不进行滚动
    if (scrollDom.children.length < 6) {
    if (scrollDom.children.length <= 5) {
      clearTimeout(timer3.value)
      return
    }
@@ -726,12 +756,13 @@
}
function ListScroll4() {
  let scrollDom = scrollContainer4.value
  if (!scrollDom) return
  // 判读组件是否渲染完成
  if (scrollDom.offsetHeight == 0) {
    scrollDom = scrollContainer4.value
  } else {
    // 如果列表数量过少不进行滚动
    if (scrollDom.children.length < 7) {
    if (scrollDom.children.length < 5) {
      clearTimeout(timer4.value)
      return
    }
@@ -761,6 +792,7 @@

<style lang="scss" scoped>
.content1 {
  flex: 1;
  width: 100%;
  height: auto;
  display: flex;
@@ -769,9 +801,10 @@

  .content_left {
    flex: 1;
    margin-right: 20px;
    .content_left_item1 {
      width: 100%;
      height: 398px;
      height: 284px;
      margin-bottom: 20px;
      .content_left_item1_head {
        background: url('@/assets/img/home_title_short@2x.png');
@@ -795,8 +828,9 @@

      .content_left_item1_content {
        width: 100%;
        height: 360px;
        height: 246px;
        padding: 20px;
        overflow: hidden;
        box-sizing: border-box;
        background: linear-gradient(180deg, rgba(52, 88, 159, 0) 0%, rgba(0, 86, 255, 0.4) 100%);

@@ -878,8 +912,6 @@
    .content_left_item2 {
      width: 100%;
      flex: 1;
      display: flex;
      flex-direction: column;
      .content_left_item2_head {
        background: url('@/assets/img/home_title_short@2x.png');
        background-repeat: no-repeat;
@@ -903,14 +935,13 @@
      .content_left_item2_content {
        width: 100%;
        height: 361px;
        height: 100%;
        padding: 20px;
        box-sizing: border-box;
        background: linear-gradient(180deg, rgba(52, 88, 159, 0) 0%, rgba(0, 86, 255, 0.4) 100%);

        .item2_content_head {
          width: 100%;
          height: 36px;
          height: 35px;
          display: flex;
          align-items: center;
          background: rgba(52, 88, 159, 0.5);
@@ -934,7 +965,7 @@

        .main_container {
          width: 100%;
          height: calc(100% - 36px);
          height: calc(100% - 35px);

          .scroll_container {
            width: 100%;
@@ -951,7 +982,7 @@

            .scroll_item {
              width: 100%;
              height: 36px;
              height: 35px;
              display: flex;
              align-items: center;

@@ -980,17 +1011,17 @@
  }

  .content_center {
    flex: 2;
    margin: 0 20px;
    flex: 3;
    margin-right: 20px;
    .content_center_top {
      width: 100%;
      height: 509px;
      height: 424px;
      margin-bottom: 20px;
      background: linear-gradient(180deg, rgba(52, 88, 159, 0) 0%, rgba(0, 86, 255, 0.4) 100%);

      .content_center_top_list {
        width: 100%;
        height: 38px;
        height: 35px;
        display: flex;
        align-items: center;

@@ -1005,9 +1036,9 @@
        }
        .content_center_top_list_item {
          width: 200px;
          height: 38px;
          height: 35px;
          cursor: pointer;
          line-height: 38px;
          line-height: 35px;
          padding-left: 34px;
          box-sizing: border-box;
          font-size: 16px;
@@ -1049,6 +1080,7 @@

            &:nth-child(5) {
              flex: 2.7;
              
            }
          }
        }
@@ -1056,7 +1088,6 @@
        .main_container {
          width: 100%;
          height: calc(100% - 34px);

          .scroll_container {
            width: 100%;
            height: 100%;
@@ -1072,10 +1103,9 @@

            .scroll_item {
              width: 100%;
              height: 58px;
              height: 50px;
              display: flex;
              align-items: center;

              .scroll_item_row {
                flex: 1;
                height: 100%;
@@ -1090,14 +1120,16 @@

                &:nth-child(5) {
                  flex: 3;
                  
                }

                .scroll_item_row_item {
                  margin-top: -11px;
                  width: 29px;
                  height: 29px;
                  border-radius: 50%;
                  margin-right: 19px;
                  display: flex;
                  flex-direction: column;
                  align-items: center;
                  justify-content: center;
                  border: 2px solid #01D9FE;
@@ -1209,7 +1241,7 @@

            .scroll_item {
              width: 100%;
              height: 36px;
              height: 35px;
              display: flex;
              align-items: center;

@@ -1244,8 +1276,8 @@

    .content_center_bottom {
      width: 100%;
      height: 286px;

      height: 284px;
      flex: 2;
      .content_center_bottom_head {
        width: 100%;
        height: 38px;
@@ -1317,7 +1349,7 @@

            .scroll_item {
              width: 100%;
              height: 37px;
              height: 35px;
              display: flex;
              align-items: center;

@@ -1346,10 +1378,9 @@

  .content_right {
    flex: 1;

    .content_right_top {
      width: 100%;
      height: 511px;
      height: 425px;
      margin-bottom: 20px;

      .content_right_top_head {
@@ -1376,12 +1407,15 @@
        height: calc(100% - 38px);
        background: linear-gradient(180deg, rgba(52, 88, 159, 0) 0%, rgba(0, 86, 255, 0.4) 100%);
        position: relative;

        #pieChart {
          width: 100%;
          height: 100%;
        }
        .content_right_top_nr_bottom_yuan {
          position: absolute;
          top: 50%;
          left: 50%;
          transform: translate(-50%, 53%);
          transform: translate(-50%, -50%);
          z-index: 999;
          width: 114px;
          height: 114px;
@@ -1419,6 +1453,7 @@
        .content_right_top_nr_bottom {
          width: 100%;
          height: 50%;
          position: relative;
        }
      }
    }
@@ -1455,7 +1490,7 @@

        .item2_content_head {
          width: 100%;
          height: 36px;
          height: 35px;
          display: flex;
          align-items: center;
          background: rgba(52, 88, 159, 0.5);
@@ -1479,7 +1514,7 @@

        .main_container {
          width: 100%;
          height: calc(100% - 36px);
          height: calc(100% - 35px);

          .scroll_container {
            width: 100%;
@@ -1496,7 +1531,7 @@

            .scroll_item {
              width: 100%;
              height: 36px;
              height: 35px;
              display: flex;
              align-items: center;


 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 * 100">
                  <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>
@@ -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" style="flex: 1.5;">{{ 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>
@@ -117,6 +117,7 @@
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()
@@ -242,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
    }
@@ -275,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
    }
@@ -428,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',
@@ -470,6 +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;
@@ -488,7 +495,7 @@
    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;
    }
@@ -594,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;
    }

 screen_standard/vite.config.js

@@ -11,7 +11,10 @@
// https://vitejs.dev/config/
export default defineConfig(({mode, command}) => {
  let env = loadEnv(mode, process.cwd(), '')
  // console.log(env.NODE_ENV);
  console.log('-------');
  console.log(env.VITE_BASE_PATH);
  console.log(env.VITE_BASE_URL);
  console.log('-------');
  return {
    base:env.VITE_BASE_CONTEXT,
    plugins: [
@@ -47,7 +50,14 @@
          target: env.VITE_BASE_URL, // 通过代理接口访问实际地址。这里是实际访问的地址。vue会通过代理服务器来代理请求
          changeOrigin: true,
          ws: false,  // 允许websocket代理
          rewrite: (path) => path.replace(/^\[env.VITE_BASE_PATH]/, '') // 将api替换为空
          // rewrite: (path) => path.replace(/^\[env.VITE_BASE_PATH]/, ''), // 将api替换为空
          secure: false
        },
        '/api' : {
          target: env.VITE_BASE_URL, // 通过代理接口访问实际地址。这里是实际访问的地址。vue会通过代理服务器来代理请求
          changeOrigin: true,
          ws: false,  // 允许websocket代理
          rewrite: (path) => path.replace(/^\api/, ''), // 将api替换为空
        }
      }
    }

			@@ -1,5 +1,5 @@
			<!DOCTYPE html>
			<html lang="en">
			<html lang="zh-cn">
			<head>
			<meta charset="UTF-8">
			<link rel="icon" href="/favicon.ico">

			@@ -8,8 +8,11 @@
			#app {
			padding: 0;
			margin: 0;
			height: 100%;
			/* height: 100%; */
			height: 100vh;
			/* overflow-y: scroll; */
			font-weight: normal;

			}

			@@ -82,7 +82,7 @@
			return enterprise.deviceNum
			})
			const unqualifiedRate = computed(() => {
			return enterprise.unqualifiedRate
			return +enterprise.unqualifiedRate.toFixed(2)
			})
			const title = computed(() => {
			return enterprise.procedureName ? `${enterprise.procedureName}工序数据看板` : 'DM云工厂车间大屏'
			@@ -174,18 +174,22 @@
			background-position: center;
			background-size: 100% 100%;
			background-repeat: no-repeat;

			// width: 1920px;
			// height: 1080px;
			width: 100%;
			height: 100%;
			padding: 30px;
			// overflow-y: scroll;
			padding: 20px 30px;
			overflow-y: scroll;
			display: flex;
			flex-direction: column;

			box-sizing: border-box;
			.header {
			background-image: url('@/assets/img/bg_maintitle@2x.png');
			background-size: 100% 74px;
			background-size: 100% 70px;
			width: 100%;
			height: 74px;
			height: 70px;
			display: flex;
			padding-top: 1px;
			padding-left: 20px;
			@@ -253,14 +257,15 @@
			}
			}
			.num-list {
			margin-top: 24px;
			margin-bottom: 27px;
			margin-top: 20px;
			margin-bottom: 20px;
			display: flex;
			justify-content: space-between;
			height: 88px;
			height: 80px;
			color: white;
			.num-item {
			width: calc(25% - 50px);
			height: 80px;
			background-size: 100% 100%;
			margin-right: 25px;
			padding-left: 30px;

			@@ -6,7 +6,7 @@
			state: () => {
			return {
			companyId: '8',
			departId: '178',
			departId: '',
			delayNum: 0, // 延期计划数
			deviceNum: 0, // 今日生产设备数
			ingNum: 0, // 执行中计划数

			@@ -1,4 +1,16 @@
			export function getAssets(url) {
			// console.log(url, new URL(`../assets/img/${url}`, import.meta.url).href);
			return new URL(`../assets/img/${url}`, import.meta.url).href
			}

			export function dateToSub(date) {
			if (!date) {
			return '-'
			}
			let tempDate = new Date(date)
			let month = tempDate.getMonth()+1
			let day = tempDate.getDate()
			let hours = tempDate.getHours()
			let minute = tempDate.getMinutes()
			return `${month<10?`0${month}`:month}-${day<10?`0${day}`:day} ${hours<10?`0${hours}`:hours}:${minute<10?`0${minute}`:minute}`
			}

			@@ -3,6 +3,7 @@

			const axiosInstance = axios.create({
			baseURL: import.meta.env.VITE_BASE_PATH,
			// baseURL: '/api',
			headers: {'Content-Type': 'application/json'},
			timeout: 60000
			});

			@@ -1,26 +1,7 @@
			<template>
			<div class="content1">
			<div class="content_left">
			<!-- 当日员工产量TOP10 -->
			<div class="content_left_item1">
			<div class="content_left_item1_head">
			<span>当日员工产量TOP10</span>
			</div>
			<div class="content_left_item1_content">
			<div class="content_left_item1_content_row" v-for="(item, index) in data.production" :key="index">
			<div class="content_left_item1_content_row_name">
			<div :class="index > 2 ? 'num bg1' : 'num bg2'">{{ index + 1 }}</div>
			<span>{{ item.userName }}</span>
			</div>
			<div class="content_left_item1_content_row_line">
			<el-progress :show-text="false" :percentage="item.doneNum / baseNum * 100">
			</el-progress>
			</div>
			<div class="content_left_item1_content_row_num">{{ item.doneNum }}</div>
			</div>
			</div>
			</div>
			<!-- 仓库实时余量统计 -->
			<!-- <div class="content_left">

			<div class="content_left_item2">
			<div class="content_left_item2_head">
			<span>仓库实时余量统计</span>
			@@ -45,7 +26,7 @@
			</div>
			</div>
			</div>
			</div>
			</div> -->
			<div class="content_center">
			<!-- 成品计划进度/工序进度 -->
			<div class="content_center_top">
			@@ -78,8 +59,7 @@
			:content="'已报工良品数' + child.doneNum + '；工序计划数' + child.planNum" placement="top">
			<div class="scroll_item_row_item" @click="jump(child.procedureId, child.procedureName)">
			<div class="scroll_item_row_item_x"></div>
			<!-- <img v-if="i == 0 \|\| i == 1" src="@/assets/img/ic_complete@2x.png" alt="" /> -->
			<span v-if="child.rate < 100">{{ child.rate }}%</span>
			<span v-if="child.rate < 100">{{ child.rate.toFixed(0) }}%</span>
			<img v-else src="@/assets/img/ic_complete@2x.png" alt="" />
			<span class="scroll_item_row_item_wz">{{ child.procedureName }}</span>
			</div>
			@@ -110,38 +90,60 @@
			<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>
			</div>
			</div>
			<!-- 报工日志 -->
			<div class="content_center_bottom">
			<div class="content_center_bottom_head">
			<span>报工日志</span>
			</div>
			<div class="content_center_bottom_b">
			<div class="content_center_top_form_head">
			<div class="content_center_top_form_head_item">员工名称</div>
			<div class="content_center_top_form_head_item">物料名称</div>
			<div class="content_center_top_form_head_item">物料编码</div>
			<div class="content_center_top_form_head_item">报工时间</div>
			<div class="content_center_top_form_head_item">良品数</div>
			<div class="content_center_top_form_head_item">不良品数</div>
			<div class="content_center_top_form_head_item">不良率</div>
			<div style="display: flex;">
			<div class="content_left" style="flex: 1;">
			<div class="content_left_item1">
			<div class="content_left_item1_head">
			<span>当日员工产量TOP10</span>
			</div>
			<div class="content_left_item1_content" ref="scrollContainer">
			<div class="content_left_item1_content_row" v-for="(item, index) in data.production" :key="index">
			<div class="content_left_item1_content_row_name">
			<div :class="index > 2 ? 'num bg1' : 'num bg2'">{{ index + 1 }}</div>
			<span>{{ item.userName }}</span>
			</div>
			<div class="content_left_item1_content_row_line">
			<el-progress :show-text="false" :percentage="item.doneNum / baseNum * 100">
			</el-progress>
			</div>
			<div class="content_left_item1_content_row_num">{{ item.doneNum }}</div>
			</div>
			</div>
			</div>
			<div @mouseenter="handleMouseEnter3" @mouseleave="handleMouseLeave3" class="main_container">
			<div ref="scrollContainer3" class="scroll_container">
			<div v-for="(item, index) in data.log" :key="index"
			:class="index % 2 == 0 ? 'scroll_item scroll_item_bg1' : 'scroll_item scroll_item_bg2'">
			<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 ? item.qualifiedNum : '-' }}</div>
			<div class="scroll_item_row">{{ item.unqualifiedNum }}</div>
			<div class="scroll_item_row">{{ item.unqualifiedRate ? item.unqualifiedRate : '0' }}%</div>
			</div>
			<div class="content_center_bottom">
			<div class="content_center_bottom_head">
			<span>报工日志</span>
			</div>
			<div class="content_center_bottom_b">
			<div class="content_center_top_form_head">
			<div class="content_center_top_form_head_item">员工名称</div>
			<div class="content_center_top_form_head_item">物料名称</div>
			<div class="content_center_top_form_head_item">工序</div>
			<div class="content_center_top_form_head_item">报工时间</div>
			<div class="content_center_top_form_head_item">良品数</div>
			<div class="content_center_top_form_head_item">不良品数</div>
			<div class="content_center_top_form_head_item">不良率</div>
			</div>
			<div @mouseenter="handleMouseEnter3" @mouseleave="handleMouseLeave3" class="main_container">
			<div ref="scrollContainer3" class="scroll_container">
			<div v-for="(item, index) in data.log" :key="index"
			:class="index % 2 == 0 ? 'scroll_item scroll_item_bg1' : 'scroll_item scroll_item_bg2'">
			<div class="scroll_item_row">{{ item.userName }}</div>
			<div class="scroll_item_row">{{ item.procedureName }}</div>
			<div class="scroll_item_row">{{ item.materialCode }}</div>
			<div class="scroll_item_row">{{ dateToSub(item.createTime) }}</div>
			<div class="scroll_item_row">{{ item.qualifiedNum \|\| 0 }}</div>
			<div class="scroll_item_row">{{ item.unqualifiedNum \|\| 0 }}</div>
			<div class="scroll_item_row">{{ (item.unqualifiedRate \|\| 0).toFixed(2) }}%</div>
			</div>
			</div>
			</div>
			</div>
			@@ -155,12 +157,16 @@
			<span>近7天不良品分布</span>
			</div>
			<div class="content_right_top_nr">
			<div class="content_right_top_nr_bottom_yuan" v-if="data.typeDistribution.length > 0">
			<span>{{ data.num }}</span>
			<span>不良项分布</span>
			</div>

			<div class="content_right_top_nr_top" id="lineChrat"></div>
			<div class="content_right_top_nr_bottom" id="pieChart"></div>
			<div class="content_right_top_nr_bottom">
			<div class="content_right_top_nr_bottom_yuan" v-if="data.typeDistribution.length > 0">
			<span>{{ data.num }}</span>
			<span>不良项分布</span>
			</div>
			<div id="pieChart"></div>
			</div>

			</div>
			</div>
			<!-- 设备巡检记录 -->
			@@ -179,7 +185,7 @@
			<div ref="scrollContainer4" class="scroll_container">
			<div v-for="(item, index) in data.patrolInspection" :key="index"
			:class="index % 2 == 0 ? 'scroll_item scroll_item_bg1' : 'scroll_item scroll_item_bg2'">
			<div class="scroll_item_row">{{ item.checkdate }}</div>
			<div class="scroll_item_row">{{ dateToSub(item.checkdate) }}</div>
			<div class="scroll_item_row">{{ item.deviceName }}</div>
			<div class="scroll_item_row">{{ item.status == 0 ? '合格' : '不合格' }}</div>
			<div class="scroll_item_row">{{ item.userName }}</div>
			@@ -193,6 +199,7 @@
			</template>

			<script setup>
			import { dateToSub } from '@/utils'
			import { reactive, ref, onMounted, nextTick, onUnmounted, computed, watch, toRefs } from 'vue'
			import { getPlanData, getTop, getStockList, getWorkPlansList, getProcedureProcessList, getRecordLogPage, getDeviceCheckPage, getUnqualified7DayData, getUnqualifiedCateData } from '@/utils/api.js'
			import { useCounterStore } from '@/stores/counter.js'
			@@ -273,27 +280,44 @@
			if (res.length > 0) {
			data.baseNum = res[0].doneNum
			data.production = res
			start()
			}
			})
			// 仓库实时余量统计
			getStockList(companyId.value, departId.value)
			.then(res => {
			data.marginStatistics = res
			nextTick(() => {
			start()
			})
			})
			// 成品计划进度
			getWorkPlansList(companyId.value, departId.value)
			.then(res => {
			data.plannedProgress = res
			nextTick(() => {
			start1()
			})
			})
			// getStockList(companyId.value, departId.value)
			// .then(res => {
			// data.marginStatistics = res
			// nextTick(() => {
			// start()
			// })
			// })
			cate.value.forEach((item, index) => {
			if (item.active) {
			if (index == 1) {
			getProcedureProcessList(companyId.value, departId.value)
			.then(res => {
			data.processProgress = res
			nextTick(() => {
			start2()
			})
			})
			} else {
			// 成品计划进度
			getWorkPlansList(companyId.value, departId.value)
			.then(res => {
			data.plannedProgress = res
			nextTick(() => {
			start1()
			})
			})
			}
			}
			})


			// 报工日志
			getRecordLogPage(companyId.value, departId.value, {
			capacity: 9999,
			capacity: 20,
			model: {},
			page: 1
			}).then(res => {
			@@ -630,12 +654,13 @@
			}
			function ListScroll() {
			let scrollDom = scrollContainer.value
			if (!scrollDom) return
			// 判读组件是否渲染完成
			if (scrollDom.offsetHeight == 0) {
			scrollDom = scrollContainer.value
			} else {
			// 如果列表数量过少不进行滚动
			if (scrollDom.children.length < 8) {
			if (scrollDom.children.length < 6) {
			clearTimeout(timer.value)
			return
			}
			@@ -655,6 +680,7 @@
			function ListScroll1() {
			let scrollDom = scrollContainer1.value
			// 判读组件是否渲染完成
			if (!scrollDom) return
			if (scrollDom.offsetHeight == 0) {
			scrollDom = scrollContainer1.value
			} else {
			@@ -678,17 +704,20 @@
			}
			function ListScroll2() {
			let scrollDom = scrollContainer2.value
			if (!scrollDom) return
			// 判读组件是否渲染完成
			if (scrollDom.offsetHeight == 0) {
			scrollDom = scrollContainer2.value
			} else {
			// 如果列表数量过少不进行滚动
			if (scrollDom.children.length < 7) {
			if (scrollDom.children.length < 10) {
			clearTimeout(timer2.value)
			return
			}
			// 组件进行滚动
			scrollDom.scrollTop += 1
			// console.log('scrollDom.scrollTop', scrollDom.scrollTop);
			// console.log('scrollDom.scrollHeight - scrollDom.clientHeight', scrollDom.scrollHeight - scrollDom.clientHeight);
			// 判断是否滚动到底部
			if (scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight)) {
			// 获取组件第一个节点
			@@ -702,12 +731,13 @@
			}
			function ListScroll3() {
			let scrollDom = scrollContainer3.value
			if (!scrollDom) return
			// 判读组件是否渲染完成
			if (scrollDom.offsetHeight == 0) {
			scrollDom = scrollContainer3.value
			} else {
			// 如果列表数量过少不进行滚动
			if (scrollDom.children.length < 6) {
			if (scrollDom.children.length <= 5) {
			clearTimeout(timer3.value)
			return
			}
			@@ -726,12 +756,13 @@
			}
			function ListScroll4() {
			let scrollDom = scrollContainer4.value
			if (!scrollDom) return
			// 判读组件是否渲染完成
			if (scrollDom.offsetHeight == 0) {
			scrollDom = scrollContainer4.value
			} else {
			// 如果列表数量过少不进行滚动
			if (scrollDom.children.length < 7) {
			if (scrollDom.children.length < 5) {
			clearTimeout(timer4.value)
			return
			}
			@@ -761,6 +792,7 @@

			<style lang="scss" scoped>
			.content1 {
			flex: 1;
			width: 100%;
			height: auto;
			display: flex;
			@@ -769,9 +801,10 @@

			.content_left {
			flex: 1;
			margin-right: 20px;
			.content_left_item1 {
			width: 100%;
			height: 398px;
			height: 284px;
			margin-bottom: 20px;
			.content_left_item1_head {
			background: url('@/assets/img/home_title_short@2x.png');
			@@ -795,8 +828,9 @@

			.content_left_item1_content {
			width: 100%;
			height: 360px;
			height: 246px;
			padding: 20px;
			overflow: hidden;
			box-sizing: border-box;
			background: linear-gradient(180deg, rgba(52, 88, 159, 0) 0%, rgba(0, 86, 255, 0.4) 100%);

			@@ -878,8 +912,6 @@
			.content_left_item2 {
			width: 100%;
			flex: 1;
			display: flex;
			flex-direction: column;
			.content_left_item2_head {
			background: url('@/assets/img/home_title_short@2x.png');
			background-repeat: no-repeat;
			@@ -903,14 +935,13 @@
			.content_left_item2_content {
			width: 100%;
			height: 361px;
			height: 100%;
			padding: 20px;
			box-sizing: border-box;
			background: linear-gradient(180deg, rgba(52, 88, 159, 0) 0%, rgba(0, 86, 255, 0.4) 100%);

			.item2_content_head {
			width: 100%;
			height: 36px;
			height: 35px;
			display: flex;
			align-items: center;
			background: rgba(52, 88, 159, 0.5);
			@@ -934,7 +965,7 @@

			.main_container {
			width: 100%;
			height: calc(100% - 36px);
			height: calc(100% - 35px);

			.scroll_container {
			width: 100%;
			@@ -951,7 +982,7 @@

			.scroll_item {
			width: 100%;
			height: 36px;
			height: 35px;
			display: flex;
			align-items: center;

			@@ -980,17 +1011,17 @@
			}

			.content_center {
			flex: 2;
			margin: 0 20px;
			flex: 3;
			margin-right: 20px;
			.content_center_top {
			width: 100%;
			height: 509px;
			height: 424px;
			margin-bottom: 20px;
			background: linear-gradient(180deg, rgba(52, 88, 159, 0) 0%, rgba(0, 86, 255, 0.4) 100%);

			.content_center_top_list {
			width: 100%;
			height: 38px;
			height: 35px;
			display: flex;
			align-items: center;

			@@ -1005,9 +1036,9 @@
			}
			.content_center_top_list_item {
			width: 200px;
			height: 38px;
			height: 35px;
			cursor: pointer;
			line-height: 38px;
			line-height: 35px;
			padding-left: 34px;
			box-sizing: border-box;
			font-size: 16px;
			@@ -1049,6 +1080,7 @@

			&:nth-child(5) {
			flex: 2.7;

			}
			}
			}
			@@ -1056,7 +1088,6 @@
			.main_container {
			width: 100%;
			height: calc(100% - 34px);

			.scroll_container {
			width: 100%;
			height: 100%;
			@@ -1072,10 +1103,9 @@

			.scroll_item {
			width: 100%;
			height: 58px;
			height: 50px;
			display: flex;
			align-items: center;

			.scroll_item_row {
			flex: 1;
			height: 100%;
			@@ -1090,14 +1120,16 @@

			&:nth-child(5) {
			flex: 3;

			}

			.scroll_item_row_item {
			margin-top: -11px;
			width: 29px;
			height: 29px;
			border-radius: 50%;
			margin-right: 19px;
			display: flex;
			flex-direction: column;
			align-items: center;
			justify-content: center;
			border: 2px solid #01D9FE;
			@@ -1209,7 +1241,7 @@

			.scroll_item {
			width: 100%;
			height: 36px;
			height: 35px;
			display: flex;
			align-items: center;

			@@ -1244,8 +1276,8 @@

			.content_center_bottom {
			width: 100%;
			height: 286px;

			height: 284px;
			flex: 2;
			.content_center_bottom_head {
			width: 100%;
			height: 38px;
			@@ -1317,7 +1349,7 @@

			.scroll_item {
			width: 100%;
			height: 37px;
			height: 35px;
			display: flex;
			align-items: center;

			@@ -1346,10 +1378,9 @@

			.content_right {
			flex: 1;

			.content_right_top {
			width: 100%;
			height: 511px;
			height: 425px;
			margin-bottom: 20px;

			.content_right_top_head {
			@@ -1376,12 +1407,15 @@
			height: calc(100% - 38px);
			background: linear-gradient(180deg, rgba(52, 88, 159, 0) 0%, rgba(0, 86, 255, 0.4) 100%);
			position: relative;

			#pieChart {
			width: 100%;
			height: 100%;
			}
			.content_right_top_nr_bottom_yuan {
			position: absolute;
			top: 50%;
			left: 50%;
			transform: translate(-50%, 53%);
			transform: translate(-50%, -50%);
			z-index: 999;
			width: 114px;
			height: 114px;
			@@ -1419,6 +1453,7 @@
			.content_right_top_nr_bottom {
			width: 100%;
			height: 50%;
			position: relative;
			}
			}
			}
			@@ -1455,7 +1490,7 @@

			.item2_content_head {
			width: 100%;
			height: 36px;
			height: 35px;
			display: flex;
			align-items: center;
			background: rgba(52, 88, 159, 0.5);
			@@ -1479,7 +1514,7 @@

			.main_container {
			width: 100%;
			height: calc(100% - 36px);
			height: calc(100% - 35px);

			.scroll_container {
			width: 100%;
			@@ -1496,7 +1531,7 @@

			.scroll_item {
			width: 100%;
			height: 36px;
			height: 35px;
			display: flex;
			align-items: center;

			@@ -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 * 100">
			<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>
			@@ -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" style="flex: 1.5;">{{ 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>
			@@ -117,6 +117,7 @@
			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()
			@@ -242,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
			}
			@@ -275,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
			}
			@@ -428,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',
			@@ -470,6 +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;
			@@ -488,7 +495,7 @@
			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;
			}
			@@ -594,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;
			}

			@@ -11,7 +11,10 @@
			// https://vitejs.dev/config/
			export default defineConfig(({mode, command}) => {
			let env = loadEnv(mode, process.cwd(), '')
			// console.log(env.NODE_ENV);
			console.log('-------');
			console.log(env.VITE_BASE_PATH);
			console.log(env.VITE_BASE_URL);
			console.log('-------');
			return {
			base:env.VITE_BASE_CONTEXT,
			plugins: [
			@@ -47,7 +50,14 @@
			target: env.VITE_BASE_URL, // 通过代理接口访问实际地址。这里是实际访问的地址。vue会通过代理服务器来代理请求
			changeOrigin: true,
			ws: false, // 允许websocket代理
			rewrite: (path) => path.replace(/^\[env.VITE_BASE_PATH]/, '') // 将api替换为空
			// rewrite: (path) => path.replace(/^\[env.VITE_BASE_PATH]/, ''), // 将api替换为空
			secure: false
			},
			'/api' : {
			target: env.VITE_BASE_URL, // 通过代理接口访问实际地址。这里是实际访问的地址。vue会通过代理服务器来代理请求
			changeOrigin: true,
			ws: false, // 允许websocket代理
			rewrite: (path) => path.replace(/^\api/, ''), // 将api替换为空
			}
			}
			}