admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: BUG修改

Browse Source
This commit is contained in:
kun 2024-05-22 01:45:13 +08:00
parent 68fcd3862d
commit 0f5c68cd04
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/assets/js/http.js
View File

@ -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:28888/' //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地 // 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.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://182.90.224.237:51234' //郭圣雄远程
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程 // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程
// axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 // 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://47.93.215.234:9809/'//鞍钢正式地址(弃用)
// axios.defaults.baseURL = 'http://42.180.188.17:9809/'//鞍钢正式地址 // axios.defaults.baseURL = 'http://42.180.188.17:9809/'//鞍钢正式地址
// axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用) // 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/'//测试地址 // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:19814/'//测试地址
} else if (process.env.NODE_ENV == 'debug') { } else if (process.env.NODE_ENV == 'debug') {

10
src/views/projectFront/laborManage/safeWorkManage/safeWorkRules.vue
View File

@ -24,14 +24,13 @@
<div> <div>
<span>报警推送时间</span> <span>报警推送时间</span>
</div> </div>
<el-date-picker <el-time-picker
v-model="alarmTime" v-model="alarmTime"
style="width: 210px" style="width: 210px"
type="date" value-format="HH:mm:ss"
value-format="yyyy-MM-dd"
:placeholder="$t('message.laborMange.pleaseSelectADate')" :placeholder="$t('message.laborMange.pleaseSelectADate')"
@change="changeSelect" @change="changeSelect"
></el-date-picker> ></el-time-picker>
</div> </div>
</div> </div>
<div class="table_wrap whiteBlock"> <div class="table_wrap whiteBlock">
@ -482,7 +481,8 @@ export default {
}; };
getProjectDetail(reqeustData).then((res) => { getProjectDetail(reqeustData).then((res) => {
if (res && res.result) { if (res && res.result) {
this.radioVal = res.result.enableWorkerAttendanceZero; this.radioVal = res.result.enableWorkerSafeWatch;
this.alarmTime = res.result.workerSafeWatchTime;
} }
}); });
}, },