更改AI工艺对比功能的数据显示内容

src/pages/components/In03-ai_comp.vue

@@ -1,5 +1,6 @@
 <template>
     <div class="dataContent">
+        <!--
         <table class="titletable" cellspacing="0" cellpadding="0">
             <thead>
                 <tr><td rowspan="2" style="border-left: 1px solid #7DA2CD;width: 15%;">设备类型</td><td rowspan="2">工艺参数</td><td colspan="2" style="border-bottom: 1px solid #7DA2CD">设定值</td></tr>
@@ -36,6 +37,35 @@
                 <tr><td>后刷辊转速rpm</td><td>{{ line1Data.r26 }}</td><td :class="diff.r26!=0?'diff':''">{{ line2Data.r26 }}{{ diff.r26!=0 ? (diff.r26>0?" ↑(":" ↓(")+diff.r26+")" :'' }}</td></tr>
             </tbody>
         </table>
+        -->
+        <table class="titletable" cellspacing="0" cellpadding="0">
+            <thead>
+                <tr><td rowspan="2" style="border-left: 1px solid #7DA2CD;width: 15%;">产线段</td><td rowspan="2">对比项目</td><td colspan="2" style="border-bottom: 1px solid #7DA2CD">分析结果</td></tr>
+                <tr><td>{{ paramObj[0].ai_prouct_no+'#产线'+paramObj[0].compDateHour1+"时 到 "+paramObj[0].compDateHour2+'时' }}</td><td>{{ paramObj[1].ai_prouct_no+'#产线 '+paramObj[1].compDateHour1+"时 到 "+paramObj[1].compDateHour2+'时' }}</td></tr>
+            </thead>
+        </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.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>
+            </tbody>
+        </table>        
     </div>
 </template>
 <script>
@@ -52,8 +82,8 @@
             const route = useRouter(); // 获取当前路由对象
             const params = ref(''); // 初始化 hash 值
             const paramObj=ref([{},{}]);
-            const line1Data = ref({});
-            const line2Data = ref({});
+            const line1Data = ref({qz:{},hz:{}});
+            const line2Data = ref({qz:{},hz:{}});
             const diff=ref({});
             function getData(){
                 var obj = JSON.parse(params.value);
@@ -95,6 +125,8 @@
                     }
                     line1Data.value=res.data[0].para;
                     line2Data.value=res.data[1].para;
