修改接口

8 months ago · 0c43fd6879
parent abefe67ce6
commit 0c43fd6879
7 changed files with 206 additions and 76 deletions
--- a/src/assets/board/logo1.png
+++ b/src/assets/board/logo1.png
--- a/src/views/model/companyIntroduction.vue
+++ b/src/views/model/companyIntroduction.vue
@ -1,6 +1,7 @@
 <template>
  <div class="app-container">
    <div class="title">澳柯玛控股集团</div>
+    <div class="logo"></div>
    <div class="spanArea">
      <p>
        澳柯玛创立于<span class="redSpan" >1987</span>年，是青岛市市属国有高科技企业集团，是青岛市培育发展起来的“<span class="redSpan" >五朵金花</span>”之一，主营业务有智慧冷链、智慧家电、智慧家居制造与销售、智慧社区服务、国际贸易及跨境电商服务等，现有员工近万人。
@ -53,6 +54,17 @@ export default {
  left: 0;
 }

+.logo {
+  background-image: url("../../assets/board/logo1.png");
+  background-repeat: no-repeat;
+  background-size: 100% 100%;
+  width: 7vw;
+  height: 7vw;
+  position: absolute;
+  top: -3%;
+  left: 0.5%;
+}
+
 .title {
  position: absolute;
  top: 5%;
--- a/src/views/model/dataCentre.vue
+++ b/src/views/model/dataCentre.vue
@ -1,6 +1,6 @@
 <template>
  <div class="app-container">
-    <div class="headTitle">河南电器大数据中心</div>
+    <div class="headTitle">澳柯玛大数据中心</div>
    <div class="exit" @click="exitFun"></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)+'%'">
@ -16,10 +16,18 @@
      <Chart ref="chart1"></Chart>
    </div>
    <div class="chart2">
-      <Chart ref="chart2"></Chart>
+      <el-carousel style="width: 100%;height: 100%" indicator-position="none" height="100%">
+        <el-carousel-item v-for="item in 4" :key="item">
+          <img src="../../assets/model/dataCentre/imgSlide1.png" alt="" style="width: 100%;height: 100%">
+        </el-carousel-item>
+      </el-carousel>
    </div>
    <div class="chart3">
-      <Chart ref="chart3"></Chart>
+      <el-carousel style="width: 100%;height: 100%" indicator-position="none" height="100%" direction="vertical">
+        <el-carousel-item v-for="item in 4" :key="item">
+          <img src="../../assets/model/dataCentre/imgSlide2.jpg" alt="" style="width: 100%;height: 100%">
+        </el-carousel-item>
+      </el-carousel>
    </div>
    <div class="chart4">
      <Chart ref="chart4"></Chart>
@ -79,7 +87,7 @@ export default {
  },
  data() {
    return {
-      hj: 1000,
+      hj: 501273,
      title: [
        '三日清单',
        '产品发布',
@ -396,7 +404,7 @@ export default {
              color: '#72b3fe'
            },
          },
-          data: [200, 382, 102, 267, 186, 315],
+          data: [315, 309, 311, 311, 311, 313],
        },
        {
          name: "合格率",
@ -430,7 +438,7 @@ export default {
          tooltip: {
            show: false,
          },
-          data: [96.74, 96.68, 98.76, 99.75, 98.58, 98.57, 98.43],
+          data: [99.74, 99.68, 99.76, 99.75, 99.58, 99.57, 99.43],
        },
      ],
    })
