LR пре 3 година
родитељ
комит
647516e74d

+ 5 - 8
src/views/spectrum/reform/api/common.ts

@@ -79,19 +79,16 @@ export interface IStatisticsBase {
 }
 
 export interface IAssessmentBase {
+  assessmentPipes: {
+    pipeLength: number
+    pipeLevel: string
+    pipePerCent: string
+  }[]
   contentGauge: number
   coverPipe: number
-  fourPipe: number
-  fourPipePerCent: string
   monitoringPoint: number
-  onePipe: number
-  onePipePerCent: string
   pipeLength: number
   pipeMonitor: number
-  threePipe: number
-  threePipePerCent: string
-  twoPipe: number
-  twoPipePerCent: string
   waterMonitor: number
 }
 export interface IAssessmentFlaw {

+ 0 - 13
src/views/spectrum/reform/assessReport/widget.vue

@@ -1,13 +0,0 @@
-<template>
-  <div>评估报告</div>
-</template>
-
-<script>
-export default {
-
-}
-</script>
-
-<style>
-
-</style>

+ 10 - 24
src/views/spectrum/reform/assessmentReport/Summary.vue

@@ -11,29 +11,15 @@
       </div>
       <div class="levels">
         <el-row type="flex">
-          <el-col :span="12">
-            1级管线
-            <span>{{ base.onePipe }}</span>
+          <el-col
+            :span="12"
+            v-for="{ pipeLength, pipeLevel, pipePerCent } of base.assessmentPipes || []"
+            :key="pipeLevel"
+          >
+            {{ pipeLevel }}管线
+            <span>{{ pipeLength }}</span>
             公里:占参与评估管网的
-            <span>{{ base.onePipePerCent }}</span>
-          </el-col>
-          <el-col :span="12">
-            2级管线
-            <span>{{ base.twoPipe }}</span>
-            公里:占参与评估管网的
-            <span>{{ base.twoPipePerCent }}</span>
-          </el-col>
-          <el-col :span="12">
-            3级管线
-            <span>{{ base.threePipe }}</span>
-            公里:占参与评估管网的
-            <span>{{ base.threePipePerCent }}</span>
-          </el-col>
-          <el-col :span="12">
-            4级管线
-            <span>{{ base.fourPipe }}</span>
-            公里:占参与评估管网的
-            <span>{{ base.fourPipePerCent }}</span>
+            <span>{{ pipePerCent }}</span>
           </el-col>
         </el-row>
       </div>
@@ -43,7 +29,7 @@
         <v-chart
           :option="healthOption"
           autoresize
-          :loading="loading.health"
+          v-loading="loading.health"
           style="width: 100%; height: 200px"
           v-if="healthOption.dataset && healthOption.dataset.source && healthOption.dataset.source.length > 0"
         />
@@ -54,7 +40,7 @@
       <el-col :span="12">
         <v-chart
           :option="assessmentOption"
-          :loading="loading.assessment"
+          v-loading="loading.assessment"
           autoresize
           style="width: 100%; height: 200px"
           v-if="

+ 1 - 1
src/views/spectrum/reform/statistics/DayAndHourChart.vue

@@ -133,7 +133,7 @@
         ],
         legend: { show: true, type: 'scroll', width: '80%' },
         grid: { top: 45, left: 50, right: 50, bottom: 45, containLabel: true },
-        toolbox: { show: true, feature: { restore: { show: true }, saveAsImage: { show: true } } },
+        toolbox: { show: true, feature: { saveAsImage: { show: true } } },
         dataset,
         series
       }

+ 1 - 1
src/views/spectrum/reform/utils.ts

@@ -31,7 +31,7 @@ export const assessmentCols: ColItem[] = [
   { prop: 'pipelineLevel', label: '管道级别', minWidth: '90px' },
   { prop: 'pipeDiameter', label: '管径(mm)', minWidth: '90px' },
   { prop: 'texture', label: '材质', minWidth: '90px' },
-  { prop: 'length', label: '长度(m)', minWidth: '90px' },
+  { prop: 'pipeLength', label: '长度(m)', minWidth: '90px' },
   { prop: 'healthLever', label: '健康等级', minWidth: '90px' },
   { prop: 'networkBroken', label: '管网破损', minWidth: '90px' },
   { prop: 'groundwaterIntrusion', label: '地下水入侵', minWidth: '90px' },