diff --git a/public/data.json b/public/data.json index 7c6cbe5..f4466ed 100644 --- a/public/data.json +++ b/public/data.json @@ -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": [ diff --git a/public/model1/Texture/1352f34fdf1d4d70aa70db1c78830be2.jpg b/public/model1/Texture/1352f34fdf1d4d70aa70db1c78830be2.jpg deleted file mode 100644 index f60fe53..0000000 Binary files a/public/model1/Texture/1352f34fdf1d4d70aa70db1c78830be2.jpg and /dev/null differ diff --git a/public/model1/Texture/42a9b5dc53464f7c8401cb8137c72465.jpg b/public/model1/Texture/42a9b5dc53464f7c8401cb8137c72465.jpg deleted file mode 100644 index 963cfbb..0000000 Binary files a/public/model1/Texture/42a9b5dc53464f7c8401cb8137c72465.jpg and /dev/null differ diff --git a/public/model1/Texture/5d3830f2ee99487aa69232da1ca459e1.jpg b/public/model1/Texture/5d3830f2ee99487aa69232da1ca459e1.jpg deleted file mode 100644 index 972d85a..0000000 Binary files a/public/model1/Texture/5d3830f2ee99487aa69232da1ca459e1.jpg and /dev/null differ diff --git a/public/model1/Texture/7e809ba9a8d64eb4b8ad4ce32eabe949.jpg b/public/model1/Texture/7e809ba9a8d64eb4b8ad4ce32eabe949.jpg deleted file mode 100644 index badabec..0000000 Binary files a/public/model1/Texture/7e809ba9a8d64eb4b8ad4ce32eabe949.jpg and /dev/null differ diff --git a/public/model1/Texture/9a006d1db61948719afca68c419656ae.jpg b/public/model1/Texture/9a006d1db61948719afca68c419656ae.jpg deleted file mode 100644 index ad2b0ac..0000000 Binary files a/public/model1/Texture/9a006d1db61948719afca68c419656ae.jpg and /dev/null differ diff --git a/public/model1/Texture/b96aa6fce4ec4cd4bf5ec515d8a839fd.jpg b/public/model1/Texture/b96aa6fce4ec4cd4bf5ec515d8a839fd.jpg deleted file mode 100644 index 42d99ea..0000000 Binary files a/public/model1/Texture/b96aa6fce4ec4cd4bf5ec515d8a839fd.jpg and /dev/null differ diff --git a/public/model1/Texture/bf817fe3a3784cf3a6c4957726ffc373.jpg b/public/model1/Texture/bf817fe3a3784cf3a6c4957726ffc373.jpg deleted file mode 100644 index f769fa8..0000000 Binary files a/public/model1/Texture/bf817fe3a3784cf3a6c4957726ffc373.jpg and /dev/null differ diff --git a/public/model1/Texture/fb79295fd42c46fca660b562e3117605.jpg b/public/model1/Texture/fb79295fd42c46fca660b562e3117605.jpg deleted file mode 100644 index f93b5fc..0000000 Binary files a/public/model1/Texture/fb79295fd42c46fca660b562e3117605.jpg and /dev/null differ diff --git a/public/model1/addition/20f2164cfb2a4a66a3b10085e58ae3f1.mrmb b/public/model1/addition/20f2164cfb2a4a66a3b10085e58ae3f1.mrmb deleted file mode 100644 index 7746c88..0000000 Binary files a/public/model1/addition/20f2164cfb2a4a66a3b10085e58ae3f1.mrmb and /dev/null differ diff --git a/public/model1/fileList.json b/public/model1/fileList.json deleted file mode 100644 index 8049155..0000000 --- a/public/model1/fileList.json +++ /dev/null @@ -1 +0,0 @@ -{"sky":{"a":"sky/a/04a7d4d3-c071-4223-9ecb-b3f7463aa257.hdr","b":"sky/b/1d41cc4e-2504-42c8-b6ab-1710d79052f8.jpg"},"mat":["mat/ab30446d8f7c4799acc9896d99888c86.json"],"box":{"max":[-413.9531555175781,259.8915100097656,-281.6982727050781],"min":[-950.13037109375,254.0809783935547,-804.098388671875]},"m":["m/d19d13fb0040469ea961d0fab4872f8d.mrmb","m/d3a5691468b84a0d91e8379a240f08da.mrmb","m/b33a1250ae47406bbe47df744ddaf669.mrmb","m/5e1fef1609744e099b36a15c330c1648.mrmb"],"addition":["addition/20f2164cfb2a4a66a3b10085e58ae3f1.mrmb"]} \ No newline at end of file diff --git a/public/model1/m/5e1fef1609744e099b36a15c330c1648.mrmb b/public/model1/m/5e1fef1609744e099b36a15c330c1648.mrmb deleted file mode 100644 index b6179cb..0000000 Binary files a/public/model1/m/5e1fef1609744e099b36a15c330c1648.mrmb and /dev/null differ diff --git a/public/model1/m/b33a1250ae47406bbe47df744ddaf669.mrmb b/public/model1/m/b33a1250ae47406bbe47df744ddaf669.mrmb deleted file mode 100644 index 886aded..0000000 Binary files a/public/model1/m/b33a1250ae47406bbe47df744ddaf669.mrmb and /dev/null differ diff --git a/public/model1/m/d19d13fb0040469ea961d0fab4872f8d.mrmb b/public/model1/m/d19d13fb0040469ea961d0fab4872f8d.mrmb deleted file mode 100644 index 79ffbe7..0000000 Binary files a/public/model1/m/d19d13fb0040469ea961d0fab4872f8d.mrmb and /dev/null differ diff --git a/public/model1/m/d3a5691468b84a0d91e8379a240f08da.mrmb b/public/model1/m/d3a5691468b84a0d91e8379a240f08da.mrmb deleted file mode 100644 index 496d018..0000000 Binary files a/public/model1/m/d3a5691468b84a0d91e8379a240f08da.mrmb and /dev/null differ diff --git a/public/model1/mat/ab30446d8f7c4799acc9896d99888c86.json b/public/model1/mat/ab30446d8f7c4799acc9896d99888c86.json deleted file mode 100644 index 4ca22cf..0000000 --- a/public/model1/mat/ab30446d8f7c4799acc9896d99888c86.json +++ /dev/null @@ -1 +0,0 @@ -{"a":[{"ee":"wire_018035031","ii":32,"a":0,"b":[0.0706,0.1373,0.1216],"jr":1,"j":1},{"ee":"wire_015035031","ii":32,"a":1,"b":[0.0588,0.1373,0.1216],"jr":1,"j":1},{"ee":"Material__23445","ii":20,"a":2,"b":[1,1,1],"c":0,"jr":1,"j":1,"x":[0,0]},{"ee":"Material__23446","ii":20,"a":3,"b":[1,1,1],"c":1,"jr":1,"j":1,"x":[0,0]},{"ee":"Material__23439","ii":20,"a":4,"b":[1,1,1],"c":2,"jr":1,"j":1,"x":[0,0]},{"ee":"Material__23440","ii":20,"a":5,"b":[1,1,1],"c":3,"jr":1,"j":1,"x":[0,0]},{"ee":"Material__23441","ii":20,"a":6,"b":[1,1,1],"c":4,"jr":1,"j":1,"x":[0,0]},{"ee":"Material__23442","ii":20,"a":7,"b":[1,1,1],"c":5,"jr":1,"j":1,"x":[0,0]},{"ee":"Material__23443","ii":20,"a":8,"b":[1,1,1],"c":6,"jr":1,"j":1,"x":[0,0]},{"ee":"Material__23444","ii":20,"a":9,"b":[1,1,1],"c":7,"jr":1,"j":1,"x":[0,0]}],"b":{"0":"9a006d1db61948719afca68c419656ae.jpg","1":"1352f34fdf1d4d70aa70db1c78830be2.jpg","2":"5d3830f2ee99487aa69232da1ca459e1.jpg","3":"42a9b5dc53464f7c8401cb8137c72465.jpg","4":"bf817fe3a3784cf3a6c4957726ffc373.jpg","5":"7e809ba9a8d64eb4b8ad4ce32eabe949.jpg","6":"b96aa6fce4ec4cd4bf5ec515d8a839fd.jpg","7":"fb79295fd42c46fca660b562e3117605.jpg"},"version":"1","z":{"0":"https://laozi-model.obs.cn-east-2.myhuaweicloud.com/mapping/LIGHTWEIGHT/1733052188701364224/fad579949ce14dff83899729637e8854.jpg","1":"https://laozi-model.obs.cn-east-2.myhuaweicloud.com/mapping/LIGHTWEIGHT/1733052188701364224/820f1a3b1e75491f87b51293d89f4914.jpg","2":"https://laozi-model.obs.cn-east-2.myhuaweicloud.com/mapping/LIGHTWEIGHT/1733052188701364224/ce91a7beefcb433995353c534deee39b.jpg","3":"https://laozi-model.obs.cn-east-2.myhuaweicloud.com/mapping/LIGHTWEIGHT/1733052188701364224/a5155a53f07b4bf4ab4f24e5f1a0f45a.jpg","4":"https://laozi-model.obs.cn-east-2.myhuaweicloud.com/mapping/LIGHTWEIGHT/1733052188701364224/64cc28b0ab1a46829051429e512a9886.jpg","5":"https://laozi-model.obs.cn-east-2.myhuaweicloud.com/mapping/LIGHTWEIGHT/1733052188701364224/16be241694e247dda0e0f5df682d40fa.jpg","6":"https://laozi-model.obs.cn-east-2.myhuaweicloud.com/mapping/LIGHTWEIGHT/1733052188701364224/276128df056c4ab9bb1556afb3773a5b.jpg","7":"https://laozi-model.obs.cn-east-2.myhuaweicloud.com/mapping/LIGHTWEIGHT/1733052188701364224/51d6713ba2804319abadcc1b12284807.jpg"}} \ No newline at end of file diff --git a/public/model1/sky/a/04a7d4d3-c071-4223-9ecb-b3f7463aa257.hdr b/public/model1/sky/a/04a7d4d3-c071-4223-9ecb-b3f7463aa257.hdr deleted file mode 100644 index fb99836..0000000 Binary files a/public/model1/sky/a/04a7d4d3-c071-4223-9ecb-b3f7463aa257.hdr and /dev/null differ diff --git a/public/model1/sky/b/1d41cc4e-2504-42c8-b6ab-1710d79052f8.jpg b/public/model1/sky/b/1d41cc4e-2504-42c8-b6ab-1710d79052f8.jpg deleted file mode 100644 index 15b04f7..0000000 Binary files a/public/model1/sky/b/1d41cc4e-2504-42c8-b6ab-1710d79052f8.jpg and /dev/null differ diff --git a/src/api/board/getData.js b/src/api/board/getData.js index 144cbc1..20e849e 100644 --- a/src/api/board/getData.js +++ b/src/api/board/getData.js @@ -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} + }) +} diff --git a/src/api/board/liner.js b/src/api/board/liner.js deleted file mode 100644 index d70de41..0000000 --- a/src/api/board/liner.js +++ /dev/null @@ -1,7 +0,0 @@ -import request from '@/utils/request' - - - - - - diff --git a/src/api/board/mixData.js b/src/api/board/mixData.js new file mode 100644 index 0000000..8a7c1a5 --- /dev/null +++ b/src/api/board/mixData.js @@ -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) + }) + } + }) + +} + + + + + diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index 15f7ad0..f0be3b8 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -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 } diff --git a/src/views/base/customData/boardIndex.vue b/src/views/base/customData/boardIndex.vue index 2ce49b1..807a358 100644 --- a/src/views/base/customData/boardIndex.vue +++ b/src/views/base/customData/boardIndex.vue @@ -138,7 +138,7 @@ - + diff --git a/src/views/board/caseShell/index2.vue b/src/views/board/caseShell/index2.vue index a63aa1b..4efd51f 100644 --- a/src/views/board/caseShell/index2.vue +++ b/src/views/board/caseShell/index2.vue @@ -4,7 +4,7 @@
{{ team }}
{{ planNum }}
{{ practicalNum }}
-
{{ differenceValue }}
+
{{ practicalNum - planNum }}
{{ i }} @@ -81,6 +81,9 @@ 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"; + +const vw = (document.documentElement.clientWidth || document.body.clientWidth) / 100 export default { components: { @@ -90,11 +93,11 @@ export default { name: "Liner", data() { return { - linerNum: 50, - caseNum: 44, - meter: 30, - frontNum: 100, - laterNum: 100, + linerNum: 0, + caseNum: 0, + meter: 0, + frontNum: 0, + laterNum: 0, title: [ '生产计划', '小时产量统计', @@ -124,10 +127,9 @@ export default { left: 68.5 }, ], - team: '白班', - planNum: 1000, - practicalNum: 1000, - differenceValue: 1000, + team: '', + planNum: 0, + practicalNum: 0, scrollTableOption: { step: 0.5, // 数值越大速度滚动越快 limitMoveNum: 9999999999999, // 开始无缝滚动的数据量 this.dataList.length @@ -139,480 +141,569 @@ export default { waitTime: 0, }, scrollTableData: [], - - } - }, - mounted() { - const vw = (document.documentElement.clientWidth || document.body.clientWidth) / 100 - getData().then(e => { - this.scrollTableData = e.caseShell2.table1 - this.$refs.chart1.setData({ - tooltip: { - trigger: "axis", - axisPointer: { - // 坐标轴指示器,坐标轴触发有效 - type: "shadow", // 默认为直线,可选为:'line' | 'shadow' - }, - }, - grid: { - left: "0", - right: "4%", - bottom: "0", - top: 20, - containLabel: true, + RequestDataSet: [ + { + e: 'xkqhb-01', + i: "", + f: (e) => { + this.team = e + } }, - legend: { - data: e.caseShell2.ImportAndExportStatistics.y.map(val => val.name), - right: 'center', - top: 0, - textStyle: { - color: "#fff", - }, - itemWidth: 12, - itemHeight: 10, - // itemGap: 35 + { + e: 'xkqhb-02', + i: "", + f: (e) => { + this.planNum = e + } }, - xAxis: { - type: "category", - data: e.caseShell2.ImportAndExportStatistics.x, - axisLine: { - lineStyle: { - color: "white", - }, - }, - axisLabel: { - // interval: 0, - // rotate: 40, - textStyle: { - fontFamily: "Microsoft YaHei", - }, - }, + { + e: 'xkqhb-03', + i: "", + f: (e) => { + this.practicalNum = e + } }, - - yAxis: { - type: "value", - axisLine: { - show: false, - lineStyle: { - color: "white", - }, - }, - splitLine: { - show: false, - }, - axisLabel: {}, + { + e: 'xkqhb-04', + i: "", + f: (e) => { + this.scrollTableData = e + } }, - series: [ - { - name: e.caseShell2.ImportAndExportStatistics.y[0].name, - type: "bar", - barWidth: "30%", - barMaxWidth: 50, - label: { - normal: { - show: true, - position: "top", + { + e: 'xkqhb-05', + 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, + }, + 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: "#39ffff", + 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.caseShell2.ImportAndExportStatistics.y[0].data, - }, - { - name: e.caseShell2.ImportAndExportStatistics.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, + + 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: "#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.caseShell2.ImportAndExportStatistics.y[1].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.chart2.y.map(val => val.name), - right: 'center', - top: 0, - textStyle: { - color: "#fff", - }, - itemWidth: 12, - itemHeight: 10, - // itemGap: 35 - }, - xAxis: { - type: "category", - data: e.chart2.x, - axisLine: { - lineStyle: { - color: "white", - }, - }, - axisLabel: { - // interval: 0, - // rotate: 40, - textStyle: { - fontFamily: "Microsoft YaHei", - }, - }, + 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, + }, + ], + }) + } }, - - yAxis: { - type: "value", - axisLine: { - show: false, - lineStyle: { - color: "white", - }, - }, - splitLine: { - show: false, - }, - axisLabel: {}, + { + e: 'xkqhb-06', + i: "", + f: (e) => { + this.meter = e + } }, - series: [ - { - name: e.chart2.y[0].name, - type: "bar", - barWidth: "30%", - barMaxWidth: 50, - label: { - normal: { - show: true, - position: "top", + { + e: 'xkqhb-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, + }, + 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: "#0bca98", + xAxis: { + type: "category", + data: e.x, + axisLine: { + lineStyle: { + color: "white", }, - { - offset: 1, - color: "#16a144", + }, + axisLabel: { + // interval: 0, + // rotate: 40, + textStyle: { + fontFamily: "Microsoft YaHei", }, - ]), + }, }, - }, - data: e.chart2.y[0].data, - }, - { - name: e.chart2.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, + + 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: "#0f8ad7", + 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: "#0b30d9", + itemStyle: { + normal: { + color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [ + { + offset: 0, + color: "#0bca98", + }, + { + offset: 1, + color: "#16a144", + }, + ]), + }, }, - ]), - }, - }, - data: e.chart2.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, - }, - legend: { - data: e.caseShell2.chart2.y.map(val => val.name), - right: 'center', - top: 0, - textStyle: { - color: "#fff", - }, - itemWidth: 12, - itemHeight: 10, - // itemGap: 35 + 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: "#0f8ad7", + }, + { + offset: 1, + color: "#0b30d9", + }, + ]), + }, + }, + data: e.y[1].data, + }, + ], + }) + } }, - xAxis: { - type: "category", - data: e.caseShell2.chart2.x, - axisLine: { - lineStyle: { - color: "white", - }, - }, - axisLabel: { - // interval: 0, - // rotate: 40, - textStyle: { - fontFamily: "Microsoft YaHei", - }, - }, + { + e: 'xkqhb-08', + i: "", + f: (e) => { + this.linerNum = e + } }, - - yAxis: { - type: "value", - axisLine: { - show: false, - lineStyle: { - color: "white", - }, - }, - splitLine: { - show: false, - }, - axisLabel: {}, + { + e: 'xkqhb-09', + i: "", + f: (e) => { + this.caseNum = e + } }, - series: [ - { - name: e.caseShell2.chart2.y[0].name, - type: "bar", - barWidth: "30%", - barMaxWidth: 50, - label: { - normal: { - show: true, - position: "top", + { + e: 'xkqhb-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, + }, + 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: "#0bca98", + xAxis: { + type: "category", + data: e.x, + axisLine: { + lineStyle: { + color: "white", }, - { - offset: 1, - color: "#16a144", + }, + axisLabel: { + // interval: 0, + // rotate: 40, + textStyle: { + fontFamily: "Microsoft YaHei", }, - ]), + }, }, - }, - data: e.caseShell2.chart2.y[0].data, - }, - { - name: e.caseShell2.chart2.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, + + 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: "#0f8ad7", + 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: "#0b30d9", + itemStyle: { + normal: { + color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [ + { + offset: 0, + color: "#0bca98", + }, + { + offset: 1, + color: "#16a144", + }, + ]), + }, }, - ]), - }, - }, - data: e.caseShell2.chart2.y[1].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' - }, - }, - grid: { - left: "0", - right: "4%", - bottom: "0", - top: 20, - containLabel: true, + 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: "#0f8ad7", + }, + { + offset: 1, + color: "#0b30d9", + }, + ]), + }, + }, + data: e.y[1].data, + }, + ], + }) + } }, - xAxis: { - type: "category", - data: e.liner.foamFixtureState.x, - axisLine: { - lineStyle: { - color: "white", - }, - }, - axisLabel: { - // interval: 0, - // rotate: 40, - textStyle: { - fontFamily: "Microsoft YaHei", - }, - }, + { + e: 'xkqhb-11', + i: "", + f: (e) => { + this.frontNum = e + } }, - - yAxis: { - type: "value", - axisLine: { - show: false, - lineStyle: { - color: "white", - }, - }, - splitLine: { - show: false, - }, - axisLabel: {}, + { + e: 'xkqhb-12', + i: "", + f: (e) => { + this.laterNum = e + } }, - series: [ - { - name: e.liner.foamFixtureState.y.name, - type: "bar", - barWidth: '30%', - barMaxWidth: 50, - label: { - normal: { - show: true, - position: "top", + { + e: 'xkqhb-13', + 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", }, - { - offset: 1, - color: "#3d7aff", + }, + axisLabel: { + // interval: 0, + // rotate: 40, + textStyle: { + fontFamily: "Microsoft YaHei", }, - ]), + }, }, - }, - data: e.liner.foamFixtureState.y.data, + + yAxis: { + type: "value", + axisLine: { + show: false, + lineStyle: { + color: "white", + }, + }, + splitLine: { + show: false, + }, + axisLabel: {}, + }, + 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, + } + ] + }) + this.laterNum = e } - ] - }) + }, + ] + + } + }, + mounted() { + this.RequestDataSet.forEach(val => { + mixData(val) }) }, methods: {} diff --git a/src/views/board/foaming/index.vue b/src/views/board/foaming/index.vue index a928d8c..4fd76d1 100644 --- a/src/views/board/foaming/index.vue +++ b/src/views/board/foaming/index.vue @@ -1,9 +1,16 @@