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

src/views/board/liner/index.vue

@@ -153,6 +153,7 @@ export default {
     }
   },
   mounted() {
+    const vw = (document.documentElement.clientWidth || document.body.clientWidth) / 100
     getData().then(e => {
       this.scrollTableData = e.table1
       this.$refs.chart1.setData({
@@ -214,6 +215,18 @@ export default {
         series: [
           {
             name: e.liner.ImportAndExportStatistics.y[0].name,
+            label: {
+              normal: {
+                show: true,
+                position: "top",
+                textStyle: {
+                  color: "#a8aab0",
+                  fontStyle: "normal",
+                  fontFamily: "微软雅黑",
+                  fontSize: 0.75 * vw,
+                },
+              },
+            },
             type: "bar",
             barWidth: "30%",
             barMaxWidth: 50,
@@ -297,6 +310,18 @@ export default {
             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, [
@@ -318,6 +343,18 @@ export default {
             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, [
@@ -386,6 +423,18 @@ export default {
             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,
+                },
+              },
+            },
             barMaxWidth: 50,
             itemStyle: {
               normal: {
@@ -467,6 +516,18 @@ export default {
             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, [

src/views/board/week/index.vue

@@ -147,7 +147,7 @@ export default {
           label: '合计'
         },
       ],
-      selectValue: '1',
+      selectValue: '2',
       title: [
         '产量统计',
         '三日订单执行情况',

src/views/model/model.vue

@@ -116,21 +116,53 @@ export default {
     // console.log(gui)
     let num = 0
     let modelArr = [
-      '1720315475507941376',
+      // '1720315475507941376',
-      '1720315479907766272',
+      // '1720315479907766272',
-      '1720315484513112064',
+      // '1720315484513112064',
-      '1720315500866703360',
+      // '1720315500866703360',
-      '1720315558030872576',
+      // '1720315558030872576',
-      '1720315596551360512',
+      // '1720315596551360512',
-      '1720315644550975488',
+      // '1720315644550975488',
-      '1720315648946606080',
+      // '1720315648946606080',
-      '1720315687114772480',
+      // '1720315687114772480',
-      '1720315691422322688',
+      // '1720315691422322688',
-      '1720315722275622912',
+      // '1720315722275622912',
-      '1720315729129115648',
+      // '1720315729129115648',
-      '1720315768454909952',
+      // '1720315768454909952',
-      '1720316275214913536',
+      // '1720316275214913536',
-      '1720316297822212096',
+      // '1720316297822212096',
+
+      // 1层
+      // '1720315722275622912',
+      // '1730411915198468096',
+      // '1730411998006611968',
+      // '1730411963659456512',
+      // '1730411959351906304',
+      // '1730412014314065920',
+      // '1730412039731548160',
+      // '1730412073898348544',
+
+      // '1730412084799344640',
+      // '1730412196258779136',
+      // '1730412089115283456',
+      // '1730412127476387840',
+      // '1730412170082127872',
+      '1730434866786471936',
+      '1730434916656746496',
+      // '1730412271693336576',
+      // '1730412211886755840',
+
+      // 1-1
+      // '1730417328874721280',
+      // '1730423530752970752',
+
+      // 2层
+      // '1730417324571365376',
+      // '1730417333178077184',
+      // '1730417383941738496',
+      // '1730417407748608000',
+      // '1730420842472542208',
+      // '1730420816044232704',
     ]
     modelArr.forEach(e => {
       let model = viewer.loadModel(e, {