yinq
/
aucma-mes-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改路由

Browse Source
master
夜笙歌 11 months ago
parent 4f3098b9c1
commit 3d19ecb41a
9 changed files with 2084 additions and 1275 deletions
Show Stats Download Patch File Download Diff File

42
public/data.json
Unescape Escape View File

@ -353,6 +353,48 @@
"value17": "100",
"value18": "100",
"value19": "100"
},
{
"value1": "11",
"value2": "A-06",
"value3": "生产中",
"value4": "1000",
"value5": "1000%",
"value6": "100%",
"value7": "100",
"value8": "100",
"value9": "100",
"value10": "100",
"value11": "100",
"value12": "100",
"value13": "100",
"value14": "100",
"value15": "100",
"value16": "100",
"value17": "100",
"value18": "100",
"value19": "100"
},
{
"value1": "12",
"value2": "A-06",
"value3": "生产中",
"value4": "1000",
"value5": "1000%",
"value6": "100%",
"value7": "100",
"value8": "100",
"value9": "100",
"value10": "100",
"value11": "100",
"value12": "100",
"value13": "100",
"value14": "100",
"value15": "100",
"value16": "100",
"value17": "100",
"value18": "100",
"value19": "100"
}
],
"table31": [

8
src/api/board/getData.js
Unescape Escape View File

@ -16,3 +16,11 @@ export function generalInterfaceList(query) {
data: query
})
}
export function getSimulateData(query) {
return request({
url: '/base/customData/list',
method: 'get',
params: {customType: 1, ...query}
})
}

7
src/api/board/liner.js
Unescape Escape View File

@ -1,7 +0,0 @@
import request from '@/utils/request'

24
src/api/board/mixData.js
Unescape Escape View File

@ -0,0 +1,24 @@
import {generalInterfaceList, getSimulateData} from '@/api/board/getData'
export function mixData(params) {
getSimulateData({customCode: params?.e || ''}).then(val => {
if (val.rows.length > 0 && val.rows[0].isFlag === 0) {
let data = JSON.parse(val.rows[0].customData);
(params?.f || (() => {
}))(data)
} else {
generalInterfaceList({
method: params?.i || ''
}).then(val2 => {
(params?.f || (() => {
}))(val2)
})
}
})
}

3
src/store/modules/permission.js
Unescape Escape View File

@ -40,8 +40,6 @@ const permission = {
const rdata = JSON.parse(JSON.stringify(res.data))
const sidebarRoutes = filterAsyncRouter(sdata)
const rewriteRoutes = filterAsyncRouter(rdata, false, true)
console.log('sidebarRoutes',sidebarRoutes)
console.log('rewriteRoutes',rewriteRoutes)
const asyncRoutes = filterDynamicRoutes(dynamicRoutes);
rewriteRoutes.push({ path: '*', redirect: '/404', hidden: true })
router.addRoutes(asyncRoutes);
@ -88,7 +86,6 @@ function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) {
}
return true
})
console.log('data',data)
return data
}

2
src/views/base/customData/boardIndex.vue
Unescape Escape View File

@ -138,7 +138,7 @@
<el-input v-model="form.customFunction" placeholder="请输入自定义功能" :disabled="editDisabled"/>
</el-form-item>
<el-form-item label="自定义编号" prop="customCode">
<el-input v-model="form.customCode" placeholder="请输入自定义编号" :disabled="editDisabled"/>
<el-input v-model="form.customCode" placeholder="请输入自定义编号" />
</el-form-item>
<el-form-item label="自定义数据" prop="customData">
<el-input v-model="form.customData" type="textarea" placeholder="请输入内容"/>

961
src/views/board/caseShell/index2.vue
View File

File diff suppressed because it is too large Load Diff

1494
src/views/board/foaming/index.vue
View File

File diff suppressed because it is too large Load Diff

818
src/views/board/liner/index.vue
Unescape Escape View File

