From cbe714cf3c16c2c6d39ac62ff9d30ed99771bdfd Mon Sep 17 00:00:00 2001
From: 黄何裕 <1053952480@qq.com>
Date: 星期四, 08 八月 2024 16:11:19 +0800
Subject: [PATCH] 最终章

---
 src/api/newpage.js                                 |   24 ++++--
 vue.config.js                                      |    2 
 src/views/screen/newPage/index.vue                 |   21 ++++-
 src/views/screen/components/screen-table/index.vue |  148 +++++++++++++++++++++++-------------
 4 files changed, 126 insertions(+), 69 deletions(-)

diff --git a/src/api/newpage.js b/src/api/newpage.js
index d4de53b..29a2767 100644
--- a/src/api/newpage.js
+++ b/src/api/newpage.js
@@ -1,17 +1,25 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
 
 // 璁惧鏁版嵁
 export function getDeviceData() {
   return request({
-    url: '/dashboard/monitor',
-    method: 'get',
-  })
+    url: "/dashboard/monitor/total",
+    method: "get",
+  });
 }
 
 // 宸ュ崟鏁版嵁
 export function getWorkOrderData() {
   return request({
-    url: '/dashboard/workOrder',
-    method: 'get',
-  })
-}
\ No newline at end of file
+    url: "/dashboard/workOrder/total",
+    method: "get",
+  });
+}
+
+//璁惧姝e父鐜�
+export function getNormalRate(id) {
+  return request({
+    url: "/dashboard/monitor/rate?dataScope=" + id,
+    method: "get",
+  });
+}
diff --git a/src/views/screen/components/screen-table/index.vue b/src/views/screen/components/screen-table/index.vue
index 2cf0b6d..4400918 100644
--- a/src/views/screen/components/screen-table/index.vue
+++ b/src/views/screen/components/screen-table/index.vue
@@ -13,7 +13,7 @@
           :max-height="tableHeight"
           class="rank-table"
         >
-          <el-table-column prop="name" label="鍦板尯" align="center" width="100">
+          <el-table-column prop="area" label="鍦板尯" align="center" width="100">
           </el-table-column>
 
           <el-table-column label="浜鸿劯璁惧" align="center">
@@ -22,14 +22,25 @@
                 <div slot="content">
                   <div class="tip-item">
                     <div class="tip-label">璁惧姝e父鏁�:</div>
-                    <div class="tip-info tip-success">12</div>
+                    <div class="tip-info tip-success">
+                      {{ scope.row.faceNormalNum }}
+                    </div>
                   </div>
                   <div class="tip-item">
                     <div class="tip-label">璁惧寮傚父鏁�:</div>
-                    <div class="tip-info tip-danger">4</div>
+                    <div class="tip-info tip-danger">
+                      {{ scope.row.faceErrorNum }}
+                    </div>
                   </div>
                 </div>
-                <div class="tip-num">75%</div>
+                <div class="tip-num">
+                  {{
+                    scope.row.faceRate?(
+                      (scope.row.faceNormalNum / scope.row.faceRate) *
+                      100
+                    ).toFixed(0)+'%':'--'
+                  }}
+                </div>
               </el-tooltip>
             </template>
           </el-table-column>
@@ -40,14 +51,25 @@
                 <div slot="content">
                   <div class="tip-item">
                     <div class="tip-label">璁惧姝e父鏁�:</div>
-                    <div class="tip-info tip-success">12</div>
+                    <div class="tip-info tip-success">
+                      {{ scope.row.carNormalNum }}
+                    </div>
                   </div>
                   <div class="tip-item">
                     <div class="tip-label">璁惧寮傚父鏁�:</div>
-                    <div class="tip-info tip-danger">4</div>
+                    <div class="tip-info tip-danger">
+                      {{ scope.row.carNormalNum }}
+                    </div>
                   </div>
                 </div>
-                <div class="tip-num">75%</div>
+                <div class="tip-num">
+                  {{
+                      scope.row.carRate?(
+                      (scope.row.carNormalNum / scope.row.carRate) *
+                      100
+                    ).toFixed(0)+'%':'--'
+                  }}
+                </div>
               </el-tooltip>
             </template>
           </el-table-column>
@@ -58,14 +80,25 @@
                 <div slot="content">
                   <div class="tip-item">
                     <div class="tip-label">璁惧姝e父鏁�:</div>
-                    <div class="tip-info tip-success">12</div>
+                    <div class="tip-info tip-success">
+                      {{ scope.row.videoNormalNum }}
+                    </div>
                   </div>
                   <div class="tip-item">
                     <div class="tip-label">璁惧寮傚父鏁�:</div>
-                    <div class="tip-info tip-danger">4</div>
+                    <div class="tip-info tip-danger">
+                      {{ scope.row.videoNormalNum }}
+                    </div>
                   </div>
                 </div>
-                <div class="tip-num">75%</div>
+                <div class="tip-num">
+                  {{
+                    scope.row.videoRate?(
+                      (scope.row.videoNormalNum / scope.row.videoRate) *
+                      100
+                    ).toFixed(0)+'%':'--'
+                  }}
+                </div>
               </el-tooltip>
             </template>
           </el-table-column>
