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:
vce 2024-03-12 21:38:33 +08:00
parent 61c0c508af
commit c7fe309c56
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,12 +83,12 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL ='http://101.43.164.214:45001/' //上海张江 // axios.defaults.baseURL ='http://101.43.164.214:45001/' //上海张江
// axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工） // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工）
// 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:9111/' //郭圣雄本地 // axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
// 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://101.43.164.214:45020/' //沈阳和盈 // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
// axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头 // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头
// axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目 axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目
// axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址 // axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址
// axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址 // axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址

2
src/views/projectFront/laborManage/personDetails.vue
View File

@ -1301,7 +1301,7 @@
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="address" :label="dateOfIssue"> <el-table-column prop="address" :label="$t('message.laborMange.dateOfIssue')">
<template slot-scope="scope"> <template slot-scope="scope">
<el-date-picker <el-date-picker
v-if="scope.row.certificateState" v-if="scope.row.certificateState"

2
src/views/projectFront/materialProcure/unProcureForm.vue
View File

@ -518,7 +518,7 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
.header-info{ .header-info{
width: 35%; width: 35%;
height: 50px; height: 25px;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;

10
src/views/projectFront/wareHouseManage/devManage.vue
View File

@ -86,7 +86,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="进场时间" prop="entryTime"> <el-form-item label="时间" prop="entryTime">
<el-date-picker <el-date-picker
:disabled="isDetail" :disabled="isDetail"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
@ -152,7 +152,7 @@ export default {
}, },
data() { data() {
return { return {
id: '', devSn: '',
pageNo2: 1, pageNo2: 1,
pageSize2: 10, pageSize2: 10,
total2: 0, total2: 0,
@ -351,18 +351,18 @@ export default {
this.dialogTableVisible = true this.dialogTableVisible = true
this.pageNo2 = 1 this.pageNo2 = 1
this.pageSize2 = 10 this.pageSize2 = 10
this.id = obj.id this.devSn = obj.devSn
this.getPageList() this.getPageList()
}, },
//获取人员动态--今日数据列表 //获取历史数据列表
getPageList() { getPageList() {
console.log(this.startTime) console.log(this.startTime)
let data = { let data = {
projectSn: this.$store.state.projectSn, projectSn: this.$store.state.projectSn,
pageNo: this.pageNo2, pageNo: this.pageNo2,
pageSize: this.pageSize2, pageSize: this.pageSize2,
id: this.id devSn: this.devSn
} }
rtToolPageHistory(data).then((res) => { rtToolPageHistory(data).then((res) => {
if (res.code == 200) { if (res.code == 200) {