From ed2bb6757f3b4f6fed45447d303517d56e3349fa Mon Sep 17 00:00:00 2001 From: jiayu Date: Tue, 22 Oct 2024 11:11:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9C=A8=E5=9E=92=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E9=83=A8=E5=88=86=E5=90=8C=E6=AD=A5=E6=A0=87=E5=87=86=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/http.js | 4 ++-- src/components/header.vue | 2 +- src/components/userChange.vue | 10 +++++++--- src/store/index.js | 8 ++++---- src/views/companyAdmin/layout.vue | 2 +- src/views/equipmentCenter/equipmentCenterIndex.vue | 1 + src/views/infoCenter/layout.vue | 2 +- src/views/message.vue | 2 +- src/views/messageV2.vue | 2 +- src/views/projectAdmin/dataBoard/dataBoard.vue | 2 +- src/views/projectAdmin/dataBoardTwo/dataBoard.vue | 2 +- src/views/projectAdmin/projectList.vue | 2 +- src/views/supplierAdmin/layout.vue | 2 +- src/views/userCenter/layout.vue | 2 +- 14 files changed, 24 insertions(+), 19 deletions(-) diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 3af6a61b..f2db1152 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -180,12 +180,12 @@ if (process.env.NODE_ENV == "development") { // axios.defaults.baseURL = 'http://192.168.34.221:28890/' //郭圣雄本地 // axios.defaults.baseURL = "http://192.168.34.221:9111/"; //郭圣雄本地 // axios.defaults.baseURL = "http://192.168.34.221:19112/"; //郭圣雄本地 - 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/' //沈阳和盈 // 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/'//测试地址 diff --git a/src/components/header.vue b/src/components/header.vue index 6fb92640..827df0a2 100644 --- a/src/components/header.vue +++ b/src/components/header.vue @@ -154,7 +154,7 @@

{ let timer = setTimeout(() => { diff --git a/src/views/equipmentCenter/equipmentCenterIndex.vue b/src/views/equipmentCenter/equipmentCenterIndex.vue index de895bc4..21c6aabc 100644 --- a/src/views/equipmentCenter/equipmentCenterIndex.vue +++ b/src/views/equipmentCenter/equipmentCenterIndex.vue @@ -343,6 +343,7 @@ var arr = this.$store.state.userInfo.menuAuthority.moduleList if (res.code == 200) { this.projectName = res.result.projectName; this.headerName += ' - ' + res.result.projectName + document.title = this.projectName; this.$store.commit('setProDetail',res.result) } }); diff --git a/src/views/infoCenter/layout.vue b/src/views/infoCenter/layout.vue index 2feb476a..99ba8aea 100644 --- a/src/views/infoCenter/layout.vue +++ b/src/views/infoCenter/layout.vue @@ -122,7 +122,7 @@ export default { if(localStorage.getItem('systemInfo')){ this.systemInfo=JSON.parse(localStorage.getItem('systemInfo')) } - document.title='企业后台' + // document.title='企业后台' console.log('mounted',this.$route.path) }, diff --git a/src/views/message.vue b/src/views/message.vue index 9cd443f7..c44e833a 100644 --- a/src/views/message.vue +++ b/src/views/message.vue @@ -191,7 +191,7 @@ export default { } }, created() { - document.title = '消息中心' + // document.title = '消息中心' this.selectNowDate() this.getListData() }, diff --git a/src/views/messageV2.vue b/src/views/messageV2.vue index a90c04a8..262f90d6 100644 --- a/src/views/messageV2.vue +++ b/src/views/messageV2.vue @@ -177,7 +177,7 @@ export default { }, created() { // '消息中心' - document.title = this.$t('message.messageCenter.msgCenter') + // document.title = this.$t('message.messageCenter.msgCenter') this.selectNowDate() this.getListData() }, diff --git a/src/views/projectAdmin/dataBoard/dataBoard.vue b/src/views/projectAdmin/dataBoard/dataBoard.vue index 22632cca..ab8988de 100644 --- a/src/views/projectAdmin/dataBoard/dataBoard.vue +++ b/src/views/projectAdmin/dataBoard/dataBoard.vue @@ -147,7 +147,7 @@ export default { this.loadWeather() this.enabledProjectV2 = enabledProjectV2 // document.title = this.$store.state.currentProDetail.projectName + this.$t('message.dataBoard.dataBoard') - document.title = this.currentProDetail.projectName + this.$t('message.dataBoard.dataBoard') + // document.title = this.currentProDetail.projectName + this.$t('message.dataBoard.dataBoard') this.getAllModule() }, methods: { diff --git a/src/views/projectAdmin/dataBoardTwo/dataBoard.vue b/src/views/projectAdmin/dataBoardTwo/dataBoard.vue index d77ead66..5c1f6e81 100644 --- a/src/views/projectAdmin/dataBoardTwo/dataBoard.vue +++ b/src/views/projectAdmin/dataBoardTwo/dataBoard.vue @@ -96,7 +96,7 @@ export default { this.getTime() this.loadWeather() this.enabledProjectV2=enabledProjectV2 - document.title=this.$store.state.currentProDetail.projectName+this.$t('message.dataBoard.dataBoard') + // document.title=this.$store.state.currentProDetail.projectName+this.$t('message.dataBoard.dataBoard') this.getAllModule() }, methods:{ diff --git a/src/views/projectAdmin/projectList.vue b/src/views/projectAdmin/projectList.vue index 7119702c..8a4756c2 100644 --- a/src/views/projectAdmin/projectList.vue +++ b/src/views/projectAdmin/projectList.vue @@ -188,7 +188,7 @@ export default { }; }, created() { - document.title='项目总览' + // document.title='项目总览' this.userInfo = this.$store.state.userInfo; this.getLayerCompany(); }, diff --git a/src/views/supplierAdmin/layout.vue b/src/views/supplierAdmin/layout.vue index 4b391dbc..270252ee 100644 --- a/src/views/supplierAdmin/layout.vue +++ b/src/views/supplierAdmin/layout.vue @@ -152,7 +152,7 @@ export default { if(localStorage.getItem('systemInfo')){ this.systemInfo=JSON.parse(localStorage.getItem('systemInfo')) } - document.title='企业后台' + // document.title='企业后台' console.log('mounted',this.$route.path) }, diff --git a/src/views/userCenter/layout.vue b/src/views/userCenter/layout.vue index cc306bca..37a04b5b 100644 --- a/src/views/userCenter/layout.vue +++ b/src/views/userCenter/layout.vue @@ -120,7 +120,7 @@ export default { if(localStorage.getItem('systemInfo')){ this.systemInfo=JSON.parse(localStorage.getItem('systemInfo')) } - document.title='企业后台' + // document.title='企业后台' console.log('mounted',this.$route.path) }, methods: { From 6190d8d64e1baca106c2306a7900d9e1da11d7cb Mon Sep 17 00:00:00 2001 From: jiayu Date: Sat, 26 Oct 2024 09:14:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/layout.vue | 17 +++-- .../equipmentCenter/equipmentCenterIndex.vue | 73 +++++++++++-------- .../allInfo/componentsModule/dataListData.vue | 4 +- src/views/projectAdmin/projectIndex.vue | 4 +- 4 files changed, 59 insertions(+), 39 deletions(-) diff --git a/src/components/layout.vue b/src/components/layout.vue index 9967ce2f..c91e3afd 100644 --- a/src/components/layout.vue +++ b/src/components/layout.vue @@ -91,15 +91,10 @@

{ + return this.company != 'xingxuan' && + item.target != '_blank' && + !item.menuEquipment && + (item.menuName != 'LED大屏显示器' || this.company != 'nanchang'); + }); + } + }, mounted() { console.log("mounted", this.$route); this.$nextTick(() => { diff --git a/src/views/equipmentCenter/equipmentCenterIndex.vue b/src/views/equipmentCenter/equipmentCenterIndex.vue index 21c6aabc..94a69878 100644 --- a/src/views/equipmentCenter/equipmentCenterIndex.vue +++ b/src/views/equipmentCenter/equipmentCenterIndex.vue @@ -6,33 +6,39 @@
-
{{$t('message.homeLayout.existingProducts')}}
+
-
- - -
-
{{item.moduleName}}
-
{{item.moduleDesc}}
- +
{{$t('message.homeLayout.ununlockedProducts')}}
@@ -314,6 +320,13 @@ export default { iconType: '1' }; }, + computed: { + filterList: function () { + return this.list.filter((item) => { + return item.operation && item.moduleType==2 && item.moduleEquipment==1 + }); + }, + }, mounted(){ if(localStorage.getItem('systemInfo')){ this.iconType = JSON.parse(localStorage.getItem('systemInfo')).iconType ? JSON.parse(localStorage.getItem('systemInfo')).iconType:'1' @@ -460,10 +473,8 @@ var arr = this.$store.state.userInfo.menuAuthority.moduleList width: 100%; display: flex; - align-items: center; - // justify-content: space-around; + align-items: flex-end; box-sizing: border-box; - // padding: 0 100px; flex-wrap: wrap; margin-bottom: 8px; .module:nth-child(4n) { @@ -471,14 +482,16 @@ var arr = this.$store.state.userInfo.menuAuthority.moduleList } } .module_title { - margin-left: -10px; + // margin-left: -10px; + margin-left: 0; border-left: 2px solid #4a8bff; padding-left: 8px; margin-bottom: 20px; font-size: 14px; + font-family: PingFang SC; } .module { - width: 320px; + width: 310px; // height: 124px; box-sizing: border-box; // border-radius: 3px; diff --git a/src/views/infoCenter/allInfo/componentsModule/dataListData.vue b/src/views/infoCenter/allInfo/componentsModule/dataListData.vue index 019f581c..67b60af8 100644 --- a/src/views/infoCenter/allInfo/componentsModule/dataListData.vue +++ b/src/views/infoCenter/allInfo/componentsModule/dataListData.vue @@ -218,7 +218,7 @@ export default { if (row.type == 11) { // 质量 path = "/project/quality/inspectionLedger"; - const res = await getQualityNoticeStatusApi({ id: payLoadParams.data.id }); + const res = await getQualityNoticeStatusApi({ id: payLoadParams?.data?.id }); if (!res.result || res.result.status == 6) { this.$message({ type: "error", @@ -229,7 +229,7 @@ export default { } else if (row.type == 10) { // 安全 path = "/project/safeSame/inspectionLedger"; - const res = await getNoticeStatusApi({ id: payLoadParams.data.id }); + const res = await getNoticeStatusApi({ id: payLoadParams?.data?.id }); if (!res.result || res.result.status == 6) { this.$message({ type: "error", diff --git a/src/views/projectAdmin/projectIndex.vue b/src/views/projectAdmin/projectIndex.vue index eb430d50..4e28883e 100644 --- a/src/views/projectAdmin/projectIndex.vue +++ b/src/views/projectAdmin/projectIndex.vue @@ -465,11 +465,13 @@ export default { } .module_title { - margin-left: -10px; + // margin-left: -10px; + margin-left: 0px; border-left: 2px solid #4a8bff; padding-left: 8px; margin-bottom: 20px; font-size: 14px; + font-family: PingFang SC; // width: 1360px; }