From d0bec404f2c22ca04e8592f1a2ba0b39eab0be2f Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期一, 22 五月 2023 09:37:03 +0800
Subject: [PATCH] Default Changelist

---
 src/views/newHome/index.vue |   36 ++++++++++++++++++++++++++++++++----
 1 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/src/views/newHome/index.vue b/src/views/newHome/index.vue
index 8450675..f944810 100644
--- a/src/views/newHome/index.vue
+++ b/src/views/newHome/index.vue
@@ -82,7 +82,17 @@
                     </div>
                     <img class="bgImg" src="../../assets/newMenu/card-7.png" />
                 </div>
-                <div class="grid-content cont-bg-1" v-throttle @click="render('7')">
+                <div class="grid-content cont-bg-1" v-throttle @click="toManLocation">
+                  <div class="toplayer">
+                    <img class="iconImg" src="../../assets/newMenu/icon12.png" />
+                    <div>
+                      <div class="itemTit">人员定位系统</div>
+                      <div class="enTit">Personnel Positioning System</div>
+                    </div>
+                  </div>
+                  <img class="bgImg" src="../../assets/newMenu/card-12.png" />
+                </div>
+                <div class="grid-content cont-bg-2" v-throttle @click="render('7')">
                     <div class="toplayer">
                         <img class="iconImg" src="../../assets/newMenu/icon5.png" />
                         <div>
@@ -141,6 +151,16 @@
                         </div>
                     </div>
                     <img class="bgImg" src="../../assets/newMenu/card-6.png" />
+                </div>
+                <div class="grid-content cont-bg-2" v-throttle @click="toSmartFactory">
+                  <div class="toplayer">
+                    <img class="iconImg" src="../../assets/newMenu/icon13.png" />
+                    <div>
+                      <div class="itemTit">智能工厂系统</div>
+                      <div class="enTit">Intelligent Factory System</div>
+                    </div>
+                  </div>
+                  <img class="bgImg" src="../../assets/newMenu/card-13.png" />
                 </div>
                 <div class="grid-content cont-bg-2" @click="render('1')">
                     <div class="toplayer">
@@ -336,6 +356,12 @@
         const toDoublePrevent = () => {
            window.open('http://121.239.169.27:6801');
         };
+        const toSmartFactory = () =>{
+          window.open('http://10.211.134.139:5522/#/login');
+        }
+        const toManLocation = () =>{
+          window.open('http://10.211.134.138:8081/GUOTAI');
+        }
         const throttle = (renderMenu: any, delay: number) => {
             let flag = true;
             let count = 0;
@@ -410,6 +436,8 @@
             renderToNew,
             toRiskPlatform,
             toDoublePrevent,
+            toSmartFactory,
+            toManLocation,
             onScreenfullClick,
             loginIconTwo,
             getThemeConfig,
@@ -455,10 +483,10 @@
 @media screen and (min-width: 1600px) {
     .gridCont {
         width: 100%;
-        height: 100%;
         display: grid;
         grid-gap: 20px;
         grid-template-columns: repeat(3, 1fr);
+        grid-template-rows: repeat(5, 200px);
         grid-auto-flow: row;
         justify-content: center;
         .toplayer {
@@ -551,7 +579,6 @@
 @media screen and (min-width: 1200px) and (max-width: 1600px) {
     .gridCont {
         width: 100%;
-        height: 100%;
         display: grid;
         grid-gap: 15px;
         grid-template-columns: repeat(3, 1fr);
@@ -644,7 +671,6 @@
 @media screen and (max-width: 1200px) {
     .gridCont {
         width: 100%;
-        height: 100%;
         display: grid;
         grid-gap: 10px;
         grid-template-columns: repeat(3, 1fr);
@@ -907,6 +933,8 @@
         position: absolute;
         top: 260px;
         left: 220px;
+      overflow: hidden;
+      overflow-y: scroll;
         .gridCont {
             .grid-content {
                 border-radius: 16px;

--
Gitblit v1.9.2