From d1a1ec641be43c9bd303acb06136b7fa32743571 Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期四, 27 六月 2024 09:50:26 +0800
Subject: [PATCH] 更新大屏接口
---
代码管理/PCS/WCS_Client/package.json | 2 +-
代码管理/PCS/WCS_Client/src/views/Homes/Homest/centerLeft2index.vue | 10 +++++-----
代码管理/PCS/WCS_Client/src/views/Home.vue | 13 +++++++------
代码管理/PCS/WCS_Server/WIDESEA_WebApi/Controllers/ReadplcController.cs | 12 ++++--------
4 files changed, 17 insertions(+), 20 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/package.json" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/package.json"
index 79b0a97..03914ee 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/package.json"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/package.json"
@@ -3,7 +3,7 @@
"version": "0.1.0",
"private": true,
"scripts": {
- "serve": " SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
+ "serve": "SET NODE_OPTIONS= && vue-cli-service serve",
"build": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
"test:unit": "vue-cli-service test:unit",
"lint": "vue-cli-service lint"
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/Home.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/Home.vue"
index b70ffed..9b06835 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/Home.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/Home.vue"
@@ -132,9 +132,9 @@
selList() {
this.loading = true;
this.http.post('api/Readplc/dt_stationinfolist').then(x => {
- this.datalist = x.data.data;
- for (var i = 0; i < x.data.data[1].item1.length; i++) {
- this.ddataList[i] = x.data.data[1].item1[i];
+ this.datalist = x;
+ for (var i = 0; i < x[1].item1.length; i++) {
+ this.ddataList[i] = x[1].item1[i];
}
})
.catch(error => {
@@ -144,9 +144,10 @@
//鑾峰彇涓嬫枡鍙ｇ殑鏁版嵁
selListxl() {
this.loading = true;
- this.http.post('api/Readplc/pcs_dt_stationinfolist').then(x => {
- this.dataxlist = x.data.data;
- this.item1 = x.data.data[4].item1[0];
+ this.http.post('api/Readplc/pcs_dt_stationinfolist').then((x) => {
+
+ this.dataxlist = x;
+ this.item1 = x[4].item1[0];
})
.catch(error => {
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/Homes/Homest/centerLeft2index.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/Homes/Homest/centerLeft2index.vue"
index 175c012..76d1405 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/Homes/Homest/centerLeft2index.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/Homes/Homest/centerLeft2index.vue"
@@ -800,11 +800,11 @@
required: true
}
},
- watch: {
- plcList_one(newVal, oldVal) {
- console.log('er:', newVal);
- }
- },
+ // watch: {
+ // plcList_one(newVal, oldVal) {
+ // console.log('er:', newVal);
+ // }
+ // },
data() {
return {
isModalVisible: false,
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WebApi/Controllers/ReadplcController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WebApi/Controllers/ReadplcController.cs"
index 3fc2ea7..8d2e5af 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WebApi/Controllers/ReadplcController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WebApi/Controllers/ReadplcController.cs"
@@ -768,9 +768,8 @@
#endregion
[HttpPost("dt_stationinfolist")]
- public WebResponseContent dt_stationinfolist()
+ public IActionResult dt_stationinfolist()
{
- WebResponseContent content = new WebResponseContent();
VOLContext volContext = new VOLContext();
Idt_stationinfoRepository dsta = new dt_stationinfoRepository(volContext);
string[] stationCodes = { "W", "A", "B", "C", "D01" };
@@ -781,13 +780,11 @@
int inst = dsta.Find(_ => true).Where(a => a.stationCode.Contains(code)).GroupBy(a => a.line).Count();
responseData.Add(Tuple.Create(data, inst));
}
- content.Data = responseData;
- return content;
+ return Ok(responseData);
}
[HttpPost("pcs_dt_stationinfolist")]
- public WebResponseContent pcs_dt_stationinfolist()
+ public IActionResult pcs_dt_stationinfolist()
{
- WebResponseContent content = new WebResponseContent();
VOLContext volContext = new VOLContext();
Idt_stationinfoRepository dsta = new dt_stationinfoRepository(volContext);
string[] stationCodes = { "X01", "X02", "X03", "S", "DD001" };
@@ -797,8 +794,7 @@
var data = dsta.Find(_ => true).Where(a => a.stationCode.Contains(code)).OrderBy(a => a.stationCode).ToList();
responseData.Add(Tuple.Create(data));
}
- content.Data = responseData;
- return content;
+ return Ok(responseData);
}
}
}
--
Gitblit v1.9.3