已织造米数改为已生产

src/pages/components/In02.vue

@@ -24,7 +24,7 @@
             <div title="返回主视图"
                 style="cursor: pointer;height: 38px;width: 38px;text-align: center;float: right;margin: 0 10px;"
                 @click.stop="backMasterViewBy02"><img src="../../assets/image/view.png"></div>
-            <div ref="autoplayer_btn" id="autoplayer_btn" title="切换自动漫游" 
+            <div ref="autoplayer_btn" id="autoplayer_btn" title="切换自动漫游"
                 style="cursor: pointer;height: 38px;width: 38px;float: right;margin: 0 10px;" @click.stop="switchAutoPlayer">
                 <img v-if="AutoPlayer" src="../../assets/image/auto3d_start.png">
                 <img v-else src="../../assets/image/auto3d_stop.png">
@@ -34,8 +34,8 @@
                 <img  src="../../assets/image/imp_icon.png">
             </div>
             -->
-            
-            
+
+
         </div>
         <div v-if="isShowFuncMenuList" id="func_menulist">
             <div  id="maogao_btn" title="" style="cursor: pointer;" @click="OpenMaoGaoWin">毛高比重</div>
@@ -61,7 +61,7 @@
                 </div>
                 <div style="margin: 0 5%; width:1px;border-left:1px solid #168895 ;"></div>
                 <div>
-                    <div class="littleFont">落米停机数</div>
+                    <div class="littleFont">落卷停机数</div>
                     <div class="label">{{ alarmjsondata.device.stop6||'-' }}<span class="unitname">台</span></div>
                     <div class="littleFont" style="margin-top: calc(30px*var(--hRate));">其他停机数</div>
                     <div class="label">{{ alarmjsondata.device.alarm||'-' }}<span class="unitname">台</span></div>
@@ -130,7 +130,7 @@
                         <tr>
                             <td class="label" style="width: 10%;text-align: center;">班组</td>
                             <td class="label" style="width: 25%">生产时间(H)</td>
-                            <td class="label" style="width: 25%">已织造数(米)</td>
+                            <td class="label" style="width: 25%">已生产数(米)</td>
                             <td class="label" style="width: 20%">总重量(T)</td>
                             <td class="label" style="width: 20%">稼动率(%)</td>
                         </tr>
@@ -438,7 +438,7 @@ export default {
             //{name:'车间能耗日报',path:'/imp-12',title:'',code:"12",type:"impWin"},
             //{name:'车间能耗月报',path:'/imp-13',title:'',code:"13",type:"impWin"},
             {name:'白坯布靶向预测',path:'/imp-14',title:'',code:"14",type:"impWin"},
-            {name:'能耗统计报表',path:'/imp-15',title:'',code:"15",type:"impWin"},            
+            {name:'能耗统计报表',path:'/imp-15',title:'',code:"15",type:"impWin"},
         ]);
         let AlarmType={
             "1": "GB1伺服通讯故障",
@@ -533,16 +533,16 @@ export default {
         watch(() => props.in02ModelLoadState, newVal=> {
             console.log('经编模型加载状态：',newVal)
             if(newVal){
-                init();                
+                init();
             }
         },{deep:true,immediate:true})
         watch(() => props.userTimeout, newVal=> {
             console.log('IN02 userTimeout value:',newVal)
             if(newVal){
-                if (!AutoPlayer.value && window.CurrentTargetType=='IN02') switchAutoPlayer(); //开启自动漫游               
+                if (!AutoPlayer.value && window.CurrentTargetType=='IN02') switchAutoPlayer(); //开启自动漫游
             }
         },{deep:true,immediate:true})
-        
+
         watch(() => props.userRole, newVal=> {
             showIndexData.value = newVal;
         },{deep:true,immediate:true})
@@ -558,8 +558,8 @@ export default {
                         }, INDEX_TIMEOUT);
                         if (res == null || res.code != 0 || window.CurrentTargetType!='IN02') {
                             return
-                        }                        
-                        indexjsondata.value = res.data;   
+                        }
+                        indexjsondata.value = res.data;
                         for(var k in res.data.efficiency)  {
                             res.data.efficiency[k] = res.data.efficiency[k].toFixed(2);
                         }
