From bf96afb25198cbf3af249042b865cdd7053991cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?home=E5=AD=99?= <1162067978@qq.com>
Date: Wed, 4 Jun 2025 17:58:39 +0800
Subject: [PATCH] 1

---
 src/assets/css/main.css         |  25 +++++++++++++++++++++++--
 src/assets/css/main.scss        |  21 ++++++++++++++++++---
 src/assets/image/more.png       | Bin 0 -> 879 bytes
 src/views/index.vue             |   6 +++---
 src/views/insectPest/detail.vue |  11 +++++++++--
 5 files changed, 53 insertions(+), 10 deletions(-)
 create mode 100644 src/assets/image/more.png

diff --git a/src/assets/css/main.css b/src/assets/css/main.css
index f71cdc06..30449205 100644
--- a/src/assets/css/main.css
+++ b/src/assets/css/main.css
@@ -4527,19 +4527,40 @@ textarea {
 }
 
 .insectPestDetail .detail-info .detail-div .detail-detail {
-  width: calc(100% - 220px);
+  width: calc(100%);
   min-height: 50%;
   display: grid;
-  grid-template-columns: repeat(auto-fill, minmax(240px, 1fr));
+  grid-template-columns: repeat(4, minmax(240px, 1fr));
   grid-row-gap: 10px;
   grid-column-gap: 10px;
 }
 
+.insectPestDetail .detail-info .detail-div .detail-detail .detail-detail-div {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+}
+
 .insectPestDetail .detail-info .detail-div .detail-detail .detail-detail-div .title {
   font-weight: bold;
   margin-bottom: 5px;
 }
 
+.insectPestDetail .detail-info .detail-div .detail-detail .detail-detail-div.to-more {
+  cursor: pointer;
+}
+
+.insectPestDetail .detail-info .detail-div .detail-detail .detail-detail-div .text {
+  display: flex;
+  align-items: center;
+}
+
+.insectPestDetail .detail-info .detail-div .detail-detail .detail-detail-div .text img {
+  width: 20px;
+  height: 20px;
+  margin-right: 5px;
+}
+
 .insectPestDetail .detail-data {
   width: 100%;
   height: 49%;
diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss
index 7d1f0936..0aad7db7 100644
--- a/src/assets/css/main.scss
+++ b/src/assets/css/main.scss
@@ -4831,17 +4831,32 @@ textarea {
                 }
             }
             .detail-detail{
-                width: calc(100% - 220px);
+                width: calc(100% );
                 min-height: 50%;
                 display: grid;
-                grid-template-columns: repeat(auto-fill, minmax(240px, 1fr));
+                grid-template-columns: repeat(4, minmax(240px, 1fr));
                 grid-row-gap: 10px; //纵向间隔
                 grid-column-gap: 10px; //横向间隔
-                .detail-detail-div{
+                .detail-detail-div{display: flex;
+                    flex-direction: column;
+                    justify-content: center;
                     .title{
                         font-weight: bold;
                         margin-bottom: 5px;
                     }
+                    &.to-more{
+                        cursor: pointer;
+                    }
+                    .text{
+                        display: flex;
+                        align-items: center;
+                     
+                        img{
+                            width: 20px;
+                            height: 20px;
+                            margin-right: 5px;
+                        }
+                    }
                 }
             }
         }
