Commit 8a15b9a3 authored by 沈翠玲's avatar 沈翠玲

问题清单

parent 43f07f84
export default { export default {
'pages.layouts.userLayout.main': '看板系统', 'pages.layouts.userLayout.main': '看板系统',
'pages.layouts.userLayout.title': '中国知名的能源气体装备制造商、成套技术集成商领军企业',
'pages.layouts.userLayout.subtitle': 'pages.layouts.userLayout.subtitle':
"China's well-known energy and gas equipment manufacturer, complete technology integrator and leading enterprise", "China's well-known energy and gas equipment manufacturer, complete technology integrator and leading enterprise",
......
export default { export default {
'pages.layouts.userLayout.main': '看板系统', 'pages.layouts.userLayout.main': '看板系统',
'pages.layouts.userLayout.title': '讓艾特成為受人尊敬的航空發動機零部件生產企業',
'pages.welcome.speech': '歡迎登陸看板系统', 'pages.welcome.speech': '歡迎登陸看板系统',
......
...@@ -13,10 +13,10 @@ const formatOptions = (data: any) => { ...@@ -13,10 +13,10 @@ const formatOptions = (data: any) => {
color: [ color: [
{ {
type: 'linear', type: 'linear',
x: 0, x: 1,
y: 0, y: 0,
x2: 0, x2: 0,
y2: 1, y2: 0,
colorStops: [ colorStops: [
{ {
offset: 1, offset: 1,
...@@ -31,10 +31,10 @@ const formatOptions = (data: any) => { ...@@ -31,10 +31,10 @@ const formatOptions = (data: any) => {
}, },
{ {
type: 'linear', type: 'linear',
x: 0, x: 1,
y: 0, y: 0,
x2: 0, x2: 0,
y2: 1, y2: 0,
colorStops: [ colorStops: [
{ {
offset: 1, offset: 1,
...@@ -49,10 +49,10 @@ const formatOptions = (data: any) => { ...@@ -49,10 +49,10 @@ const formatOptions = (data: any) => {
}, },
{ {
type: 'linear', type: 'linear',
x: 0, x: 1,
y: 0, y: 0,
x2: 0, x2: 0,
y2: 1, y2: 0,
colorStops: [ colorStops: [
{ {
offset: 1, offset: 1,
...@@ -66,44 +66,45 @@ const formatOptions = (data: any) => { ...@@ -66,44 +66,45 @@ const formatOptions = (data: any) => {
global: false, // 缺省为 false global: false, // 缺省为 false
}, },
], ],
tooltip: {},
xAxis: { xAxis: {
// type: 'category', type: 'value',
data: [], show: false,
nameTextStyle: {
color: '#fff',
fontSize: 14,
},
axisLabel: {
interval: 0,
color: '#fff',
fontSize: 14,
},
axisTick: {
show: false,
},
axisLine: {
show: false,
},
}, },
dataZoom: [ dataZoom: [
{ {
type: 'slider', type: 'slider',
orient: 'vertical',
show: false, show: false,
startValue: 0, startValue: 0,
endValue: 3, endValue: 3,
}, },
], ],
grid: { grid: {
left: 5, left: 82,
// right: 60,
bottom: 30, bottom: 30,
right: 40,
}, },
legend: { legend: {
show: false show: false
}, },
yAxis: { yAxis: {
show: false, type: 'category',
type: 'value', triggerEvent: true,
data: [],
axisLabel: {
color: '#fff',
fontSize: 14,
formatter: function (value: string) {
return (value.length > 4 ? (value.slice(0,4)+"...") : value )
}
},
axisTick: {
show: false,
},
axisLine: {
show: false,
},
}, },
series: [], series: [],
}; };
...@@ -114,12 +115,12 @@ const formatOptions = (data: any) => { ...@@ -114,12 +115,12 @@ const formatOptions = (data: any) => {
barGap: 0, barGap: 0,
label: { label: {
show: true, show: true,
position: 'top', position: 'right',
color: '#fff', color: '#fff',
}, },
data: data.map((item: any) => item.ct), data: data.map((item: any) => item.ct),
}]; }];
option.xAxis.data = xAxisData; option.yAxis.data = xAxisData;
option.series = series; option.series = series;
} }
console.log('option', option) console.log('option', option)
...@@ -182,10 +183,10 @@ const Main: React.FC<ProcessOutProps> = ({ data, setting }) => { ...@@ -182,10 +183,10 @@ const Main: React.FC<ProcessOutProps> = ({ data, setting }) => {
} }
}); });
// 如果数据工序大于5那么需要自动轮训播放 // 如果数据工序大于5那么需要自动轮训播放
if (option.xAxis.data.length > 4 && setting.rowMovingTime > 0) { if (option.yAxis.data.length > 4 && setting.rowMovingTime > 0) {
timer = setInterval(() => { timer = setInterval(() => {
option.dataZoom[0].startValue++; option.dataZoom[0].startValue++;
if (option.dataZoom[0].endValue++ >= option.xAxis.data.length - 1) { if (option.dataZoom[0].endValue++ >= option.yAxis.data.length - 1) {
option.dataZoom[0].startValue = 0; option.dataZoom[0].startValue = 0;
option.dataZoom[0].endValue = 3; option.dataZoom[0].endValue = 3;
} }
......
...@@ -94,6 +94,9 @@ const formatOptions = (data: any) => { ...@@ -94,6 +94,9 @@ const formatOptions = (data: any) => {
axisLabel: { axisLabel: {
color: '#fff', color: '#fff',
fontSize: 14, fontSize: 14,
formatter: function (value: string) {
return (value.length > 4 ? (value.slice(0,4)+"...") : value )
}
}, },
axisTick: { axisTick: {
show: false, show: false,
......
...@@ -89,9 +89,6 @@ const Login: React.FC = () => { ...@@ -89,9 +89,6 @@ const Login: React.FC = () => {
</span> </span>
</Link> </Link>
</div> </div>
<div className={styles.desc}>
<FormattedMessage id="pages.layouts.userLayout.title" defaultMessage="中国知名企业" />
</div>
</div> </div>
<div className={styles.main}> <div className={styles.main}>
<ProForm <ProForm
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment