|
@@ -1,163 +1,137 @@
|
|
|
<template>
|
|
|
- <div>
|
|
|
- <div class="btns">
|
|
|
- <el-button type="success" class="btn" @click="begin">开始测试</el-button>
|
|
|
- <el-button type="danger" class="btn" @click="stop">停止测试</el-button>
|
|
|
- </div>
|
|
|
- <div>
|
|
|
- <el-table :data="tableData" class="tableView">
|
|
|
- <el-table-column prop="taskNo" label="当前任务号" align="center" />
|
|
|
- <el-table-column
|
|
|
- prop="tightenResult"
|
|
|
- label="最终拧紧结果"
|
|
|
- align="center"
|
|
|
- />
|
|
|
- <el-table-column
|
|
|
- prop="tightenTorqueMax"
|
|
|
- label="拧紧过程中最大扭力值"
|
|
|
- align="center"
|
|
|
- />
|
|
|
- <el-table-column
|
|
|
- prop="torquetarget"
|
|
|
- label="当前任务目标扭力"
|
|
|
- align="center"
|
|
|
- />
|
|
|
- <el-table-column prop="totalCycles" label="总圈数" align="center" />
|
|
|
- <el-table-column prop="warning" label="警报" align="center" />
|
|
|
- <!-- <el-table-column prop="writeData" align="center" label="是否已填报">
|
|
|
- <template #default="scope">
|
|
|
- <span
|
|
|
- :class="{
|
|
|
- 'red-text': scope.row.writeData === '',
|
|
|
- 'green-text': scope.row.writeData !== '',
|
|
|
- }"
|
|
|
- >
|
|
|
- {{ scope.row.writeData === "" ? "否" : "是" }}
|
|
|
- </span>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="操作" fixed="right" width="200">
|
|
|
- <template #default="scope">
|
|
|
- <el-button
|
|
|
- link
|
|
|
- v-if="scope.row.writeData !== ''"
|
|
|
- class="btnText"
|
|
|
- type="primary"
|
|
|
- @click="handleLook(scope.row)"
|
|
|
- >
|
|
|
- 查看
|
|
|
- </el-button>
|
|
|
- <el-button
|
|
|
- link
|
|
|
- class="btnText"
|
|
|
- type="primary"
|
|
|
- @click="handleEdit(scope.row)"
|
|
|
- >
|
|
|
- 编辑
|
|
|
- </el-button>
|
|
|
-
|
|
|
- <el-popconfirm
|
|
|
- v-if="scope.row.writeData !== ''"
|
|
|
- :visible="scope.row.dialogVisible"
|
|
|
- title="您确认重置吗?(重置此操作不可逆)"
|
|
|
- width="200"
|
|
|
- @cancel="scope.row.dialogVisible = false"
|
|
|
- @confirm="reset(scope.row)"
|
|
|
- >
|
|
|
- <el-button> 取消 </el-button>
|
|
|
- <el-button type="primary"> 确认 </el-button>
|
|
|
- <template #reference>
|
|
|
- <el-button
|
|
|
- link
|
|
|
- class="btnText"
|
|
|
- type="primary"
|
|
|
- @click="scope.row.dialogVisible = true"
|
|
|
- >重置</el-button
|
|
|
- >
|
|
|
- </template>
|
|
|
- </el-popconfirm>
|
|
|
- </template>
|
|
|
- </el-table-column> -->
|
|
|
- </el-table>
|
|
|
- <Pagination
|
|
|
- v-model:limit="page.pageSize"
|
|
|
- v-model:page="page.pageNo"
|
|
|
- :total="page.total"
|
|
|
- size="large"
|
|
|
- @pagination="getData"
|
|
|
- position="right"
|
|
|
- />
|
|
|
- </div>
|
|
|
+ <div class="containerBox">
|
|
|
+ <el-collapse accordion v-model="activeNames">
|
|
|
+ <el-collapse-item
|
|
|
+ v-for="(item, index) in materialsData"
|
|
|
+ :key="index"
|
|
|
+ :name="index"
|
|
|
+ >
|
|
|
+ <template #title>
|
|
|
+ {{
|
|
|
+ dictS.getLableByValue("device_type", item.deviceType)
|
|
|
+ }} <span
|
|
|
+ :class="item.state ? 'round green' : 'round'"
|
|
|
+ ></span
|
|
|
+ >
|
|
|
+ <span
|
|
|
+ @click.stop="aa"
|
|
|
+ class="opear"
|
|
|
+ style="font-size: 18px; color: rgb(10, 89, 247); font-weight: 600"
|
|
|
+ >新增数据</span
|
|
|
+ ></template
|
|
|
+ >
|
|
|
+ <el-table :data="item.children" border>
|
|
|
+ <el-table-column prop="a" label="设备编号">
|
|
|
+ <template #default="scope" v-if="!item.updateStatus">
|
|
|
+ {{ scope.row.a }}
|
|
|
+ </template>
|
|
|
+ <template #default v-else>
|
|
|
+ <el-input v-model="item.equitType" />
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column prop="b" label="设备名称">
|
|
|
+ <template #default="scope" v-if="!item.updateStatus">
|
|
|
+ {{ scope.row.b }}
|
|
|
+ </template>
|
|
|
+ <template #default v-else>
|
|
|
+ <el-input v-model="item.equitType" />
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column prop="equitType" label="高度">
|
|
|
+ <template #default="scope" v-if="!item.updateStatus">
|
|
|
+ {{ scope.row.c }}
|
|
|
+ </template>
|
|
|
+ <template #default v-else>
|
|
|
+ <el-input v-model="item.equitType" />
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column prop="equitType" label="宽度">
|
|
|
+ <template #default="scope" v-if="!item.updateStatus">
|
|
|
+ {{ scope.row.d }}
|
|
|
+ </template>
|
|
|
+ <template #default v-else>
|
|
|
+ <el-input v-model="item.equitType" />
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column prop="equitType" label="采集时间">
|
|
|
+ <template #default="scope" v-if="!item.updateStatus">
|
|
|
+ {{ scope.row.e }}
|
|
|
+ </template>
|
|
|
+ <template #default v-else>
|
|
|
+ <el-input v-model="item.equitType" />
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="操作">
|
|
|
+ <template #default="scope">
|
|
|
+ <!-- <span class="opear">完成</span> -->
|
|
|
+ <span class="opear">删除</span>
|
|
|
+ <!-- <span class="opear">取消</span> -->
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
+ </el-collapse-item>
|
|
|
+ </el-collapse>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
-<script setup>
|
|
|
-import {
|
|
|
- getScrewdriverData,
|
|
|
- startData,
|
|
|
- endData,
|
|
|
-} from "@/api/prosteps/screwdriver";
|
|
|
+<script setup lang="ts">
|
|
|
+import { getScrewdriverData } from "@/api/prosteps/screwdriver";
|
|
|
import { useProcessStore } from "@/store";
|
|
|
-import { emitter, EventsNames } from "@/utils/common";
|
|
|
+import { useDictionaryStore } from "@/store";
|
|
|
+import { DeviceContainer, ResData } from "@/api/prosteps/screwdriverTypes";
|
|
|
+const dictS = useDictionaryStore();
|
|
|
const store = useProcessStore();
|
|
|
+const activeNames = ref([0]);
|
|
|
+const materialsData = ref<DeviceContainer[]>([]);
|
|
|
+const getData = async () => {
|
|
|
+ const res: ResData = await getScrewdriverData();
|
|
|
+ materialsData.value = res.data;
|
|
|
+};
|
|
|
+const aa = () => {
|
|
|
+ console.log("111");
|
|
|
+};
|
|
|
const page = reactive({
|
|
|
pageSize: 10,
|
|
|
pageNo: 1,
|
|
|
total: 0,
|
|
|
});
|
|
|
-const tableData = ref([]);
|
|
|
-const getData = async () => {
|
|
|
- const { data, code } = await getScrewdriverData({
|
|
|
- pageSize: page.pageSize,
|
|
|
- pageNo: page.pageNo,
|
|
|
- });
|
|
|
- tableData.value = data.records;
|
|
|
- page.total = data.totalCount;
|
|
|
-};
|
|
|
-const begin = async () => {
|
|
|
- const { code } = await startData({
|
|
|
- workOrderCode: store.odersData.workOrderCode,
|
|
|
- seqNo: store.useSeqNo,
|
|
|
- operationId: store.odersData.operationId,
|
|
|
- operationName: store.processInfo.operationName,
|
|
|
- });
|
|
|
- if (code == "200") {
|
|
|
- ElMessage.success("操作成功");
|
|
|
- }
|
|
|
-};
|
|
|
-const stop = async () => {
|
|
|
- const { code } = await endData();
|
|
|
- if (code == "200") {
|
|
|
- ElMessage.success("操作成功");
|
|
|
- }
|
|
|
-};
|
|
|
-const setSearch = () => {
|
|
|
- page.pageNo = 1;
|
|
|
-};
|
|
|
onMounted(() => {
|
|
|
- emitter.on(EventsNames.GET_Screwdriver, () => {
|
|
|
- setSearch();
|
|
|
- getData();
|
|
|
- });
|
|
|
getData();
|
|
|
});
|
|
|
</script>
|
|
|
|
|
|
<style lang="scss" scoped>
|
|
|
-.btns {
|
|
|
- width: 100%;
|
|
|
- height: 60px;
|
|
|
- display: flex;
|
|
|
- align-items: center;
|
|
|
- .btn {
|
|
|
- height: 40px;
|
|
|
- font-size: 20px;
|
|
|
+//生产履历表格公共样式
|
|
|
+:deep(.el-collapse-item__header) {
|
|
|
+ background-color: white !important;
|
|
|
+ padding: 0 20px;
|
|
|
+ height: 80px;
|
|
|
+}
|
|
|
+:deep(.el-badge) {
|
|
|
+ font-size: $f24;
|
|
|
+}
|
|
|
+:deep(.el-collapse-item__header) {
|
|
|
+ font-size: $f24;
|
|
|
+}
|
|
|
+:deep(.el-pagination) {
|
|
|
+ span {
|
|
|
+ font-weight: 600 !important;
|
|
|
}
|
|
|
}
|
|
|
-.tableView {
|
|
|
- width: 100%;
|
|
|
- height: calc(100vh - 380px);
|
|
|
- padding: 20px 0px;
|
|
|
- border-radius: 16px;
|
|
|
+:deep(.el-collapse-item__wrap) {
|
|
|
+ padding: 20px;
|
|
|
+}
|
|
|
+.opear {
|
|
|
+ font-size: 16px;
|
|
|
+ margin-right: 5px;
|
|
|
+}
|
|
|
+.round {
|
|
|
+ width: 20px;
|
|
|
+ height: 20px;
|
|
|
+ border-radius: 10px;
|
|
|
+ background-color: red;
|
|
|
+}
|
|
|
+.green {
|
|
|
+ background-color: green;
|
|
|
}
|
|
|
</style>
|