修改显示

master
夜笙歌 11 months ago
parent aa3d0cac58
commit ede091b57c

@ -1031,6 +1031,288 @@
"value6": "100%"
}
],
"table9": [
{
"value1": "1",
"value2": "487JFY",
"value3": "15",
"value4": "15",
"value5": "0"
},
{
"value1": "2",
"value2": "487JFY",
"value3": "15",
"value4": "15",
"value5": "0"
},
{
"value1": "3",
"value2": "487JFY",
"value3": "15",
"value4": "15",
"value5": "0"
},
{
"value1": "4",
"value2": "487JFY",
"value3": "15",
"value4": "15",
"value5": "0"
},
{
"value1": "5",
"value2": "487JFY",
"value3": "15",
"value4": "15",
"value5": "0"
},
{
"value1": "6",
"value2": "487JFY",
"value3": "15",
"value4": "15",
"value5": "0"
},
{
"value1": "7",
"value2": "487JFY",
"value3": "15",
"value4": "15",
"value5": "0"
},
{
"value1": "8",
"value2": "487JFY",
"value3": "15",
"value4": "15",
"value5": "0"
},
{
"value1": "9",
"value2": "487JFY",
"value3": "15",
"value4": "15",
"value5": "0"
},
{
"value1": "10",
"value2": "487JFY",
"value3": "15",
"value4": "15",
"value5": "0"
},
{
"value1": "11",
"value2": "487JFY",
"value3": "15",
"value4": "15",
"value5": "0"
},
{
"value1": "12",
"value2": "487JFY",
"value3": "15",
"value4": "15",
"value5": "0"
},
{
"value1": "13",
"value2": "487JFY",
"value3": "15",
"value4": "15",
"value5": "0"
},
{
"value1": "14",
"value2": "487JFY",
"value3": "15",
"value4": "15",
"value5": "0"
},
{
"value1": "15",
"value2": "487JFY",
"value3": "15",
"value4": "15",
"value5": "0"
},
{
"value1": "16",
"value2": "487JFY",
"value3": "15",
"value4": "15",
"value5": "1"
},
{
"value1": "17",
"value2": "487JFY",
"value3": "15",
"value4": "15",
"value5": "0"
},
{
"value1": "18",
"value2": "487JFY",
"value3": "15",
"value4": "15",
"value5": "0"
},
{
"value1": "19",
"value2": "487JFY",
"value3": "15",
"value4": "15",
"value5": "0"
},
{
"value1": "20",
"value2": "487JFY",
"value3": "15",
"value4": "15",
"value5": "0"
},
{
"value1": "21",
"value2": "487JFY",
"value3": "15",
"value4": "15",
"value5": "0"
},
{
"value1": "22",
"value2": "487JFY",
"value3": "15",
"value4": "15",
"value5": "0"
},
{
"value1": "23",
"value2": "487JFY",
"value3": "15",
"value4": "15",
"value5": "2"
},
{
"value1": "24",
"value2": "487JFY",
"value3": "15",
"value4": "15",
"value5": "0"
},
{
"value1": "25",
"value2": "487JFY",
"value3": "15",
"value4": "15",
"value5": "0"
},
{
"value1": "26",
"value2": "487JFY",
"value3": "15",
"value4": "15",
"value5": "0"
},
{
"value1": "27",
"value2": "487JFY",
"value3": "15",
"value4": "15",
"value5": "0"
},
{
"value1": "28",
"value2": "487JFY",
"value3": "15",
"value4": "15",
"value5": "0"
},
{
"value1": "29",
"value2": "487JFY",
"value3": "15",
"value4": "15",
"value5": "0"
},
{
"value1": "30",
"value2": "487JFY",
"value3": "15",
"value4": "15",
"value5": "0"
},
{
"value1": "31",
"value2": "487JFY",
"value3": "15",
"value4": "15",
"value5": "0"
},
{
"value1": "32",
"value2": "487JFY",
"value3": "15",
"value4": "15",
"value5": "0"
},
{
"value1": "33",
"value2": "487JFY",
"value3": "15",
"value4": "15",
"value5": "0"
},
{
"value1": "34",
"value2": "487JFY",
"value3": "15",
"value4": "15",
"value5": "3"
},
{
"value1": "35",
"value2": "487JFY",
"value3": "15",
"value4": "15",
"value5": "0"
},
{
"value1": "36",
"value2": "487JFY",
"value3": "15",
"value4": "15",
"value5": "0"
},
{
"value1": "37",
"value2": "487JFY",
"value3": "15",
"value4": "15",
"value5": "0"
},
{
"value1": "38",
"value2": "487JFY",
"value3": "15",
"value4": "15",
"value5": "0"
},
{
"value1": "39",
"value2": "487JFY",
"value3": "15",
"value4": "15",
"value5": "0"
},
{
"value1": "40",
"value2": "487JFY",
"value3": "15",
"value4": "15",
"value5": "0"
}
],
"chart1": {
"x": [
"01:00",
@ -1454,6 +1736,51 @@
]
}
},
"chart15": {
"x": [
"1日",
"2日",
"3日",
"4日",
"5日",
"6日",
"7日"
],
"y": [
{
"name": "计划",
"data": [
22,
52,
55,
12,
35,
44,
66
]
},
{
"name": "实际",
"data": [
32,
42,
50,
22,
30,
40,
52
]
}
]
},
"chart16": {
"x": ["组A", "组B", "组C", "组D", "组E", "组F", "组G", "组H"],
"y": [60, 55, 45, 42, 40, 40, 39, 38]
},
"chart17": {
"x": ["A-1", "A-2", "A-3", "A-4", "A-5", "A-6", "A-7"],
"y": [12, 20, 11, 30, 14, 80, 50]
},
"liner": {
"plan": [
{
@ -1865,5 +2192,17 @@
}
]
}
},
"a": {
"fpx": {
"A1": 0,
"A2": 0,
"B1": 0,
"B2": 0
},
"fpj": {
"A": 0,
"B": 0
}
}
}

