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

Mr.Shi

2023-08-22 62678f54bbc7a64dc3cdad5d086e17de6383c003

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

 screen_standard/src/components/AppLayout.vue

@@ -53,7 +53,7 @@

<script setup>
import { getAssets } from '@/utils'
import { getDepartmentList } from '@/utils/apis.js'
import { getDepartmentList } from '@/utils/api.js'
import { reactive, toRefs, onMounted, computed } from 'vue';
import { useCounterStore } from '@/stores/counter.js'
import { RouterView, useRoute, useRouter } from 'vue-router'

 screen_standard/src/utils/api.js

@@ -1,8 +1,8 @@
import axiosInstance from './request';

// å‘˜å·¥äº§å“ç»Ÿè®¡TOP10
export function getTop (companyId, departId) {
    return axiosInstance.get(`statistics/userProduceTop/${companyId}/${departId}`)
export function getTop (companyId, departId, params) {
    return axiosInstance.get(`statistics/userProduceTop/${companyId}/${departId}`, { params })
}

// æˆå“è®¡åˆ’-实时仓库余量统计
@@ -39,3 +39,19 @@
export function getUnqualifiedCateData (companyId, departId, procedureId) {
    return axiosInstance.get(`statistics/getUnqualifiedCateData/${companyId}/${departId}?procedureId=${procedureId}`)
}


// æ•°æ®ç»Ÿè®¡-成品计划，执行中、延期计划数、今日生产人数、今日生产设备数、今日不良品
export function getProcedurePlansList (companyId, departId, params) {
  return axiosInstance.get(`statistics/getProcedurePlansList/${companyId}/${departId}`, {params} )
}

// æŸ¥è¯¢ä¼ä¸šå…¨éƒ¨å…¬å¸éƒ¨é—¨
export function getDepartmentList (companyId) {
  return axiosInstance.get(`statistics/getDepartmentList/${companyId}`)
}

// æ•°æ®ç»Ÿè®¡-成品计划，执行中、延期计划数、今日生产人数、今日生产设备数、今日不良品
export function getProcedurePlanData (companyId, departId, params) {
  return axiosInstance.get(`statistics/getProcedurePlanData/${companyId}/${departId}`, {params} )
}

 screen_standard/src/utils/apis.js

ÎļþÒÑɾ³ý

 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>
@@ -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>
@@ -108,7 +108,7 @@

<script setup>
import { reactive, ref, toRefs, onMounted, onBeforeUnmount, onUnmounted, nextTick } from 'vue'
import { getProcedurePlanData, getTop } from '@/utils/apis.js'
import { getProcedurePlanData, getTop, getProcedurePlansList, getRecordLogPage } from '@/utils/api.js'
import { useCounterStore } from '@/stores/counter.js'
import { useRoute } from 'vue-router'
import * as echarts from 'echarts'
@@ -119,18 +119,8 @@
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,
@@ -202,7 +192,16 @@
        }
      }
    })
  
  // å·¥åºè®¡åˆ’进度查询
  getProcedurePlansList(enterprise.companyId, enterprise.departId, { procedureId: route.query.procedureId })
    .then(res => {
      data.listData = res
    })
  // æŠ¥å·¥æ—¥å¿—分页查询 
  getRecordLogPage(enterprise.companyId, enterprise.departId, { capacity: 9999, page: 1, model: { procedureId: route.query.procedureId } })
    .then(res => {
      data.reportListData = res.records
    })
}

function handleMouseEnter() {