From 3e1567003f6d51aa810252238235c448fa5bf0ab Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期三, 26 六月 2024 19:03:04 +0800
Subject: [PATCH] 优化工业看板
---
代码管理/大屏/src/views/centerRight3.vue | 4 ++--
代码管理/大屏/src/views/centerRight4.vue | 4 ++--
代码管理/WMS/WMS_Server/WIDESEA_WebApi/Controllers/LargescreenController.cs | 3 +++
代码管理/大屏/src/main.js | 2 +-
代码管理/大屏/README.md | 2 +-
5 files changed, 9 insertions(+), 6 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/LargescreenController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/LargescreenController.cs"
index 06bc158..39848cc 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/LargescreenController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/LargescreenController.cs"
@@ -382,6 +382,9 @@
case "SendOut":
item.agv_taskstate = "宸蹭笅鍙�";
break;
+ case "Pause":
+ item.agv_taskstate = "鏆傚仠";
+ break;
default:
return "鏈煡浠诲姟鐘舵��";
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\345\244\247\345\261\217/README.md" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\345\244\247\345\261\217/README.md"
index 9084486..f4e64e9 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\345\244\247\345\261\217/README.md"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/\345\244\247\345\261\217/README.md"
@@ -182,7 +182,7 @@
Vue.prototype.$http = axios.create({
//璁剧疆20绉掕秴鏃舵椂闂�
timeout: 20000,
- baseURL: 'http://localhost:8098', //杩欓噷鍐欏悗绔湴鍧�http://localhost:8098/
+ baseURL: 'http://192.168.12.101:8098', //杩欓噷鍐欏悗绔湴鍧�http://localhost:8098/
});
```
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\345\244\247\345\261\217/src/main.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\345\244\247\345\261\217/src/main.js"
index 46997f8..ab606c4 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\345\244\247\345\261\217/src/main.js"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/\345\244\247\345\261\217/src/main.js"
@@ -21,7 +21,7 @@
Vue.prototype.$http = axios.create({
timeout: 20000,
- baseURL: 'http://localhost:8098',
+ baseURL: 'http://192.168.12.101:8098',
});
//5.x 寮曠敤鏂瑰紡涓烘寜闇�寮曠敤
//甯屾湜浣跨敤5.x鐗堟湰鐨勮瘽,闇�瑕佸湪package.json涓洿鏂扮増鏈彿,骞跺垏鎹㈠紩鐢ㄦ柟寮�
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\345\244\247\345\261\217/src/views/centerRight3.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\345\244\247\345\261\217/src/views/centerRight3.vue"
index 0bc4177..a90cf89 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\345\244\247\345\261\217/src/views/centerRight3.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/\345\244\247\345\261\217/src/views/centerRight3.vue"
@@ -45,10 +45,10 @@
this.changeNumber()
setInterval(() => {
this.changeNumber()
- },100)
+ },5000)
},
changeNumber() {
- this.$http.post('/api/Largescreen/Current_agvtask')
+ this.$http.post("/api/Largescreen/Current_agvtask", "鏌ヨ涓�...")
.then(response => {
let GetAGVTaskData = []
if(response.data<=0){
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\345\244\247\345\261\217/src/views/centerRight4.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\345\244\247\345\261\217/src/views/centerRight4.vue"
index b3e3510..55ec29f 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\345\244\247\345\261\217/src/views/centerRight4.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/\345\244\247\345\261\217/src/views/centerRight4.vue"
@@ -46,12 +46,12 @@
this.GetLocationData();
setInterval(() => {
this.GetLocationData()
- },1000)
+ },5000)
},
GetLocationData(){
var _this=this;
this.data = [];
- axios.post("http://localhost:8099/api/Readplc/Workinfo_information").then((x)=>{
+ axios.post("http://192.168.12.101:8099/api/Readplc/Workinfo_information").then((x)=>{
let GetAGVTaskData = []
x.data.forEach(element => {
let data = [
--
Gitblit v1.9.3