+                    line1Data.value['qz'] = line1Data.value['qz']||{};
+                    line1Data.value['hz'] = line1Data.value['hz']||{};
                     var tmp={};
                     for(var key in line2Data.value){
                         tmp[key] = line2Data.value[key]-line1Data.value[key];

src/pages/components/In03.vue

@@ -463,9 +463,9 @@ export default {
                     if(markerLClickObj==null){
                         //emit('markerLClick',{});
                         markerLClickObj = compMarkerts[event.markerId];
-                        if(markerLClickObj!=null){
+                        if(markerLClickObj!=null){                            
                             var params = JSON.stringify(compProctList.value);
-                            emit('OpenIframeWin',{class:'newwin in03AiCompWin',src:'/in03-ai-comp#'+params,title:'AI工艺配置详情'});
+                            emit('OpenIframeWin',{class:'newwin in03AiCompWin',src:'/in03-ai-comp#'+params,title:'AI工艺比对详情'});
                         }
                         return;
                     }
@@ -891,6 +891,10 @@ export default {
             [-0.0033254334820971166, 0.29907134022370024, 0.9542249603468546], 1);
             var lineNo1 = compProctList.value[0].ai_prouct_no*1;
             var lineNo2 = compProctList.value[1].ai_prouct_no*1;
+            line1Data['qz']=line1Data.qz||{};
+            line2Data['qz']=line2Data.qz||{};
+            line1Data['hz']=line1Data.qz||{};
+            line2Data['hz']=line2Data.qz||{};
             var dt = "";
             var imgid = await player.Native.GisMarker.loadImage(lineNo1==lineNo2?"data://icon/qietu/tip-m.png":"data://icon/qietu/tip-r.png");
                 var tipText = "";
@@ -902,6 +906,7 @@ export default {
                     else{
                         dt = v.s1.substring(5).replace(":00:00","")+"时 到 "+v.e1.substring(5).replace(":00:00","")+"时";
                     }
+                    /*
                     tipText = lineNo1+"#产线\r"+dt
                     +"       \r       合格率(%)："+line1Data.rate
                     +"       \r       重  量(T)："+line1Data.weight
@@ -909,12 +914,23 @@ export default {
                     +"       \r       水(m3)   ："+line1Data.water
                     +"       \r       电(kWh)  ："+line1Data.electricity
                     +"       \r       气(GJ)   ："+line1Data.gas;
+                    */
+                    tipText = lineNo1+"#产线\r"+dt
+                    +"       \r       产    能(米)："+(line1Data.length||'-')
+                    +"\r———————————————"
+                    +"       \r       定　  型(次)："+(line1Data.qz.dx||'-')
+                    +"       \r   前  高　  梳(次)："+(line1Data.qz.gs||'-')
+                    +"       \r   整  双棍烫光(次)："+(line1Data.qz.tg||'-')
+                    +"       \r       双棍刷毛(次)："+(line1Data.qz.sm||'-')
+                    //+"       \r       电(kWh)    ："+(line2Data.qz.elect||'-')
+                    //+"       \r       热 油(GJ)  ："+(line2Data.qz.oil||'-')
+                    +"       \r              ...";
                 }else{
                     var dt1="";
                     var dt2="";
                     var dtPadLen = 19;
                     var dataPadLen = 5;
-                    var tipWidth = 340;
+                    var tipWidth = 400;
                     if(v.s1==v.e1) dt1 = v.s1.substring(5).replace(":00:00","")+"时";
                     else if(v.s1.substring(0,10)==v.e1.substring(0,10)){
                         dt1 = v.s1.substring(5).replace(":00:00","")+"时 到 "+v.e1.substring(11).replace(":00:00","")+"时";
@@ -923,7 +939,7 @@ export default {
                         dt1 = v.s1.substring(5).replace(":00:00","")+"时 到 "+v.e1.substring(5).replace(":00:00","")+"时";
                         dtPadLen = 24;
                         dataPadLen = 12;
-                        tipWidth = 430;
+                        tipWidth = 500;
                     }
                     if(v.s2==v.e2) dt2 = v.s2.substring(5).replace(":00:00","")+"时";
                     else if(v.s2.substring(0,10)==v.e2.substring(0,10)){
@@ -931,6 +947,7 @@ export default {
                     }else{
                         dt2 = v.s2.substring(5).replace(":00:00","")+"时 到 "+v.e2.substring(5).replace(":00:00","")+"时";
                     }
+                    /*
                     tipText = lineNo1+"#产线\r"+
                         dt1.padEnd(dtPadLen," ")+
                         dt2+"\r合格率(%)："+line1Data.rate.toString().padEnd(dataPadLen," ")+"    合格率(%)："+line2Data.rate
@@ -939,7 +956,19 @@ export default {
                         +"    \r水(m3)   ："+line1Data.water.toString().padEnd(dataPadLen," ")+"    水(m3)   ："+line2Data.water.toString().padEnd(5," ")
                         +"    \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产能(米)："+(line1Data.length||'-')+"               产能(米)："+(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电(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                      ...";
+                    }
                 var options = {
                                     "text": tipText,
                                     "visible": true,
@@ -953,7 +982,7 @@ export default {
                 };
                 options.pos = lineNo1==lineNo2 ? markerPos[lineNo1-1][0] : markerPos[lineNo1-1][1];
                 options.imgId = imgid
-                options.imgSize = lineNo1!=lineNo2 ? [260, 170] :[tipWidth, 170];
+                options.imgSize = lineNo1!=lineNo2 ? [260, 190] :[tipWidth, 190];
                 var ptr = await player.Native.GisMarker.create(options);
                 compMarkerts[ptr] = options;
                 if(lineNo1!=lineNo2){
@@ -964,14 +993,18 @@ export default {
                     else{
                         dt = v.s2.substring(5).replace(":00:00","")+"时 到 "+v.e2.substring(5).replace(":00:00","")+"时";
                     }
+                    var tipText = lineNo2+"#产线\r"+dt
+                    +"       \r       产    能(米)："+(line2Data.length||'-')
+                    +"\r———————————————"
+                    +"       \r       定　  型(次)："+(line2Data.qz.dx||'-')
+                    +"       \r   前  高　  梳(次)："+(line2Data.qz.gs||'-')
+                    +"       \r   整  双棍烫光(次)："+(line2Data.qz.tg||'-')
+                    +"       \r       双棍刷毛(次)："+(line2Data.qz.sm||'-')
+                    //+"       \r       电(kWh)    ："+(line2Data.qz.elect||'-')
+                    //+"       \r       热 油(GJ)  ："+(line2Data.qz.oil||'-')
+                    +"       \r              ...";
                     var options = {
-                                    "text": lineNo2+"#产线\r"+dt
-                                    +"       \r       合格率(%)："+line2Data.rate
-                                    +"       \r       重  量(T)："+line2Data.weight
-                                    +"       \r       米  长(m)："+line2Data.length
-                                    +"       \r       水(m3)   ："+line2Data.water
-                                    +"       \r       电(kWh)  ："+line2Data.electricity
-                                    +"       \r       气(GJ)   ："+line2Data.gas,
+                                    "text": tipText,
                                     "visible": true,
                                     //"maxLod": 130,
                                     "minLod": 0,
@@ -984,7 +1017,7 @@ export default {
                     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, 170];
+                    options.imgSize = [260, 190];
                     var ptr = await player.Native.GisMarker.create(options);
                     compMarkerts[ptr] = options;
                 }

src/styles/main.css

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