Kaynağa Gözat

环路换热站反显,能耗相关问题修改

picasso 2 yıl önce
ebeveyn
işleme
dc6629eb1d

+ 1 - 0
src/views/heating/energyAnalysis/analysisReport/index.vue

@@ -15,6 +15,7 @@
               }"
               default-expand-all
               :filter-node-method="filterNode"
+							:expand-on-click-node="false"
               @node-click="onNodeClick"
             >
               <template #default="{ data }">

+ 10 - 15
src/views/heating/energyAnalysis/heatStationWaterAnalysis/index.vue

@@ -14,6 +14,7 @@
                 children: 'loopInfo'
               }"
               default-expand-all
+							:expand-on-click-node="false"
               :filter-node-method="filterNode"
               @node-click="onNodeClick"
             >
@@ -157,12 +158,7 @@ const initBarChart = () => {
 	if (!global.dispose.some((b: any) => b === global.barChart)) global.barChart.dispose();
 	global.barChart = <any>echarts.init(barChartRef.value, state.charts.theme);
 	const option =  {
-		tooltip: {
-			trigger: 'axis',
-			axisPointer: {
-				type: 'shadow'
-			}
-		},
+		tooltip: { trigger: 'axis' },
 		legend: {},
 		grid: {
 			left: '3%',
@@ -184,19 +180,18 @@ const initBarChart = () => {
 		series: [
 			{
 				name: '供水流量',
-				type: 'bar',
-				emphasis: {
-					focus: 'series'
-				},
+				type: 'line',
+				symbolSize: 6,
+				symbol: 'circle',
+				smooth: true,
 				data: state.barChartSeries1
 			},
 			{
 				name: '回水流量',
-				type: 'bar',
-				stack: 'Ad',
-				emphasis: {
-					focus: 'series'
-				},
+				type: 'line',
+				symbolSize: 6,
+				symbol: 'circle',
+				smooth: true,
 				data: state.barChartSeries2
 			}
 		]

+ 7 - 1
src/views/heating/energyAnalysis/loopEnergyCostPerformanceAppraisal/index.vue

@@ -14,7 +14,7 @@
 							end-placeholder="结束日期">
 						</el-date-picker>
 					</el-form-item>
-          <el-form-item label="排" prop="sort">
+          <el-form-item label="排" prop="sort">
             <el-select v-model="state.tableData.param.sort" placeholder="按照选择进行排名" filterable clearable size="default">
 							<el-option label="总耗热" :value="1" />
 							<el-option label="热单耗" :value="2" />
@@ -24,6 +24,12 @@
 							<el-option label="水单耗" :value="6" />
 						</el-select>
           </el-form-item>
+          <el-form-item label="排序方式" prop="isdesc">
+            <el-select v-model="state.tableData.param.isdesc" placeholder="按照选择进行排名" filterable clearable size="default">
+							<el-option label="正序" :value="2" />
+							<el-option label="倒序" :value="1" />
+						</el-select>
+          </el-form-item>
           <el-form-item label="换热站名称" prop="stationName">
             <el-input v-model="state.tableData.param.stationName" placeholder="输入" clearable size="default">
 						</el-input>

+ 1 - 1
src/views/heating/heatStation/loop/component/edit.vue

@@ -241,7 +241,7 @@ export default defineComponent({
 					state.ruleForm = {
 						...res
 					}
-					state.pointList = state.ruleForm.viaPoint.map((item: any) => ({
+					state.pointList = (state.ruleForm.viaPoint || []).map((item: any) => ({
 						...item,
 						editFlag: false
 					}))