修复 bug

src/pages/components/In03-ai_comp.vue

@@ -46,24 +46,24 @@
         </table>
         <table class="datatable" cellspacing="0" cellpadding="0">
             <tbody>
-                <tr><td rowspan="3" style="border-left: 1px solid #7DA2CD;width: 15%;">全部</td><td>总产值(米)</td><td>{{ line1Data.length }}</td><td >{{ line2Data.length }}</td></tr>
-                <tr><td>耗电(kWh)</td><td>{{ line1Data.elect||'' }}</td><td >{{ line2Data.elect||'' }}</td></tr>
-                <tr><td>导热油(GJ)</td><td>{{ line1Data.oil||'' }}</td><td >{{ line2Data.oil||'' }}</td></tr>
-                <tr><td rowspan="6" style="border-left: 1px solid #7DA2CD;width: 15%;">前整</td><td>定型次数(次)</td><td>{{ line1Data.qz.dx||'' }}</td><td>{{ line2Data.qz.dx||'' }}</td></tr>
-                <tr><td>高梳次数(次)</td><td>{{ line1Data.qz.gs||'' }}</td><td >{{ line2Data.qz.gs||'' }}</td></tr>
-                <tr><td>双棍烫光次数(次)</td><td>{{ line1Data.qz.tg||'' }}</td><td >{{ line2Data.qz.tg||'' }}</td></tr>
-                <tr><td>双棍刷毛次数(次)</td><td>{{ line1Data.qz.sm||'' }}</td><td >{{ line2Data.qz.sm||'' }}</td></tr>
-                <tr><td>电(kWh)</td><td>{{ line1Data.qz.elect||'' }}</td><td >{{ line2Data.qz.elect||'' }}</td></tr>
-                <tr><td>导热油(GJ)</td><td>{{ line1Data.qz.oil||'' }}</td><td >{{ line2Data.qz.oil||'' }}</td></tr>
-                <tr style="background-color: transparent;"><td style="border-left: 1px solid #7DA2CD;width: 15%;">印染</td><td>印花次数(次)</td><td>{{ line1Data.yr.yh||'' }}</td><td >{{ line2Data.r15 }}</td></tr>
-                <tr style="background-color: #016a7c;"><td rowspan="8" style="border-left: 1px solid #7DA2CD;width: 15%;">后整</td><td>定型次数(次)</td><td>{{ line1Data.hz.dx||'' }}</td><td >{{ line2Data.hz.dx||'' }}</td></tr>
-                <tr><td>高梳次数(次)</td><td>{{ line1Data.hz.gs||'' }}</td><td >{{ line2Data.hz.gs||'' }}</td></tr>
-                <tr><td>刷毛次数(次)</td><td>{{ line1Data.hz.sm||'' }}</td><td >{{ line2Data.hz.sm||'' }}</td></tr>
-                <tr><td>起毛次数(次)</td><td>{{ line1Data.hz.qm||'' }}</td><td >{{ line2Data.hz.qm||'' }}</td></tr>
-                <tr><td>双棍烫光(次)</td><td>{{ line1Data.hz.tg||'' }}</td><td >{{ line2Data.hz.tg||'' }}</td></tr>
-                <tr><td>烫剪(次)</td><td>{{ line1Data.hz.tj||'' }}</td><td >{{ line2Data.hz.tj||'' }}</td></tr>
-                <tr><td>电(kWh)</td><td>{{ line1Data.hz.elect||'' }}</td><td >{{ line2Data.hz.elect||'' }}</td></tr>
-                <tr><td>导热油(GJ)</td><td>{{ line1Data.hz.oil||'' }}</td><td >{{ line2Data.hz.oil||'' }}</td></tr>
+                <tr><td rowspan="3" style="border-left: 1px solid #7DA2CD;width: 15%;">全部</td><td>总产值(米)</td><td>{{ ReplaceNull(line1Data.length,'-') }}</td><td >{{ ReplaceNull(line2Data.length,'-') }}</td></tr>
+                <tr><td>耗电(kWh)</td><td>{{ ReplaceNull(line1Data.elect,'-') }}</td><td >{{ ReplaceNull(line2Data.elect,'-') }}</td></tr>
+                <tr><td>导热油(GJ)</td><td>{{ ReplaceNull(line1Data.oil,'-') }}</td><td >{{ ReplaceNull(line2Data.oil,'-') }}</td></tr>
+                <tr><td rowspan="6" style="border-left: 1px solid #7DA2CD;width: 15%;">前整</td><td>定型次数(次)</td><td>{{ ReplaceNull(line1Data.qz.dx,'-') }}</td><td>{{ ReplaceNull(line2Data.qz.dx,'-') }}</td></tr>
+                <tr><td>高梳次数(次)</td><td>{{ ReplaceNull(line1Data.qz.gs,'-') }}</td><td >{{ ReplaceNull(line2Data.qz.gs,'-') }}</td></tr>
+                <tr><td>双棍烫光次数(次)</td><td>{{ ReplaceNull(line1Data.qz.tg,'-') }}</td><td >{{ ReplaceNull(line2Data.qz.tg,'-') }}</td></tr>
+                <tr><td>双棍刷毛次数(次)</td><td>{{ ReplaceNull(line1Data.qz.sm,'-') }}</td><td >{{ ReplaceNull(line2Data.qz.sm,'-') }}</td></tr>
+                <tr><td>电(kWh)</td><td>{{ ReplaceNull(line1Data.qz.elect,'-') }}</td><td >{{ ReplaceNull(line2Data.qz.elect,'-') }}</td></tr>
+                <tr><td>导热油(GJ)</td><td>{{ ReplaceNull(line1Data.qz.oil,'-') }}</td><td >{{ ReplaceNull(line2Data.qz.oil,'-') }}</td></tr>
+                <tr style="background-color: transparent;"><td style="border-left: 1px solid #7DA2CD;width: 15%;">印染</td><td>印花次数(次)</td><td>{{ ReplaceNull(line1Data.yh,'-') }}</td><td >{{ ReplaceNull(line2Data.yh,'-') }}</td></tr>
+                <tr style="background-color: #016a7c;"><td rowspan="8" style="border-left: 1px solid #7DA2CD;width: 15%;">后整</td><td>定型次数(次)</td><td>{{ ReplaceNull(line1Data.hz.dx,'-') }}</td><td >{{ ReplaceNull(line2Data.hz.dx,'-') }}</td></tr>
+                <tr><td>高梳次数(次)</td><td>{{ ReplaceNull(line1Data.hz.gs,'-') }}</td><td >{{ ReplaceNull(line2Data.hz.gs,'-') }}</td></tr>
+                <tr><td>刷毛次数(次)</td><td>{{ ReplaceNull(line1Data.hz.sm,'-') }}</td><td >{{ ReplaceNull(line2Data.hz.sm,'-') }}</td></tr>
+                <tr><td>起毛次数(次)</td><td>{{ ReplaceNull(line1Data.hz.qm,'-') }}</td><td >{{ ReplaceNull(line2Data.hz.qm,'-') }}</td></tr>
+                <tr><td>双棍烫光(次)</td><td>{{ ReplaceNull(line1Data.hz.tg,'-') }}</td><td >{{ ReplaceNull(line2Data.hz.tg,'-') }}</td></tr>
+                <tr><td>烫剪(次)</td><td>{{ ReplaceNull(line1Data.hz.tj,'-') }}</td><td >{{ ReplaceNull(line2Data.hz.tj,'-') }}</td></tr>
+                <tr><td>电(kWh)</td><td>{{ ReplaceNull(line1Data.hz.elect,'-') }}</td><td >{{ ReplaceNull(line2Data.hz.elect,'-') }}</td></tr>
+                <tr><td>导热油(GJ)</td><td>{{ ReplaceNull(line1Data.hz.oil,'-') }}</td><td >{{ ReplaceNull(line2Data.hz.oil,'-') }}</td></tr>
             </tbody>
         </table>        
     </div>
