From 8acd4872010cbdf759dc8a55076d28de6549cdc3 Mon Sep 17 00:00:00 2001
From: cjp <3096114695@qq.com>
Date: Thu, 11 Jan 2024 17:51:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectAdmin/dataBoard/index.vue    |  1 +
 .../projectAdmin/fourEngin/govComp/Col4.vue   | 29 +++++++++++++++++-
 .../smartBeamField/pedestalManage.vue         | 29 ++++++++++++++----
 .../toxicGasDetection/gasMonitoringData.vue   | 30 ++++++++++++++-----
 .../tunnelPositioning/tunnelConfiguration.vue | 22 ++++++++++----
 .../workTicketManage/riskInventory.vue        |  4 +--
 6 files changed, 94 insertions(+), 21 deletions(-)

diff --git a/src/views/projectAdmin/dataBoard/index.vue b/src/views/projectAdmin/dataBoard/index.vue
index b0b24846..c8502e2e 100644
--- a/src/views/projectAdmin/dataBoard/index.vue
+++ b/src/views/projectAdmin/dataBoard/index.vue
@@ -46,6 +46,7 @@
           autoplay
           controls
           loop
+          muted
         ></video>
         <div
           @mouseenter="showChangeImg = true"
diff --git a/src/views/projectAdmin/fourEngin/govComp/Col4.vue b/src/views/projectAdmin/fourEngin/govComp/Col4.vue
index 73dacfd8..44417d3d 100644
--- a/src/views/projectAdmin/fourEngin/govComp/Col4.vue
+++ b/src/views/projectAdmin/fourEngin/govComp/Col4.vue
@@ -39,6 +39,32 @@ export default {
   data() {
     return {
       dataList: [
+      {
+          date: '2024/1/2',
+          building: '屋顶层悬挑板',
+          quantity: 15
+        },
+        {
+          date: '2024/1/2',
+          building: '屋顶层悬挑板',
+          quantity: 15
+        },
+        {
+          date: '2023/12/23',
+          building: '屋面层楼承板',
+          quantity: 230
+        },
+        {
+          date: '2023/12/23',
+          building: '屋面层楼承板',
+          quantity: 230
+        },
+        {
+          date: '2023/12/23',
+          building: '屋面层楼承板',
+          quantity: 230
+        },
+
         {
           date: '2023/12/20',
           building: '三十四至三十五层钢管柱',
@@ -2227,7 +2253,8 @@ export default {
         },
         series: [
           {
-            data: [3589, 311.5, 3007.5, 1683.28, 1205, 3508, 8538, 5602, 2857, 4822, 3894, 2628],
+            // data: [3589, 311.5, 3007.5, 1683.28, 1205, 3508, 8538, 5602, 2857, 4822, 3894, 3318],
+            data: [30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
             type: 'line',
             smooth: true,
             color: '#f56c35'
diff --git a/src/views/projectFront/smartBeamField/pedestalManage.vue b/src/views/projectFront/smartBeamField/pedestalManage.vue
index 95aaa366..458fb732 100644
--- a/src/views/projectFront/smartBeamField/pedestalManage.vue
+++ b/src/views/projectFront/smartBeamField/pedestalManage.vue
@@ -199,7 +199,7 @@ export default {
       }
     },
     processChange(e) {
-      console.log(e, '工序选中')
+      // console.log(e, '工序选中')
       const resultArray = e.map(id => {
         const foundObject = this.processOption.find(obj => obj.id === id)
         return foundObject || [] // 如果未找到匹配的对象，返回 null
@@ -271,6 +271,22 @@ export default {
       })
     },
 
+    //  回显工序下拉
+    getCurrentProcess(listId) {
+      let data = {
+        projectSn: this.projectSn,
+        smartBeamFieldMakeBeamPedestalId: listId
+      }
+      beamFieldProcessList(data).then(res => {
+        console.log('回显工序列表', res)
+        if (res.result.length > 0) {
+          this.processOptionValue = res.result.map(item => item.id)
+          this.cardForm.processList = res.result
+        }
+        console.log('回显工序列表', this.processOptionValue)
+      })
+    },
+
     // 查询制梁台座列表
     getPointList() {
       let data = {
@@ -293,11 +309,12 @@ export default {
     },
     editBtn(obj) {
       console.log('编辑的信息', obj)
-      if (obj.pedestalProcess.length > 0) {
-        const dataArray = obj.pedestalProcess.split(',').map(item => item.trim())
-        // console.log(dataArray,"绑扎台序")
-        this.processOptionValue = dataArray
-      }
+      // if (obj.pedestalProcess.length > 0) {
+      //   const dataArray = obj.pedestalProcess.split(',').map(item => item.trim())
+      //   console.log(dataArray,"回显台座")
+      //   this.processOptionValue = dataArray
+      // }
+      this.getCurrentProcess(obj.id)
 
       this.cardDialog = true
       this.isAdding = true
diff --git a/src/views/projectFront/toxicGasDetection/gasMonitoringData.vue b/src/views/projectFront/toxicGasDetection/gasMonitoringData.vue
index f59e134a..c269be5b 100644
--- a/src/views/projectFront/toxicGasDetection/gasMonitoringData.vue
+++ b/src/views/projectFront/toxicGasDetection/gasMonitoringData.vue
@@ -47,13 +47,11 @@
         <el-table-column prop="uploadTime" align="center" label="上报时间">
         </el-table-column>
         <el-table-column prop="gasType" align="center" label="气体类型">
-          <template slot-scope="scope">{{
-            scope.row.gasType == 1
-              ? '氧气'
-              : scope.row.gasType == 2
-              ? '甲烷'
-              : '一氧化碳'
-          }}</template>
+          <template slot-scope="scope">
+            <div v-if="scope.row.gasType">
+              {{gasTypeOption[scope.row.gasType - 1].label}}
+            </div>
+          </template>
         </el-table-column>
         <el-table-column prop="gasVal" align="center" label="监测值">
           <template slot-scope="scope">
@@ -91,6 +89,24 @@ export default {
       pageSize: 10,
       total: 0,
       tableData: [],
+      gasTypeOption: [
+        {
+        value: 1,
+        label: '氧气'
+      },
+      {
+        value: 2,
+        label: '甲烷'
+      },
+      {
+        value: 3,
+        label: '一氧化碳'
+      },
+      {
+        value: 3,
+        label: '硫化氢'
+      }
+    ]
     };
   },
   created() {
diff --git a/src/views/projectFront/tunnelPositioning/tunnelConfiguration.vue b/src/views/projectFront/tunnelPositioning/tunnelConfiguration.vue
index 44ccc3aa..2d8965dc 100644
--- a/src/views/projectFront/tunnelPositioning/tunnelConfiguration.vue
+++ b/src/views/projectFront/tunnelPositioning/tunnelConfiguration.vue
@@ -336,20 +336,32 @@ export default {
   },
   methods: {
     inputNumber(value) {
-      console.log('输入框的值---', value);
-      if (value >= 310 && value <= 530) {
+      console.log('输入框的值---', value,this.addEditForm.yvalueRandomRangeEnd);
+      // if (value >= 310 && value <= 530) {
+      //   this.addEditForm.yvalueRandomRangeStart = value;
+      // } else {
+      //   this.$message.error('请输入符合范围内的数值:310-530')
+      //   this.addEditForm.yvalueRandomRangeStart = ''
+      // }
+      if (this.addEditForm.yvalueRandomRangeEnd == '' || (value < this.addEditForm.yvalueRandomRangeEnd)) {
         this.addEditForm.yvalueRandomRangeStart = value;
       } else {
-        this.$message.error('请输入符合范围内的数值:310-530')
+        this.$message.error('请输入正确的范围数值')
         this.addEditForm.yvalueRandomRangeStart = ''
       }
     },
     inputNumber2(value) {
       console.log('输入框的值---', value);
-      if (value >= this.addEditForm.yvalueRandomRangeStart && value <= 530) {
+      // if (value >= this.addEditForm.yvalueRandomRangeStart && value <= 530) {
+      //   this.addEditForm.yvalueRandomRangeEnd = value;
+      // } else {
+      //   this.$message.error('请输入符合范围内的数值:310-530')
+      //   this.addEditForm.yvalueRandomRangeEnd = ''
+      // }
+      if (value > this.addEditForm.yvalueRandomRangeStart) {
         this.addEditForm.yvalueRandomRangeEnd = value;
       } else {
-        this.$message.error('请输入符合范围内的数值:310-530')
+        this.$message.error('请输入正确的范围数值')
         this.addEditForm.yvalueRandomRangeEnd = ''
       }
     },
diff --git a/src/views/projectFront/workTicketManage/riskInventory.vue b/src/views/projectFront/workTicketManage/riskInventory.vue
index c56dcd39..247acbd0 100644
--- a/src/views/projectFront/workTicketManage/riskInventory.vue
+++ b/src/views/projectFront/workTicketManage/riskInventory.vue
@@ -164,7 +164,7 @@
         </div>
         <div class="dialog-footer">
           <el-button class="cancleBtn" @click="dialogVisible = false" icon="el-icon-circle-close" size="medium">取消 </el-button>
-          <el-button type="primary" icon="el-icon-circle-check" @click="submitBtn" size="medium">确定 </el-button>
+          <el-button v-if="title != '详情'" type="primary" icon="el-icon-circle-check" @click="submitBtn" size="medium">确定 </el-button>
         </div>
       </el-dialog>
       <!-- //查看大图 -->
@@ -394,7 +394,7 @@ export default {
     //新增
     addBefore(addType, value) {
       if (addType == 1) {
-        this.title = '新增分项'
+        this.title = '新增风险清册'
         this.dialogType = 1
       } else {
         console.log('新增子分项点击', value)