Merge branch 'master' of http://175.27.215.92:3000/yinq/aucma-mes-ui

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": [

public/model1/fileList.json

@@ -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"]}

public/model1/mat/ab30446d8f7c4799acc9896d99888c86.json

@@ -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"}}

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}
+  })
+}

src/api/board/liner.js

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

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)
+      })
+    }
+  })
+
+}
+
+
+
+
+

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
 }
 

src/views/base/customData/boardIndex.vue

@@ -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="请输入内容"/>

src/views/board/liner/index.vue

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

src/views/dashboard/LineChart.vue

@@ -137,9 +137,9 @@ export default {
                   color: '#3888fa',
                   width: 2
                 },
-                areaStyle: {
+                // areaStyle: {
-                  color: '#f3f8ff'
+                //   color: '#f3f8ff'
-                }
+                // }
               }
             },
             data: expectedData,
@@ -150,11 +150,12 @@ export default {
             name: '产量',
             smooth: false,
             type: 'bar',
+            barMaxWidth:60,
             itemStyle: {
               normal: {
-                color: '#3888fa',
+                color: '#9fe080',
                 lineStyle: {
-                  color: '#3888fa',
+                  color: '#9fe080',
                   width: 2
                 },
                 areaStyle: {

src/views/index_v1.vue

@@ -3,9 +3,6 @@
 
     <panel-group @handleSetLineChartData="handleSetLineChartData"/>
 
-    <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
-      <line-chart :chart-data="lineChartData"/>
-    </el-row>
     <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
       <el-table
         :data="tableData"
@@ -57,6 +54,10 @@
       </el-table>
     </el-row>
 
+    <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
+      <line-chart :chart-data="lineChartData"/>
+    </el-row>
+
     <el-row :gutter="32">
       <el-col :xs="24" :sm="24" :lg="16">
         <div class="chart-wrapper">
@@ -185,7 +186,8 @@ export default {
     padding: 8px;
   }
 }
-.el-table th.el-table__cell > .cell{
+
-  text-align: center  ;
+.el-table th.el-table__cell > .cell {
+  text-align: center;
 }
 </style>