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

木垒bug修改

Browse Source
This commit is contained in:
jiayu 2024-10-30 19:12:04 +08:00
parent dd7be313d5
commit 08ced344a2
10 changed files with 7950 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/assets/js/api/quality.js
View File

@ -62,6 +62,16 @@ export const deleteSafeRectifyRecordListApi = data=> post('xmgl/xzSecurityQualit
export const backRectifyRecordListApi = data=> post('xmgl/qualityInspectionRecord/revocation',data); //撤回质量整改记录
export const backSafeRectifyRecordListApi = data=> post('xmgl/xzSecurityQualityInspectionRecord/revocation',data); //撤回质量整改记录
export const getInspectionRecordDraftListApi = data=> post('xmgl/qualityInspectionRecordDraft/page',data); //质量问题记录
export const addRecordDraftApi = data=> post('xmgl/qualityInspectionRecordDraft/add',data); //质量问题记录 新增记录
export const queryByIdRecordDraftApi = data=> post('xmgl/qualityInspectionRecordDraft/queryById',data); //质量问题记录 新增记录
export const deleteRectifyRecordDraftApi = data=> post('xmgl/qualityInspectionRecordDraft/delete',data); //删除质量问题记录
export const getSafeRectifyRecordDraftListApi = data=> post('xmgl/xzSecurityQualityInspectionRecordDraft/page',data); //安全问题记录
export const addSafeRectifyRecordApi = data=> post('xmgl/xzSecurityQualityInspectionRecordDraft/add',data); //安全问题记录 新增记录
export const queryByIdSafeRectifyRecordApi = data=> post('xmgl/xzSecurityQualityInspectionRecordDraft/queryById',data); //安全问题记录 新增记录
export const deleteSafeRectifyRecordDraftApi = data=> post('xmgl/xzSecurityQualityInspectionRecordDraft/delete',data); //删除安全问题记录
// 楼栋管理
export const addPositionBuildApi = data => post('xmgl/massReboundBuild/add', data);

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

@ -185,7 +185,7 @@ if (process.env.NODE_ENV == "development") {
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程
// axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
// 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:8099/'//中建四局(沙湖)线上（最新）地址
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址
@ -201,6 +201,7 @@ if (process.env.NODE_ENV == "development") {
// axios.defaults.baseURL = 'http://192.168.100.4:9809/' //乌丹(合肥启程)新正式地址
// axios.defaults.baseURL = "http://jxj.zhgdyun.com:18000"; //包头化工
// axios.defaults.baseURL = "http://222.80.185.228:6090"; //木垒
axios.defaults.baseURL = "https://zm.zhgdyun.com:11111";
} else if (process.env.NODE_ENV == "debug") {
axios.defaults.baseURL = "https://www.ceshi.com";
} else if (process.env.NODE_ENV == "production") {

11
src/components/layout.vue
View File

@ -196,12 +196,17 @@ export default {
},
computed: {
filterMenuList() {
return this.$store.state.menuList.filter(item => {
let list = this.$store.state.menuList.filter(item => {
return this.company != 'xingxuan' &&
item.target != '_blank' &&
!item.menuEquipment &&
(item.menuName != 'LED大屏显示器' || this.company != 'nanchang');
});
})
// 非数据中台页面，过滤数据中台菜单
if(this.$route.path.includes('equipmentCenter')) {
return list
} else {
return list.filter(item => !item.menuEquipment) ;
}
}
},
mounted() {

3
src/components/message.vue
View File

@ -312,7 +312,7 @@ export default {
// mqtt连接 +"/#" +workerId
client.on("connect", e => {
// console.log('连接成功:', this.topicName + this.userId)
console.log('连接成功:', this.topicName + this.userId)
client.subscribe(this.topicName + this.userId, { qos: 0 }, error => {
if (!error) {
// console.log('订阅成功')
@ -331,6 +331,7 @@ export default {
// this.$emit('sendMsg')
// }
// }
this.getData()
setTimeout(() => {
this.$emit("sendMsg", message);
this.$notify({

16
src/router/index.js
View File

@ -1465,6 +1465,14 @@ const routes2 = [{
"@/views/projectFront/quality/inspectionLedger.vue",
], resolve),
},
{
path: "/project/quality/problemRecord", //质量管理 -- 问题记录
name: "质量管理_问题记录",
component: (resolve) =>
require([
"@/views/projectFront/quality/problemRecord.vue",
], resolve),
},
{
path: "/project/safeSame/inspectionLedger", //安全管理 -- 检查记录
@ -1474,6 +1482,14 @@ const routes2 = [{
"@/views/projectFront/safeSame/inspectionLedger.vue",
], resolve),
},
{
path: "/project/safeSame/problemRecord", //质量管理 -- 问题记录
name: "安全管理_问题记录",
component: (resolve) =>
require([
"@/views/projectFront/safeSame/problemRecord.vue",
], resolve),
},
// {
// path: "/project/quality/inspectionLedgerag", //质量管理 -- 检查记录
// name: "质量管理_全部检查记录1",

3
src/store/index.js
View File

@ -46,6 +46,9 @@ export default new Vuex.Store({
state: {
PAGESIZRS: [10, 20, 30, 50],
// UPLOADURL: 'https://zm.zhgdyun.com:11111/upload/image/', // 木垒-标准版
// FILEURL: 'https://zm.zhgdyun.com:11111/image/', // 木垒-标准版
// WORKFLOWURL: "https://zm.zhgdyun.com:15000/#/workspace/forms", // 木垒-工作流-标准版
// UPLOADURL: "http://222.80.185.228:6090/upload/image/", // 木垒
// FILEURL: "http://222.80.185.228:6090/image/", //木垒
// UPLOADURL: 'http://192.168.9.249:9820/upload/image/', // 四川网城

14
src/views/projectFront/laborManage/personModule/administration.vue
View File

@ -2242,7 +2242,7 @@ export default {
},
data() {
return {
pageSizeList: [],
pageSizeList: [10, 50, 100, 200, 500],
sendStatusArr: [
{ name: "未下发", value: 4 },
{ name: "成功", value: 1 },
@ -2408,7 +2408,7 @@ export default {
};
},
created() {
this.pageSizeList = JSON.parse(JSON.stringify(this.$store.state.PAGESIZRS));
// this.pageSizeList = JSON.parse(JSON.stringify(this.$store.state.PAGESIZRS));
this.projectSn = this.$store.state.projectSn;
this.uploadUrl = this.$store.state.UPLOADURL;
this.fileUrl = this.$store.state.FILEURL;
@ -3015,11 +3015,11 @@ export default {
this.checkAllStatus =
this.tableListData.length == 0 ? true : boole ? true : false;
this.total = res.result.total;
if (
+res.result.total > this.pageSizeList[this.pageSizeList.length - 1]
) {
this.pageSizeList.push(+res.result.total);
}
// if (
// +res.result.total > this.pageSizeList[this.pageSizeList.length - 1]
// ) {
// this.pageSizeList.push(+res.result.total);
// }
}
});
},

14
src/views/projectFront/laborManage/personModule/laborComponent.vue
View File

@ -2496,7 +2496,7 @@ export default {
},
data() {
return {
pageSizeList: [],
pageSizeList: [10, 50, 100, 200, 500],
sendStatusArr: [
{ name: "未下发", value: 4 },
{ name: "成功", value: 1 },
@ -2702,7 +2702,7 @@ export default {
};
},
created() {
this.pageSizeList = JSON.parse(JSON.stringify(this.$store.state.PAGESIZRS));
// this.pageSizeList = JSON.parse(JSON.stringify(this.$store.state.PAGESIZRS));
this.projectSn = this.$store.state.projectSn;
this.uploadUrl = this.$store.state.UPLOADURL;
this.fileUrl = this.$store.state.FILEURL;
@ -3648,11 +3648,11 @@ export default {
this.checkAllStatus =
this.tableListData.length == 0 ? true : boole ? true : false;
this.total = res.result.total;
if (
+res.result.total > this.pageSizeList[this.pageSizeList.length - 1]
) {
this.pageSizeList.push(+res.result.total);
}
// if (
// +res.result.total > this.pageSizeList[this.pageSizeList.length - 1]
// ) {
// this.pageSizeList.push(+res.result.total);
// }
}
});
},

4257
src/views/projectFront/quality/problemRecord.vue Normal file
View File

File diff suppressed because it is too large Load Diff

3638
src/views/projectFront/safeSame/problemRecord.vue Normal file
View File

File diff suppressed because it is too large Load Diff