@@ -123,11 +123,10 @@
                         });
                         return;
                     }
-                    line1Data.value=res.data[0].para;
-                    line2Data.value=res.data[1].para;
+                    line1Data.value=res.data[0];
+                    line2Data.value=res.data[1];
                     line1Data.value['qz'] = line1Data.value['qz']||{};
                     line1Data.value['hz'] = line1Data.value['hz']||{};
-                    line1Data.value['yr'] = line1Data.value['yr']||{};
                     var tmp={};
                     /*
                     for(var key in line2Data.value){

src/pages/components/In03.vue

@@ -872,7 +872,7 @@ export default {
                 loadingMsg.close();
                 if(res.code!=200 || res.data==null){
                     ElMessage({
-                        message:'获取数据失败！',
+                        message:res.msg,
                         type:'error',
                         customClass: 'custom-message'
                     });
@@ -885,6 +885,11 @@ export default {
               console.error('请求失败:', error);
             });
         }
+
+        function ReplaceNull(v,defaultValue){
+            if(v==null) return defaultValue;
+            return v;
+        }
         async function MarkLineComper(line1Data,line2Data,v){
             player.Native.Camera.moveTo([-94.61742308377592, -231.88112394996935, 91.21216074507522],
             [-80.69618225097656,21.59876251220703,11.815500259399414],
@@ -916,12 +921,12 @@ export default {
                     +"       \r       气(GJ)   ："+line1Data.gas;
                     */
                     tipText = lineNo1+"#产线\r"+dt
-                    +"       \r       产    能(米)："+(line1Data.length||'-')
+                    +"       \r       产    能(米)："+ReplaceNull(line1Data.length,'-')
                     +"\r———————————————"
