修改接口

master
夜笙歌 11 months ago
parent 069d6a8c04
commit 0ee2adbc07

@ -1 +1 @@
{"sky":{"a":"sky/a/04a7d4d3-c071-4223-9ecb-b3f7463aa257.hdr","b":"sky/b/1d41cc4e-2504-42c8-b6ab-1710d79052f8.jpg"},"mat":["mat/mat.json"],"instance":["instance/ac2ab7084a284ec7a8e423e549fde6e9.mrmb"],"box":{"max":[1643.9346923828125,36.417999267578125,656.109375],"min":[-1077.169921875,-6.0707221031188965,-843.8449096679688]},"m":["m/89497d03d6654f0da05752e164f91ee7.mrmb"],"scene":"scene/scene.json","sceneData":"sceneData/sceneData.json","addition":["addition/4a1183172be4466586f0aba659cfaa0e.mrmb"]}
{"sky":{"a":"sky/a/04a7d4d3-c071-4223-9ecb-b3f7463aa257.hdr","b":"sky/b/1d41cc4e-2504-42c8-b6ab-1710d79052f8.jpg"},"mat":["mat/mat.json"],"instance":["instance/46d48a67aa554c4983cb0d191c1c0af1.mrmb"],"box":{"max":[1643.9346923828125,36.417999267578125,656.109375],"min":[-1077.169921875,-6.0707221031188965,-843.8449096679688]},"m":["m/3ded9fbaeb94477ea21aba9d79e2b7cc.mrmb"],"scene":"scene/scene.json","sceneData":"sceneData/sceneData.json","addition":["addition/220530f3157f46188e043490d520c4ad.mrmb"]}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 316 KiB

After

Width:  |  Height:  |  Size: 1.9 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 337 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 462 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 130 KiB

After

Width:  |  Height:  |  Size: 187 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 789 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 60 KiB

After

Width:  |  Height:  |  Size: 75 KiB

