From adb05ed65c85d62ba5ddbae2d5b738597c1cec86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AD=A5=E5=B1=A5=E4=B8=8D=E5=81=9C?= <1873501479@qq.com>
Date: Tue, 2 Aug 2022 11:19:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=AD=E9=97=B4=E9=83=A8=E5=88=862?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/config.js                           |   4 +-
 src/views/DataManagement/ReminderSettings.vue |   2 +-
 .../FacilityManagement/OperationLogs.vue      |   2 +-
 src/views/FacilityManagement/RealTimeDate.vue |   2 +-
 src/views/NewMainPage.vue                     | 123 ++++++++++++++----
 .../NewMainPageComponents/LeftCenter.vue      |   2 +-
 6 files changed, 107 insertions(+), 28 deletions(-)

diff --git a/src/utils/config.js b/src/utils/config.js
index 1f6c066..f573220 100644
--- a/src/utils/config.js
+++ b/src/utils/config.js
@@ -1,7 +1,7 @@
 module.exports = {
-  baseUrl: 'localhost:2011'
+  // baseUrl: 'localhost:2011'
   // baseUrl: '49.234.81.196:2011'
-  // baseUrl: '192.168.0.101:2011'
+  baseUrl: '192.168.0.101:2011'
   // baseUrl: '120.25.106.20:2011'
   // baseUrl: 'localhost:40000'
 }
diff --git a/src/views/DataManagement/ReminderSettings.vue b/src/views/DataManagement/ReminderSettings.vue
index aaaa33a..6ae23af 100644
--- a/src/views/DataManagement/ReminderSettings.vue
+++ b/src/views/DataManagement/ReminderSettings.vue
@@ -1,4 +1,4 @@
-<!--  报表导出 -->
+<!--  提醒设置 -->
 <template>
   <div>
     <BreadCrumb :inner="inner" />
diff --git a/src/views/FacilityManagement/OperationLogs.vue b/src/views/FacilityManagement/OperationLogs.vue
index 0b7d21e..dcaaf52 100644
--- a/src/views/FacilityManagement/OperationLogs.vue
+++ b/src/views/FacilityManagement/OperationLogs.vue
@@ -1,4 +1,4 @@
-<!-- 设备操作 -->
+<!-- 实时数据 -->
 <template>
   <div>
     <BreadCrumb :inner="inner" />
diff --git a/src/views/FacilityManagement/RealTimeDate.vue b/src/views/FacilityManagement/RealTimeDate.vue
index 689adf9..f57bfd4 100644
--- a/src/views/FacilityManagement/RealTimeDate.vue
+++ b/src/views/FacilityManagement/RealTimeDate.vue
@@ -1,4 +1,4 @@
-<!-- 设备操作 -->
+<!-- 设备信息 -->
 <template>
   <div>
     <BreadCrumb :inner="inner" />
diff --git a/src/views/NewMainPage.vue b/src/views/NewMainPage.vue
index 4a5ac0e..6a236a9 100644
--- a/src/views/NewMainPage.vue
+++ b/src/views/NewMainPage.vue
@@ -63,7 +63,7 @@
               IP地址:192.168.0.100
             </span><br>
             <span>
-              端口号:1001
+              端口号:4111
             </span>
           </div>
           <!--     服务器文字     -->
@@ -108,24 +108,40 @@
           </div>
           <!--     服务器文字     -->
         </div>
-        <div class="center-center">
-          <!--     服务器文字     -->
+        <div v-for="(item,index)in dataList" :key="item" class="center-center">
+          <!--          区域信息文字-->
           <div style="height: 100%;width: 25%;display: inline-block;vertical-align: top;color: #ffffff;font-size: 12px">
             <h5 style="font-size: 14px;color: rgb(196, 130, 19);padding: 35px 0 5px 45px">
-              01区
+              {{ dataList[index].information.name }}
             </h5>
             <span style="padding-left: 25px">
-              位置:1号厂房入口
+              位置:{{ dataList[index].information.address }}
             </span><br>
             <span style="padding-left: 25px">
-              设备:20台
+              设备:{{ dataList[index].information.option }}
             </span><br>
             <span style="padding-left: 25px">
-              维护:王小明
+              维护:{{ dataList[index].information.weihu }}
             </span>
           </div>
-          <!--     服务器文字     -->
-          <!--     服务器文字     -->
+          <!--          区域信息文字-->
+          <!--     设备信息文字     -->
+          <!--          <div style="height: 100%;width: 22%;display: inline-block;vertical-align: top;color: #ffffff;font-size: 12px">-->
+          <!--            <h5 style="font-size: 14px;color: rgb(4, 190, 198);padding: 35px 0 5px 0">-->
+          <!--              {{ dataList.information.name }}-->
+          <!--            </h5>-->
+          <!--            <span>-->
+          <!--              通行:5020-->
+          <!--            </span><br>-->
+          <!--            <span>-->
+          <!--              报警:2011-->
+          <!--            </span><br>-->
+          <!--            <span>-->
+          <!--              报警率:40.1%-->
+          <!--            </span>-->
+          <!--          </div>-->
+          <!--     设备信息文字     -->
+          <!--          &lt;!&ndash;     服务器文字     &ndash;&gt;
           <div style="height: 100%;width: 22%;display: inline-block;vertical-align: top;color: #ffffff;font-size: 12px">
             <h5 style="font-size: 14px;color: rgb(4, 190, 198);padding: 35px 0 5px 0">
               安检门
@@ -140,9 +156,9 @@
               报警率:40.1%
             </span>
           </div>
-          <!--     服务器文字     -->
+          &lt;!&ndash;     服务器文字     &ndash;&gt;
 
