|
@@ -112,6 +112,11 @@
|
|
|
><span>{{ row.batchNo }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
+ <el-table-column align="center" prop="source" label="数据来源">
|
|
|
+ <template #default="{ row }"
|
|
|
+ ><span>{{ row.source }}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column
|
|
|
align="center"
|
|
|
prop="accuracys"
|
|
@@ -195,9 +200,18 @@
|
|
|
><span>{{ row.measure }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column align="center" width="160" prop="" label="操作">
|
|
|
+ <el-table-column align="center" width="240" prop="" label="操作">
|
|
|
<template #default="{ row }">
|
|
|
<el-button
|
|
|
+ v-if="row.source === '自动'"
|
|
|
+ type="primary"
|
|
|
+ size="small"
|
|
|
+ class="btn"
|
|
|
+ @click="dataAcquisition(row)"
|
|
|
+ style="height: 25px"
|
|
|
+ >采集数据</el-button
|
|
|
+ >
|
|
|
+ <el-button
|
|
|
type="primary"
|
|
|
size="small"
|
|
|
class="btn"
|
|
@@ -258,13 +272,16 @@
|
|
|
v-for="(item, index) in taskOption"
|
|
|
:key="index"
|
|
|
:label="item.taskCode"
|
|
|
- :value="item.id"
|
|
|
+ :value="Number(item.id)"
|
|
|
/>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="产品型号" prop="model">
|
|
|
<el-input :disabled="true" v-model="addData.model" />
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="数据来源" prop="source">
|
|
|
+ <el-input :disabled="true" v-model="addData.source" />
|
|
|
+ </el-form-item>
|
|
|
<el-form-item label="生产批号" prop="batchNo">
|
|
|
<el-input v-model="addData.batchNo" />
|
|
|
</el-form-item>
|
|
@@ -327,15 +344,26 @@ import {
|
|
|
getTaskCode,
|
|
|
} from "@/api/analysis";
|
|
|
import Search from "@/components/Search/index.vue";
|
|
|
-import { XBarRCompute } from "@/api/analysis";
|
|
|
+import { XBarRCompute, collectData } from "@/api/analysis";
|
|
|
import { useCrud } from "@/hooks/userCrud";
|
|
|
|
|
|
const { Utils } = useCrud({
|
|
|
src: "/api/v1/spc/pDownloadTemplate",
|
|
|
});
|
|
|
const { exportData } = Utils;
|
|
|
-
|
|
|
const emit = defineEmits(["tableData"]);
|
|
|
+
|
|
|
+const dataAcquisition = async (row) => {
|
|
|
+ const { data } = await collectData({
|
|
|
+ qualitySpcRecordId: row.id,
|
|
|
+ model: row.model,
|
|
|
+ batchNo: row.batchNo,
|
|
|
+ operation: lableValue.value,
|
|
|
+ });
|
|
|
+ emit("tableData", data);
|
|
|
+ getTableData();
|
|
|
+};
|
|
|
+
|
|
|
const compute = async () => {
|
|
|
const accuracysList = ref([]);
|
|
|
for (const item of tableData.value) {
|
|
@@ -555,6 +583,7 @@ const taskChange = (value) => {
|
|
|
taskOption.value.forEach((item) => {
|
|
|
if (item.id == value) {
|
|
|
addData.value.model = item.prodtModel;
|
|
|
+ addData.value.source = item.source;
|
|
|
if (item.source === "手动") {
|
|
|
accuracysSum.value = Number(item.processCount);
|
|
|
addData.value.accuracys = [];
|