@@ -631,8 +631,8 @@ export default {
             }
         }
 
-        function search() {            
-            if (seachValue.value == "") {                
+        function search() {
+            if (seachValue.value == "") {
                 search_result_list.value = [];
                 return
             }
@@ -782,7 +782,7 @@ export default {
                 y_itemid = cacheNameRGB[name][2];
                 g_itemid = cacheNameRGB[name][1];
                 r_itemid = cacheNameRGB[name][0];
-            }            
+            }
             player.Native.ModelTree.setItemVisible([y_itemid.item,g_itemid.item,r_itemid.item],false)
             if(t=='g'){
                 player.Native.ModelTree.setItemVisible([g_itemid.item],true);
@@ -854,8 +854,8 @@ export default {
         async function updateInfo(name, event) {
             if(player.Native==null) return;
             if(event.object==null) return;
-            if (AutoPlayer.value) 
-            { 
+            if (AutoPlayer.value)
+            {
                 //停止 自动漫游
                 AutoPlayer.value=false;
                 player.Native.CameraAnimation.stop();
@@ -932,12 +932,12 @@ export default {
           }
         //打开单设备窗口
         function OpenWin(name) {
-            if (LastClickObj != null && name != LastClickObj) return;  
-            emit('OpenIframeWin',{class:'newwin',src:'/in02-device-peifang#'+name,title:name+'详细信息'})          
+            if (LastClickObj != null && name != LastClickObj) return;
+            emit('OpenIframeWin',{class:'newwin',src:'/in02-device-peifang#'+name,title:name+'详细信息'})
         }
- 
+
         function AlarmLine (data) {
-            //只获取数据中的alarm数据            
+            //只获取数据中的alarm数据
             var times = [];
             var v_series = [];
             var tmpWeek=[];
@@ -1034,7 +1034,7 @@ export default {
                 };
                 var echartsEle = echarts.init(document.getElementById('echarts_alarm'));
                 echartsEle.setOption(opt);
-            }            
+            }
         }
         function StopLine (data, typecode) {
             var t = dev_stop.value;
@@ -1173,15 +1173,15 @@ export default {
                 if (v != null) week_efficiency.push(v);
                 week_aefficiency.push(data[i]['aefficiency']);
                 week_befficiency.push(data[i]['befficiency']);
-                if(data[i]['aefficiency']<minValue) minValue = data[i]['aefficiency'];
-                if(data[i]['befficiency']<minValue) minValue = data[i]['befficiency'];
+                if(data[i]['aefficiency']<minValue) minValue = parseInt(data[i]['aefficiency']);
+                if(data[i]['befficiency']<minValue) minValue = parseInt(data[i]['befficiency']);
             }
             minValue = minValue-10;
             if (week_efficiency.length == 0) {
                 return
             }
             v_series.push({
-                name: "总稼动率", type: 'line', 
+                name: "总稼动率", type: 'line',
                 smooth:true,
                 showSymbol: false,
                 data: week_efficiency, itemStyle: {
@@ -1194,28 +1194,28 @@ export default {
                 },
             });
             v_series.push({
-                name: "A组稼动率", type: 'line',  
+                name: "A组稼动率", type: 'line',
                 smooth:true,
                 showSymbol: false,
                 data: week_aefficiency, itemStyle: {
                     normal: {
-                        color: '#1EFFFF', // 这里设置折线的颜色 
+                        color: '#1EFFFF', // 这里设置折线的颜色
                         lineStyle: {
                             color: '#1EFFFF' // 这里同时设置线头的颜色
-                        }                        
+                        }
                     }
                 },
             });
             v_series.push({
-                name: "B组稼动率", type: 'line', 
+                name: "B组稼动率", type: 'line',
                 smooth:true,
                 showSymbol: false,
                 data: week_befficiency, itemStyle: {
                     normal: {
-                        color: '#fb4750', // 这里设置折线的颜色   
+                        color: '#fb4750', // 这里设置折线的颜色
                         lineStyle: {
                             color: '#fb4750' // 这里同时设置线头的颜色
-                        }                     
+                        }
                     }
                 },
             });
@@ -1552,8 +1552,8 @@ export default {
             echartsEle.setOption(opt);
         }
         //告警设备列表数据
-        function AlarmTable(data) {            
-            AlarmData.value = data;            
+        function AlarmTable(data) {
+            AlarmData.value = data;
             if (data == null || data.length == 0) {
                 for (var devcode in modelsMap) {
                     if(LastAlarmDevs[devcode]==null) continue;
@@ -1584,7 +1584,7 @@ export default {
             alarmDevList.value = alarmDev;
             //dev_alarm_list.value.innerHtml='<tbody>'+lst.join('')+'</tbody>';
             var noAlarmDevs = [];
-            
+
             for (var devcode in modelsMap) {
                     if (OFFLINE_DEVS[devcode] == 1) continue;
                     var alarmInfo = alarmDev[devcode];
@@ -1652,7 +1652,7 @@ export default {
         }
 
         function openStopView(){
-           emit('OpenIframeWin',{class:'newwin bpbWin',src:'/imp-00',title:'停机状态分析'}) 
+           emit('OpenIframeWin',{class:'newwin bpbWin',src:'/imp-00',title:'停机状态分析'})
         }
         function LoadPan(data) {
             //盘头数据处理
@@ -1755,7 +1755,7 @@ export default {
                     return;
                 }
                 isShowMaogaoDetailWin.value = true;
-            })            
+            })
         }
         //导出毛高比重数据
         function impMaogaodetail(){
@@ -1820,7 +1820,7 @@ export default {
         }
         //切换到数据消费后台
         function toAdmin(){
-            
+
         }
         function switchIndex(){
             if(showIndexData.value=='index'){
@@ -1833,8 +1833,8 @@ export default {
             backMasterViewBy02();
             //动态设置停机原因的top
             var ele = document.getElementById('dev_alarm');
-            var style = window.getComputedStyle(ele);            
-            dev_stop.value.style.top= (ele.offsetTop * 1 + parseInt(style.height) + 30) + "px"; 
+            var style = window.getComputedStyle(ele);
+            dev_stop.value.style.top= (ele.offsetTop * 1 + parseInt(style.height) + 30) + "px";
             clearTimeout(dataTimer1);
             clearTimeout(dataTimer2);
             clearTimeout(dataTimer3);
@@ -1927,11 +1927,11 @@ export default {
     -webkit-mask-image: linear-gradient(to bottom, #0b313de5 10%, transparent 40%,transparent 50%, #0b313d 100%);
     mask-image: linear-gradient(to bottom, #0b313de5 10%,transparent 40%,transparent 50%, #0b313d 100%);
     /*
-    
+
     background:url('../../assets/image/000.png');
     -webkit-mask-image:radial-gradient(circle, transparent 26%, #95afc5 54%);
-    
-    background: 
+
+    background:
     repeating-linear-gradient(
       45deg,
       #ccc 0, #ccc 10px,
@@ -1956,4 +1956,4 @@ export default {
     border: 2px solid #17666e;
     border-top: 0px;
 }
-</style>
+</style>

src/pages/components/In03_show_allprod.vue

@@ -17,7 +17,7 @@
                     <el-table-column label="A班" align="center" prop="timeA" />
                     <el-table-column label="B班" align="center" prop="timeB" />
                 </el-table-column>
-                <el-table-column label="已织造数(米)" align="center">
+                <el-table-column label="已生产数(米)" align="center">
                     <el-table-column label="A班" align="center" prop="lengthA" />
                     <el-table-column label="B班" align="center" prop="lengthB" />
                 </el-table-column>
@@ -86,7 +86,7 @@ export default {
                 api.Get03Data().then((res)=>{
                     loading.value = false;
                     //if(window.CurrentTargetType!='IN03') return;
-                    
+
                     if (res == null) {
                         return
                     }
@@ -103,7 +103,7 @@ export default {
             let tmp = btns.value;
             for (let index = 0; index < tmp.length; index++) {
                 const element = tmp[index];
-                element.active = element.code==code?true:false;                
+                element.active = element.code==code?true:false;
             }
             btns.value = tmp;
             setTimeout(() => {
@@ -119,22 +119,22 @@ export default {
             let data = deviceStatData.value.prodTrade;
             //生产趋势
             //获取数据中weight、aweight、bweight
-            var t = echarts_sc_qushi.value;            
+            var t = echarts_sc_qushi.value;
             var dataLine = [[],[],[],[],[],[],[],[]];
             var lineColors = ['#1EFFFF','#cccccc','#ffffff','#fbc16b','#fc4850','#68f1f6','#c856fc','#feb54a'];
             var times = [];
             var v_series = [];
-            for (var i = 0; i < data.length; i++) {              
+            for (var i = 0; i < data.length; i++) {
                 var tv = data[i]['date'];
                 times.push([tv,data[i].tips]);
                 if(dataType=='Length'){
                     for (let index = 0; index < 8; index++) {
-                        dataLine[index].push({value:data[i].line[index+1]['length'],type:'Length'});                        
+                        dataLine[index].push({value:data[i].line[index+1]['length'],type:'Length'});
                     }
                 }else{
                     for (let index = 0; index < 8; index++) {
-                        dataLine[index].push({value:data[i].line[index+1]['weight'],type:'Weight'});                        
-                    } 
+                        dataLine[index].push({value:data[i].line[index+1]['weight'],type:'Weight'});
+                    }
                 }
             }
             if (times.length == 0) {
@@ -143,7 +143,7 @@ export default {
             for (let index = 0; index < dataLine.length; index++) {
                 v_series.push({
                     name: (index+1)+'号', type: 'line',  //symbol: 'none',
-                    data: dataLine[index], 
+                    data: dataLine[index],
                     itemStyle: {
                         normal: {
                             color: lineColors[index], // 这里设置折线的颜色
@@ -255,7 +255,7 @@ export default {
             for (var i = 0; i < data.length; i++) {
                 times.push([data[i]['date'],data[i].tips]);
                 for (let index = 0; index < 8; index++) {
-                    dataLine[index].push({value:data[i].line[index+1][dataType],type:dataType});                        
+                    dataLine[index].push({value:data[i].line[index+1][dataType],type:dataType});
                 }
             }
             if (times.length == 0) {
@@ -264,7 +264,7 @@ export default {
             for (let index = 0; index < dataLine.length; index++) {
                 v_series.push({
                     name: (index+1)+'号', type: 'line',  //symbol: 'none',
-                    data: dataLine[index], 
+                    data: dataLine[index],
                     itemStyle: {
                         normal: {
                             color: lineColors[index], // 这里设置折线的颜色
@@ -364,7 +364,7 @@ export default {
             if(echartsEleIns_0!=null){
                 echartsEleIns_0.dispose();
             }
-            echartsEleIns_0 = echarts.init(t);            
+            echartsEleIns_0 = echarts.init(t);
             echartsEleIns_0.setOption(opt);
         }
         onMounted(()=>{
@@ -402,7 +402,7 @@ export default {
 .el-table .el-table__body tr:nth-child(odd) td {
   background-color: #054f5c; /* 奇数行背景色 */
 }
- 
+
 .el-table .el-table__body tr:nth-child(even) td {
   background-color: #085e6b; /* 偶数行背景色 */
 }
@@ -460,4 +460,4 @@ export default {
     background-color: #008899;
     color: #fff;
 }
-</style>
+</style>