From 5bd56f3ebf96aa9a71e4a452cd2402df59d17384 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期四, 04 九月 2025 09:28:27 +0800
Subject: [PATCH] 1.全部页面增加线下数据查询 2.增加一键删除线下玻璃按钮
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/TaskingService.java | 6
UI-Project/src/views/Rotate/rotate.vue | 39 ++++
UI-Project/src/views/ManualReporting/manualReporting.vue | 9 +
UI-Project/src/lang/zh.js | 1
UI-Project/src/views/Cleaning/cleaning.vue | 23 +-
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/TaskingController.java | 302 ++++++++++++++++++++-----------------
UI-Project/src/views/GlueDispenser/glueDispenser.vue | 7
UI-Project/src/views/Edging/edging.vue | 7
UI-Project/src/views/FlipSlice/flipSlice.vue | 38 ++++
UI-Project/src/views/Lamination/lamination.vue | 7
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/TaskingServiceImpl.java | 5
UI-Project/src/stores/tool.js | 11 +
UI-Project/src/views/Marking/marking.vue | 10 +
13 files changed, 306 insertions(+), 159 deletions(-)
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/TaskingController.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/TaskingController.java
index 156a2d2..c9e3eaf 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/TaskingController.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/TaskingController.java
@@ -29,159 +29,181 @@
* @author yanzhixin
* @since 2024-09-13
*/
- @RestController
- @RequestMapping("/tasking")
- public class TaskingController {
- @Autowired
- private TaskingService taskingService;
- @Autowired
- private ProjectService projectService;
- @Autowired
- private MachineMapper machineMapper;
- @Autowired
- private TaskingMapper taskingMapper;
- @Autowired
- private TaskingLogService taskingLogService;
- @Autowired
- private KBBTLensSortingMapper kBBTLensSortingMapper;
+@RestController
+@RequestMapping("/tasking")
+public class TaskingController {
+ @Autowired
+ private TaskingService taskingService;
+ @Autowired
+ private ProjectService projectService;
+ @Autowired
+ private MachineMapper machineMapper;
+ @Autowired
+ private TaskingMapper taskingMapper;
+ @Autowired
+ private TaskingLogService taskingLogService;
+ @Autowired
+ private KBBTLensSortingMapper kBBTLensSortingMapper;
-
- @ApiOperation("鏌ヨ搴撲綅淇℃伅 杩斿洖缁撴灉")
- @PostMapping("/findKBBTLensSorting")
- @ResponseBody
- public Result findKBBTLensSorting(@RequestBody Map<String, String> map) {
- try {
- String scanId=map.get("scanId").toString();
- if (!scanId.isEmpty()){
- List<KBBTLensSorting> list=kBBTLensSortingMapper.selectList(new QueryWrapper<KBBTLensSorting>().lambda()
- .eq(KBBTLensSorting::getBarcode,scanId));
- return Result.build(200,"鎴愬姛",list);
- }
- return Result.build(199,"鍓嶇浼犲�糔ULL",map);
- }catch (Exception e){
- return Result.build(199,"寮傚父",map);
+ @ApiOperation("鏌ヨ搴撲綅淇℃伅 杩斿洖缁撴灉")
+ @PostMapping("/findKBBTLensSorting")
+ @ResponseBody
+ public Result findKBBTLensSorting(@RequestBody Map<String, String> map) {
+ try {
+ String scanId = map.get("scanId").toString();
+ if (!scanId.isEmpty()) {
+ List<KBBTLensSorting> list = kBBTLensSortingMapper.selectList(new QueryWrapper<KBBTLensSorting>().lambda()
+ .eq(KBBTLensSorting::getBarcode, scanId));
+ return Result.build(200, "鎴愬姛", list);
}
+ return Result.build(199, "鍓嶇浼犲�糔ULL", map);
+ } catch (Exception e) {
+ return Result.build(199, "寮傚父", map);
}
- @ApiOperation("鎵爜鎴愬姛鍚庤繑鍥炵粨鏋� machineId,scanId")
- @PostMapping("/scanMachineAdd")
- @ResponseBody
- public Result scanMachineAdd(@RequestBody Map<String, String> map) {
- try {
- String machineId=map.get("machineId").toString();
- String scanId=map.get("scanId").toString();
- if (!scanId.isEmpty()&&!machineId.isEmpty()){
- Machine machine = machineMapper.selectById(machineId);
- int addCount =taskingService.scanMachineAdd(machine,scanId);
- return Result.build(200,"鎴愬姛",addCount);
- }
- return Result.build(199,"鍓嶇浼犲�糔ULL",map);
- }catch (Exception e){
- return Result.build(199,"寮傚父",map);
+ }
+
+ @ApiOperation("鎵爜鎴愬姛鍚庤繑鍥炵粨鏋� machineId,scanId")
+ @PostMapping("/scanMachineAdd")
+ @ResponseBody
+ public Result scanMachineAdd(@RequestBody Map<String, String> map) {
+ try {
+ String machineId = map.get("machineId").toString();
+ String scanId = map.get("scanId").toString();
+ if (!scanId.isEmpty() && !machineId.isEmpty()) {
+ Machine machine = machineMapper.selectById(machineId);
+ int addCount = taskingService.scanMachineAdd(machine, scanId);
+ return Result.build(200, "鎴愬姛", addCount);
}
+ return Result.build(199, "鍓嶇浼犲�糔ULL", map);
+ } catch (Exception e) {
+ return Result.build(199, "寮傚父", map);
}
- @ApiOperation("鎶ュ伐鎻愪氦 ")
- @PostMapping("/reportForWork")
- @ResponseBody
- public Result reportForWork(@RequestBody Machine machine) {
- try {
- int deleteCount=taskingMapper.deleteJoin(new MPJLambdaWrapper<Tasking>()
- .selectAll(Tasking.class)
- .innerJoin(LineConfiguration.class,LineConfiguration::getId,Tasking::getLineConfigurationId)
- .innerJoin(Machine.class,Machine::getId,LineConfiguration::getMachineId)
- .eq(LineConfiguration::getMachineId,machine.getId())
- .eq(Tasking::getGlassState,"姝ｅ父")
- .eq(Tasking::getState,"绾夸笂")
- .ne(Tasking::getWorkState,"瀹屽伐"));
- taskingLogService.reportTaskingLog();
- return Result.build(200,"鎴愬姛",deleteCount);
- }catch (Exception e){
- return Result.build(199,"寮傚父",machine);
- }
- }
- @ApiOperation("鏌ヨ褰撳墠璁惧锛屾湭瀹屽伐鐘舵�佺殑绾夸笂浠诲姟")
- @PostMapping("/findMachineTask")
- @ResponseBody
- public Result findMachineTask(@RequestBody Machine machine) {
- List<Tasking> list =taskingService.findMachineTask(machine);
- return Result.build(200,"鎴愬姛",list);
- }
+ }
- @ApiOperation("鏌ヨ褰撳墠璁惧锛屾煇鐘舵�佺殑绾夸笂浠诲姟銆愮瓑寰�/姝ｅ湪宸ヤ綔/瀹屽伐銆�")
- @PostMapping("/findMachineWorkStateTask")
- @ResponseBody
- public Result findMachineWorkStateTask(@RequestBody Machine machine,String workState) {
- List<Tasking> list =taskingService.findMachineWorkStateTask(machine,workState);
- return Result.build(200,"鎴愬姛",list);
+ @ApiOperation("鎶ュ伐鎻愪氦 ")
+ @PostMapping("/reportForWork")
+ @ResponseBody
+ public Result reportForWork(@RequestBody Machine machine) {
+ try {
+ int deleteCount = taskingMapper.deleteJoin(new MPJLambdaWrapper<Tasking>()
+ .selectAll(Tasking.class)
+ .innerJoin(LineConfiguration.class, LineConfiguration::getId, Tasking::getLineConfigurationId)
+ .innerJoin(Machine.class, Machine::getId, LineConfiguration::getMachineId)
+ .eq(LineConfiguration::getMachineId, machine.getId())
+ .eq(Tasking::getGlassState, "姝ｅ父")
+ .eq(Tasking::getState, "绾夸笂")
+ .ne(Tasking::getWorkState, "瀹屽伐"));
+ taskingLogService.reportTaskingLog();
+ return Result.build(200, "鎴愬姛", deleteCount);
+ } catch (Exception e) {
+ return Result.build(199, "寮傚父", machine);
}
+ }
- @ApiOperation("淇敼鐜荤拑鐘舵�� 銆愮牬鎹熴��")
- @PostMapping("/damagedTask")
- @ResponseBody
- public Result damagedTask(@RequestBody Tasking tasking) {
- int count =taskingService.damagedTask(tasking);
- return Result.build(200,"淇敼鎴愬姛锛�"+count,count);
- }
- @ApiOperation("淇敼浠诲姟鐘舵�� 銆愭鍦ㄥ伐浣溿��")
- @PostMapping("/startMachineTask")
- @ResponseBody
- public Result startMachineTask(@RequestBody Machine machine) {
- Tasking tasking =taskingService.startMachineTask(machine);
- return Result.build(200,"淇敼鎴愬姛锛�",tasking);
- }
- @ApiOperation("淇敼浠诲姟鐘舵�� 銆愬け璐ャ��")
- @PostMapping("/loseMachineTask")
- @ResponseBody
- public Result loseMachineTask(@RequestBody Machine machine) {
- int count =taskingService.loseMachineTask(machine);
- return Result.build(200,"淇敼鎴愬姛锛�"+count,count);
- }
- @ApiOperation("淇敼浠诲姟鐘舵�� 銆愬畬宸ャ��")
- @PostMapping("/finishMachineTask")
- @ResponseBody
- public Result finishMachineTask(@RequestBody Machine machine) {
- int count =taskingService.finishMachineTask(machine);
- return Result.build(200,"淇敼鎴愬姛锛�"+count,count);
- }
+ @ApiOperation("鏌ヨ褰撳墠璁惧锛屾湭瀹屽伐鐘舵�佺殑绾夸笂浠诲姟")
+ @PostMapping("/findMachineTask")
+ @ResponseBody
+ public Result findMachineTask(@RequestBody Machine machine) {
+ List<Tasking> list = taskingService.findMachineTask(machine);
+ return Result.build(200, "鎴愬姛", list);
+ }
- @ApiOperation("淇敼褰撳墠璁惧 銆愪笂绾裤��")
- @PostMapping("/glassTopLineList")
- @ResponseBody
- public Result glassTopLineList(@RequestBody List<Tasking> taskingList) {
- int count =taskingService.glassTopLine(taskingList);
- return Result.build(200,"淇敼鎴愬姛锛�"+count,count);
- }
+ @ApiOperation("鏌ヨ褰撳墠璁惧锛屾煇鐘舵�佺殑绾夸笂浠诲姟銆愮瓑寰�/姝ｅ湪宸ヤ綔/瀹屽伐銆�")
+ @PostMapping("/findMachineWorkStateTask")
+ @ResponseBody
+ public Result findMachineWorkStateTask(@RequestBody Machine machine, String workState) {
+ List<Tasking> list = taskingService.findMachineWorkStateTask(machine, workState);
+ return Result.build(200, "鎴愬姛", list);
+ }
- @ApiOperation("淇敼褰撳墠璁惧 銆愪笂绾裤��")
- @PostMapping("/glassTopLine")
- @ResponseBody
- public Result glassTopLine(@RequestBody Tasking tasking) {
- int count =taskingService.glassTopLine(tasking);
- return Result.build(200,"淇敼鎴愬姛锛�"+count,count);
- }
+ @ApiOperation("淇敼鐜荤拑鐘舵�� 銆愮牬鎹熴��")
+ @PostMapping("/damagedTask")
+ @ResponseBody
+ public Result damagedTask(@RequestBody Tasking tasking) {
+ int count = taskingService.damagedTask(tasking);
+ return Result.build(200, "淇敼鎴愬姛锛�" + count, count);
+ }
- @ApiOperation("淇敼褰撳墠璁惧 銆愪笅绾裤��")
- @PostMapping("/glassDownLine")
- @ResponseBody
- public Result glassDownLine(@RequestBody Tasking tasking) {
- int count =taskingService.glassDownLine(tasking);
- return Result.build(200,"淇敼鎴愬姛锛�"+count,count);
- }
- @ApiOperation("鐜荤拑 銆愪笅绾裤��")
- @PostMapping("/glassAgainTopLine")
- @ResponseBody
- public Result glassAgainTopLine(@RequestBody Tasking tasking) {
- int count =taskingService.stopTasking(tasking);
- return Result.build(200,"淇敼鎴愬姛锛�"+count,count);
- }
+ @ApiOperation("淇敼浠诲姟鐘舵�� 銆愭鍦ㄥ伐浣溿��")
+ @PostMapping("/startMachineTask")
+ @ResponseBody
+ public Result startMachineTask(@RequestBody Machine machine) {
+ Tasking tasking = taskingService.startMachineTask(machine);
+ return Result.build(200, "淇敼鎴愬姛锛�", tasking);
+ }
- @ApiOperation("鎻愪氦 鎵爜鎶ュ伐 ")
- @PostMapping("/scanReport")
- @ResponseBody
- public Result scanReport(@RequestBody Tasking tasking) {
- int count =taskingService.stopTasking(tasking);
- return Result.build(200,"淇敼鎴愬姛锛�"+count,count);
- }
+ @ApiOperation("淇敼浠诲姟鐘舵�� 銆愬け璐ャ��")
+ @PostMapping("/loseMachineTask")
+ @ResponseBody
+ public Result loseMachineTask(@RequestBody Machine machine) {
+ int count = taskingService.loseMachineTask(machine);
+ return Result.build(200, "淇敼鎴愬姛锛�" + count, count);
+ }
+
+ @ApiOperation("淇敼浠诲姟鐘舵�� 銆愬畬宸ャ��")
+ @PostMapping("/finishMachineTask")
+ @ResponseBody
+ public Result finishMachineTask(@RequestBody Machine machine) {
+ int count = taskingService.finishMachineTask(machine);
+ return Result.build(200, "淇敼鎴愬姛锛�" + count, count);
+ }
+
+ @ApiOperation("淇敼褰撳墠璁惧 銆愪笂绾裤��")
+ @PostMapping("/glassTopLineList")
+ @ResponseBody
+ public Result glassTopLineList(@RequestBody List<Tasking> taskingList) {
+ int count = taskingService.glassTopLine(taskingList);
+ return Result.build(200, "淇敼鎴愬姛锛�" + count, count);
+ }
+
+ @ApiOperation("淇敼褰撳墠璁惧 銆愪笂绾裤��")
+ @PostMapping("/glassTopLine")
+ @ResponseBody
+ public Result glassTopLine(@RequestBody Tasking tasking) {
+ int count = taskingService.glassTopLine(tasking);
+ return Result.build(200, "淇敼鎴愬姛锛�" + count, count);
+ }
+
+ @ApiOperation("淇敼褰撳墠璁惧 銆愪笅绾裤��")
+ @PostMapping("/glassDownLine")
+ @ResponseBody
+ public Result glassDownLine(@RequestBody Tasking tasking) {
+ int count = taskingService.glassDownLine(tasking);
+ return Result.build(200, "淇敼鎴愬姛锛�" + count, count);
+ }
+
+ @ApiOperation("鐜荤拑 銆愪笅绾裤��")
+ @PostMapping("/glassAgainTopLine")
+ @ResponseBody
+ public Result glassAgainTopLine(@RequestBody Tasking tasking) {
+ int count = taskingService.stopTasking(tasking);
+ return Result.build(200, "淇敼鎴愬姛锛�" + count, count);
+ }
+
+ @ApiOperation("鏌ヨ銆愮嚎涓嬨�戠幓鐠� ")
+ @PostMapping("/selectGlassDownLine")
+ @ResponseBody
+ public Result selectGlassDownLine() {
+ List<Tasking> downLineTask = taskingService.findDownLineTask();
+ return Result.build(200, "鏌ヨ鎴愬姛锛�", downLineTask);
+ }
+
+ @ApiOperation("鍒犻櫎銆愮嚎涓嬨�戠幓鐠� ")
+ @PostMapping("/deleteGlassDownLine")
+ @ResponseBody
+ public Result deleteGlassDownLine() {
+ int count = taskingService.deleteGlassDownLine();
+ return Result.build(200, "娓呴櫎鎴愬姛锛�"+count, count);
+ }
+
+ @ApiOperation("鎻愪氦 鎵爜鎶ュ伐 ")
+ @PostMapping("/scanReport")
+ @ResponseBody
+ public Result scanReport(@RequestBody Tasking tasking) {
+ int count = taskingService.stopTasking(tasking);
+ return Result.build(200, "淇敼鎴愬姛锛�" + count, count);
+ }
}
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/TaskingService.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/TaskingService.java
index dc38ab8..20ac77a 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/TaskingService.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/TaskingService.java
@@ -121,6 +121,12 @@
int glassTopLine(List<Tasking> taskingList);
/**
+ * 鎵归噺鍒犻櫎鐜荤拑 銆愮嚎涓嬨��
+ * @return
+ */
+ int deleteGlassDownLine();
+
+ /**
* @param tasking
* 鎵归噺淇敼鐘舵�� 銆愪笂绾裤��
* @return
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/TaskingServiceImpl.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/TaskingServiceImpl.java
index 68cd9ce..20e6294 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/TaskingServiceImpl.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/TaskingServiceImpl.java
@@ -468,6 +468,11 @@
return resultCount;
}
+ @Override
+ public int deleteGlassDownLine() {
+ return baseMapper.delete(new QueryWrapper<Tasking>().lambda().eq(Tasking::getState,"绾夸笅"));
+ }
+
/**
* @param taskingList
* 鎵归噺淇敼鐘舵�� 銆愪笂绾裤��
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index f5d29e7..f57a325 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -173,6 +173,7 @@
functionState:{
deleteTips:'鏄惁纭鐮存崯锛�',
delete :'鍒犻櫎',
+ deleteDownLineGlass :'鍒犻櫎绾夸笅鐜荤拑',
tips:'鏄惁纭锛�',
yes:'鏄�',
sure :'纭',
diff --git a/UI-Project/src/stores/tool.js b/UI-Project/src/stores/tool.js
index 71fd8d6..b47dd80 100644
--- a/UI-Project/src/stores/tool.js
+++ b/UI-Project/src/stores/tool.js
@@ -1,11 +1,18 @@
import moment from "moment";
//鏍煎紡鍖栬〃鏍兼椂闂存埑 姣
+// export function gridDateFormatter(row,column,cellValue,index){
+// const daterc = row[column.property];
+// //alert(daterc);
+// return moment(Number(daterc)).format('YYYY-MM-DD HH:mm:ss');
+// }
+
+//鏍煎紡鍖栬〃鏍兼椂闂存埑 姣
export function gridDateFormatter(row,column,cellValue,index){
const daterc = row[column.property];
- //alert(daterc);
- return moment(Number(daterc)).format('YYYY-MM-DD HH:mm:ss');
+ return moment.utc(daterc).utcOffset(8).format("YYYY-MM-DD HH:mm:ss");
}
+
export function getDataSort(dataSort){
dataSort.sort((a, b) => a.operationRecordTime - b.operationRecordTime);
}
diff --git a/UI-Project/src/views/Cleaning/cleaning.vue b/UI-Project/src/views/Cleaning/cleaning.vue
index c1d779b..4a297b5 100644
--- a/UI-Project/src/views/Cleaning/cleaning.vue
+++ b/UI-Project/src/views/Cleaning/cleaning.vue
@@ -42,24 +42,17 @@
// 鍋囪鍚庣杩斿洖鐨勬暟鎹牸寮忎笌 handleMessage 棰勬湡涓�鑷�
const responseData = res.data || {};
findMachine.value =responseData;
- if (Object.keys(findMachine.value).length === 0){
- if(findMachine.value.remark.toString()!=errorScanId&&findMachine.value.remark.toString()!=""&&findMachine.value.remark.toString()!=undefined){
- //鏈夋暟鎹氨寮圭獥
- if(errorOpen){
- ElMessageBox.close();
- }
- errorScanId=findMachine.value.remark.toString();
- errorInfoFuntion(findMachine.value.remark.toString());
- errorOpen=true;
- }else if(findMachine.value.remark.toString()==""&&errorOpen){
- ElMessageBox.close();
- errorOpen=false;
- }
- }
}
});
// 绾夸笅鏁版嵁
+ request.post("/deviceInteraction/tasking/selectGlassDownLine").then((res) => { // 鏇挎崲涓轰綘鐨凙PI绔偣
+ if (res.code === 200) {
+ // 鍋囪鍚庣杩斿洖鐨勬暟鎹牸寮忎笌 handleMessage 棰勬湡涓�鑷�
+ const responseData = res.data || {};
+ downLineTask.value =responseData;
+ }
+ });
} catch (err) {
console.error('瀹氭椂璇锋眰鍚庣鎺ュ彛澶辫触锛�', err);
}
@@ -256,7 +249,7 @@
<div id="search" >
<!-- 鍔熻兘 -->
<el-button :type="(findMachine['state']=='鏆傚仠'?'danger':'success')" id="ButtonMachineStatus" @click="machineStatus((findMachine['state']=='鏆傚仠'?'寮�宸�':'鏆傚仠'))">{{findMachine['state']=='寮�宸�'?$t('functionState.start'):$t('functionState.stop')}}</el-button>
- <el-button type="primary" id="ButtonTopLine" @click="topLine">{{$t('functionState.topLine')}}</el-button>
+<!-- <el-button type="primary" id="ButtonTopLine" @click="topLine">{{$t('functionState.topLine')}}</el-button>-->
<!-- <el-button type="primary" id="searchButton" @click="downLine('涓嬬嚎')">涓嬬嚎</el-button>
<el-button type="primary" id="searchButton" @click="workStatus('鐮存崯')">鐮存崯</el-button>
<el-button type="primary" id="searchButton" @click="workStatus('瀹屽伐')">瀹屽伐</el-button> -->
diff --git a/UI-Project/src/views/Edging/edging.vue b/UI-Project/src/views/Edging/edging.vue
index 752c951..769cf01 100644
--- a/UI-Project/src/views/Edging/edging.vue
+++ b/UI-Project/src/views/Edging/edging.vue
@@ -76,6 +76,13 @@
});
// 绾夸笅鏁版嵁
+ request.post("/deviceInteraction/tasking/selectGlassDownLine").then((res) => { // 鏇挎崲涓轰綘鐨凙PI绔偣
+ if (res.code === 200) {
+ // 鍋囪鍚庣杩斿洖鐨勬暟鎹牸寮忎笌 handleMessage 棰勬湡涓�鑷�
+ const responseData = res.data || {};
+ downLineTask.value =responseData;
+ }
+ });
} catch (err) {
console.error('瀹氭椂璇锋眰鍚庣鎺ュ彛澶辫触锛�', err);
}
diff --git a/UI-Project/src/views/FlipSlice/flipSlice.vue b/UI-Project/src/views/FlipSlice/flipSlice.vue
index c035cac..0f84131 100644
--- a/UI-Project/src/views/FlipSlice/flipSlice.vue
+++ b/UI-Project/src/views/FlipSlice/flipSlice.vue
@@ -76,6 +76,13 @@
}
});
// 绾夸笅鏁版嵁
+ request.post("/deviceInteraction/tasking/selectGlassDownLine").then((res) => { // 鏇挎崲涓轰綘鐨凙PI绔偣
+ if (res.code === 200) {
+ // 鍋囪鍚庣杩斿洖鐨勬暟鎹牸寮忎笌 handleMessage 棰勬湡涓�鑷�
+ const responseData = res.data || {};
+ downLineTask.value =responseData;
+ }
+ });
} catch (err) {
console.error('瀹氭椂璇锋眰鍚庣鎺ュ彛澶辫触锛�', err);
}
@@ -349,6 +356,35 @@
})
})
}
+
+//鍒犻櫎绾夸笅鐜荤拑
+const deleteGlassDownLine = async () => {
+ ElMessageBox.confirm(
+ t('functionState.tips'),
+ t('delivery.prompt'),
+ {
+ confirmButtonText: t('functionState.sure'),
+ cancelButtonText: t('functionState.cancel'),
+ type: 'warning',
+ }
+ )
+ .then(() => {
+ //涓婄嚎鎺ュ彛
+ request.post("/deviceInteraction/tasking/deleteGlassDownLine").then((res) => { // 鏇挎崲涓轰綘鐨凙PI绔偣
+ if (res.code === 200) {
+ ElMessage.success(res.message);
+ } else {
+ ElMessage.warning(res.message)
+ }
+ })
+ })
+ .catch(() => {
+ ElMessage({
+ type: 'info',
+ message: t('functionState.cancel'),
+ })
+ })
+}
const handleDialogClose = () => {
}
@@ -389,8 +425,8 @@
<el-button :type="(findMachine['mode'] == '瀹氬埗' ? 'danger' : 'success')" id="ButtonMachineMode"
@click="machineMode((findMachine['mode'] == 0 ? 1 : 0))">{{ findMachine['mode'] == 0 ?
$t('functionState.modeD') : $t('functionState.modeB') }}</el-button>
-
<el-button type="primary" id="ButtonTopLine" @click="topLineShow">{{ $t('functionState.topLine') }}</el-button>
+ <el-button type="primary" id="deleteGlassDownLine" @click="deleteGlassDownLine">{{ $t('functionState.deleteDownLineGlass') }}</el-button>
<!-- <el-button type="primary" id="searchButton" @click="downLine('涓嬬嚎')">涓嬬嚎</el-button>
<el-button type="primary" id="searchButton" @click="workStatus('鐮存崯')">鐮存崯</el-button>
<el-button type="primary" id="searchButton" @click="workStatus('瀹屽伐')">瀹屽伐</el-button> -->
diff --git a/UI-Project/src/views/GlueDispenser/glueDispenser.vue b/UI-Project/src/views/GlueDispenser/glueDispenser.vue
index d56c87c..b2d2db2 100644
--- a/UI-Project/src/views/GlueDispenser/glueDispenser.vue
+++ b/UI-Project/src/views/GlueDispenser/glueDispenser.vue
@@ -59,6 +59,13 @@
});
// 绾夸笅鏁版嵁
+ request.post("/deviceInteraction/tasking/selectGlassDownLine").then((res) => { // 鏇挎崲涓轰綘鐨凙PI绔偣
+ if (res.code === 200) {
+ // 鍋囪鍚庣杩斿洖鐨勬暟鎹牸寮忎笌 handleMessage 棰勬湡涓�鑷�
+ const responseData = res.data || {};
+ downLineTask.value =responseData;
+ }
+ });
} catch (err) {
console.error('瀹氭椂璇锋眰鍚庣鎺ュ彛澶辫触锛�', err);
}
diff --git a/UI-Project/src/views/Lamination/lamination.vue b/UI-Project/src/views/Lamination/lamination.vue
index 77aa2e2..5f83592 100644
--- a/UI-Project/src/views/Lamination/lamination.vue
+++ b/UI-Project/src/views/Lamination/lamination.vue
@@ -76,6 +76,13 @@
});
// 绾夸笅鏁版嵁
+ request.post("/deviceInteraction/tasking/selectGlassDownLine").then((res) => { // 鏇挎崲涓轰綘鐨凙PI绔偣
+ if (res.code === 200) {
+ // 鍋囪鍚庣杩斿洖鐨勬暟鎹牸寮忎笌 handleMessage 棰勬湡涓�鑷�
+ const responseData = res.data || {};
+ downLineTask.value =responseData;
+ }
+ });
} catch (err) {
console.error('瀹氭椂璇锋眰鍚庣鎺ュ彛澶辫触锛�', err);
}
diff --git a/UI-Project/src/views/ManualReporting/manualReporting.vue b/UI-Project/src/views/ManualReporting/manualReporting.vue
index 662c7cf..4a0ea7f 100644
--- a/UI-Project/src/views/ManualReporting/manualReporting.vue
+++ b/UI-Project/src/views/ManualReporting/manualReporting.vue
@@ -105,7 +105,16 @@
}
}
});
+
// 绾夸笅鏁版嵁
+ request.post("/deviceInteraction/tasking/selectGlassDownLine").then((res) => { // 鏇挎崲涓轰綘鐨凙PI绔偣
+ if (res.code === 200) {
+ // 鍋囪鍚庣杩斿洖鐨勬暟鎹牸寮忎笌 handleMessage 棰勬湡涓�鑷�
+ const responseData = res.data || {};
+ downLineTask.value =responseData;
+ groupAndCount();
+ }
+ });
} catch (err) {
console.error('瀹氭椂璇锋眰鍚庣鎺ュ彛澶辫触锛�', err);
}
diff --git a/UI-Project/src/views/Marking/marking.vue b/UI-Project/src/views/Marking/marking.vue
index 49771e2..de00271 100644
--- a/UI-Project/src/views/Marking/marking.vue
+++ b/UI-Project/src/views/Marking/marking.vue
@@ -17,6 +17,7 @@
const loadData = ref([]);
const findMachine = ref([]);
const sendRecords = ref([]);
+const downLineTask = ref([]);
const userInfo=JSON.parse(window.localStorage.getItem('userInfo'));
const pageParams=userInfo.user.menus[0].pages[3].params;
@@ -55,6 +56,13 @@
});
// 绾夸笅鏁版嵁
+ request.post("/deviceInteraction/tasking/selectGlassDownLine").then((res) => { // 鏇挎崲涓轰綘鐨凙PI绔偣
+ if (res.code === 200) {
+ // 鍋囪鍚庣杩斿洖鐨勬暟鎹牸寮忎笌 handleMessage 棰勬湡涓�鑷�
+ const responseData = res.data || {};
+ downLineTask.value =responseData;
+ }
+ });
} catch (err) {
console.error('瀹氭椂璇锋眰鍚庣鎺ュ彛澶辫触锛�', err);
}
@@ -252,7 +260,7 @@
<el-button :type="(findMachine['state']=='鏆傚仠'?'danger':'success')" id="ButtonMachineStatus"
@click="machineStatus((findMachine['state']=='鏆傚仠'?'寮�宸�':'鏆傚仠'))">
{{findMachine['state']=='寮�宸�'?$t('functionState.start'):$t('functionState.stop')}}</el-button>
- <el-button type="primary" id="ButtonTopLine" @click="topLine">{{$t('functionState.topLine')}}</el-button>
+<!-- <el-button type="primary" id="ButtonTopLine" @click="topLine">{{$t('functionState.topLine')}}</el-button>-->
<!-- <el-button type="primary" id="searchButton" @click="downLine('涓嬬嚎')">涓嬬嚎</el-button>
<el-button type="primary" id="searchButton" @click="workStatus('鐮存崯')">鐮存崯</el-button>
<el-button type="primary" id="searchButton" @click="workStatus('瀹屽伐')">瀹屽伐</el-button> -->
diff --git a/UI-Project/src/views/Rotate/rotate.vue b/UI-Project/src/views/Rotate/rotate.vue
index c9cc309..74264f0 100644
--- a/UI-Project/src/views/Rotate/rotate.vue
+++ b/UI-Project/src/views/Rotate/rotate.vue
@@ -75,6 +75,13 @@
});
// 绾夸笅鏁版嵁
+ request.post("/deviceInteraction/tasking/selectGlassDownLine").then((res) => { // 鏇挎崲涓轰綘鐨凙PI绔偣
+ if (res.code === 200) {
+ // 鍋囪鍚庣杩斿洖鐨勬暟鎹牸寮忎笌 handleMessage 棰勬湡涓�鑷�
+ const responseData = res.data || {};
+ downLineTask.value =responseData;
+ }
+ });
} catch (err) {
console.error('瀹氭椂璇锋眰鍚庣鎺ュ彛澶辫触锛�', err);
}
@@ -343,6 +350,7 @@
const topLineShow = async () => {
blind.value = true;
}
+
//涓婄嚎
const topLine = async (row) => {
ElMessageBox.confirm(
@@ -375,6 +383,36 @@
})
})
}
+
+//鍒犻櫎绾夸笅鐜荤拑
+const deleteGlassDownLine = async () => {
+ ElMessageBox.confirm(
+ t('functionState.tips'),
+ t('delivery.prompt'),
+ {
+ confirmButtonText: t('functionState.sure'),
+ cancelButtonText: t('functionState.cancel'),
+ type: 'warning',
+ }
+ )
+ .then(() => {
+ //涓婄嚎鎺ュ彛
+ request.post("/deviceInteraction/tasking/deleteGlassDownLine").then((res) => { // 鏇挎崲涓轰綘鐨凙PI绔偣
+ if (res.code === 200) {
+ ElMessage.success(res.message);
+ } else {
+ ElMessage.warning(res.message)
+ }
+ })
+ })
+ .catch(() => {
+ ElMessage({
+ type: 'info',
+ message: t('functionState.cancel'),
+ })
+ })
+}
+
const handleDialogClose = () => {
}
@@ -433,6 +471,7 @@
<el-button type="primary" id="ButtonTopLine" @click="topLineShow">{{ $t('functionState.topLine') }}</el-button>
+ <el-button type="primary" id="deleteGlassDownLine" @click="deleteGlassDownLine">{{ $t('functionState.deleteDownLineGlass') }}</el-button>
<!-- <el-button type="primary" id="searchButton" @click="downLine('涓嬬嚎')">涓嬬嚎</el-button>
<el-button type="primary" id="searchButton" @click="workStatus('鐮存崯')">鐮存崯</el-button>
<el-button type="primary" id="searchButton" @click="workStatus('瀹屽伐')">瀹屽伐</el-button> -->
--
Gitblit v1.8.0