diff --git a/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/operationMaintenance/project/index.html b/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/operationMaintenance/project/index.html index 547e090..b66c2f6 100644 --- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/operationMaintenance/project/index.html +++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/operationMaintenance/project/index.html @@ -1,13 +1,16 @@ <div> <!-- 人员信息总汇--> - <project-ry/> + <project-ry :docType="docType" + :treeNode="treeNode" :parentNode="parentNode" :projectId="projectId"/> </div> <div> <!-- 项目评价总汇--> - <project-pj/> + <project-pj :docType="docType" + :treeNode="treeNode" :parentNode="parentNode" :projectId="projectId"/> </div> <div> <!-- 项目资料总汇--> - <project-zl/> + <project-zl :docType="docType" + :treeNode="treeNode" :parentNode="parentNode" :projectId="projectId"/> </div> </div> diff --git a/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/operationMaintenance/project/index.js b/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/operationMaintenance/project/index.js index 10d05a4..beb47f0 100644 --- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/operationMaintenance/project/index.js +++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/operationMaintenance/project/index.js @@ -20,6 +20,20 @@ export default { } } }, + props:{ + treeNode: { + type: Object, + default: {} + }, + parentNode: { + type: Object, + default: {} + }, + projectId: { + type: String, + default: '' + } + }, setup() { let height = Vue.ref(window.innerHeight - 130); const {proxy} = Vue.getCurrentInstance(); diff --git a/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/operationMaintenance/ry/index.js b/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/operationMaintenance/ry/index.js index 567a943..7151b9f 100644 --- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/operationMaintenance/ry/index.js +++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/operationMaintenance/ry/index.js @@ -92,11 +92,14 @@ export default { proxy.$http.post("/api-web/bOpsPerson/personCollect", { "page":1, "limit":10, - "projectId": treeNode.map.nodeType.projectId + "projectId": props.treeNode.map.nodeType.projectId }, function (res) { if (res && res.data) { dataList.value = res.data total.value = res.count; + } else { + dataList.value = [] + total.value = 0; } }); } diff --git a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/availability/index.js b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/availability/index.js index dd7f01b..5e04533 100644 --- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/availability/index.js +++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/availability/index.js @@ -179,7 +179,7 @@ export default { clearInterval(this.timerId) } let index = 12 - this.timerId = setInterval(() => { + /*this.timerId = setInterval(() => { this.startValue++ this.endValue++ // this.allData.polyline.data @@ -194,7 +194,7 @@ export default { console.log(this.startValue) console.log(this.endValue) this.updateChart() - }, 5000) + }, 5000)*/ } } -} \ No newline at end of file +} diff --git a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/bandwidthCpu/index.js b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/bandwidthCpu/index.js index 98335c8..0efd57d 100644 --- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/bandwidthCpu/index.js +++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/bandwidthCpu/index.js @@ -190,7 +190,7 @@ export default { clearInterval(this.timerId) } let index = 12 - this.timerId = setInterval(() => { + /*this.timerId = setInterval(() => { this.startValue++ this.endValue++ // this.allData.polyline.data @@ -205,7 +205,7 @@ export default { console.log(this.startValue) console.log(this.endValue) this.updateChart() - }, 5000) + }, 5000)*/ } } -} \ No newline at end of file +} diff --git a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/declareCpu/index.js b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/declareCpu/index.js index f9735dc..e5c0386 100644 --- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/declareCpu/index.js +++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/declareCpu/index.js @@ -188,7 +188,7 @@ export default { clearInterval(this.timerId) } let index = 12 - this.timerId = setInterval(() => { + /*this.timerId = setInterval(() => { this.startValue++ this.endValue++ if ((this.allData.polyline.data).length > 0) { @@ -201,7 +201,7 @@ export default { console.log(this.startValue) console.log(this.endValue) this.updateChart() - }, 5000) + }, 5000)*/ } } -} \ No newline at end of file +} diff --git a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/declarePolyline/index.js b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/declarePolyline/index.js index aa0a078..49d1b46 100644 --- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/declarePolyline/index.js +++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/declarePolyline/index.js @@ -208,7 +208,7 @@ export default { clearInterval(this.timerId) } let index = 10 - this.timerId = setInterval(() => { + /*this.timerId = setInterval(() => { this.startValue++ this.endValue++ if (this.allData.polyline.data.data.length > 0) { @@ -219,7 +219,7 @@ export default { this.endValue = 9 } this.updateChart() - }, 5000) + }, 5000)*/ } } } diff --git a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/documentCpu/index.js b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/documentCpu/index.js index 958b782..7732aaf 100644 --- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/documentCpu/index.js +++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/documentCpu/index.js @@ -187,7 +187,7 @@ export default { clearInterval(this.timerId) } let index = 12 - this.timerId = setInterval(() => { + /*this.timerId = setInterval(() => { this.startValue++ this.endValue++ if ((this.allData.polyline.data).length > 0) { @@ -200,7 +200,7 @@ export default { console.log(this.startValue) console.log(this.endValue) this.updateChart() - }, 5000) + }, 5000)*/ } } -} \ No newline at end of file +} diff --git a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/responseMonitor/index.js b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/responseMonitor/index.js index f4a3e9e..969df1b 100644 --- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/responseMonitor/index.js +++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/responseMonitor/index.js @@ -173,7 +173,7 @@ export default { clearInterval(this.timerId) } let index = 12 - this.timerId = setInterval(() => { + /*this.timerId = setInterval(() => { this.startValue++ this.endValue++ // this.allData.polyline.data @@ -188,7 +188,7 @@ export default { console.log(this.startValue) console.log(this.endValue) this.updateChart() - }, 5000) + }, 5000)*/ } } -} \ No newline at end of file +} diff --git a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/trendPolyline/index.js b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/trendPolyline/index.js index 32b2cf2..bb1de4e 100644 --- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/trendPolyline/index.js +++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/dp/components/trendPolyline/index.js @@ -146,7 +146,7 @@ export default { clearInterval(this.timerId) } let index = 30 - this.timerId = setInterval(() => { + /*this.timerId = setInterval(() => { this.startValue++ this.endValue++ // this.allData.polyline.data @@ -161,7 +161,7 @@ export default { // console.log(this.startValue) // console.log(this.endValue) this.updateChart() - }, 5000) + }, 5000)*/ } } -} \ No newline at end of file +} diff --git a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/operationMaintenance/index.html b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/operationMaintenance/index.html index 81543c6..cb32529 100644 --- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/operationMaintenance/index.html +++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/operationMaintenance/index.html @@ -6,7 +6,7 @@ <el-tree :data="dataSource" :default-expanded-keys="[1]" :props="defaultProps" > <template #default="{ node, data }"> <div style=" width: 100%;"> - <div style="width: 100%;max-width: 100%;overflow: hidden;text-overflow: ellipsis;text-align: left;" @click="handleNodeClick(data)" :title="node.label"> + <div style="width: 85%;max-width: 85%;overflow: hidden;text-overflow: ellipsis;text-align: left;" @click="handleNodeClick(data)" :title="node.label"> {{node.label }} </div> </div>