diff --git a/package-lock.json b/package-lock.json index 8992ae8..c162021 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,6 +9,7 @@ "version": "0.1.0", "dependencies": { "@dataview/datav-vue3": "^0.0.0-test.1672506674342", + "@iamzzg/data-view": "^2.10.0", "@jiaminghi/data-view": "^2.10.0", "@tweenjs/tween.js": "^19.0.0", "axios": "^1.3.2", @@ -1785,6 +1786,15 @@ "@hapi/hoek": "^9.0.0" } }, + "node_modules/@iamzzg/data-view": { + "version": "2.10.0", + "resolved": "https://registry.npmmirror.com/@iamzzg/data-view/-/data-view-2.10.0.tgz", + "integrity": "sha512-UafIJaEqHIgEC+8CaEL0qQxG34JsgKOc13RkYjlupOIAoELNkWXCrYN89xOP+RkSreBTpgaTEt43PfW4EMMjcQ==", + "dependencies": { + "@babel/runtime": "^7.5.5", + "@jiaminghi/charts": "*" + } + }, "node_modules/@intlify/core-base": { "version": "9.2.2", "resolved": "https://registry.npmmirror.com/@intlify/core-base/-/core-base-9.2.2.tgz", @@ -4050,9 +4060,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001449", - "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001449.tgz", - "integrity": "sha512-CPB+UL9XMT/Av+pJxCKGhdx+yg1hzplvFJQlJ2n68PyQGMz9L/E2zCyLdOL8uasbouTUgnPl+y0tccI/se+BEw==", + "version": "1.0.30001532", + "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001532.tgz", + "integrity": "sha512-FbDFnNat3nMnrROzqrsg314zhqN5LGQ1kyyMk2opcrwGbVGpHRhgCWtAgD5YJUqNAiQ+dklreil/c3Qf1dfCTw==", "dev": true }, "node_modules/case-sensitive-paths-webpack-plugin": { @@ -13390,6 +13400,15 @@ "@hapi/hoek": "^9.0.0" } }, + "@iamzzg/data-view": { + "version": "2.10.0", + "resolved": "https://registry.npmmirror.com/@iamzzg/data-view/-/data-view-2.10.0.tgz", + "integrity": "sha512-UafIJaEqHIgEC+8CaEL0qQxG34JsgKOc13RkYjlupOIAoELNkWXCrYN89xOP+RkSreBTpgaTEt43PfW4EMMjcQ==", + "requires": { + "@babel/runtime": "^7.5.5", + "@jiaminghi/charts": "*" + } + }, "@intlify/core-base": { "version": "9.2.2", "resolved": "https://registry.npmmirror.com/@intlify/core-base/-/core-base-9.2.2.tgz", @@ -15280,9 +15299,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001449", - "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001449.tgz", - "integrity": "sha512-CPB+UL9XMT/Av+pJxCKGhdx+yg1hzplvFJQlJ2n68PyQGMz9L/E2zCyLdOL8uasbouTUgnPl+y0tccI/se+BEw==", + "version": "1.0.30001532", + "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001532.tgz", + "integrity": "sha512-FbDFnNat3nMnrROzqrsg314zhqN5LGQ1kyyMk2opcrwGbVGpHRhgCWtAgD5YJUqNAiQ+dklreil/c3Qf1dfCTw==", "dev": true }, "case-sensitive-paths-webpack-plugin": { diff --git a/package.json b/package.json index 89f0bf6..e505106 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ }, "dependencies": { "@dataview/datav-vue3": "^0.0.0-test.1672506674342", + "@iamzzg/data-view": "^2.10.0", "@jiaminghi/data-view": "^2.10.0", "@tweenjs/tween.js": "^19.0.0", "axios": "^1.3.2", diff --git a/src/main.ts b/src/main.ts index 91ddfbc..b23ea91 100644 --- a/src/main.ts +++ b/src/main.ts @@ -18,7 +18,7 @@ import zhCn from 'element-plus/dist/locale/zh-cn.mjs' import echarts from '@/utils/echarts' import {createPinia} from 'pinia' // import DataV, { setClassNamePrefix } from '@dataview/datav-vue3'; -import dataV from '@jiaminghi/data-view' +import dataV from "@iamzzg/data-view/dist/vue3/datav.map.vue.esm"; import './registerServiceWorker' import router from './router' import i18n from './locales' diff --git a/src/views/InPlantProducts/child/component/header1.vue b/src/views/InPlantProducts/child/component/header1.vue index 5be9e88..357be8d 100644 --- a/src/views/InPlantProducts/child/component/header1.vue +++ b/src/views/InPlantProducts/child/component/header1.vue @@ -24,7 +24,7 @@ + \ No newline at end of file diff --git a/src/views/MicroExhibition/component/BottomBorder.vue b/src/views/MicroExhibition/component/BottomBorder.vue new file mode 100644 index 0000000..8935dde --- /dev/null +++ b/src/views/MicroExhibition/component/BottomBorder.vue @@ -0,0 +1,131 @@ + + + + + + diff --git a/src/views/MicroExhibition/component/Header.vue b/src/views/MicroExhibition/component/Header.vue new file mode 100644 index 0000000..f0d1b83 --- /dev/null +++ b/src/views/MicroExhibition/component/Header.vue @@ -0,0 +1,112 @@ + + + + + + diff --git a/src/views/MicroExhibition/component/ScrollBoard.vue b/src/views/MicroExhibition/component/ScrollBoard.vue new file mode 100644 index 0000000..1c02cf5 --- /dev/null +++ b/src/views/MicroExhibition/component/ScrollBoard.vue @@ -0,0 +1,74 @@ + + + + + diff --git a/src/views/MicroExhibition/component/StepItem.vue b/src/views/MicroExhibition/component/StepItem.vue new file mode 100644 index 0000000..8101ebf --- /dev/null +++ b/src/views/MicroExhibition/component/StepItem.vue @@ -0,0 +1,71 @@ + + + + + + diff --git a/src/views/MicroExhibition/images/border.png b/src/views/MicroExhibition/images/border.png new file mode 100644 index 0000000..65830e5 Binary files /dev/null and b/src/views/MicroExhibition/images/border.png differ diff --git a/src/views/MicroExhibition/images/bottom_border.png b/src/views/MicroExhibition/images/bottom_border.png new file mode 100644 index 0000000..ba65b3c Binary files /dev/null and b/src/views/MicroExhibition/images/bottom_border.png differ diff --git a/src/views/MicroExhibition/images/bottom_border1.png b/src/views/MicroExhibition/images/bottom_border1.png new file mode 100644 index 0000000..533c565 Binary files /dev/null and b/src/views/MicroExhibition/images/bottom_border1.png differ diff --git a/src/views/MicroExhibition/images/header.png b/src/views/MicroExhibition/images/header.png new file mode 100644 index 0000000..f87259e Binary files /dev/null and b/src/views/MicroExhibition/images/header.png differ diff --git a/src/views/MicroExhibition/images/hr.png b/src/views/MicroExhibition/images/hr.png new file mode 100644 index 0000000..f64a4d7 Binary files /dev/null and b/src/views/MicroExhibition/images/hr.png differ diff --git a/src/views/MicroExhibition/images/step_item.png b/src/views/MicroExhibition/images/step_item.png new file mode 100644 index 0000000..ee6317e Binary files /dev/null and b/src/views/MicroExhibition/images/step_item.png differ diff --git a/src/views/MicroExhibition/index.vue b/src/views/MicroExhibition/index.vue index 49adda1..ceb007c 100644 --- a/src/views/MicroExhibition/index.vue +++ b/src/views/MicroExhibition/index.vue @@ -1,179 +1,110 @@ + @@ -208,7 +132,7 @@ onUnmounted(() => { height: 1080px; width: 1920px; color: #FFFFFF; - background-color: #0E0E0E; + background-color: rgba(0, 11, 18, 1); position: relative; } @@ -228,199 +152,89 @@ onUnmounted(() => { box-sizing: border-box; } -.left, +.left { + width: 540px; + height: 100%; + margin-left: 13px; + display: flex; + flex-direction: column; + justify-content: space-between; + align-items: center; +} + +.ltop { + width: 100%; + height: 630px; +} + +.lbottom { + width: 100%; + height: 335px; +} + .right { - height: 980px; - width: 600px; + width: 1330px; + height: 100%; + margin-right: 13px; display: flex; flex-direction: column; justify-content: space-between; + align-items: center; } -.center { - width: 670px; - height: 980px; - margin: 0 20px; - display: flex; - flex-direction: column; - justify-content: space-between; -} - -.lt, -.rt { +.rtop { width: 100%; - height: 450px; -} - -.lb, -.rb { - width: 100%; - height: 530px; -} - -.ct { - width: 100%; - height: 110px; + height: 715px; display: flex; flex-direction: row; - justify-content: space-around; + justify-content: space-between; + align-items: center; } -.cc { +.rbottom { width: 100%; - height: 350px; + height: 250px; } -.cb { - width: 100%; - height: 500px; -} - -.top-item { - width: 30%; +.rtleft { + width: 777px; height: 100%; - background-image: url(@/assets/img/u8.png); - background-size: 100% 100%; - box-sizing: border-box; - padding: 5px; + display: flex; + flex-direction: column; + justify-content: space-between; + align-items: center; } -.top-item .div_p { - height: 60%; +.rtltop { width: 100%; + height: 120px; + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; +} + +.rtlbottom { + width: 100%; + height: 580px; display: flex; justify-content: center; align-items: center; - position: relative; + /* background-image: url('./images/border.png'); + background-repeat: no-repeat; + background-size: 100% 100%; + box-sizing: border-box; + padding: 10px; */ } -.div_p .div-p-tip { - position: absolute; - font-size: 1.5rem; - top: 10%; - left: 20%; -} - -h2 { - /* color: #fff; */ - font-size: 18px; - line-height: 1.5rem; - color: #02C1D7; -} - -.on { - color: #20AEC5; - font-size: 3.5rem; -} - -.off { - color: #797979; - font-size: 3.5rem; -} - -.left-tip-type { - position: absolute; - top: 69px; - left: 462px; - width: 160px; - height: 50px; - display: flex; - justify-content: space-between; - align-items: center; - font-size: 14px; - font-weight: 700; -} - -.left-tip-type-item { - width: 33%; +.rtlbottom .video { + width: 100%; height: 100%; - display: flex; - flex-direction: column; - justify-content: space-between; - align-items: center; + object-fit: fill; } -.yuan { - width: 24px; - height: 24px; - border-radius: 50%; -} - -.green { - background-color: #7CFFB2; -} - -.yello { - background-color: #FDDD60; -} - -.red { - background-color: #FF6E76; -} - -.blue { - color: #20AEC5; -} - -.err { - color: #FF6E76; -} - -.right-tip-type { - position: absolute; - top: 15px; - left: 1550px; - width: 120px; - height: 70px; - display: flex; - justify-content: space-between; - align-items: center; -} - -.right-tip-type-item { - width: 58px; +.rtright { + width: 540px; height: 100%; - display: flex; - flex-direction: column; - justify-content: space-between; - align-items: center; -} - -.gatway { - font-size: 42px; -} - - -.wrap { - position: absolute; - top: 2px; - left: 582px; - width: 537px; - border-bottom: 0px solid transparent; - border-top: 92px solid #0E1D2F; - border-left: 109px solid transparent; - border-right: 110px solid transparent; -} - -.dev-center { - width: 3px; - height: 60px; - background-image: linear-gradient(to bottom, #2869E8, #00D0FF); - background-color: #5067BC; - transform: rotate(40deg) translate(7px, -6px); -} - -.dev-top { - transform: translate(-6px, -10px); - font-size: 30px; -} - -.dev-bottom { - transform: translate(15px, 15px); - font-size: 30px; -} -.left-tip-type-item-text { - font-weight: 700; - font-size: 14px; } diff --git a/src/views/MicroExhibition/indexOld.vue b/src/views/MicroExhibition/indexOld.vue new file mode 100644 index 0000000..49adda1 --- /dev/null +++ b/src/views/MicroExhibition/indexOld.vue @@ -0,0 +1,426 @@ + + + + + + diff --git a/src/views/legionProducts/chart/scrollBoard.vue b/src/views/legionProducts/chart/scrollBoard.vue index dd162ec..993e348 100644 --- a/src/views/legionProducts/chart/scrollBoard.vue +++ b/src/views/legionProducts/chart/scrollBoard.vue @@ -1,24 +1,24 @@