代码上传

src/optionSystem/calculationAndSelection/index.vue

@@ -263,20 +263,20 @@
           </div>
           <el-table :data="tableData" style="width: 100%" size="mini" border>
             <el-table-column prop="workingCondition" :label="$t('工况')" align="center"></el-table-column>
-              <el-table-column prop="conditionName" :label="$t('条件名称')" align="center"></el-table-column>
-              <el-table-column prop="q" :label="$t('流量') + '(q)'" align="center"></el-table-column>
-              <el-table-column prop="p1" :label="$t('阀前压力') + '(p1)'" align="center"></el-table-column>
-              <el-table-column prop="p2" :label="$t('阀后压力') + '(p2)'" align="center"></el-table-column>
-            <el-table-column prop="p" :label="$t('前后压差') + '(p)'" align="center"></el-table-column>
-            <el-table-column prop="pv" :label="$t('饱和蒸汽压') + '(pV)'" align="center"></el-table-column>
-            <el-table-column prop="kv" :label="$t('流量系数') + '(kv)'" align="center"></el-table-column>
-            <el-table-column prop="li" :label="$t('开度') + '(li)'" align="center"></el-table-column>
-            <el-table-column prop="ldc" :label="$t('临界汽蚀系数') + 'σc(Idc)'" align="center"></el-table-column>
-            <el-table-column prop="dc" :label="$t('气蚀系数') + 'σ(dc)'" align="center"></el-table-column>
-            <el-table-column prop="fi" :label="$t('压力恢复系数') + 'FI(fi)'" align="center"></el-table-column>
-            <el-table-column prop="fr" :label="$t('流阻系数') + 'ζ(fr)'" align="center"></el-table-column>
-            <el-table-column prop="fkv" :label="$t('阻塞流修正系数') + 'Fkv(fkv)'" align="center"></el-table-column>
-            <el-table-column prop="v" :label="$t('流速') + 'V(v)'" align="center"></el-table-column>
+            <el-table-column prop="conditionName" :label="$t('条件名称')" align="center"></el-table-column>
+            <el-table-column prop="q" :label="$t('流量') + '(m³/h)'" align="center"></el-table-column>
+            <el-table-column prop="p1" :label="$t('阀前压力') + '(kPa)'" align="center"></el-table-column>
+            <el-table-column prop="p2" :label="$t('阀后压力') + '(kPa)'" align="center"></el-table-column>
+            <el-table-column prop="p" :label="$t('前后压差') + '(kPa)'" align="center"></el-table-column>
+            <el-table-column prop="pv" :label="$t('饱和蒸汽压') + '(kPa)'" align="center"></el-table-column>
+            <el-table-column prop="kv" :label="$t('Kv')" align="center"></el-table-column>
+            <el-table-column prop="li" :label="$t('开度') + '(%)'" align="center"></el-table-column>
+            <el-table-column prop="ldc" :label="$t('临界汽蚀系数')" align="center"></el-table-column>
+            <el-table-column prop="dc" :label="$t('气蚀系数')" align="center"></el-table-column>
+            <el-table-column prop="fi" :label="$t('压力恢复系数')" align="center"></el-table-column>
+            <el-table-column prop="fr" :label="$t('流阻系数')" align="center"></el-table-column>
+            <el-table-column prop="fkv" :label="$t('阻塞流修正系数')" align="center"></el-table-column>
+            <el-table-column prop="v" :label="$t('流速') + '(m/h)'" align="center"></el-table-column>
           </el-table>
           <!-- 开度设置 -->
           <el-divider content-position="left">{{$t('开度设置')}}</el-divider>
