From 0f5c68cd0467f7dc738737fd97be7e96632b89b4 Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Wed, 22 May 2024 01:45:13 +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

---
 src/assets/js/http.js                                  |  4 ++--
 .../laborManage/safeWorkManage/safeWorkRules.vue       | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index 199e5790..0679d524 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -85,7 +85,7 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地
   // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
   // axios.defaults.baseURL ='http://192.168.34.221:19111/' //郭圣雄本地
-  // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
+  axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
   // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
   // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程
   // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
@@ -97,7 +97,7 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用)
   // axios.defaults.baseURL = 'http://42.180.188.17:9809/'//鞍钢正式地址
   // axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用)
-  axios.defaults.baseURL = 'http://42.180.188.17:11211/'//鞍钢测试地址
+  // axios.defaults.baseURL = 'http://42.180.188.17:11211/'//鞍钢测试地址
   // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:19814/'//测试地址
 
 } else if (process.env.NODE_ENV == 'debug') {
diff --git a/src/views/projectFront/laborManage/safeWorkManage/safeWorkRules.vue b/src/views/projectFront/laborManage/safeWorkManage/safeWorkRules.vue
index b662ff9b..abefdacb 100644
--- a/src/views/projectFront/laborManage/safeWorkManage/safeWorkRules.vue
+++ b/src/views/projectFront/laborManage/safeWorkManage/safeWorkRules.vue
@@ -24,14 +24,13 @@
         <div>
           <span>报警推送时间</span>
         </div>
-        <el-date-picker
+        <el-time-picker
           v-model="alarmTime"
           style="width: 210px"
-          type="date"
-          value-format="yyyy-MM-dd"
+          value-format="HH:mm:ss"
           :placeholder="$t('message.laborMange.pleaseSelectADate')"
           @change="changeSelect"
-        ></el-date-picker>
+        ></el-time-picker>
       </div>
     </div>
     <div class="table_wrap whiteBlock">
@@ -482,7 +481,8 @@ export default {
       };
       getProjectDetail(reqeustData).then((res) => {
         if (res && res.result) {
-          this.radioVal = res.result.enableWorkerAttendanceZero;
+          this.radioVal = res.result.enableWorkerSafeWatch;
+          this.alarmTime = res.result.workerSafeWatchTime;
         }
       });
     },