中建四(指挥中心)：细节bug修复

public/js/config.js

@@ -18,7 +18,7 @@ var PROJECT = {
 }
 
 
-var PROJECT_TYPE = PROJECT.local_test
+var PROJECT_TYPE = PROJECT.online_zjsj
 
 var headerShow = true; // 是否显示头部
 var tabsShow = true;  // 是否显示tabs

src/assets/js/http.js

@@ -40,10 +40,10 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL = 'http://124.71.178.44:100/' // 河南
   // tag: 本地
   // axios.defaults.baseURL = 'http://192.168.34.174:6023/'  // 老大本地
-  axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地
+  // axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地
   // axios.defaults.baseURL = 'http://ue6a4s.natappfree.cc'  // 邱平毅vpn本地
   // axios.defaults.baseURL = 'http://139.9.66.234:6324/' // 河南春笋
-  // axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上
+  axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上
   // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1
   // axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上
   // axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地

src/store/index.js

@@ -58,8 +58,8 @@ export default new Vuex.Store({
     // 邱平毅的
     // UPLOADURL: 'http://192.168.34.216:6023/upload/image',
     // FILEURL: 'http://192.168.34.216:6023/image/',
-    UPLOADURL: 'http://ue6a4s.natappfree.cc/upload/image',
+    UPLOADURL: 'http://124.71.67.160:8088/upload/image',
-    FILEURL: 'http://ue6a4s.natappfree.cc/image/',
+    FILEURL: 'http://124.71.67.160:8088/image/',
 
     // UPLOADURL:'http://'+"61.190.32.219:9050"+'/upload/image',//正式
     // FILEURL:'http://'+"61.190.32.219:9050"+'/image/',//正式

src/views/projectAdmin/fourEngin/command/leftThree.vue

@@ -49,13 +49,13 @@ export default {
       leftList: {
         a: { label: 'PM2.5', value: 68, unit: 'μg/m³', image: require('../assets/images/command-center/icon-pm25.png') },
         b: { label: 'PM10', value: 36, unit: 'μg/m³', image: require('../assets/images/command-center/icon-pm10.png') },
-        c: { label: '噪音', value: 13, unit: '%dB', image: require('../assets/images/command-center/icon-noise.png') }
+        c: { label: '噪音', value: 13, unit: 'dB', image: require('../assets/images/command-center/icon-noise.png') }
       },
       tableData:[],
       // 右边的列表
       rightList: {
         temperature: { label: '温度', value: 22, unit: '℃', image: require('../assets/images/command-center/icon-temperature.png') },
-        humidity: { label: '湿度', value: 16, unit: 'RH', image: require('../assets/images/command-center/icon-humidity.png') },
+        humidity: { label: '湿度', value: 16, unit: '%RH', image: require('../assets/images/command-center/icon-humidity.png') },
         windSpeed: {
           label: '风速',
           value: 60,
@@ -85,6 +85,7 @@ export default {
             getDustNoiseDataApi(data).then(res=>{
                 console.log('环境监测',res)
                 if(res.code == 200){
+                  if(res.result != null){
                     this.leftList.a.value = res.result.pm25
                   this.leftList.b.value = res.result.pm10
                   this.leftList.c.value = res.result.noise
@@ -93,6 +94,7 @@ export default {
                   this.rightList.windSpeed.value = res.result.windspeed
                   this.rightList.windDirection.value = res.result.winddirectionName
                   }  
+                }
             })
         },
   }

src/views/projectAdmin/fourEngin/command/rightFour.vue

@@ -15,11 +15,11 @@
         <swiper class="swiper1" :options="swiperOption" ref="mySwiper">
           <swiper-slide v-for="(item,index) in showList" :key="index"
             ><p>{{item.title}}</p>
-            <img :src="$store.state.FILEURL+item.imageUrl" alt="" 
+            <img class="imgBox" :src="$store.state.FILEURL+item.imageUrl" alt="" 
           /></swiper-slide>
           <!-- <swiper-slide
             ><p>中国建筑深基坑挖掘沉降观测工程</p>
-            <img src="../assets/images/command-center/auto2.png" alt=""
+            <img class="imgBox" src="../assets/images/command-center/auto2.png" alt=""
           /></swiper-slide>
           <swiper-slide
             ><p>中国建筑混凝土强度检测工程</p>
@@ -172,19 +172,23 @@ export default {
         position: absolute;
         background-color: rgba(0, 0, 0, 0.55);
       }
-      img{
+      .imgBox{
         width: 100%;
-        height: 60%;
+        height: 100%;
       }
+      // img{
+      //   width: 100%;
+      //   height: 100%;
+      // }
       // .swiper-container-horizontal > .swiper-pagination-bullets
       ::v-deep  .swiper-pagination {
-        bottom: 42%;
+        bottom: 10%;
         left: 0;
         width: 100%;
       }   
       ::v-deep .swiper-button-next,.swiper-button-prev {
         position: absolute;
-        top: 32%;
+        // top: 32%;
       }
       ::v-deep .swiper-pagination-bullet-active {
         background: #fff;

src/views/projectAdmin/fourEngin/command/rightTwo.vue

@@ -12,13 +12,13 @@
       <!-- <div class="left" ref="chart" style="transform: translateY(5px)"></div> -->
       <div class="right">
         <div class="top">
-          <div class="left">
+          <div class="left" :class=" tab==2 ? 'click' : ''" >
             <span class="label" @click="already(2)">已整改质量问题</span>
             <span class="value"
               >({{ qualityProblem.rectificationNum || 0 }})</span
             >
           </div>
-          <div class="right">
+          <div class="right" :class=" tab==5 ? 'click' : ''">
             <span class="label" @click="already(5)">未整改质量问题</span>
             <span class="value"
               >({{ qualityProblem.noRectificationNum || 0 }})</span
@@ -67,6 +67,7 @@ export default {
   components: { Card, JNestedRingChart },
   data() {
     return {
+      tab : 2,
       show:true,
       recordStatus: 2, // 整改状态   2已整改（已闭合） 5待整改
       // 质量问题
@@ -159,6 +160,7 @@ export default {
     },
     already(val) {
       this.recordStatus = val;
+      this.tab = val
     },
     getQuality() {
       getInspectionRecordListApi({
@@ -196,15 +198,19 @@ export default {
     flex-direction: column;
     width: 50%;
     .top {
+      cursor: pointer;
       display: flex;
       padding: 5px 0;
       color: #fff;
       font-size: 14px;
       white-space: nowrap;
       line-height: 25px;
-      .left {
+      // .left {
+      //   color: #af5320;
+      //   transform: translateX(-10%);
+      // }
+      .click{
         color: #af5320;
-        transform: translateX(-10%);
       }
     }
 
@@ -248,9 +254,9 @@ export default {
           //     background-size: 100% 100%;
           //     transition: all 0.3s;
           //   }
-          .value {
+          // .value {
-            color: #c2805f;
+          //   color: #c2805f;
-          }
+          // }
         }
 
         &:last-child {