@@ -80,57 +113,62 @@
 
 export default {
   name: "ScreenTable",
-
+  props: {
+    tableData: {
+      type: Array,
+      default: null,
+    },
+  },
   components: {
     WrapperTitle,
   },
   data() {
     return {
       tableHeight: 40,
-      tableData: [
-        {
-          name: "瀵岄『鍘�",
-          data1: 1123,
-          data2: 1123,
-          data3: 1123,
-        },
-        {
-          name: "鑽e幙",
-          data1: 1123,
-          data2: 1123,
-          data3: 1123,
-        },
-        {
-          name: "楂樻柊鍖�",
-          data1: 1123,
-          data2: 1123,
-          data3: 1123,
-        },
-        {
-          name: "鑷祦浜曞尯",
-          data1: 1123,
-          data2: 1123,
-          data3: 1123,
-        },
-        {
-          name: "璐′簳鍖�",
-          data1: 1123,
-          data2: 1123,
-          data3: 1123,
-        },
-        {
-          name: "澶у畨鍖�",
-          data1: 1123,
-          data2: 1123,
-          data3: 1123,
-        },
-        {
-          name: "娌挎哗鍖�",
-          data1: 1123,
-          data2: 1123,
-          data3: 1123,
-        },
-      ],
+      // tableData: [
+      //   {
+      //     name: "瀵岄『鍘�",
+      //     data1: 1123,
+      //     data2: 1123,
+      //     data3: 1123,
+      //   },
+      //   {
+      //     name: "鑽e幙",
+      //     data1: 1123,
+      //     data2: 1123,
+      //     data3: 1123,
+      //   },
+      //   {
+      //     name: "楂樻柊鍖�",
+      //     data1: 1123,
+      //     data2: 1123,
+      //     data3: 1123,
+      //   },
+      //   {
+      //     name: "鑷祦浜曞尯",
+      //     data1: 1123,
+      //     data2: 1123,
+      //     data3: 1123,
+      //   },
+      //   {
+      //     name: "璐′簳鍖�",
+      //     data1: 1123,
+      //     data2: 1123,
+      //     data3: 1123,
+      //   },
+      //   {
+      //     name: "澶у畨鍖�",
+      //     data1: 1123,
+      //     data2: 1123,
+      //     data3: 1123,
+      //   },
+      //   {
+      //     name: "娌挎哗鍖�",
+      //     data1: 1123,
+      //     data2: 1123,
+      //     data3: 1123,
+      //   },
+      // ],
     };
   },
   methods: {
diff --git a/src/views/screen/newPage/index.vue b/src/views/screen/newPage/index.vue
index 7408779..32a7ed9 100644
--- a/src/views/screen/newPage/index.vue
+++ b/src/views/screen/newPage/index.vue
@@ -3,7 +3,7 @@
     <div style="display: flex; justify-content: center">
       <div class="header_box">
         <div class="tabs-box">
-          <el-tabs v-model="activeName" @tab-click="handleClick">
+          <el-tabs v-model="activeName" @tab-click="tabChange">
             <el-tab-pane
               v-for="item in testData1"
               :label="item.name"
@@ -74,7 +74,7 @@
           <div class="card_header">
             <div class="title">璁惧姝e父鐜�</div>
             <div style="margin: 10px 10px">
-              <ScreenTable></ScreenTable>
+              <ScreenTable :tableData="tableData"></ScreenTable>
             </div>
           </div>
         </div>
@@ -125,7 +125,7 @@
 import ExamineChart from "../components/screen-examine/components/examine-chart.vue";
 import ScreenData from "../components/screen-data/index.vue";
 import NewMap from "./components/newMap.vue";
-import { getDeviceData, getWorkOrderData } from "@/api/newpage";
+import { getDeviceData, getWorkOrderData, getNormalRate } from "@/api/newpage";
 export default {
   name: "Newpage",
   components: {
@@ -179,6 +179,7 @@
           totalNum: 28,
         },
       },
+      tableData: [],
     };
   },
   mounted() {
@@ -194,16 +195,26 @@
     getData() {
       getDeviceData()
         .then((res) => {
-          this.deviceList = res.data.monitorTotal;
+          this.deviceList = res.data;
         })
         .catch((err) => {});
       getWorkOrderData()
         .then((res) => {
           this.workOrderData = res.data;
-          console.log(res, "zxczxczxcxc");
+        })
+        .catch((err) => {});
+      this.getTableList();
+    },
+    getTableList() {
+      getNormalRate(this.activeName)
+        .then((res) => {
+          this.tableData = res.data;
         })
         .catch((err) => {});
     },
+    tabChange(){
+      this. getTableList()
+    }
   },
 };
 </script>
diff --git a/vue.config.js b/vue.config.js
index 28d4193..7d934eb 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -41,7 +41,7 @@
         // target: `http://192.168.3.64:8080`,
 
         // 榫氱剷鑼�
-        target: `http://192.168.3.87:8080`,
+        target: `http://192.168.137.227:8080`,
         
         // 鍚戝煿
         // target: `http://192.168.3.88:8085`,

--
Gitblit v1.8.0