湖里大屏：优化了若干样式问题

src/assets/js/http.js

@@ -95,6 +95,7 @@ if (store.state.userInfo) {
 // http请求拦截器
 axios.interceptors.request.use(
   config => {
+    if (config.url.includes('live?port')) return config
     // 分屏插件兼容配置
     const screensBaseURL = sessionStorage.getItem('screens-baseURL')
     if (config.url.indexOf(screensBaseURL) !== -1) {

src/router/index.js

@@ -1694,8 +1694,8 @@ const routes2 = [
       },
       {
         path: 'cim',
-        name: '数据看板-CIM',
+        name: '数据看板-BIM',
-        component: () => import('@/views/projectAdmin/jlw/CIM/index.vue')
+        component: () => import('@/views/projectAdmin/jlw/BIM/index.vue')
       },
       {
         path: 'safe',

src/views/projectAdmin/jlw/BIM/BimCoordination.vue

@@ -1,7 +1,7 @@
 <template>
   <Card title="BIM协同">
     <div class="table">
-      <div class="row">
+      <div class="row" style="font-weight: bold;">
         <div class="td">规划报批</div>
         <div class="td">施工图审查</div>
         <div class="td">竣工验收</div>
@@ -40,7 +40,7 @@ export default {
   height: 100%;
   .row {
     margin-bottom: 20px;
-    font-size: 12px;
+    font-size: 14px;
     display: flex;
     .td {
       flex: 1;

src/views/projectAdmin/jlw/components/CountList.vue

@@ -17,7 +17,6 @@
       </div>
     </div>
       <div class="list">
-      <vue-scroll>
         <div class="list-item" :class="item.devonline == '0' ? 'online' : 'offline'" v-for="(item, i) in list" :key="i">
           <div class="status">{{ item.devonline == '0' ? '在线' : '离线' }}</div>
           <div class="label">{{ item.devName || item.deviceName }}</div>
@@ -27,7 +26,6 @@
             <div class="person">出场人数：{{ item.outer }}</div>
           </div>
         </div>
-      </vue-scroll>
       </div>
   </div>
 </template>
@@ -72,6 +70,7 @@ export default {
 <style lang="less" scoped>
 .h-count-list {
   height: 100%;
+  overflow: hidden;
   .counts {
     padding: 10px 26px 20px;
     display: flex;
@@ -129,6 +128,7 @@ export default {
   .list {
     height: calc(100% - 90px);
     padding: 0 10px;
+    overflow-y: scroll;
     .list-item {
       margin-bottom: 6px;
       padding-left: 16px;

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

@@ -6,7 +6,11 @@
       </div>
       <div class="leftCenter">
         <!-- <leftCenter title="AI分析"></leftCenter> -->
-        <leftCenter title="升降机设备"></leftCenter>
+        <leftCenter title="升降机设备"
+          :lifterList="lifterList"
+          :totalLifterDev="totalLifterDev"
+          :totalDangerLifterDev="totalDangerLifterDev"
+        ></leftCenter>
       </div>
       <div class="leftBottom">
         <leftBottom title="视频设备" :videoCountList="videoCountList"></leftBottom>
@@ -22,23 +26,17 @@
     </div>
     <div class="rightBox">
       <div class="rightTop">
-        <rightTop
+        <rightTop title="人脸闸机" :ufaceList="ufaceList" ></rightTop>
-          title="人脸闸机"
-          :lifterList="lifterList"
-          :totalLifterDev="totalLifterDev"
-          :totalDangerLifterDev="totalDangerLifterDev"
-        ></rightTop>
       </div>
       <div class="rightCenter">
-        <rightCenter
+        <rightCenter title="AI分析" ></rightCenter>
-          title="AI分析"
+      </div>
+      <div class="rightBottom">
+        <rightBottom title="环境监测"
           :onlineNum="environment.online"
           :offlineNum="environment.offline"
           :list="environment.list"
-        ></rightCenter>
+        ></rightBottom>
-      </div>
-      <div class="rightBottom">
-        <rightBottom title="环境监测" :ufaceList="ufaceList"></rightBottom>
       </div>
     </div>
   </div>
@@ -178,6 +176,7 @@ export default {
       })
       // 获取升降机设备信息
       selectLifterDevAlarmCountList(data).then(res => {
+        console.log('获取升降机设备信息: ', res);
         if (res.code === 200) {
           this.lifterList = res.result.devList
           console.log(res)

src/views/projectAdmin/jlw/digitalSite/rightTop.vue

@@ -53,6 +53,7 @@ export default {
   color: #636364;
 }
 .list {
+  height: 100%;
   padding: 0 10px;
   color: #fff;
   .list-head {
@@ -73,7 +74,7 @@ export default {
     }
   }
   .listBox{
-    height:100px;
+    height: calc(100% - 15px);
     overflow:auto;
       .list-item {
     margin-bottom: 6px;

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

@@ -7,13 +7,13 @@
           <table class="greenTable">
             <thead>
               <tr>
-                <th>报警设备</th>
+                <th style="font-weight: bold;">报警设备</th>
-                <th>报警时间</th>
+                <th style="font-weight: bold;">报警时间</th>
-                <th>报警类型</th>
+                <th style="font-weight: bold;">报警类型</th>
               </tr>
             </thead>
             <tbody>
-              <tr v-for="(item, index) in alarmList" :key="index">
+              <tr style="font-size: 14px;" v-for="(item, index) in alarmList" :key="index">
                 <td>{{ item.deviceName }}</td>
                 <td>{{ item.tempAlarmTime }}</td>
                 <td>{{ item.alarmTypeName }}</td>

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

@@ -43,6 +43,7 @@
           </p>
         </div>
       </div>
+      <div>
         <div class="persontype">
           <p style="padding-left: 35px;" class="person">{{statisticsCount.workercount.jfGlPersonTotal}}</p>
           <p class="person">{{statisticsCount.presencecount.jfGlPersonTotal}}</p>
@@ -59,6 +60,7 @@
           <span>在册劳务人员数</span>
           <span>在场劳务人员数</span>
         </div>
+      </div>
       <div class="minTit">
         <div class="point"></div>
         {{$t('message.dataBoard.managementPersonnelStatistics')}}
@@ -209,7 +211,7 @@ export default {
     span {
       width: 168px;
       text-align: left;
-      font-size: 16px;
+      font-size: 13px;
       margin-right: 10px;
     }
     .person {
@@ -217,7 +219,7 @@ export default {
       width: 50%;
       text-align: left;
       // margin-right: 60px;
-      font-size: 20px;
+      font-size: 18px;
       color: #fff;
       // background-image: url(~@/assets/images/projectImg/numBgc.png);
       // background-size:100%;
@@ -244,8 +246,8 @@ export default {
     .management_item {
       box-sizing: border-box;
       position: relative;
-      width: 60;
+      width: 52px;
-      height: 60px;
+      height: 52px;
       text-align: start;
       .item_content {
         position: absolute;
@@ -254,8 +256,8 @@ export default {
         font-size: 12px;
       }
       .itemImgBox {
-        width: 60px;
+        width: 52px;
-        height: 60px;
+        height: 52px;
         border-radius: 50%;
         background-size: 100%;
         img {

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

@@ -1,5 +1,15 @@
 <template>
   <Card :title="title" showRefresh @query="handleQuery">
+    <div class="container">
+      <div class="header">
+        <div class="left-content">
+          <div class="item" v-for="(item, index) in headerList" :key="index">
+            <div class="color-block" :style="{ background: item.color }"></div>
+            <div class="label">{{ item.label }}</div>
+          </div>
+        </div>
+        <div class="right-content">备注：更新（进度填报）内容后该甘特图将自动更新</div>
+      </div>
       <div class="gantt-chart">
         <div class="table" @scroll="handleScroll">
           <div class="thead">
@@ -67,6 +77,7 @@
           </div>
         </div>
       </div>
+    </div>
   </Card>
 </template>
 
@@ -88,6 +99,13 @@ export default {
   },
   data() {
     return {
+      // 头部行
+      headerList: [
+        { label: '阶段完成', color: '#4983fc' },
+        { label: '任务完成', color: '#4fd389' },
+        { label: '进行中', color: '#f1d520' },
+        { label: '逾期', color: '#fc6f8e' },
+      ],
       projects: [
         {
           pName: '地基与基础工程',
@@ -276,8 +294,44 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.gantt-chart {
+.container {
+  box-sizing: border-box;
+  padding: 0 13px;
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  width: 100%;
+  height: 60px;
+  .left-content {
+    display: flex;
+    width: 40%;
     height: 100%;
+    .item {
+      display: flex;
+      align-items: center;
+      width: calc(100% / 4);
+      .color-block {
+        margin-right: 10px;
+        width: 15px;
+        height: 15px;
+        border-radius: 2px;
+      }
+      .label {
+        color: #fff;
+        font-size: 13px;
+      }
+    }
+  }
+  .right-content {
+    font-size: 13px;
+    line-height: 60px;
+  }
+}
+
+.gantt-chart {
+  height: calc(100% - 60px);
   .table {
     position: relative;
     height: 100%;

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

@@ -186,5 +186,14 @@ export default {
         }
     }
 }
+
+::v-deep .containerBox .content .alarmTypeBox[data-v-337506f2] .el-input__inner {
+    background-color: transparent;
+    color: white;
+    height: 24px;
+    line-height: 24px;
+    padding: 0 5px;
+    border-color: #87f1fb;
+}
 </style>
 

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

@@ -4,7 +4,7 @@
     <div class="containerBox">
       <!-- 配置项目竣工日期 -->
       <div class="blockContent">
-        <p>
+        <p style="transform: translateX(-20px)">
           <!-- 项目整体倒计时： -->
           {{$t('message.dataBoard.projectCountDown')+':'}}
         </p>
@@ -15,7 +15,7 @@
             {{$t('message.dataBoard.textList')[0]}}
           </span>
         </div>
-        <img src="@/assets/images/daysBG.png" class="daysBG" />
+        <img src="../assets/images/bg/bg-rectangular-box.png" class="daysBG" />
         <p class="endDate">
           <!-- 竣工时间： -->
           {{$t('message.dataBoard.completeTime')+':'}}{{endDate}}
@@ -202,7 +202,7 @@ export default {
   }
   .days {
     position: absolute;
-    top: 40%;
+    top: 45%;
     left: 50%;
     transform: translate(-50%, -50%);
     .num {
@@ -211,14 +211,14 @@ export default {
   }
   .daysBG {
     position: absolute;
-    top: 40%;
+    top: 45%;
     left: 50%;
     transform: translate(-50%, -50%);
   }
   .endDate {
     position: absolute;
     right: 20px;
-    bottom: 60px;
+    bottom: 30px;
     // font-size: 13px;
   }
 }

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

@@ -1,20 +1,16 @@
 <template>
   <!-- 项目简介 -->
   <Card :title="title">
-     <div class="content">
+    <div class="container">
       <vue-scroll>
         <div class="listItem">
           <!-- 项目名称 -->
-          <span class="label">
+          <span class="label">{{ $t('message.companyDiagram.entryName1') }}：</span>
-            {{ $t('message.companyDiagram.entryName1') }}：
-          </span>
           <span class="value">{{ projectData.projectName }}</span>
         </div>
         <div class="listItem">
           <!-- 项目地址 -->
-          <span class="label">
+          <span class="label">{{ $t('message.companyDiagram.projectAddress') }}：</span>
-            {{ $t('message.companyDiagram.projectAddress') }}：
-          </span>
           <span class="value">
             {{ projectData.provinceName }}{{ projectData.cityName }}
             {{ projectData.areaName }}{{ projectData.projectAddress }}
@@ -22,92 +18,66 @@
         </div>
         <div class="listItem">
           <!-- 项目经理 -->
-          <span class="label">
+          <span class="label">{{ $t('message.companyDiagram.projectManager') }}：</span>
-            {{ $t('message.companyDiagram.projectManager') }}：
-          </span>
           <span class="value">{{ projectData.projectManage }}</span>
         </div>
         <div class="listItem">
           <!-- 联系电话 -->
-          <span class="label">
+          <span class="label">{{ $t('message.companyDiagram.telPhone') }}：</span>
-            {{ $t('message.companyDiagram.telPhone') }}：
-          </span>
           <span class="value">{{ projectData.projectTel }}</span>
         </div>
         <div class="listItem">
           <!-- 建筑面积 -->
-          <span class="label">
+          <span class="label">{{ $t('message.companyDiagram.buildArea') }}：</span>
-            {{ $t('message.companyDiagram.buildArea') }}：
-          </span>
           <span class="value">{{ projectData.projectAcreage }} m²</span>
         </div>
         <div class="listItem">
           <!-- 开工日期 -->
-          <span class="label">
+          <span class="label">{{ $t('message.companyDiagram.buildStartTime') }}：</span>
-            {{ $t('message.companyDiagram.buildStartTime') }}：
-          </span>
           <span class="value">{{ projectData.startWorkDate }}</span>
         </div>
         <div class="listItem">
           <!-- 项目编号 -->
-          <span class="label">
+          <span class="label">{{ $t('message.companyDiagram.projectNo') }}：</span>
-            {{ $t('message.companyDiagram.projectNo') }}：
-          </span>
           <span class="value">{{ projectData.projectNumber }}</span>
         </div>
         <div class="listItem">
           <!-- 工程类别 -->
-          <span class="label">
+          <span class="label">{{ $t('message.companyDiagram.projectType') }}：</span>
-            {{ $t('message.companyDiagram.projectType') }}：
-          </span>
           <span
             class="value"
             v-for="(item, index) in $t('message.companyDiagram.PROJECTTYPE')"
             :key="index"
-          >
+          >{{ projectData.projectType == item.id ? item.name : '' }}</span>
-            {{ projectData.projectType == item.id ? item.name : '' }}
-          </span>
         </div>
         <div class="listItem">
           <!-- 工程用途 -->
-          <span class="label">
+          <span class="label">{{ $t('message.companyDiagram.projectUse') }}：</span>
-            {{ $t('message.companyDiagram.projectUse') }}：
-          </span>
           <span
             class="value"
             v-for="(item, index) in $t(
               'message.companyDiagram.ENGINEERINGPRUPOSE'
             )"
             :key="index"
-          >
+          >{{ projectData.engineeringPurpose == item.id ? item.name : '' }}</span>
-            {{ projectData.engineeringPurpose == item.id ? item.name : '' }}
-          </span>
         </div>
         <div class="listItem">
           <!-- 结构类型 -->
-          <span class="label">
+          <span class="label">{{ $t('message.companyDiagram.structureType') }}：</span>
-            {{ $t('message.companyDiagram.structureType') }}：
-          </span>
           <span
             class="value"
             v-for="(item, index) in $t('message.companyDiagram.STRUCTURETYPE')"
             :key="index"
-          >
+          >{{ projectData.structureType == item.id ? item.name : '' }}</span>
-            {{ projectData.structureType == item.id ? item.name : '' }}
-          </span>
         </div>
         <div class="listItem">
           <!-- 工程状态 -->
-          <span class="label">
+          <span class="label">{{ $t('message.companyDiagram.projectStatus') }}：</span>
-            {{ $t('message.companyDiagram.projectStatus') }}：
-          </span>
           <span
             class="value"
             v-for="(item, index) in $t('message.companyDiagram.BUILDSTATUS')"
             :key="index"
-          >
+          >{{ projectData.bulidStatus == item.id ? item.name : '' }}</span>
-            {{ projectData.bulidStatus == item.id ? item.name : '' }}
-          </span>
         </div>
       </vue-scroll>
     </div>
@@ -121,7 +91,7 @@ components:{Card},
   props: {
     title: {
       type: String,
-      default: "default title"
+      default: 'default title'
     },
     projectData: {
       type: Object,
@@ -129,19 +99,17 @@ components:{Card},
     }
   },
   data() {
-    return {
+    return {}
-
+  }
-    };
-  },
-
 }
 </script>
 
 <style lang="less" scoped>
-   .content {
+.container {
+  box-sizing: border-box;
   position: relative;
-    padding: 10px 20px;
+  height: 100%;
-    height: calc(100% - 20px - 24px);
+  padding: 10px 13px;
   z-index: 2;
   .listItem {
     margin-bottom: 2px;
@@ -151,5 +119,4 @@ components:{Card},
     }
   }
 }
-
 </style>

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

@@ -61,6 +61,8 @@ export default {
 
 <style lang="less" scoped>
 .frequentProblems {
+  display: flex;
+  flex-direction: column;
   width: 100%;
   height: 100%;
   .days-switch {
@@ -69,7 +71,7 @@ export default {
     margin-left: auto;
   }
   .content {
-    height: 100%;
+    flex: 1;
   }
 }
 </style>

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

@@ -77,4 +77,17 @@ export default {
     height: 62%;
   }
 }
+
+::v-deep .el-range-editor--mini.el-input__inner,
+::v-deep .el-range-editor--mini .el-range-input,
+::v-deep .el-icon-date:before {
+  background: #07162b;
+  border-color: #6ee4f0;
+  color: #6ee4f0;
+}
+
+::v-deep .el-table th.is-leaf, 
+::v-deep .el-table td {
+  border-bottom: 0;
+}
 </style>

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

@@ -81,6 +81,8 @@ export default {
 .info {
   height: 100%;
   .info-item {
+    color: #808c9a;
+    padding: 10px 0;
     padding-left: 20px;
   }
 }

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

@@ -2,7 +2,7 @@
   <Card :title="title">
     <!-- <JProgressChart :seriesData="seriesData" :yData="yData" /> -->
 
-    <div class="table">
+    <!-- <div class="table">
       <div class="thead">
         <div class="row">
           <div class="td">检查项</div>
@@ -22,6 +22,20 @@
           <div v-if="!alarmList.length">无数据</div>
         </vue-scroll>
       </div>
+    </div>-->
+    <div style="width: 100%;height: 100%;" ref="container">
+      <el-table 
+        :data="alarmList" 
+        style="width: 100%"
+        header-align="center"
+        :header-cell-style="{ backgroundColor: '#07162b', color: '#67d4db' }"
+        :cell-style="{ color: '#fff' }"
+      >
+        <el-table-column align="center" prop="checkPoints" label="检查项" ></el-table-column>
+        <el-table-column align="center" prop="checkContent" label="检查内容" ></el-table-column>
+        <el-table-column align="center" prop="checkTime" label="检查时间" width="100"></el-table-column>
+        <el-table-column align="center" prop="rectifyPeopleAme" label="整改人" ></el-table-column>
+      </el-table>
     </div>
   </Card>
 </template>
@@ -38,11 +52,7 @@ export default {
       default: ''
     }
   },
-  mounted() {
+  
-    getNewestSecurityManageDataList2Api({ projectSn: this.projectSn }).then(res => {
-      this.alarmList = res.result || []
-    })
-  },
   data() {
     return {
       projectSn: this.$store.state.projectSn,
@@ -60,7 +70,13 @@ export default {
       // ].reverse(),
       // seriesData: [100, 235, 232, 532, 112, 532, 449, 269, 998]
     }
-  }
+  },
+  mounted() {
+    getNewestSecurityManageDataList2Api({ projectSn: this.projectSn }).then(res => {
+      console.log('待整改问题: ', res);
+      this.alarmList = res.result || []
+    })
+  },
 }
 </script>
 
@@ -87,14 +103,15 @@ export default {
         height: 30px;
         line-height: 30px;
         &:nth-child(1) {
-          width: 160px;
+          width: 150px;
           overflow: hidden;
           text-overflow: ellipsis;
           white-space: nowrap;
         }
         &:nth-child(2) {
-          padding-left: 10px;
+          // padding-left: 10px;
-          flex: 1;
+          // flex: 1;
+          width: 100px;
         }
         &:nth-child(3) {
           width: 140px;
@@ -106,4 +123,5 @@ export default {
     }
   }
 }
+
 </style>

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

@@ -56,19 +56,17 @@ export default {
       default: ''
     }
   },
-  data: () => ({
-    // 日期范围
-    dateRange: [],
-  }),
-  mounted() {
-    this.getCounts()
-  },
   data() {
     return {
+      // 日期范围
+      dateRange: [],
       projectSn: this.$store.state.projectSn,
       totals: {}
     }
   },
+  mounted() {
+    this.getCounts()
+  },
   methods: {
     getCounts() {
       selectSecurityManageStatisticsApi({ projectSn: this.projectSn }).then(res => {