From 7a66d7f17131f5000f63c953f1befedf80af423b Mon Sep 17 00:00:00 2001 From: haha Date: Sat, 12 Aug 2023 00:51:55 +0800 Subject: [PATCH 1/4] update code --- src/pages/index.vue | 1435 ++++++++++++++++-------------- src/pages/index/indexDlg2.vue | 82 +- src/pages/progress/indexDlg1.vue | 62 +- src/pages/progress/indexDlg3.vue | 48 +- src/pages/projectProgress.vue | 4 +- src/pages/style/index.less | 40 + 6 files changed, 884 insertions(+), 787 deletions(-) diff --git a/src/pages/index.vue b/src/pages/index.vue index 7836836..3830191 100644 --- a/src/pages/index.vue +++ b/src/pages/index.vue @@ -1,162 +1,230 @@ - + diff --git a/src/pages/index/indexDlg2.vue b/src/pages/index/indexDlg2.vue index 49ab5df..5aab8fa 100644 --- a/src/pages/index/indexDlg2.vue +++ b/src/pages/index/indexDlg2.vue @@ -9,24 +9,34 @@
- - - - - - - - - -
+ + + + + + + + + + + + + + + +
@@ -52,16 +62,7 @@ 目前进展:
{{ it.date }}
- - - 滞后事项: -
{{ it.porgress }}
- - - 存在问题: -
{{ it.question }}
- - +
@@ -117,15 +118,7 @@
{{ it.date}}
-
-
- 目前进展: -
{{ it.porgress }}
-
-
- 目前存在问题: -
{{ it.question }}
-
+
@@ -361,20 +354,7 @@ export default { position: absolute; top: -40px; right: 100px; - - .svg-icon { - width: 40px !important; - height: 40px !important; - cursor: pointer; - *{ - fill: #fff; - } - &.active{ - *{ - fill: aqua; - } - } - } + } } .popup-project-introduction-min { diff --git a/src/pages/progress/indexDlg1.vue b/src/pages/progress/indexDlg1.vue index 2734201..504ceac 100644 --- a/src/pages/progress/indexDlg1.vue +++ b/src/pages/progress/indexDlg1.vue @@ -4,24 +4,34 @@
- - - - - - - - - -
+ + + + + + + + + + + + + + + +
@@ -176,21 +186,7 @@ export default { .font-size-tools { position: absolute; top: -40px; - right: 100px; - - .svg-icon { - width: 40px !important; - height: 40px !important; - cursor: pointer; - *{ - fill: #fff; - } - &.active{ - *{ - fill: aqua; - } - } - } + right: 100px; } } diff --git a/src/pages/progress/indexDlg3.vue b/src/pages/progress/indexDlg3.vue index c392128..d2647ff 100644 --- a/src/pages/progress/indexDlg3.vue +++ b/src/pages/progress/indexDlg3.vue @@ -2,7 +2,7 @@
- + + - - - + + + + - + + + + d="M839 875H735.3l-74.1-198.7H358.6L288.7 875H185l276.8-726h100.4L839 875zM632.1 594.3L522.3 292.4c-3.4-9.7-7.2-26.6-11.3-50.6h-2.3c-3.4 21.9-7.4 38.7-11.7 50.6L388.1 594.3h244z" + fill="#fff" p-id="3687"> +
+
@@ -126,6 +132,7 @@
暂无数据
+
@@ -273,19 +280,6 @@ export default { position: absolute; top: 18px; right: 400px; - - .svg-icon { - width: 40px !important; - height: 40px !important; - cursor: pointer; - - &.active { - * { - fill: aqua; - } - } - - } } .popup-project-introduction-details { diff --git a/src/pages/projectProgress.vue b/src/pages/projectProgress.vue index 8304635..dba0c39 100644 --- a/src/pages/projectProgress.vue +++ b/src/pages/projectProgress.vue @@ -335,11 +335,11 @@ export default { this.init() }, mounted() { - this.$bus.$on("projectChange",res=>{ + this.$bus.$on("projectChange",res=>{ this.loadProjectConstructionProgress(); }); this.$bus.$on("loadProjects",prjs=>{ - this.projects=prjs; + this.projects=prjs; }) this.$bus.$on("deptChange",dept=>{ this.$api.quarterlyAssess.currentListByDept(dept.id).then(d=>{ diff --git a/src/pages/style/index.less b/src/pages/style/index.less index 552d6c0..6d35e22 100644 --- a/src/pages/style/index.less +++ b/src/pages/style/index.less @@ -1,3 +1,43 @@ .el-tooltip__popper{ max-width: 50%; +} +.font-size-tools{ +.set-font-size{ + cursor: pointer; + position: relative; + + &.active{ + color: aqua; + .svg-icon{ + *{ + fill: aqua; + } + } + } + .svg-icon{ + width: 40px !important; + height: 40px !important; + } + &.font-size2{ + &::after{ + content: "+"; + font-style: normal; + right: 0px; + font-weight: bold; + position: absolute; + font-size: 16px !important; + } + margin-right:4px; + } + &.font-size0{ + &::after{ + content: "-"; + font-style: normal; + right: 0px; + font-weight: bold; + position: absolute; + font-size: 16px !important; + } + } +} } \ No newline at end of file From edff6eef7b12bcd0b97c8d263695e5c7ca53ec2c Mon Sep 17 00:00:00 2001 From: haha Date: Sat, 12 Aug 2023 14:16:43 +0800 Subject: [PATCH 2/4] update code --- src/api/project/index.js | 68 +++++++++++- src/components/project-overview-chart.js | 11 +- src/components/rank-chart.js | 5 +- src/pages/index.vue | 132 ++++++++++++++++------- src/pages/projectProgress.vue | 65 ++++++----- 5 files changed, 205 insertions(+), 76 deletions(-) diff --git a/src/api/project/index.js b/src/api/project/index.js index 2ecc7e6..4126f8a 100644 --- a/src/api/project/index.js +++ b/src/api/project/index.js @@ -20,10 +20,70 @@ const getProgressProjects=()=>{ }) }; -export default{ - findProjectByDept, - getProjectBuildNode, - getProgressProjects +const groupByProjectCategory=(cb)=>{ + request({ + url:`bgscreen/project/groupByProjectCategory`, + method: 'get' + }).then(res=>{ + let objs=(res.data||[]).map(it=>{ + return { + id:it.deptName, + label:it.projectName, + schedule:it.projectSchedule, + cnt:it.deptId + } + }); + const getItems=(id,schedule)=>{ + let tmps=objs.filter(d=>d.id==id && d.schedule==schedule); + if(tmps.length>0){ + return tmps[0]; + } + return { + id:id,schedule:schedule,cnt:0 + } + } + let ret1= [getItems(1,1),getItems(1,2)]; + let ret2= [getItems(2,1),getItems(2,2)]; + let ret3= [getItems(3,1),getItems(3,2)]; + let rets= [ + ret1,ret2,ret3 + ]; + if(cb){ + cb(rets); + } + }); +}; + +const groupByCategory=(deptId,type)=>{ + return request({ + url: `bgscreen/project/groupByCategory`, + method: 'post', + data:{ + deptId:deptId, + id:type + } + }) +} + +const groupByLevel=(deptId,type)=>{ + return request({ + url: `bgscreen/project/groupByLevel`, + method: 'post', + data:{ + deptId:deptId, + id:type + } + }) +} + + +export default{ + findProjectByDept, + getProjectBuildNode, + getProgressProjects, + groupByProjectCategory, + groupByCategory, + groupByLevel } diff --git a/src/components/project-overview-chart.js b/src/components/project-overview-chart.js index 7c9d833..470c445 100644 --- a/src/components/project-overview-chart.js +++ b/src/components/project-overview-chart.js @@ -124,20 +124,23 @@ Vue.component("project-overview-chart", { title: { text: this.maintitle||total_datas, subtext: this.text, - x: "85", - y: "89", + textAlign:'center', + top:'top', + itemGap :10, textStyle: { color: "#0dd2fd", fontSize: 24, fontWeight: "bold", - align: "center", - width: "200px", + align: "center", }, subtextStyle: { color: "#a5b5f0", fontSize: 12, align: "center", }, + padding:[95,0,0,110], + left:'left' + }, tooltip: { trigger: 'item', diff --git a/src/components/rank-chart.js b/src/components/rank-chart.js index 28040b4..8ffe944 100644 --- a/src/components/rank-chart.js +++ b/src/components/rank-chart.js @@ -10,6 +10,9 @@ Vue.component("rank-chart", { height:{ type:Number }, + width:{ + type:Number + }, showval:{ type:Boolean, default:false @@ -119,7 +122,7 @@ Vue.component("rank-chart", { fontSize:'14', }, name: { - width: this.showval?280:300, + width: this.width?this.width:this.showval?280:300, color: '#c6d9fa', padding:[0,0,0,10], fontSize:'16', diff --git a/src/pages/index.vue b/src/pages/index.vue index 3830191..22d7e88 100644 --- a/src/pages/index.vue +++ b/src/pages/index.vue @@ -8,7 +8,7 @@
- +
@@ -29,7 +29,7 @@ :maintitle="overviewTotal" :legend-opt="legendOpt1" :typedata="typeDistributionData" :text="overviewText" :height="230"> - + @@ -75,13 +75,13 @@ + style="position: absolute;cursor: pointer;right: 13px;top: 12px;" @click="doShowDlg2">
-
在建项目 +
在建项目({{ getPrjCateCount(0) }})
-
拟建项目 +
拟建项目({{ getPrjCateCount(1) }})
-
前期项目 +
前期项目({{ getPrjCateCount(2) }})
@@ -302,10 +302,7 @@ export default { //原因类型分析 availabilityData: [ - { value: 7, prop: 42.9, text: '新区级' }, - { value: 9, prop: 22.9, text: '省级' }, - { value: 10, prop: 20, text: '市级' }, - { value: 39, prop: 14.2, text: '新城级' }, + ], overviewText: '项目数量', overviewTotal: 100, @@ -476,6 +473,9 @@ export default { ], warningTypeInterval: undefined, warningTypeIndex: 0, + projectCategory:[], + projectCategoryWidth:200, + deptInfo:{}, } }, created() { @@ -491,6 +491,10 @@ export default { this.investmentAmountData2[0].value = "" + res.onAccountAmount * 1.0; this.elKey++; }); + this.$bus.$on("deptChange",dept=>{ + this.deptInfo=dept; + this.onClickoOverview(0) + }); }, methods: { numberWithCommas(x) { @@ -509,14 +513,36 @@ export default { doShowDlg2() { this.$refs.dlg2.showDialog(this.prjProcessNav) }, + getPrjCateCount(n){ + if(this.projectCategory.length0){ + let sum=0; + tmps.forEach(d=>{ + sum+=d.cnt; + }) + return sum; + } + return 0; + }, init() { - + this.$api.project.groupByProjectCategory(datas=>{ + this.projectCategory=datas; + this.prjPrcessTotal=this.getPrjCateCount(0); + let item=this.projectCategory.length>0?this.projectCategory[0]:null; + this.prjPrcessData[0].value=item && item.length>0?item[0].cnt:0; + this.prjPrcessData[1].value=item && item.length>1?item[1].cnt:0; + this.elKey++; + }); + this.localStorage = JSON.parse(localStorage.getItem("data1")) //地图数据 this.chartMap() //设备概况点击事件定时器 - this.overviewInterval = setInterval(this.overviewClick, 5000); + //this.overviewInterval = setInterval(this.overviewClick, 5000); //重大节点预期预警 this.majorInterval = setInterval(this.timer, 5000); //正在发生 定时器 @@ -527,29 +553,11 @@ export default { doPrjProcess(n, text) { this.prjProcessNav = n; this.prjPrcessText = text; - if (n == 0) { - this.prjPrcessTotal = 100; - this.prjPrcessData = [ - { text: "正常推进项目", value: 13 }, - { text: "进度滞后项目", value: 22 }, - ] - } - if (n == 1) { - this.prjPrcessTotal = 90; - this.prjPrcessData = [ - { text: "规划中项目", value: 4 }, - { text: "审批中项目", value: 9 }, - { text: "设计中项目", value: 8 }, - ] - } - if (n == 2) { - this.prjPrcessTotal = 130; - this.prjPrcessData = [ - { text: "进度滞后项目", value: 0 }, - { text: "正常推进项目", value: 0 }, - - ] - } + this.prjPrcessTotal=this.getPrjCateCount(n); + let item=this.projectCategory.length>n?this.projectCategory[n]:null; + this.prjPrcessData[0].value=item && item.length>0?item[0].cnt:0; + this.prjPrcessData[1].value=item && item.length>1?item[1].cnt:0; + this.elKey++; }, //劳务人员概况 onWarningInfoNav(n, text) { @@ -591,19 +599,67 @@ export default { //设备概况点击事件 onClickoOverview(n) { this.overview = n + if (this.overview == 0) { - this.overviewTotal = 65; + this.projectCategoryWidth=290; this.overviewText = "项目数"; this.surveyUrlSb = 'images/survey_icon_1.png' + } else if (this.overview == 1) { - this.overviewTotal = 515.97; + this.projectCategoryWidth=210; this.overviewText = "项目总投资"; this.surveyUrlSb = 'images/survey_icon_2.png' + } else { - this.overviewTotal = 134.86; + this.projectCategoryWidth=210; this.overviewText = "项目年投资"; this.surveyUrlSb = 'images/survey_icon_3.png' } + this.$api.project.groupByCategory(this.deptInfo.id,n).then(d=>{ + let tmps=(d.data||[]).map(it=>{ + return { + id:it.id, + name:it.projectName, + value:it.deptId/10000.0 + } + }); + let sum=0; + tmps.forEach(it=>{ + sum+=it.value; + }) + this.overviewTotal=sum; + this.typeDistributionData=tmps; + this.elKey++; + }) + this.$api.project.groupByLevel(this.deptInfo.id,n).then(d=>{ + let tmps=(d.data||[]).map(it=>{ + return { + id:it.id, + text:it.projectName, + value:it.deptId/10000.0, + prop:0, + } + }); + let sum=0; + tmps.forEach(it=>{ + sum+=it.value; + }) + let total=0; + tmps.forEach((it,idx)=>{ + it.prop=sum==0?0:(it.value*100.0/sum).toFixed(1) + + if(idx0){ + it.prop=(100-total).toFixed(1); + } + } + }) + this.availabilityData=tmps; + this.elKey++; + }) + }, //地图数据 chartMap() { diff --git a/src/pages/projectProgress.vue b/src/pages/projectProgress.vue index dba0c39..f5b0d87 100644 --- a/src/pages/projectProgress.vue +++ b/src/pages/projectProgress.vue @@ -83,12 +83,12 @@ - +
-
在建项目(100)
-
拟建项目(20)
-
验收项目(10)
+
在建项目({{ getPrjCateCount(0) }})
+
拟建项目({{ getPrjCateCount(1) }})
+
前期项目({{ getPrjCateCount(2) }})
@@ -268,6 +268,7 @@ export default { }, data() { return { + elKey:0, //节点完成率 completionData:[ {name:"泾河新城荟锦坊二期",cnt:50,step:'施工阶段'}, @@ -282,8 +283,8 @@ export default { pushText:'在建项目', pushCount:35, pushData:[ - { text:"正常推进项目", value:13 }, - { text:"进度滞后项目", value:22 }, + { text:"正常推进项目", value:0 }, + { text:"进度滞后项目", value:1 }, ], costIndex:0, direction:'right', @@ -328,13 +329,13 @@ export default { prjInfo:{}, scheduleInfo:null, projects:[], - + projectCategory:[] } }, created() { this.init() }, - mounted() { + mounted() { this.$bus.$on("projectChange",res=>{ this.loadProjectConstructionProgress(); }); @@ -396,26 +397,12 @@ export default { doPushNav(n,t){ this.pushNav=n; this.pushText=t; - this.pushCount=[35,21,0][n]; this.pushUrl=['images/company_6.png','images/company_5.png','images/company_4.png'][n] - if(n==0){ - this.pushData=[ - { text:"正常推进项目", value:13 }, - { text:"进度滞后项目", value:22 } - ] - } - if(n==1){ - this.pushData=[ - { text:"正常推进项目", value:4 }, - { text:"进度滞后项目", value:17 } - ] - } - if(n==2){ - this.pushData=[ - { text:"正常推进项目", value:0 }, - { text:"进度滞后项目", value:0 } - ] - } + this.pushCount=this.getPrjCateCount(n); + let item=this.projectCategory.length>n?this.projectCategory[n]:null; + this.pushData[0].value=item && item.length>0?item[0].cnt:0; + this.pushData[1].value=item && item.length>1?item[1].cnt:0; + this.elKey++; }, modifyLeftBtn(){ this.direction = 'left' @@ -484,7 +471,20 @@ export default { planMouseout(){ this.planInterval=setInterval(this.manufacturingPlanRoll,5000); }, - + getPrjCateCount(n){ + if(this.projectCategory.length0){ + let sum=0; + tmps.forEach(d=>{ + sum+=d.cnt; + }) + return sum; + } + return 0; + }, init(){ if(localStorage.length == 0){ var company = {text:'城投公司',id:1,type:1} @@ -498,7 +498,14 @@ export default { this.localStorage1 = JSON.parse(localStorage.getItem("company")) this.localStorage2 = JSON.parse(localStorage.getItem("project")) } - + this.$api.project.groupByProjectCategory(datas=>{ + this.projectCategory=datas; + this.pushCount=this.getPrjCateCount(0); + let item=this.projectCategory.length>0?this.projectCategory[0]:null; + this.pushData[0].value=item && item.length>0?item[0].cnt:0; + this.pushData[1].value=item && item.length>1?item[1].cnt:0; + this.elKey++; + }); //设备概况点击事件定时器 this.overviewInterval = setInterval(this.overviewClick,5000); //重大节点预期预警 From 1fe3b97466756d56c03a95c82c6ac88119203d68 Mon Sep 17 00:00:00 2001 From: haha Date: Sat, 12 Aug 2023 14:54:19 +0800 Subject: [PATCH 3/4] update code --- src/components/project-overview-chart.js | 2 +- src/pages/index.vue | 79 +++++++++++++++++------- 2 files changed, 59 insertions(+), 22 deletions(-) diff --git a/src/components/project-overview-chart.js b/src/components/project-overview-chart.js index 470c445..1e38c40 100644 --- a/src/components/project-overview-chart.js +++ b/src/components/project-overview-chart.js @@ -1,7 +1,7 @@ import Vue from 'vue' Vue.component("project-overview-chart", { template: ` -
+
diff --git a/src/pages/index.vue b/src/pages/index.vue index 22d7e88..68df46d 100644 --- a/src/pages/index.vue +++ b/src/pages/index.vue @@ -32,13 +32,13 @@ - -
-
安全管理
-
质量管理
+ +
+
安全管理
+
质量管理
- + @@ -268,19 +268,23 @@ export default { }, }, }, - legendOpt2: { + legendOpt2: { icon: "rect", + orient: "horizontal", + left:'50%', + top:'top', + itemGap:0, textStyle: { fontSize: 14, rich: { name: { color: "#c3dbfd", - padding: [10, 5, 20, 5], + padding: [5, 2, 20, 2], }, percent: { color: "#4676FD", fontSize: 16, - padding: [0, 5, 0, 5], + padding: [0, 2, 0, 2], }, }, } @@ -291,19 +295,9 @@ export default { { text: '西安市地铁2号线二期工程施工总承包项目2标段', id: 2, type: 2 }, { text: '苏州桑田岛项目', id: 3, type: 2 }, ], - dangersDatas: [ - { name: '四口，临边防护工程', value: '0' }, - { name: '混泥土', value: '0' }, - { name: '移动脚手架', value: '0' }, - { name: '砌体', value: '0' }, - { name: '模板支架', value: '0' }, - { name: '外墙', value: '0' } - ], - + dangersDatas: [], //原因类型分析 - availabilityData: [ - - ], + availabilityData: [], overviewText: '项目数量', overviewTotal: 100, //项目概况 @@ -314,6 +308,8 @@ export default { ], //质量管理 qualityNav: 0, + qualityNavTitle:'', + qualityNavTotal:0, //劳务人员 infoNav: 0, staffText: '在岗人员', @@ -494,9 +490,50 @@ export default { this.$bus.$on("deptChange",dept=>{ this.deptInfo=dept; this.onClickoOverview(0) + this.qualityNavClick(0); }); }, methods: { + qualityNavClick(n){ + this.qualityNav=n; + if(n==0){ + this.qualityNavTitle="安全隐患总数"; + this.$api.problemmodify.safetySummary(this.deptInfo.id,0).then(d=>{ + this.dangersDatas=(d||[]).map(it=>{ + return { + text:it.problemArea, + prop:'0.0', + name:it.problemArea, + value:+it.roleType||0 + } + }); + let sum=0; + this.dangersDatas.forEach(it=>{ + sum+=it.value*1; + }) + this.qualityNavTotal=sum; + this.elKey++; + }) + }else{ + this.qualityNavTitle="质量隐患总数"; + this.$api.problemmodify.qualitySummary(this.deptInfo.id,0).then(d=>{ + this.dangersDatas=(d||[]).map(it=>{ + return { + text:it.problemArea, + prop:'0.0', + name:it.problemArea, + value:+it.roleType||0 + } + }); + let sum=0; + this.dangersDatas.forEach(it=>{ + sum+=it.value*1; + }) + this.qualityNavTotal=sum; + this.elKey++; + }) + } + }, numberWithCommas(x) { x = x.toString(); var pattern = /(-?\d+)(\d{3})/; From 89f2e8bd4e2cacaab9702b84d3acc5d7f893e2cb Mon Sep 17 00:00:00 2001 From: haha Date: Sun, 13 Aug 2023 12:31:50 +0800 Subject: [PATCH 4/4] update code --- src/api/problemmodify/index.js | 16 ++- src/pages/components/MonitAndWarning.vue | 137 +++++++++++++++++++++++ src/pages/index.vue | 83 ++------------ src/pages/projectDetail.vue | 33 +----- 4 files changed, 165 insertions(+), 104 deletions(-) create mode 100644 src/pages/components/MonitAndWarning.vue diff --git a/src/api/problemmodify/index.js b/src/api/problemmodify/index.js index 372dfde..69d8768 100644 --- a/src/api/problemmodify/index.js +++ b/src/api/problemmodify/index.js @@ -27,7 +27,6 @@ const safetySummaryByProject=(deptId,roleType)=>{ }) } - //质量整改-安全分类汇总(按项目) const qualitySummaryByProject=(deptId,roleType)=>{ return request({ @@ -36,6 +35,17 @@ const qualitySummaryByProject=(deptId,roleType)=>{ }) } -export default{ - safetySummary,qualitySummary,safetySummaryByProject,qualitySummaryByProject +//项目监测预警查询，用于大屏项目概况 +const getMonitAndWarning=(deptId,projectId=0)=>{ + return request({ + url: `bgscreen/problemmodify/getMonitAndWarning?deptId=${deptId}&projectId=${projectId}`, + method: 'get' + }) +} + + + + +export default{ + safetySummary,qualitySummary,safetySummaryByProject,qualitySummaryByProject,getMonitAndWarning } diff --git a/src/pages/components/MonitAndWarning.vue b/src/pages/components/MonitAndWarning.vue new file mode 100644 index 0000000..8d71fcd --- /dev/null +++ b/src/pages/components/MonitAndWarning.vue @@ -0,0 +1,137 @@ + + + + + \ No newline at end of file diff --git a/src/pages/index.vue b/src/pages/index.vue index 68df46d..11fefd7 100644 --- a/src/pages/index.vue +++ b/src/pages/index.vue @@ -187,35 +187,7 @@
- - -
-

今日预警数

-
6 个
-
-
-

本周预警数

-
23 个
-
- - -
-
-
预警类型
-
-
- -
- - + @@ -239,13 +211,15 @@ import indexDlg1 from './index/indexDlg1' import indexDlg2 from './index/indexDlg2' import indexDlg3 from './index/indexDlg3' import indexMap from './index/map.vue' +import MonitAndWarning from './components/MonitAndWarning.vue' export default { name: 'App', components: { indexDlg1, indexDlg2, indexDlg3, - indexMap + indexMap, + MonitAndWarning }, data() { return { @@ -445,30 +419,7 @@ export default { //正在发生 warningInterval: undefined, - forIndex: 0, - - //预警类型 - warningType: [ - { - name: 'AI预警', - data: 0, - total: 0 - }, { - name: '安全预警', - data: 1, - total: 5 - }, { - name: '质量预警', - data: 2, - total: 6 - }, { - name: '环境预警', - data: 3, - total: 12 - }, - ], - warningTypeInterval: undefined, - warningTypeIndex: 0, + forIndex: 0, projectCategory:[], projectCategoryWidth:200, deptInfo:{}, @@ -491,9 +442,10 @@ export default { this.deptInfo=dept; this.onClickoOverview(0) this.qualityNavClick(0); + }); }, - methods: { + methods: { qualityNavClick(n){ this.qualityNav=n; if(n==0){ @@ -583,9 +535,7 @@ export default { //重大节点预期预警 this.majorInterval = setInterval(this.timer, 5000); //正在发生 定时器 - this.warningInterval = setInterval(this.automaticRoll, 5000); - //预警类型 定时器 - this.warningTypeInterval = setInterval(this.automaticRollType, 5000); + this.warningInterval = setInterval(this.automaticRoll, 5000); }, doPrjProcess(n, text) { this.prjProcessNav = n; @@ -836,21 +786,8 @@ export default { } }, - automaticRollType() { - var height = window.$(".glr-login-number-max").innerHeight() - if (window.$("#afootOverflowType").scrollTop() == height * this.warningType.length - window.$("#afootOverflowType").innerHeight()) { - this.warningTypeIndex = 0 - } else { - this.warningTypeIndex = this.warningTypeIndex + 1 - } - window.$("#afootOverflowType").animate({ scrollTop: (height * this.warningTypeIndex) + 'px' }) - }, - listMinMouseoverType() { - clearInterval(this.warningTypeInterval); - }, - listMinMouseoutType() { - this.warningTypeInterval = setInterval(this.automaticRollType, 5000); - }, + + automaticRoll() { var height = window.$(".afoot-con-for").innerHeight() diff --git a/src/pages/projectDetail.vue b/src/pages/projectDetail.vue index 41d2b75..c2b8b79 100644 --- a/src/pages/projectDetail.vue +++ b/src/pages/projectDetail.vue @@ -356,33 +356,7 @@
- - -
-

今日预警数

-
8 个
-
-
-

本周预警数

-
28 个
-
- - -
-
-
预警类型
-
-
- -
- - + @@ -397,8 +371,11 @@ import '../components/module/module-one-1-2' import '../components/background_video' import '../components/header' import '../components/staff-survey-chart' - +import MonitAndWarning from './components/MonitAndWarning.vue' export default { + components:{ + MonitAndWarning + }, data() { return { dept:null,