新增BVS合并

src/optionSystem/calculationAndSelection/index.vue

@@ -707,8 +707,9 @@ export default {
         "pageNumber": 1,
         "pageSize": 100,
         "where": {
-        "condition": "",
-        "throttletype": this.valveSelection.throttletype
+          "condition": "",
+          "throttletype": this.valveSelection.throttletype,
+          "caliber": this.basicInfo.caliber,
         }
         },
         "id": 2025091915552702,
@@ -1031,7 +1032,7 @@ export default {
             chartData.push({
               opening: item[0],
               value: item[1],
-              type: `流量-${pressureCondition}kPa`,
+              type: `开度${pressureCondition}%`,
               unit: 'm³/h'
             })
           })
@@ -1045,24 +1046,7 @@ export default {
             })
           })
         } else {
-          // 使用模拟数据作为后备
-          const mockData = this.generateMockChartData()
-          mockData.flowData.forEach(item => {
-            chartData.push({
-              opening: item[0],
-              value: item[1],
-              type: this.$t('流量'),
-              unit: 'm³/h'
-            })
-          })
-          mockData.pressureDropData.forEach(item => {
-            chartData.push({
-              opening: item[0],
-              value: item[1],
-              type: this.$t('压差'),
-              unit: 'kPa'
-            })
-          })
+          
         }
         
         // 设置数据