@ -4,7 +4,7 @@
<div class="topNum team">{{ team }}</div>
<div class="topNum planNum">{{ planNum }}</div>
<div class="topNum practicalNum">{{ practicalNum }}</div>
<div class="topNum differenceValue">{{ differenceValue }}</div>
<div class="topNum differenceValue">{{ practicalNum - planNum }}</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 }}
@ -93,7 +93,10 @@
import vueSeamlessScroll from "vue-seamless-scroll";
import Chart from "../../../components/board/Chart";
import * as echarts from 'echarts'
import {getData, generalInterfaceList} from '@/api/board/getData'
import {getData, generalInterfaceList, getSimulateData} from '@/api/board/getData'
import {mixData} from '@/api/board/mixData'
const vw = (document.documentElement.clientWidth || document.body.clientWidth) / 100
export default {
components: {
@ -110,9 +113,9 @@ export default {
'泡前库存统计',
'箱体发泡实时状态',
],
meter: 30,
linerNum: 50,
caseNum: 44,
meter: 0,
linerNum: 0,
caseNum: 0,
titlePosition: [
{
top: 19.8,
@ -135,10 +138,9 @@ export default {
left: 68.5
},
],
team: '白班',
planNum: 1000,
practicalNum: 1000,
differenceValue: 1000,
team: '',
planNum: 0,
practicalNum: 0,
scrollTableOption: {
step: 0.5,
limitMoveNum: 9999999999,
@ -150,417 +152,469 @@ export default {
waitTime: 0,
},
scrollTableData: [],
}
},
mounted() {
const vw = (document.documentElement.clientWidth || document.body.clientWidth) / 100
generalInterfaceList({
"method": "SCADA_INV_STATS_01('')"
}).then(e => {
console.log(e)
})
generalInterfaceList({
"method": "SCADA_INV_STATS_SUM('')"
}).then(e => {
console.log(e)
})
generalInterfaceList({
"method": "scada_inv_stats_02('')"
}).then(e => {
console.log(e)
})
generalInterfaceList({
"method": "scada_in_store_01('')"
}).then(e => {
console.log(e)
})
generalInterfaceList({
"method": "scada_xk_pro_01('')"
}).then(e => {
console.log(e)
})
getData().then(e => {
this.scrollTableData = e.table1
this.$refs.chart1.setData({
tooltip: {
trigger: "axis",
axisPointer: {
// 坐标轴指示器，坐标轴触发有效
type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
},
RequestDataSet: [
{
e: 'nd-01',
i: "",
f: (e) => {
this.team = e
}
},
grid: {
left: "0",
right: "4%",
bottom: "0",
top: 20,
containLabel: true,
{
e: 'nd-02',
i: "",
f: (e) => {
this.planNum = e
}
},
xAxis: {
type: "category",
data: e.liner.ImportAndExportStatistics.x,
axisLine: {
lineStyle: {
color: "white",
},
},
axisLabel: {
// interval: 0,
// rotate: 40,
textStyle: {
fontFamily: "Microsoft YaHei",
},
},
{
e: 'nd-03',
i: "",
f: (e) => {
this.practicalNum = e
console.log(e)
}
},
yAxis: {
type: "value",
axisLine: {
show: false,
lineStyle: {
color: "white",
},
},
splitLine: {
show: false,
},
axisLabel: {},
{
e: 'nd-04',
i: "",
f: (e) => {
this.scrollTableData = e
}
},
series: [
{
name: e.liner.ImportAndExportStatistics.y[0].name,
label: {
normal: {
show: true,
position: "top",
textStyle: {
color: "#a8aab0",
fontStyle: "normal",
fontFamily: "微软雅黑",
fontSize: 0.75 * vw,
{
e: 'nd-05',
i: "",
f: (e) => {
this.$refs.chart1.setData({
tooltip: {
trigger: "axis",
axisPointer: {
// 坐标轴指示器，坐标轴触发有效
type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
},
},
},
type: "bar",
barWidth: "30%",
barMaxWidth: 50,
itemStyle: {
normal: {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{
offset: 0,
color: "#39ffff",
grid: {
left: "0",
right: "4%",
bottom: "0",
top: 20,
containLabel: true,
},
xAxis: {
type: "category",
data: e.x,
axisLine: {
lineStyle: {
color: "white",
},
{
offset: 1,
color: "#5affa6",
},
axisLabel: {
// interval: 0,
// rotate: 40,
textStyle: {
fontFamily: "Microsoft YaHei",
},
]),
},
},
},
data: e.liner.ImportAndExportStatistics.y[0].data,
},
],
})
this.$refs.chart2.setData({
tooltip: {
trigger: "axis",
axisPointer: {
// 坐标轴指示器，坐标轴触发有效
type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
},
},
grid: {
left: "0",
right: "4%",
bottom: "0",
top: 20,
containLabel: true,
},
legend: {
data: e.liner.inventoryStatus.y.map(val => val.name),
right: 'center',
top: 0,
textStyle: {
color: "#fff",
},
itemWidth: 12,
itemHeight: 10,
// itemGap: 35
},
xAxis: {
type: "category",
data: e.liner.inventoryStatus.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: {},
},
series: [
{
name: e.liner.inventoryStatus.y[0].name,
type: "bar",
barWidth: "30%",
barMaxWidth: 50,
label: {
normal: {
show: true,
position: "top",
textStyle: {
color: "#a8aab0",
fontStyle: "normal",
fontFamily: "微软雅黑",
fontSize: 0.75 * vw,
yAxis: {
type: "value",
axisLine: {
show: false,
lineStyle: {
color: "white",
},
},
splitLine: {
show: false,
},
axisLabel: {},
},
},
itemStyle: {
normal: {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{
offset: 0,
color: "#39ffff",
series: [
{
name: e.y[0].name,
label: {
normal: {
show: true,
position: "top",
textStyle: {
color: "#a8aab0",
fontStyle: "normal",
fontFamily: "微软雅黑",
fontSize: 0.75 * vw,
},
},
},
{
offset: 1,
color: "#5affa6",
type: "bar",
barWidth: "30%",
barMaxWidth: 50,
itemStyle: {
normal: {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{
offset: 0,
color: "#39ffff",
},
{
offset: 1,
color: "#5affa6",
},
]),
},
},
]),
data: e.y[0].data,
},
],
})
}
},
{
e: 'nd-06',
i: "",
f: (e) => {
this.meter = e
}
},
{
e: 'nd-07',
i: "SCADA_INV_STATS_01('')",
f: (e) => {
this.$refs.chart2.setData({
tooltip: {
trigger: "axis",
axisPointer: {
// 坐标轴指示器，坐标轴触发有效
type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
},
},
grid: {
left: "0",
right: "4%",
bottom: "0",
top: 20,
containLabel: true,
},
},
data: e.liner.inventoryStatus.y[0].data,
},
{
name: e.liner.inventoryStatus.y[1].name,
type: "bar",
barWidth: "30%",
barMaxWidth: 50,
label: {
normal: {
show: true,
position: "top",
legend: {
data: e.y.map(val => val.name),
right: 'center',
top: 0,
textStyle: {
color: "#a8aab0",
fontStyle: "normal",
fontFamily: "微软雅黑",
fontSize: 0.75 * vw,
color: "#fff",
},
itemWidth: 12,
itemHeight: 10,
// itemGap: 35
},
},
itemStyle: {
normal: {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{
offset: 0,
color: "#4adfff",
xAxis: {
type: "category",
data: e.x,
axisLine: {
lineStyle: {
color: "white",
},
{
offset: 1,
color: "#3d7aff",
},
axisLabel: {
// interval: 0,
// rotate: 40,
textStyle: {
fontFamily: "Microsoft YaHei",
},
]),
},
},
},
data: e.liner.inventoryStatus.y[1].data,
},
],
})
this.$refs.chart3.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.liner.inventoryStatistics.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: {},
},
series: [
{
name: e.liner.inventoryStatistics.y.name,
type: "bar",
barWidth: "30%",
label: {
normal: {
show: true,
position: "top",
textStyle: {
color: "#a8aab0",
fontStyle: "normal",
fontFamily: "微软雅黑",
fontSize: 0.75 * vw,
yAxis: {
type: "value",
axisLine: {
show: false,
lineStyle: {
color: "white",
},
},
splitLine: {
show: false,
},
axisLabel: {},
},
},
barMaxWidth: 50,
itemStyle: {
normal: {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{
offset: 0,
color: "#4adfff",
series: [
{
name: e.y[0].name,
type: "bar",
barWidth: "30%",
barMaxWidth: 50,
label: {
normal: {
show: true,
position: "top",
textStyle: {
color: "#a8aab0",
fontStyle: "normal",
fontFamily: "微软雅黑",
fontSize: 0.75 * vw,
},
},
},
{
offset: 1,
color: "#3d7aff",
itemStyle: {
normal: {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{
offset: 0,
color: "#39ffff",
},
{
offset: 1,
color: "#5affa6",
},
]),
},
},
]),
},
},
data: e.liner.inventoryStatistics.y.data,
},
],
})
this.$refs.chart4.setData({
legend: {
data: ['运行中夹具数量'],
right: 'center',
top: 0,
textStyle: {
color: "#fff",
},
itemWidth: 12,
itemHeight: 10,
// itemGap: 35
},
tooltip: {
trigger: "axis",
axisPointer: {
// 坐标轴指示器，坐标轴触发有效
type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
},
data: e.y[0].data,
},
{
name: e.y[1].name,
type: "bar",
barWidth: "30%",
barMaxWidth: 50,
label: {
normal: {
show: true,
position: "top",
textStyle: {
color: "#a8aab0",
fontStyle: "normal",
fontFamily: "微软雅黑",
fontSize: 0.75 * vw,
},
},
},
itemStyle: {
normal: {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{
offset: 0,
color: "#4adfff",
},
{
offset: 1,
color: "#3d7aff",
},
]),
},
},
data: e.y[1].data,
},
],
})
}
},
grid: {
left: "0",
right: "4%",
bottom: "0",
top: 20,
containLabel: true,
{
e: 'nd-08',
i: "",
f: (e) => {
this.linerNum = e
}
},
xAxis: {
type: "category",
data: e.liner.foamFixtureState.x,
axisLine: {
lineStyle: {
color: "white",
},
},
axisLabel: {
// interval: 0,
// rotate: 40,
textStyle: {
fontFamily: "Microsoft YaHei",
},
},
{
e: 'nd-09',
i: "",
f: (e) => {
this.caseNum = e
}
},
{
e: 'nd-10',
i: "",
f: (e) => {
this.$refs.chart3.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: e.y.name,
type: "bar",
barWidth: "30%",
label: {
normal: {
show: true,
position: "top",
textStyle: {
color: "#a8aab0",
fontStyle: "normal",
fontFamily: "微软雅黑",
fontSize: 0.75 * vw,
},
},
},
barMaxWidth: 50,
itemStyle: {
normal: {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{
offset: 0,
color: "#4adfff",
},
{
offset: 1,
color: "#3d7aff",
},
]),
},
},
data: e.y.data,
},
],
})
console.log(e)
}
},
series: [
{
name: e.liner.foamFixtureState.y.name,
type: "bar",
barWidth: '30%',
barMaxWidth: 50,
label: {
normal: {
show: true,
position: "top",
{
e: 'nd-11',
i: "",
f: (e) => {
this.$refs.chart4.setData({
legend: {
data: ['运行中夹具数量'],
right: 'center',
top: 0,
textStyle: {
color: "#a8aab0",
fontStyle: "normal",
fontFamily: "微软雅黑",
fontSize: 0.75 * vw,
color: "#fff",
},
itemWidth: 12,
itemHeight: 10,
// itemGap: 35
},
tooltip: {
trigger: "axis",
axisPointer: {
// 坐标轴指示器，坐标轴触发有效
type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
},
},
},
itemStyle: {
normal: {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{
offset: 0,
color: "#4adfff",
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",
},
{
offset: 1,
color: "#3d7aff",
},
},
yAxis: {
type: "value",
axisLine: {
show: false,
lineStyle: {
color: "white",
},
]),
},
splitLine: {
show: false,
},
axisLabel: {},
},
},
data: e.liner.foamFixtureState.y.data,
series: [
{
name: e.y.name,
type: "bar",
barWidth: '30%',
barMaxWidth: 50,
label: {
normal: {
show: true,
position: "top",
textStyle: {
color: "#a8aab0",
fontStyle: "normal",
fontFamily: "微软雅黑",
fontSize: 0.75 * vw,
},
},
},
itemStyle: {
normal: {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{
offset: 0,
color: "#4adfff",
},
{
offset: 1,
color: "#3d7aff",
},
]),
},
},
data: e.y.data,
}
]
})
console.log(e)
}
]
})
},
]
}
},
mounted() {
this.RequestDataSet.forEach(val => {
mixData(val)
})
},
methods: {}

Write Preview
Loading…
Cancel
Save