瀏覽代碼

Merge branch 'lifeline_develop_siping_v3' of F:\工作\四平生命线\visu_lifeline with conflicts.

WXX-xiaoxue 1 周之前
父節點
當前提交
cc4f46c65d
共有 4 個文件被更改,包括 36 次插入234 次删除
  1. 20 15
      src/views/industry/jcxt.vue
  2. 11 10
      src/views/industry/jgpt.vue
  3. 3 207
      src/views/industry/qiaoliang.vue
  4. 2 2
      vue.config.js

+ 20 - 15
src/views/industry/jcxt.vue

@@ -1797,21 +1797,6 @@
 		}
 	}
 
-	.sj-input-style {
-		margin-top: 5px !important;
-
-		.el-input__inner {
-			height: 30px;
-			line-height: 30px;
-			background-color: rgba(12, 44, 80, 0.52);
-			border: 1px solid #326e96;
-			color: #0fc0ee;
-		}
-
-		.el-input__icon {
-			line-height: 30px;
-		}
-	}
 
 	.sj-select {
 		margin: 0 10px !important;
@@ -3168,4 +3153,24 @@
 			/* 确保三角形中心对齐链接的中心 */
 		}
 	}
+
+  .sj-input-style {
+    margin-top: 5px !important;
+    width: 100% !important;
+
+    .el-input__inner {
+      height: 30px;
+      line-height: 30px;
+      background-color: rgba(12, 44, 80, 0.52);
+      border: 1px solid #326e96;
+      color: #0fc0ee;
+
+    }
+
+    .el-input__icon {
+      line-height: 30px;
+    }
+  }
+
+
 </style>

+ 11 - 10
src/views/industry/jgpt.vue

@@ -3339,7 +3339,7 @@
 		align-items: center;
 		position: absolute;
 		left: 570px;
-		bottom: 65px;
+		/*bottom: 65px;*/
 		z-index: 100;
 		transition: all 0.3s ease-in-out;
 		cursor: pointer;
@@ -3350,15 +3350,7 @@
 			height: 22px;
 		}
 	}