@@ -1081,13 +1065,13 @@ export default {
         // 设置坐标轴
         this.flowChartInstance.axis('opening', {
           title: {
-            text: this.$t('压差')
+            text: this.$t('压差(kpa)')
           }
         })
         
         this.flowChartInstance.axis('value', {
           title: {
-            text: this.$t('流量')
+            text: this.$t('流量(m³/h)')
           }
         })
         
@@ -1109,19 +1093,19 @@ export default {
         this.flowChartInstance
           .line()
           .position('opening*value')
-          .color('type', ['#409EFF', '#67C23A'])
+          .color('type', ['#999999', '#3874f6','#e6a23c','#F56C6C','#67C23A'])
           .shape('smooth')
           .tooltip('opening*value*type*unit', (opening, value, type, unit) => {
             return {
               name: type,
-              value: `${value} ${unit} (开度: ${opening}%)`
+              value: `${value} ${unit} (压差: ${opening}kpa)`
             }
           })
         
         this.flowChartInstance
           .point()
           .position('opening*value')
-          .color('type', ['#409EFF', '#67C23A'])
+          .color('type', ['#999999', '#3874f6','#e6a23c','#F56C6C','#67C23A'])
           .size(4)
           .shape('circle')
           .style({
@@ -1231,19 +1215,19 @@ export default {
         this.kvChartInstance
           .line()
           .position('opening*value')
-          .color('#409EFF')
+          .color('type', ['#999999', '#3874f6','#e6a23c','#F56C6C','#67C23A'])
           .shape('smooth')
           .tooltip('opening*value*type', (opening, value, type) => {
             return {
               name: type,
-              value: `${value} (开度: ${opening}%)`
+              value: `${value}`
             }
           })
         
         this.kvChartInstance
           .point()
           .position('opening*value')
-          .color('#409EFF')
+          .color('type', ['#999999', '#3874f6','#e6a23c','#F56C6C','#67C23A'])
           .size(4)
           .shape('circle')
           .style({
@@ -1450,19 +1434,19 @@ export default {
         this.zetaChartInstance
           .line()
           .position('opening*value')
-          .color('#E6A23C')
+          .color('type', ['#999999', '#3874f6','#e6a23c','#F56C6C','#67C23A'])
           .shape('smooth')
           .tooltip('opening*value*type', (opening, value, type) => {
             return {
               name: type,
-              value: `${value} (开度: ${opening}%)`
+              value: `${value}`
             }
           })
         
         this.zetaChartInstance
           .point()
           .position('opening*value')
-          .color('#E6A23C')
+          .color('type', ['#999999', '#3874f6','#e6a23c','#F56C6C','#67C23A'])
           .size(4)
           .shape('circle')
           .style({
@@ -1577,7 +1561,7 @@ export default {
           .tooltip('opening*value*type', (opening, value, type) => {
             return {
               name: type,
-              value: `${value} (开度: ${opening}%)`
+              value: `${value}`
             }
           })
         

src/optionSystem/optionOrder/detail/indexCalc.vue

@@ -36,9 +36,9 @@
             <el-descriptions-item label="应用场景">{{mainData.calculate.purpose}}</el-descriptions-item>
             <el-descriptions-item label="介质">{{mainData.calculate.mediatype}}</el-descriptions-item>
             <el-descriptions-item label="密度">{{mainData.calculate.p}}</el-descriptions-item>
-            <el-descriptions-item label="起点高程">{{mainData.calculate.z1}}</el-descriptions-item>
-            <el-descriptions-item label="末点高程">{{mainData.calculate.z2}}</el-descriptions-item>
-            <el-descriptions-item label="阀中心高程">{{mainData.calculate.zv}}</el-descriptions-item>
+            <el-descriptions-item label="起点高程(m)">{{mainData.calculate.z1}}</el-descriptions-item>
+            <el-descriptions-item label="末点高程(m)">{{mainData.calculate.z2}}</el-descriptions-item>
+            <el-descriptions-item label="阀中心高程(m)">{{mainData.calculate.zv}}</el-descriptions-item>
         </el-descriptions>
         <h3 class="mt-10" style="color:#000">计算结果</h3>
         <el-table :data="mainData.conditions" style="width: 100%" size="mini" border>
@@ -197,7 +197,7 @@ export default {
              chartData.push({
                opening: item[0],
                value: item[1],
-               type: `流量-${pressureCondition}kPa`,
+               type: `开度:${pressureCondition}%`,
                unit: 'm³/h'
              })
            })
@@ -231,13 +231,13 @@ export default {
          // 设置坐标轴
          this.flowChartInstance.axis('opening', {
            title: {
-             text: '压差'
+             text: '压差(kpa)'
            }
          })
          
          this.flowChartInstance.axis('value', {
            title: {
-             text: '流量'
+             text: '流量(m³/h)'
            }
          })
          
@@ -259,19 +259,19 @@ export default {
          this.flowChartInstance
            .line()
            .position('opening*value')
-           .color('type', ['#409EFF', '#67C23A'])
+           .color('type', ['#999999', '#3874f6','#e6a23c','#F56C6C','#67C23A'])
            .shape('smooth')
            .tooltip('opening*value*type*unit', (opening, value, type, unit) => {
              return {
                name: type,
-               value: `${value} ${unit} (开度: ${opening}%)`
+               value: `${value} ${unit} (压差: ${opening}kpa)`
              }
            })
          
          this.flowChartInstance
            .point()
            .position('opening*value')
-           .color('type', ['#409EFF', '#67C23A'])
+           .color('type', ['#999999', '#3874f6','#e6a23c','#F56C6C','#67C23A'])
            .size(4)
            .shape('circle')
            .style({
@@ -370,19 +370,19 @@ export default {
          this.kvChartInstance
            .line()
            .position('opening*value')
-           .color('#409EFF')
+           .color('type', ['#999999', '#3874f6','#e6a23c','#F56C6C','#67C23A'])
            .shape('smooth')
            .tooltip('opening*value*type', (opening, value, type) => {
              return {
                name: type,
-               value: `${value} (开度: ${opening}%)`
+               value: `${value}`
              }
            })
          
          this.kvChartInstance
            .point()
            .position('opening*value')
-           .color('#409EFF')
+           .color('type', ['#999999', '#3874f6','#e6a23c','#F56C6C','#67C23A'])
            .size(4)
            .shape('circle')
            .style({
@@ -480,19 +480,19 @@ export default {
          this.zetaChartInstance
            .line()
            .position('opening*value')
-           .color('#E6A23C')
+           .color('type', ['#999999', '#3874f6','#e6a23c','#F56C6C','#67C23A'])
            .shape('smooth')
            .tooltip('opening*value*type', (opening, value, type) => {
              return {
                name: type,
-               value: `${value} (开度: ${opening}%)`
+               value: `${value}`
              }
            })
          
          this.zetaChartInstance
            .point()
            .position('opening*value')
-           .color('#E6A23C')
+           .color('type', ['#999999', '#3874f6','#e6a23c','#F56C6C','#67C23A'])
            .size(4)
            .shape('circle')
            .style({
@@ -595,7 +595,7 @@ export default {
            .tooltip('opening*value*type', (opening, value, type) => {
              return {
                name: type,
-               value: `${value} (开度: ${opening}%)`
+               value: `${value}`
              }
            })