Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-init/pulls/86pull/99/head
@@ -0,0 +1,14 @@ | |||
<?xml version="1.0" encoding="UTF-8"?> | |||
<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> | |||
<title>编组</title> | |||
<g id="01数字驾驶舱" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> | |||
<g id="产量驾驶舱" transform="translate(-1438.000000, -12.000000)" fill="#FFFFFF" fill-rule="nonzero"> | |||
<g id="编组-20" transform="translate(1438.000000, 8.000000)"> | |||
<g id="编组" transform="translate(0.000000, 4.000000)"> | |||
<rect id="矩形" opacity="0" x="0" y="0" width="24" height="24"></rect> | |||
<path d="M11.1710783,2.42919989 C11.7298936,2.09409047 12.4328291,2.12455473 12.9654367,2.52059014 L20.3218013,7.99000647 L20.4665209,8.10559268 C21.0744501,8.62656431 21.4302636,9.40344805 21.4302636,10.227099 L21.4302636,19.0470569 L21.4250327,19.2212289 C21.3382831,20.6611171 20.1833875,21.8011882 18.7715031,21.8011882 L5.2284969,21.8011882 L5.06035624,21.7957697 C3.67032883,21.7059084 2.56973638,20.5095861 2.56973638,19.0470569 L2.56973638,10.2273587 L2.57600507,10.0381789 C2.63012926,9.22282649 3.03207443,8.47038558 3.67819781,7.99000711 L11.034559,2.52059336 Z M12.0713092,3.55793652 C11.9772762,3.53774358 11.8769764,3.55793433 11.7954857,3.6185066 L4.43911542,9.0879271 L4.32641124,9.18150853 C4.04059293,9.44596068 3.87451485,9.82573182 3.87451485,10.2273587 L3.87451485,19.0470569 L3.880713,19.1821318 C3.94632222,19.8933667 4.52470053,20.4496068 5.2284969,20.4496068 L11.2507497,20.4487759 L11.3507364,20.3451977 L11.3512202,14.4627186 L11.3582338,14.3683764 C11.4044406,14.0603828 11.6734228,13.8227675 12,13.8227675 C12.3345637,13.8227675 12.6123182,14.0734451 12.6454705,14.3976012 L12.6489183,14.4681588 L12.6487364,20.3451881 L12.7487231,20.4487759 L18.7714898,20.4496068 L18.9018895,20.4431864 C19.5885066,20.3752237 20.1254851,19.7760987 20.1254851,19.0470569 L20.1254851,10.2273587 L20.1177907,10.0779557 C20.0769951,9.68325297 19.8759128,9.32208831 19.5608746,9.08791971 L12.2045243,3.61851399 L12.1402672,3.58065321 Z" id="形状结合" stroke="#FFFFFF" stroke-width="0.1"></path> | |||
</g> | |||
</g> | |||
</g> | |||
</g> | |||
</svg> |
@@ -1,11 +1,13 @@ | |||
<template> | |||
<el-breadcrumb class="app-breadcrumb" separator="/"> | |||
<transition-group name="breadcrumb"> | |||
<el-breadcrumb-item v-for="(item, index) in levelList" :key="item.path"> | |||
<span v-if="item.redirect === 'noRedirect' || index === levelList.length - 1" class="no-redirect">{{ | |||
item.meta.title | |||
}}</span> | |||
<a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a> | |||
<el-breadcrumb-item v-for=" (item, index) in levelList" :key="item.path"> | |||
<span :style="{ color: (changeColor == true ? 'rgba(255, 255, 255, 0.45)' :' rgba(0, 0, 0, .65)')}" | |||
v-if="item.redirect === 'noRedirect' || index === levelList.length - 1" class="no-redirect">{{ | |||
item.meta.title | |||
}}</span> | |||
<a :style="{ color: (changeColor == true ? 'rgba(255, 255, 255, 0.45)' :' rgba(0, 0, 0, .45)')}" v-else | |||
@click.prevent="handleLink(item)">{{ item.meta.title }}</a> | |||
</el-breadcrumb-item> | |||
</transition-group> | |||
</el-breadcrumb> | |||
@@ -20,33 +22,33 @@ export default { | |||
}, | |||
computed: { | |||
changeColor() { | |||
if (this.$route.path == '/copilot/efficiency-container' || this.$route.path == '/copilot/main') { | |||
console.log(this.$route); | |||
if (this.$route.path == '/copilot/efficiency-container' || this.$route.path == '/copilot/main' || this.$route.path == '/factoryData/hdIndex' || this.$route.path === '/factoryData/factory-data') { | |||
return true | |||
} else { | |||
return false | |||
} | |||
}, | |||
} | |||
}, | |||
watch: { | |||
// changeColor(val) { | |||
// if (val == true) { | |||
// var tag = document.getElementsByClassName("breadcrumb-container") | |||
// console.log('tag', tag) | |||
// // for (let i in tag) { | |||
// tag[i].style.color = 'rgba(255, 255, 255, 0.45)' | |||
// // tag[i].classList.remove("default") | |||
// // } | |||
// // console.log('this.$refs.scrollContainer', this.$refs.tag); | |||
// } else { | |||
// var tag = document.getElementsByClassName("breadcrumb-container") | |||
// console.log('tag', tag) | |||
// for (let i in tag) { | |||
// tag[i].style.color = '' | |||
// // tag[i].classList.remove("default") | |||
// } | |||
// // this.$refs.mainContainer.style.backgroundColor = '' | |||
// } | |||
// }, | |||
changeColor(val) { | |||
if (val == true) { | |||
let item = document.getElementsByClassName('el-breadcrumb__separator') | |||
for (let i in item) { | |||
console.log(item[i]) | |||
if (item[i]) { | |||
item[i].style.color = 'rgba(255, 255, 255, 0.45)' | |||
} | |||
} | |||
} else { | |||
let item = document.getElementsByClassName('el-breadcrumb__separator') | |||
for (let i in item) { | |||
if (item[i]) { | |||
// item[i].style.color = '#c0c4cc' | |||
} | |||
} | |||
} | |||
}, | |||
$route(route) { | |||
// if you go to the redirect page, do not update the breadcrumbs | |||
if (route.path.startsWith('/redirect/')) { | |||
@@ -98,13 +100,13 @@ export default { | |||
margin-left: 8px; | |||
.no-redirect { | |||
color: rgba(0, 0, 0, 0.65); | |||
color: rgba(0, 0, 0, .45); | |||
cursor: text; | |||
} | |||
} | |||
.app-breadcrumb .el-breadcrumb__inner a, | |||
.el-breadcrumb__inner.is-link { | |||
color: rgba(0, 0, 0, 0.45); | |||
color:rgba(0, 0, 0, 0.65) | |||
} | |||
</style> |
@@ -1,6 +1,7 @@ | |||
<template> | |||
<div ref="navbar" class="navbar"> | |||
<hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" | |||
<div ref="navbar" class="navbar" | |||
:style="changeColor ? 'background: rgba(0, 21, 41, 1);boxShadow:0px 1px 8px 0px rgba(0,131,255,0.35)' : ''"> | |||
<hamburger id="hamburger-container" style="color: blue;" :is-active="sidebar.opened" class="hamburger-container" | |||
@toggleClick="toggleSideBar" /> | |||
<breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav" /> | |||
@@ -42,7 +43,7 @@ export default { | |||
'device' | |||
]), | |||
changeColor() { | |||
if (this.$route.path == '/copilot/efficiency-container' || this.$route.path == '/copilot/main') { | |||
if (this.$route.path == '/copilot/efficiency-container' || this.$route.path == '/copilot/main' || this.$route.path == '/factoryData/hdIndex' || this.$route.path === '/factoryData/factory-data') { | |||
return true | |||
} else { | |||
return false | |||
@@ -66,16 +67,17 @@ export default { | |||
} | |||
}, | |||
watch: { | |||
// changeColor(val) { | |||
// if (val == true) { | |||
// // console.log('this.$refs.mainContainer', this.$refs.mainContainer); | |||
// this.$refs.navbar.style.backgroundColor = 'rgba(0, 21, 41, 1)' | |||
// this.$refs.navbar.style.boxShadow = '0px 1px 8px 0px rgba(0,131,255,0.35)' | |||
// } else { | |||
// this.$refs.navbar.style.backgroundColor = '' | |||
// this.$refs.navbar.style.boxShadow = '' | |||
// } | |||
// }, | |||
changeColor(val) { | |||
if (val == true) { | |||
let svg = document.getElementsByClassName('hamburger') | |||
console.log('svg',svg); | |||
svg[0].setAttribute('fill', 'rgba(255, 255, 255, 1)') | |||
} else { | |||
let svg = document.getElementsByClassName('hamburger') | |||
console.log('svg', svg); | |||
svg[0].setAttribute('fill', '') | |||
} | |||
}, | |||
}, | |||
methods: { | |||
toggleSideBar() { | |||
@@ -1,25 +1,31 @@ | |||
<template> | |||
<div class="right-msg" :style="blackTitle ? 'color: #000' : 'color: #fff'"> | |||
<div class="home-icon" v-if='blackTitle'> | |||
<svg-icon icon-class="home" style="font-size: 24px; cursor: pointer;" @click="toHome" /> | |||
<svg-icon :icon-class="changeColor === true ? 'darkHome' : 'home'" | |||
style="font-size: 24px; cursor: pointer;color: aqua;" @click="toHome" /> | |||
</div> | |||
<div class="time-msg"> | |||
<div class="line1">{{ timeZone }} {{ topTime }}</div> | |||
<div class="line2">{{ topDate }}</div> | |||
<div class="line1" :style="changeColor === true ? 'color:rgba(255, 255, 255, 1)' : ''">{{ timeZone | |||
}} {{ topTime }}</div> | |||
<div :style="changeColor === true ? 'color:rgba(255, 255, 255, .65)' : ''" class="line2">{{ topDate }}</div> | |||
</div> | |||
<div class="base-msg"> | |||
<div class="avatar"> | |||
<el-dropdown> | |||
<img :src="require(`../../assets/images/choicepart/avatar.png`)" alt="" width="32" height="32" /> | |||
<el-dropdown-menu slot="dropdown"> | |||
<el-dropdown-item><svg-icon icon-class="helpbtn" />帮助文档</el-dropdown-item> | |||
<el-dropdown-item @click.native="logout"><svg-icon icon-class="exitbtn" />退出登录</el-dropdown-item> | |||
<el-dropdown-item> | |||
<svg-icon icon-class="helpbtn" />帮助文档 | |||
</el-dropdown-item> | |||
<el-dropdown-item @click.native="logout"> | |||
<svg-icon icon-class="exitbtn" />退出登录 | |||
</el-dropdown-item> | |||
</el-dropdown-menu> | |||
</el-dropdown> | |||
</div> | |||
<div class="use-msg"> | |||
<div class="line1">{{ nickname }}</div> | |||
<div class="line2">{{ dept }}</div> | |||
<div :style="changeColor === true ? 'color:rgba(255, 255, 255, 1)' : ''" class="line1">{{ nickname }}</div> | |||
<div :style="changeColor === true ? 'color:rgba(255, 255, 255, .65)' : ''" class="line2">{{ dept }}</div> | |||
</div> | |||
</div> | |||
</div> | |||
@@ -48,6 +54,15 @@ export default { | |||
} | |||
} | |||
}, | |||
computed: { | |||
changeColor() { | |||
if (this.$route.path == '/copilot/efficiency-container' || this.$route.path == '/copilot/main' || this.$route.path == '/factoryData/hdIndex' || this.$route.path === '/factoryData/factory-data') { | |||
return true | |||
} else { | |||
return false | |||
} | |||
}, | |||
}, | |||
created() { | |||
// this.getUserMsg() | |||
this.getTime() | |||
@@ -124,4 +139,4 @@ export default { | |||
opacity: 0.65; | |||
} | |||
} | |||
</style> | |||
</style> |
@@ -1,10 +1,11 @@ | |||
<template> | |||
<div ref="tagsViewContainer" id="tags-view-container" class="tags-view-container"> | |||
<div ref="tagsViewContainer" | |||
:style="changeColor === true ? 'background:rgba(0, 21, 41, 1);borderTop:0px solid #d8dce5' : ''" id="tags-view-container" | |||
class="tags-view-container"> | |||
<scroll-pane ref="scrollPane" class="tags-view-wrapper" @scroll="handleScroll"> | |||
<router-link v-for="tag in visitedViews" ref="tag" :key="tag.path" | |||
:class="isActive(tag) ? 'active' : ''" :to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }" | |||
tag="span" class="tags-view-item" :style="activeStyle(tag)" | |||
@click.middle.native="!isAffix(tag) ? closeSelectedTag(tag) : ''" | |||
<router-link v-for="tag in visitedViews" ref="tag" :key="tag.path" :class="isActive(tag) ? 'active' : ''" | |||
:to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }" tag="span" class="tags-view-item" | |||
:style="activeStyle(tag)" @click.middle.native="!isAffix(tag) ? closeSelectedTag(tag) : ''" | |||
@contextmenu.prevent.native="openMenu(tag, $event)"> | |||
{{ tag.title }} | |||
<span v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" /> | |||
@@ -38,7 +39,7 @@ export default { | |||
}, | |||
computed: { | |||
changeColor() { | |||
if (this.$route.path == '/copilot/efficiency-container' || this.$route.path == '/copilot/main') { | |||
if (this.$route.path == '/copilot/efficiency-container' || this.$route.path == '/copilot/main' || this.$route.path == '/factoryData/hdIndex' || this.$route.path === '/factoryData/factory-data') { | |||
return true | |||
} else { | |||
return false | |||
@@ -57,19 +58,19 @@ export default { | |||
watch: { | |||
changeColor(val) { | |||
if (val == true) { | |||
console.log('this.$refs.tagsViewContainer', this.$refs.tagsViewContainer); | |||
this.$refs.tagsViewContainer.style.backgroundColor = 'rgba(0, 21, 41, 1)' | |||
this.$refs.tagsViewContainer.style.borderTop = '0px solid #d8dce5' | |||
// console.log('this.$refs.tagsViewContainer', this.$refs.tagsViewContainer); | |||
// this.$refs.tagsViewContainer.style.backgroundColor = 'rgba(0, 21, 41, 1)' | |||
// this.$refs.tagsViewContainer.style.borderTop = '0px solid #d8dce5' | |||
var tag = document.getElementsByClassName("tags-view-item") | |||
console.log('tag', tag) | |||
for (let i in tag) { | |||
tag[i].classList.add("changeColor") | |||
// tag[i].classList.remove("default") | |||
} | |||
console.log('this.$refs.scrollContainer', this.$refs.tag); | |||
// console.log('this.$refs.scrollContainer', this.$refs.tag); | |||
} else { | |||
this.$refs.tagsViewContainer.style.backgroundColor = '' | |||
this.$refs.tagsViewContainer.style.borderTop = '1px solid #d8dce5' | |||
// this.$refs.tagsViewContainer.style.backgroundColor = '' | |||
// this.$refs.tagsViewContainer.style.borderTop = '1px solid #d8dce5' | |||
var tag = document.getElementsByClassName("tags-view-item") | |||
for (let i in tag) { | |||
tag[i].classList.remove("changeColor") | |||
@@ -2,7 +2,8 @@ | |||
<div :class="classObj" class="app-wrapper" :style="{ '--current-color': theme }"> | |||
<div v-if="device === 'mobile' && sidebar.opened" class="drawer-bg" @click="handleClickOutside" /> | |||
<sidebar v-if="!sidebar.hide" class="sidebar-container" /> | |||
<div ref="mainContainer" :class="{ hasTagsView: needTagsView, sidebarHide: sidebar.hide }" class="main-container"> | |||
<div :style="changeColor ? 'background: rgba(0, 21, 41, 1)' : ''" ref="mainContainer" | |||
:class="{ hasTagsView: needTagsView, sidebarHide: sidebar.hide }" class="main-container"> | |||
<div :class="{ 'fixed-header': fixedHeader }"> | |||
<navbar /> | |||
<tags-view v-if="needTagsView" /> | |||
@@ -40,7 +41,7 @@ export default { | |||
fixedHeader: state => state.settings.fixedHeader | |||
}), | |||
changeColor() { | |||
if (this.$route.path == '/copilot/efficiency-container' || this.$route.path == '/copilot/main') { | |||
if (this.$route.path == '/copilot/efficiency-container' || this.$route.path == '/copilot/main' || this.$route.path == '/factoryData/hdIndex' || this.$route.path === '/factoryData/factory-data') { | |||
return true | |||
} else { | |||
return false | |||
@@ -59,14 +60,14 @@ export default { | |||
} | |||
}, | |||
watch: { | |||
changeColor(val) { | |||
if (val == true) { | |||
console.log('this.$refs.mainContainer', this.$refs.mainContainer); | |||
this.$refs.mainContainer.style.backgroundColor = 'rgba(0, 21, 41, 1)' | |||
} else { | |||
this.$refs.mainContainer.style.backgroundColor = '' | |||
} | |||
}, | |||
// changeColor(val) { | |||
// if (val == true) { | |||
// // console.log('this.$refs.mainContainer', this.$refs.mainContainer); | |||
// this.$refs.mainContainer.style.backgroundColor = 'rgba(0, 21, 41, 1)' | |||
// } else { | |||
// this.$refs.mainContainer.style.backgroundColor = '' | |||
// } | |||
// }, | |||
}, | |||
methods: { | |||
handleClickOutside() { | |||
@@ -114,19 +114,19 @@ export default { | |||
`<span title=${this.prodOrder[i].actualProduction || ""}>${this.prodOrder[i].actualProduction || "" | |||
}</span>`, | |||
`<span style="display:inline-block;width:45px;">${this.prodOrder[i].productionProgress | |||
? this.prodOrder[i].productionProgress.toFixed(0) * 100 + "%" | |||
? this.prodOrder[i].productionProgress.toFixed(2) * 100 + "%" | |||
: "0%" | |||
}</span> | |||
<div style="display:inline-block;height:20px;margin-top:-5px;vertical-align:middle;"> | |||
<svg xmlns="http://www.w3.org/200/svg" height="20" width="20"> | |||
<circle cx="10" cy="10" r="6" fill="none" stroke="#283851" stroke-width="4" stroke-linecap="round"/> | |||
<circle style="transform-origin: center;transform: rotate(-90deg);" id="J_progress_bar" cx="10" cy="10" r="6" fill="none" stroke="#47FF27" stroke-width="4" stroke-dasharray="${this.prodOrder[i].productionProgress | |||
? this.prodOrder[i].productionProgress.toFixed(0) *100 * | |||
? this.prodOrder[i].productionProgress.toFixed(2) *100 * | |||
37.68 * | |||
0.01 + | |||
"," + | |||
(1 - | |||
this.prodOrder[i].productionProgress.toFixed(0) * 0.01) * 100 * | |||
this.prodOrder[i].productionProgress.toFixed(2) * 0.01) * 100 * | |||
37.68 | |||
: 0 + "," + 37.68 | |||
}"/> | |||
@@ -1,8 +1,8 @@ | |||
<!-- | |||
* @Author: zhp | |||
* @Date: 2024-04-15 10:49:13 | |||
* @LastEditTime: 2024-07-01 17:06:29 | |||
* @LastEditors: DY | |||
* @LastEditTime: 2024-07-08 08:50:26 | |||
* @LastEditors: zhp | |||
* @Description: | |||
--> | |||
<template> | |||
@@ -142,15 +142,15 @@ export default { | |||
selectOptions: [ | |||
{ | |||
label: '未开始', | |||
value: 1 | |||
value: 0 | |||
}, | |||
{ | |||
label: '生产中', | |||
value: 2 | |||
value: 1 | |||
}, | |||
{ | |||
label: '已完成', | |||
value: 3 | |||
value: 2 | |||
} | |||
], | |||
labelField: "label", | |||
@@ -1,9 +1,9 @@ | |||
<!-- | |||
* @Author: Do not edit | |||
* @Date: 2024-06-24 15:03:19 | |||
* @LastEditTime: 2024-06-24 15:07:42 | |||
* @LastEditors: DY | |||
* @Description: | |||
* @LastEditTime: 2024-07-08 08:48:58 | |||
* @LastEditors: zhp | |||
* @Description: | |||
--> | |||
<template> | |||
<div> | |||
@@ -22,10 +22,10 @@ export default { | |||
}, | |||
computed: { | |||
state() { | |||
return ['', '未开始', '生产中', '已完成'][this.injectData.orderStatus] | |||
return ['未开始', '生产中', '已完成'][this.injectData.orderStatus] | |||
}, | |||
myClass() { | |||
return ['', 'yellow', 'blue', 'green'][this.injectData.orderStatus] | |||
return ['yellow', 'blue', 'green'][this.injectData.orderStatus] | |||
} | |||
}, | |||
}; | |||
@@ -1,7 +1,7 @@ | |||
<!-- | |||
* @Author: zhp | |||
* @Date: 2024-04-15 10:49:13 | |||
* @LastEditTime: 2024-07-05 13:24:58 | |||
* @LastEditTime: 2024-07-08 13:18:08 | |||
* @LastEditors: zhp | |||
* @Description: | |||
--> | |||
@@ -201,12 +201,29 @@ export default { | |||
// this.getOverView() | |||
const today = new Date() | |||
const sevenDaysAgo = new Date(today.getTime() - (7 * 24 * 60 * 60 * 1000)) | |||
this.listQuery.startDate = moment(sevenDaysAgo).format('yyyy-MM-DD') | |||
this.listQuery.endDate = moment(today).format('yyyy-MM-DD') | |||
this.listQuery.startDate = this.getFirstDay() | |||
this.listQuery.endDate = this.getLastDay() | |||
this.listQuery.reportTime = [this.listQuery.startDate, this.listQuery.endDate] | |||
this.getDataList() | |||
}, | |||
methods: { | |||
getFirstDay() { | |||
//当前月第一天 | |||
var y = new Date().getFullYear(); //获取年份 | |||
var m = new Date().getMonth() + 1; //获取月份 | |||
var d = "01"; | |||
m = m < 10 ? "0" + m : m; //月份补 0 | |||
return [y, m, d].join("-"); | |||
}, | |||
getLastDay() { | |||
//当前月最后一天 | |||
var y = new Date().getFullYear(); //获取年份 | |||
var m = new Date().getMonth() + 1; //获取月份 | |||
var d = new Date(y, m, 0).getDate(); //获取当月最后一日 | |||
m = m < 10 ? "0" + m : m; //月份补 0 | |||
d = d < 10 ? "0" + d : d; //日数补 0 | |||
return [y, m, d].join("-"); | |||
}, | |||
handleChange() { | |||
this.listQuery.reportTime = [] | |||
this.listQuery.end = null | |||
@@ -396,12 +396,29 @@ export default { | |||
// this.getOverView() | |||
const today = new Date() | |||
const sevenDaysAgo = new Date(today.getTime() - (7 * 24 * 60 * 60 * 1000)) | |||
this.listQuery.beginTime = moment(sevenDaysAgo).format('yyyy-MM-DD') | |||
this.listQuery.endTime = moment(today).format('yyyy-MM-DD') | |||
this.listQuery.beginTime = this.getFirstDay() | |||
this.listQuery.endTime = this.getLastDay() | |||
this.listQuery.reportTime = [this.listQuery.beginTime, this.listQuery.endTime] | |||
this.getDataList() | |||
}, | |||
methods: { | |||
getFirstDay() { | |||
//当前月第一天 | |||
var y = new Date().getFullYear(); //获取年份 | |||
var m = new Date().getMonth() + 1; //获取月份 | |||
var d = "01"; | |||
m = m < 10 ? "0" + m : m; //月份补 0 | |||
return [y, m, d].join("-"); | |||
}, | |||
getLastDay() { | |||
//当前月最后一天 | |||
var y = new Date().getFullYear(); //获取年份 | |||
var m = new Date().getMonth() + 1; //获取月份 | |||
var d = new Date(y, m, 0).getDate(); //获取当月最后一日 | |||
m = m < 10 ? "0" + m : m; //月份补 0 | |||
d = d < 10 ? "0" + d : d; //日数补 0 | |||
return [y, m, d].join("-"); | |||
}, | |||
handleChange(val) { | |||
this.listQuery.reportTime = [] | |||
this.listQuery.end = null | |||
@@ -365,12 +365,29 @@ export default { | |||
// this.getOverView() | |||
const today = new Date() | |||
const sevenDaysAgo = new Date(today.getTime() - (7 * 24 * 60 * 60 * 1000)) | |||
this.listQuery.startDate = moment(sevenDaysAgo).format('yyyy-MM-DD') | |||
this.listQuery.endDate = moment(today).format('yyyy-MM-DD') | |||
this.listQuery.startDate = this.getFirstDay() | |||
this.listQuery.endDate = this.getLastDay() | |||
this.listQuery.reportTime = [this.listQuery.startDate, this.listQuery.endDate] | |||
this.getDataList() | |||
}, | |||
methods: { | |||
getFirstDay() { | |||
//当前月第一天 | |||
var y = new Date().getFullYear(); //获取年份 | |||
var m = new Date().getMonth() + 1; //获取月份 | |||
var d = "01"; | |||
m = m < 10 ? "0" + m : m; //月份补 0 | |||
return [y, m, d].join("-"); | |||
}, | |||
getLastDay() { | |||
//当前月最后一天 | |||
var y = new Date().getFullYear(); //获取年份 | |||
var m = new Date().getMonth() + 1; //获取月份 | |||
var d = new Date(y, m, 0).getDate(); //获取当月最后一日 | |||
m = m < 10 ? "0" + m : m; //月份补 0 | |||
d = d < 10 ? "0" + d : d; //日数补 0 | |||
return [y, m, d].join("-"); | |||
}, | |||
handleChange() { | |||
this.listQuery.reportTime = [] | |||
this.listQuery.end = null | |||
@@ -489,12 +489,29 @@ export default { | |||
// this.getOverView() | |||
const today = new Date() | |||
const sevenDaysAgo = new Date(today.getTime() - (7 * 24 * 60 * 60 * 1000)) | |||
this.listQuery.startDate = moment(sevenDaysAgo).format('yyyy-MM-DD') | |||
this.listQuery.endDate = moment(today).format('yyyy-MM-DD') | |||
this.listQuery.startDate = this.getFirstDay() | |||
this.listQuery.endDate = this.getLastDay() | |||
this.listQuery.reportTime = [this.listQuery.startDate, this.listQuery.endDate] | |||
this.getDataList() | |||
}, | |||
methods: { | |||
getFirstDay() { | |||
//当前月第一天 | |||
var y = new Date().getFullYear(); //获取年份 | |||
var m = new Date().getMonth() + 1; //获取月份 | |||
var d = "01"; | |||
m = m < 10 ? "0" + m : m; //月份补 0 | |||
return [y, m, d].join("-"); | |||
}, | |||
getLastDay() { | |||
//当前月最后一天 | |||
var y = new Date().getFullYear(); //获取年份 | |||
var m = new Date().getMonth() + 1; //获取月份 | |||
var d = new Date(y, m, 0).getDate(); //获取当月最后一日 | |||
m = m < 10 ? "0" + m : m; //月份补 0 | |||
d = d < 10 ? "0" + d : d; //日数补 0 | |||
return [y, m, d].join("-"); | |||
}, | |||
handleChange() { | |||
this.listQuery.reportTime = [] | |||
this.listQuery.end = null | |||
@@ -416,12 +416,29 @@ export default { | |||
// this.getOverView() | |||
const today = new Date() | |||
const sevenDaysAgo = new Date(today.getTime() - (7 * 24 * 60 * 60 * 1000)) | |||
this.listQuery.startDate = moment(sevenDaysAgo).format('yyyy-MM-DD') | |||
this.listQuery.endDate = moment(today).format('yyyy-MM-DD') | |||
this.listQuery.startDate = this.getFirstDay() | |||
this.listQuery.endDate = this.getLastDay() | |||
this.listQuery.reportTime = [this.listQuery.startDate, this.listQuery.endDate] | |||
this.getDataList() | |||
}, | |||
methods: { | |||
getFirstDay() { | |||
//当前月第一天 | |||
var y = new Date().getFullYear(); //获取年份 | |||
var m = new Date().getMonth() + 1; //获取月份 | |||
var d = "01"; | |||
m = m < 10 ? "0" + m : m; //月份补 0 | |||
return [y, m, d].join("-"); | |||
}, | |||
getLastDay() { | |||
//当前月最后一天 | |||
var y = new Date().getFullYear(); //获取年份 | |||
var m = new Date().getMonth() + 1; //获取月份 | |||
var d = new Date(y, m, 0).getDate(); //获取当月最后一日 | |||
m = m < 10 ? "0" + m : m; //月份补 0 | |||
d = d < 10 ? "0" + d : d; //日数补 0 | |||
return [y, m, d].join("-"); | |||
}, | |||
handleChange() { | |||
this.listQuery.reportTime = [] | |||
this.listQuery.end = null | |||
@@ -583,13 +600,22 @@ export default { | |||
if (this.listQuery.type == 2) { | |||
res.data.list.forEach((ele, index) => { | |||
let i = index + 1 | |||
this.chartMsg.xData.push(ele.titleValue) | |||
// this.chartMsg.xData.push(ele.titleValue) | |||
this.otherProps.push({ | |||
label: ele.titleValue, | |||
filter: (val) => (val || val === 0 ? val : "-"), | |||
prop: 'value' + i | |||
}) | |||
}) | |||
res.data.list.slice(0,res.data.list.length-1).forEach((ele, index) => { | |||
// let i = index + 1 | |||
this.chartMsg.xData.push(ele.titleValue) | |||
// this.otherProps.push({ | |||
// label: ele.titleValue, | |||
// filter: (val) => (val || val === 0 ? val : "-"), | |||
// prop: 'value' + i | |||
// }) | |||
}) | |||
this.chartMsgYearTarget.xData.push('FTO投入', '芯片产量', '标准组件产量', '综合良率') | |||
res.data.list.slice(res.data.list.length - 1, res.data.list.length).forEach((ele) => { | |||
this.title = ele.titleValue | |||
@@ -693,42 +719,35 @@ export default { | |||
dataArr[3]['' + m + ''] = item.comprehensiveYieldRate | |||
}) | |||
}) | |||
for (let i in dataArr[0]) { | |||
this.chartMsg.series[0].name = dataArr[0]['item'] | |||
if (i.search('value') === 0) { | |||
// for (let i in chartDataArr[0]) { | |||
// this.chartMsg.series[0].name = chartDataArr[0]['item'] | |||
// if (i.search('value') === 0) { | |||
// this.chartMsg.series[0].data.push({ | |||
// name: chartDataArr[0]['item'], | |||
// value: chartDataArr[0][i] === 0 ? null : chartDataArr[0][i] | |||
// }) | |||
// } | |||
// } | |||
res.data.list.slice(0, res.data.list.length - 1).forEach((ele, index) => { | |||
ele.productYieldDataVOList.forEach((item, index) => { | |||
this.chartMsg.series[0].data.push({ | |||
name: dataArr[0]['item'], | |||
value: dataArr[0][i] === 0 ? null : dataArr[0][i] | |||
name: ele.titleValue, | |||
value: item.ftoInput === 0 ? null : item.ftoInput | |||
}) | |||
} | |||
} | |||
for (let i in dataArr[1]) { | |||
this.chartMsg.series[1].name = dataArr[1]['item'] | |||
if (i.search('value') === 0) { | |||
this.chartMsg.series[1].data.push({ | |||
name: dataArr[1]['item'], | |||
value: dataArr[1][i] === 0 ? null : dataArr[1][i] | |||
name: ele.titleValue, | |||
value: item.chipYield === 0 ? null : item.chipYield | |||
}) | |||
} | |||
} | |||
for (let i in dataArr[2]) { | |||
this.chartMsg.series[2].name = dataArr[2]['item'] | |||
if (i.search('value') === 0) { | |||
this.chartMsg.series[2].data.push({ | |||
name: dataArr[2]['item'], | |||
value: dataArr[2][i] === 0 ? null : dataArr[2][i] | |||
name: ele.titleValue, | |||
value: item.componentYield === 0 ? null : item.componentYield | |||
}) | |||
} | |||
} | |||
for (let i in dataArr[3]) { | |||
this.chartMsg.series[3].name = dataArr[3]['item'] | |||
if (i.search('value') === 0) { | |||
this.chartMsg.series[3].data.push({ | |||
name: dataArr[3]['item'], | |||
value: dataArr[3][i] === 0 ? null : dataArr[3][i] | |||
name: ele.titleValue, | |||
value: item.comprehensiveYieldRate === 0 ? null : item.comprehensiveYieldRate | |||
}) | |||
} | |||
} | |||
}) | |||
}) | |||
} else { | |||
res.data.list.forEach((ele, index) => { | |||
let i = index + 1 | |||