From 62678f54bbc7a64dc3cdad5d086e17de6383c003 Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期二, 22 八月 2023 15:04:57 +0800
Subject: [PATCH] Merge branch 'master' of ssh://139.186.142.91:29418/productDev/dmMes
---
screen_standard/src/views/process.vue | 57 ++++++++++++++++++++++++++++-----------------------------
1 files changed, 28 insertions(+), 29 deletions(-)
diff --git a/screen_standard/src/views/process.vue b/screen_standard/src/views/process.vue
index ac48cf4..88ae7a3 100644
--- a/screen_standard/src/views/process.vue
+++ b/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() {
--
Gitblit v1.9.3