xieqy 2 年之前
父节点
当前提交
f592248ca3

+ 1 - 1
src/views/groupPage/components/ComprehensiveChart/designAndConsChart.vue

@@ -113,7 +113,7 @@ export default {
         yAxis: [
           {
             type: 'value',
-            name: '单位:km',
+            name: '单位:',
             nameTextStyle: {
               color: '#FFFFFF'
             },

+ 3 - 3
src/views/groupPage/components/ComprehensiveChart/inspectionsNumChart.vue

@@ -71,7 +71,7 @@ export default {
           textStyle: {
             color: '#FFFFFF'
           },
-          data: ['累计次数', '每次数']
+          data: ['累计次数', '每次数']
         },
         xAxis: [
           {
@@ -117,7 +117,7 @@ export default {
           },
           {
             type: 'value',
-            name: '每次数',
+            name: '每次数',
             position: 'right',
             nameTextStyle: {
               color: '#FFFFFF'
@@ -157,7 +157,7 @@ export default {
             data: this.chartData.total
           },
           {
-            name: '每次数',
+            name: '每次数',
             type: 'bar',
             barWidth: 12,
             itemStyle: {

+ 126 - 0
src/views/groupPage/districtPageModules/pipeUnitInfo/Security.vue

@@ -0,0 +1,126 @@
+<template>
+  <div class="baseInfo">
+    <div class="wrap" v-for="(info, index) in infos" :key="info.title">
+      <div class="remake">
+        <div class="remakeColor"></div>
+        <div class="remakeTitle titleValue">{{ info.title }}</div>
+      </div>
+      <div class="item" v-for="item in info.data" :key="item.title">
+        <span class="title" :title="item.title">{{ item.title }}:</span>
+        <el-input class="value" :value="item.value" size="small"></el-input>
+      </div>
+      <div class="line" v-if="index < infos.length - 1"></div>
+    </div>
+  </div>
+</template>
+<script>
+import { setNullAndUndefined } from '@/views/groupPage/util'
+/**
+ * 部件查看---安全
+ */
+export default {
+  name: 'UnitDesignInfo',
+  data() {
+    return {
+      infos: [] //安全信息
+    }
+  },
+  mounted() {
+    this.getInfo()
+  },
+  methods: {
+    getInfo() {
+      this.infos = [
+        {
+          title: '施工任务',
+          data: [
+            { title: '作业时间', value: '2022/12/14 19:45:35' },
+            { title: '作业部位', value: '白羊冲片区' },
+            { title: '作业内容', value: '下雨暂未施工' },
+            { title: '作业地点', value: '湖北省宜昌市伍家岗区' },
+            { title: '施工单位名称', value: '中国铁建大桥工程局集团有限公司' },
+            { title: '作业人员数量', value: '2' },
+            { title: '现场安全员', value: '王武(大桥局)' },
+            { title: '监理工程师', value: '陆亮(二标段)' },
+            { title: '是否高风险', value: '否' },
+            { title: '高风险类型', value: '无' }
+          ]
+        },
+        {
+          title: '危险源',
+          data: [
+            { title: '危险源等级', value: '四级' },
+            { title: '危险源类型', value: '淹溺' },
+            { title: '导致事故类型', value: '淹溺' },
+            { title: '管控措施', value: '增加安全巡查' },
+            { title: '管控人', value: '王武(大桥局)' },
+            { title: '验收人', value: '陆亮(二标段)' }
+          ]
+        },
+        {
+          title: '安全隐患',
+          data: [
+            { title: '隐患时间', value: '2022/12/14 19:45:35' },
+            { title: '上报人', value: '李亮' },
+            { title: '隐患等级', value: '轻微隐患' },
+            { title: '隐患状态', value: '已闭合' },
+            { title: '隐患部位', value: '/' },
+            { title: '隐患描述', value: '未佩戴安全帽' },
+            { title: '整改要求', value: '在现场做好安全防护措施' },
+            { title: '整改期限', value: '2022/12/15 00:00:00' },
+            { title: '整改责任人', value: '廖雄庆' },
+            { title: '整改责任单位', value: '中国铁建大桥工程局集团有限公司' }
+          ]
+        }
+      ]
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.baseInfo {
+  width: 100%;
+  height: 430px;
+  overflow: auto;
+  position: relative;
+  float: left;
+  .wrap {
+    width: 100%;
+  }
+  .remake {
+    position: relative;
+    float: left;
+    width: 100%;
+    .remakeColor {
+      position: relative;
+      float: left;
+      width: 5px;
+      height: 0.083333rem /* 16/192 */;
+      background: #0ea7ff;
+    }
+    .remakeTitle {
+      color: #0ea7ff;
+      position: relative;
+      float: left;
+      font-size: 0.083333rem /* 16/192 */;
+      left: 10px;
+    }
+  }
+  .item {
+    position: relative;
+    float: left;
+    width: 48%;
+    display: flex;
+    align-items: center;
+    padding: 5px;
+  }
+  .line {
+    width: 100%;
+    height: 2px;
+    background: rgba(14, 167, 255, 0.2);
+    position: relative;
+    float: left;
+    margin: 20px 0px 6px 0px;
+  }
+}
+</style>

+ 6 - 2
src/views/groupPage/districtPageModules/pipeUnitInfo/index.vue

@@ -17,7 +17,7 @@
           <el-tab-pane label="设计" name="design"><Design ref="designPanel" /></el-tab-pane>
           <el-tab-pane label="扫码" name="sminfo"><SmInfo ref="scanPanel" /></el-tab-pane>
           <el-tab-pane label="质量" name="quality"><Quality ref="qualityPanel" /></el-tab-pane>
-          <el-tab-pane label="安全" name="security"></el-tab-pane>
+          <el-tab-pane label="安全" name="security"><Security ref="securityPanel" /></el-tab-pane>
           <el-tab-pane label="合同材料" name="contract"><Contract ref="contractPanel" /></el-tab-pane>
           <el-tab-pane label="图纸档案" name="document"><Dcouments ref="dcoumentPanel" /></el-tab-pane>
         </el-tabs>
@@ -38,6 +38,7 @@ import SmInfo from '@/views/groupPage/districtPageModules/pipeUnitInfo/SmInfo.vu
 import Quality from '@/views/groupPage/districtPageModules/pipeUnitInfo/Quality.vue'
 import Contract from '@/views/groupPage/districtPageModules/pipeUnitInfo/Contract.vue'
 import Dcouments from '@/views/groupPage/districtPageModules/pipeUnitInfo/Documents.vue'
+import Security from '@/views/groupPage/districtPageModules/pipeUnitInfo/Security.vue'
 //API以及帮助工具
 import apis from '@/api/PipeUnitInfo'
 import {
@@ -52,7 +53,10 @@ import {
 const Cesium = (window as any).Cesium
 const SuperMap = (window as any).SuperMap
 //属性查看
-@Component({ name: 'pipeUnitInfo', components: { ComMapBox, BaseInfo, Design, SmInfo, Quality, Contract, Dcouments } })
+@Component({
+  name: 'pipeUnitInfo',
+  components: { ComMapBox, BaseInfo, Design, SmInfo, Quality, Contract, Dcouments, Security }
+})
 export default class pipeUnitInfo extends Vue {
   position: Array<any> = []
   viewer

+ 1 - 0
src/views/groupPage/districtPageModules/statisticalAnalysis/progressModule/ProjectSituationofPM.vue

@@ -132,6 +132,7 @@ export default class ProjectSituationofPM extends Vue {
   }
   assembleData(result) {
     const { build, design } = result.recentProjectInfo
+    console.log(build, design)
     let dPercent = 0,
       cPercent = 0
     build.forEach((item) => {

+ 1 - 1
src/views/groupPage/districtPageModules/statisticalAnalysis/qualityModule/ProjectSituationofQM.vue

@@ -74,7 +74,7 @@
                       <div class="timeInfo">2022-02-03 12:12:12</div>
                     </div>
                   </div>
-                  <img class="consImg" src="@/views/groupPage/images/项目图册/1-调蓄池施工.png" />
+                  <img class="consImg" src="@/views/groupPage/images/项目图册/质量现场.jpg" />
                 </el-carousel-item>
               </el-carousel>
               <div class="switchWidget">

+ 1 - 1
src/views/groupPage/districtPageModules/statisticalAnalysis/qualityModule/QualityEvaluation.vue

@@ -58,7 +58,7 @@
           <div class="buildAndDesignLength">
             <div class="title">
               <div class="icon"></div>
-              <span class="item-name">长度统计</span>
+              <span class="item-name">数量统计</span>
             </div>
             <div class="lengthChartContent">
               <DesignAndConsChart :chartData="chartData" />

二进制
src/views/groupPage/images/项目图册/质量现场.jpg


+ 1 - 0
src/views/groupPage/util.ts

@@ -42,6 +42,7 @@ export function setNullAndUndefinedEmpty(input) {
         input === null ||
         input === undefined ||
         input === '' ||
+        input === Infinity ||
         Object.is(input, NaN)
     ) {
         return 0