From 83d5f40aa0562a7b931c95b37ee2c3b033a4a1fd Mon Sep 17 00:00:00 2001
From: tanghaolin <1723298894@qq.com>
Date: 星期四, 20 二月 2025 18:04:11 +0800
Subject: [PATCH] 修改证书查询界面
---
src/views/EecLabel.vue | 144 ++++++++++++++++++++++-------------
src/views/Home.vue | 6
src/views/ProductDetail.vue | 17 ++-
src/views/PaymentPage.vue | 29 +++---
4 files changed, 118 insertions(+), 78 deletions(-)
diff --git a/src/views/EecLabel.vue b/src/views/EecLabel.vue
index 6d8e57b..4f9c1ed 100644
--- a/src/views/EecLabel.vue
+++ b/src/views/EecLabel.vue
@@ -148,54 +148,65 @@
</el-card>
</div>
<el-dialog v-model="dialogVisible" title="璇︾粏" width="500" align-center>
- <!-- 娉典骇鍝佹樉绀� -->
- <el-form v-if="isPumpProduct" :model="state.m_detailDialogInfo" label-width="120px" size="small">
- <el-form-item label="浜у搧绫诲瀷" prop="ModelType">
- <span>{{ state.m_detailDialogInfo.ModelType }}</span>
- </el-form-item>
- <el-form-item label="浜у搧鍨嬪彿" prop="Model">
- <span>{{ state.m_detailDialogInfo.Model }}</span>
- </el-form-item>
- <el-form-item label="鐢熶骇鍘傚晢" prop="CompanyName">
- <span>{{ state.m_detailDialogInfo.CompanyName }}</span>
- </el-form-item>
- <el-form-item label="鑳芥晥绛夌骇" prop="EnergyEfficiencyClass">
- <span>{{ state.m_detailDialogInfo.EnergyEfficiencyClass }}</span>
- </el-form-item>
- <el-form-item label="澶囨鍙�" prop="RecordNumber">
- <span class="detail-text">{{ state.m_detailDialogInfo.CompanyName }}</span>
- </el-form-item>
- <el-form-item label="澶囨鏃堕棿" prop="RecordTime">
- <span>{{ state.m_detailDialogInfo.RecordTime }}</span>
- </el-form-item>
- <el-form-item label="渚濇嵁鍥藉鏍囧噯" prop="RecordNumber">
- <span></span>
- </el-form-item>
- </el-form>
- <!-- 鍏朵粬浜у搧鏄剧ず -->
- <el-form v-if="!isPumpProduct" :model="state.m_detailDialogInfo" label-width="120px" size="small">
- <el-form-item label="浜у搧绫诲瀷" prop="ModelType">
- <span>{{ state.m_detailDialogInfo.ModelType }}</span>
- </el-form-item>
- <el-form-item label="浜у搧鍨嬪彿" prop="Model">
- <span>{{ state.m_detailDialogInfo.Model }}</span>
- </el-form-item>
- <el-form-item label="鐢熶骇鍘傚晢" prop="CompanyName">
- <span>{{ state.m_detailDialogInfo.CompanyName }}</span>
- </el-form-item>
- <el-form-item label="鑳芥晥绛夌骇" prop="EnergyEfficiencyClass">
- <span>{{ state.m_detailDialogInfo.EnergyEfficiencyClass }}</span>
- </el-form-item>
- <el-form-item label="澶囨鍙�" prop="RecordNumber">
- <span class="detail-text">{{ state.m_detailDialogInfo.CompanyName }}</span>
- </el-form-item>
- <el-form-item label="澶囨鏃堕棿" prop="RecordTime">
- <span>{{ state.m_detailDialogInfo.RecordTime }}</span>
- </el-form-item>
- <el-form-item label="渚濇嵁鍥藉鏍囧噯" prop="RecordNumber">
- <span></span>
- </el-form-item>
- </el-form>
+ <div v-loading="dialogLoading">
+ <!-- 娉典骇鍝佹樉绀� -->
+ <el-form v-if="isPumpProduct" :model="state.m_detailDialogInfo" label-width="120px" size="small">
+ <el-form-item label="浜у搧绫诲瀷" prop="ModelType">
+ <span>{{ state.m_detailDialogInfo.ModelType }}</span>
+ </el-form-item>
+ <el-form-item label="浜у搧鍨嬪彿" prop="Model">
+ <span>{{ state.m_detailDialogInfo.Model }}</span>
+ </el-form-item>
+ <el-form-item label="鐢熶骇鍘傚晢" prop="CompanyName">
+ <span>{{ state.m_detailDialogInfo.CompanyName }}</span>
+ </el-form-item>
+ <el-form-item label="鑳芥晥绛夌骇" prop="EnergyEfficiencyClass">
+ <span>{{ state.m_detailDialogInfo.EnergyEfficiencyClass }}</span>
+ </el-form-item>
+ <el-form-item label="澶囨鍙�" prop="RecordNumber">
+ <span class="detail-text">{{ state.m_detailDialogInfo.CompanyName }}</span>
+ </el-form-item>
+ <el-form-item label="澶囨鏃堕棿" prop="RecordTime">
+ <span>{{ state.m_detailDialogInfo.RecordTime }}</span>
+ </el-form-item>
+ <el-form-item label="渚濇嵁鍥藉鏍囧噯" prop="RecordNumber">
+ <span></span>
+ </el-form-item>
+ </el-form>
+ <!-- 鍏朵粬浜у搧鏄剧ず -->
+ <el-form v-if="!isPumpProduct" :model="state.m_OtherDetailInfo" label-width="120px" size="small">
+ <el-form-item label="浜у搧绫诲瀷" prop="ModelType">
+ <span>{{ state.m_OtherDetailInfo.ModelType }}</span>
+ </el-form-item>
+ <el-form-item label="浜у搧鍨嬪彿" prop="Model">
+ <span>{{ state.m_OtherDetailInfo.Model }}</span>
+ </el-form-item>
+ <el-form-item label="鐢熶骇鍘傚晢" prop="CompanyName">
+ <span>{{ state.m_OtherDetailInfo.CompanyName }}</span>
+ </el-form-item>
+ <el-form-item label="鑳芥晥绛夌骇" prop="EnergyEfficiencyClass">
+ <span>{{ state.m_OtherDetailInfo.EnergyEfficiencyClass }}</span>
+ </el-form-item>
+ <el-form-item label="澶囨鍙�" prop="RecordNumber">
+ <span class="detail-text">{{ state.m_OtherDetailInfo.RecordNumber }}</span>
+ </el-form-item>
+ <el-form-item label="鍏憡鏃堕棿" prop="AnnouncementTime">
+ <span>{{ state.m_OtherDetailInfo.AnnouncementTime }}</span>
+ </el-form-item>
+ <el-form-item label="渚濇嵁鍥藉鏍囧噯" prop="Standard">
+ <span>{{ state.m_OtherDetailInfo.Standard }}</span>
+ </el-form-item>
+ <el-form-item label="澶囨淇℃伅" prop="RecordNumber">
+ <div style="padding-left: 30px; background-color: rgb(243 250 255)">
+ <el-form label-width="200px" >
+ <el-form-item v-for="(item, index) in state.m_OtherDetailInfo.List" :key="index" :label="item.name" prop="Standard">
+ <span>{{ item.value }}</span>
+ </el-form-item>
+ </el-form>
+ </div>
+ </el-form-item>
+ </el-form>
+ </div>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="dialogVisible = false"> 纭畾 </el-button>
@@ -229,6 +240,7 @@
const dialogVisible = ref(false);
const dialogVisibleCertifcate = ref(false);
const isPumpProduct = ref(true);
+const dialogLoading = ref(false);
let state = reactive({
m_formData: {
ProductModel: '',
@@ -252,6 +264,17 @@
EnergyEfficiencyClass: '',
RecordTime: '',
RecordNumber: '',
+ },
+ m_OtherDetailInfo: {
+ ModelType: '',
+ Model: '',
+ CompanyName: '',
+ RecordNumber: '',
+ EnergyEfficiencyClass: '',
+ AnnouncementTime: '',
+ Standard: '',
+ List: '',
+ RecordTime: '',
},
typeSelect: 1,
// 鍒嗙被閫夐」
@@ -362,16 +385,16 @@
const changeProductType = () => {
initData();
};
-const clickDetail = (row: any) => {
- if(row.Id.includes('Pupm')){
+const clickDetail = async (row: any) => {
+ if (row.Id.includes('Pupm')) {
isPumpProduct.value = true;
- }else {
+ } else {
isPumpProduct.value = false;
+ getProductDetail(row.Model);
}
state.m_detailDialogInfo = row;
dialogVisible.value = true;
- getProductDetail(row.Model)
// 鎵惧埌褰撳墠鐐瑰嚮鐨勪骇鍝�
// const currentProduct = state.m_dispTableData.find((item) => item.id === row.id);
// if (currentProduct) {
@@ -386,7 +409,7 @@
};
const getProductDetail = async (productModel) => {
-
+ dialogLoading.value = true;
const productRegistrationList = () => {
return new Promise((reslvoe, reject) => {
axios({
@@ -435,14 +458,25 @@
if (!result.list.length) {
reslvoe([]);
}
- reslvoe(result.list);
+ reslvoe(result);
})
.catch((err) => {});
});
};
const detailData = await detailResponse();
- return detailData;
+ dialogLoading.value = false;
+ state.m_OtherDetailInfo = {
+ ModelType: detailData.productType,
+ Model: detailData.productModel,
+ CompanyName: detailData.producerName,
+ RecordNumber: detailData.registrationNumber,
+ EnergyEfficiencyClass: detailData.nxLever,
+ AnnouncementTime: detailData.announcementTime,
+ Standard: detailData.standard,
+ List: detailData.list,
+ RecordTime: '',
+ };
};
const resertForm = () => {
diff --git a/src/views/Home.vue b/src/views/Home.vue
index b89b044..3e4190a 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -340,7 +340,7 @@
d="M17 8h2a2 2 0 012 2v6a2 2 0 01-2 2h-2v4l-4-4H9a1.994 1.994 0 01-1.414-.586m0 0L11 14h4a2 2 0 002-2V6a2 2 0 00-2-2H5a2 2 0 00-2 2v6a2 2 0 002 2h2v4l.586-.586z"
/>
</svg>
- <div class="bg-gray-800 text-white text-sm py-1 px-3 rounded text-black" style="text-align: center">瀹㈡湇</div>
+ <div class="bg-gray-800 text-sm py-1 px-3 rounded text-black" style="text-align: center">瀹㈡湇</div>
</div>
<div class="hidden group-hover:block absolute right-full top-0 mr-2 whitespace-nowrap card-hover-style">
<img :src="CallMe" width="150" height="150" />
@@ -366,7 +366,7 @@
d="M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z"
/>
</svg>
- <div class="bg-gray-800 text-white text-sm py-1 px-3 rounded text-black" style="text-align: center">鍙嶉</div>
+ <div class="bg-gray-800 text-sm py-1 px-3 rounded text-black" style="text-align: center">鍙嶉</div>
</div>
</div>
@@ -384,7 +384,7 @@
>
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 10l7-7m0 0l7 7m-7-7v18" />
</svg>
- <div class="bg-gray-800 text-white text-sm py-1 px-3 rounded text-black" style="text-align: center">椤堕儴</div>
+ <div class="bg-gray-800 text-sm py-1 px-3 rounded text-black" style="text-align: center">椤堕儴</div>
</div>
</div>
</div>
diff --git a/src/views/PaymentPage.vue b/src/views/PaymentPage.vue
index 3c077b5..c1542b2 100644
--- a/src/views/PaymentPage.vue
+++ b/src/views/PaymentPage.vue
@@ -41,28 +41,29 @@
:class="{ 'border-blue-500 bg-blue-50': paymentMethod === 'wechat' }"
@click="paymentMethod = 'wechat'"
>
- <div class="flex justify-between items-center">
- <div class="flex items-center gap-3">
+ <div class="flex items-center">
+ <!-- <div class="flex items-center gap-3">
+ <img src="@/assets/icons/PAY-WEIXIN.png" alt="寰俊鏀粯" class="w-8 h-8" />
+ <span class="font-medium">寰俊鏀粯</span>
+ </div> -->
+ <!-- <el-radio v-model="paymentMethod" label="wechat" /> -->
+ <el-radio v-model="paymentMethod" value="wechat" size="large" border>
+ <div class="flex items-center gap-3">
<img src="@/assets/icons/PAY-WEIXIN.png" alt="寰俊鏀粯" class="w-8 h-8" />
<span class="font-medium">寰俊鏀粯</span>
</div>
- <el-radio v-model="paymentMethod" label="wechat" />
- </div>
- </div>
-
- <div
- class="border rounded-lg p-4"
- :class="{ 'border-blue-500 bg-blue-50': paymentMethod === 'alipay' }"
- @click="paymentMethod = 'alipay'"
- >
- <div class="flex justify-between items-center">
- <div class="flex items-center gap-3">
+ </el-radio>
+ <el-radio v-model="paymentMethod" value="alipay" size="large" border>
+ <div class="flex items-center gap-3">
<img src="@/assets/icons/PAY-ALI.png" alt="鏀粯瀹�" class="w-8 h-8" />
<span class="font-medium">鏀粯瀹�</span>
</div>
- <el-radio v-model="paymentMethod" label="alipay" />
+
+ </el-radio>
</div>
</div>
+
+
</div>
<!-- 浜岀淮鐮佹敮浠樺尯鍩� -->
diff --git a/src/views/ProductDetail.vue b/src/views/ProductDetail.vue
index 43bfc89..aa47932 100644
--- a/src/views/ProductDetail.vue
+++ b/src/views/ProductDetail.vue
@@ -94,25 +94,26 @@
</div>
</el-tab-pane>
<el-tab-pane label="鎬ц兘鏇茬嚎" name="PerformanceCurve">
- <div style="width: 1200px; height: 750px" v-show="true">
+ <div style="width: 1200px; height: 750px" v-show="isPumpDetail">
<LXBChart ref="lxbChartCtrl"></LXBChart>
</div>
- <!-- <el-empty description="鏆傛棤鎬ц兘鏇茬嚎淇℃伅" /> -->
+ <el-empty description="鏆傛棤鎬ц兘鏇茬嚎淇℃伅" v-show="!isPumpDetail" />
</el-tab-pane>
<el-tab-pane label="鍙橀�熸洸绾�" name="params">
<!-- <div style="width: 1200px; height: 750px"></div> -->
- <div style="width: 1200px; height: 750px" v-show="true">
+ <div style="width: 1200px; height: 750px" v-show="isPumpDetail">
<MultiSpeedChart ref="multiSpeedChartCtrl"></MultiSpeedChart>
</div>
- <!-- <el-empty description="鏆傛棤鍙橀�熸洸绾夸俊鎭�" /> -->
+ <el-empty description="鏆傛棤鍙橀�熸洸绾夸俊鎭�" v-show="!isPumpDetail" />
</el-tab-pane>
<el-tab-pane label="鍒囧壊鏇茬嚎" name="CutCurve">
<el-empty description="鏆傛棤鍒囧壊鏇茬嚎淇℃伅" />
</el-tab-pane>
<el-tab-pane label="瑙勬牸鍙傛暟" name="SpecificParam">
<div class="p-6">
- <prop ref="propCtrl"></prop>
+ <prop ref="propCtrl" v-show="isPumpDetail"></prop>
</div>
+ <el-empty description="鏆傛棤鍙橀�熸洸绾夸俊鎭�" v-show="!isPumpDetail" />
</el-tab-pane>
<el-tab-pane label="閫夊瀷鎶ュ憡" name="SelectReport">
<el-empty description="鏆傛棤鎶ュ憡" />
@@ -198,6 +199,8 @@
const activeTab = ref('intro');
const showBuyDialog = ref(false);
+const isPumpDetail = ref(false);
+
const orderForm = ref({
name: '',
phone: '',
@@ -234,7 +237,7 @@
const handleBuyNow = () => {
// showBuyDialog.value = true;
- router.push('/order-info')
+ router.push('/order-info');
};
const handleAddToCart = () => {
@@ -301,6 +304,7 @@
鑳芥晥绛夌骇: `${productData.EnergyEfficiencyClass}绾,
},
};
+ isPumpDetail.value = productData.Id.includes('Pupm') ? true : false;
}
initDetailData();
});
@@ -346,6 +350,7 @@
multiSpeedChartCtrl.value.setWrkCurveInfo(curve);
},
};
+ if(!isPumpDetail.value)return;
lxbChartCtrl.value.initPumpInfoData(0, pumpInfoData, cb_dict, m_userUnitSetting);
multiSpeedChartCtrl.value.initPumpInfoData(0, pumpInfoData, () => {}, m_userUnitSetting);
//鍒濆鍖栧睘鎬ф帶浠�
--
Gitblit v1.9.3