|
@@ -55,7 +55,7 @@
|
|
|
<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: 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>
|
|
@@ -82,8 +82,8 @@
|
|
|
const route = useRouter(); // 获取当前路由对象
|
|
|
const params = ref(''); // 初始化 hash 值
|
|
|
const paramObj=ref([{},{}]);
|
|
|
- const line1Data = ref({qz:{},hz:{}});
|
|
|
- const line2Data = ref({qz:{},hz:{}});
|
|
|
+ const line1Data = ref({qz:{},hz:{},yr:{}});
|
|
|
+ const line2Data = ref({qz:{},hz:{},yr:{}});
|
|
|
const diff=ref({});
|
|
|
function getData(){
|
|
|
var obj = JSON.parse(params.value);
|
|
@@ -127,12 +127,15 @@
|
|
|
line2Data.value=res.data[1].para;
|
|
|
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){
|
|
|
tmp[key] = line2Data.value[key]-line1Data.value[key];
|
|
|
}
|
|
|
diff.value = tmp
|
|
|
console.log(diff.value)
|
|
|
+ */
|
|
|
}).catch((error) => {
|
|
|
console.error('请求失败:', error);
|
|
|
});
|