From e5cda0c4c1607bd390a88caf0ecc1e71e89c7bc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LI-CCONG=5C=E6=9D=8E=E8=81=AA=E8=81=AA?= <1441652193@qq.com>
Date: Thu, 16 Nov 2023 08:33:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E4=BC=AA=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../echart/bottom/bottomLeftChart/index.vue   | 141 ++++-
 .../echart/bottom/bottomRightChart/index.vue  | 196 ++++--
 .../echart/center/centerChartRate/index.vue   |   2 +-
 yuhong-ui/src/utils/requestConfig.js          |   3 +-
 yuhong-ui/src/views/bottomRight.vue           | 215 ++++---
 yuhong-ui/src/views/center.vue                |  40 +-
 yuhong-ui/src/views/centerLeft1.vue           | 575 ++++++++++++------
 yuhong-ui/src/views/centerRight1.vue          |   4 +-
 yuhong-ui/src/views/index.vue                 |  15 +-
 9 files changed, 793 insertions(+), 398 deletions(-)

diff --git a/yuhong-ui/src/components/echart/bottom/bottomLeftChart/index.vue b/yuhong-ui/src/components/echart/bottom/bottomLeftChart/index.vue
index 82d542c..e51010a 100644
--- a/yuhong-ui/src/components/echart/bottom/bottomLeftChart/index.vue
+++ b/yuhong-ui/src/components/echart/bottom/bottomLeftChart/index.vue
@@ -91,25 +91,127 @@ export default {
     // 根据自己的业务情况修改
     setData() {
       const _this = this
-      request({
-        // 各产品生产数量api路径
-        url: '/api/BigScreen/getMonthData',
-        method: 'get'
-      }).then(r => {
-        // debugger
-        // console.log(r.data.ProductQty)
-        // if (r) {
-        //   _this.cdata = r.data.ProductQty
+      // request({
+      //   // 各产品生产数量api路径
+      //   url: '/api/BigScreen/getMonthData',
+      //   method: 'get'
+      // }).then(r => {
+      //   // debugger
+      //   // console.log(r.data.ProductQty)
+      //   // if (r) {
+      //   //   _this.cdata = r.data.ProductQty
 
-        // }
-        if (r) {
-          _this.cdata = r.data.ProductQty
-          this.cdata.series.forEach(i => {
-            i.type = 'bar'
-            i.emphasis = {
-              focus: 'series'
-            }
-          })
+      //   // }
+      //   if (r) {
+      //     _this.cdata = r.data.ProductQty
+      //     this.cdata.series.forEach(i => {
+      //       i.type = 'bar'
+      //       i.emphasis = {
+      //         focus: 'series'
+      //       }
+      //     })
+      //   }
+      // })
+
+      _this.cdata = {
+        "xAxis": {
+          "type": "category",
+          "data": [
+            "11-09",
+            "11-10",
+            "11-11",
+            "11-12",
+            "11-13",
+            "11-14",
+            "11-15"
+          ]
+        },
+        "series": [
+          {
+            "name": "卫生巾",
+            "type": "bar",
+            "data": [
+              617123,
+              620893,
+              610171,
+              609700,
+              628225,
+              620343,
+              290895
+            ]
+          },
+          {
+            "name": "纸尿裤",
+            "type": "bar",
+            "data": [
+              240724,
+              244698,
+              210171,
+              209700,
+              228818,
+              256812,
+              213227,
+            ]
+          },
+          {
+            "name": "经期裤",
+            "type": "bar",
+            "data": [
+              442344,
+              445735,
+              421467,
+              417019,
+              431023,
+              405409,
+              215090,
+            ]
+          },
+          {
+            "name": "拉拉裤",
+            "type": "bar",
+            "data": [
+              263005,
+              241245,
+              239953,
+              281388,
+              226385,
+              216700,
+              102300,
+            ]
+          },
+          {
+            "name": "平面口罩",
+            "type": "bar",
+            "data": [
+              0,
+              0,
+              0,
+              0,
+              0,
+              0,
+              0
+            ]
+          },
+          {
+            "name": "KN95-1",
+            "type": "bar",
+            "data": [
+              0,
+              0,
+              0,
+              0,
+              0,
+              0,
+              0
+            ]
+          }
+        ]
+      }
+
+      this.cdata.series.forEach(i => {
+        i.type = 'bar'
+        i.emphasis = {
+          focus: 'series'
         }
       })
     }
@@ -117,5 +219,4 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>
diff --git a/yuhong-ui/src/components/echart/bottom/bottomRightChart/index.vue b/yuhong-ui/src/components/echart/bottom/bottomRightChart/index.vue
index 20ec93c..c42ed71 100644
--- a/yuhong-ui/src/components/echart/bottom/bottomRightChart/index.vue
+++ b/yuhong-ui/src/components/echart/bottom/bottomRightChart/index.vue
@@ -34,77 +34,142 @@ export default {
   },
   mounted() {
     this.setData()
-    this.startInterval()
+    // this.startInterval()
   },
   methods: {
     // 开启定时器
-    startInterval() {
-      const _this = this
-      // 应通过接口获取配置时间，暂时写死10s
-      const time = 80 * 10 * 1000
-      if (this.intervalId !== null) {
-        clearInterval(this.intervalId)
-      }
-      this.intervalId = setInterval(() => {
-        _this.setData()
-      }, time)
-    },
+    // startInterval() {
+    //   const _this = this
+    //   // 应通过接口获取配置时间，暂时写死10s
+    //   const time = 80 * 10 * 1000
+    //   if (this.intervalId !== null) {
+    //     clearInterval(this.intervalId)
+    //   }
+    //   this.intervalId = setInterval(() => {
+    //     _this.setData()
+    //   }, time)
+    // },
     // 根据自己的业务情况修改
     setData() {
       const _this = this
-      request({
-        // 各产品生产数量api路径
-        url: '/api/BigScreen/getMonthData1',
-        method: 'get'
-      }).then((r) => {
-        // debugger
-        if (r) {
-          _this.cdata = r.data.EqmtRate
-          // console.log('zzzzzzzzzzzzz')
-          // console.log(this.cdata)
-          // this.cdata.xAxis.data = [
-          //   ...this.cdata.xAxis.data,
-          //   "5#",
-          //   "7#",
-          //   "8#",
-          //   "20#",
-          //   "21#",
-          // ];
-          this.cdata.series.forEach((i) => {
-            // i.data = [...i.data, 0, 0, 0, 0, 0];
-            i.data.map((item, index, self) => {
-              i.data[index] = Math.trunc(item)
-            })
-            i.type = 'bar'
-            i.markLine = {
-              focus: 'series'
-            }
-            i.label = {
-              show: true, // 开启显示
-              position: 'top', // 在上方显示
-              textStyle: {
-                // 数值样式
-                color: 'white',
-                fontSize: 14
-              }
-            }
-            var colorList = []
-            for (const item of i.data) {
-              if (item > 85) {
-                colorList.push('#19BB65')
-              } else {
-                colorList.push('red')
-              }
-            }
-            i.itemStyle = {
-              color: function(params) {
-                if (params.dataIndex >= colorList.length) {
-                  params.dataIndex = params.dataIndex - colorList.length
-                }
-                return colorList[params.dataIndex]
-              }
+      // request({
+      //   // 各产品生产数量api路径
+      //   url: '/api/BigScreen/getMonthData1',
+      //   method: 'get'
+      // }).then((r) => {
+      //   // debugger
+      //   if (r) {
+      //     _this.cdata = r.data.EqmtRate
+      //     this.cdata.series.forEach((i) => {
+      //       // i.data = [...i.data, 0, 0, 0, 0, 0];
+      //       i.data.map((item, index, self) => {
+      //         i.data[index] = Math.trunc(item)
+      //       })
+      //       i.type = 'bar'
+      //       i.markLine = {
+      //         focus: 'series'
+      //       }
+      //       i.label = {
+      //         show: true, // 开启显示
+      //         position: 'top', // 在上方显示
+      //         textStyle: {
+      //           // 数值样式
+      //           color: 'white',
+      //           fontSize: 14
+      //         }
+      //       }
+      //       var colorList = []
+      //       for (const item of i.data) {
+      //         if (item > 85) {
+      //           colorList.push('#19BB65')
+      //         } else {
+      //           colorList.push('red')
+      //         }
+      //       }
+      //       i.itemStyle = {
+      //         color: function(params) {
+      //           if (params.dataIndex >= colorList.length) {
+      //             params.dataIndex = params.dataIndex - colorList.length
+      //           }
+      //           return colorList[params.dataIndex]
+      //         }
+      //       }
+      //     })
+      //   }
+      // })
+      // 
+      _this.cdata = {
+        xAxis: {
+          "type": "category",
+          "data": [
+            "7#",
+            "13#",
+            "15#",
+            "16#",
+            "17#",
+            "18#",
+            "19#",
+            "21#",
+            "平面口罩",
+            "KN95-1",
+            "KN95-2"
+          ]
+        },
+        yAxis: {
+          type: 'value'
+        },
+        series: [
+          {
+            "smooth": true,
+            "type": "line",
+            "data": [
+              97.21,
+              0,
+              0,
+              96.75,
+              95.91,
+              98.22,
+              97.67,
+              98.17,
+              0,
+              0,
+              0
+            ]
+          }
+        ]
+      }
+      this.cdata.series.forEach((i) => {
+        i.data.map((item, index, self) => {
+          i.data[index] = Math.trunc(item)
+        })
+        i.type = 'bar'
+        i.markLine = {
+          focus: 'series'
+        }
+        i.label = {
+          show: true, // 开启显示
+          position: 'top', // 在上方显示
+          textStyle: {
+            // 数值样式
+            color: 'white',
+            fontSize: 14
+          }
+        }
+        var colorList = []
+        for (const item of i.data) {
+          if (item > 85) {
+            colorList.push('#19BB65')
+          } else {
+            colorList.push('red')
+          }
+        }
+        i.itemStyle = {
+          color: function (params) {
+            if (params.dataIndex >= colorList.length) {
+              params.dataIndex = params.dataIndex - colorList.length
             }
-          })
+            return colorList[params.dataIndex]
+          }
         }
       })
     }
@@ -112,5 +177,4 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>
diff --git a/yuhong-ui/src/components/echart/center/centerChartRate/index.vue b/yuhong-ui/src/components/echart/center/centerChartRate/index.vue
index 4db74a7..fd8f9eb 100644
--- a/yuhong-ui/src/components/echart/center/centerChartRate/index.vue
+++ b/yuhong-ui/src/components/echart/center/centerChartRate/index.vue
@@ -52,7 +52,7 @@ export default {
     // tips 是会变更的数据，所以进行监听
     tips: {
       handler(newData) {
-        debugger
+        // debugger
         this.options = {
           series: [
             {
diff --git a/yuhong-ui/src/utils/requestConfig.js b/yuhong-ui/src/utils/requestConfig.js
index bfa9748..e36a815 100644
--- a/yuhong-ui/src/utils/requestConfig.js
+++ b/yuhong-ui/src/utils/requestConfig.js
@@ -1,7 +1,8 @@
 // const devBaseURL = 'http://localhost:5281'
 // const devBaseURL = 'http://5a35a48943.wicp.vip:40709'
 // const proBaseURL = 'http://5a35a48943.wicp.vip:40709'
-const devBaseURL = 'http://127.0.0.1:9002'
+// const devBaseURL = 'http://127.0.0.1:9002'
+const devBaseURL = 'http://127.0.0.1:5000'
 const proBaseURL = 'http://118.195.155.9:9002'
 export const BASE_URL = process.env.NODE_ENV === 'development' ? devBaseURL : proBaseURL
 
diff --git a/yuhong-ui/src/views/bottomRight.vue b/yuhong-ui/src/views/bottomRight.vue
index a3ce048..eec44d5 100644
--- a/yuhong-ui/src/views/bottomRight.vue
+++ b/yuhong-ui/src/views/bottomRight.vue
@@ -1,20 +1,13 @@
 <template>
   <div id="bottomRight">
-    <div class="up">
-      <div
-        v-for="item in titleItem"
-        :key="item.title"
-        class="bg-color-black item"
-      >
+    <!-- <div class="up">
+      <div v-for="item in titleItem" :key="item.title" class="bg-color-black item">
         <p class="ml-3 colorBlue fw-b fs-xl">{{ item.title }}</p>
         <div>
-          <dv-digital-flop
-            class="dv-dig-flop ml-1 mt-2 pl-3"
-            :config="item.number"
-          />
+          <dv-digital-flop class="dv-dig-flop ml-1 mt-2 pl-3" :config="item.number" />
         </div>
       </div>
-    </div>
+    </div> -->
     <div class="down">
       <div class="percent">
         <div class="item bg-color-black">
@@ -97,35 +90,65 @@ export default {
   },
   mounted() {
     this.setData()
-
     this.startInterval()
   },
   methods: {
     // 开启定时器
     startInterval() {
       const _this = this
-      // 应通过接口获取配置时间，暂时写死10s
-      const time = 10 * 11 * 1000
+      // 应通过接口获取配置时间，暂时写死10min
+      const time = 60 * 10  * 1000
+      // const time = 1000
       if (this.intervalId !== null) {
         clearInterval(this.intervalId)
       }
       this.intervalId = setInterval(() => {
+        console.log(123456);
         _this.setData()
       }, time)
     },
     // 根据自己的业务情况修改
     setData() {
       const _this = this
-      request({
-        // 合格率api路径
-        url: '/api/BigScreen/getMonthData2',
-        method: 'get'
-      }).then(r => {
-        // debugger
-        console.log(r.data)
-        if (r) {
+      // request({
+      //   // 合格率api路径
+      //   url: '/api/BigScreen/getMonthData2',
+      //   method: 'get'
+      // }).then(r => {
+      //   // debugger
+      //   console.log(r.data)
+        // if (r) {
           // debugger
-          const rData = r.data.ProductOKRate
+          // const rData = r.data.ProductOKRate
+          let arr = [98.39, 98.40, 98.41, 98.43, 98.44, 98.45];
+          let ri = Math.floor(Math.random() * arr.length);
+          this.$emit("updateRI", ri);
+          const rData = [
+            {
+              "ProductName": "卫生巾",
+              "OKRate": 97.73
+            },
+            {
+              "ProductName": "纸尿裤",
+              "OKRate": 97.71
+            },
+            {
+              "ProductName": "经期裤",
+              "OKRate": arr[ri],
+            },
+            {
+              "ProductName": "拉拉裤",
+              "OKRate": 99.38
+            },
+            {
+              "ProductName": "平面口罩",
+              "OKRate": 0
+            },
+            {
+              "ProductName": "KN95-1",
+              "OKRate": 0
+            }
+          ];
           _this.productOKRateList = []
           for (const item of rData) {
             var n = {
@@ -135,101 +158,113 @@ export default {
               waveNum: 2,
               waveHeight: 10,
               // 判断合格率低于97显示红色
-              colors: item.OKRate > 97 ? ['#00FFFF', '#00B2EE'] : ['#ff6600', '#cc0000']
+              colors: item.OKRate > 97 ? ['#ff6600', '#cc0000'] : ['#00FFFF', '#00B2EE']
             }
             _this.productOKRateList.push({
               ProductName: item.ProductName,
               config: n
             })
           }
-        }
-      })
+        
+        // }
+      // })
     }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-  #bottomRight {
+#bottomRight {
+  display: flex;
+  flex-direction: column;
+
+  .up {
+    width: 100%;
     display: flex;
-    flex-direction: column;
+    flex-wrap: wrap;
+    justify-content: space-around;
 
-    .up {
-      width: 100%;
-      display: flex;
-      flex-wrap: wrap;
-      justify-content: space-around;
-      .item {
-        border-radius: 6px;
-        padding-top: 8px;
-        margin-top: 8px;
-        width: 32%;
-        height: 70px;
-        .dv-dig-flop {
-          width: 150px;
-          height: 30px;
-        }
+    .item {
+      border-radius: 6px;
+      padding-top: 8px;
+      margin-top: 8px;
+      width: 32%;
+      height: 70px;
+
+      .dv-dig-flop {
+        width: 150px;
+        height: 30px;
       }
     }
-    .down {
-      margin: 10px;
-      padding: 10px;
-      width: 100%;
-      display: flex;
-      height: 245px;
-      justify-content: space-between;
-      .bg-color-black {
-        border-radius: 5px;
-      }
-      .ranking {
-        width: 59%;
-        padding-left:10px;
+  }
 
-         .ranking_span{
-          margin-top: 15px;
-            font-size: 16px;
-            display: flex;
-            justify-content: center;
+  .down {
+    margin: 10px;
+    padding: 10px;
+    width: 100%;
+    display: flex;
+    height: 245px;
+    justify-content: space-between;
 
-          }
-         .item {
-          margin-top: 10px;
-          display: flex;
-          flex-wrap: wrap;
+    .bg-color-black {
+      border-radius: 5px;
+    }
 
-          }
-          .item_span{
-            margin:25px;
+    .ranking {
+      width: 59%;
+      padding-left: 10px;
+
+      .ranking_span {
+        margin-top: 15px;
+        font-size: 16px;
+        display: flex;
+        justify-content: center;
 
-          }
-      }
-      .ranking1{
-        margin-left:20px;
       }
 
-      .percent {
-        width: 40%;
+      .item {
+        margin-top: 10px;
         display: flex;
         flex-wrap: wrap;
-        .item {
-          width: 100%;
-          height: 225px;
-
-          span {
-            margin-top: 15px;
-            font-size: 16px;
-            display: flex;
-            justify-content: center;
-          }
+
+      }
+
+      .item_span {
+        margin: 25px;
+
+      }
+    }
+
+    .ranking1 {
+      margin-left: 20px;
+    }
+
+    .percent {
+      width: 40%;
+      display: flex;
+      flex-wrap: wrap;
+
+      .item {
+        width: 100%;
+        height: 225px;
+
+        span {
+          margin-top: 15px;
+          font-size: 16px;
+          display: flex;
+          justify-content: center;
         }
-        .water {
-          width: 100%;
-          .dv-wa-le-po {
-            height: 120px;
-          }
+      }
+
+      .water {
+        width: 100%;
+
+        .dv-wa-le-po {
+          height: 120px;
         }
       }
     }
   }
+}
 </style>
 
diff --git a/yuhong-ui/src/views/center.vue b/yuhong-ui/src/views/center.vue
index c31f9ef..7433fe3 100644
--- a/yuhong-ui/src/views/center.vue
+++ b/yuhong-ui/src/views/center.vue
@@ -58,14 +58,14 @@ export default {
   data() {
     return {
       config: {
-        data: [0],
+        data: [98.5],
         shape: 'round',
         waveHeight: 10,
         waveNum: 2
         // colors: ['#003366', 'FFE4C4']
       },
       config1: {
-        data: [0],
+        data: [95],
         shape: 'round',
         waveHeight: 10,
         waveNum: 2
@@ -111,23 +111,22 @@ export default {
     }
   },
   mounted() {
-    this.setData()
-
-    this.startInterval()
+    // this.setData()
+    // this.startInterval()
   },
   methods: {
     // 开启定时器
-    startInterval() {
-      const _this = this
-      // 应通过接口获取配置时间，暂时写死10s
-      const time = 50 * 10 * 1000
-      if (this.intervalId !== null) {
-        clearInterval(this.intervalId)
-      }
-      this.intervalId = setInterval(() => {
-        _this.setData()
-      }, time)
-    },
+    // startInterval() {
+    //   const _this = this
+    //   // 应通过接口获取配置时间，暂时写死10s
+    //   const time = 50 * 10 * 1000
+    //   if (this.intervalId !== null) {
+    //     clearInterval(this.intervalId)
+    //   }
+    //   this.intervalId = setInterval(() => {
+    //     _this.setData()
+    //   }, time)
+    // },
     // 根据自己的业务情况修改
     setData() {
       const _this = this
@@ -155,15 +154,6 @@ export default {
             // colors: ['#003366', 'FFE4C4']
           }
         }
-        // if (r) {
-        //   _this.cdata = r.data.EqmtRate
-        //   this.cdata.series.forEach(i => {
-        //     i.type = 'line'
-        //     i.markLine = {
-        //       focus: 'series'
-        //     }
-        //   })
-        // }
       })
     }
   }
diff --git a/yuhong-ui/src/views/centerLeft1.vue b/yuhong-ui/src/views/centerLeft1.vue
index f01413c..9f3e00b 100644
--- a/yuhong-ui/src/views/centerLeft1.vue
+++ b/yuhong-ui/src/views/centerLeft1.vue
@@ -7,10 +7,7 @@
         </div> -->
         <div class="text2">
           <p style="width:100px;height:37px;">{{ item.eqmt_name }}</p>
-          <dv-water-level-pond
-            :config="item.config"
-            style="width: 100px; height: 100px"
-          />
+          <dv-water-level-pond :config="item.config" style="width: 100px; height: 100px" />
           <span>产线合格率</span>
         </div>
         <div class="text3">
@@ -40,7 +37,13 @@ import { request } from '@/utils/request.js'
 
 export default {
   components: {},
-
+  props: {
+    rindex: {
+      type: Number,
+      request: false,
+      default: 0
+    }
+  },
   data() {
     return {
       lessL: 0,
@@ -106,14 +109,25 @@ export default {
     }
   },
   mounted() {
+    console.log(this.rindex);
     this.setData()
     this.startInterval()
   },
+  watch: {
+    rindex: {
+      handler(newVal, oldVal) {
+        // console.log(newVal);
+        this.rindex = newVal;
+        this.setData();
+      },
+      immediate: true
+    }
+  },
   methods: {
     // 开启定时器
     startInterval() {
       const _this = this
-      // 应通过接口获取配置时间，暂时写死10s
+      // 应通过接口获取配置时间，暂时写死10min
       const time = 10 * 60 * 1000
       if (this.intervalId !== null) {
         clearInterval(this.intervalId)
@@ -125,188 +139,362 @@ export default {
     // // 根据自己的业务情况修改
     setData() {
       const _this = this
-      request({
-        // 各产线
-        url: '/api/BigScreen/getEqmtDetailList',
-        method: 'get'
-      }).then((r) => {
-        debugger
-        if (r) {
-          const rData = r.data
-
-          const objS = [
-            {
-              collect_id: null,
-              create_time: null,
-              eqmt_alarm_flag: 0,
-              eqmt_except_flag: 0,
-              eqmt_id: 0,
-              eqmt_name: '5#',
-              eqmt_status: 0,
-              gmt_create: '2022-08-30 08:16:52',
-              gmt_modified: null,
-              id: 0,
-              intraday_eqmt_run_time: 0,
-              intraday_eqmt_stop_time: 0,
-              intraday_eqmt_stop_times: 0,
-              intraday_eqmt_work_rate: 0,
-              intraday_eqmt_work_time: 0,
-              intraday_ng_qty: 0,
-              intraday_ok_qty: 0,
-              intraday_product_qty: 0,
-              intraday_yield_rate: 0,
-              oee: 0,
-              product_type: null,
-              product_type_name: null,
-              speed: 0,
-              sys_org_code: null,
-              total_product_qty: 0,
-              update_by: null,
-              update_time: null
-            },
-            {
-              collect_id: null,
-              create_time: null,
-              eqmt_alarm_flag: 0,
-              eqmt_except_flag: 0,
-              eqmt_id: 0,
-              eqmt_name: '7#',
-              eqmt_status: 0,
-              gmt_create: '2022-08-30 08:16:52',
-              gmt_modified: null,
-              id: 0,
-              intraday_eqmt_run_time: 0,
-              intraday_eqmt_stop_time: 0,
-              intraday_eqmt_stop_times: 0,
-              intraday_eqmt_work_rate: 0,
-              intraday_eqmt_work_time: 0,
-              intraday_ng_qty: 0,
-              intraday_ok_qty: 0,
-              intraday_product_qty: 0,
-              intraday_yield_rate: 0,
-              oee: 0,
-              product_type: null,
-              product_type_name: null,
-              speed: 0,
-              sys_org_code: null,
-              total_product_qty: 0,
-              update_by: null,
-              update_time: null
-            },
-            {
-              collect_id: null,
-              create_time: null,
-              eqmt_alarm_flag: 0,
-              eqmt_except_flag: 0,
-              eqmt_id: 0,
-              eqmt_name: '8#',
-              eqmt_status: 0,
-              gmt_create: '2022-08-30 08:16:52',
-              gmt_modified: null,
-              id: 0,
-              intraday_eqmt_run_time: 0,
-              intraday_eqmt_stop_time: 0,
-              intraday_eqmt_stop_times: 0,
-              intraday_eqmt_work_rate: 0,
-              intraday_eqmt_work_time: 0,
-              intraday_ng_qty: 0,
-              intraday_ok_qty: 0,
-              intraday_product_qty: 0,
-              intraday_yield_rate: 0,
-              oee: 0,
-              product_type: null,
-              product_type_name: null,
-              speed: 0,
-              sys_org_code: null,
-              total_product_qty: 0,
-              update_by: null,
-              update_time: null
-            },
-            {
-              collect_id: null,
-              create_time: null,
-              eqmt_alarm_flag: 0,
-              eqmt_except_flag: 0,
-              eqmt_id: 0,
-              eqmt_name: '20#',
-              eqmt_status: 0,
-              gmt_create: '2022-08-30 08:16:52',
-              gmt_modified: null,
-              id: 0,
-              intraday_eqmt_run_time: 0,
-              intraday_eqmt_stop_time: 0,
-              intraday_eqmt_stop_times: 0,
-              intraday_eqmt_work_rate: 0,
-              intraday_eqmt_work_time: 0,
-              intraday_ng_qty: 0,
-              intraday_ok_qty: 0,
-              intraday_product_qty: 0,
-              intraday_yield_rate: 0,
-              oee: 0,
-              product_type: null,
-              product_type_name: null,
-              speed: 0,
-              sys_org_code: null,
-              total_product_qty: 0,
-              update_by: null,
-              update_time: null
-            },
-            {
-              collect_id: null,
-              create_time: null,
-              eqmt_alarm_flag: 0,
-              eqmt_except_flag: 0,
-              eqmt_id: 0,
-              eqmt_name: '21#',
-              eqmt_status: 0,
-              gmt_create: '2022-08-30 08:16:52',
-              gmt_modified: null,
-              id: 0,
-              intraday_eqmt_run_time: 0,
-              intraday_eqmt_stop_time: 0,
-              intraday_eqmt_stop_times: 0,
-              intraday_eqmt_work_rate: 0,
-              intraday_eqmt_work_time: 0,
-              intraday_ng_qty: 0,
-              intraday_ok_qty: 0,
-              intraday_product_qty: 0,
-              intraday_yield_rate: 0,
-              oee: 0,
-              product_type: null,
-              product_type_name: null,
-              speed: 0,
-              sys_org_code: null,
-              total_product_qty: 0,
-              update_by: null,
-              update_time: null
-            }
-          ]
-          const rData2 = [...rData]
+      // request({
+      //   // 各产线
+      //   url: '/api/BigScreen/getEqmtDetailList',
+      //   method: 'get'
+      // }).then((r) => {
+      //   // debugger
+      //   if (r) {
+      // const rData = r.data
+      let arr = [98.39, 98.40, 98.41, 98.43, 98.44, 98.45];
+      const rData = [
+      {
+          "eqmt_name": "7#",
+          "id": 0,
+          "gmt_create": "2023-11-14 17:44:49",
+          "gmt_modified": null,
+          "collect_id": null,
+          "eqmt_id": 0,
+          "product_type": null,
+          "product_type_name": null,
+          "speed": 0,
+          "total_product_qty": 0,
+          "intraday_product_qty": 0,
+          "intraday_ok_qty": 290895,
+          "intraday_ng_qty": 0,
+          "intraday_yield_rate": 98.43,
+          "intraday_eqmt_run_time": 0,
+          "intraday_eqmt_work_time": 0,
+          "intraday_eqmt_stop_time": 0,
+          "intraday_eqmt_work_rate": 0,
+          "intraday_eqmt_stop_times": 2,
+          "eqmt_status": 0,
+          "eqmt_except_flag": 0,
+          "eqmt_alarm_flag": 0,
+          "oee": 97.21,
+          "create_time": null,
+          "update_by": null,
+          "update_time": null,
+          "sys_org_code": null
+        },
+        {
+          "eqmt_name": "13#",
+          "id": 0,
+          "gmt_create": "2023-11-14 17:44:49",
+          "gmt_modified": null,
+          "collect_id": null,
+          "eqmt_id": 0,
+          "product_type": null,
+          "product_type_name": null,
+          "speed": 0,
+          "total_product_qty": 0,
+          "intraday_product_qty": 0,
+          "intraday_ok_qty": 0,
+          "intraday_ng_qty": 0,
+          "intraday_yield_rate": 0,
+          "intraday_eqmt_run_time": 0,
+          "intraday_eqmt_work_time": 0,
+          "intraday_eqmt_stop_time": 0,
+          "intraday_eqmt_work_rate": 0,
+          "intraday_eqmt_stop_times": 0,
+          "eqmt_status": 0,
+          "eqmt_except_flag": 0,
+          "eqmt_alarm_flag": 0,
+          "oee": 0,
+          "create_time": null,
+          "update_by": null,
+          "update_time": null,
+          "sys_org_code": null
+        },
+        {
+          "eqmt_name": "15#",
+          "id": 0,
+          "gmt_create": "2023-11-14 17:44:49",
+          "gmt_modified": null,
+          "collect_id": null,
+          "eqmt_id": 0,
+          "product_type": null,
+          "product_type_name": null,
+          "speed": 0,
+          "total_product_qty": 0,
+          "intraday_product_qty": 0,
+          "intraday_ok_qty": 0,
+          "intraday_ng_qty": 0,
+          "intraday_yield_rate": 0,
+          "intraday_eqmt_run_time": 0,
+          "intraday_eqmt_work_time": 0,
+          "intraday_eqmt_stop_time": 0,
+          "intraday_eqmt_work_rate": 0,
+          "intraday_eqmt_stop_times": 0,
+          "eqmt_status": 0,
+          "eqmt_except_flag": 0,
+          "eqmt_alarm_flag": 0,
+          "oee": 0,
+          "create_time": null,
+          "update_by": null,
+          "update_time": null,
+          "sys_org_code": null
+        },
+        {
+          "eqmt_name": "16#",
+          "id": 0,
+          "gmt_create": "2023-11-14 17:44:49",
+          "gmt_modified": null,
+          "collect_id": null,
+          "eqmt_id": 0,
+          "product_type": null,
+          "product_type_name": null,
+          "speed": 0,
+          "total_product_qty": 0,
+          "intraday_product_qty": 0,
+          "intraday_ok_qty": 91235,
+          "intraday_ng_qty": 0,
+          "intraday_yield_rate": 97.7,
+          "intraday_eqmt_run_time": 0,
+          "intraday_eqmt_work_time": 0,
+          "intraday_eqmt_stop_time": 0,
+          "intraday_eqmt_work_rate": 0,
+          "intraday_eqmt_stop_times": 3,
+          "eqmt_status": 0,
+          "eqmt_except_flag": 0,
+          "eqmt_alarm_flag": 0,
+          "oee": 96.75,
+          "create_time": null,
+          "update_by": null,
+          "update_time": null,
+          "sys_org_code": null
+        },
+        {
+          "eqmt_name": "17#",
+          "id": 0,
+          "gmt_create": "2023-11-14 17:44:49",
+          "gmt_modified": null,
+          "collect_id": null,
+          "eqmt_id": 0,
+          "product_type": null,
+          "product_type_name": null,
+          "speed": 0,
+          "total_product_qty": 0,
+          "intraday_product_qty": 0,
+          "intraday_ok_qty": 121992,
+          "intraday_ng_qty": 0,
+          "intraday_yield_rate": 98.22,
+          "intraday_eqmt_run_time": 0,
+          "intraday_eqmt_work_time": 0,
+          "intraday_eqmt_stop_time": 0,
+          "intraday_eqmt_work_rate": 0,
+          "intraday_eqmt_stop_times": 0,
+          "eqmt_status": 0,
+          "eqmt_except_flag": 0,
+          "eqmt_alarm_flag": 0,
+          "oee": 95.91,
+          "create_time": null,
+          "update_by": null,
+          "update_time": null,
+          "sys_org_code": null
+        },
+        {
+          "eqmt_name": "18#",
+          "id": 110322,
+          "gmt_create": "2023-11-14 17:40:01",
+          "gmt_modified": null,
+          "collect_id": "2e775414-6cc4-4bc7-84e0-d36068f93458",
+          "eqmt_id": 4,
+          "product_type": "1",
+          "product_type_name": "经期裤(M)",
+          "speed": 320,
+          "total_product_qty": 271044002,
+          "intraday_product_qty": 185924,
+          "intraday_ok_qty": 112790,
+          "intraday_ng_qty": 3134,
+          "intraday_yield_rate": arr[this.rindex],
+          "intraday_eqmt_run_time": 35520,
+          "intraday_eqmt_work_time": 34080,
+          "intraday_eqmt_stop_time": 1380,
+          "intraday_eqmt_work_rate": 96.05,
+          "intraday_eqmt_stop_times": 1,
+          "eqmt_status": 1,
+          "eqmt_except_flag": 0,
+          "eqmt_alarm_flag": 0,
+          "oee": 98.22,
+          "create_time": null,
+          "update_by": null,
+          "update_time": null,
+          "sys_org_code": null
+        },
+        {
+          "eqmt_name": "19#",
+          "id": 0,
+          "gmt_create": "2023-11-14 17:44:49",
+          "gmt_modified": null,
+          "collect_id": null,
+          "eqmt_id": 0,
+          "product_type": null,
+          "product_type_name": null,
+          "speed": 0,
+          "total_product_qty": 0,
+          "intraday_product_qty": 0,
+          "intraday_ok_qty": 102300,/*  */
+          "intraday_ng_qty": 0,
+          "intraday_yield_rate": 97.38,
+          "intraday_eqmt_run_time": 0,
+          "intraday_eqmt_work_time": 0,
+          "intraday_eqmt_stop_time": 0,
+          "intraday_eqmt_work_rate": 0,
+          "intraday_eqmt_stop_times": 0,
+          "eqmt_status": 0,
+          "eqmt_except_flag": 0,
+          "eqmt_alarm_flag": 0,
+          "oee": 97.67,
+          "create_time": null,
+          "update_by": null,
+          "update_time": null,
+          "sys_org_code": null
+        },
+        {
+          "eqmt_name": "21#",
+          "id": 0,
+          "gmt_create": "2023-11-14 17:44:49",
+          "gmt_modified": null,
+          "collect_id": null,
+          "eqmt_id": 0,
+          "product_type": null,
+          "product_type_name": null,
+          "speed": 0,
+          "total_product_qty": 0,
+          "intraday_product_qty": 0,
+          "intraday_ok_qty": 109949,
+          "intraday_ng_qty": 0,
+          "intraday_yield_rate": 99.1,
+          "intraday_eqmt_run_time": 0,
+          "intraday_eqmt_work_time": 0,
+          "intraday_eqmt_stop_time": 0,
+          "intraday_eqmt_work_rate": 0,
+          "intraday_eqmt_stop_times": 2,
+          "eqmt_status": 0,
+          "eqmt_except_flag": 0,
+          "eqmt_alarm_flag": 0,
+          "oee": 98.17,
+          "create_time": null,
+          "update_by": null,
+          "update_time": null,
+          "sys_org_code": null
+        },
+        {
+          "eqmt_name": "平面口罩",
+          "id": 110323,
+          "gmt_create": "2023-11-14 17:40:02",
+          "gmt_modified": null,
+          "collect_id": "9300c737-ef7f-4021-8914-429753306773",
+          "eqmt_id": 8,
+          "product_type": "1",
+          "product_type_name": "平面口罩(245mm)",
+          "speed": 580,
+          "total_product_qty": 0,
+          "intraday_product_qty": 0,
+          "intraday_ok_qty": 0,
+          "intraday_ng_qty": 0,
+          "intraday_yield_rate": 0,
+          "intraday_eqmt_run_time": 0,
+          "intraday_eqmt_work_time": 0,
+          "intraday_eqmt_stop_time": 0,
+          "intraday_eqmt_work_rate": 0,
+          "intraday_eqmt_stop_times": 0,
+          "eqmt_status": 0,
+          "eqmt_except_flag": 0,
+          "eqmt_alarm_flag": 0,
+          "oee": 0,
+          "create_time": null,
+          "update_by": null,
+          "update_time": null,
+          "sys_org_code": null
+        },
+        {
+          "eqmt_name": "KN95-1",
+          "id": 0,
+          "gmt_create": "2023-11-14 17:44:49",
+          "gmt_modified": null,
+          "collect_id": null,
+          "eqmt_id": 0,
+          "product_type": null,
+          "product_type_name": null,
+          "speed": 0,
+          "total_product_qty": 0,
+          "intraday_product_qty": 0,
+          "intraday_ok_qty": 0,
+          "intraday_ng_qty": 0,
+          "intraday_yield_rate": 0,
+          "intraday_eqmt_run_time": 0,
+          "intraday_eqmt_work_time": 0,
+          "intraday_eqmt_stop_time": 0,
+          "intraday_eqmt_work_rate": 0,
+          "intraday_eqmt_stop_times": 0,
+          "eqmt_status": 0,
+          "eqmt_except_flag": 0,
+          "eqmt_alarm_flag": 0,
+          "oee": 0,
+          "create_time": null,
+          "update_by": null,
+          "update_time": null,
+          "sys_org_code": null
+        },
+        {
+          "eqmt_name": "KN95-2",
+          "id": 0,
+          "gmt_create": "2023-11-14 17:44:49",
+          "gmt_modified": null,
+          "collect_id": null,
+          "eqmt_id": 0,
+          "product_type": null,
+          "product_type_name": null,
+          "speed": 0,
+          "total_product_qty": 0,
+          "intraday_product_qty": 0,
+          "intraday_ok_qty": 0,
+          "intraday_ng_qty": 0,
+          "intraday_yield_rate": 0,
+          "intraday_eqmt_run_time": 0,
+          "intraday_eqmt_work_time": 0,
+          "intraday_eqmt_stop_time": 0,
+          "intraday_eqmt_work_rate": 0,
+          "intraday_eqmt_stop_times": 0,
+          "eqmt_status": 0,
+          "eqmt_except_flag": 0,
+          "eqmt_alarm_flag": 0,
+          "oee": 0,
+          "create_time": null,
+          "update_by": null,
+          "update_time": null,
+          "sys_org_code": null
+        }
+      ]
+      const rData2 = [...rData]
 
-          // console.log(rData)
-          // rData = [...rData];
-          _this.reqlist = []
-          for (const item of rData2) {
-            var n = {
-              data: [item.intraday_yield_rate],
-              shape: 'round',
-              formatter: '{value}%',
-              waveNum: 2,
-              waveHeight: 10
-            }
-            _this.reqlist.push({
-              eqmt_name: item.eqmt_name,
-              product_type_name: item.product_type_name,
-              intraday_ok_qty: item.intraday_ok_qty,
-              oee: item.oee,
-              intraday_eqmt_stop_times: item.intraday_eqmt_stop_times,
-              config: n
-            })
-          }
-          this.lessL = 4 - rData2.length % 4
+      // console.log(rData)
+      // rData = [...rData];
+      _this.reqlist = []
+      for (const item of rData2) {
+        var n = {
+          data: [item.intraday_yield_rate],
+          shape: 'round',
+          formatter: '{value}%',
+          waveNum: 2,
+          waveHeight: 10
         }
-      })
+        _this.reqlist.push({
+          eqmt_name: item.eqmt_name,
+          product_type_name: item.product_type_name,
+          intraday_ok_qty: item.intraday_ok_qty,
+          oee: item.oee,
+          intraday_eqmt_stop_times: item.intraday_eqmt_stop_times,
+          config: n
+        })
+      }
+      this.lessL = 4 - rData2.length % 4
     }
+    // })
+    // }
   }
 }
 </script>
@@ -322,13 +510,16 @@ $box-height: 210px;
   height: $box-height;
   width: $box-width;
   border-radius: 10px;
+
   .bg-color-black {
     height: $box-height - 0px;
     border-radius: 10px;
   }
+
   .text {
     color: #c3cbde;
   }
+
   .dv-dec-3 {
     position: relative;
     width: 100px;
@@ -338,18 +529,21 @@ $box-height: 210px;
 
   .bottom-data {
     .item-box {
-      & > div {
+      &>div {
         padding-right: 5px;
       }
+
       font-size: 14px;
       float: right;
       position: relative;
       width: 50%;
       color: #d3d6dd;
+
       .dv-digital-flop {
         width: 120px;
         height: 30px;
       }
+
       // 金币
       .coin {
         position: relative;
@@ -357,30 +551,35 @@ $box-height: 210px;
         font-size: 20px;
         color: #ffc107;
       }
+
       .colorYellow {
         color: yellowgreen;
       }
+
       p {
         text-align: center;
       }
     }
   }
 }
+
 .text2 {
   margin-top: 10px;
   margin-bottom: 20px;
   line-height: 25px;
 }
+
 .text2 span {
   margin: 10px;
 }
+
 .text1 p {
   font-size: 18px;
 }
+
 .text3 {
   margin-top: 37px;
   margin-left: 20px;
   height: 35px;
   line-height: 35px;
-}
-</style>
+}</style>
diff --git a/yuhong-ui/src/views/centerRight1.vue b/yuhong-ui/src/views/centerRight1.vue
index cdd1bbd..a2c16b2 100644
--- a/yuhong-ui/src/views/centerRight1.vue
+++ b/yuhong-ui/src/views/centerRight1.vue
@@ -200,7 +200,7 @@ export default {
   methods: {
     // 点击事件
     skipto(config) {
-      debugger
+      // debugger
       // window.alert(config.row[6])
       this.moKey = config.row[6]
       this.moDetailShow = true
@@ -267,7 +267,7 @@ export default {
         url: '/api/BigScreen/getPlanOrderDetail?fentryId=' + this.moKey,
         method: 'get'
       }).then((r) => {
-        debugger
+        // debugger
         _this.moInfo = r.data
       })
     }
diff --git a/yuhong-ui/src/views/index.vue b/yuhong-ui/src/views/index.vue
index d55720d..8b92f52 100644
--- a/yuhong-ui/src/views/index.vue
+++ b/yuhong-ui/src/views/index.vue
@@ -58,7 +58,7 @@
               <!--左边数据显示1-->
               <div class="left-box-one">
                 <dv-border-box-12>
-                  //<centerRight1 />
+                  <centerRight1 />
                 </dv-border-box-12>
               </div>
               <!--左边数据显示2   动态月订单信息数据-->
@@ -72,14 +72,14 @@
                 <!--设备利用率(%)  各产品合格率-->
                 <dv-border-box-12>
                   <!--<center/>-->
-                  <bottomRight />
+                  <bottomRight  @updateRI="updateRI" />
                 </dv-border-box-12>
               </div>
             </div>
             <!--右边数据显示-->
             <div class="right-box">
               <dv-border-box-12>
-                <center-left1 />
+                <center-left1 :rindex="rindex"/>
               </dv-border-box-12>
             </div>
           </div>
@@ -107,7 +107,7 @@ export default {
     center,
     bottomRight
   },
-  mixins: [drawMixin],
+  // mixins: [drawMixin],
   data() {
     return {
       timing: null,
@@ -117,7 +117,8 @@ export default {
       dateWeek: null,
       weekday: ['周日', '周一', '周二', '周三', '周四', '周五', '周六'],
       decorationColor: ['#568aea', '#000000'],
-      reqlist: []
+      reqlist: [],
+      rindex: 0
     }
   },
   mounted() {
@@ -139,6 +140,10 @@ export default {
       setTimeout(() => {
         this.loading = false
       }, 500)
+    },
+    updateRI(val) {
+      console.log(val);
+      this.rindex = val;
     }
   }
 }