-          <!--     服务器文字     -->
+          &lt;!&ndash;     服务器文字     &ndash;&gt;
           <div style="height: 100%;width: 26%;display: inline-block;vertical-align: top;color: #ffffff;font-size: 12px">
             <h5 style="font-size: 14px;color: rgb(4, 190, 198);padding: 35px 0 5px 0">
               人脸ESD
@@ -157,7 +173,7 @@
               报警率:40.1%
             </span>
           </div>
-          <!--     服务器文字     -->
+          &lt;!&ndash;     服务器文字     &ndash;&gt;
           <div style="height: 100%;width: 22%;display: inline-block;vertical-align: top;color: #ffffff;font-size: 12px">
             <h5 style="font-size: 14px;color: rgb(4, 190, 198);padding: 35px 0 5px 0">
               X射线机
@@ -171,10 +187,10 @@
             <span>
               报警率:40.1%
             </span>
-          </div>
+          </div>-->
         </div>
-        <div class="center-bottom">
-          <!--     服务器文字     -->
+        <!--        <div class="center-bottom">
+          &lt;!&ndash;     服务器文字     &ndash;&gt;
           <div style="height: 100%;width: 25%;display: inline-block;vertical-align: top;color: #ffffff;font-size: 12px">
             <h5 style="font-size: 14px;color: rgb(196, 130, 19);padding: 35px 0 5px 45px">
               02区
@@ -189,8 +205,8 @@
               维护:张小东
             </span>
           </div>
-          <!--     服务器文字     -->
-          <!--     服务器文字     -->
+          &lt;!&ndash;     服务器文字     &ndash;&gt;
+          &lt;!&ndash;     服务器文字     &ndash;&gt;
           <div style="height: 100%;width: 22%;display: inline-block;vertical-align: top;color: #ffffff;font-size: 12px">
             <h5 style="font-size: 14px;color: rgb(4, 190, 198);padding: 35px 0 5px 0">
               安检门
@@ -205,9 +221,9 @@
               报警率:40.1%
             </span>
           </div>
-          <!--     服务器文字     -->
+          &lt;!&ndash;     服务器文字     &ndash;&gt;
 
-          <!--     服务器文字     -->
+          &lt;!&ndash;     服务器文字     &ndash;&gt;
           <div style="height: 100%;width: 26%;display: inline-block;vertical-align: top;color: #ffffff;font-size: 12px">
             <h5 style="font-size: 14px;color: rgb(4, 190, 198);padding: 35px 0 5px 0">
               人脸ESD
@@ -222,8 +238,8 @@
               报警率:40.1%
             </span>
           </div>
-          <!--     服务器文字     -->
-        </div>
+          &lt;!&ndash;     服务器文字     &ndash;&gt;
+        </div>-->
       </div>
       <div class="right-box">
         <div class="right-top">
@@ -252,9 +268,72 @@ export default {
   components: { LeftTop, RightBottom, RightTop, LowerLeft, LeftCenter, RightMiddle },
   data() {
     return {
-      leftBtnColor: ['#ffde00', 'rgb(0, 240, 255)', 'rgb(0, 240, 255)', 'rgb(0, 240, 255)', 'rgb(0, 240, 255)']
+      leftBtnColor: ['#ffde00', 'rgb(0, 240, 255)', 'rgb(0, 240, 255)', 'rgb(0, 240, 255)', 'rgb(0, 240, 255)'],
+      dataList: [
+        {
+          information: {
+            name: '01区',
+            address: '1号厂房入口',
+            option: '20台',
+            weihu: '王小明'
+          },
+          sheBei: {
+            anJianMen: {
+              name: '安检门',
+              tongXin: '5020',
+              baoJin: '2011',
+              baoJinLv: '40.1%'
+            },
+            ESD: {
+              name: '人脸ESD',
+              tongXin: '5020',
+              baoJin: '2011',
+              baoJinLv: '40.1%'
+            },
+            X: {
+              name: 'X射线机',
+              tongXin: '5020',
+              baoJin: '2011',
+              baoJinLv: '40.1%'
+            }
+          }
+        },
+        {
+          information: {
+            name: '01区',
+            address: '1号厂房入口',
+            option: '20台',
+            weihu: '王小明'
+          },
+          sheBei: {
+            anJianMen: {
+              name: '安检门',
+              tongXin: '5020',
+              baoJin: '2011',
+              baoJinLv: '40.1%'
+            },
+            ESD: {
+              name: '人脸ESD',
+              tongXin: '5020',
+              baoJin: '2011',
+              baoJinLv: '40.1%'
+            },
+            X: {
+              name: 'X射线机',
+              tongXin: '5020',
+              baoJin: '2011',
+              baoJinLv: '40.1%'
+            }
+          }
+        }
+      ]
     }
   },
+  created() {
+    this.dataList.forEach(function(item, index) {
+      console.log(item.information.name)
+    })
+  },
   async mounted() {
     this.$Socket.connect()
     this.getWebSocket()
diff --git a/src/views/NewMainPageComponents/LeftCenter.vue b/src/views/NewMainPageComponents/LeftCenter.vue
index f0d3aab..67d7169 100644
--- a/src/views/NewMainPageComponents/LeftCenter.vue
+++ b/src/views/NewMainPageComponents/LeftCenter.vue
@@ -828,7 +828,7 @@ export default {
   background-color: rgba(30, 144, 255, 0.26) !important;
 }
 /deep/ .cell {
-  height: 20px;
+  height: 2.1vh;
   line-height: 20px;
 }
 /deep/ .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
-- 
Gitee