wangmengwei 2 周之前
父節點
當前提交
463ebc85e0

二進制
ruoyi-ui/src/assets/images/ico_htgl_yzd.png


二進制
ruoyi-ui/src/assets/images/pic_htgl_sbyx_dks.png


二進制
ruoyi-ui/src/assets/images/pic_htgl_sbyx_gbs.png


+ 3 - 1
ruoyi-ui/src/settings.js

@@ -1,6 +1,8 @@
 module.exports = {
-  urls: `http://192.168.101.32:8099`,
+  urls: `http://192.168.101.245:8099`,
+   // urls: `http://10.90.90.53:8099`,
   // 10.90.90.52 192.168.101.245
+  // 10.90.90.53
   // urls:`https://zxygj.qs163.cn`,
   /**
    * 侧边栏主题 深色主题theme-dark,浅色主题theme-light

+ 1 - 1
ruoyi-ui/src/views/dashboard/PieChart.vue

@@ -99,7 +99,7 @@ watch: {
                            {
                              // name:'访问来源',
                              type:'pie',
-                             radius: ['40%', '70%'],
+                             radius: ['50%', '70%'],
                               center: ['30%', '39%'],
                              avoidLabelOverlap: false,
                              minShowLabelAngle: 2,

+ 6 - 7
ruoyi-ui/src/views/dashboard/RaddarChart.vue

@@ -77,12 +77,11 @@ export default {
           radar: {
             // shape: 'circle',
             indicator: [
-              { name: 'Sales', max: 6500 },
-              { name: 'Administration', max: 16000 },
-              { name: 'Information Technology', max: 30000 },
-              { name: 'Customer Support', max: 38000 },
-              { name: 'Development', max: 52000 },
-              { name: 'Marketing', max: 25000 }
+              { name: '烟雾告警', max: 65000 },
+              { name: '越线告警', max: 66000 },
+              { name: '徘徊告警', max: 30000 },
+              { name: '陌生人告警', max: 38000 },
+              { name: '火焰告警', max: 52000 },
             ]
           },
           series: [
@@ -97,7 +96,7 @@ export default {
                       },
               data: [
                 {
-                  value: [4200, 3000, 20000, 35000, 50000, 18000],
+                  value: [42000, 30800, 20000, 35000, 30000, ],
                   name: 'Allocated Budget',
                   // 设置区域边框和区域的颜色
                                   itemStyle: {

+ 72 - 59
ruoyi-ui/src/views/index.vue

@@ -402,7 +402,7 @@
                     <span class="text_24">快捷功能</span>
                   </div>
                   <div class="image-wrapper_1 flex-row justify-between">
-                    <div style="text-align: center;">
+                    <div style="text-align: center;cursor: pointer;" @click="tiahz(0)">
                       <img
                         class="label_2"
                         referrerpolicy="no-referrer"
@@ -412,7 +412,7 @@
                          <span class="text_25">人员管理</span>
                       </div>
                     </div>
-                    <div style="text-align: center;">
+                    <div style="text-align: center;cursor: pointer;" @click="tiahz(1)">
                       <img
                         class="label_3"
                         referrerpolicy="no-referrer"
@@ -422,34 +422,34 @@
                          <span class="text_26">设备管理</span>
                       </div>
                     </div>
-                    <div style="text-align: center;">
+                    <div style="text-align: center; cursor: pointer;" @click="tiahz(2)">
                       <img
                         class="label_4"
                         referrerpolicy="no-referrer"
                         src="../assets/images/icon_hthp_kj_jkgl.png"
                       />
                       <div style="margin-top: 10px;">
-                         <span class="text_27">监控回放</span>
+                         <span class="text_27">视频告警</span>
                       </div>
                     </div>
-                    <div style="text-align: center;">
+                    <div style="text-align: center; cursor: pointer;" @click="tiahz(3)">
                       <img
                         class="label_5"
                         referrerpolicy="no-referrer"
                         src="../assets/images/icon_hthp_kj_yjbk.png"
                       />
                       <div style="margin-top: 10px;">
-                          <span class="text_28">一键布控</span>
+                          <span class="text_28">网络管理</span>
                       </div>
                     </div>
-                    <div style="text-align: center;">
+                    <div style="text-align: center; cursor: pointer;" @click="tiahz(4)">
                       <img
                         class="label_6"
                         referrerpolicy="no-referrer"
                         src="../assets/images/icon_hthp_kj_yjcf.png"
                       />
                       <div style="margin-top: 10px;">
-                         <span class="text_29">一键撤防</span>
+                         <span class="text_29">通道管理</span>
                       </div>
                     </div>
                   </div>
@@ -482,7 +482,7 @@
                         </div>
             <!-- 日历-->
             <div class="timeall">
-                    <i class="el-icon-arrow-left lastbt" @click="lastclick"></i>
+                    <i style="cursor: pointer;" class="el-icon-arrow-left lastbt" @click="lastclick"></i>
                     <div class="table_header">
                         <div class="weekday" v-for="(item,index) in weekAll" :key="index">
                              <span>{{item}}</span>
@@ -490,11 +490,11 @@
                     </div>
                     <div class="table_header">
                         <div class="weekday test"   v-for="(item,index) in weekDayArr" :key="index">
-                             <span :class="item.adate==todayDate?'finish':''"   @click="getAdate(item)">{{item.adate.slice(8,10)}}</span>
+                             <span style="cursor: pointer;" :class="item.adate==todayDate?'finish':''"   @click="getAdate(item)">{{item.adate.slice(8,10)}}</span>
                         </div>
                     </div>
 
-                    <i class="el-icon-arrow-right nextbt" @click="nextclick"></i>
+                    <i style="cursor: pointer;" class="el-icon-arrow-right nextbt" @click="nextclick"></i>
                   </div>
             <!-- 内容 -->
                 <div>
@@ -529,47 +529,22 @@
                           </div>
                           <span class="text_100">查看更多&nbsp;→</span>
                         </div>
-                        <div class="section_10 flex-row">
-                          <div class="image-text_6 flex-col justify-between">
+                        <div class="section_10 flex-row" style="flex-wrap: wrap;">
+                          <div class="image-text_6 flex-col justify-between" v-for="(item,index) in  14">
                             <img
+                            v-if="index == 1 || index == 9"
                               class="image_6"
                               referrerpolicy="no-referrer"
-                              src="../assets/images/pic_htgl_sbyx_gb.png"
+                              src="../assets/images/pic_htgl_sbyx_dks.png"
                             />
-                            <span class="text-group_6">设备01</span>
-                          </div>
-                          <div class="image-text_7 flex-col justify-between">
                             <img
-                              class="image_7"
+                             v-else
+                              class="image_6"
                               referrerpolicy="no-referrer"
-                              src="../assets/images/pic_htgl_sbyx_dk.png"
+                              src="../assets/images/pic_htgl_sbyx_gbs.png"
                             />
-                            <span class="text-group_7">设备02</span>
+                            <span class="text-group_6">设备{{ index >8 ? index + 1 : '0'  + (index + 1)}}</span>
                           </div>
-                          <div class="image-text_6 flex-col justify-between">
-                                                      <img
-                                                        class="image_6"
-                                                        referrerpolicy="no-referrer"
-                                                        src="../assets/images/pic_htgl_sbyx_gb.png"
-                                                      />
-                                                      <span class="text-group_6">设备03</span>
-                                                    </div>
-                          <div class="image-text_6 flex-col justify-between">
-                                                      <img
-                                                        class="image_6"
-                                                        referrerpolicy="no-referrer"
-                                                        src="../assets/images/pic_htgl_sbyx_gb.png"
-                                                      />
-                                                      <span class="text-group_6">设备04</span>
-                                                    </div>
-                         <div class="image-text_6 flex-col justify-between">
-                                                     <img
-                                                       class="image_6"
-                                                       referrerpolicy="no-referrer"
-                                                       src="../assets/images/pic_htgl_sbyx_gb.png"
-                                                     />
-                                                     <span class="text-group_6">设备05</span>
-                                                   </div>
                         </div>
                       </div>
           </div>
@@ -1445,6 +1420,35 @@
                     };
               this.resetForm("formg");
             },
+      tiahz(item){
+        if(item == 0){
+          // 人员管理
+          this.$router.push({
+            path: '/renyuan',
+          })
+        }else if(item == 1){
+          // 设备管理
+          this.$router.push({
+            path: '/shebei',
+          })
+        }else if(item == 2){
+          // 视频告警
+          this.$router.push({
+            path: '/gaojingguanli',
+          })
+        }else if(item == 3){
+          // 网络告警
+          this.$router.push({
+            path: '/NetworkManage',
+          })
+        }else if(item == 4){
+          // 通道管理
+          this.$router.push({
+            path: '/channelNumber',
+          })
+        }
+
+      }
 
     }
   };
@@ -1513,6 +1517,12 @@
       line-height: 102px;
     }
   }
+  .index{
+    .el-select-dropdown__item .selected{
+      color: #03BF8A;
+    }
+  }
+
 
   </style>
 
@@ -2414,12 +2424,15 @@ button:active {
   margin-left: 12px;
   .el-input--medium .el-input__inner{
     background-color: rgba(238, 248, 245, 1);
+
     border-radius: 11px;
     border-color: rgba(238, 248, 245, 1);
     width: 102px;
+    border: none;
     color: #333;
     // height: 24px;
   }
+
   .el-input--medium .el-input__inner{
     height: 24px;
     line-height: 24px;
@@ -3409,7 +3422,7 @@ button:active {
   text-align: center;
   white-space: nowrap;
   line-height: 26px;
-  margin: 11px 0 0 1px;
+  margin: 15px 0 0 1px;
 }
 
 .text_75 {
@@ -3870,7 +3883,7 @@ button:active {
 .box_16 {
   background-color: rgba(255, 255, 255, 1);
   border-radius: 10px;
-  height: 232px;
+  height: 239px;
   margin-top: 12px;
   width: 100%;
 }
@@ -3927,13 +3940,13 @@ button:active {
 }
 
 .image-text_6 {
-  width: 58px;
-  height: 149px;
+  width: 41px;
+  height: 90px;
 }
 
 .image_6 {
-  width: 58px;
-  height: 127px;
+  width: 41px;
+  height: 69px;
 }
 
 .text-group_6 {
@@ -3941,7 +3954,7 @@ button:active {
   height: 15px;
   overflow-wrap: break-word;
   color: rgba(51, 51, 51, 1);
-  font-size: 16px;
+  font-size: 12px;
   font-family: PingFang-SC-Medium;
   font-weight: 500;
   text-align: left;
@@ -3951,14 +3964,14 @@ button:active {
 }
 
 .image-text_7 {
-  width: 59px;
-  height: 149px;
+  width: 41px;
+  height: 90px;
   // margin-left: 28px;
 }
 
 .image_7 {
-  width: 59px;
-  height: 127px;
+  width: 41px;
+  height: 69px;
 }
 
 .text-group_7 {
@@ -3966,7 +3979,7 @@ button:active {
   height: 15px;
   overflow-wrap: break-word;
   color: rgba(51, 51, 51, 1);
-  font-size: 16px;
+  font-size: 12px;
   font-family: PingFang-SC-Medium;
   font-weight: 500;
   text-align: left;
@@ -4129,11 +4142,11 @@ button:active {
 .timeall{
     position: relative;
     width: 100%;
-    margin-top: 40px;
+    margin-top: 30px;
   }
   .lastbt,.nextbt{
     position: absolute;
-    top:18px;
+    top:25px;
   }
   .lastbt{
     left: -7px;
@@ -4141,7 +4154,7 @@ button:active {
   .nextbt{
     right: -7px;
   }
-.table_header{ display:flex; justify-content: center; color:#8e8e8e;}
+.table_header{ display:flex; justify-content: center; color:#8e8e8e;margin-bottom: 10px;}
 .week_one{ text-align: center; line-height: 50px; border-bottom:1px solid #f5f4f7; border-left:1px solid #f5f4f7; background: #e9f0fe;  width:200px; }
 .weekday{ flex:1; text-align: center; line-height: 25px; }
 .finish {

+ 4 - 0
ruoyi-ui/src/views/shipinggaoj/gaojingguanli/index.vue

@@ -700,6 +700,9 @@ export default {
 };
 </script>
 <style  lang="scss">
+  .ckilde{
+    // color: #03BF8A;
+  }
   .quning{
     .el-image{
       box-shadow:0;
@@ -797,6 +800,7 @@ export default {
 
     }
   }
+
   </style>
 
 

+ 1 - 1
ruoyi-ui/src/views/shipinggaoj/shebe/index.vue

@@ -73,7 +73,7 @@
               <div style=" height: 36px;;line-height: 36px;margin-top: 10px;"v-for="(item,index) in 6">
                               <div @click="ishg(item)" style="display: flex;align-items: center;justify-content: space-between;">
                                 <div style="font-size: 16px;
-              color: #333333;">通道0{{index +1}}</div>
+              color: #333333;"> 通道{{ index >8 ? index + 1 : '0'  + (index + 1)}}</div>
                                 <img src="../../../assets/images/icon_htgl_zd.png" alt="" style="width: 10px;height: 12px;">
                               </div>
                           </div>