Merge branch 'dev-yjl' into 'shenzhen-dev'

中建四局（安全管理页面数据显示调整）

See merge request !77

src/views/projectAdmin/fourEngin/carbon/leftTopL.vue

@@ -41,7 +41,10 @@ export default {
           color: [ "#6EE4F0", "#E86129","#FFC303",],
           itemStyle: {
             normal: {
+              
               label: {
+                length:30,   	// 指示线长度
+              position: 'outside',  
                 //饼图图形上的文本标签
                 show: true,
                 formatter: " {d}% \n {b} ",

src/views/projectAdmin/fourEngin/progress/uav.vue

@@ -4,9 +4,10 @@
       <el-date-picker
         @change="credad"
         v-model="shootingTime"
-        value-format="yyyy-MM-dd HH:mm:ss"
+        value-format="yyyy-MM-dd"
-        type="datetime"
+        type="date"
         placeholder="选择日期时间"
+        :clearable ="true"
       >
       </el-date-picker>
       <vue-scroll>
@@ -54,7 +55,7 @@ import { getUavVideoApi } from "@/assets/js/api/zhongjianFourth";
 export default {
   data() {
     return {
-      shootingTime: "", //日期
+      shootingTime: '', //日期
       uavList: [], //列表数据
       videoUrl: "", //视频
     };
@@ -65,10 +66,14 @@ export default {
   methods: {
     //获取无人机列表数据
     credad(val) {
-      this.shootingTime = "";
+      let data = ""
+      if(val) {
+        data = val
+      }
+      console.log("获取无人机列表数据 :时间参数 -- " ,val);
       getUavVideoApi({
         projectSn: this.$store.state.projectSn,
-        shootingTime: val,
+        shootingDate: data,
       }).then((res) => {
         console.log("无人机res", res);
         this.uavList = res.result;

src/views/projectAdmin/fourEngin/security/centerTop.vue

@@ -17,15 +17,15 @@
 
         <div class="textDivBox">
           <div class="textDiv">
-            <span>{{ threeLevel.projectWorkerNumber }}</span>
+            <span>{{ threeLevel.projectWorkerNumber||0}}</span>
             <p>项目总人数</p>
           </div>
           <div class="textDiv">
-            <span>{{ threeLevel.projectTrainWorkerNumber }}</span>
+            <span>{{ threeLevel.projectTrainWorkerNumber||0}}</span>
             <p>项目培训人数</p>
           </div>
           <div class="textDiv">
-            <span>{{ threeLevel.projectTrainRatio }}%</span>
+            <span>{{ threeLevel.projectTrainRatio||0}}%</span>
             <p>项目培训率</p>
           </div>
         </div>
@@ -56,8 +56,7 @@
                 v-if="threeLevel.workerSafeEducationList.length == 0"
               >
                 <div
-                  style="
+                  style=" font-size: 14px;
-                    font-size: 14px;
                     color: #999;
                     text-align: center;
                     width: 100%;
@@ -75,8 +74,7 @@
       <div class="centerC">
         <div class="text">
           每日<span
-            style="
+            style="width: 100px;
-              width: 100px;
               height: 100px;
               border-bottom: 1px solid #f56c35;
               padding: 0 0 5px 0;
@@ -87,11 +85,11 @@
 
         <div class="textDivBox">
           <div class="textDiv">
-            <span>{{ shouting.allCount }}</span>
+            <span>{{ shouting.allCount||0}}</span>
             <p>今日班前喊话次数</p>
           </div>
           <div class="textDiv">
-            <span>{{ shouting.todayCount }}</span>
+            <span>{{ shouting.todayCount||0}}</span>
             <p>班前喊话次数</p>
           </div>
         </div>
@@ -138,8 +136,7 @@
           <!-- <div class="text">每日<span style="width:100px;height:100px;border-bottom:1px solid #F56C35;padding:0 0 5px 0">班前</span>喊话</div> -->
 
           安<span
-            style="
+            style="width: 100px;
-              width: 100px;
               height: 100px;
               border-bottom: 1px solid #f56c35;
               padding: 0 0 5px 0;
@@ -150,19 +147,19 @@
 
         <div class="textDivBox">
           <div class="textDiv">
-            <span>{{ safetyDisclosure.trainNumber }}次</span>
+            <span>{{ safetyDisclosure.trainNumber||0}}次</span>
             <p>培训次数</p>
           </div>
           <div class="textDiv">
-            <span>{{ safetyDisclosure.specialOperationsNumber }}次</span>
+            <span>{{ safetyDisclosure.specialOperationsNumber||0}}次</span>
             <p>特种作业</p>
           </div>
           <div class="textDiv">
-            <span>{{ safetyDisclosure.disclosureInRainySeasonNumber }}次</span>
+            <span>{{ safetyDisclosure.disclosureInRainySeasonNumber||0}}次</span>
             <p>雨季交底</p>
           </div>
           <div class="textDiv">
-            <span>{{ safetyDisclosure.electricityDisclosureNumber }}次</span>
+            <span>{{ safetyDisclosure.electricityDisclosureNumber||0}}次</span>
             <p>用电交底</p>
           </div>
         </div>
@@ -181,7 +178,7 @@
                 v-for="(item,index) in safetyDisclosureDate" :key="index"
               >
                 <div class="td">{{ item.eduCourseName }}</div>
-                <div class="td">{{item.eduTypeList[item.eduType] }}</div>
+                <div class="td">{{eduTypeList[item.eduType] }}</div>
                 <div class="td">{{ item.eduTeacher }}</div>
                 <div class="td">{{ item.eduTime }}</div>
               </div>
@@ -208,7 +205,6 @@
 
 <script>
 import Card from "../components/Card.vue";
-import { mapState } from "vuex";
 import {
   getThreeLevelDataByProjectSnApi,
   getSecurityDataByProjectSnApi,
@@ -239,13 +235,19 @@ export default {
         8: "每日交底（安全技术交底）",
         9: "每日交底（大工程交底）",
         10: "入职培训",
+        11:"入场三级交底",
+        12:"特种作业",
+        13:"雨季交底",
+        14:"用电交底",
       },
+      projectSn:'',
     };
   },
-  computed: {
+  // computed: {
-    ...mapState(["projectSn"]),
+  //   ...mapState(["projectSn"]),
-  },
+  // },
   created() {
+    this.projectSn=this.$store.state.projectSn
     this.getThreeLevelDataByProjectSn();
     this.getSecurityDataByProjectSn();
     this.getTodayInfoByProjectSn();
@@ -255,7 +257,7 @@ export default {
     getThreeLevelDataByProjectSn() {
       getThreeLevelDataByProjectSnApi({ projectSn: this.projectSn }).then(
         (res) => {
-          console.log(res, "getThreeLevelDataByProjectSn-----------");
+          console.log(res, "getThreeLevelDataByProjectSn----------进场三级交底-");
           this.threeLevel = res.result;
         }
       );
@@ -264,6 +266,7 @@ export default {
     getSecurityDataByProjectSn() {
       getSecurityDataByProjectSnApi({ projectSn: this.projectSn }).then(
         (res) => {
+          console.log(res, "getThreeLevelDataByProjectSn----------安全交底-");
           this.safetyDisclosure = res.result;
           this.safetyDisclosureDate=res.result.workerSafeEducationList
         }
@@ -272,6 +275,7 @@ export default {
     //班前喊话
     getTodayInfoByProjectSn() {
       getTodayInfoByProjectSnApi({ projectSn: this.projectSn }).then((res) => {
+        console.log(res, "getThreeLevelDataByProjectSn----------班前喊话-");
         console.log(res, "getTodayInfoByProjectSnApi");
         this.shouting = res.result;
       });

src/views/projectAdmin/fourEngin/security/rightTopComponents/aiDevList.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="device" v-for="i in list" :key="i">
+    <div class="device" v-for="(i,index) in list" :key="index">
       <div class="device-name">{{i.hardwareName}}</div>
       <div class="info">
         

src/views/projectAdmin/fourEngin/security/rightTopComponents/environmentDevList.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="device" v-for="i in list" :key="i">
+    <div class="device" v-for="(i,index) in list" :key="index">
       <div class="device-name">{{i.deviceName}}</div>
       <div class="info">
         <!-- <img class="image" src="../../assets/images/common/bg_kyj.png" /> -->

src/views/projectAdmin/fourEngin/security/rightTopComponents/videoItemList.vue

@@ -1,10 +1,14 @@
 <template>
   <div>
-    <div class="device" v-for="i in list" :key="i">
+    <div class="device" v-for="(i, index) in list" :key="index">
       <div class="device-name">{{ i.videoName }}</div>
       <div class="info">
-        <div class="image" v-if="i.coverUrl.length"><img class="image" :src="i.coverUrl" /></div>
+        <div class="image" >
-        <div class="image" style="line-height:140px;text-align:center" v-else>暂无图片</div>
+          <img class="image" :src="i.coverUrl"  />
+        </div>
+        <!-- <div  class="image" style="line-height: 140px; text-align: center">
+          暂无图片
+        </div> -->
         <div class="detail">
           <div class="detail-item green">
             状态：{{ i.deviceState == 1 ? "在线" : "离线" }}
@@ -29,7 +33,6 @@
       </div>
     </div>
     <div
-      v-if="list.length == 0"
       style="
         font-size: 14px;
         color: #999;
@@ -61,6 +64,7 @@ export default {
         5: "宇视",
         6: "国标",
       },
+      // src:'@/assets/images/noData3.png'
     };
   },
   props: {