@@ -207,12 +220,18 @@ import echarts from 'echarts'
import { mapGetters } from 'vuex';
import { getInventoryList } from "@/api/inm";
import { getProductionplanList} from "@/api/pm";
+import { getContractList , getOrderList } from "@/api/sam";
export default {
name: 'Dashboard',
data() {
return {
chartColumn: null,
+ week:null,
+ currentTime:null,
+ currentYear:null,
+ currentMonth:null,
+ currentDay:null,
stockPage:1,
stockPageSize:10,
stockTotal:100,
@@ -232,16 +251,25 @@ export default {
{id:1,name:'HIehd9',card:'3337',sco:'REF-32'}
],
options:{
-
"1":'成品',
"2":'半成品',
"3":'主要原料',
"4":'辅助材料',
"5":'加工工具',
"6":'辅助工装',
-
},
- seriesData:[80,60,60, 70, 76, 80, 90, 70],
+ seriesData:[80,95,96, 96, 96, 98, 99,100],
+ contractTotalCount:null,//合同总数
+ contractTotalCurrent:null,
+ orderTotalCount:null,//生产订单总数
+ orderTotalCurrent:null,
+ planTotalCount:null,//已排产任务总数
+ planTotalCurrent:null,
+ rderTotalCount:null,//累计交付产品总数
+ derTotalCount:null,//累计不合格产品总数
+ listLoadingPlan:false,
+ listLoadingStock:false,
+ cardTabelHeight:null,
}
},
computed: {
@@ -252,6 +280,51 @@ export default {
])
},
methods:{
+ getStatisticsData(){
+ let dat = new Date();
+ this.week = dat.getDay();
+ this.currentTime = dat.getTime();
+ this.currentYear = dat.getFullYear();
+ let month = dat.getMonth() + 1;
+ this.currentMonth = month>9?month:'0'+month ;
+ this.currentDay = dat.getDate();
+ let create_time_start = this.currentYear+'-'+this.currentMonth+'-01';
+ //获取合同数
+ getContractList({page:1,page_size:1}).then((response) => {
+ if (response.data) {
+ this.contractTotalCount = response.data.count;
+ }
+ });
+ getContractList({page:1,page_size:1,create_time_start:create_time_start}).then((response) => {
+ if (response.data) {
+ this.contractTotalCurrent = response.data.count;
+ }
+ });
+ //获取生产订单数
+ getOrderList({page:1,page_size:1}).then((response) => {
+ if (response.data) {
+ this.orderTotalCount = response.data.count;
+ }
+ });
+ getOrderList({page:1,page_size:1,create_time_start:create_time_start}).then((response) => {
+ if (response.data) {
+ this.orderTotalCurrent = response.data.count;
+ }
+ });
+ //获取已排产任务
+ getProductionplanList({page:1,page_size:1}).then((response) => {
+ if (response.data) {
+ this.planTotalCount = response.data.count;
+ }
+ });
+ getProductionplanList({page:1,page_size:1,tag:'working'}).then((response) => {
+ if (response.data) {
+ this.planTotalCurrent = response.data.count;
+ }
+ });
+ //获取交付产品
+ //获取不合格产品
+ },
gotoTicketPage(){
let path = this.$route.path;
if(path==='/workflow/ticket'){
@@ -263,24 +336,24 @@ export default {
//任务排期列表
getPlanList() {
let that = this;
- this.listLoading = true;
+ this.listLoadingPlan = true;
getProductionplanList({page:0}).then((response) => {
if (response.data) {
that.planList = response.data;
}
- this.listLoading = false;
+ this.listLoadingPlan = false;
});
},
//库存列表
getStockList() {
let that = this;
- this.listLoading = true;
+ this.listLoadingStock = true;
getInventoryList({page:this.stockPage,page_size:this.stockPageSize}).then((response) => {
if (response.data) {
that.stockList = response.data.results;
that.stockTotal = response.data.count;
}
- this.listLoading = false;
+ this.listLoadingStock = false;
});
},
//图标渲染
@@ -355,10 +428,38 @@ export default {
},
itemStyle: {
normal: {
- color: function(params) {
+ /*color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+ offset: 0,
+ color: '#adcff3'
+ }, {
+ offset: 1,
+ color: '#409EFF'
+ }]),*/
+
+ /*color: function(params) {
let colorList = [
- '#5e7e54','#e44f2f','#81b6b2','#eba422',
- '#1bcde4','#b61b08','#84eb84','#d8d417'
+ ['#5fcdc2','#ffffff'],
+ ['#FFA783','#ffffff'],
+ ['#D099FF','#ffffff'],
+ ['#83FFC0','#ffffff'],
+ ['#FF83D8','#ffffff'],
+ ['#FFE899','#ffffff'],
+ ['#83FFE9','#ffffff'],
+ ];
+ let colorItem = colorList[params.dataIndex];
+ return new echarts.graphic.LinearGradient(0,1,0,0,[
+ {
+ color: colorItem[0]
+ },
+ {
+ color: colorItem[1]
+ }
+ ]);
+ },*/
+ color: function(params) {
+ let colorList = [
+ '#5fcdc2','#a378e4','#fea94c','#f27197',
+ '#409eff','#5fcdc2','#a378e4','#fea94c'
];
return colorList[params.dataIndex]
},
@@ -374,6 +475,7 @@ export default {
convenientClick(index,type){
let startTime = '',endTime = '',url='',activeIndex = '1',obj = new Object();
let dat = new Date();
+ let week = dat.getDay();//0-6
let currentTime = dat.getTime();
let currentYear = dat.getFullYear();
let currentMonth = dat.getMonth() + 1;
@@ -381,19 +483,27 @@ export default {
endTime = currentYear+'-'+currentMonth+''+currentDay;
if(type==='week'){
activeIndex = '1';
- let time = currentTime-6*24*60*60*1000;
+ let num = week===0?6:week-1;
+ let time = currentTime-num*24*60*60*1000;
let start = new Date(time);
startTime = start.getFullYear()+'-'+(start.getMonth()+1)+'-'+start.getDate();
}else if(type==='month'){
activeIndex = '2';
- let time = currentTime-30*24*60*60*1000;
- let start = new Date(time);
- startTime = start.getFullYear()+'-'+(start.getMonth()+1)+'-'+start.getDate();
+ startTime = currentYear+'-'+currentMonth+'-01';
}else if(type==='quarter'){
activeIndex = '3';
- let time = currentTime-120*24*60*60*1000;
- let start = new Date(time);
- startTime = start.getFullYear()+'-'+(start.getMonth()+1)+'-'+start.getDate();
+ let mon = null,yea = null;
+ if(currentMonth>2){
+ mon = currentMonth-2;
+ yea = currentYear;
+ }else if(currentMonth===2){
+ mon = 12;
+ yea = currentYear-1;
+ }else if(currentMonth===1){
+ mon = 11;
+ yea = currentYear-1;
+ }
+ startTime = yea+'-'+mon+'-01';
}
obj.startTime = startTime;
obj.endTime = endTime;
@@ -408,11 +518,25 @@ export default {
},
//选择月份
searchTimeChange(index){
+ let startDate = '',endDate = '';
+ let year = null,month = null,days = null;
if(index==='1'){
this.tableIndex = null;
+ startDate = this.tableDate+'-01';
+ year = this.tableDate.split("-")[0];
+ month = this.tableDate.split("-")[1];
+ let d = new Date(year, month, 0);
+ days = d.getDate();
}else{
this.chartIndex = null;
+ startDate = this.chartDate+'-01';
+ year = this.tableDate.split("-")[0];
+ month = this.tableDate.split("-")[1];
+ let d = new Date(year, month, 0);
+ days = d.getDate();
}
+ endDate = this.chartDate + '-'+days;
+ console.log(startDate,endDate);
},
handleStockSizeChange(val){
this.stockPageSize = val;
@@ -421,6 +545,7 @@ export default {
handleStockCurrentChange(val){
let that = this;
this.listLoading = true;
+ this.stockPage = val;
getInventoryList({page:val,page_size:this.stockPageSize}).then((response) => {
if (response.data) {
that.stockList = response.data.results;
@@ -439,9 +564,15 @@ export default {
},
mounted () {
+ // let he = document.documentElement.clientHeight || document.body.clientHeight;
+ let hei = document.getElementsByClassName('app-main')[0].clientHeight;
+ let heig = document.getElementsByClassName('dashboardTopCard')[0].clientHeight;
+ this.cardTabelHeight = ((hei-heig)/2-80);
+ document.getElementById('chartColumn').style.height = this.cardTabelHeight+'px';
this.drawChart();
this.getPlanList();
this.getStockList();
+ this.getStatisticsData();
},
updated () {
this.drawChart()
@@ -450,6 +581,12 @@ export default {
diff --git a/hb_client/src/views/login/index.vue b/hb_client/src/views/login/index.vue
index 2c6092f..4f256c6 100644
--- a/hb_client/src/views/login/index.vue
+++ b/hb_client/src/views/login/index.vue
@@ -1,73 +1,85 @@
-
@@ -189,8 +209,8 @@
.login-form {
border-radius: 6px;
background: #ffffff;
- width: 400px;
- padding: 25px 25px 5px 25px;
+ width: 700px;
+ padding: 25px;
.el-input {
height: 45px;
input {
diff --git a/hb_client/src/views/testModel/markImage.vue b/hb_client/src/views/testModel/markImage.vue
index a3b778b..7e03d43 100644
--- a/hb_client/src/views/testModel/markImage.vue
+++ b/hb_client/src/views/testModel/markImage.vue
@@ -34,7 +34,7 @@