@ -472,13 +480,13 @@ export default {
          axisTick: {
            show: false,
          },
-          data: ["1日", "2日", "3日", "4日", "5日", "6日", "7日"],
+          data: ["1-10", "1-11", "1-12", "1-13", "1-14", "1-15", "1-16"],
        },
      ],
      yAxis: [
        {
          type: "value",
-          min: 0,
+          // min: 0,
          // max: 140,
          splitNumber: 7,
          splitLine: {
@ -503,7 +511,7 @@ export default {
        },
        {
          type: "value",
-          min: 90,
+          // min: 90,
          max: 100,
          splitLine: {
            show: true,
@ -548,7 +556,7 @@ export default {
              color: '#9fe080'
            },
          },
-          data: [200, 382, 102, 267, 186, 315, 316],
+          data: [200, 350, 400, 350, 450, 500, 343],
        },
        {
          name: "订单履约率",
@ -582,7 +590,7 @@ export default {
          tooltip: {
            show: false,
          },
-          data: [96.74, 96.68, 98.76, 99.75, 98.58, 98.57, 98.43],
+          data: [100, 100, 100, 100, 100, 100, 46],
        },
      ],
    })
@ -979,7 +987,7 @@ export default {
          label: {
            normal: {
              show: true,
-              formatter: "{b}\n{c}",
+              formatter: "{b}\n{d}%",
              textStyle: {
                fontSize: 12,
                color: '#fff'
@ -1000,32 +1008,48 @@ export default {
              show: false,
            },
          },
-          data: [
+          data:[
            {
-              value: 10,
-              name: "问题1",
+              name: "干燥过滤器",
+              value: 1
            },
            {
-              value: 5,
-              name: "问题2",
+              name: "压机室外观",
+              value: 1
            },
            {
-              value: 15,
-              name: "问题3",
+              name: "箱体外观",
+              value: 3
            },
            {
-              value: 25,
-              name: "问题4",
+              name: "集液管",
+              value: 2
            },
            {
-              value: 20,
-              name: "问题5",
+              name: "A内胆外观",
+              value: 1
            },
            {
-              value: 35,
-              name: "问题6",
+              name: "毛细管",
+              value: 1
            },
-          ],
+            {
+              name: "封口",
+              value: 1
+            },
+            {
+              name: "集液管漏",
+              value: 1
+            },
+            {
+              name: "蒸发器缠绕圈数错",
+              value: 1
+            },
+            {
+              name: "少全铜管标",
+              value: 1
+            }
+          ]
        },
      ],
    })
@ -1109,8 +1133,8 @@ export default {
              ),
            },
          },
