金林湾(大屏):bug修复

public/js/config.js

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

src/views/projectAdmin/jlw/envirManage/centerBottom.vue

@@ -52,6 +52,7 @@ export default {
   methods: {
     /** 查询 */
     handleQuery() {
+      this.weatherList = []
       this.loadWeather()
     },
     loadWeather() {

src/views/projectAdmin/jlw/envirManage/centerTop.vue

@@ -159,7 +159,7 @@ export default {
       });
     },
     watch:{
-      plantCap:{
+      'plantCap':{
         handler(newVal, oldVal) {
           if (newVal != oldVal) {
             this.createCenterChart();

src/views/projectAdmin/jlw/envirManage/index.vue

@@ -57,7 +57,7 @@ export default {
   },
   data() {
     return {
-      devId:{}
+      devId:''
     };
   },
   mounted(){

src/views/projectAdmin/jlw/envirManage/leftBottom.vue

@@ -52,7 +52,7 @@
           {{$t('message.dataBoard.nodata')}}
         </p>
       </div>
-      <!-- <div class="myChart" ref="myChart" /> -->
+      <div class="myChart" ref="myChart" />
     </div>
   </Card>
 </template>
@@ -73,12 +73,13 @@ export default {
     },
     devId: {
       type: String,
+      default:'40190789'
     }
   },
   data() {
     return {
       checked: 1,
-      deviceId: "",
+      deviceId: "40190789",
       dustData_24: [],
       currentDevDetail: {},
       pm10Warning: "",
@@ -88,16 +89,18 @@ export default {
     };
   },
    watch: {
-    devId: {
+      devId(newVal, oldVal) {
-      handler(newVal, oldVal) {
         if (newVal != oldVal) {
           this.getEnvironment();
           this.selectDustNoiseData();
         }
-      }
+    },
-    }
+    deep:true,
+  },
+  mounted() {
+    this.switchingData(1);
+    // this.getEnvironment();
   },
-  mounted() {},
   methods: {
     getEnvironment() {
       getEnvironmentWarningInfo({
@@ -137,13 +140,13 @@ export default {
         console.log("最近24小时", res);
         this.dustData_24 = res.result;
       });
+      this.initMyChart();
     },
 
     //切换  24小时数据
     switchingData(value) {
       this.checked = value;
       this.selectDustNoiseData();
-      this.initMyChart();
     },
     initMyChart() {
       var xdata = [],
@@ -200,10 +203,25 @@ export default {
         });
       }
       const option = {
+        tooltip: {
+          trigger: "axis"
+        },
+        grid: {
+        x: "10%",//x 偏移量
+        y: "5%", // y 偏移量
+        width: "85%", // 宽度
+        height: "80%"// 高度
+      },
         xAxis: {
           type: "category",
           boundaryGap: false,
-          data: xdata
+          data: xdata,
+          axisLabel: {
+            show: true,
+            textStyle: {
+              color: "#9ea3ab"
+            }
+          }
         },
         yAxis: {
           type: "value",
@@ -264,6 +282,8 @@ export default {
   height: 100%;
  
   .myChart {
+    box-sizing: border-box;
+    padding-top: 2%;
     width: 100%;
     height: 90%;
   }

src/views/projectAdmin/jlw/envirManage/rightBottom.vue

@@ -89,6 +89,7 @@ export default {
     }
     td {
       color: white;
+      line-height: 35px;
     }
   }
 }

src/views/projectAdmin/jlw/planProgress/leftBottom.vue

@@ -13,7 +13,7 @@
           <el-option :value="2" :label="$t('message.dataBoard.accordingtoTask')"></el-option>
         </el-select>
       </div>
-      <div class="blockContent">
+      <div class="blockContent" v-if="alarmList.length != 0">
         <vue-scroll>
           <table class="greenTable" v-show="alarmType==1">
             <thead>
@@ -60,15 +60,15 @@
               </tr>
             </tbody>
           </table>
-          <div class="noData" v-if="alarmList.length == 0">
+        </vue-scroll>
+      </div>
+      <div class="noData" v-if="alarmList.length == 0">
             <img src="@/assets/images/noData3.png" alt srcset />
             <p>
               <!-- 暂无数据 -->
               {{$t('message.dataBoard.nodata')}}
             </p>
           </div>
-        </vue-scroll>
-      </div>
     </div>
 
   </Card>
@@ -148,7 +148,7 @@ export default {
 .containerBox{
   .content{
     .alarmTypeBox{
-      margin-left: 300px;
+      margin-left: 75%;
       width: 100px;
       margin-bottom: 10px;
        ::v-deep .el-input__inner {
@@ -166,7 +166,8 @@ export default {
   }
 
   .noData{
-    margin-left: 200px;
+    text-align: center;
+    margin-top: 5%;
   }
   .greenTable{
         font-size: 13px;

src/views/projectAdmin/jlw/planProgress/leftTop.vue

@@ -2,6 +2,7 @@
   <!-- 进度总览 -->
   <Card :title="title">
     <div class="containerBox">
+      <!-- <i class="el-icon-s-tools" @click="dialogVisible=true"></i> -->
       <!-- 配置项目竣工日期 -->
       <div class="blockContent">
         <p style="transform: translateX(-20px)">
@@ -163,7 +164,9 @@ export default {
 .containerBox {
   width: 100%;
   height: 100%;
-
+  .el-icon-s-tools{
+    margin-left: 90%;
+  }
   // .content{
   //   display: flex;
   //   justify-content: center;

src/views/projectAdmin/jlw/projectHuli/generalView.vue

@@ -194,7 +194,7 @@ export default {
           margin-right: 10px;
           width: 8px;
           height: 8px;
-          background-color: #fff;
+          background-color: rgb(172, 177, 184);
           border-radius: 50%;
         }
       }

src/views/projectAdmin/jlw/projectHuli/intelligentManage.vue

@@ -3,7 +3,6 @@
   <Card :title="title">
     <div class="intelligentManage">
       <div class="image">
-        <el-image :src="require('@/assets/images/projectImg/intell.png')" alt="" />
       </div>
     </div>
   </Card>
@@ -35,8 +34,12 @@ export default {
   width: 100%;
   height: 100%;
   .image {
-    width: 100%;
+    margin-left: 10%;
+    width: 85%;
     height: 100%;
+    background-image: url('~@/assets/images/projectImg/intell.png');
+    background-size: 90%;
+    background-repeat: no-repeat;
   }
   img {
     display: block;

src/views/projectAdmin/jlw/safeManage/leftBottom.vue

@@ -21,12 +21,15 @@
       </div>
     </div> -->
     <div class="info">
-      <vue-scroll>
+      <vue-scroll  v-if="activityList.length > 0 ">
         <div class="info-item" v-for="(item, index) in activityList" :key="index">
           {{ `${item.rectifyPeopleAme}有一条${status[item.state]}的问题` }}
         </div>
       </vue-scroll>
-      <div v-if="!activityList.length">无数据</div>
+      <div class="nodata" v-else>
+            <img src="@/assets/images/noData3.png" alt srcset />
+            <p>暂无数据</p>
+          </div>
     </div>
   </Card>
 </template>
@@ -45,6 +48,7 @@ export default {
   },
   mounted() {
     selectRectifiedSecurityManageList2Api({ projectSn: this.$store.state.projectSn }).then(res => {
+      console.log('------',res)
       this.activityList = res.result || []
     })
   },
@@ -85,5 +89,10 @@ export default {
     padding: 10px 0;
     padding-left: 20px;
   }
+  .nodata{
+      text-align: center;
+      padding-top: 10%;
+      box-sizing: border-box
+  }
 }
 </style>

src/views/projectAdmin/jlw/style.less

@@ -170,7 +170,7 @@
         height: 100%;
     }
     .operateBar{
-        margin-top: 5px;
+        // margin-top: 5px;
     }
     .greenTable{
         font-size: 13px;

src/views/projectFront/laborManage/personModule/laborComponent.vue

@@ -2329,6 +2329,7 @@ export default {
     handleSuccessE() {
       this.$message.success(this.$t('message.laborMange.hint6')) //登录成功！
       this.refreshBtn()
+      this.getTeamList()
     },
     handleErrorE() {
       this.$message.error(this.$t('message.laborMange.hint7'))
@@ -2673,6 +2674,7 @@ export default {
         if (res.code == 200) {
           this.checkedTeamId = type !== 1 ? 0 : this.checkedTeamId
           this.teamListData = res.result
+          console.log('==============',res.result)
           this.tableParameter.projectSn = this.projectSn
           this.getTableData()
         }