调整AI工艺对比模块功能

src/pages/components/In03-ai_comp.vue

@@ -46,22 +46,29 @@
         </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>{{ ReplaceNull(line1Data.length,'-') }}</td><td >{{ ReplaceNull(line2Data.length,'-') }}</td></tr>
+                <tr><td rowspan="4" style="border-left: 1px solid #7DA2CD;width: 15%;">全部</td><td>总产值(米)</td><td>{{ ReplaceNull(line1Data.length,'-') }}</td><td >{{ ReplaceNull(line2Data.length,'-') }}</td></tr>
+                <tr><td>白坯投放(T)</td><td>{{ ReplaceNull(line1Data.bp,'-') }}</td><td >{{ ReplaceNull(line2Data.bp,'-') }}</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 rowspan="9" 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.hxAvgTemp,'-') }}</td><td >{{ ReplaceNull(line2Data.qz.hxAvgTemp,'-') }}</td></tr>
+                <tr><td>烫辊平均温度</td><td>{{ ReplaceNull(line1Data.qz.tgAvgTemp,'-') }}</td><td >{{ ReplaceNull(line2Data.qz.tgAvgTemp,'-') }}</td></tr>
+                <tr><td>烫光平均速度</td><td>{{ ReplaceNull(line1Data.qz.tgAvgSpeed,'-') }}</td><td >{{ ReplaceNull(line2Data.qz.tgAvgSpeed,'-') }}</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.yr.yh,'-') }}</td><td >{{ ReplaceNull(line2Data.yr.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 style="background-color: #016a7c;"><td rowspan="11" 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>烘箱平均温度</td><td>{{ ReplaceNull(line1Data.hz.hxAvgTemp,'-') }}</td><td >{{ ReplaceNull(line2Data.hz.hxAvgTemp,'-') }}</td></tr>
+                <tr><td>烫辊平均温度</td><td>{{ ReplaceNull(line1Data.hz.tgAvgTemp,'-') }}</td><td >{{ ReplaceNull(line2Data.hz.tgAvgTemp,'-') }}</td></tr>
+                <tr><td>烫光平均速度</td><td>{{ ReplaceNull(line1Data.hz.tgAvgSpeed,'-') }}</td><td >{{ ReplaceNull(line2Data.hz.tgAvgSpeed,'-') }}</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>

src/pages/components/In03.vue

@@ -918,8 +918,10 @@ export default {
                     +"       \r       米  长(m)："+line1Data.length
                     +"       \r       水(m3)   ："+line1Data.water
                     +"       \r       电(kWh)  ："+line1Data.electricity
-                    +"       \r       气(GJ)   ："+line1Data.gas;
+                    +"       \r       气(GJ)   ："+line1Data.gas
+                    +"       \r              ...";
                     */
+                    /*
                     tipText = lineNo1+"#产线\r"+dt
                     +"       \r       产    能(米)："+ReplaceNull(line1Data.length,'-')
                     +"\r———————————————"
@@ -927,8 +929,15 @@ export default {
                     +"       \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       电(kWh)    ："+(line1Data.qz.elect||'-')
+                    //+"       \r       热 油(GJ)  ："+(line1Data.qz.oil||'-')
+                    +"       \r              ...";
+                    */
+                    tipText = lineNo1+"#产线\r"+dt
+                    +"       \r       产   能(米)："+ReplaceNull(line1Data.length,'-')
+                    +"       \r       白坯投放(T)："+ReplaceNull(line1Data.weight,'-')
+                    +"       \r       电(kWh)　　："+ReplaceNull(line1Data.elect,'-')
+                    +"       \r       导热油(GJ) ："+ReplaceNull(line1Data.oil,'-')
                     +"       \r              ...";
                 }else{
                     var dt1="";
@@ -962,6 +971,7 @@ export default {
                         +"    \r电(kWh)  ："+line1Data.electricity.toString().padEnd(dataPadLen," ")+"    电(kWh)  ："+line2Data.electricity.toString().padEnd(5," ")
                         +"    \r气(GJ)   ："+line1Data.gas.toString().padEnd(dataPadLen," ")+"    气(GJ)   ："+line2Data.gas.toString().padEnd(5," ");
                     */
+                   /*
                     tipText = lineNo1+"#产线\r"+
                         dt1.padEnd(dtPadLen," ")+"        "+dt2
                         +"       \r产能(米)："+ReplaceNull(line1Data.length,'-')+"               产能(米)："+ReplaceNull(line2Data.length,'-')
@@ -974,6 +984,15 @@ export default {
                         //+"    \r热 油(GJ)  ："+line1Data.qz.oil.toString().padEnd(dataPadLen," ")+"    热 油(GJ)   ："+line2Data.qz.oil.toString().padEnd(5," ");
                         +"\r                      ...";
                     }
+                    */
+                    tipText = lineNo1+"#产线\r"+
+                        dt1.padEnd(dtPadLen," ")+"        "+dt2
+                        +"    \r产   能(米)："+ReplaceNull(line1Data.length,'-')+"             产   能(米)："+ReplaceNull(line2Data.length,'-')
+                        +"    \r白坯投放(T)："+ReplaceNull(line1Data.bp,'-').toString().padEnd(dataPadLen," ")+"         白坯投放(T)："+ReplaceNull(line2Data.bp,'-').toString().padEnd(5," ")
+                        +"    \r电(kWh)    ："+ReplaceNull(line1Data.elect,'-').toString().padEnd(dataPadLen," ")+"         电(kWh)    ："+ReplaceNull(line2Data.elect,'-').toString().padEnd(5," ")
+                        +"    \r热 油(GJ)  ："+ReplaceNull(line1Data.oil,'-').toString().padEnd(dataPadLen," ")+"         热 油(GJ)  ："+ReplaceNull(line2Data.oil,'-').toString().padEnd(5," ")
+                        +"\r                      ...";
+                }
                 var options = {
                                     "text": tipText,
                                     "visible": true,
@@ -982,12 +1001,12 @@ export default {
                                     "textFontSize":16,
                                     "textColor": parseInt("0xffffffff"),
                                     "contentPadding":[10,5,10,10],
-                                    "nodeOffset": lineNo1==lineNo2 ? [-130,-175]:[-200,-175],
+                                    "nodeOffset": lineNo1==lineNo2 ? [-130,-150]:[-200,-150],
                                     "userData":"comp|"
                 };
                 options.pos = lineNo1==lineNo2 ? markerPos[lineNo1-1][0] : markerPos[lineNo1-1][1];
                 options.imgId = imgid
-                options.imgSize = lineNo1!=lineNo2 ? [260, 190] :[tipWidth, 190];
+                options.imgSize = lineNo1!=lineNo2 ? [260, 150] :[tipWidth, 150];
                 var ptr = await player.Native.GisMarker.create(options);
                 compMarkerts[ptr] = options;
                 if(lineNo1!=lineNo2){
@@ -998,6 +1017,7 @@ export default {
                     else{
                         dt = v.s2.substring(5).replace(":00:00","")+"时 到 "+v.e2.substring(5).replace(":00:00","")+"时";
                     }
+                    /*
                     var tipText = lineNo2+"#产线\r"+dt
                     +"       \r       产    能(米)："+ReplaceNull(line2Data.length,'-')
                     +"\r———————————————"
@@ -1008,6 +1028,13 @@ export default {
                     //+"       \r       电(kWh)    ："+(line2Data.qz.elect||'-')
                     //+"       \r       热 油(GJ)  ："+(line2Data.qz.oil||'-')
                     +"       \r              ...";
+                    */
+                    var tipText = lineNo2+"#产线\r"+dt
+                    +"       \r       产   能(米)："+ReplaceNull(line2Data.length,'-')
+                    +"       \r       白坯投放(T)："+ReplaceNull(line2Data.weight,'-')
+                    +"       \r       电(kWh)　　："+ReplaceNull(line2Data.elect,'-')
+                    +"       \r       导热油(GJ) ："+ReplaceNull(line2Data.oil,'-')
+                    +"       \r              ...";
                     var options = {
                                     "text": tipText,
                                     "visible": true,
@@ -1016,13 +1043,13 @@ export default {
                                     "textFontSize":16,
                                     "textColor": parseInt("0xffffffff"),
                                     "contentPadding":[10,5,10,10],
-                                    "nodeOffset":[-50,-170],
+                                    "nodeOffset":[-50,-150],
                                     "userData":"comp|"
                     };
                     options.pos = markerPos[lineNo2-1][2];
                     var imgid = await player.Native.GisMarker.loadImage("data://icon/qietu/tip-l.png");
                     options.imgId = imgid
-                    options.imgSize = [260, 190];
+                    options.imgSize = [260, 150];
                     var ptr = await player.Native.GisMarker.create(options);
                     compMarkerts[ptr] = options;
                 }

src/styles/main.css

@@ -203,14 +203,14 @@
     }
     .in03AiCompWin{
         width: 800px !important;
-        height: 600px !important;
+        height: 770px !important;
         left: 50%;
         top:50%;
-        margin-top: -300px !important;
+        margin-top: -385px !important;
         margin-left:-400px !important;
     }
     .in03AiCompWin .content,.in03AiCompWin iframe{
-        height: 600px !important;
+        height: 720px !important;
         width: 100%;
         border: 0;       
     }