From 39e3917d386964c736b00797f8ab0cce6f81c599 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9DRain=E2=80=9C?= <904416525@qq.com> Date: Thu, 23 May 2024 20:04:48 +0800 Subject: [PATCH] =?UTF-8?q?flx=EF=BC=9A=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/http.js | 4 +-- .../projectSummary/cooperationUnit.vue | 2 ++ .../projectFront/quality/qualityAnalysis.vue | 8 ++--- .../safetyEducation/safetyAnalysis.vue | 10 +++--- .../safetyEducation/securityRiskAnalysis.vue | 36 +++++++++++-------- 5 files changed, 34 insertions(+), 26 deletions(-) diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 08e97487..6778e31c 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -84,8 +84,8 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工） // 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:9111/' //郭圣雄本地 - axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 + axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地 + // 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/' //沈阳和盈 diff --git a/src/views/projectFront/projectSummary/cooperationUnit.vue b/src/views/projectFront/projectSummary/cooperationUnit.vue index 4b140db7..2d71f722 100644 --- a/src/views/projectFront/projectSummary/cooperationUnit.vue +++ b/src/views/projectFront/projectSummary/cooperationUnit.vue @@ -348,6 +348,8 @@ v-model="enterpriseForm.bankcardnumber" :placeholder="$t('message.laborMange.placeholder2')" type="number" + @wheel.native.prevent + oninput ="value=value.replace(/[^0-9.]/g,'')" > diff --git a/src/views/projectFront/quality/qualityAnalysis.vue b/src/views/projectFront/quality/qualityAnalysis.vue index 706b37b0..56c79356 100644 --- a/src/views/projectFront/quality/qualityAnalysis.vue +++ b/src/views/projectFront/quality/qualityAnalysis.vue @@ -650,7 +650,7 @@ export default { { name: '重大风险', type: 'line', - stack: 'Total', + // stack: 'Total', data: this.riskList.map(item => item.greatFaultLevelNum), itemStyle: { //颜色 默认灰色 color: 'rgba(255,0,0,1)', @@ -661,7 +661,7 @@ export default { { name: '较大风险', type: 'line', - stack: 'Total', + // stack: 'Total', data: this.riskList.map(item => item.largerRiskNum), itemStyle: { //颜色 默认灰色 color: 'rgba(255,153,1,1)', @@ -672,7 +672,7 @@ export default { { name: '一般风险', type: 'line', - stack: 'Total', + // stack: 'Total', data: this.riskList.map(item => item.generalRiskNum), itemStyle: { //颜色 默认灰色 color: 'rgba(255,255,2,1)', @@ -683,7 +683,7 @@ export default { { name: '低风险', type: 'line', - stack: 'Total', + // stack: 'Total', data: this.riskList.map(item => item.lowRiskNum), itemStyle: { //颜色 默认灰色 color: 'rgba(0,0,255,1)', diff --git a/src/views/projectFront/safetyEducation/safetyAnalysis.vue b/src/views/projectFront/safetyEducation/safetyAnalysis.vue index d2d17792..a5a7c5ef 100644 --- a/src/views/projectFront/safetyEducation/safetyAnalysis.vue +++ b/src/views/projectFront/safetyEducation/safetyAnalysis.vue @@ -578,7 +578,7 @@ export default { // 折线图 lineCharts(el) { let ageChart = echarts.init(el); - + console.log(this.riskList) let option = { tooltip: { trigger: 'axis' @@ -645,7 +645,7 @@ export default { { name: '重大风险', type: 'line', - stack: 'Total', + // stack: 'Total', data: this.riskList.map(item => item.greatFaultLevelNum), itemStyle: { //颜色 默认灰色 color: 'rgba(255,0,0,1)', @@ -656,7 +656,7 @@ export default { { name: '较大风险', type: 'line', - stack: 'Total', + // stack: 'Total', data: this.riskList.map(item => item.largerRiskNum), itemStyle: { //颜色 默认灰色 color: 'rgba(255,153,1,1)', @@ -667,7 +667,7 @@ export default { { name: '一般风险', type: 'line', - stack: 'Total', + // stack: 'Total', data: this.riskList.map(item => item.generalRiskNum), itemStyle: { //颜色 默认灰色 color: 'rgba(255,255,2,1)', @@ -678,7 +678,7 @@ export default { { name: '低风险', type: 'line', - stack: 'Total', + // stack: 'Total', data: this.riskList.map(item => item.lowRiskNum), itemStyle: { //颜色 默认灰色 color: 'rgba(0,0,255,1)', diff --git a/src/views/projectFront/safetyEducation/securityRiskAnalysis.vue b/src/views/projectFront/safetyEducation/securityRiskAnalysis.vue index 9194c7ef..a883797e 100644 --- a/src/views/projectFront/safetyEducation/securityRiskAnalysis.vue +++ b/src/views/projectFront/safetyEducation/securityRiskAnalysis.vue @@ -117,15 +117,15 @@
人员扣分记录
-
-
-
{{ deductScoreInfo.workerName }}
-
扣分分数: {{ item.deductScore }}
+
+
+
+
{{ deductScoreInfo.workerName }}
+
扣分分数: {{ item.deductScore }}
+
+
扣分原因：{{ item.deductReason }}
-
扣分原因：{{ item.deductReason }}
-
-
-
+

暂无数据

@@ -398,7 +398,7 @@ export default { { name: '低风险', type: 'line', - stack: 'Total', + // stack: 'Total', data: this.statsEnterpriseList.map(item => item.lowRiskNum), itemStyle: { //颜色 默认灰色 color: '#FFE500', @@ -407,7 +407,7 @@ export default { { name: '中风险', type: 'line', - stack: 'Total', + // stack: 'Total', data: this.statsEnterpriseList.map(item => item.mediumRiskNum), itemStyle: { //颜色 默认灰色 color: '#FF9901', @@ -416,7 +416,7 @@ export default { { name: '高风险', type: 'line', - stack: 'Total', + // stack: 'Total', data: this.statsEnterpriseList.map(item => item.highRiskNum), itemStyle: { //颜色 默认灰色 color: '#FF0000', @@ -633,17 +633,23 @@ export default { /deep/ .el-dialog__body { padding-top: 10px; height: 480px; + overflow: hidden +} + +.dialog-main { overflow-y: scroll; + height: 65%; + padding-bottom: 20px; } // 美化滚动条 -/deep/ .el-dialog__body::-webkit-scrollbar, +.dialog-main::-webkit-scrollbar, /deep/ .el-tabs__content::-webkit-scrollbar { width: 6px; height: 6px; } -/deep/ .el-dialog__body::-webkit-scrollbar-track, +.dialog-main::-webkit-scrollbar-track, /deep/ .el-tabs__content::-webkit-scrollbar-track { width: 6px; background: rgba(#101F1C, 0.1); @@ -652,7 +658,7 @@ export default { border-radius: 2em; } -/deep/ .el-dialog__body::-webkit-scrollbar-thumb, +.dialog-main::-webkit-scrollbar-thumb, /deep/ .el-tabs__content::-webkit-scrollbar-thumb { background-color: rgba(144, 147, 153, .5); background-clip: padding-box; @@ -664,7 +670,7 @@ export default { cursor: pointer; } -/deep/ .el-dialog__body::-webkit-scrollbar-thumb:hover, +.dialog-main::-webkit-scrollbar-thumb:hover, /deep/ .el-tabs__content::-webkit-scrollbar-thumb:hover { background-color: rgba(144, 147, 153, .3); }