From 7ccfc3503f5484373e922da4aa149db43152c312 Mon Sep 17 00:00:00 2001
From: tanghaolin <1723298894@qq.com>
Date: 星期二, 22 四月 2025 10:41:36 +0800
Subject: [PATCH] 修改与添加数据
---
public/static/EecProductData/NIS.json | 10 --
public/static/EecProductData/ND.json | 20 -----
src/views/PolicyInfo.vue | 51 ++----------
src/views/ProductSeries.vue | 84 ++++++++++----------
public/static/EecProductData/CDL.json | 10 --
public/static/EecProductData/Pump.json | 2
src/assets/carousel/home/2.png | 0
package.json | 2
src/assets/logo/footer_logo.png | 0
src/views/Home.vue | 11 +-
public/static/img/reportLog.png | 0
public/static/img/watermark.png | 0
12 files changed, 59 insertions(+), 131 deletions(-)
diff --git a/package.json b/package.json
index 42b4bd7..35f09e1 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
"html2canvas": "^1.4.1",
"leafer-ui": "^1.0.0-rc.28",
"lodash-es": "^4.17.21",
- "mammoth": "^1.9.0",
+ "marked": "^15.0.9",
"pinia": "^2.0.26",
"pinia-plugin-persistedstate": "^4.2.0",
"swiper": "^11.2.4",
diff --git a/public/static/EecProductData/CDL.json b/public/static/EecProductData/CDL.json
index 3734a67..37a4aed 100644
--- a/public/static/EecProductData/CDL.json
+++ b/public/static/EecProductData/CDL.json
@@ -1,15 +1,5 @@
[
{
- "id":1,
- "sid":1,
- "model":"CDL8-2-1",
- "flow":"8",
- "head":"9",
- "speed":"2900",
- "eta":"58.5",
- "nengxiao_level":""
- },
- {
"id":2,
"sid":1,
"model":"CDL8-2",
diff --git a/public/static/EecProductData/ND.json b/public/static/EecProductData/ND.json
index afa12dc..85b7365 100644
--- a/public/static/EecProductData/ND.json
+++ b/public/static/EecProductData/ND.json
@@ -1,15 +1,5 @@
[
{
- "id":1,
- "sid":3,
- "model":"ND32-14G/2",
- "flow":"8",
- "head":"14",
- "speed":"2900",
- "eta":"50",
- "nengxiao_level":""
- },
- {
"id":2,
"sid":3,
"model":"ND32-18G/2",
@@ -128,16 +118,6 @@
"speed":"2900",
"eta":"63",
"nengxiao_level":"3"
- },
- {
- "id":14,
- "sid":3,
- "model":"ND40-36G/2",
- "flow":"25",
- "head":"36",
- "speed":"2900",
- "eta":"52",
- "nengxiao_level":""
},
{
"id":15,
diff --git a/public/static/EecProductData/NIS.json b/public/static/EecProductData/NIS.json
index 01ffd2d..864dc09 100644
--- a/public/static/EecProductData/NIS.json
+++ b/public/static/EecProductData/NIS.json
@@ -120,16 +120,6 @@
"nengxiao_level":"1"
},
{
- "id":13,
- "sid":4,
- "model":"NIS65-50-125/1.1",
- "flow":"25",
- "head":"9",
- "speed":"2900",
- "eta":"67.5",
- "nengxiao_level":""
- },
- {
"id":14,
"sid":4,
"model":"NIS65-50-125/1.5",
diff --git a/public/static/EecProductData/Pump.json b/public/static/EecProductData/Pump.json
index 055747f..cc82f4c 100644
--- a/public/static/EecProductData/Pump.json
+++ b/public/static/EecProductData/Pump.json
@@ -147,7 +147,7 @@
"Type": 1,
"SeriesID":10,
"Model": "Q+鏅鸿兘娉�",
- "ModelType": "绠＄綉鍙犲帇锛堟棤璐熷帇锛夊彉棰戠粰姘磋澶囷紙浜屾渚涙按璁惧锛�",
+ "ModelType": "绠＄綉鍙犲帇鍙橀缁欐按璁惧",
"CatalogID": 1,
"CompanyName": "涓婃捣涓煩",
"RecordNumber": "S-CQC20701255038",
diff --git a/public/static/img/reportLog.png b/public/static/img/reportLog.png
index a497402..e4b8373 100644
--- a/public/static/img/reportLog.png
+++ b/public/static/img/reportLog.png
Binary files differ
diff --git a/public/static/img/watermark.png b/public/static/img/watermark.png
index 46fa8cd..e4b8373 100644
--- a/public/static/img/watermark.png
+++ b/public/static/img/watermark.png
Binary files differ
diff --git a/src/assets/carousel/home/2.png b/src/assets/carousel/home/2.png
index 9760280..5dcd44f 100644
--- a/src/assets/carousel/home/2.png
+++ b/src/assets/carousel/home/2.png
Binary files differ
diff --git a/src/assets/logo/footer_logo.png b/src/assets/logo/footer_logo.png
index 4466986..f606016 100644
--- a/src/assets/logo/footer_logo.png
+++ b/src/assets/logo/footer_logo.png
Binary files differ
diff --git a/src/views/Home.vue b/src/views/Home.vue
index ca94ef1..c43f2d4 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -109,9 +109,12 @@
<div class="catalog-continer overflow-hidden">
<div class="catalog-continer-item p-4 relative" v-for="child in item" :key="child.Id"
@click="handleSeriesClick(child)">
- <div class="w-full h-[250px]">
+ <div class="w-full h-[220px]">
<img class="w-full h-full object-contain" :src="child.PhysicalPicturePath"
alt="" />
+ </div>
+ <div class="mt-4 text-center font-medium" style="font-size: 18px">
+ {{ child.ModelType }}
</div>
<div class="mt-4 text-center font-medium" style="font-size: 18px">
{{ child.Model }}
@@ -193,8 +196,8 @@
<div class="eec-product-classify-div mb-[170px]">
<div class="w-full mt-4">
<div class="flex justify-between items-center">
- <div class="flex items-center space-x-2 ml-2 font-bold">
- <span class="text-medium font-bold"> 鑳芥晥浜у搧鍒嗙被</span>
+ <div class="flex items-center space-x-2 ml-2 font-bold mb-[15px]">
+ <span class="text-medium font-bold text-[20px]" style="font-size: 20px">鑳芥晥浜у搧鍒嗙被</span>
</div>
</div>
<div class="flex h-[360px] bg-[#f9f9f9] eec-product-div" v-if="false">
@@ -244,7 +247,7 @@
<span class="text-medium font-medium">宸ヤ笟杞欢锝滃伐涓欰PP<span class="text-primary">浜у搧鍒嗙被</span></span>
</div>
</div> -->
- <div class="text-large flex items-center w-fit mx-auto mt-4 font-bold">鑳芥晥浜у搧鍒嗙被</div>
+
<div class="flex">
<div class="w-[45%] h-[400px]" ref="pieChartRef"></div>
<div class="w-[55%] h-[400px]" ref="barChartRef"></div>
diff --git a/src/views/PolicyInfo.vue b/src/views/PolicyInfo.vue
index 41098d7..5396dc7 100644
--- a/src/views/PolicyInfo.vue
+++ b/src/views/PolicyInfo.vue
@@ -75,7 +75,7 @@
<script setup lang="ts">
import { ref, onMounted } from 'vue'
-import mammoth from 'mammoth';
+import { marked } from 'marked';
import { useRouter } from 'vue-router';
const activeTab = ref('laws')
const currentPage = ref(1)
@@ -153,50 +153,17 @@
})
const readDocFile = () => {
- let filePath = "http://198.18.0.1:5680/static/Data/test.docx"
- // 灏嗘枃浠惰浆涓篵lob瀵硅薄
- // let docFileBlob = new Blob([filePath])
- // let reader = new FileReader()
- // reader.readAsArrayBuffer(docFileBlob)
-
- // reader.onload = (evt)=> {
- // let arrayBuffer = evt.target.result
- // mammoth.convertToHtml({ arrayBuffer: arrayBuffer }).then((res)=>{
- // console.log(res,158)
- // }).catch(err=>{
- // console.log(err)
- // })
- // }
-
- // 璇诲彇鏂囦欢鍐呭
+ let filePath = "file/md.md"
+ // 鑾峰彇markdown鏂囦欢鍐呭
fetch(filePath)
- .then(res => res.arrayBuffer())
- .then(buffer => {
- mammoth.convertToHtml({ arrayBuffer: buffer })
- .then((result) => {
- console.log(result,'鏂囦欢璇诲彇');
- })
- .catch((err) => {
- console.error("杞崲閿欒:", err);
- });
+ .then(response => response.text())
+ .then(data => {
+ // 灏唌arkdown杞崲涓篐TML
+ console.log(data)
+
})
- .catch(error => console.error('Error reading file:', error));
- // 灏嗘枃浠惰浆鎹㈡垚blob瀵硅薄
+ .catch(error => console.error('Error reading the file:', error));
- // mammoth.convertToHtml({
- // path: filePath,
- // // options: {
- // // styleMap: `
- // // p[style-name='Title'] => h1
- // // p[style-name='Subtitle'] => h2
- // // strong => b
- // // `
- // // }
- // }).then(res => {
- // console.log(res)
- // }).catch(err => {
- // console.log(err)
- // })
}
</script>
diff --git a/src/views/ProductSeries.vue b/src/views/ProductSeries.vue
index 854a1ca..3e49162 100644
--- a/src/views/ProductSeries.vue
+++ b/src/views/ProductSeries.vue
@@ -12,8 +12,8 @@
<div class="grid grid-cols-1 md:grid-cols-2 gap-8 mb-8">
<!-- Product Image -->
<div class="bg-white p-4 rounded-lg shadow flex justify-center flex-col">
- <img :src="m_curSeriesNode.PhysicalPicturePath" :alt="m_curSeriesNode.ModelType"
- class="w-full max-w-md mx-auto" />
+ <img :src="m_curSeriesNode.PhysicalPicturePath" :alt="m_curSeriesNode.ModelType"
+ class="w-full max-w-md mx-auto h-[475px]" style="object-fit: contain;" />
<h2 class="text-xl font-bold mt-4 text-center">{{ m_curSeriesNode.ModelType }}</h2>
</div>
@@ -31,13 +31,15 @@
</div>
</el-tab-pane>
<el-tab-pane label="涓夌淮鍔ㄧ敾" name="bim" class="h-full">
- <div class="h-full" style="box-sizing: border-box;" v-loading="loading_frm">
- <!-- <el-empty description="鏆傛湭涓婁紶" /> -->
- <model-3D ref="model3dCtrl"></model-3D>
- </div>
+ <el-empty description="鏆傛湭涓婁紶" v-if="!hasBimFile" />
+ <template v-if="hasBimFile">
+ <div style="box-sizing: border-box; height: calc(100% - 2px);" v-loading="loading_frm">
+ <model-3D ref="model3dCtrl"></model-3D>
+ </div>
+ </template>
</el-tab-pane>
<el-tab-pane label="浜у搧瑙嗛" name="video">
- <div class="p-4">
+ <div>
<el-empty description="鏆傛湭涓婁紶" />
</div>
</el-tab-pane>
@@ -112,14 +114,14 @@
</div>
</template>
</el-table-column>
- <el-table-column prop="power" align="center">
+ <!-- <el-table-column prop="power" align="center">
<template #header>
<div class="text-center">
<div>鍔熺巼</div>
<div class="text-xs text-gray-500">(kw)</div>
</div>
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column prop="speed" align="center">
<template #header>
<div class="text-center">
@@ -128,7 +130,7 @@
</div>
</template>
</el-table-column>
- <el-table-column prop="efficiency" align="center">
+ <el-table-column prop="eta" align="center">
<template #header>
<div class="text-center">
<div>鏁堢巼</div>
@@ -193,15 +195,15 @@
videoUrl: "",
three_D_url: ""
},
- 2: {
+ 4: {
description: "姹℃按姹＄墿娼滄按鐢垫车鏄竴绉嶄笓涓鸿緭閫佸惈鏈夊潥纭浐浣撳拰绾ょ淮鐨勬恫浣撹�岃璁＄殑璁惧锛岀壒鍒�傜敤浜庡鐞嗙壒鍒剰銆佺矘鎴栨粦鐨勬恫浣撱�傚畠鍦ㄦ薄姘村鐞嗗拰鎺掓斁绯荤粺涓彂鎸ョ潃鑷冲叧閲嶈鐨勪綔鐢ㄢ��",
hangyeDisc: "姹℃按姹＄墿娼滄按鐢垫车閫傜敤浜庡悇绉嶇敓娲绘薄姘淬�佸伐涓氬簾姘淬�佸缓绛戝伐鍦版帓姘淬�佹恫鐘堕ゲ鏂欑瓑銆傚湪甯傛斂宸ョ▼銆佸伐涓氥�佸尰闄€�佸缓绛戙�侀キ搴椼�佹按鍒╁缓璁剧瓑鍚勮鍚勪笟涓兘鏈夊箍娉涘簲鐢ㄢ��",
videoUrl: "",
three_D_url: ""
},
- 3: {
- description: "鈥岀珛寮忓绾х蹇冩车鏄叿鏈夋暣浣撶粨鏋勭揣鍑戙�佷綋绉皬銆侀噸閲忚交銆佸櫔澹颁綆銆佽妭鑳芥晥鏋滄樉钁楋紝妫�淇柟渚跨殑绂诲績娉点�傞噰鐢ㄦ爣鍑嗙珛寮忕數鏈哄拰蹇寮忔満姊板瘑灏侊紝鏇存崲闈炲父鏂逛究銆傛车鐨勮繃娴侀儴鍒嗗潎閲囩敤涓嶉攬閽紙304/316锛夋潗鏂欏埗鎴愶紝鍙�傜敤浜庤交搴﹁厫铓�鎬т粙璐ㄣ��",
- hangyeDisc: "鈥屸�岀珛寮忓绾х蹇冩车閫傜敤浜嶾n楂樺眰寤虹瓚渚涙按鈥岋細绔嬪紡澶氱骇涓嶉攬閽㈢蹇冩车閫傜敤浜庨珮灞傚缓绛戠殑渚涙按绯荤粺锛岃兘澶熸彁渚涚ǔ瀹氱殑姘村帇锛屾弧瓒抽珮灞傚缓绛戠殑鏃ュ父鐢熸椿鐢ㄦ按闇�姹傗�孿n鈥屽伐涓氱敤姘粹�岋細鍦ㄥ伐涓氱敓浜т腑锛岀珛寮忓绾т笉閿堥挗绂诲績娉靛彲鐢ㄤ簬杈撻�佸悇绉嶅伐涓氱敤姘达紝濡傚喎鍗村惊鐜按銆佽繘鏂欐按銆佹礂娑ゆ按绛夛紝婊¤冻涓嶅悓宸ヨ壓鐨勭敤姘磋姹傗�孿n鈥屽啘鐢扮亴婧夆�岋細璇ユ车鍙敤浜庡啘鐢扮亴婧夛紝鎻愪緵鍏呰冻鐨勬按璧勬簮锛屼繚璇佸啘浣滅墿鐨勭敓闀库�孿n鈥屾按澶勭悊宸ョ▼鈥岋細鍦ㄦ按澶勭悊宸ョ▼涓紝绔嬪紡澶氱骇涓嶉攬閽㈢蹇冩车骞挎硾搴旂敤浜庣粰姘村鐞嗐�佸弽娓楅�忋�佽秴婊ょ瓑宸ヨ壓锛屾彁渚涢珮璐ㄩ噺鐨勬按婧愨�孿n鈥屽寲宸ヨ涓氣�岋細鍦ㄥ寲宸ョ敓浜т腑锛岃娉靛叿鏈夎壇濂界殑鑰愯厫铓�鎬ц兘锛屽彲鐢ㄤ簬杈撻�佸惈鏈夎厫铓�鎬с�佹槗鐕冩�с�佹槗鐖嗘�х殑浠嬭川鈥孿n鈥岃兘婧愯涓氣�岋細鍦ㄨ兘婧愯涓氫腑锛屽鏍哥數绔欍�佺數鍘備緵姘寸瓑锛岀珛寮忓绾т笉閿堥挗绂诲績娉典篃鏈夊箍娉涘簲鐢ㄢ�孿n鈥屾秷闃茬郴缁熲�岋細鍦ㄦ秷闃茬郴缁熶腑锛岃娉佃兘澶熷揩閫熷皢姘村鍘嬪埌鎵�闇�鐨勯珮鍘嬬姸鎬侊紝淇濊瘉娑堥槻姘磋兘澶熷柗灏勫埌杈冮珮鐨勬ゼ灞傛垨鑰呰緝杩滅殑璺濈鈥孿n鈥岄鍝併�佸尰鑽�佸寲宸ョ瓑琛屼笟鈥岋細绔嬪紡澶氱骇涓嶉攬閽㈢蹇冩车杩樺箍娉涘簲鐢ㄤ簬椋熷搧銆佸尰鑽�佸寲宸ャ�佹按浜у吇娈栫瓑棰嗗煙锛屼綔涓虹粰姘存帓姘寸殑鍔ㄥ姏璁惧鈥孿n杩欎簺搴旂敤棰嗗煙灞曠ず浜嗙珛寮忓绾т笉閿堥挗绂诲績娉电殑澶氭牱鎬у拰閲嶈鎬э紝鍏跺湪涓嶅悓琛屼笟涓彂鎸ョ潃鍏抽敭浣滅敤銆�",
+ 6: {
+ description: "鈥岀鍚告车鈥岋紝涔熺О涓哄崟鍚告车锛屾槸鎸囨恫浣撲粠鍙惰疆鐨勪竴绔繘姘寸殑娉点�傚叾鍩烘湰缁撴瀯鐢辨车浣撱�佸彾杞�佽酱銆佸瘑灏佽缃瓑缁勬垚锛岃繘鍙ｅ拰鍑哄彛浣嶄簬娉电殑鍚屼竴渚э紝閫氬父杩涘彛鍦ㄦ车鐨勬湯绔紝鍑哄彛鍦ㄦ车鐨勫墠绔�岃繖绉嶈璁′娇寰楁车鐨勭粨鏋勭浉瀵圭揣鍑戯紝渚夸簬瀹夎鍜岀淮鎶も��",
+ hangyeDisc: "鈥岀鍚告车骞挎硾搴旂敤浜庡缓绛戜緵姘淬�佸鍘嬨�佺┖璋冪郴缁熴�佸伐涓氬惊鐜瓑澶氱鍦哄悎銆�",
videoUrl: "",
three_D_url: ""
},
@@ -211,6 +213,12 @@
videoUrl: "",
three_D_url: ""
},
+ 8: {
+ description: "鍗曠骇绠￠亾娉碘�屾槸涓�绉嶅崟鍚稿崟绾х蹇冩车锛屽睘浜庣珛寮忕粨鏋勩�傚叾杩涘嚭鍙ｅ湪鍚屼竴鐩寸嚎涓婏紝涓旇繘鍑哄彛鍙ｅ緞鐩稿悓锛屽褰豢浼间竴娈电閬擄紝鍥犳寰楀悕銆傚崟鏈虹閬撴车鍙互瀹夎鍦ㄧ閬撶殑浠讳綍浣嶇疆锛屽叿鏈夌粨鏋勭揣鍑戙�佸崰鍦伴潰绉皬銆佸畨瑁呮柟渚跨瓑鐗圭偣鈥�",
+ hangyeDisc:"鍗曠骇绠￠亾娉甸�傜敤浜庡寲宸ャ�佺煶娌广�佸埗鑽�佸伐涓氳涓�",
+ videoUrl: "",
+ three_D_url: ""
+ }
}
},
2: {
@@ -218,7 +226,7 @@
catalog: {
1: {
description: "鏄緷闈犲帇缂╄厰鐨勫唴閮ㄥ绉缉灏忔潵鎻愰珮姘斾綋鎴栬捀姘斿帇鍔涚殑鍘嬬缉鏈猴紝鏄帇缂╂満鐨勪竴绫伙紝甯歌鐢ㄥ湪鍒跺喎銆佺┖璋冨強鐑车绛夈�傚帇缂╂満鏄帇缂╂皵浣撲互鎻愰珮姘斾綋鍘嬪姏鐨勬満姊帮紝濡傚帇姘旀満銆佹皵娉电瓑锛屾牴鎹帇缂╂皵浣撶殑鏂瑰紡涓嶅悓锛屽彲鍒嗕负瀹圭Н寮忓帇缂╂満鍜屽姩鍔涘紡鍘嬬缉鏈恒�傗��",
- hangyeDisc: "姹℃按姹＄墿娼滄按鐢垫车閫傜敤浜庘�屾櫘閫氫綇瀹呮ゼ銆佸晢浣忔ゼ銆佸眳姘戝皬鍖衡�屻�侀珮灞傚缓绛戙�侀珮绾у棣嗛キ搴椼�佺敓娲诲皬鍖恒�侀珮灞傚缓绛戠殑鐑按渚涘簲绯荤粺銆佺患鍚堟ゼ銆佸啓瀛楁ゼ绛夊缓绛�",
+ hangyeDisc: "",
videoUrl: "",
three_D_url: ""
}
@@ -228,8 +236,8 @@
name: "閫氶鏈�",
catalog: {
1: {
- description: "鏄竴绉嶅湪鍘熸湁绠＄綉姘村帇鍔涘熀纭�涓婂啀娆″姞鍘嬬殑渚涙按璁惧銆傚叾涓昏鍔熻兘鏄湪甯傛斂渚涙按绠＄綉鍘嬪姏鐨勫熀纭�涓婅繘琛屼簩娆″姞鍘嬶紝浠ユ弧瓒虫洿楂樼殑渚涙按闇�姹傦紝鍚屾椂纭繚甯傛斂绠＄綉鐨勫帇鍔涗笉浣庝簬璁惧畾淇濇姢鍘嬪姏锛岄槻姝㈣礋鍘嬩骇鐢燂紝纭繚渚涙按鐨勫畨鍏ㄣ�佸彲闈犲拰绋冲畾鈥屸��",
- hangyeDisc: "瀹圭Н寮忕┖鍘嬫満鍦ㄥ涓鍩熸湁骞挎硾搴旂敤鈥岋紝涓昏鍖呮嫭鍖昏嵂銆佹苯杞﹀埗閫犮�佹満姊板姞宸ャ�佺煶娌瑰寲宸ャ�佹柊鑳芥簮绛夐鍩熴�傚湪鍖昏嵂棰嗗煙锛屽绉紡绌哄帇鏈哄彲鐢ㄤ簬鍖昏嵂鍖呰鍜屽尰鑽櫎灏樿繃绋嬶紱鍦ㄦ苯杞﹀埗閫犻鍩燂紝鍏跺簲鐢ㄤ簬杞﹁韩鍠锋秱鍜岃疆鑳庡厖姘旂瓑娴佺▼锛涘湪鐭虫补鍖栧伐棰嗗煙锛岀敤浜庡ぉ鐒舵皵澶勭悊鍜岃緭閫佺瓑鐜妭鈥屾澶栵紝瀹圭Н寮忕┖鍘嬫満杩樺箍娉涘簲鐢ㄤ簬鍒跺喎銆佺┖璋冨強鐑车绛夐鍩熲��",
+ description: "閫氶鏈烘槸渚濋潬杈撳叆鐨勬満姊拌兘锛屾彁楂樻皵浣撳帇鍔涘苟鎺掗�佹皵浣撶殑鏈烘锛屽畠鏄竴绉嶄粠鍔ㄧ殑娴佷綋鏈烘銆傛帓姘斿帇鍔涗綆浜�1.5脳10^4甯曘��",
+ hangyeDisc: "鈥�",
videoUrl: "",
three_D_url: ""
}
@@ -239,8 +247,8 @@
name: "姘村喎鏈虹粍",
catalog: {
1: {
- description: "鏄竴绉嶅湪鍘熸湁绠＄綉姘村帇鍔涘熀纭�涓婂啀娆″姞鍘嬬殑渚涙按璁惧銆傚叾涓昏鍔熻兘鏄湪甯傛斂渚涙按绠＄綉鍘嬪姏鐨勫熀纭�涓婅繘琛屼簩娆″姞鍘嬶紝浠ユ弧瓒虫洿楂樼殑渚涙按闇�姹傦紝鍚屾椂纭繚甯傛斂绠＄綉鐨勫帇鍔涗笉浣庝簬璁惧畾淇濇姢鍘嬪姏锛岄槻姝㈣礋鍘嬩骇鐢燂紝纭繚渚涙按鐨勫畨鍏ㄣ�佸彲闈犲拰绋冲畾鈥屸��",
- hangyeDisc: "姹℃按姹＄墿娼滄按鐢垫车閫傜敤浜庘�屾櫘閫氫綇瀹呮ゼ銆佸晢浣忔ゼ銆佸眳姘戝皬鍖衡�屻�侀珮灞傚缓绛戙�侀珮绾у棣嗛キ搴椼�佺敓娲诲皬鍖恒�侀珮灞傚缓绛戠殑鐑按渚涘簲绯荤粺銆佺患鍚堟ゼ銆佸啓瀛楁ゼ绛夊缓绛�",
+ description: "鍐锋按鏈虹粍锛堝張绉帮細鍐峰喕鏈恒�佸埗鍐锋満缁勩�佸啺姘存満缁勩�佸喎鍗磋澶囷級鏄竴涓埗鍐疯澶囥�傚湪鍒跺喎琛屼笟涓垎涓洪鍐峰紡鍐锋按鏈虹粍鍜屾按鍐峰紡鍐锋按鏈虹粍涓ょ锛屾牴鎹帇缂╂満鍙堝垎涓鸿灪鏉嗗紡鍐锋按鏈虹粍銆佹丁鏃嬪紡鍐锋按鏈虹粍銆佺蹇冨紡鍐锋按鏈虹粍銆�",
+ hangyeDisc: "",
videoUrl: "",
three_D_url: ""
}
@@ -250,8 +258,8 @@
name: "鐢垫満",
catalog: {
1: {
- description: "鏄竴绉嶅湪鍘熸湁绠＄綉姘村帇鍔涘熀纭�涓婂啀娆″姞鍘嬬殑渚涙按璁惧銆傚叾涓昏鍔熻兘鏄湪甯傛斂渚涙按绠＄綉鍘嬪姏鐨勫熀纭�涓婅繘琛屼簩娆″姞鍘嬶紝浠ユ弧瓒虫洿楂樼殑渚涙按闇�姹傦紝鍚屾椂纭繚甯傛斂绠＄綉鐨勫帇鍔涗笉浣庝簬璁惧畾淇濇姢鍘嬪姏锛岄槻姝㈣礋鍘嬩骇鐢燂紝纭繚渚涙按鐨勫畨鍏ㄣ�佸彲闈犲拰绋冲畾鈥屸��",
- hangyeDisc: "姹℃按姹＄墿娼滄按鐢垫车閫傜敤浜庘�屾櫘閫氫綇瀹呮ゼ銆佸晢浣忔ゼ銆佸眳姘戝皬鍖衡�屻�侀珮灞傚缓绛戙�侀珮绾у棣嗛キ搴椼�佺敓娲诲皬鍖恒�侀珮灞傚缓绛戠殑鐑按渚涘簲绯荤粺銆佺患鍚堟ゼ銆佸啓瀛楁ゼ绛夊缓绛�",
+ description: "",
+ hangyeDisc: "",
videoUrl: "",
three_D_url: ""
}
@@ -271,22 +279,6 @@
LawID: 2,
FileName: 'AS1-20'
- },
- 2: {
- requestPath: "http://60.188.55.38:85/v3/ModelLibrary/GetProductDimList",
- filePath: "http://60.188.55.38:82/Data/Series1/BIM/FL/DIM.fbx",
- settingPath: "http://60.188.55.38:82/Data/Series1/BIM/FL/DIM.json",
- SeriesID: 1,
- LawID: 2,
- FileName: 'AS1-20'
- },
- 3: {
- requestPath: "http://60.188.55.38:85/v3/ModelLibrary/GetProductDimList",
- filePath: "http://60.188.55.38:82/Data/Series1/BIM/FL/DIM.fbx",
- settingPath: "http://60.188.55.38:82/Data/Series1/BIM/FL/DIM.json",
- SeriesID: 1,
- LawID: 2,
- FileName: 'AS1-20'
}
}
@@ -316,6 +308,8 @@
const catalogType = ref(1)
const seriesID = ref(1)
const catalogID = ref(1)
+
+const hasBimFile = ref(false)
const m_curSeriesNode = ref({
PhysicalPicturePath: "",
Tip: "",
@@ -447,22 +441,26 @@
const changeTab = (value) => {
console.log('鎴戣璋冪敤浜�', value)
if (value === 'bim' && !isLoadingBim.value) {
- nextTick(() => {
loadModel3dView();
- })
-
}
}
const loadModel3dView = () => {
+ if(!BimObj[seriesID.value]){
+ hasBimFile.value = false;
+ return;
+ }
const fbx_file_path = BimObj[seriesID.value].filePath;
-
- loading_frm.value = true
- model3dCtrl.value.loadModel(fbx_file_path, true, (val) => {
+ hasBimFile.value = true;
+ loading_frm.value = true;
+ nextTick(()=>{
+ model3dCtrl.value.loadModel(fbx_file_path, true, (val) => {
setModelSizeValue();
loading_frm.value = false;
isLoadingBim.value = true;
});
+ })
+
}
const setModelSizeValue = () => {
--
Gitblit v1.9.3