ソースを参照

后台界面 大屏界面修改

zhanghao 1 ヶ月 前
コミット
3f71f423ce

BIN
src/assets/images/main/components_bg_2025.png


+ 67 - 68
src/views/pad/engineering/unitAccessDialog.vue

@@ -3,8 +3,8 @@
       class="main-data terminal-dialog-area"
       @click.stop="preventDefault"
       @mouseleave="leaveFun"
-  
-  
+
+
     >
       <div class="dialog-title">
         <img src="@/assets/images/main/cont_title_bg.png" />
@@ -28,7 +28,7 @@
                   <div style="font-size: 38px;letter-spacing: 6px;color: #00FFFF;font-family: 'electronicFont'">{{ num }}<span style="font-size: 12px">个</span></div>
                 </div>
               </div>
-  
+
             </div>
           </div>
         </div>
@@ -67,14 +67,14 @@
       </div>
     </div>
   </template>
-  
+
   <script>
   import LineChart from "@/components/Echarts/LineChart";
   import PieChart from "@/components/Echarts/PieChart";
   import BarChart from "@/components/Echarts/BarChart.vue";
   import echarts from "echarts";
   import { getProjectNum, getProjectNumX, getProjectNumY } from '@/api/screen/service'
-  
+
   export default {
     name: "BuildingSaveDialog",
     components: {
@@ -135,13 +135,13 @@
         totalCenter: ["30%", "50%"],
         catePieCenter: ["27%", "50%"],
         pieRadius: ["35%", "50%"],
-  
+
         //各单位终端在线
         barData: [],
         barAxis: {},
         barYAxis: {},
         barLegend: {},
-  
+
         personInOutBarData: [
           {
             name: "员工",
@@ -382,7 +382,7 @@
       chooseHealth(){
         this.$emit('chooseH')
       },
-  
+
       //实例化饼图
       handlePie() {
         this.pieData = [
@@ -390,7 +390,7 @@
           { value: 200, name: "在线数" },
         ];
       },
-  
+
       //实例化柱状图
       handleBar() {
         this.barData = [
@@ -422,7 +422,7 @@
             data: [120, 332, 101, 134, 290, 300],
           },
         ];
-  
+
         this.barGrid = {
           top: 30,
           bottom: 0,
@@ -430,7 +430,7 @@
           right: "5%",
           containLabel: true,
         };
-  
+
         this.barLegend = {
           right: 20,
           top: 0,
@@ -440,7 +440,7 @@
             color: "#FFF",
           },
         };
-  
+
         this.barAxis = {
           type: "category",
           data: [
@@ -464,7 +464,7 @@
           },
           splitArea: false,
         };
-  
+
         this.barYAxis = {
           name: "数量(个)",
           nameTextStyle: {
@@ -488,30 +488,30 @@
           splitArea: false,
         };
       },
-  
+
       //鼠标移出
       leaveFun() {
         setTimeout(() => {
           this.$emit("closeDialog");
         }, 200);
       },
-  
+
       preventDefault() {
         console.log(11);
       },
     },
   };
   </script>
-  
+
   <style  scoped lang="scss" >
   .terminal-dialog-area {
     overflow: hidden;
     width: 580px;
-    height: 581px;
-    background: url("../../../assets/images/main/components_bg_2025.png");
-    background-size: cover;
+    height: 920px;
+    background: url("../../../assets/images/main/main_bg.png") no-repeat;
+    background-size: contain;
     padding: 19px 15px 11px 15px;
-  
+
     .dialog-title {
       display: flex;
       flex-direction: row;
@@ -536,17 +536,17 @@
         color: #fff;
       }
     }
-  
+
     .dialog-cont {
       width: 550px;
-      height: 493px;
+      height: 849px;
       padding: 15px;
       overflow-y: scroll;
-      background: url("../../../assets/images/main/components_nable.png")
+      background: url("../../../assets/images/main/components_long_bg.png")
       no-repeat;
-      background-size: cover;
-  
-  
+      background-size: contain;
+
+
       .dialog-left {
         width: 520px;
         float: left;
@@ -556,27 +556,27 @@
         float: right;
       }
     }
-  
+
     .dialog-list {
       width: 100%;
       display: flex;
       justify-content: space-between !important;
       margin-bottom: 0px;
-  
+
       .dialog-item {
         width: calc(50% - 20px);
       }
-  
+
       .dialog-item-cont {
         display: flex;
         justify-content: center;
         align-items: center;
         margin-top: 40px;
       }
-  
+
       .wid100 {
         width: 100%;
-  
+
         .content-title {
           width: 100%;
           background: url("../../../assets/images/main/title_pro_long.png")
@@ -584,7 +584,7 @@
         }
       }
     }
-  
+
     .content-title {
       width: 230px;
       height: 26px;
@@ -605,7 +605,7 @@
       width: 100%;
       background: url("../../../assets/images/main/title_pro_long.png") no-repeat !important;
     }
-  
+
     .content {
       .title-format {
         width: 150px;
@@ -625,7 +625,7 @@
           }
         }
       }
