From 913dc74cb6594c8f7cd50578e6198f68c4eaecac Mon Sep 17 00:00:00 2001
From: cjp <3096114695@qq.com>
Date: Wed, 26 Jul 2023 11:07:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectFront/concreteMonitoring/devManage.vue   |  1 +
 src/views/projectFront/highModulus/pointManage.vue  |  4 ++--
 .../projectFront/laborManage/safetyTrainManage.vue  | 13 +++++++------
 src/views/projectFront/towerCrane/alarmsTable.vue   |  4 ++--
 src/views/projectFront/towerCrane/liveDataTable.vue |  2 +-
 src/views/projectFront/towerCrane/violationData.vue |  2 +-
 .../projectFront/towerCrane/workCycleTable.vue      |  2 +-
 7 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/views/projectFront/concreteMonitoring/devManage.vue b/src/views/projectFront/concreteMonitoring/devManage.vue
index 151ebd27..0c45a1fd 100644
--- a/src/views/projectFront/concreteMonitoring/devManage.vue
+++ b/src/views/projectFront/concreteMonitoring/devManage.vue
@@ -321,6 +321,7 @@
                 >
                   <el-input
                   type="number"
+                  oninput="if(value.length>5)value=value.slice(0,5)"
                     v-model="item.temperatureThreshold"
                     style="width: 120px"
                     :placeholder="$t('message.safeManage.placeholder')"
diff --git a/src/views/projectFront/highModulus/pointManage.vue b/src/views/projectFront/highModulus/pointManage.vue
index ef3bb562..527b5301 100644
--- a/src/views/projectFront/highModulus/pointManage.vue
+++ b/src/views/projectFront/highModulus/pointManage.vue
@@ -211,7 +211,7 @@
     >
       <div class="dialog_content">
         <div class="filterBox">
-          <el-select
+          <!-- <el-select
             size="medium"
             :placeholder="$t('message.highModulus.realData')"
             v-model="filterForm.alarmState"
@@ -224,7 +224,7 @@
               :value="index + 1"
               :label="item"
             ></el-option>
-          </el-select>
+          </el-select> -->
           <el-date-picker
             size="medium"
             v-model="daterange"
diff --git a/src/views/projectFront/laborManage/safetyTrainManage.vue b/src/views/projectFront/laborManage/safetyTrainManage.vue
index c4628bdf..af733d1f 100644
--- a/src/views/projectFront/laborManage/safetyTrainManage.vue
+++ b/src/views/projectFront/laborManage/safetyTrainManage.vue
@@ -830,14 +830,14 @@ export default {
             return;
           }
           this.cardForm.workernum = this.cardForm.list.length;
-          var json = this.cardForm;
-          var arr = [];
+          let json = this.cardForm;
+          let arr = [];
           console.log(json.list);
           json.list.forEach((element) => {
-            var item = {
+            let item = {
               isQualified: element.isQualified,
               score: element.score,
-              workerId: this.isAdd ? element.id : element.workerId,
+              workerId: element.id,
               projectSn: this.$store.state.projectSn,
             };
             if (!this.isAdd) {
@@ -848,7 +848,7 @@ export default {
           });
           json.list = arr;
           if (this.isAdd) {
-            console.log(json);
+            console.log(json,"新增");
             workerSafeEducationAddApi(json).then((res) => {
               this.cardDialog = false;
               this.loadCardData();
@@ -858,7 +858,8 @@ export default {
             });
           } else {
             // console.log(this.cardForm)
-            workerSafeEducationEditApi(this.cardForm).then((res) => {
+            console.log(json,"修改")
+            workerSafeEducationEditApi(json).then((res) => {
               this.cardDialog = false;
               this.loadCardData();
               this.$message.success(
diff --git a/src/views/projectFront/towerCrane/alarmsTable.vue b/src/views/projectFront/towerCrane/alarmsTable.vue
index 843b2a9a..9b831803 100644
--- a/src/views/projectFront/towerCrane/alarmsTable.vue
+++ b/src/views/projectFront/towerCrane/alarmsTable.vue
@@ -346,7 +346,7 @@ export default {
       pageSize: 10,
       total: 0,
       moment: moment,
-      valueTime: '',
+      valueTime: null,
       selectAlarmType: '',
       // 1力矩，2风速，3高度上限位，4幅度内限位，5幅度外限位，6顺时针回转限位,7逆时针回转限位,8倾角,9环境防撞,10多机防撞
       alarmTypeList: [
@@ -404,7 +404,7 @@ export default {
   created() {
     this.projectSn = this.sn ? this.sn : this.$store.state.projectSn;
     this.queryDev()
-    this.selectNowDate()
+    // this.selectNowDate()
     this.queryTowerAlarmList()
   },
   computed: {
diff --git a/src/views/projectFront/towerCrane/liveDataTable.vue b/src/views/projectFront/towerCrane/liveDataTable.vue
index 4b872622..5b05e81a 100644
--- a/src/views/projectFront/towerCrane/liveDataTable.vue
+++ b/src/views/projectFront/towerCrane/liveDataTable.vue
@@ -425,7 +425,7 @@ export default {
         this.projectSn = this.sn ? this.sn:this.$store.state.projectSn;
         this.startTime = this.endTime = moment(new Date()).format('YYYY-MM-DD')
         console.log(this.startTime, this.endTime)
-        this.selectNowDate()
+        // this.selectNowDate()
         this.queryDev()
         this.queryTowerCurrentDataList()
     },
diff --git a/src/views/projectFront/towerCrane/violationData.vue b/src/views/projectFront/towerCrane/violationData.vue
index ff96e45f..7ee0ad96 100644
--- a/src/views/projectFront/towerCrane/violationData.vue
+++ b/src/views/projectFront/towerCrane/violationData.vue
@@ -157,7 +157,7 @@ export default {
   created() {
     this.projectSn = this.sn ? this.sn : this.$store.state.projectSn
     this.queryDev()
-    this.selectNowDate()
+    // this.selectNowDate()
     this.queryTowerWorkCycle()
   },
   computed: {
diff --git a/src/views/projectFront/towerCrane/workCycleTable.vue b/src/views/projectFront/towerCrane/workCycleTable.vue
index b0756e9d..6681c130 100644
--- a/src/views/projectFront/towerCrane/workCycleTable.vue
+++ b/src/views/projectFront/towerCrane/workCycleTable.vue
@@ -458,7 +458,7 @@ export default {
   created() {
     this.projectSn = this.sn ? this.sn : this.$store.state.projectSn
     this.queryDev()
-    this.selectNowDate()
+    // this.selectNowDate()
     this.queryTowerWorkCycle()
   },
   computed: {