-          data: [8888, 6225, 9532, 7842, 7891, 7823, 6784, 8642, 8641, 7893, 5611, 6784,],
-        },
+          data: [40631, 71777, 23375, 29402, 32359, 35070, 40360, 52643, 50001, 44100, 54000, 27555,],
+        }
      ],
    })
    this.$refs.chart10_1.setData({
@ -1214,7 +1238,7 @@ export default {
          center: ["50%", "50%"],
          data: [
            {
-              value: 4.5,
+              value: 5.5,
              label: {
                normal: {
                  rich: {
@ -1313,7 +1337,7 @@ export default {
                    return (
                      "{a|" +
                      params.value +
-                      "}" +
+                      "%}" +
                      "\n{b|产线OEE}"
                    );
                  },
@ -1378,6 +1402,7 @@ export default {
          axisTick: {show: false},
          axisLabel: {
            rotate: -20,
+            interval:0,
            margin: 20,
            textStyle: {
              fontSize: 0.75 * vw,
@ -1422,13 +1447,19 @@ export default {
          label: {
            show: true,
            position: "top",
-            formatter: `{c}${''}`,
+            formatter: (e)=>{
+              if(e.data === 0){
+                return ''
+              }else{
+                return e.data
+              }
+            },
            textStyle: {
              color: "rgba(255,255,255,0.5)",
              fontSize: 0.6 * vw
            },
          },
-          data: [64, 26, 24, 73, 26, 83, 64, 73, 56, 72, 27, 73],
+          data: [8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
        },
        {
          name: '闭环数',
@ -1442,7 +1473,13 @@ export default {
          label: {
            show: true,
            position: "top",
-            formatter: `{c}${''}`,
+            formatter: (e)=>{
+              if(e.data === 0){
+                return ''
+              }else{
+                return e.data
+              }
+            },
            textStyle: {
              color: "rgba(255,255,255,0.5)",
              fontSize: 0.6 * vw
@ -1454,7 +1491,7 @@ export default {
              color: true ? '#9ce375' : "#4FD3B9",
            },
          },
-          data: [63, 24, 22, 73, 26, 80, 63, 71, 55, 72, 26, 70],
+          data: [8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
        },
      ]
    })
@ -1606,13 +1643,13 @@ export default {
      clearInterval(time1)
      if (!data) {
        data = {
-          yNameOne: ["订单00001", "订单00001", "订单00001", "订单00001", "订单00001", "订单00001", "订单00001", "订单00001", "订单00001", "订单00001", "订单00001"],
-          yData: [41, 99, 41, 99, 32, 41, 24, 4, 16, 64, 18],
+
+          yNameOne: ["11244726", "11244725", "11244695", "11244639", "11244635", "11244634", "11244633", "11244632", "11244311", "11244310"],
+          yData: [100, 100, 100, 100, 100, 100, 100, 100, 100, 100],
          xDataName: "达成率",
-          status: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]
+          status: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1]
        }
      }
-      let myColor = ["green", "red", "yellow", "blue", "#8B78F6"];
      let bgBar = []
      data.yData.forEach(() => {
        bgBar.push(100)
@ -1621,7 +1658,7 @@ export default {
        grid: {
          // left: "-10%",
          left: "0%",
-          right: "8%",
+          right: "15%",
          bottom: "0%",
          top: "0%",
          containLabel: true,
@ -1665,7 +1702,7 @@ export default {
              normal: {
                barBorderRadius: 30,
                color: function (params) {
-                  return myColor[data.status[params.dataIndex]];
+                  return 'green'
                },
              },
            },
@ -1830,9 +1867,6 @@ export default {
 }

 .chart2 {
-  background-image: url("../../assets/model/dataCentre/imgSlide1.png");
-  background-repeat: no-repeat;
-  background-size: 100% 100%;
  position: absolute;
  top: 14.5%;
  left: 27%;
@ -1841,9 +1875,6 @@ export default {
 }

 .chart3 {
-  background-image: url("../../assets/model/dataCentre/imgSlide2.jpg");
-  background-repeat: no-repeat;
-  background-size: 100% 100%;
  position: absolute;
  top: 14.5%;
  left: 50.7%;
--- a/src/views/model/equipment.vue
+++ b/src/views/model/equipment.vue
@ -1,6 +1,6 @@
 <template>
  <div class="app-container">
-    <div class="headTitle">仓储物流</div>
+    <div class="headTitle">仓储物流中心</div>
    <div class="exit" @click="exitFun"></div>

    <div class="time" id="time">{{ time }}</div>
@ -229,28 +229,28 @@ export default {
          },
          data: [
            {
-              value: 10,
-              name: "A-01",
+              value: 511,
+              name: "BCD-162CST",
            },
            {
-              value: 5,
-              name: "A-02",
+              value: 632,
+              name: "BCD-212CHG",
            },
            {
-              value: 15,
-              name: "A-03",
+              value: 724,
+              name: "BCD-211CGN",
            },
            {
-              value: 25,
-              name: "A-04",
+              value: 671,
+              name: "BC/BD-310NF",
            },
            {
-              value: 20,
-              name: "A-05",
+              value: 572,
+              name: "BC/BD-232WD",
            },
            {
-              value: 35,
-              name: "A-06",
+              value: 673,
+              name: "BC/BD-145NF",
            },
          ],
        },
@ -583,7 +583,7 @@ export default {
            interval: 0,
            fontSize: 0.5 * vw,
          },
-          data: [1, 2, 3, 4, 5, 6, 7, 8, 9],
+          data: ['BCD-162CST', 'BCD-212CHG', 'BCD-211CGN', 'BC/BD-310NF', 'BC/BD-232WD', 'BC/BD-145NF'],
        },
      ],
      yAxis: [
@ -621,7 +621,7 @@ export default {
            },
          },
          data: [
-            709, 1917, 2455, 2610, 1719, 1433, 1544, 3285, 5208
+            709, 1917, 2455, 2610, 1719, 1433
          ],
        },
      ],
@ -675,7 +675,7 @@ export default {
            interval: 0,
            fontSize: 0.5 * vw,
          },
-          data: [1, 2, 3, 4, 5, 6, 7, 8, 9],
+          data: ['BCD-162CST', 'BCD-212CHG', 'BCD-211CGN', 'BC/BD-310NF', 'BC/BD-232WD', 'BC/BD-145NF'],
        },
      ],
      yAxis: [
@ -736,7 +736,7 @@ export default {
            },
          },
          data: [
-            709, 1917, 2455, 2610, 1719, 1433, 1544, 3285, 5208
+            709, 1917, 2455, 2610, 1719, 1433
          ],
        },
        {
@ -765,7 +765,7 @@ export default {
          lineStyle: {
            color: "#ffffff",
          },
-          data: [94.7, 93.2, 94.7, 93.4, 94.4, 99.4, 92.4, 96.2, 97.2],
+          data: [94.7, 93.2, 94.7, 93.4, 94.4, 99.4],
        },
      ],
    })
@ -778,10 +778,10 @@ export default {
    chart1Option(data, id) {
      if (!data) {
        data = {
-          yNameOne: ["订单00001", "订单00001", "订单00001", "订单00001", "订单00001", "订单00001", "订单00001", "订单00001", "订单00001", "订单00001", "订单00001"],
-          yData: [41, 99, 41, 99, 32, 41, 24, 4, 16, 64, 18],
+          yNameOne: ["11244726", "11244725", "11244695", "11244639", "11244635", "11244634", "11244633", "11244632", "11244311", "11244310"],
+          yData: [100, 100, 100, 100, 100, 100, 100, 100, 100, 100],
          xDataName: "达成率",
-          status: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]
+          status: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1]
        }
      }
      let myColor = ["green", "red", "yellow", "blue", "#8B78F6"];
@ -793,7 +793,7 @@ export default {
        grid: {
          // left: "-10%",
          left: "0%",
-          right: "8%",
+          right: "15%",
          bottom: "0%",
          top: "0%",
          containLabel: true,
@ -837,7 +837,7 @@ export default {
              normal: {
                barBorderRadius: 30,
                color: function (params) {
-                  return myColor[data.status[params.dataIndex]];
+                  return 'green'
                },
              },
            },
--- a/src/views/model/factoryIntroduction.vue
+++ b/src/views/model/factoryIntroduction.vue
@ -1,6 +1,7 @@
 <template>
  <div class="app-container">
    <div class="title">河南澳柯玛智能产业园</div>
+    <div class="logo"></div>
    <!--    <div class="title1">首个商用智慧大规模个性化定制的智能互联工厂</div>-->
    <div class="box1">
      <img src="../../assets/model/factoryIntroduction/img1.png" alt="" style="height: calc(38vh - 16px)">
@ -71,6 +72,16 @@ export default {
  font-size: 2.7vw;
  font-weight: 800;
 }
+.logo {
+  background-image: url("../../assets/board/logo1.png");
+  background-repeat: no-repeat;
+  background-size: 100% 100%;
+  width: 7vw;
+  height: 7vw;
+  position: absolute;
+  top: -3%;
+  left: 0.5%;
+}

 .title1 {
  position: absolute;
--- a/src/views/model/live.vue
+++ b/src/views/model/live.vue
@ -1,9 +1,13 @@
 <template>
  <div class="app-container">
-    <div class="headTitle">现场直播</div>
+    <div class="headTitle">智造现场直播</div>
    <div class="time" id="time">{{ time }}</div>
    <div class="date" id="date">{{ date }}</div>
    <div class="logo"></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 }}
+    </div>
    <div class="videoItem" style="top: 14.8%;left: 3.5%;">
      <div>
        <div class="time1">{{ time1 }}</div>
@ -77,7 +81,41 @@ export default {
    return {
      time: '',
      time1: '',
-      date: ''
+      date: '',
+      title: [
+        '内胆自动成型',
+        '数控缠绕蒸发器',
+        '箱壳自动成型',
+        '智能物流调度',
+        '双进双出直线发泡',
+        ' ',
+      ],
+      titlePosition: [
+        {
+          top: 11.6,
+          left: 5.5
+        },
+        {
+          top: 11.6,
+          left: 37
+        },
+        {
+          top: 11.6,
+          left: 68.5
+        },
+        {
+          top: 55.8,
+          left: 5.5
+        },
+        {
+          top: 55.8,
+          left: 37
+        },
+        {
+          top: 55.8,
+          left: 68.5
+        }
+      ],
    }
  },
  created() {
@ -89,9 +127,12 @@ export default {
      let HH = date.getHours().toString().length === 1 ? ('0' + date.getHours()) : date.getHours()
      let mm = date.getMinutes().toString().length === 1 ? ('0' + date.getMinutes()) : date.getMinutes()
      let ss = date.getSeconds().toString().length === 1 ? ('0' + date.getSeconds()) : date.getSeconds()
+      let week = date.getDay()
+      let weekArr = ['一','二','三','四','五','六','日']
      this.date = `${YYYY} - ${MM} - ${dd}`
      this.time = `${HH} : ${mm} : ${ss}`
-      this.time1 = `${YYYY} - ${MM} - ${dd} ${HH} : ${mm} : ${ss}`
+      this.time1 = `${YYYY} 年 ${MM} 月 ${dd}日 星期${weekArr[week -1 ]} ${HH} : ${mm} : ${ss}`
+      this.time1 = `${YYYY} 年 ${MM} 月 ${dd}日 星期${weekArr[week -1 ]} ${HH} : ${mm} : ${ss}`
    }
    getDate()
    getDateIntervalFun = setInterval(getDate, 1000)
@ -185,12 +226,19 @@ export default {

    .time1 {
      position: absolute;
-      top: 0;
-      right: 0;
+      top: 5%;
+      left: 3%;
      font-size: 0.6vw;
      color: #fff;
      transform: translateY(0);
    }
  }
 }
+.title {
+  position: absolute;
+  transform: translateY(-50%);
+  color: #dddddd;
+  font-size: 1vw;
+  letter-spacing: 2px;
+}
 </style>
--- a/src/views/model/model.vue
+++ b/src/views/model/model.vue
@ -4,10 +4,22 @@

      <div id="container" class="container"></div>
      <div class="titleBg"></div>
-      <div class="headTitle">河南澳柯玛智能制造中心</div>
+      <div class="headTitle">澳柯玛智能制造中心</div>\
      <div class="time" id="time">{{ time }}</div>
      <div class="date" id="date">{{ date }}</div>
      <div class="logo"></div>
+      <div class="cgtd1">
+        <span>参</span>
+        <span>观</span>
+        <span>通</span>
+        <span>道</span>
+      </div>
+      <div class="cgtd2">
+        <span>参</span>
+        <span>观</span>
+        <span>通</span>
+        <span>道</span>
+      </div>
      <div class="currentPosition"><span>当前位置</span></div>
      <div class="tool">
        <el-row>
@ -858,7 +870,7 @@ export default {
        toLoad(val)
      })
    }
-    setModel(0, 10)
+    // setModel(0, 10)

    // viewer.operator.enabled = true

@ -1128,4 +1140,20 @@ export default {
  width: 100vw;
  height: 3.21vw;
 }
+.cgtd1{
+  position: absolute;
+  top: 36%;
+  left: 45%;
+  transform: translate(-50%,-50%);
+  font-size: 0.8vw;
+  color: #fff;
+}
+.cgtd2{
+  position: absolute;
+  top: 47.5%;
+  left: 45%;
+  transform: translate(-50%,-50%);
+  font-size: 0.8vw;
+  color: #fff;
+}
 </style>