-  
+
       .rate-area {
         position: relative;
         img {
@@ -699,12 +699,12 @@
           font-size: 12px;
         }
       }
-  
+
       .rate-area {
         width: 150px;
         height: 70px;
         position: relative;
-  
+
         img {
           width: 150px;
           height: 70px;
@@ -717,7 +717,7 @@
           width: 100%;
           position: absolute;
           top: 0;
-  
+
           color: #fff;
           .rate-data {
             display: flex;
@@ -742,10 +742,10 @@
         margin-top: 50px;
       }
     }
-  
+
     .other-cont {
       display: flex;
-  
+
       .icon {
         display: block;
         width: 70px;
@@ -753,7 +753,7 @@
       }
       .other-info {
         padding-left: 2px;
-  
+
         .desc {
           font-size: 12px;
           color: #ffffff;
@@ -764,7 +764,7 @@
           padding-top: 2px;
           display: flex;
           align-items: center;
-  
+
           .num {
             font-size: 30px;
             color: #19fcde;
@@ -784,21 +784,21 @@
         }
       }
     }
-  
+
     .mar {
       margin-bottom: 15px;
     }
     .data-left {
       width: auto;
-  
+
       .data-item {
         width: auto;
         margin-bottom: 23px;
-  
+
         .data-fir {
           display: flex;
           align-items: center;
-  
+
           .icon {
             width: 15px;
             height: 15px;
@@ -813,7 +813,7 @@
           display: flex;
           align-items: center;
           padding-top: 2px;
-  
+
           .num {
             font-size: 32px;
             color: #00ffff;
@@ -832,7 +832,7 @@
     }
     .data-right {
       padding-top: 3px;
-  
+
       .circle {
         width: 100px;
         height: 100px;
@@ -841,7 +841,7 @@
         display: flex;
         justify-content: center;
         align-items: flex-start;
-  
+
         .value {
           display: flex;
           align-items: center;
@@ -861,7 +861,7 @@
         }
       }
     }
-  
+
     .choose-area {
       margin: 20px 0;
       .choose-item {
@@ -876,10 +876,10 @@
         cursor: pointer;
       }
     }
-  
+
     .table-cont {
       width: 100%;
-  
+
       .table-top {
         width: 100%;
         height: 26px;
@@ -895,7 +895,7 @@
       }
       .table-bot {
         width: 100%;
-  
+
         .table-list {
           width: 100%;
           height: 38px;
@@ -952,12 +952,12 @@
         margin-bottom: 10px !important;
       }
     }
-  
+
     .data-chart {
       margin-top: 12px !important;
       margin-bottom: 10px !important;
     }
-  
+
     ::-webkit-scrollbar {
       display: none;
       width: 3px;
@@ -995,7 +995,7 @@
           color:#00FFFF;
           font-weight: 500;
           position: relative;
-  
+
           left:2px;
         }
       }
@@ -1003,7 +1003,7 @@
     .saddddf{
       display: flex;
       flex-direction: column;
-  
+
     }
     .naw{
       color: white;
@@ -1015,7 +1015,7 @@
       align-items: flex-start;
       justify-content: space-between;
       padding: 15px 20px 0 15px;
-  
+
     }
     .contentr-left{
       width: 520px;
@@ -1034,7 +1034,7 @@
       height:240px;
       float: left;
     }
-  
+
     .names{
       font-size: 32px;
       color:#00FFFF;
@@ -1044,15 +1044,15 @@
         color:#00FFFF;
         font-weight: 500;
         position: relative;
-  
+
         left:2px;
       }
-  
+
     }
-  
+
     .content-maper{
-  
-  
+
+
       .content-one{
         display: flex;
         padding-top: 10px;
@@ -1114,11 +1114,11 @@
       }
       .box-small{
         width: 20%;
-  
+
         height: 50px;
         .box-above{
           display: flex;
-  
+
         }
       }
       .box-smalls{
@@ -1126,7 +1126,7 @@
         height: 50px;
         .box-above{
           display: flex;
-  
+
         }
       }
     }
@@ -1135,7 +1135,7 @@
       // border-radius: 5px;
       background-color: #58cbbb;
     }
-  
+
     ::-webkit-scrollbar-track {
       //轨道部分
       // box-shadow: inset 0 0 5px #ddd;
@@ -1144,4 +1144,3 @@
     }
   }
   </style>
-  

+ 2 - 2
src/views/pad/logistics/car/carStock.vue

@@ -3,7 +3,7 @@
     <div class="c1_title"></div>
     <div class="c1_body">
       <div style="display: flex;justify-content: center;align-items: center;margin-bottom: 10px;flex-wrap: wrap">
-        <div style="display: flex;width: 100%;align-items: center;justify-content: center;margin-bottom: 10px;">
+        <div style="display: flex;width: 100%;align-items: center;margin: 0 0 10px 25px">
           <img src="../../../../assets/zhang/publicCar/car.png" width="68" style="margin-right: 20px">
           <div class="carInstall">
             <div style="width: 90%;display: flex;flex-wrap: wrap">
@@ -16,7 +16,7 @@
             <div style="width: 8%;height:30px;border-right: 3px #14424C solid"></div>
           </div>
         </div>
-        <div style="display: flex;width: 100%;align-items: center;justify-content: center">
+        <div style="display: flex;width: 100%;align-items: center;margin: 0 0 0 25px">
           <img src="../../../../assets/zhang/publicCar/car.png" width="68" style="margin-right: 20px">
           <div class="carInstall">
             <div style="width: 90%;display: flex;flex-wrap: wrap">

+ 1 - 1
src/views/pad/logistics/car/carStockDialog.vue

@@ -382,7 +382,7 @@ export default {
   width: 550px;
   height: 920px;
   background: url("../../../../assets/images/main/components_long_bg.png") no-repeat;
-  background-size: cover;
+  background-size: 100% 100%;
   margin-top: 4px;
 }
 .c1_title{

+ 4 - 4
src/views/pad/official/terminalDataDialog.vue

@@ -577,10 +577,10 @@ export default {
 <style lang="scss" scoped>
 .c1 {
   width: 580px;
-  height: 920px;
+  height: 1000px;
   padding-top: 19px;
   background: url("../../../assets/images/main/main_bg.png") no-repeat;
-  background-size: cover;
+  background-size: 100% 100%;
 }
 .Img {
   width: 284px;
@@ -588,9 +588,9 @@ export default {
 }
 .c1_bg{
   width: 550px;
-  height: 849px;
+  height: 920px;
   background: url("../../../assets/images/main/components_long_bg.png") no-repeat;
-  background-size: cover;
+  background-size: 100% 100%;
   margin-top: 4px;
 }
 .overTitle{

+ 2 - 2
src/views/screen/logistics/car/carStock.vue

@@ -3,7 +3,7 @@
     <div class="c1_title"></div>
     <div class="c1_body">
       <div style="display: flex;justify-content: center;align-items: center;margin-bottom: 10px;flex-wrap: wrap">
-        <div style="display: flex;width: 100%;align-items: center;justify-content: center;margin-bottom: 10px;">
+        <div style="display: flex;width: 100%;align-items: center;margin: 0 0 10px 25px;">
           <img src="../../../../assets/zhang/publicCar/car.png" width="68" style="margin-right: 20px">
           <div class="carInstall">
             <div style="width: 90%;display: flex;flex-wrap: wrap">
@@ -16,7 +16,7 @@
             <div style="width: 8%;height:30px;border-right: 3px #14424C solid"></div>
           </div>
         </div>
-        <div style="display: flex;width: 100%;align-items: center;justify-content: center">
+        <div style="display: flex;width: 100%;align-items: center;margin: 0 0 0 25px">
           <img src="../../../../assets/zhang/publicCar/car.png" width="68" style="margin-right: 20px">
           <div class="carInstall">
             <div style="width: 90%;display: flex;flex-wrap: wrap">

+ 1 - 1
src/views/screen/logistics/car/carStockDialog.vue

@@ -1,6 +1,6 @@
 <template>
   <div style="display: flex;width: 100%">
-    <div class="c1" >
+    <div class="c1" @mouseleave="leaveFun">
       <div style="display: flex;justify-content: center;width: 100%;flex-wrap: wrap">
         <div style="position: relative;height: 38px">
           <div class="overTitle">监控管理</div>

+ 0 - 3
src/views/screen/official/main.vue

@@ -327,7 +327,6 @@ export default {
 
     chooseOp(title, alertType){
       this.op = title
-      this.closeDialog()
       this.alertType = alertType
       getWarnDetail(this.appOrg, alertType, 10, 0).then(res => {
         if (Number(res.code) === 200) {
@@ -350,7 +349,6 @@ export default {
     },
 
     chooseCost(){
-      this.closeDialog()
       getCarDetail(this.appOrg, 0, 10, 0).then(res => {
         if (Number(res.code) === 200) {
           this.dataList = res.data.list
@@ -366,7 +364,6 @@ export default {
     },
 
     chooseHealth(){
-      this.closeDialog()
       getCarDetail(this.appOrg, 1, 10, 0).then(res => {
         if (Number(res.code) === 200) {
           this.dataList = res.data.list

+ 1 - 1
src/views/screen/official/terminalDataDialog.vue

@@ -1,6 +1,6 @@
 <template>
   <div style="display: flex;width: 100%">
-    <div class="c1">
+    <div class="c1" @mouseleave="leaveFun">
       <div style="display: flex;justify-content: center;width: 100%;flex-wrap: wrap">
         <div style="position: relative;height: 38px">
           <div class="overTitle">资源台账</div>