diff --git a/components/qiun-data-charts/qiun-data-charts.vue b/components/qiun-data-charts/qiun-data-charts.vue index ccdcb00d..c632cc0a 100644 --- a/components/qiun-data-charts/qiun-data-charts.vue +++ b/components/qiun-data-charts/qiun-data-charts.vue @@ -1341,6 +1341,7 @@ export default { }, //==============以下是uCharts的方法==================== ucinit(newVal, oldVal, owner, instance){ + if(!(newVal && oldVal)) return; if(JSON.stringify(newVal) == JSON.stringify(oldVal)){ return; } diff --git a/main.js b/main.js index 569e7d2e..a722b9a1 100644 --- a/main.js +++ b/main.js @@ -44,8 +44,8 @@ if (process.env.NODE_ENV === 'development') { // Vue.prototype.url_config = 'http://192.168.34.155:19111/' //彭洁本地 // Vue.prototype.work_url = 'http://47.93.215.234:19997' // 工作流线上地址（弃用） // Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址 - // Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址 - Vue.prototype.work_url = 'http://192.168.34.138:5173' // 工作流地址 + Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址 + // Vue.prototype.work_url = 'http://192.168.34.138:5173' // 工作流地址 // Vue.prototype.work_url = 'http://139.9.66.234:5173' // 工作流地址 // Vue.prototype.work_url = 'http://192.168.34.126:5173' // 工作流地址 // Vue.prototype.url_config = 'http://8.142.139.165:7080/' // 湖里 @@ -86,13 +86,13 @@ if (process.env.NODE_ENV === 'development') { // Vue.prototype.url_config = 'http://10.168.1.105:11111/' // 线上地址 // Vue.prototype.url_config = 'http://10.168.1.104:11111/' // 线上地址 // Vue.prototype.url_config = 'http://47.93.215.234:9809/' // 鞍钢线上地址（弃用） - Vue.prototype.url_config = 'http://42.180.188.17:9809/' // 鞍钢线上地址 - // Vue.prototype.url_config = 'http://42.180.188.17:11211/' // 鞍钢线上测试地址 + // Vue.prototype.url_config = 'http://42.180.188.17:9809/' // 鞍钢线上地址 + Vue.prototype.url_config = 'http://42.180.188.17:11211/' // 鞍钢线上测试地址 // Vue.prototype.url_config = 'http://182.90.224.237:51234/' // 百色三标段 // Vue.prototype.url_config = 'http://192.168.34.221:9111/' // 百色三标段 // Vue.prototype.work_url = 'http://47.93.215.234:19997' // 工作流线上地址（弃用） - Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址 - // Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址 + // Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址 + Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址 // Vue.prototype.work_url = 'http://192.168.34.139:5173' // 工作流地址 // Vue.prototype.url_config = 'http://182.90.224.147:100/' //演示平台 // Vue.prototype.url_config ='http://124.71.178.44:8012/' // 河南 diff --git a/pages/projectEnd/dangerBigProject/index.vue b/pages/projectEnd/dangerBigProject/index.vue index a3a912e2..7da110af 100644 --- a/pages/projectEnd/dangerBigProject/index.vue +++ b/pages/projectEnd/dangerBigProject/index.vue @@ -24,7 +24,7 @@ 类别：{{item.engineeringTypeName}} - 超危 + 超危 diff --git a/pages/projectEnd/qualityManage/analysisAlarm.vue b/pages/projectEnd/qualityManage/analysisAlarm.vue index 874ce4ea..35b403f8 100644 --- a/pages/projectEnd/qualityManage/analysisAlarm.vue +++ b/pages/projectEnd/qualityManage/analysisAlarm.vue @@ -25,7 +25,7 @@ - 分包单位统计TOP10 + 分包单位质量隐患统计 @@ -33,7 +33,7 @@
- + 暂无数据 @@ -394,12 +394,14 @@ "#ea7ccc" ], padding: [15, 15, 0, 5], - enableScroll: false, + enableScroll: true, legend: { show: false }, xAxis: { - disableGrid: true + disableGrid: true, + itemCount: 5, + scrollShow: true }, yAxis: { data: [{ @@ -702,7 +704,7 @@ } }) }, - // 分包单位TOP10 + // 分包单位质量隐患统计 getStatsByEnterpriseFn() { let that = this let requestData = { @@ -718,12 +720,16 @@ data: requestData, method: "post", success(res) { - console.log(res, "获取分包单位TOP10") + console.log(res, "获取分包单位质量隐患统计") let responseData = res.result.records; let categoriesArr = []; let dataArr = []; responseData.map(item => { - categoriesArr.push(item.enterpriseName.substring(0,8) + '...') + if(item.enterpriseName.length == 4){ + categoriesArr.push(item.enterpriseName) + } else { + categoriesArr.push(item.enterpriseName.substring(0,4) + '...') + } dataArr.push(item.totalNum) }) let chartObj = { diff --git a/pages/projectEnd/qualityManage/index.vue b/pages/projectEnd/qualityManage/index.vue index 922597d5..22b16b71 100644 --- a/pages/projectEnd/qualityManage/index.vue +++ b/pages/projectEnd/qualityManage/index.vue @@ -57,21 +57,21 @@ 常用模块 - + 检查台账 - + 新增检查 - + 项目质量自检 - + diff --git a/pages/projectEnd/safeSame/analysisAlarm.vue b/pages/projectEnd/safeSame/analysisAlarm.vue index bebed858..9abb7bb9 100644 --- a/pages/projectEnd/safeSame/analysisAlarm.vue +++ b/pages/projectEnd/safeSame/analysisAlarm.vue @@ -25,7 +25,7 @@ - 分包单位统计TOP10 + 分包单位安全隐患统计 @@ -33,7 +33,7 @@
- + 暂无数据 @@ -394,12 +394,14 @@ "#ea7ccc" ], padding: [15, 15, 0, 5], - enableScroll: false, + enableScroll: true, legend: { show: false }, xAxis: { - disableGrid: true + disableGrid: true, + itemCount: 5, + scrollShow: true }, yAxis: { data: [{ @@ -702,7 +704,7 @@ } }) }, - // 分包单位TOP10 + // 分包单位安全隐患统计 getStatsByEnterpriseFn() { let that = this let requestData = { @@ -718,12 +720,16 @@ data: requestData, method: "post", success(res) { - console.log(res, "获取分包单位TOP10") + console.log(res, "分包单位安全隐患统计") let responseData = res.result.records; let categoriesArr = []; let dataArr = []; responseData.map(item => { - categoriesArr.push(item.enterpriseName.substring(0,8) + '...') + if(item.enterpriseName.length == 4){ + categoriesArr.push(item.enterpriseName) + } else { + categoriesArr.push(item.enterpriseName.substring(0,4) + '...') + } dataArr.push(item.totalNum) }) let chartObj = { diff --git a/pages/projectEnd/safeSame/index.vue b/pages/projectEnd/safeSame/index.vue index e1f1bf9d..e7d9f1c7 100644 --- a/pages/projectEnd/safeSame/index.vue +++ b/pages/projectEnd/safeSame/index.vue @@ -57,27 +57,27 @@ 常用模块 - 检查台账 - 新增检查 - + 项目安全自检 - 危大验收 - + 安全分析预警