tongshanglei 2 years ago
parent
commit
2b1f62ac12

+ 1 - 1
.env.development

@@ -3,5 +3,5 @@ ENV = 'development'
 
 # base api
 #VUE_APP_BASE_API = 'http://wxt.rltest.cn:8102'
-#VUE_APP_BASE_API = '127.0.0.1'
+VUE_APP_BASE_API = 'http://127.0.0.1'
 #VUE_APP_BASE_API = 'http://192.168.1.63:8000'

+ 3 - 2
src/views/report/maintainCount/index.vue

@@ -424,9 +424,10 @@ export default {
   margin-bottom: 30px;
 }
 .content-box{
-  width: 33%;
+  width: 30%;
+  margin-right: 3%;
   height:100%;
-
+  padding-right:20px;
   float: left;
 }
 .pie-left-content{

+ 1 - 1
src/views/screen/index.vue

@@ -588,7 +588,7 @@ export default {
     getBarOptions() {
       return {
         title: {
-          text: "已服务螺栓数(季度)",
+          text: "已服务统计",
           textStyle: {
             fontWeight: "600",
             fontSize: "18",

+ 4 - 4
src/views/screen/index_v1.scss

@@ -130,7 +130,7 @@
 .left-chart1-box-contnet{
   width:100%;
   height: 20%;
-  font-size: 2vh;
+  font-size: 1.2vw;
   text-align: center;
   display: inline-block;
 
@@ -149,7 +149,7 @@
   color: #3fd5f1;
   margin-bottom: 5px;
   padding-left: 8px;
-
+  text-align: left;
 }
 .task-table{
   width:100%;
@@ -309,7 +309,7 @@
   width: 5vw;
   min-width: 100px;
   height: 5vh;
-  font-size: 1vh;
+  font-size: 0.6vw;
   position : absolute;
   bottom:20px;
   left : 20px; 
@@ -345,7 +345,7 @@
 .map-right-bottom{
   width: 5vw;
   min-width: 100px;
-  height: 17.5vh;
+  height: 17vh;
   background:#245baf;
   font-size: 1vh;
   position : absolute;

+ 3 - 3
src/views/screen/preview_v1.vue

@@ -35,7 +35,7 @@
             <!-- <i class="el-icon-time" style="color:#3fd5f1;"></i>&nbsp; <span>{{date}}</span> -->
             </span>
         
-          <span class="time-box fr time-box-right" ><i class="el-icon-time" style="color:#3fd5f1;"></i>&nbsp; {{date}}</span></div>
+          <span class="time-box fr time-box-right" ><i class="el-icon-time" style="color:#3fd5f1;"></i>&nbsp; {{date}}&nbsp;&nbsp;&nbsp;&nbsp;{{nowWeek}}</span></div>
       </el-col>
        <el-col :span="1">
         <div class="grid-content"></div>
@@ -95,7 +95,7 @@
           <i class="bottomR"></i>
           <table width="100%" border=0 class="task-table" style="border-collapse:collapse;border:none;">
             <tr>
-                <th colspan="4" class="task-header">作业动态</th>
+                <th colspan="5" class="task-header">作业动态</th>
             </tr>
             <tr align="center">
                 <th></th>
@@ -223,7 +223,7 @@
           <i class="bottomL"></i>
           <i class="bottomR"></i>
           <!-- <base-pie :options="pieFaultOptions" width="100%" theme="shine" /> -->
-          <div class="grid-content alarm-title">检测结果</div>
+          <div class="grid-content alarm-title">装备自检</div>
           <scroll :alarmData="alarmData" />
         </div>