From 0cce10d0db3ea3786edf4b322925057ad87814cf Mon Sep 17 00:00:00 2001
From: chenyong <chenyong@hnkhzn.com>
Date: 星期四, 15 五月 2025 09:16:19 +0800
Subject: [PATCH] 三楼大屏
---
CodeManagement/BigScreenVue/src/views/indexs/station-two.vue | 60 +---
CodeManagement/BigScreenVue/src/views/home.vue | 2
CodeManagement/BigScreenVue/src/views/indexs/station-three.vue | 12
CodeManagement/BigScreenVue/src/views/indexs/index.vue | 14
CodeManagement/BigScreenVue/src/views/indexs/right-center.vue | 59 +++
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 45 ++
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationRepository/obj/Debug/net6.0/WIDESEA_StoragIntegrationRepository.AssemblyInfo.cs | 2
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationRepository/obj/WIDESEA_StoragIntegrationRepository.csproj.nuget.g.props | 10
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationRepository/obj/Debug/net6.0/WIDESEA_IStoragIntegrationRepository.AssemblyInfo.cs | 2
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationRepository/obj/Debug/net6.0/WIDESEA_IStoragIntegrationRepository.GeneratedMSBuildEditorConfig.editorconfig | 2
CodeManagement/BigScreenVue/src/views/indexs/station-one.vue | 60 +---
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json | 84 +++---
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs | 22 +
CodeManagement/BigScreenVue/src/views/indexs/center-bottom.vue | 176 +++----------
CodeManagement/BigScreenVue/src/views/indexs/left-bottom.vue | 98 +++---
CodeManagement/BigScreenVue/src/views/indexs/center-map.vue | 16
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationRepository/obj/Debug/net6.0/WIDESEA_StoragIntegrationRepository.GeneratedMSBuildEditorConfig.editorconfig | 2
CodeManagement/BigScreenVue/src/views/indexs/plan.vue | 53 ++-
CodeManagement/BigScreenVue/src/views/indexs/pass-two.vue | 38 ++
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskService/Task/IDt_TaskService.cs | 10
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationRepository/obj/WIDESEA_IStoragIntegrationRepository.csproj.nuget.g.props | 10
21 files changed, 373 insertions(+), 404 deletions(-)
diff --git a/CodeManagement/BigScreenVue/src/views/home.vue b/CodeManagement/BigScreenVue/src/views/home.vue
index 8586461..eb97471 100644
--- a/CodeManagement/BigScreenVue/src/views/home.vue
+++ b/CodeManagement/BigScreenVue/src/views/home.vue
@@ -23,7 +23,7 @@
<div class="guang"></div>
<div class="d-flex jc-center">
<div class="title">
- <span class="title-text">娣畨鐗瑰垱鎴愬搧鏁版嵁灞曠ず骞冲彴</span>
+ <span class="title-text">娴欐睙鍐犲畤鏁版嵁灞曠ず骞冲彴</span>
</div>
</div>
<div class="timers">
diff --git a/CodeManagement/BigScreenVue/src/views/indexs/center-bottom.vue b/CodeManagement/BigScreenVue/src/views/indexs/center-bottom.vue
index 4a302d6..3049fc6 100644
--- a/CodeManagement/BigScreenVue/src/views/indexs/center-bottom.vue
+++ b/CodeManagement/BigScreenVue/src/views/indexs/center-bottom.vue
@@ -11,7 +11,7 @@
<script>
// import { currentGET } from "api/modules";
import { graphic } from "echarts";
-import {Productions} from "@/api/http.js"
+import {Getproductionvolume} from "@/api/http.js"
import axios from 'axios'
export default {
data() {
@@ -35,7 +35,7 @@
"浜ч噺" +
" : " +
item.value +
- "PCS</br>";
+ "鎵�</br>";
} else {
result += item.marker + " " + item.seriesName + " : - </br>";
}
@@ -44,7 +44,7 @@
},
},
legend: {
- data: ["鍗曚綅锛歅CS"],
+ data: ["鍗曚綅锛氭墭"],
textStyle: {
color: "#B4B4B4",
},
@@ -57,14 +57,14 @@
top: "20px",
},
xAxis: {
- data: ['8/12','8/13','8/14','8/15','8/16','8/17','8/18'],
+ data: [],
axisLine: {
lineStyle: {
color: "#B4B4B4",
},
},
axisTick: {
- show: false,
+ show: true,
},
},
yAxis: [
@@ -82,7 +82,7 @@
],
series: [
{
- name: "鍗曚綅锛歅CS",
+ name: "鍗曚綅锛氭墭",
type: "bar",
barWidth: 20,
itemStyle: {
@@ -106,8 +106,8 @@
},
],
},
- };
- },
+ xAxisDates: [],
+ };},
props: {},
mounted() {
this.getData();
@@ -129,21 +129,29 @@
}, 3000);
},
async getData() {
- // this.numberData.forEach((item, index) => {
- // item.number.number[0] += ++index
- // item.number = { ...item.number }
- // })
- var rep = await Productions();
- console.log(rep);
- //鑾峰彇rep涓璞＄殑鐨則oday鍊兼暣鍚堟垚鏁扮粍
- var todays= rep.map((item) => {
- return item.today;
- });
- //鑾峰彇rep涓璞＄殑鐨刾csCounts鍊兼暣鍚堟垚鏁扮粍
- var pcsCounts= rep.map((item) => {
- return item.pcsCounts;
- });
- console.log(todays);
+ const rep = await Getproductionvolume();
+
+ var rep1=rep.filter(it=>it.taskType==200&&it.roadway.includes("JZ"))
+ // 鍒嗙粍骞舵帓搴�
+ const groupedData = rep1.reduce((acc, item) => {
+ const dateKey = item.createDate.split(' ')[0];
+ acc[dateKey] = acc[dateKey] || { date: dateKey, tasks: [] };
+ acc[dateKey].tasks.push(item);
+ return acc;
+ }, {});
+
+ const sortedGroups = Object.values(groupedData).sort(
+ (a, b) => new Date(b.date) - new Date(a.date)
+ );
+
+ // 鎻愬彇鏃ユ湡锛�7/2 鏍煎紡锛�
+ this.xAxisDates= sortedGroups.map(group => {
+ const date = new Date(group.date);
+ return `${date.getMonth() + 1}/${date.getDate()}`;
+ });
+ console.log(sortedGroups)
+ const pcsCounts = sortedGroups.map(group => group.tasks.length);
+
this.options = {
tooltip: {
trigger: "axis",
@@ -163,7 +171,7 @@
"浜ч噺" +
" : " +
item.value +
- "PCS</br>";
+ "鎵�</br>";
} else {
result += item.marker + " " + item.seriesName + " : - </br>";
}
@@ -172,7 +180,7 @@
},
},
legend: {
- data: ["鍗曚綅锛歅CS"],
+ data: ["鍗曚綅锛氭墭"],
textStyle: {
color: "#B4B4B4",
},
@@ -185,14 +193,14 @@
top: "20px",
},
xAxis: {
- data: todays.reverse(),
+ data:this.xAxisDates.reverse(),
axisLine: {
lineStyle: {
color: "#B4B4B4",
},
},
axisTick: {
- show: false,
+ show: true,
},
},
yAxis: [
@@ -210,7 +218,7 @@
],
series: [
{
- name: "鍗曚綅锛歅CS",
+ name: "鍗曚綅锛氭墭",
type: "bar",
barWidth: 20,
itemStyle: {
@@ -239,115 +247,9 @@
this.$store.state.setting.echartsAutoTime
);
},
-
- // async getData() {
- // this.pageflag = true;
- // let rep = await Timefault((a)=>{
- // console.log(a);
- // });
-
- // this.init(rep);
- // currentGET("big6", { companyName: this.companyName }).then((res) => {
- // console.log("鏁呴殰鏃堕暱缁熻", res);
-
- // // if (res.success) {
- // // this.init(res.data);
- // // console.log("娴嬭瘯2",res.data);
- // // } else {
- // // this.pageflag = false;
- // // this.$Message({
- // // text: res.msg,
- // // type: "warning",
- // // });
- // // }
- // });
- // },
- // init(val) {
- // console.log(val);
- // this.options = {
- // tooltip: {
- // trigger: "axis",
- // backgroundColor: "rgba(0,0,0,.6)",
- // borderColor: "rgba(147, 235, 248, .8)",
- // textStyle: {
- // color: "#FFF",
- // },
- // formatter: function (params) {
- // // 娣诲姞鍗曚綅
- // var result = params[0].name + "<br>";
- // params.forEach(function (item) {
- // if (item.value) {
- // result +=
- // item.marker +
- // " " +
- // "鍚堟牸浜ч噺" +
- // " : " +
- // item.value +
- // "绠�</br>";
- // } else {
- // result += item.marker + " " + item.seriesName + " : - </br>";
- // }
- // });
- // return result;
- // },
- // },
- // legend: {
- // data: ["鍗曚綅锛氱"],
- // textStyle: {
- // color: "#B4B4B4",
- // },
- // top: "-5",
- // },
- // grid: {
- // left: "50px",
- // right: "40px",
- // bottom: "30px",
- // top: "20px",
- // },
- // xAxis: {
- // data: [val[6].datetime,val[5].datetime,val[4].datetime,val[3].datetime,
- // val[2].datetime,val[1].datetime,val[0].datetime],
- // axisLine: {
- // lineStyle: {
- // color: "#B4B4B4",
- // },
- // },
- // axisTick: {
- // show: false,
- // },
- // },
- // yAxis: [
- // {
- // splitLine: { show: true },
- // axisLine: {
- // lineStyle: {
- // color: "#B4B4B4",
- // },
- // },
- // axisLabel: {
- // formatter: "{value}",
- // },
- // }
- // ],
- // series: [
- // {
- // name: "鍗曚綅锛氱",
- // type: "bar",
- // barWidth: 20,
- // itemStyle: {
- // borderRadius: 5,
- // color: new graphic.LinearGradient(0, 0, 0, 1, [
- // { offset: 0, color: "#956FD4" },
- // { offset: 1, color: "#3EACE5" },
- // ]),
- // },
- // data: [val[6].qty,val[5].qty,val[4].qty,val[3].qty,
- // val[2].qty,val[1].qty,val[0].qty],
- // },
- // ],
- // };
- // },
- },
+
+
+ }
};
</script>
<style lang="scss" scoped>
diff --git a/CodeManagement/BigScreenVue/src/views/indexs/center-map.vue b/CodeManagement/BigScreenVue/src/views/indexs/center-map.vue
index 1898df6..886b898 100644
--- a/CodeManagement/BigScreenVue/src/views/indexs/center-map.vue
+++ b/CodeManagement/BigScreenVue/src/views/indexs/center-map.vue
@@ -30,6 +30,7 @@
import { currentGET } from "api/modules";
import * as echarts from "echarts";
import { GETNOBASE } from "api";
+import {Getproductionvolume} from "@/api/http.js"
export default {
data() {
return {
@@ -44,19 +45,12 @@
mounted() {
// console.log(xzqCode);
- this.getData("china");
+ this.getData();
},
methods: {
- getData(code) {
- // currentGET("big8", { regionCode: code }).then((res) => {
- // console.log("璁惧鍒嗗竷", res);
- // if (res.success) {
- // this.getGeojson(res.data.regionCode, res.data.dataList);
- // this.mapclick();
- // } else {
- // this.$Message.warning(res.msg);
- // }
- // });
+
+ async getData(code) {
+
},
/**
* @description: 鑾峰彇geojson
diff --git a/CodeManagement/BigScreenVue/src/views/indexs/index.vue b/CodeManagement/BigScreenVue/src/views/indexs/index.vue
index e000998..4bc7dfc 100644
--- a/CodeManagement/BigScreenVue/src/views/indexs/index.vue
+++ b/CodeManagement/BigScreenVue/src/views/indexs/index.vue
@@ -17,21 +17,21 @@
<ItemWrap
class="contetn_left-bottom contetn_lr-item"
- title="鎴愬搧鎵ц浠诲姟缁熻"
+ title="褰撳墠鍑哄叆搴撲换鍔�"
>
<stationone/>
</ItemWrap>
<ItemWrap
class="contetn_left-bottom contetn_lr-item"
- title="鎴愬搧搴撳瓨灞炴�у垎甯�"
+ title="浠婃棩寰呭嚭搴撳疄鐩�"
>
<stationtwo/>
</ItemWrap>
<ItemWrap
class="contetn_left-bottom contetn_lr-item"
- title="鎴愬搧璐т綅鐘舵�佷俊鎭�"
+ title="璐т綅鐘舵�佷俊鎭�"
>
<stationthree/>
</ItemWrap>
@@ -43,7 +43,7 @@
</div>
<ItemWrap
class="contetn_left-bottom contetn_lr-item"
- title="鎴愬搧搴撳瓨灞曠ず淇℃伅"
+ title="浜ч噺灞曠ず淇℃伅"
style="padding: 0 10px 16px 10px"
>
<RightCenter />
@@ -52,7 +52,7 @@
<div class="contetn_right">
<ItemWrap
class="contetn_left-bottom contetn_lr-item"
- title="鎴愬搧浜у搧淇℃伅鎺掕"
+ title="鍚勭嚎褰撳墠浠诲姟鏁伴噺"
style="padding: 0 10px 16px 10px"
>
<passtwo />
@@ -60,7 +60,7 @@
<ItemWrap
class="contetn_left-bottom contetn_lr-item"
- title="鎴愬搧鍏ュ簱浜ч噺缁熻"
+ title="瀹炵洏鍏ュ簱浜ч噺缁熻"
style="padding: 0 10px 16px 10px"
>
<CenterBottom />
@@ -68,7 +68,7 @@
<ItemWrap
class="contetn_left-bottom contetn_lr-item"
- title="鎴愬搧鍑哄簱浜ч噺缁熻"
+ title="瀹炵洏鍑哄簱浜ч噺缁熻"
>
<plan />
</ItemWrap>
diff --git a/CodeManagement/BigScreenVue/src/views/indexs/left-bottom.vue b/CodeManagement/BigScreenVue/src/views/indexs/left-bottom.vue
index c5bff26..4d9f6e9 100644
--- a/CodeManagement/BigScreenVue/src/views/indexs/left-bottom.vue
+++ b/CodeManagement/BigScreenVue/src/views/indexs/left-bottom.vue
@@ -13,11 +13,12 @@
<script>
import { currentGET } from "api/modules";
-import { ProLocationStatistics } from "@/api/http.js";
+import { Getproductionvolume } from "@/api/http.js";
import * as echarts from 'echarts';
let style = {
fontSize: 24,
};
+
export default {
data() {
return {
@@ -201,7 +202,7 @@
itemStyle: {
color: '#feb01e'
},
- data: [43, 50, 41, 18, 28, 25, 26, 40],
+ data: [99, 50, 41, 18, 28, 25, 26, 0],
}, {
name: 'CO2',
type: 'line',
@@ -300,40 +301,35 @@
clearData() {
if (this.timer) {
clearInterval(this.timer);
- this.timer = null;
+ this.timer = 3000;
}
},
async getData() {
- this.pageflag = true;
- // currentGET("big2").then((res) => {
- // if (!this.timer) {
- // console.log("璁惧鎬昏2", res);
- // }
- // if (res.success) {
- // this.userOverview = res.data;
- // this.onlineconfig = {
- // ...this.onlineconfig,
- // number: [1]
- // }
- // this.config = {
- // ...this.config,
- // number: [7]
- // }
- // this.offlineconfig = {
- // ...this.offlineconfig,
- // number: [4]
- // }
- // this.laramnumconfig = {
- // ...this.laramnumconfig,
- // number: [10]
- // }
- // this.switper();
- // } else {
- // this.pageflag = false;
- // this.$Message.warning(res.msg);
- // }
- // });
- var rep = await ProLocationStatistics();
+ var rep1=await Getproductionvolume()
+ var rep=rep1.filter(it=>it.roadway.includes("JZ"))
+ // (1) 鎸夋棩鏈熷垎缁勬牳蹇冪畻娉�
+const groupedData = rep.reduce((acc, item) => {
+ // 鎻愬彇鏃ユ湡閮ㄥ垎锛堟牸寮忥細YYYY-MM-DD锛�
+ const dateKey = item.createDate.split(' ')[0]; // 鎴� item.createDate.substring(0,10)
+
+ // 鍒涘缓鏃ユ湡鍒嗙粍瀹瑰櫒锛堝鏋滀笉瀛樺湪锛�
+ if (!acc[dateKey]) {
+ acc[dateKey] = {
+ date: dateKey,
+ tasks: []
+ };
+ }
+
+ // 灏嗗綋鍓嶉」鍔犲叆瀵瑰簲鍒嗙粍
+ acc[dateKey].tasks.push(item);
+ return acc;
+}, {});
+
+// (2) 杞崲涓烘帓搴忓悗鐨勬暟缁�
+const sortedGroups = Object.values(groupedData)
+ .sort((a, b) => new Date(b.date) - new Date(a.date)); // 闄嶅簭鎺掑垪
+
+
this.options = {
backgroundColor: '#0a1256',
//娴姩妗�
@@ -350,7 +346,7 @@
itemWidth: 10,
itemHeight: 10,
icon: 'circle',
- data: ['鎴愬搧鍏ュ簱', '鎴愬搧鍑哄簱', '鎴愬搧鍥炴']
+ data: ['瀹炴鍏ュ簱', '瀹炴鍑哄簱', '绌烘鍏ュ簱']
},
grid: {
left: '8%',
@@ -369,7 +365,7 @@
gte: 60,
color: '#e5421b'
}],
- seriesName: '鎴愬搧鍏ュ簱',
+ seriesName: '瀹炴鍏ュ簱',
seriesIndex: 2
}, {
type: 'piecewise',
@@ -382,7 +378,7 @@
gte: 60,
color: '#e5421b'
}],
- seriesName: '鎴愬搧鍑哄簱',
+ seriesName: '瀹炴鍑哄簱',
seriesIndex: 1
}, {
type: 'piecewise',
@@ -395,7 +391,7 @@
gte: 60,
color: '#e5421b'
}],
- seriesName: '鎴愬搧鍥炴',
+ seriesName: '绌烘鍏ュ簱',
seriesIndex: 0
}],
//x杞�
@@ -416,7 +412,7 @@
show: false
},
//鍧愭爣杞存樉绀哄��
- data: ["04/19", "04/20", "04/21", "04/22", "04/23", "04/24", "04/25"]
+ data: [sortedGroups[6].date, sortedGroups[5].date, sortedGroups[4].date, sortedGroups[3].date,sortedGroups[2].date,sortedGroups[1].date,sortedGroups[0].date ]
},
//y杞�
yAxis: {
@@ -446,31 +442,31 @@
//
series: [{
- name: '鎴愬搧鍏ュ簱',
+ name: '瀹炴鍏ュ簱',
type: 'line',
symbolSize: [0, 0],
itemStyle: {
color: '#feb01e'
},
- data: [160, 156, 150, 180, 170, 200, 20],
+ data: [sortedGroups[6].tasks.filter(it=>it.taskType==200).length, sortedGroups[5].tasks.filter(it=>it.taskType==200).length, sortedGroups[4].tasks.filter(it=>it.taskType==200).length, sortedGroups[3].tasks.filter(it=>it.taskType==200).length, sortedGroups[2].tasks.filter(it=>it.taskType==200).length, sortedGroups[1].tasks.filter(it=>it.taskType==200).length, sortedGroups[0].tasks.filter(it=>it.taskType==200).length],
}, {
- name: '鎴愬搧鍑哄簱',
+ name: '瀹炴鍑哄簱',
type: 'line',
symbolSize: [0, 0],
itemStyle: {
color: '#1be57a'
},
- data: [80, 115, 120, 130, 91, 99, 20]
+ data: [sortedGroups[6].tasks.filter(it=>it.taskType==100).length, sortedGroups[5].tasks.filter(it=>it.taskType==100).length, sortedGroups[4].tasks.filter(it=>it.taskType==100).length, sortedGroups[3].tasks.filter(it=>it.taskType==100).length, sortedGroups[2].tasks.filter(it=>it.taskType==100).length, sortedGroups[1].tasks.filter(it=>it.taskType==100).length, sortedGroups[0].tasks.filter(it=>it.taskType==100).length]
}, {
- name: '鎴愬搧鍥炴',
+ name: '绌烘鍏ュ簱',
type: 'line',
symbolSize: [0, 0],
itemStyle: {
color: '#69dbf7'
},
- data: [70, 113, 118, 111, 89, 99, 32]
+ data: [sortedGroups[6].tasks.filter(it=>it.taskType==204).length, sortedGroups[5].tasks.filter(it=>it.taskType==204).length, sortedGroups[4].tasks.filter(it=>it.taskType==204).length, sortedGroups[3].tasks.filter(it=>it.taskType==204).length, sortedGroups[2].tasks.filter(it=>it.taskType==204).length, sortedGroups[1].tasks.filter(it=>it.taskType==204).length, sortedGroups[0].tasks.filter(it=>it.taskType==204).length]
}, { //姘存尝绾圭偣
- name: '鎴愬搧鍏ュ簱',
+ name: '瀹炴鍏ュ簱',
type: 'effectScatter',
symbolSize: [5, 5],
rippleEffect: {
@@ -487,10 +483,9 @@
color: 'rgba(254,176,30,.3)'
}])
},
- data: [160, 156, 150, 180, 170, 200, 20]
-
+ data: [sortedGroups[6].tasks.filter(it=>it.taskType==200).length, sortedGroups[5].tasks.filter(it=>it.taskType==200).length, sortedGroups[4].tasks.filter(it=>it.taskType==200).length, sortedGroups[3].tasks.filter(it=>it.taskType==200).length, sortedGroups[2].tasks.filter(it=>it.taskType==200).length, sortedGroups[1].tasks.filter(it=>it.taskType==200).length, sortedGroups[0].tasks.filter(it=>it.taskType==200).length],
}, { //姘存尝绾圭偣
- name: '鎴愬搧鍑哄簱',
+ name: '瀹炴鍑哄簱',
type: 'effectScatter',
symbolSize: [5, 5],
rippleEffect: {
@@ -507,10 +502,10 @@
color: 'rgba(27,229,122,.3)'
}])
},
- data: [80, 115, 120, 130, 91, 99, 20]
+ data:[sortedGroups[6].tasks.filter(it=>it.taskType==100).length, sortedGroups[5].tasks.filter(it=>it.taskType==100).length, sortedGroups[4].tasks.filter(it=>it.taskType==100).length, sortedGroups[3].tasks.filter(it=>it.taskType==100).length, sortedGroups[2].tasks.filter(it=>it.taskType==100).length, sortedGroups[1].tasks.filter(it=>it.taskType==100).length, sortedGroups[0].tasks.filter(it=>it.taskType==100).length]
}, { //姘存尝绾圭偣
- name: '鎴愬搧鍥炴',
+ name: '绌烘鍏ュ簱',
type: 'effectScatter',
symbolSize: [5, 5],
rippleEffect: {
@@ -543,7 +538,7 @@
yAxis: 60
}]
},
- data: [70, 113, 118, 111, 89, 99, 32]
+ data: [sortedGroups[6].tasks.filter(it=>it.taskType==204).length, sortedGroups[5].tasks.filter(it=>it.taskType==204).length, sortedGroups[4].tasks.filter(it=>it.taskType==204).length, sortedGroups[3].tasks.filter(it=>it.taskType==204).length, sortedGroups[2].tasks.filter(it=>it.taskType==204).length, sortedGroups[1].tasks.filter(it=>it.taskType==204).length, sortedGroups[0].tasks.filter(it=>it.taskType==204).length]
}]
};
@@ -551,6 +546,7 @@
},
//杞
switper() {
+
if (this.timer) {
return;
}
diff --git a/CodeManagement/BigScreenVue/src/views/indexs/pass-two.vue b/CodeManagement/BigScreenVue/src/views/indexs/pass-two.vue
index 45196b6..2b8b948 100644
--- a/CodeManagement/BigScreenVue/src/views/indexs/pass-two.vue
+++ b/CodeManagement/BigScreenVue/src/views/indexs/pass-two.vue
@@ -13,7 +13,7 @@
<script>
import { currentGET } from "api/modules";
-import { ProductionRanking } from "@/api/http.js";
+import { Floorfault } from "@/api/http.js";
import * as echarts from 'echarts';
let style = {
fontSize: 24,
@@ -44,7 +44,7 @@
init() {
// import echarts from 'echarts'
var charts = { // 鎸夐『搴忔帓鍒椾粠澶у埌灏�
- cityList: ['38鍙风偣锛�1锛�', '38鍙风偣锛�2锛�', '15鍙风偣', '16鍙风偣', '24鍙风偣'],
+ cityList: ['8绾匡級', '6绾�', '5绾�','7绾�'],
cityData: [7500, 6200, 5700, 4200, 3500]
}
var top10CityList = charts.cityList
@@ -216,13 +216,31 @@
// this.$Message.warning(res.msg);
// }
// });
- var rep = await ProductionRanking();
- var cityLists= rep.map((item,index) => {
- return '#'+(index+1)+' 浜у搧'+item.pCode;
- });
- var cityDatas= rep.map((item,index) => {
- return item.qtys;
- });
+ var rep1 = await Floorfault();
+ const rep = rep1.filter(it => it.roadway.includes("JZ"));
+
+// 鎸� productionLine 瀛楁鍒嗙粍锛屽苟杞崲涓哄璞℃暟缁�
+const groupedArray = Object.entries(
+ rep.reduce((acc, item) => {
+ const key = item.productionLine;
+ if (!acc[key]) {
+ acc[key] = [];
+ }
+ acc[key].push(item);
+ return acc;
+ }, {})
+).map(([productionLine, items]) => ({
+ productionLine,
+ items
+}));
+
+// 浠� groupedArray 涓彁鍙栨墍鏈� productionLine 鐨勫��
+const cityLists = groupedArray.map(item => item.productionLine);
+// 鑾峰彇姣忕粍鐨勯暱搴︽暟缁�
+const cityDatas = groupedArray.map(group => group.items.length);
+
+// 杈撳嚭瀵硅薄鏁扮粍鏍煎紡鐨勫垎缁勭粨鏋�
+
var charts = { // 鎸夐『搴忔帓鍒椾粠澶у埌灏�
cityList: cityLists,
cityData: cityDatas
@@ -310,7 +328,7 @@
fontFamily: 'PingFangSC-Regular'
},
formatter: function (val) {
- return `${val}PCS`
+ return `${val}鎵榒
}
},
splitArea: {
diff --git a/CodeManagement/BigScreenVue/src/views/indexs/plan.vue b/CodeManagement/BigScreenVue/src/views/indexs/plan.vue
index 1d7896c..0da94d4 100644
--- a/CodeManagement/BigScreenVue/src/views/indexs/plan.vue
+++ b/CodeManagement/BigScreenVue/src/views/indexs/plan.vue
@@ -11,7 +11,7 @@
<script>
// import { currentGET } from "api/modules";
import { graphic } from "echarts";
-import {ProductionsOut} from "@/api/http.js"
+import {Getproductionvolume} from "@/api/http.js"
import axios from 'axios'
export default {
data() {
@@ -35,7 +35,7 @@
"浜ч噺" +
" : " +
item.value +
- "PCS</br>";
+ "鎵�</br>";
} else {
result += item.marker + " " + item.seriesName + " : - </br>";
}
@@ -44,7 +44,7 @@
},
},
legend: {
- data: ["鍗曚綅锛歅CS"],
+ data: ["鍗曚綅锛氭墭"],
textStyle: {
color: "#B4B4B4",
},
@@ -82,7 +82,7 @@
],
series: [
{
- name: "鍗曚綅锛歅CS",
+ name: "鍗曚綅锛氭墭",
type: "bar",
barWidth: 20,
itemStyle: {
@@ -106,6 +106,7 @@
},
],
},
+ xAxisDates: [],
};
},
props: {},
@@ -129,21 +130,27 @@
}, 3000);
},
async getData() {
- // this.numberData.forEach((item, index) => {
- // item.number.number[0] += ++index
- // item.number = { ...item.number }
- // })
- var rep = await ProductionsOut();
- console.log(rep);
- //鑾峰彇rep涓璞＄殑鐨則oday鍊兼暣鍚堟垚鏁扮粍
- var todays= rep.map((item) => {
- return item.today;
- });
- //鑾峰彇rep涓璞＄殑鐨刾csCounts鍊兼暣鍚堟垚鏁扮粍
- var pcsCounts= rep.map((item) => {
- return item.pcsCounts;
- });
- console.log(todays);
+ const rep = await Getproductionvolume();
+
+var rep1=rep.filter(it=>it.taskType==100&&it.roadway.includes("JZ"))
+// 鍒嗙粍骞舵帓搴�
+const groupedData = rep1.reduce((acc, item) => {
+const dateKey = item.createDate.split(' ')[0];
+acc[dateKey] = acc[dateKey] || { date: dateKey, tasks: [] };
+acc[dateKey].tasks.push(item);
+return acc;
+}, {});
+
+const sortedGroups = Object.values(groupedData).sort(
+(a, b) => new Date(b.date) - new Date(a.date)
+);
+
+this.xAxisDates= sortedGroups.map(group => {
+const date = new Date(group.date);
+return `${date.getMonth() + 1}/${date.getDate()}`;
+});
+
+const pcsCounts = sortedGroups.map(group => group.tasks.length);
this.options = {
tooltip: {
trigger: "axis",
@@ -163,7 +170,7 @@
"浜ч噺" +
" : " +
item.value +
- "PCS</br>";
+ "鎵�</br>";
} else {
result += item.marker + " " + item.seriesName + " : - </br>";
}
@@ -172,7 +179,7 @@
},
},
legend: {
- data: ["鍗曚綅锛歅CS"],
+ data: ["鍗曚綅锛氭墭"],
textStyle: {
color: "#B4B4B4",
},
@@ -185,7 +192,7 @@
top: "20px",
},
xAxis: {
- data: todays.reverse(),
+ data:this.xAxisDates.reverse(),
axisLine: {
lineStyle: {
color: "#B4B4B4",
@@ -210,7 +217,7 @@
],
series: [
{
- name: "鍗曚綅锛歅CS",
+ name: "鍗曚綅锛氭墭",
type: "bar",
barWidth: 20,
itemStyle: {
diff --git a/CodeManagement/BigScreenVue/src/views/indexs/right-center.vue b/CodeManagement/BigScreenVue/src/views/indexs/right-center.vue
index 65c3385..ea0e31f 100644
--- a/CodeManagement/BigScreenVue/src/views/indexs/right-center.vue
+++ b/CodeManagement/BigScreenVue/src/views/indexs/right-center.vue
@@ -13,7 +13,7 @@
<script>
import { currentGET } from "api/modules";
-import { ProductionStock } from "@/api/http.js";
+import { Getoutput } from "@/api/http.js";
import * as echarts from 'echarts';
let style = {
fontSize: 24,
@@ -226,18 +226,61 @@
// this.$Message.warning(res.msg);
// }
// });
- var rep = await ProductionStock();
+ var rep1=await Getoutput();
+
+ var rep=rep1.filter(it=>it.roadway.includes("JZ"))
+
+// 鑾峰彇浠婂ぉ闆剁偣鐨勬椂闂存埑
+const now = Date.now(); // 褰撳墠鏃堕棿鎴筹紙姣锛�
+const todayStart = new Date(now);
+todayStart.setHours(0, 0, 0, 0); // 璁剧疆涓烘湰鍦版椂闂寸殑 00:00:00
+const todayStartTimestamp = todayStart.getTime();
+// 鍑忓幓褰撳ぉ宸茶繃鍘荤殑姣鏁�
+const timestamp = todayStartTimestamp;
+const date = new Date(timestamp);
+
+// 琛ラ浂鍑芥暟
+const padZero = (num) => num.toString().padStart(2, '0');
+
+// 鏍煎紡鍖栨棩鏈�
+const formattedDate = `${date.getFullYear()}-${
+ padZero(date.getMonth() + 1)}-${
+ padZero(date.getDate())} ${
+ padZero(date.getHours())}:${
+ padZero(date.getMinutes())}:${
+ padZero(date.getSeconds())}`;
+
+
+// 鏈湴鏃跺尯褰撴湀绗竴澶╃殑 00:00:00
+const firstDayOfMonth = new Date(
+ new Date().getFullYear(),
+ new Date().getMonth(), // 鏈堜唤浠� 0 寮�濮嬶紙0=1鏈堬級
+ 1 // 鏃ユ湡璁句负 1 鍙�
+);
+const date1 = new Date(firstDayOfMonth.getTime());
+
+// 琛ラ浂鍑芥暟
+const padZero1 = (num) => num.toString().padStart(2, '0');
+
+// 鏍煎紡鍖栨棩鏈�
+const formattedDate1 = `${date.getFullYear()}-${
+ padZero1(date1.getMonth() + 1)}-${
+ padZero1(date1.getDate())} ${
+ padZero1(date1.getHours())}:${
+ padZero1(date1.getMinutes())}:${
+ padZero1(date1.getSeconds())}`;
+
var data1 = [{
- text: '鎴愬搧搴撳瓨(PCS)',
- value: rep.cpCount,
+ text: '鏃ヤ骇閲�',
+ value:rep.filter(it => it.createDate>formattedDate ).length,
color: '#5dd054'
}, {
- text: '鐮斿彂搴撳瓨(PCS)',
- value: rep.yfCount,
+ text: '鏈堜骇閲�',
+ value: rep.filter(it => it.createDate>formattedDate1).length,
color: '#097ff9'
}, {
- text: '灏炬暟搴撳瓨(PCS)',
- value: rep.wsCount,
+ text: '骞翠骇閲�',
+ value:rep.length,
color: '#ff6804'
}];
diff --git a/CodeManagement/BigScreenVue/src/views/indexs/station-one.vue b/CodeManagement/BigScreenVue/src/views/indexs/station-one.vue
index eaa6e13..1cd69b4 100644
--- a/CodeManagement/BigScreenVue/src/views/indexs/station-one.vue
+++ b/CodeManagement/BigScreenVue/src/views/indexs/station-one.vue
@@ -11,7 +11,7 @@
<div class="user_Overview_nums allnum ">
<dv-digital-flop :config="inboundConfig" style="width:100%;height:100%;" />
</div>
- <p>鎴愬搧鍏ュ簱</p>
+ <p>瀹炴鍏ュ簱</p>
<br>
<!-- <p>{{stationstate[0].station_state}}</p> -->
<!-- <p v-if="stationstate[0].station_state == '妫�淇腑'">{{stationstate[0].station_checkName}}</p> -->
@@ -20,7 +20,7 @@
<div class="user_Overview_nums online">
<dv-digital-flop :config="outboundConfig" style="width:100%;height:100%;" />
</div>
- <p>鎴愬搧鍑哄簱</p>
+ <p>瀹炴鍑哄簱</p>
<br>
<!-- <p>{{stationstate[1].station_state}}</p> -->
<!-- <p v-if="stationstate[1].station_state == '妫�淇腑'">{{stationstate[1].station_checkName}}</p> -->
@@ -29,7 +29,7 @@
<div class="user_Overview_nums offline">
<dv-digital-flop :config="backConfig" style="width:100%;height:100%;" />
</div>
- <p>鎴愬搧鍥炴</p>
+ <p>绌烘鍏ュ簱</p>
<br>
<!-- <p>{{stationstate[1].station_state}}</p> -->
<!-- <p v-if="stationstate[1].station_state == '妫�淇腑'">{{stationstate[1].station_checkName}}</p> -->
@@ -38,7 +38,7 @@
<div class="user_Overview_nums laramnum">
<dv-digital-flop :config="surplusConfig" style="width:100%;height:100%;" />
</div>
- <p>鎴愬搧閫�搴�</p>
+ <p>绌烘鍑哄簱</p>
<br>
<!-- <p>{{stationstate[1].station_state}}</p> -->
<!-- <p v-if="stationstate[1].station_state == '妫�淇腑'">{{stationstate[1].station_checkName}}</p> -->
@@ -70,6 +70,7 @@
<script>
import { currentGET } from 'api/modules'
import {Floorfault} from "@/api/http.js"
+
let style = {
fontSize: 24
}
@@ -86,8 +87,8 @@
stationstate:[],
pageflag: true,
timer: null,
- backConfig: { //鎴愬搧鍥炴
- number: [9999],
+ backConfig: { //绌烘鍏ュ簱
+ number: [50],
content: '{nt}',
style: {
...style,
@@ -147,51 +148,22 @@
},
async getData() {
this.pageflag = true;
- // currentGET("big2").then((res) => {
- // if (!this.timer) {
- // console.log("璁惧鎬昏2", res);
- // }
- // if (res.success) {
- // this.userOverview = res.data;
- // this.onlineconfig = {
- // ...this.onlineconfig,
- // number: [1]
- // }
- // this.config = {
- // ...this.config,
- // number: [7]
- // }
- // this.offlineconfig = {
- // ...this.offlineconfig,
- // number: [4]
- // }
- // this.laramnumconfig = {
- // ...this.laramnumconfig,
- // number: [10]
- // }
- // this.switper();
- // } else {
- // this.pageflag = false;
- // this.$Message.warning(res.msg);
- // }
- // });
- var rep = await Floorfault();
-
+
+ var rep1 = await Floorfault();
+ var rep=rep1.filter(task=>task.roadway.includes("JZ"))
this.inboundConfig={
- ...this.inboundConfig,
- number: [rep.inboundCount]
+ number: [rep.filter(task => task.taskType === "鍏ュ簱").length]
}
this.outboundConfig={
- ...this.outboundConfig,
- number: [rep.outboundCount]
+ number: [rep.filter(task => task.taskType === "鍑哄簱").length]
}
this.backConfig={
...this.backConfig,
- number: [rep.backboundCount]
+ number: [rep.filter(task => task.taskType === "绌烘墭鐩樺叆搴�").length]
}
this.surplusConfig={
...this.surplusConfig,
- number: [rep.surplusCount]
+ number: [rep.filter(task => task.taskType === "绌烘墭鐩樺嚭搴�").length]
}
// this.onlineconfig = {
// ...this.onlineconfig,
@@ -213,7 +185,9 @@
},
//杞
switper() {
- if (this.timer) {
+
+
+ if (this.timer) {
return
}
let looper = (a) => {
diff --git a/CodeManagement/BigScreenVue/src/views/indexs/station-three.vue b/CodeManagement/BigScreenVue/src/views/indexs/station-three.vue
index 1a845d6..0abc78d 100644
--- a/CodeManagement/BigScreenVue/src/views/indexs/station-three.vue
+++ b/CodeManagement/BigScreenVue/src/views/indexs/station-three.vue
@@ -217,22 +217,22 @@
// this.$Message.warning(res.msg);
// }
// });
- var rep = await ProLocationStatistics();
-
+ var rep1 = await ProLocationStatistics();
+ var rep=rep1.filter(rep=>rep.roadwayNo.includes("JZ"))
var img =
"data:image/png;base64,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";
var trafficWay = [
{
name: "閿佸畾",
- value: rep.lockCount,
+ value: rep.filter(rep=>rep.locationStatus==1).length,
},
{
name: "绌洪棽",
- value: rep.freeCount,
+ value:rep.filter(rep=>rep.locationStatus==0).length,
},
{
name: "鏈夎揣",
- value: rep.inStockCount,
+ value:rep.filter(rep=>rep.locationStatus==2).length,
},
];
var data = [];
@@ -311,7 +311,7 @@
this.options = {
color: color,
title: {
- text: `鎬婚噺\n${rep.lockCount+rep.freeCount+rep.inStockCount}`,
+ text: `鎬婚噺\n${rep.length}`,
top: "40%",
textAlign: "center",
left: "49%",
diff --git a/CodeManagement/BigScreenVue/src/views/indexs/station-two.vue b/CodeManagement/BigScreenVue/src/views/indexs/station-two.vue
index 8c14a2d..161d6de 100644
--- a/CodeManagement/BigScreenVue/src/views/indexs/station-two.vue
+++ b/CodeManagement/BigScreenVue/src/views/indexs/station-two.vue
@@ -7,7 +7,7 @@
-->
<template>
<div id="name" style="width: 100%; height: 100%">
- <Echart :options="options" style="width: 100%; height: 100%"></Echart>
+ <Echart :options="options2" style="width: 100%; height: 100%"></Echart>
</div>
</template>
@@ -23,7 +23,7 @@
return {
pageflag: true,
myChart: {},
- options: {},
+ options2: {},
};
},
filters: {
@@ -101,7 +101,8 @@
}
-this.options = {
+this.options1 = {
+
backgroundColor: '#021228',
title: {
text: '鎶ヨ鎬绘暟',
@@ -206,39 +207,13 @@
},
async getData() {
this.pageflag = true;
- // currentGET("big2").then((res) => {
- // if (!this.timer) {
- // console.log("璁惧鎬昏2", res);
- // }
- // if (res.success) {
- // this.userOverview = res.data;
- // this.onlineconfig = {
- // ...this.onlineconfig,
- // number: [1]
- // }
- // this.config = {
- // ...this.config,
- // number: [7]
- // }
- // this.offlineconfig = {
- // ...this.offlineconfig,
- // number: [4]
- // }
- // this.laramnumconfig = {
- // ...this.laramnumconfig,
- // number: [10]
- // }
- // this.switper();
- // } else {
- // this.pageflag = false;
- // this.$Message.warning(res.msg);
- // }
- // });
- // var rep = await ProductionStock();
+ var rep=await ProductionStock();
+ console.log(rep.filter(it=>it.))
+
let dataPie = [
{
- value: 430,
- name: '搴撳瓨浜у搧'
+ value: rep[0].items.length,
+ name: '浠婃棩寰呭嚭瀹炵洏鎬绘暟'
},
];
let colorPie = ['#173852'];
@@ -252,7 +227,6 @@
itemStyle: {
normal: {
borderWidth: 50,
-
borderColor: colorPie[i],
}
@@ -285,10 +259,10 @@
}
-this.options = {
+this.options2 = {
title: {
- text: '浜у搧鎬绘暟',
- subtext: '430',
+ text: '浠婃棩寰呭嚭瀹炵洏鎬绘暟',
+ subtext: rep[0].items.length,
textStyle: {
color: '#00b5f3',
fontSize: 12,
@@ -309,7 +283,7 @@
formatter: "{a}锛歿b} <br/>鍗犳瘮锛歿d}%"
},
legend: {
- data: ['搴撳瓨浜у搧'],
+ data: ['浠婃棩寰呭嚭瀹炵洏鎬绘暟'],
icon: 'vertical',
right: '1%',
top: 'center',
@@ -346,16 +320,16 @@
{
name: '',
type: 'pie',
- clockWise: false, //椤烘椂鍔犺浇
- hoverAnimation: false, //榧犳爣绉诲叆鍙樺ぇ
+ clockWise: true, //椤烘椂鍔犺浇
+ hoverAnimation: true, //榧犳爣绉诲叆鍙樺ぇ
center: ['40%', '50%'],
radius: ['80%', '81%'],
tooltip: {
- show: false
+ show: true
},
label: {
normal: {
- show: false
+ show: true
}
},
data: baseDataWrap
diff --git a/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationRepository/obj/Debug/net6.0/WIDESEA_IStoragIntegrationRepository.AssemblyInfo.cs b/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationRepository/obj/Debug/net6.0/WIDESEA_IStoragIntegrationRepository.AssemblyInfo.cs
index 4a65e44..a058c99 100644
--- a/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationRepository/obj/Debug/net6.0/WIDESEA_IStoragIntegrationRepository.AssemblyInfo.cs
+++ b/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationRepository/obj/Debug/net6.0/WIDESEA_IStoragIntegrationRepository.AssemblyInfo.cs
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEA_IStoragIntegrationRepository")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+2759089d07788d9f4c70e2fd9a18d205cb583b88")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+c467a598f23fd81cf624e0abc5f012fb5c9c6ada")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEA_IStoragIntegrationRepository")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEA_IStoragIntegrationRepository")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationRepository/obj/Debug/net6.0/WIDESEA_IStoragIntegrationRepository.GeneratedMSBuildEditorConfig.editorconfig b/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationRepository/obj/Debug/net6.0/WIDESEA_IStoragIntegrationRepository.GeneratedMSBuildEditorConfig.editorconfig
index fbd1c29..3bfc672 100644
--- a/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationRepository/obj/Debug/net6.0/WIDESEA_IStoragIntegrationRepository.GeneratedMSBuildEditorConfig.editorconfig
+++ b/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationRepository/obj/Debug/net6.0/WIDESEA_IStoragIntegrationRepository.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,7 +8,7 @@
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = WIDESEA_IStoragIntegrationRepository
-build_property.ProjectDir = E:\GET\BaiBuSanLouNew\CodeManagement\WMS\WIDESEA_WMSServer\WIDESEA_IStoragIntegrationRepository\
+build_property.ProjectDir = D:\baibu\BaiBuSanLouNew\CodeManagement\WMS\WIDESEA_WMSServer\WIDESEA_IStoragIntegrationRepository\
build_property.EnableComHosting =
build_property.EnableGeneratedComInterfaceComImportInterop =
build_property.EffectiveAnalysisLevelStyle = 6.0
diff --git a/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationRepository/obj/WIDESEA_IStoragIntegrationRepository.csproj.nuget.g.props b/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationRepository/obj/WIDESEA_IStoragIntegrationRepository.csproj.nuget.g.props
index 8dae155..07ee94b 100644
--- a/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationRepository/obj/WIDESEA_IStoragIntegrationRepository.csproj.nuget.g.props
+++ b/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationRepository/obj/WIDESEA_IStoragIntegrationRepository.csproj.nuget.g.props
@@ -5,18 +5,18 @@
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
- <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Administrator\.nuget\packages\;D:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
+ <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
- <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.13.2</NuGetToolVersion>
+ <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.12.1</NuGetToolVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
- <SourceRoot Include="C:\Users\Administrator\.nuget\packages\" />
- <SourceRoot Include="D:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
+ <SourceRoot Include="C:\Users\admin\.nuget\packages\" />
+ <SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
</ItemGroup>
<ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<Import Project="$(NuGetPackageRoot)microsoft.entityframeworkcore\6.0.31\buildTransitive\net6.0\Microsoft.EntityFrameworkCore.props" Condition="Exists('$(NuGetPackageRoot)microsoft.entityframeworkcore\6.0.31\buildTransitive\net6.0\Microsoft.EntityFrameworkCore.props')" />
</ImportGroup>
<PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
- <PkgMicrosoft_Extensions_ApiDescription_Server Condition=" '$(PkgMicrosoft_Extensions_ApiDescription_Server)' == '' ">C:\Users\Administrator\.nuget\packages\microsoft.extensions.apidescription.server\6.0.5</PkgMicrosoft_Extensions_ApiDescription_Server>
+ <PkgMicrosoft_Extensions_ApiDescription_Server Condition=" '$(PkgMicrosoft_Extensions_ApiDescription_Server)' == '' ">C:\Users\admin\.nuget\packages\microsoft.extensions.apidescription.server\6.0.5</PkgMicrosoft_Extensions_ApiDescription_Server>
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskService/Task/IDt_TaskService.cs b/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskService/Task/IDt_TaskService.cs
index e07f14c..b30cd98 100644
--- a/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskService/Task/IDt_TaskService.cs
+++ b/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskService/Task/IDt_TaskService.cs
@@ -244,5 +244,15 @@
/// <returns></returns>
WebResponseContent GetStockInfo();
#endregion
+ /// <summary>
+ /// 鑾峰彇璐т綅鐘舵��
+ /// </summary>
+ /// <returns></returns>
+ WebResponseContent GetStockQuantity();
+ /// <summary>
+ /// 鑾峰彇涓冩棩鍐呯殑浜ч噺
+ /// </summary>
+ /// <returns></returns>
+ WebResponseContent Getproductionvolume();
}
\ No newline at end of file
diff --git a/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationRepository/obj/Debug/net6.0/WIDESEA_StoragIntegrationRepository.AssemblyInfo.cs b/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationRepository/obj/Debug/net6.0/WIDESEA_StoragIntegrationRepository.AssemblyInfo.cs
index 78b8ba1..450070b 100644
--- a/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationRepository/obj/Debug/net6.0/WIDESEA_StoragIntegrationRepository.AssemblyInfo.cs
+++ b/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationRepository/obj/Debug/net6.0/WIDESEA_StoragIntegrationRepository.AssemblyInfo.cs
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEA_StoragIntegrationRepository")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+2759089d07788d9f4c70e2fd9a18d205cb583b88")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+c467a598f23fd81cf624e0abc5f012fb5c9c6ada")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEA_StoragIntegrationRepository")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEA_StoragIntegrationRepository")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationRepository/obj/Debug/net6.0/WIDESEA_StoragIntegrationRepository.GeneratedMSBuildEditorConfig.editorconfig b/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationRepository/obj/Debug/net6.0/WIDESEA_StoragIntegrationRepository.GeneratedMSBuildEditorConfig.editorconfig
index 60a375a..5cc21f2 100644
--- a/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationRepository/obj/Debug/net6.0/WIDESEA_StoragIntegrationRepository.GeneratedMSBuildEditorConfig.editorconfig
+++ b/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationRepository/obj/Debug/net6.0/WIDESEA_StoragIntegrationRepository.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,7 +8,7 @@
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = WIDESEA_StoragIntegrationRepository
-build_property.ProjectDir = E:\GET\BaiBuSanLouNew\CodeManagement\WMS\WIDESEA_WMSServer\WIDESEA_StoragIntegrationRepository\
+build_property.ProjectDir = D:\baibu\BaiBuSanLouNew\CodeManagement\WMS\WIDESEA_WMSServer\WIDESEA_StoragIntegrationRepository\
build_property.EnableComHosting =
build_property.EnableGeneratedComInterfaceComImportInterop =
build_property.EffectiveAnalysisLevelStyle = 6.0
diff --git a/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationRepository/obj/WIDESEA_StoragIntegrationRepository.csproj.nuget.g.props b/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationRepository/obj/WIDESEA_StoragIntegrationRepository.csproj.nuget.g.props
index 8dae155..07ee94b 100644
--- a/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationRepository/obj/WIDESEA_StoragIntegrationRepository.csproj.nuget.g.props
+++ b/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationRepository/obj/WIDESEA_StoragIntegrationRepository.csproj.nuget.g.props
@@ -5,18 +5,18 @@
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
- <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Administrator\.nuget\packages\;D:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
+ <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
- <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.13.2</NuGetToolVersion>
+ <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.12.1</NuGetToolVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
- <SourceRoot Include="C:\Users\Administrator\.nuget\packages\" />
- <SourceRoot Include="D:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
+ <SourceRoot Include="C:\Users\admin\.nuget\packages\" />
+ <SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
</ItemGroup>
<ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<Import Project="$(NuGetPackageRoot)microsoft.entityframeworkcore\6.0.31\buildTransitive\net6.0\Microsoft.EntityFrameworkCore.props" Condition="Exists('$(NuGetPackageRoot)microsoft.entityframeworkcore\6.0.31\buildTransitive\net6.0\Microsoft.EntityFrameworkCore.props')" />
</ImportGroup>
<PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
- <PkgMicrosoft_Extensions_ApiDescription_Server Condition=" '$(PkgMicrosoft_Extensions_ApiDescription_Server)' == '' ">C:\Users\Administrator\.nuget\packages\microsoft.extensions.apidescription.server\6.0.5</PkgMicrosoft_Extensions_ApiDescription_Server>
+ <PkgMicrosoft_Extensions_ApiDescription_Server Condition=" '$(PkgMicrosoft_Extensions_ApiDescription_Server)' == '' ">C:\Users\admin\.nuget\packages\microsoft.extensions.apidescription.server\6.0.5</PkgMicrosoft_Extensions_ApiDescription_Server>
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs b/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
index 58f94ff..195f8fc 100644
--- a/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
+++ b/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
@@ -1652,6 +1652,7 @@
/// 鑾峰彇浠诲姟淇℃伅
/// </summary>
/// <returns></returns>
+ ///
public WebResponseContent GetTaskInfo()
{
WebResponseContent content = new WebResponseContent();
@@ -1709,20 +1710,50 @@
return content.Error(ex.Message);
}
}
+ /// <summary>
+ /// 鑾峰彇璐т綅鐘舵��
+ /// </summary>
+ /// <returns></returns>
+ public WebResponseContent GetStockQuantity() {
+ WebResponseContent content = new WebResponseContent();
+ try {
+ var location= _locationRepository.Db.Queryable<DtLocationInfo>().ToList();
+ return content.OK(data: location);
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+ }
+ public WebResponseContent Getproductionvolume()
+ {
+ WebResponseContent content = new WebResponseContent();
+ try {
+ var now = DateTime.Now;
+ var startOfDay = new DateTime(now.Year, now.Month, now.Day);
+ var endOfDay1 = startOfDay.AddDays(-7);
+ var taskHty= _task_HtyRepository.Db.Queryable<Dt_Task_Hty>().Where(it=>it.CreateDate> endOfDay1).ToList();
+ return content.OK(data: taskHty);
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+ }
#endregion
- #endregion 澶栭儴鎺ュ彛鏂规硶
+ #endregion 澶栭儴鎺ュ彛鏂规硶
- #region 鍐呴儴璋冪敤鏂规硶
+ #region 鍐呴儴璋冪敤鏂规硶
- /// <summary>
- /// 鍒涘缓涓�涓柊鐨勪换鍔�
- /// </summary>
- /// <param name="model">浠诲姟妯″瀷</param>
- /// <returns>鍒涘缓鐨勪换鍔�</returns>
+ /// <summary>
+ /// 鍒涘缓涓�涓柊鐨勪换鍔�
+ /// </summary>
+ /// <param name="model">浠诲姟妯″瀷</param>
+ /// <returns>鍒涘缓鐨勪换鍔�</returns>
public async Task<Dt_Task> Create(Dt_Task model)
{
return await BaseDal.Create(model);
diff --git a/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs b/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs
index 2d4bbb3..8c7b901 100644
--- a/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs
+++ b/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs
@@ -227,15 +227,35 @@
return await Service.QueryStockInfoForRealTrayJZAsync(ProductLine,PalletCode);
}
-
+ /// <summary>
+ /// 鑾峰彇浠诲姟淇℃伅
+ /// </summary>
+ /// <returns></returns>
[HttpPost, AllowAnonymous, Route("GetTaskInfo")]
public WebResponseContent GetTaskInfo()
{
return Service.GetTaskInfo();
}
+ /// <summary>
+ /// 鑾峰彇褰撴棩鍑哄簱搴撳瓨淇℃伅
+ /// </summary>
+ /// <returns></returns>
[HttpPost, AllowAnonymous, Route("GetStockInfo")]
public WebResponseContent GetStockInfo()
{
return Service.GetStockInfo();
}
+ /// <summary>
+ /// 鑾峰彇搴撳瓨淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, AllowAnonymous, Route("GetStockQuantity")]
+ public WebResponseContent GetStockQuantity() {
+ return Service.GetStockQuantity();
+ }
+ [HttpPost, AllowAnonymous, Route("Getproductionvolume")]
+ public WebResponseContent Getproductionvolume()
+ {
+ return Service.Getproductionvolume();
+ }
}
\ No newline at end of file
diff --git a/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json b/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json
index 52bc41e..19e397d 100644
--- a/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json
+++ b/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json
@@ -1,48 +1,48 @@
{
- "Logging": {
- "LogLevel": {
- "Default": "Information",
- "Microsoft.AspNetCore": "Warning"
- }
- },
- "AllowedHosts": "*",
- "urls": "http://*:5000",
- "MainDB": "DB_WIDESEA", //褰撳墠椤圭洰鐨勪富搴擄紝鎵�瀵瑰簲鐨勮繛鎺ュ瓧绗︿覆鐨凟nabled蹇呴』涓簍rue
- //杩炴帴瀛楃涓�
- "ConnectionString": "Data Source=.;Initial Catalog=WIDESEA_WMSDB3F;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
- "ConnectionStringWCS": "Data Source=.;Initial Catalog=WIDESEA_WCSDB3F;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
- //璺ㄥ煙
- "Cors": {
- "PolicyName": "CorsIpAccess", //绛栫暐鍚嶇О
- "EnableAllIPs": true, //褰撲负true鏃讹紝寮�鏀炬墍鏈塈P鍧囧彲璁块棶銆�
- // 鏀寔澶氫釜鍩熷悕绔彛锛屾敞鎰忕鍙ｅ彿鍚庝笉瑕佸甫/鏂滄潌锛氭瘮濡俵ocalhost:8000/锛屾槸閿欑殑
- // 娉ㄦ剰锛宧ttp://127.0.0.1:1818 鍜� http://localhost:1818 鏄笉涓�鏍风殑
- "IPs": "http://127.0.0.1:8080,http://localhost:8080,http://127.0.0.1:8081,http://localhost:8081"
- },
+ "Logging": {
+ "LogLevel": {
+ "Default": "Information",
+ "Microsoft.AspNetCore": "Warning"
+ }
+ },
+ "AllowedHosts": "*",
+ "urls": "http://*:5000",
+ "MainDB": "DB_WIDESEA", //褰撳墠椤圭洰鐨勪富搴擄紝鎵�瀵瑰簲鐨勮繛鎺ュ瓧绗︿覆鐨凟nabled蹇呴』涓簍rue
+ //杩炴帴瀛楃涓�
+ "ConnectionString": "Data Source=.;Initial Catalog=WIDESEA_WMSDB_BBMain;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
+ "ConnectionStringWCS": "Data Source=.;Initial Catalog=WIDESEAWCS_BaiBu;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
+ //璺ㄥ煙
+ "Cors": {
+ "PolicyName": "CorsIpAccess", //绛栫暐鍚嶇О
+ "EnableAllIPs": true, //褰撲负true鏃讹紝寮�鏀炬墍鏈塈P鍧囧彲璁块棶銆�
+ // 鏀寔澶氫釜鍩熷悕绔彛锛屾敞鎰忕鍙ｅ彿鍚庝笉瑕佸甫/鏂滄潌锛氭瘮濡俵ocalhost:8000/锛屾槸閿欑殑
+ // 娉ㄦ剰锛宧ttp://127.0.0.1:1818 鍜� http://localhost:1818 鏄笉涓�鏍风殑
+ "IPs": "http://127.0.0.1:8080,http://localhost:8080,http://127.0.0.1:8081,http://localhost:8081"
+ },
- //缂撳瓨璁剧疆
- "CacheSettings": {
- "UseRedis": false, //鍚敤redis
- "RedisSettings": {
- "Address": "127.0.0.1:6379", //鍦板潃
- "Password": "123456", //Redis鏈嶅姟瀵嗙爜
- "Db": 9, //榛樿搴�
- "ClearRedis": true //鏄惁姣忔鍚姩閮芥竻闄edis缂撳瓨
- }
- },
+ //缂撳瓨璁剧疆
+ "CacheSettings": {
+ "UseRedis": false, //鍚敤redis
+ "RedisSettings": {
+ "Address": "127.0.0.1:6379", //鍦板潃
+ "Password": "123456", //Redis鏈嶅姟瀵嗙爜
+ "Db": 9, //榛樿搴�
+ "ClearRedis": true //鏄惁姣忔鍚姩閮芥竻闄edis缂撳瓨
+ }
+ },
- "ApiName": "WIDESEA",
- "ExpMinutes": 120,
+ "ApiName": "WIDESEA",
+ "ExpMinutes": 120,
- // 闇�瑕佺Щ搴撶殑琛�
- "TransfertRows": "1,4,5,8",
+ // 闇�瑕佺Щ搴撶殑琛�
+ "TransfertRows": "1,4,5,8",
- // 鍏佽鍑哄簱鐨勭紪鐮�
- "OutBoundMateriel": [
- //{
- // "MaterielCode": "CC01050001348",
- // "ProductionLine": "ZJ-8",
- // "ProcessCode": "CH001"
- //}
- ]
+ // 鍏佽鍑哄簱鐨勭紪鐮�
+ "OutBoundMateriel": [
+ //{
+ // "MaterielCode": "CC01050001348",
+ // "ProductionLine": "ZJ-8",
+ // "ProcessCode": "CH001"
+ //}
+ ]
}
--
Gitblit v1.9.3