@ -135,7 +135,7 @@
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="自定义功能" prop="customFunction">
<el-input v-model="form.customFunction" placeholder="请输入自定义功能" :disabled="editDisabled"/>
<el-input v-model="form.customFunction" placeholder="请输入自定义功能" />
</el-form-item>
<el-form-item label="自定义编号" prop="customCode">
<el-input v-model="form.customCode" placeholder="请输入自定义编号" />

@ -8,23 +8,23 @@
<div class="title1">班组</div>
<div class="title2">上线数量</div>
<div class="nowClass">总装</div>
<div class="num">1122</div>
<div class="nowClass">{{ info.bz }}</div>
<div class="num">{{ info.sxsl }}</div>
<div class="info1Title">产品条码</div>
<div class="info1">B23120783055009802101</div>
<div class="info1">{{ info.tm }}</div>
<div class="info2Title">扫描时间</div>
<div class="info2">2023/12/7 12:01:53</div>
<div class="info2">{{ info.sj }}</div>
<div class="info3Title">产品型号</div>
<div class="info3">发泡箱体,BCD-530WPG,标准白</div>
<div class="info3">{{ info.xh }}</div>
<div class="info4Title">订单编号</div>
<div class="info4">11232394</div>
<div class="info4">{{ info.bh }}</div>
<div class="info5Title">订单数量</div>
<div class="info5">300</div>
<div class="info5">{{ info.ddsl }}</div>
<div class="info6Title">上线数量</div>
<div class="info6">63</div>
<div class="info6">{{ info.sxsl2 }}</div>
<div class="info7Title">提示信息</div>
<div class="info7">扫描成功</div>
<div class="info7">{{ info.tsxx }}</div>
<div class="scrollTable">
<div style="background-color: #094170">
@ -102,6 +102,7 @@ import vueSeamlessScroll from "vue-seamless-scroll";
import Chart from "../../../components/board/Chart";
import * as echarts from 'echarts'
import {getData} from "@/api/board/getData";
import {mixData} from "@/api/board/mixData";
export default {
components: {
@ -130,6 +131,7 @@ export default {
left: 5.5
},
],
info: {},
scrollTableOption: {
step: 0.5, //
limitMoveNum: 5, // this.dataList.length
@ -141,162 +143,190 @@ export default {
waitTime: 0,
},
scrollTableData: [],
}
},
mounted() {
getData().then(e => {
this.scrollTableData = e.table7
this.$refs.chart1.setData({
tooltip: {
trigger: "axis",
axisPointer: {
//
type: "shadow", // 线'line' | 'shadow'
},
},
grid: {
left: "0",
right: "4%",
bottom: "0",
top: 20,
containLabel: true,
},
xAxis: {
type: "category",
data: e.chart4.x,
axisLine: {
lineStyle: {
color: "white",
},
},
axisLabel: {
// interval: 0,
// rotate: 40,
textStyle: {
fontFamily: "Microsoft YaHei",
},
},
RequestDataSet: [
{
e: 'zzsc-01',
i: "",
f: (e) => {
this.info = e
}
},
{
e: 'zzsc-02',
i: "",
f: (e) => {
this.$refs.chart1.setData({
tooltip: {
trigger: "axis",
axisPointer: {
//
type: "shadow", // 线'line' | 'shadow'
},
},
grid: {
left: "0",
right: "4%",
bottom: "0",
top: 20,
containLabel: true,
},
xAxis: {
type: "category",
data: e.x,
axisLine: {
lineStyle: {
color: "white",
},
},
axisLabel: {
// interval: 0,
// rotate: 40,
textStyle: {
fontFamily: "Microsoft YaHei",
},
},
},
yAxis: {
type: "value",
axisLine: {
show: false,
lineStyle: {
color: "white",
},
},
splitLine: {
show: false,
},
axisLabel: {},
yAxis: {
type: "value",
axisLine: {
show: false,
lineStyle: {
color: "white",
},
},
splitLine: {
show: false,
},
axisLabel: {},
},
series: [
{
name: "数量",
type: "bar",
barWidth: "30%",
barMaxWidth: 50,
itemStyle: {
normal: {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{
offset: 0,
color: "#0bca98",
},
{
offset: 1,
color: "#16a144",
},
]),
},
},
data: e.y.data,
},
],
})
}
},
series: [
{
name: "数量",
type: "bar",
barWidth: "30%",
barMaxWidth: 50,
itemStyle: {
normal: {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{
offset: 0,
color: "#0bca98",
{
e: 'zzsc-03',
i: "",
f: (e) => {
this.$refs.chart2.setData({
grid: {
left: "0",
right: "4%",
bottom: '2%',
top: "10%",
containLabel: true,
},
xAxis: {
data: e.x,
axisLine: {
lineStyle: {
color: "#3d5269",
},
{
offset: 1,
color: "#16a144",
},
axisLabel: {
interval: 0,
color: "#fff",
fontSize: 14,
},
},
yAxis: {
nameTextStyle: {
color: "#fff",
fontSize: 16,
},
axisLine: {
lineStyle: {
color: "#3d5269",
},
},
axisLabel: {
color: "#fff",
fontSize: 10,
},
splitLine: {
show: true,
lineStyle: {
color: "#2d3d53",
},
]),
},
interval: 500,
},
},
data: e.chart4.y.data,
},
],
})
this.$refs.chart2.setData({
grid: {
left: "0",
right: "4%",
bottom: '2%',
top: "10%",
containLabel: true,
},
xAxis: {
data: e.chart3.x,
axisLine: {
lineStyle: {
color: "#3d5269",
},
},
axisLabel: {
interval: 0,
color: "#fff",
fontSize: 14,
},
},
yAxis: {
nameTextStyle: {
color: "#fff",
fontSize: 16,
},
axisLine: {
lineStyle: {
color: "#3d5269",
},
},
axisLabel: {
color: "#fff",
fontSize: 10,
},
splitLine: {
show: true,
lineStyle: {
color: "#2d3d53",
},
},
interval: 500,
},
series: [
{
type: "bar",
barWidth: '40%',
itemStyle: {
normal: {
color: new echarts.graphic.LinearGradient(
0,
0,
0,
1,
[
{
offset: 0,
color: "#5ef3ff",
series: [
{
type: "bar",
barWidth: '40%',
itemStyle: {
normal: {
color: new echarts.graphic.LinearGradient(
0,
0,
0,
1,
[
{
offset: 0,
color: "#5ef3ff",
},
{
offset: 1,
color: "#06a4f4",
},
],
false
),
},
{
offset: 1,
color: "#06a4f4",
},
label: {
normal: {
show: true,
fontSize: 12,
fontWeight: "bold",
color: "#ffffff",
position: "top",
},
],
false
),
},
},
label: {
normal: {
show: true,
fontSize: 12,
fontWeight: "bold",
color: "#ffffff",
position: "top",
},
},
data: e.chart3.y.data,
},
],
})
},
data: e.y.data,
},
],
})
}
},
{
e: 'zzsc-04',
i: "",
f: (e) => {
this.scrollTableData = e
}
},
]
}
},
mounted() {
this.RequestDataSet.forEach(val => {
mixData(val)
})
},
methods: {}
@ -447,7 +477,6 @@ export default {
}
.info3Title {
position: absolute;
top: 13.5%;
@ -489,7 +518,6 @@ export default {
}
.info5Title {
position: absolute;
top: 18%;

File diff suppressed because it is too large Load Diff

@ -172,7 +172,6 @@ export default {
i: "",
f: (e) => {
this.practicalNum = e
console.log(e)
}
},
{
@ -409,7 +408,7 @@ export default {
},
{
e: 'nd-08',
i: "",
i: "SCADA_INV_STATS_SUM('')",
f: (e) => {
this.linerNum = e
}
@ -506,7 +505,6 @@ export default {
},
],
})
console.log(e)
}
},
{
@ -605,7 +603,6 @@ export default {
}
]
})
console.log(e)
}
},
]

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save