diff --git a/src/assets/image/more.png b/src/assets/image/more.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1e12109d1d19bf050563b4be17417931cf16ff2
GIT binary patch
literal 879
zcmV-#1CacQP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px&DM>^@RCr$Pn_+U?APj}kO}aN}PSWNiNluc@Nt&LddlS;Pfegm7kw6Z32G3;j
zV{KONTOovy$(``>-v4mU{c_Iz4(4Bp=%q#q)jZVm8SgzrzcM!5oO2IEg#Y5}Q~-9w
zN5N_cUjTwz!L{&baovdM-C`h&ArM~$;SNACxK__|?c7YiXve;*bM7beqlrC%y!RO3
zk5-xDegvpT#r=z0_rzn|;JL6r_goPK06;*A(X`gi(sKw->giAtAHTE(0s#EW=z*Ln
zk}~SyRq3S$AQj&V0RVifu{i(+>LU?hzKSlb_!bDm0jL#U3t=b#t>SAS3<JPQycWU`
z0IbDpAan<?lZQ0r4-yDObQu9az6!y16Y&BF*RB9IT;EiD0m7{}04@!`Xt%VY<l=MB
z^Ys7T=k)&G0Fb{U6HPBs4lfm*cmP*N=sN{q+{RwS6vECb^U&1;0sweH^=_`@2|MEN
z>3MemM?xrx$9E3_;0Op3@k0Tygdi0^8~_Ul8u42IP`+v{h@i@pmZ-G#fU3Z#6(0d0
z0_PQ+QgGFNu1;=3nF}Cu+t?+tMtlUY%8s<^3iqQteyJH#3ZYhf1ORvANY~iRJ)^D%
zrh}9q1P|d(ibT^co(sgYHm=5A3j#I3H;cT!0D(Km5sANhK&`s(er^XsZi-m^sQ@HP
z<lb~ui9a2H1Okr6(`_wQh8IogJ-W?lra<oJVM-uoH66m97JyX@ngFawo^_n*0cZW?
ztnAKPWH7GP#^}8z3rwQCh1SiLBBsJeb&053WDe|DVQm?zMJD{}d70e81L7E~LznMr
zkrCAcdbI0owaBzm&v$5|E%8RXj<qd|sW41cIOO?xzmj@$!=%i4#cKjcdl#n%jMOF8
z+Fiy43-A4$0$Fl5W5A37$;%Zp2+kllP_OV@1=gMGGZU;Sb!SIwGY^<~z_Q9U6QP+1
z6%wItEi%k9i1WX{jTMo+U1v1~hG~&uc5aQ@*~b@4D^lTMT4WA<fioqss80gGR!5c<
zeNjD7c>dpN)5;dEMaJS_B))ryGketwlgX>`u;XxBJ^(Lxu)E81!dd_T002ovPDHLk
FV1hGLj_Uvb

literal 0
HcmV?d00001

diff --git a/src/views/index.vue b/src/views/index.vue
index cae20477..7dce10b6 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -510,7 +510,7 @@ export default {
         toRouter(item) {
             if (item.router) {
                 // 是虫情
-                if(this.deviceName=='99'){
+                if(this.routerNow == 'insectPestDetail'||this.routerNow == 'insectPestImageList'){
                      this.$message('虫情设备无该页面');
                      return
                 }
@@ -584,14 +584,14 @@ export default {
                 if (item.http) {
                     window.location.href = item.http;
                 }else if(item.isRouter){
-                        
                         // 虫情页面逻辑
                         if(item.deviceName=='99'){
                             this.$router.push({ path: item.router,query:{id:item.deviceId} })
+                           
                         }else{
                             this.$router.push({ path: item.router })
                         }
-                         
+                          
                 } else if ( this.$route.query.index != item.index) {
                     if (this.routerNow == 'realTime'||item.router=='realTime') {
                         this.$store.state.equipmentIndex = item.index
diff --git a/src/views/insectPest/detail.vue b/src/views/insectPest/detail.vue
index 95c39908..abdc663d 100644
--- a/src/views/insectPest/detail.vue
+++ b/src/views/insectPest/detail.vue
@@ -3,9 +3,9 @@
     <div class="detail-info">
       <div class="table-title">设备详情</div>
       <div class="detail-div">
-        <div class="detail-img">
+        <!-- <div class="detail-img">
           <img src="../../assets/image/pest.png" alt="" />
-        </div>
+        </div> -->
         <div class="detail-detail" v-if="detail">
             <div class="detail-detail-div">
               <div class="title">设备名称:</div>
@@ -35,6 +35,9 @@
               <div class="title">设备所属sim卡:</div>
               <div class="text">{{detail.simCardNo}}</div>
             </div>
+               <div @click="toMore" class="detail-detail-div to-more">
+              <div class="text"> <img src="../../assets/image/more.png" alt="" />更多操作</div>
+            </div>
         </div>
       </div>
     </div>
@@ -108,6 +111,10 @@ export default {
           }
         });
     },
+    toMore(){
+      window.open('https://zdny.zznongyeyiqi.com/index', '_blank');
+      
+    },
     getTimeNew() {
       // 获取当前日期（格式：YYYY-MM-DD）
       const today = new Date().toISOString().split("T")[0];