@ -2045,20 +2045,20 @@ export default {
}
}
.left2{
background-image: url("../../../assets/board/left.png");
background-image: url("../../../assets/board/right.png");
background-repeat: no-repeat;
background-size: 100% 100%;
position: absolute;
transform: translate(-50%,-50%);
top: 44%;
left: 43%;
top: 49%;
left: 55%;
width: 5vw;
height: 4.05vw;
height: 2.86vw;
span{
position: absolute;
transform: translate(-50%,-50%);
top: 28%;
left: 43%;
top: 37%;
left: 57%;
font-size: 1vw;
color: #fff;
}

@ -796,10 +796,10 @@ export default {
background-size: 100% 100%;
position: absolute;
transform: translateX(-50%);
top: 35%;
top: 21%;
left: 50%;
width: 36vw;
height: 8.7vw;
width: 40vw;
height: 20vw;
}
.app-container {

@ -632,7 +632,7 @@ export default {
top: 54.5%;
left: 50%;
width: 93%;
height: 8.71vw;
height: 10.34vw;
}
.headTitle {

@ -1,6 +1,6 @@
<template>
<div class="app-container">
<div class="headTitle">{{ line }}线成品入库数据监控平台</div>
<div class="headTitle">{{ line }}{{line === '' ? '' : '线'}}成品入库数据监控平台</div>
<div class="title" v-for="(i,k) in title"
:style="'top:'+(titlePosition[k]&&titlePosition[k].top||0)+'%;left:'+(titlePosition[k]&&titlePosition[k].left||0)+'%'">
{{ i }}
@ -1043,6 +1043,11 @@ export default {
mixData(val)
})
this.line = '二'
}else if (this.$route.query.id === '3' || this.id === '3') {
this.RequestDataSet1.forEach(val => {
mixData(val)
})
this.line = ''
}else{
this.RequestDataSet.forEach(val => {
mixData(val)

@ -7,7 +7,7 @@
<foaming2 v-if="show === 'foaming2'"/>
<pourInto f v-if="show === 'pourInto'"/>
<finalAssembly v-if="show === 'finalAssembly'"/>
<scanDown v-if="show === 'scanDown'" id="1"/>
<scanDown v-if="show === 'scanDown'" id="3"/>
<week v-if="show === 'week'"/>
</div>
<div class="time" id="time">{{ time }}</div>

@ -79,15 +79,6 @@ export default {
},
data() {
return {
chartData: [...(chinaMap.features.map(e => {
return {
name: e.properties.name,
value: Math.random() * 200
}
})), {
name: '南海诸岛',
value: Math.random() * 200
}],
hj: 1000,
title: [
'三日清单',
@ -194,300 +185,23 @@ export default {
{value: [115.179594, 34.647758]},
];
let option = {
geo: {
map: "china",
aspectScale: 0.75, //
zoom: 1.1,
roam: false,
label: {
normal: {
show: false,
},
},
itemStyle: {
normal: {
areaColor: {
type: "radial",
x: 0.5,
y: 0.5,
r: 0.8,
colorStops: [
{
offset: 0,
color: "#09132c", // 0%
},
{
offset: 1,
color: "#274d68", // 100%
},
],
globalCoord: true, // false
},
shadowColor: "rgb(58,115,192)",
shadowOffsetX: 2,
shadowOffsetY: 2.3,
},
emphasis: {
areaColor: "#2AB8FF",
borderWidth: 0,
color: "green",
label: {
show: false,
},
},
},
regions: [
{
name: "南海诸岛",
itemStyle: {
areaColor: "rgba(0, 10, 52, 1)",
borderColor: "rgba(0, 10, 52, 1)",
normal: {
opacity: 0,
label: {
show: false,
color: "#009cc9",
},
},
},
},
],
},
series: [
{
type: "map",
roam: false,
label: {
normal: {
show: false,
},
},
itemStyle: {
normal: {
borderColor: "rgb(147, 235, 248)",
borderWidth: 1,
areaColor: {
type: "radial",
x: 0.5,
y: 0.5,
r: 0.8,
colorStops: [
{
offset: 0,
color: "#09132c", // 0%
},
{
offset: 1,
color: "#274d68", // 100%
},
],
globalCoord: true, // false
},
},
emphasis: {
areaColor: "rgb(46,229,206)",
// shadowColor: 'rgb(12,25,50)',
borderWidth: 0.1,
},
},
zoom: 1.1,
// roam: false,
map: "china", //使
// data: this.difficultData //
},
{
type: "effectScatter",
coordinateSystem: "geo",
showEffectOn: "render",
zlevel: 1,
rippleEffect: {
period: 15,
scale: 4,
brushType: "fill",
},
hoverAnimation: true,
label: {
normal: {
formatter: "{b}",
position: "right",
offset: [15, 0],
color: "#1DE9B6",
show: true,
},
},
itemStyle: {
normal: {
color: "#1DE9B6",
shadowBlur: 10,
shadowColor: "#333",
},
},
symbolSize: 2,
data: points,
},
{
type: "lines",
zlevel: 2,
effect: {
show: true,
period: 2, //
trailLength: 0.4, //[0,1]
symbol: "arrow", //
symbolSize: 5, //
},
lineStyle: {
normal: {
color: "#1DE9B6",
width: 1, //线
opacity: 0.1, //线
curveness: 0.3, //线
},
},
data: [
{
coords: [
[115.179594, 34.647758],
[118.8062, 31.9208],
],
lineStyle: {color: "#4ab2e5"},
},
{
coords: [
[115.179594, 34.647758],
[127.9688, 45.368],
],
lineStyle: {color: "#4fb6d2"},
},
{
coords: [
[115.179594, 34.647758],
[110.3467, 41.4899],
],
lineStyle: {color: "#52b9c7"},
},
{
coords: [
[115.179594, 34.647758],
[125.8154, 44.2584],
],
lineStyle: {color: "#5abead"},
},
{
coords: [
[115.179594, 34.647758],
[116.4551, 40.2539],
],
lineStyle: {color: "#f34e2b"},
},
{
coords: [
[115.179594, 34.647758],
[123.1238, 42.1216],
],
lineStyle: {color: "#f56321"},
},
{
coords: [
[115.179594, 34.647758],
[114.4995, 38.1006],
],
lineStyle: {color: "#f56f1c"},
},
{
coords: [
[115.179594, 34.647758],
[117.4219, 39.4189],
],
lineStyle: {color: "#f58414"},
},
{
coords: [
[115.179594, 34.647758],
[112.3352, 37.9413],
],
lineStyle: {color: "#f58f0e"},
},
{
coords: [
[115.179594, 34.647758],
[109.1162, 34.2004],
],
lineStyle: {color: "#f5a305"},
},
{
coords: [
[115.179594, 34.647758],
[103.5901, 36.3043],
],
lineStyle: {color: "#e7ab0b"},
},
{
coords: [
[115.179594, 34.647758],
[106.3586, 38.1775],
],
lineStyle: {color: "#dfae10"},
},
{
coords: [
[115.179594, 34.647758],
[101.4038, 36.8207],
],
lineStyle: {color: "#d5b314"},
},
{
coords: [
[115.179594, 34.647758],
[103.9526, 30.7617],
],
lineStyle: {color: "#c1bb1f"},
},
{
coords: [
[115.179594, 34.647758],
[108.384366, 30.439702],
],
lineStyle: {color: "#b9be23"},
},
{
coords: [
[115.179594, 34.647758],
[113.0823, 28.2568],
],
lineStyle: {color: "#a6c62c"},
},
{
coords: [
[115.179594, 34.647758],
[102.9199, 25.46639],
],
lineStyle: {color: "#96cc34"},
},
],
},
],
};
let plantCap = [
{
name: "外观时尚",
value: "222",
value: "24231",
},
{
name: "低碳环保",
value: "115",
value: "36232",
},
{
name: "高端智能",
value: "113",
value: "45423",
},
{
name: "老品牌",
value: "95",
value: "24542",
},
];
@ -737,142 +451,418 @@ export default {
borderColor: "#fff",
},
},
xAxis: [
xAxis: [
{
type: "category",
boundaryGap: true,
axisLine: {
//线x
show: true,
lineStyle: {
color: "#f9f9f9",
},
},
axisLabel: {
//
textStyle: {
color: "#d1e6eb",
margin: 15,
},
},
axisTick: {
show: false,
},
data: ["1日", "2日", "3日", "4日", "5日", "6日", "7日"],
},
],
yAxis: [
{
type: "value",
min: 0,
// max: 140,
splitNumber: 7,
splitLine: {
show: true,
lineStyle: {
color: "#0a3256",
},
},
axisLine: {
show: false,
},
axisLabel: {
margin: 5,
textStyle: {
fontSize: 0.5 * vw,
color: "#d1e6eb",
},
},
axisTick: {
show: false,
},
},
{
type: "value",
min: 90,
max: 100,
splitLine: {
show: true,
lineStyle: {
color: "#0a3256",
},
},
axisLine: {
show: false,
},
axisLabel: {
margin: 5,
textStyle: {
fontSize: 0.5 * vw,
color: "#d1e6eb",
},
formatter: '{value}%'
},
axisTick: {
show: false,
},
},
],
series: [
{
name: "产量",
type: "bar",
barWidth: 20,
tooltip: {
show: false,
},
label: {
show: true,
position: "top",
textStyle: {
fontSize: 0.5 * vw,
color: "#fff",
},
},
itemStyle: {
normal: {
color: '#9fe080'
},
},
data: [200, 382, 102, 267, 186, 315, 316],
},
{
name: "订单履约率",
type: "line",
yAxisIndex: 1,
// smooth: true, //线
// symbol:'circle', //
showAllSymbol: true,
symbol: "emptyCircle",
symbolSize: 6,
lineStyle: {
normal: {
color: "#ecf3ff", // 线
},
borderColor: "#6d88bf",
},
label: {
show: true,
position: "top",
textStyle: {
fontSize: 0.5 * vw,
color: "#fff",
},
formatter: '{c}%'
},
itemStyle: {
normal: {
color: "#28ffb3",
},
},
tooltip: {
show: false,
},
data: [96.74, 96.68, 98.76, 99.75, 98.58, 98.57, 98.43],
},
],
})
this.$refs.chart6.setData({
geo: {
map: "china",
aspectScale: 0.75, //
zoom: 1.1,
roam: false,
label: {
normal: {
show: false,
},
},
itemStyle: {
normal: {
areaColor: {
type: "radial",
x: 0.5,
y: 0.5,
r: 0.8,
colorStops: [
{
offset: 0,
color: "#09132c", // 0%
},
{
offset: 1,
color: "#274d68", // 100%
},
],
globalCoord: true, // false
},
shadowColor: "rgb(58,115,192)",
shadowOffsetX: 2,
shadowOffsetY: 2.3,
},
emphasis: {
areaColor: "#2AB8FF",
borderWidth: 0,
color: "green",
label: {
show: false,
},
},
},
regions: [
{
name: "南海诸岛",
itemStyle: {
areaColor: "rgba(0, 10, 52, 1)",
borderColor: "rgba(0, 10, 52, 1)",
normal: {
opacity: 0,
label: {
show: false,
color: "#009cc9",
},
},
},
},
],
},
series: [
{
type: "map",
roam: false,
label: {
normal: {
show: false,
},
},
itemStyle: {
normal: {
borderColor: "rgb(147, 235, 248)",
borderWidth: 1,
areaColor: {
type: "radial",
x: 0.5,
y: 0.5,
r: 0.8,
colorStops: [
{
offset: 0,
color: "#09132c", // 0%
},
{
type: "category",
boundaryGap: true,
axisLine: {
//线x
show: true,
lineStyle: {
color: "#f9f9f9",
offset: 1,
color: "#274d68", // 100%
},
],
globalCoord: true, // false
},
axisLabel: {
//
textStyle: {
color: "#d1e6eb",
margin: 15,
},
emphasis: {
areaColor: "rgb(46,229,206)",
// shadowColor: 'rgb(12,25,50)',
borderWidth: 0.1,
},
axisTick: {
show: false,
},
data: ["1日", "2日", "3日", "4日", "5日", "6日", "7日"],
zoom: 1.1,
// roam: false,
map: "china", //使
// data: this.difficultData //
},
],
yAxis: [
{
type: "value",
min: 0,
// max: 140,
splitNumber: 7,
splitLine: {
show: true,
lineStyle: {
color: "#0a3256",
},
type: "effectScatter",
coordinateSystem: "geo",
showEffectOn: "render",
zlevel: 1,
rippleEffect: {
period: 15,
scale: 4,
brushType: "fill",
},
axisLine: {
show: false,
hoverAnimation: true,
label: {
normal: {
formatter: "{b}",
position: "right",
offset: [15, 0],
color: "#1DE9B6",
show: true,
},
axisLabel: {
margin: 5,
textStyle: {
fontSize: 0.5 * vw,
color: "#d1e6eb",
},
itemStyle: {
normal: {
color: "#1DE9B6",
shadowBlur: 10,
shadowColor: "#333",
},
axisTick: {
show: false,
},
symbolSize: 2,
data: points,
},
{
type: "value",
min: 90,
max: 100,
splitLine: {
type: "lines",
zlevel: 2,
effect: {
show: true,
lineStyle: {
color: "#0a3256",
},
period: 2, //
trailLength: 0.4, //[0,1]
symbol: "arrow", //
symbolSize: 5, //
},
axisLine: {
show: false,
lineStyle: {
normal: {
color: "#1DE9B6",
width: 1, //线
opacity: 0.1, //线
curveness: 0.3, //线
},
axisLabel: {
margin: 5,
textStyle: {
fontSize: 0.5 * vw,
color: "#d1e6eb",
},
formatter: '{value}%'
data: [
{
coords: [
[115.179594, 34.647758],
[118.8062, 31.9208],
],
lineStyle: {color: "#4ab2e5"},
},
axisTick: {
show: false,
{
coords: [
[115.179594, 34.647758],
[127.9688, 45.368],
],
lineStyle: {color: "#4fb6d2"},
},
{
coords: [
[115.179594, 34.647758],
[110.3467, 41.4899],
],
lineStyle: {color: "#52b9c7"},
},
{
coords: [
[115.179594, 34.647758],
[125.8154, 44.2584],
],
series: [
lineStyle: {color: "#5abead"},
},
{
name: "产量",
type: "bar",
barWidth: 20,
tooltip: {
show: false,
coords: [
[115.179594, 34.647758],
[116.4551, 40.2539],
],
lineStyle: {color: "#f34e2b"},
},
label: {
show: true,
position: "top",
textStyle: {
fontSize: 0.5 * vw,
color: "#fff",
{
coords: [
[115.179594, 34.647758],
[123.1238, 42.1216],
],
lineStyle: {color: "#f56321"},
},
{
coords: [
[115.179594, 34.647758],
[114.4995, 38.1006],
],
lineStyle: {color: "#f56f1c"},
},
itemStyle: {
normal: {
color: '#9fe080'
{
coords: [
[115.179594, 34.647758],
[117.4219, 39.4189],
],
lineStyle: {color: "#f58414"},
},
{
coords: [
[115.179594, 34.647758],
[112.3352, 37.9413],
],
lineStyle: {color: "#f58f0e"},
},
data: [200, 382, 102, 267, 186, 315, 316],
{
coords: [
[115.179594, 34.647758],
[109.1162, 34.2004],
],
lineStyle: {color: "#f5a305"},
},
{
name: "订单履约率",
type: "line",
yAxisIndex: 1,
// smooth: true, //线
// symbol:'circle', //
showAllSymbol: true,
symbol: "emptyCircle",
symbolSize: 6,
lineStyle: {
normal: {
color: "#ecf3ff", // 线
coords: [
[115.179594, 34.647758],
[103.5901, 36.3043],
],
lineStyle: {color: "#e7ab0b"},
},
borderColor: "#6d88bf",
{
coords: [
[115.179594, 34.647758],
[106.3586, 38.1775],
],
lineStyle: {color: "#dfae10"},
},
label: {
show: true,
position: "top",
textStyle: {
fontSize: 0.5 * vw,
color: "#fff",
{
coords: [
[115.179594, 34.647758],
[101.4038, 36.8207],
],
lineStyle: {color: "#d5b314"},
},
formatter: '{c}%'
{
coords: [
[115.179594, 34.647758],
[103.9526, 30.7617],
],
lineStyle: {color: "#c1bb1f"},
},
itemStyle: {
normal: {
color: "#28ffb3",
{
coords: [
[115.179594, 34.647758],
[108.384366, 30.439702],
],
lineStyle: {color: "#b9be23"},
},
{
coords: [
[115.179594, 34.647758],
[113.0823, 28.2568],
],
lineStyle: {color: "#a6c62c"},
},
tooltip: {
show: false,
{
coords: [
[115.179594, 34.647758],
[102.9199, 25.46639],
],
lineStyle: {color: "#96cc34"},
},
data: [96.74, 96.68, 98.76, 99.75, 98.58, 98.57, 98.43],
],
},
],
})
this.$refs.chart6.setData(option)
this.$refs.chart7.setData({
grid: {
show: false,
@ -1053,7 +1043,7 @@ export default {
containLabel: true,
},
xAxis: {
data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'],
data: ['2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月', '1月'],
axisLine: {
lineStyle: {
color: "#0177d4",

File diff suppressed because it is too large Load Diff

@ -11,28 +11,34 @@
<div class="currentPosition"><span>当前位置</span></div>
<div class="tool">
<el-row>
<el-col :span="5">
<el-col :span="4">
<div class="toolItem" @click="click1('companyIntroduction')">
<img class="icon" src="@/assets/model/model/companyIntroduction.png"/>
<div class="whiteSpan grid-content bg-purple">公司介绍</div>
</div>
</el-col>
<el-col :span="5">
<el-col :span="4">
<div class="toolItem" @click="click1('factoryIntroduction')">
<img class="icon" src="@/assets/model/model/factoryIntroduction.png"/>
<div class="whiteSpan grid-content bg-purple">工厂介绍</div>
</div>
</el-col>
<el-col :span="5">
<el-col :span="4">
<div class="toolItem" @click="click1('dataCentre')">
<img class="icon" src="@/assets/model/model/dataCentre.png"/>
<div class="whiteSpan grid-content bg-purple">大数据中心</div>
</div>
</el-col>
<el-col :span="5">
<el-col :span="4">
<div class="toolItem" @click="click2()">
<img class="icon" src="@/assets/model/model/process.png"/>
<div class="whiteSpan grid-content bg-purple-light">工艺流程</div>
<div class="whiteSpan grid-content bg-purple-light">智慧管控</div>
</div>
</el-col>
<el-col :span="4">
<div class="toolItem" @click="click1('equipment')">
<img class="icon" src="@/assets/model/model/process.png"/>
<div class="whiteSpan grid-content bg-purple-light">仓储物流</div>
</div>
</el-col>
<el-col :span="4">
@ -208,7 +214,7 @@ export default {
height: 4,
bgColor: '#ed7d31',
text: '箱壳预装',
link: 'foaming',
link: 'caseShell',
},
{
top: 35,
@ -217,7 +223,7 @@ export default {
height: 4,
bgColor: '#7f7f7f',
text: '箱壳<br>集存库',
link: 'foaming',
link: 'caseShell',
},
//
@ -228,7 +234,6 @@ export default {
height: 4,
bgColor: '#f4b183',
text: '壳胆<br>组装',
link: 'caseShell',
},
{
top: 17,
@ -264,6 +269,7 @@ export default {
height: 4,
bgColor: '#7f7f7f',
text: '发泡<br>箱体库',
link: 'finalAssembly',
},
{
top: 17,
@ -272,7 +278,6 @@ export default {
height: 4,
bgColor: '#ffc000',
text: '焊接',
link: 'pourInto',
},
{
top: 17,
@ -309,7 +314,6 @@ export default {
height: 4,
bgColor: '#2f5597',
text: '门壳<br>自动成型',
link: 'liner',
},
{
top: 68,
@ -318,7 +322,6 @@ export default {
height: 4,
bgColor: '#ed7d31',
text: '门壳预装',
link: 'liner',
},
{
top: 68,
@ -855,7 +858,7 @@ export default {
toLoad(val)
})
}
setModel(0, 10)
// setModel(0, 10)
// viewer.operator.enabled = true

Loading…
Cancel
Save