-	.zy-icon1{
-		bottom:250px;
-		}
-	.zy-icon2{
-		bottom:180px;
-	}
-	.zy-icon3{
-		bottom: 110px !important;
-	}
+
 
 
 	.zy-icon:hover {
@@ -4968,4 +4960,13 @@
 	.mar-top45{
 		margin-top: 45px!important;
 	}
+  .zy-icon1{
+    bottom: 200px !important;
+  }
+  .zy-icon2{
+    bottom: 70px !important;
+  }
+  .zy-icon3{
+    bottom: 135px !important;
+  }
 </style>

+ 3 - 207
src/views/industry/qiaoliang.vue

@@ -29,42 +29,6 @@
         <div class="all-title">
           <span>{{type}}</span>
         </div>
-        <div v-if="type=='设备管理'" class="sbgl_list">
-          <div class="sbgl_zs">
-            <img src="../../assets/index_img/sbgl_icon1.png"/>
-            <div class="sbgl_num1">
-              <span>设备总数</span>
-              <b>{{ totalCount }}</b>
-            </div>
-            <div class="sbgl_num2">
-              <span>设备在线</span>
-              <b>{{ onlineCount }}</b>
-            </div>
-            <div class="sbgl_num3">
-              <span>设备离线</span>
-              <b>{{ offlineCount }}</b>
-            </div>
-            <div class="sbgl_num4">
-              <h4>{{percentage(totalCount,onlineCount)}}%</h4>
-              <i>在线率</i>
-            </div>
-          </div>
-<!--          <div class="sbgl_fs">-->
-<!--            <div class="sbgl_fs_div"  v-for="dep in dooByDep">-->
-<!--              <div class="sbgl_fs_left">-->
-<!--                <p>{{ dep.deptName }}</p>-->
-<!--                <b>{{ dep.total }}</b>-->
-<!--                <span>设备总数</span>-->
-<!--              </div>-->
-<!--              <div class="sbgl_fs_right">-->
-<!--                <p class="zx">在线</p>-->
-<!--                <span class="zx_span">{{ dep.online }}</span>-->
-<!--                <p class="lx">离线</p>-->
-<!--                <span class="lx_span">{{ dep.offline }}</span>-->
-<!--              </div>-->
-<!--            </div>-->
-<!--          </div>-->
-        </div>
         <div class="ss-big">
           <!-- 管线管理筛查项 -->
           <div v-if="type=='桥梁管理'" class="sousuo">
@@ -289,7 +253,7 @@
           <el-table
             element-loading-text="数据正在加载中..."
             :data="tableList"
-            height="530">
+            height="650">
             <el-table-column show-overflow-tooltip align="center" v-for="(table,idx) in tablePropAndLabel"
                              :prop="table.prop" :label="table.label" :key="idx" v-if="!table.hidden">
               <template slot-scope="scope">
@@ -775,10 +739,9 @@ import {
 import {bridgeViewSelectDeviceList,
   bridgeViewSelectBridgeStructuralAnalysis,bridgeViewSelectBridgeDefectAnalysis,bridgeViewSelectBridgeInspectionAnalysis,
   bridgeViewGetBridgeInfoList,bridgeViewGetBridgeAllyCrossPierList,bridgeViewGetBridgeCheckDiseaseList,bridgeViewGetBridgeDiseaseDisposalList,
-  bridgeViewGetBridgeMaintenanceRepairList,getDeviceTypeCount,getBridgeDOOByDept
+  bridgeViewGetBridgeMaintenanceRepairList,getDeviceTypeCount
 } from "@/api/qiaoliang";
 import { getWeather } from '@/api/data'
-import { getGasDOOByDept } from '@/api/ThermalPower'
 export default {
   dicts: ['gas_pipeline_category','pressure_level','construction_tasks_status','lifeline_industry',
     'sys_notice_status','sys_notice_type','sys_normal_disable','sys_user_sex','lifeline_enterprise',
@@ -973,10 +936,6 @@ export default {
       detailInfoVisible:false,
       divOptionDialog:false,
       focusList:[],    // 重点关注列表
-      dooByDep:[], // 各部门设备统计
-      totalCount:0,
-      onlineCount:0,
-      offlineCount:0,
     }
   },
   mounted(){
@@ -996,12 +955,6 @@ export default {
     })
   },
   methods: {
-    percentage(totalCount,onlineCount) {
-      // 防止除以0的情况
-      if (totalCount === 0) return 0;
-      // 计算百分比并保留两位小数
-      return ((onlineCount / totalCount) * 100).toFixed(2);
-    },
     getWeather() {
       let date = new Date()
       let y = date.getFullYear()
@@ -1221,7 +1174,6 @@ export default {
       }
     },
     TableInfoHandler(type, deptId, pageNum) {
-      this.getRightSideInside()
       this.deptId = deptId
       this.type = type
       this.tablePropAndLabel = []
@@ -1498,12 +1450,6 @@ export default {
       /****************************************************************设备管理start*******************************************************/
       else if(type=='设备管理'){
         this.tableListVisible = true
-        getBridgeDOOByDept().then(res => {
-          this.dooByDep = res.data.dooByDep
-          this.totalCount = res.data.totalCount
-          this.onlineCount = res.data.onlineCount
-          this.offlineCount = res.data.offlineCount
-        })
         bridgeViewSelectDeviceList({
           pageNum: pageNum || 1,
           pageSize: 10,
@@ -5434,7 +5380,7 @@ div ::-webkit-scrollbar {
 .left-nav-inside {
   width: 450px;
   overflow-y: scroll;
-  top: 50px;
+  top: 0px;
   position: absolute;
   left: -34.75rem !important;
 }
@@ -5525,9 +5471,6 @@ div ::-webkit-scrollbar {
   background: linear-gradient(to right, color(srgb 0.02 0.34 0.69 / 0), color(srgb 0.02 0.34 0.69 / 0.8));
   border-bottom: 1px solid #1166AE;
 }
-.el-table__body-wrapper{
-  height: 470px !important;
-}
 .el-table th.el-table__cell,.el-table tr,.el-table{
   background:none;
   color: #C9E1EF;
@@ -5725,153 +5668,6 @@ div ::-webkit-scrollbar {
     }
   }
 }
-.sbgl_list{
-  display: flex;
-  flex-direction: column;
-  width: 510px;
-  z-index: 999;
-  .sbgl_zs{
-    flex-direction: row;
-    display: flex;
-    justify-content: space-between;
-    border-bottom: 1px solid #496fa6;
-    div{
-      span{
-        font-size: 16px;
-        font-weight: bold;
-        display: block;
-        color: #fff;
-        padding-top: 16px;
-      }
-      b{
-        font-family: 'ysbth';
-        font-size: 22px;
-        line-height: 40px;
-
-      }
-      h4{
-        font-size: 35px;
-        font-family: 'ysbth';
-        color: #00b2ff;
-        text-shadow:0px 0px 9px #05918a;
-        padding-top: 12px;
-      }
-      i{
-        font-size: 12px;
-        color: #fff;
-        font-style: normal;
-      }
-    }
-    .sbgl_num1{
-      b{
-        background: -webkit-linear-gradient(bottom,#96adf7,#fff); /* Chrome, Safari */
-        background: linear-gradient(bottom,#96adf7,#fff); /* 标准语法 */
-        -webkit-background-clip: text; /* Chrome, Safari */
-        background-clip: text;
-        -webkit-text-fill-color: transparent; /* Chrome, Safari */
-        color: transparent; /* 兼容不支持background-clip的浏览器 */
-        /*box-shadow: 0px 0px 5px #3063ca;*/
-
-      }
-    }
-    .sbgl_num2{
-      b{
-        background: -webkit-linear-gradient(bottom,#96f7ab,#fff); /* Chrome, Safari */
-        background: linear-gradient(bottom,#96f7ab,#fff); /* 标准语法 */
-        -webkit-background-clip: text; /* Chrome, Safari */
-        background-clip: text;
-        -webkit-text-fill-color: transparent; /* Chrome, Safari */
-        color: transparent; /* 兼容不支持background-clip的浏览器 */
-        /*box-shadow: 0px 0px 5px #3063ca;*/
-
-      }
-    }
-    .sbgl_num3{
-      b{
-        background: -webkit-linear-gradient(bottom,#ababab,#fff); /* Chrome, Safari */
-        background: linear-gradient(bottom,#ababab,#fff); /* 标准语法 */
-        -webkit-background-clip: text; /* Chrome, Safari */
-        background-clip: text;
-        -webkit-text-fill-color: transparent; /* Chrome, Safari */
-        color: transparent; /* 兼容不支持background-clip的浏览器 */
-        /*box-shadow: 0px 0px 5px #3063ca;*/
-
-      }
-    }
-  }
-  .sbgl_fs{
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-    .sbgl_fs_div{
-      display: flex;
-      flex-direction: row;
-      padding-top: 15px;
-      .sbgl_fs_left{
-        p{
-          font-size: 16px;
-          font-weight: bold;
-          padding-left: 25px;
-          background: url("../../assets/index_img/sbgl_icon2.png") no-repeat left;
-          color: #fff;
-        }
-        b{
-          background: -webkit-linear-gradient(bottom,#96adf7,#fff); /* Chrome, Safari */
-          background: linear-gradient(bottom,#96adf7,#fff); /* 标准语法 */
-          -webkit-background-clip: text; /* Chrome, Safari */
-          background-clip: text;
-          -webkit-text-fill-color: transparent; /* Chrome, Safari */
-          color: transparent; /* 兼容不支持background-clip的浏览器 */
-          /*box-shadow: 0px 0px 5px #3063ca;*/
-          display: block;
-          font-family: 'ysbth';
-          font-size: 20px;
-          padding-left: 25px;
-          line-height: 35px;
-        }
-        span{
-          color: #fff;
-          font-size: 12px;
-          padding-left: 25px;
-        }
-      }
-      .sbgl_fs_right{
-        padding-left: 15px;
-        p{
-          font-size: 12px;
-          padding-left: 10px;
-          color: #fff;
-          position: relative;
-        }
-        p::after{
-          position: absolute;
-          content: '';
-          display: block;
-          width: 5px;
-          height: 5px;
-          left: 0px;
-          top:7px;
-        }
-        p.zx::after{
-          background: #03f38a;
-        }
-        p.lx::after{
-          background: #afafaf;
-        }
-        span.zx_span{
-          color: #03f38a;
-          height: 23px;
-          line-height: 23px;
-        }
-        span.lx_span{
-          color: #afafaf;
-          height: 23px;
-          line-height: 23px;
-        }
-      }
-    }
-  }
-}
 </style>
 <style lang="scss">
 .tk_list_div_box{

+ 2 - 2
vue.config.js

@@ -44,8 +44,8 @@ module.exports = {
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://192.168.10.12:3041`,
 		// target: `http://192.168.4.5:3031`,
-		// target: `http://192.168.4.12:3031`,
-		target: `http://192.168.4.27:3031`,
+		target: `http://192.168.4.6:3031`,
+		// target: `http://192.168.4.27:3031`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''