-                    +"       \r       定　  型(次)："+(line1Data.qz.dx||'-')
-                    +"       \r   前  高　  梳(次)："+(line1Data.qz.gs||'-')
-                    +"       \r   整  双棍烫光(次)："+(line1Data.qz.tg||'-')
-                    +"       \r       双棍刷毛(次)："+(line1Data.qz.sm||'-')
+                    +"       \r       定　  型(次)："+ReplaceNull(line1Data.qz.dx,'-')
+                    +"       \r   前  高　  梳(次)："+ReplaceNull(line1Data.qz.gs,'-')
+                    +"       \r   整  双棍烫光(次)："+ReplaceNull(line1Data.qz.tg,'-')
+                    +"       \r       双棍刷毛(次)："+ReplaceNull(line1Data.qz.sm,'-')
                     //+"       \r       电(kWh)    ："+(line2Data.qz.elect||'-')
                     //+"       \r       热 油(GJ)  ："+(line2Data.qz.oil||'-')
                     +"       \r              ...";
@@ -959,12 +964,12 @@ export default {
                     */
                     tipText = lineNo1+"#产线\r"+
                         dt1.padEnd(dtPadLen," ")+"        "+dt2
-                        +"       \r产能(米)："+(line1Data.length||'-')+"               产能(米)："+(line2Data.length||'-')
+                        +"       \r产能(米)："+ReplaceNull(line1Data.length,'-')+"               产能(米)："+ReplaceNull(line2Data.length,'-')
                         +"\r————————————————————————"
-                        +"    \r   定　  型(次)："+(line1Data.qz.dx||'-').toString().padEnd(dataPadLen," ")+"     定　  型(次)："+(line2Data.qz.dx||'-').toString().padEnd(5," ")
-                        +"    \r前 高　  梳(次)："+(line1Data.qz.gs||'-').toString().padEnd(dataPadLen," ")+"  前 高　  梳(次)："+(line2Data.qz.gs||'-').toString().padEnd(5," ")
-                        +"    \r整 双棍烫光(次)："+(line1Data.qz.tg||'-').toString().padEnd(dataPadLen," ")+"  整 双棍烫光(次)："+(line2Data.qz.tg||'-').toString().padEnd(5," ")
-                        +"    \r   双棍刷毛(次)："+(line1Data.qz.sm||'-').toString().padEnd(dataPadLen," ")+"     双棍刷毛(次)："+(line2Data.qz.sm||'-').toString().padEnd(5," ")
+                        +"    \r   定　  型(次)："+ReplaceNull(line1Data.qz.dx,'-').toString().padEnd(dataPadLen," ")+"     定　  型(次)："+ReplaceNull(line2Data.qz.dx,'-').toString().padEnd(5," ")
+                        +"    \r前 高　  梳(次)："+ReplaceNull(line1Data.qz.gs,'-').toString().padEnd(dataPadLen," ")+"  前 高　  梳(次)："+ReplaceNull(line2Data.qz.gs,'-').toString().padEnd(5," ")
+                        +"    \r整 双棍烫光(次)："+ReplaceNull(line1Data.qz.tg,'-').toString().padEnd(dataPadLen," ")+"  整 双棍烫光(次)："+ReplaceNull(line2Data.qz.tg,'-').toString().padEnd(5," ")
+                        +"    \r   双棍刷毛(次)："+ReplaceNull(line1Data.qz.sm,'-').toString().padEnd(dataPadLen," ")+"     双棍刷毛(次)："+ReplaceNull(line2Data.qz.sm,'-').toString().padEnd(5," ")
                         //+"    \r电(kWh)    ："+line1Data.qz.elect.toString().padEnd(dataPadLen," ")+"    电(kWh)  ："+line2Data.qz.elect.toString().padEnd(5," ")
                         //+"    \r热 油(GJ)  ："+line1Data.qz.oil.toString().padEnd(dataPadLen," ")+"    热 油(GJ)   ："+line2Data.qz.oil.toString().padEnd(5," ");
                         +"\r                      ...";
@@ -994,12 +999,12 @@ export default {
                         dt = v.s2.substring(5).replace(":00:00","")+"时 到 "+v.e2.substring(5).replace(":00:00","")+"时";
                     }
                     var tipText = lineNo2+"#产线\r"+dt
-                    +"       \r       产    能(米)："+(line2Data.length||'-')
+                    +"       \r       产    能(米)："+ReplaceNull(line2Data.length,'-')
                     +"\r———————————————"
-                    +"       \r       定　  型(次)："+(line2Data.qz.dx||'-')
-                    +"       \r   前  高　  梳(次)："+(line2Data.qz.gs||'-')
-                    +"       \r   整  双棍烫光(次)："+(line2Data.qz.tg||'-')
-                    +"       \r       双棍刷毛(次)："+(line2Data.qz.sm||'-')
+                    +"       \r       定　  型(次)："+ReplaceNull(line2Data.qz.dx,'-')
+                    +"       \r   前  高　  梳(次)："+ReplaceNull(line2Data.qz.gs,'-')
+                    +"       \r   整  双棍烫光(次)："+ReplaceNull(line2Data.qz.tg,'-')
+                    +"       \r       双棍刷毛(次)："+ReplaceNull(line2Data.qz.sm,'-')
                     //+"       \r       电(kWh)    ："+(line2Data.qz.elect||'-')
                     //+"       \r       热 油(GJ)  ："+(line2Data.qz.oil||'-')
                     +"       \r              ...";