From 00d0b83bde14f733c4698c97dbc04f40680f6909 Mon Sep 17 00:00:00 2001
From: gerson <1405270578@qq.com>
Date: 星期四, 13 二月 2025 22:38:35 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/IEE/Web.V1
---
src/views/IndustrialSoftware.vue | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/src/views/IndustrialSoftware.vue b/src/views/IndustrialSoftware.vue
index 79df8d8..e083846 100644
--- a/src/views/IndustrialSoftware.vue
+++ b/src/views/IndustrialSoftware.vue
@@ -24,11 +24,10 @@
<div class="flex items-center">
<span class="text-gray-500">鍘傚晢锛�</span>
<div class="flex flex-1">
- <span v-for="item in factory" :key="item.tag" class="ant-tag !px-4"
- :class="factorySelect === item.tag ? 'ant-tag-checked' : ''"
- :type="factorySelect === item.tag ? 'primary' : 'default'"
- @click="factorySelect = item.tag" size="small">
- {{ item.name }}
+ <span v-for="item in factory" :key="item.CompanyId" class="ant-tag !px-4"
+ :class="factorySelect === item.CompanyId ? 'ant-tag-checked' : ''"
+ @click="factorySelect = item.CompanyId" size="small">
+ {{ item.CompanyAbbName }}
</span>
</div>
</div>
@@ -123,7 +122,7 @@
// 閫変腑鐘舵��
const typeSelect = ref(1);
-const factorySelect = ref('鍏ㄩ儴');
+const factorySelect = ref('-99');
const EecSelect = ref(0);
const EecLevelEnum = {
@@ -162,7 +161,7 @@
const initComanyData = () => {
axios({
method: 'get',
- url: m_RequestDataObj[typeSelect.value].requestPath,
+ url: 'static/EecProductData/CompanyData.json',
}).then((res) => {
let result = res.data;
factory.value = result.map((item: any) => {
@@ -196,8 +195,8 @@
EnergyEfficiencyClass: item.EnergyEfficiencyClass,
RecordTime: item.RecordTime,
Price: item.Price,
- PhysicalPicturePath: "/static/EecProductData/" + item.PhysicalPicturePath,
- CertificatePath: `/static/EecProductData/${item.CertificatePath}`,
+ PhysicalPicturePath: "static/EecProductData/" + item.PhysicalPicturePath,
+ CertificatePath: `static/EecProductData/${item.CertificatePath}`,
Tip: `澶囨鏃堕棿锛�${item.RecordTime} \n 澶囨鍙凤細${item.RecordNumber}`,
}
arr.push(node)
@@ -218,7 +217,7 @@
return item.EnergyEfficiencyClass === EecSelect.value
})
}
- if (factorySelect.value !== '鍏ㄩ儴') {
+ if (factorySelect.value !== '-99') {
filterProductData.value = filterProductData.value.filter((item) => {
return item.CompanyName === factorySelect.value
})
@@ -258,11 +257,10 @@
// 鎵惧埌褰撳墠鐐瑰嚮鐨勪骇鍝�
const currentProduct = dispEecProduct.value.find((item) => item.id === productId);
if (currentProduct) {
- console.log("馃殌 ~ currentProduct:", currentProduct)
// 淇濆瓨浜у搧淇℃伅鍒發ocalStorage
localStorage.setItem('currentProduct', JSON.stringify(currentProduct));
}
- router.push(`/product/${productId}`);
+ router.push(`/product/${currentProduct.Id}`);
};
const handleEecLevel = (tag: number) => {
EecSelect.value = tag;
--
Gitblit v1.9.3