From a3c8fc9c32b054ffa97fe851936028b7c766da6e Mon Sep 17 00:00:00 2001 From: jxj_yjl <1490736767@qq.com> Date: Thu, 1 Jun 2023 21:59:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=90=E6=B6=A6=E9=A1=B9=E7=9B=AE=EF=BC=88?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2bug=E4=BF=AE=E5=A4=8D=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/http.js | 4 +- src/views/companyAdmin/companyDiagram.vue | 6 ++ .../companyFront/environManage/overview.vue | 4 +- src/views/companyFront/project/overview.vue | 10 +-- .../companyFront/towerManage/towerManage.vue | 12 ++- .../dataBoard/homePage/personOverview.vue | 24 +++-- .../projectFront/configManage/roleManage.vue | 2 +- src/views/projectFront/examination/test.vue | 87 +++++++++---------- .../projectFront/markingRoom/devManage.vue | 8 +- .../projectSummary/cooperatorDatails.vue | 2 +- 10 files changed, 87 insertions(+), 72 deletions(-) diff --git a/src/assets/js/http.js b/src/assets/js/http.js index f5290567..7c2c3821 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -86,9 +86,9 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://121.196.214.246/api/'//金林湾线上新 // axios.defaults.baseURL = 'http://42.194.144.62:8088/'//中建四局线上（新）地址 // axios.defaults.baseURL = 'http://101.43.164.214:12350'//中建五局线上 - // axios.defaults.baseURL = 'http://182.90.224.147:15551/'//港投(成润)项目线上(1) + axios.defaults.baseURL = 'http://182.90.224.147:15551/'//港投(成润)项目线上(1) // axios.defaults.baseURL = 'http://182.90.224.147:30262/'//港投(成润)项目线上(2) - axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/ + // axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/ // axios.defaults.baseURL ='http://192.168.34.221:8070' //郭圣雄本地 // axios.defaults.baseURL ='http://192.168.34.221:12350/' //金林湾本地 diff --git a/src/views/companyAdmin/companyDiagram.vue b/src/views/companyAdmin/companyDiagram.vue index 1439c429..9a2204fb 100644 --- a/src/views/companyAdmin/companyDiagram.vue +++ b/src/views/companyAdmin/companyDiagram.vue @@ -450,6 +450,7 @@ :visible.sync="addProjectDialog" :modal-append-to-body="false" width="1100px" + @close="close" >
v.name); //  ["1", "2", "3", "4", "5", "6", "7", "8"] - let yAxisData1 = echartData.map((v) => v.value1); + let yAxisData1 = echartData.map((v) => v.value1?v.value1:0) // [100, 138, 350, 173, 180, 150, 180, 230] - let yAxisData2 = echartData.map((v) => v.value2); - let yAxisData3 = echartData.map((v) => v.value3); + let yAxisData2 = echartData.map((v) => v.value2? v.value2:0) + let yAxisData3 = echartData.map((v) => v.value3?v.value3:0) // [233, 233, 200, 180, 199, 233, 210, 180] const hexToRgba = (hex, opacity) => { let rgbaColor = ""; @@ -1065,8 +1065,8 @@ export default { }, grid: { top: 35, - right: 20, - left: 0, + right: 45, + left: 15, bottom: 0, containLabel: true, }, diff --git a/src/views/companyFront/towerManage/towerManage.vue b/src/views/companyFront/towerManage/towerManage.vue index 3665c367..3ab7112d 100644 --- a/src/views/companyFront/towerManage/towerManage.vue +++ b/src/views/companyFront/towerManage/towerManage.vue @@ -710,7 +710,15 @@ export default { selectTowerAlarmViolationTrendListApi({sn: this.searchsn,selectType: this.activeNav2}).then(res=>{ console.log(res,'---报警违章趋势') if(res.code == 200){ - this.tendencyData = res.result ? res.result:[] + if(type==1){ + this.tendencyData = res.result ? res.result:[] + }else if(type==2){ + this.tendencyData = res.result ? res.result:[] + + }else{ + this.tendencyData = res.result ? res.result:[] + + } this.$nextTick(()=>{ this.createEchart6() }) @@ -1295,7 +1303,7 @@ export default { dataList2.push(item.violationNum) }) if(this.activeNav2 == 2){ - titleData = [...new Set([...titleData,...this.makeDate()])] + // titleData = [...new Set([...titleData,...this.makeDate()])] } else if(this.activeNav2 == 3){ titleData = [...new Set([...titleData,...this.getMounth()])] } diff --git a/src/views/projectAdmin/dataBoard/homePage/personOverview.vue b/src/views/projectAdmin/dataBoard/homePage/personOverview.vue index e522d949..edb3a817 100644 --- a/src/views/projectAdmin/dataBoard/homePage/personOverview.vue +++ b/src/views/projectAdmin/dataBoard/homePage/personOverview.vue @@ -1,9 +1,10 @@ @@ -97,7 +103,7 @@ export default { } .content { position: relative; - padding: 10px 20px; + // padding: 10px 20px; height: calc(100% - 20px - 24px); z-index: 2; .personCount { diff --git a/src/views/projectFront/configManage/roleManage.vue b/src/views/projectFront/configManage/roleManage.vue index bd31050c..0c1cd04a 100644 --- a/src/views/projectFront/configManage/roleManage.vue +++ b/src/views/projectFront/configManage/roleManage.vue @@ -238,7 +238,7 @@ export default { roleName: "", roleDesc: "", projectSn: "", - seeEquipment: 1 + seeEquipment: '0' }, formRules: { roleName: [ diff --git a/src/views/projectFront/examination/test.vue b/src/views/projectFront/examination/test.vue index 350b771b..faff6c02 100644 --- a/src/views/projectFront/examination/test.vue +++ b/src/views/projectFront/examination/test.vue @@ -6,49 +6,29 @@
交卷之前离开当前页面会导致本次考试作废！
-
+
{{ index + 1 }}、{{ item.questionName }}（{{ item.questionScore }}分）
- - {{ indexList[index2] }}、{{ data.optionName }} + + {{ + indexList[index2] }}、{{ data.optionName }} - - {{ indexList[index2] }}、{{ data.optionName }} + + + {{ indexList[index2] + }}、{{ data.optionName }}
@@ -68,13 +48,7 @@ *身份证号码
- +