@@ -349,7 +349,7 @@ export default {
   name: 'CalculationAndSelection',
   data() {
     return {
-      activeStep: 2,
+      activeStep: 0,
       stepItems: [
         { title: this.$t('基本信息') },
         { title: this.$t('工况条件') },
@@ -773,11 +773,13 @@ export default {
         // 处理表格数据
         const minData = {
           ...res.data.min,
+          li: res.data.min.li * 100,
           workingCondition: this.$t('通用'),
           conditionName: this.$t('最小流量')
         }
         const maxData = {
           ...res.data.max,
+          li: res.data.max.li * 100,
           workingCondition: this.$t('通用'),
           conditionName: this.$t('最大流量')
         }
@@ -1079,13 +1081,13 @@ export default {
         // 设置坐标轴
         this.flowChartInstance.axis('opening', {
           title: {
-            text: this.$t('开度 (%)')
+            text: this.$t('压差')
           }
         })
         
         this.flowChartInstance.axis('value', {
           title: {
-            text: this.$t('数值')
+            text: this.$t('流量')
           }
         })
         

src/optionSystem/optionOrder/detail/indexCalc.vue

@@ -44,19 +44,19 @@
         <el-table :data="mainData.conditions" style="width: 100%" size="mini" border>
           <el-table-column prop="workingCondition" label="工况" align="center"></el-table-column>
           <el-table-column prop="conditionName" label="条件名称" align="center"></el-table-column>
-          <el-table-column prop="q" label="流量(q)" align="center"></el-table-column>
-          <el-table-column prop="p1" label="阀前压力(p1)" align="center"></el-table-column>
-          <el-table-column prop="p2" label="阀后压力(p2)" align="center"></el-table-column>
-          <el-table-column prop="p" label="前后压差(p)" align="center"></el-table-column>
-          <el-table-column prop="pv" label="饱和蒸汽压(pV)" align="center"></el-table-column>
-          <el-table-column prop="kv" label="KV(kv)" align="center"></el-table-column>
-          <el-table-column prop="li" label="开度(li)" align="center"></el-table-column>
-          <el-table-column prop="ldc" label="临界汽蚀系数σc(Idc)" align="center"></el-table-column>
-          <el-table-column prop="dc" label="气蚀系数σ(dc)" align="center"></el-table-column>
-          <el-table-column prop="fi" label="压力恢复系数FI(fi)" align="center"></el-table-column>
-          <el-table-column prop="fr" label="流阻系数ζ(fr)" align="center"></el-table-column>
-          <el-table-column prop="fkv" label="阻塞流修正系数Fkv(fkv)" align="center"></el-table-column>
-          <el-table-column prop="v" label="流速V(v)" align="center"></el-table-column>
+          <el-table-column prop="q" label="流量(m³/h)" align="center"></el-table-column>
+          <el-table-column prop="p1" label="阀前压力(kPa)" align="center"></el-table-column>
+          <el-table-column prop="p2" label="阀后压力(kPa)" align="center"></el-table-column>
+          <el-table-column prop="p" label="前后压差(kPa)" align="center"></el-table-column>
+          <el-table-column prop="pv" label="饱和蒸汽压(kPa)" align="center"></el-table-column>
+          <el-table-column prop="kv" label="Kv" align="center"></el-table-column>
+          <el-table-column prop="li" label="开度(%)" align="center"></el-table-column>
+          <el-table-column prop="ldc" label="临界汽蚀系数" align="center"></el-table-column>
+          <el-table-column prop="dc" label="气蚀系数" align="center"></el-table-column>
+          <el-table-column prop="fi" label="压力恢复系数" align="center"></el-table-column>
+          <el-table-column prop="fr" label="流阻系数" align="center"></el-table-column>
+          <el-table-column prop="fkv" label="阻塞流修正系数" align="center"></el-table-column>
+          <el-table-column prop="v" label="流速(m/h)" align="center"></el-table-column>
         </el-table>
         
         <!-- 图表区域 -->
@@ -81,7 +81,7 @@
               </div>
               <!-- 流量开度曲线图 -->
               <div v-if="showFlowChart" class="chart-container">
-                <el-divider content-position="left">流量开度曲线图</el-divider>
+                <el-divider content-position="left">流量-压差-开度曲线图</el-divider>
                 <div id="flowOpeningChart" style="width: 100%; height: 400px;"></div>
               </div>
             </el-col>
@@ -137,11 +137,13 @@ export default {
       this.mainData = res.data;
       const minData = {
         ...res.data.conditions[0],
+        li: res.data.conditions[0].li * 100,
         workingCondition: '通用',
         conditionName: '最小流量'
       }
       const maxData = {
         ...res.data.conditions[1],
+        li: res.data.conditions[0].li * 100,
         workingCondition: '通用',
         conditionName: '最大流量'
       }
@@ -229,13 +231,13 @@ export default {
          // 设置坐标轴
          this.flowChartInstance.axis('opening', {
            title: {
-             text: '开度 (%)'
+             text: '压差'
            }
          })
          
          this.flowChartInstance.axis('value', {
            title: {
-             text: '数值'
+             text: '流量'
            }
          })
          

src/optionSystem/optionOrder/detail/modules/setOrderCalc.vue

@@ -3,18 +3,22 @@
         <tr style="width: 100px;">
             <td class="title">{{$t('光头')}}</td>
             <td>
-                <div class="text1" style="margin-bottom: 8px;">
-                    <el-tag style="margin-right: 10px;" size="small" type="warning">{{ resultArr[0] && resultArr[0].actuatorbrand || '无品牌' }}</el-tag>
-                    <span>{{ resultArr[0] && resultArr[0].itemname}}</span>
-                </div>
-                <div class="descript">
-                    <div class="item" v-if="resultArr.length && resultArr[0].itemno"><span style="color: #888888;">{{$t('料号')}}：</span>{{resultArr[0].itemno }}</div>
-                    <div class="item" v-if="resultArr.length && resultArr[0].torque"><span style="color: #888888;">{{$t('扭矩')}}：</span>{{resultArr[0].torque }}</div>
-                    <div class="item" v-if="resultArr.length && resultArr[0].flh"><span style="color: #888888;">{{$t('法兰号')}}：</span>{{resultArr[0].flh.join('-') }}</div>
-                    <div class="item" v-if="resultArr.length && resultArr[0].caliber"><span style="color: #888888;">{{$t('公称通径')}}：</span>{{resultArr[0].caliber }}</div>
-                    <div class="item" v-if="resultArr.length && resultArr[0].nominalpressure"><span style="color: #888888;">{{$t('公称压力')}}：</span>{{ tool.nominalPressureSet(resultArr[0].nominalpressure) }}</div>
-                    <div class="item" v-if="resultArr.length && resultArr[0].stemmaterial"><span style="color: #888888;">{{$t('阀杆材质')}}：</span>{{resultArr[0].stemmaterial }}</div>
-                    <div class="item" v-if="resultArr.length && resultArr[0].mainmaterial"><span style="color: #888888;">{{$t('主体材质')}}：</span>{{resultArr[0].mainmaterial }}</div>
+                <div class="text1" v-if="!resultArr[0].itemname && !resultArr[0].actuatorbrand">-</div>
+                <div v-else>
+                    <div class="text1" style="margin-bottom: 8px;">
+                        <el-tag style="margin-right: 10px;" size="small" type="warning">{{ resultArr[0] && resultArr[0].actuatorbrand || '无品牌' }}</el-tag>
+                        <span>{{ resultArr[0] && resultArr[0].itemname || '无'}}</span>
+                    </div>
+
+                    <div class="descript">
+                        <div class="item" v-if="resultArr.length && resultArr[0].itemno"><span style="color: #888888;">{{$t('料号')}}：</span>{{resultArr[0].itemno }}</div>
+                        <div class="item" v-if="resultArr.length && resultArr[0].torque"><span style="color: #888888;">{{$t('扭矩')}}：</span>{{resultArr[0].torque }}</div>
+                        <div class="item" v-if="resultArr.length && resultArr[0].flh"><span style="color: #888888;">{{$t('法兰号')}}：</span>{{resultArr[0].flh.join('-') }}</div>
+                        <div class="item" v-if="resultArr.length && resultArr[0].caliber"><span style="color: #888888;">{{$t('公称通径')}}：</span>{{resultArr[0].caliber }}</div>
+                        <div class="item" v-if="resultArr.length && resultArr[0].nominalpressure"><span style="color: #888888;">{{$t('公称压力')}}：</span>{{ tool.nominalPressureSet(resultArr[0].nominalpressure) }}</div>
+                        <div class="item" v-if="resultArr.length && resultArr[0].stemmaterial"><span style="color: #888888;">{{$t('阀杆材质')}}：</span>{{resultArr[0].stemmaterial }}</div>
+                        <div class="item" v-if="resultArr.length && resultArr[0].mainmaterial"><span style="color: #888888;">{{$t('主体材质')}}：</span>{{resultArr[0].mainmaterial }}</div>
+                    </div>
                 </div>
             </td>
         </tr>
@@ -23,7 +27,7 @@
             <td>
                 <div class="text1" style="margin-bottom: 8px;">
                     <el-tag style="margin-right: 10px;" size="small" type="warning">{{ resultArr[1] && resultArr[1].actuatorbrand || '无品牌' }}</el-tag>
-                    <span>{{ resultArr[1].itemname }}</span>
+                    <span>{{ resultArr[1].itemname || '无' }}</span>
                 </div>
                 <div class="descript">
                     <!-- <div class="item" v-if="resultArr.length >= 2 && resultArr[1].actuatorname"><span style="color: #888888;">{{$t('执行器名称')}}：</span>{{resultArr[1].actuatorname }}</div> -->
@@ -95,6 +99,23 @@ export default {
             }).then(res => {
                 console.log("123123321",res)
                 this.resultArr = res.data
+                // 判断数组中是否存在parttype为'主阀'的项，如果没有则在第一行插入一条空数据
+                const hasMainValve = this.resultArr.some(item => item.parttype === '主阀')
+                if (!hasMainValve) {
+                    this.resultArr.unshift({
+                        parttype: '主阀',
+                        actuatorbrand: '',
+                        itemname: '',
+                        itemno: '',
+                        torque: '',
+                        flh: [],
+                        caliber: '',
+                        nominalpressure: '',
+                        stemmaterial: '',
+                        mainmaterial: '',
+                        itemid: ''
+                    })
+                }
                 this.$api.requested({
                     "id": 2024071916224702,
                     "content": {

src/views/salesData/modules/shippingTrendAnalysis.vue

@@ -8,16 +8,13 @@
             <div class="title" style="float: left">{{$t(`出货趋势分析`)}}</div>
             <el-tooltip placement="top" style="vertical-align: middle">
               <div slot="content">
-                {{$t(`1、不包含备货数据：`)}}<br>&nbsp;
-                {{$t(`依据：月度的准交率 = 月度准交的订单行数 ÷ 月度的总订单行数 x 100%；`)}}<br>
-                {{$t(`（1）月度准交的订单行数：回复交期在当月，且在回复交期后一个工作日（包含）之前完全出货的订单行数；`)}}<br>
-                {{$t(`（2）月度的总订单行数: 回复交期在当月的，有审核和关闭的订单行数。`)}}<br>
-                {{$t(`2、包含备货数据：`)}}<br>&nbsp;
-                {{$t(`依据：月度的准交率 = 月度准交的订单行数 ÷ 月度的总订单行数 x 100%；`)}}<br>
-                {{$t(`（1）月度准交的订单行数：①+②`)}}<br>&nbsp;&nbsp;&nbsp;&nbsp;
-                {{$t(`①回复交期在当月，且在回复交期后一个工作日（包含）之前完全出货的订单行数；`)}}<br>&nbsp;&nbsp;&nbsp;&nbsp;
-                {{$t(`②备货日期在当月，且在回复交期后一个工作日（包含）之前完全备货且未完全出货的订单行数；`)}}<br>
-                {{$t(`（2）月度的总订单行数: 回复交期在当月的，有审核和关闭的订单行数。`)}}<br>
+                <p>{{$t(`依据：月度的准交率 = 月度准交的订单行数 ÷ 月度的总订单行数 x 100%；`)}}</p>
+                <p>{{$t(`月度的总订单行数： 回复交期在当月的，有审核和关闭的订单行数。`)}}</p>
+                <p>{{$t(`1、不包含备货数据，月度准交的订单行数：`)}}</p>
+                <p>{{$t(`回复交期在当月，且出货日期在回复交期+一个工作日（包含）之前完全出货的订单行数；`)}}</p>
+                <p>{{$t(`2、包含备货数据，月度准交的订单行数：①+②`)}}</p>
+                <p>{{$t(`①回复交期在当月，且出货日期在回复交期+一个工作日（包含）之前完全出货的订单行数；`)}}</p>
+                <p>{{$t(`②回复交期在当月，且备货日期在回复交期（包含）之前完全备货且未完全出货的订单行数；`)}}</p>
               </div>
               <img style="vertical-align: middle;margin-left: 10px"  width="14px" height="14px" src="../../../assets/icons/prompt_icon.svg" >
             </el-tooltip>