diff --git a/.env.development b/.env.development index 000102f..3c96a29 100644 --- a/.env.development +++ b/.env.development @@ -46,7 +46,7 @@ VITE_API_URL = 'http://192.168.34.221:9111' #雄哥本地 # 包头化工 # VITE_API_URL = 'http://jxj.zhgdyun.com:18000' # 大连金笔 -VITE_API_URL = 'http://101.43.164.214:11126' +# VITE_API_URL = 'http://101.43.164.214:11126' # 上传 VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url=' diff --git a/package-lock.json b/package-lock.json index f8d8cdc..e75f586 100644 --- a/package-lock.json +++ b/package-lock.json @@ -45,7 +45,6 @@ "print-js": "^1.6.0", "qs": "^6.11.0", "sortablejs": "^1.15.0", - "vite-plugin-optimizer": "^1.4.3", "vue": "^3.2.47", "vue-i18n": "^9.1.9", "vue-router": "^4.1.6", @@ -96,6 +95,7 @@ "vite-plugin-eslint": "^1.6.0", "vite-plugin-html": "^3.2.0", "vite-plugin-mars3d": "^2.1.0", + "vite-plugin-optimizer": "^1.4.3", "vite-plugin-svg-icons": "^2.0.1", "vite-plugin-vue-setup-extend-plus": "^0.1.0", "vue-tsc": "^1.0.24" @@ -16005,7 +16005,8 @@ "node_modules/vite-plugin-optimizer": { "version": "1.4.3", "resolved": "https://registry.npmmirror.com/vite-plugin-optimizer/-/vite-plugin-optimizer-1.4.3.tgz", - "integrity": "sha512-m1AFakemDxSNIwxsTYykBFuQxkKJLI8207RNAg33N5km2aE29cP+Jt41xbfdrALOU2VKYWGFlBz64GMbIser4A==" + "integrity": "sha512-m1AFakemDxSNIwxsTYykBFuQxkKJLI8207RNAg33N5km2aE29cP+Jt41xbfdrALOU2VKYWGFlBz64GMbIser4A==", + "dev": true }, "node_modules/vite-plugin-svg-icons": { "version": "2.0.1", @@ -28280,7 +28281,8 @@ "vite-plugin-optimizer": { "version": "1.4.3", "resolved": "https://registry.npmmirror.com/vite-plugin-optimizer/-/vite-plugin-optimizer-1.4.3.tgz", - "integrity": "sha512-m1AFakemDxSNIwxsTYykBFuQxkKJLI8207RNAg33N5km2aE29cP+Jt41xbfdrALOU2VKYWGFlBz64GMbIser4A==" + "integrity": "sha512-m1AFakemDxSNIwxsTYykBFuQxkKJLI8207RNAg33N5km2aE29cP+Jt41xbfdrALOU2VKYWGFlBz64GMbIser4A==", + "dev": true }, "vite-plugin-svg-icons": { "version": "2.0.1", diff --git a/package.json b/package.json index 067533c..f4fcca2 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,6 @@ "print-js": "^1.6.0", "qs": "^6.11.0", "sortablejs": "^1.15.0", - "vite-plugin-optimizer": "^1.4.3", "vue": "^3.2.47", "vue-i18n": "^9.1.9", "vue-router": "^4.1.6", @@ -108,6 +107,7 @@ "vite-plugin-eslint": "^1.6.0", "vite-plugin-html": "^3.2.0", "vite-plugin-mars3d": "^2.1.0", + "vite-plugin-optimizer": "^1.4.3", "vite-plugin-svg-icons": "^2.0.1", "vite-plugin-vue-setup-extend-plus": "^0.1.0", "vue-tsc": "^1.0.24" diff --git a/src/assets/images/mapimg/Frame.png b/src/assets/images/mapimg/Frame.png new file mode 100644 index 0000000..6057806 Binary files /dev/null and b/src/assets/images/mapimg/Frame.png differ diff --git a/src/assets/images/mapimg/Group 1000015760.png b/src/assets/images/mapimg/Group 1000015760.png new file mode 100644 index 0000000..2904bb4 Binary files /dev/null and b/src/assets/images/mapimg/Group 1000015760.png differ diff --git a/src/assets/images/mapimg/Group 1000015762.png b/src/assets/images/mapimg/Group 1000015762.png new file mode 100644 index 0000000..af72854 Binary files /dev/null and b/src/assets/images/mapimg/Group 1000015762.png differ diff --git a/src/assets/images/mapimg/Group 1000015780.png b/src/assets/images/mapimg/Group 1000015780.png new file mode 100644 index 0000000..afb141d Binary files /dev/null and b/src/assets/images/mapimg/Group 1000015780.png differ diff --git a/src/assets/images/mapimg/Group 1000015795.png b/src/assets/images/mapimg/Group 1000015795.png new file mode 100644 index 0000000..78ac581 Binary files /dev/null and b/src/assets/images/mapimg/Group 1000015795.png differ diff --git a/src/assets/images/mapimg/Group 1000015799.png b/src/assets/images/mapimg/Group 1000015799.png new file mode 100644 index 0000000..a4cdd8d Binary files /dev/null and b/src/assets/images/mapimg/Group 1000015799.png differ diff --git a/src/assets/images/mapimg/Group 1000015822.png b/src/assets/images/mapimg/Group 1000015822.png new file mode 100644 index 0000000..78ac581 Binary files /dev/null and b/src/assets/images/mapimg/Group 1000015822.png differ diff --git a/src/assets/images/mapimg/Group 1000015823.png b/src/assets/images/mapimg/Group 1000015823.png new file mode 100644 index 0000000..0147391 Binary files /dev/null and b/src/assets/images/mapimg/Group 1000015823.png differ diff --git a/src/assets/images/mapimg/Group 4064.png b/src/assets/images/mapimg/Group 4064.png new file mode 100644 index 0000000..04cb56e Binary files /dev/null and b/src/assets/images/mapimg/Group 4064.png differ diff --git a/src/assets/images/mapimg/Group 4225.png b/src/assets/images/mapimg/Group 4225.png new file mode 100644 index 0000000..664f96e Binary files /dev/null and b/src/assets/images/mapimg/Group 4225.png differ diff --git a/src/assets/images/mapimg/Rectangle 34624241.png b/src/assets/images/mapimg/Rectangle 34624241.png new file mode 100644 index 0000000..56eae42 Binary files /dev/null and b/src/assets/images/mapimg/Rectangle 34624241.png differ diff --git a/src/assets/images/mapimg/image 66.png b/src/assets/images/mapimg/image 66.png new file mode 100644 index 0000000..e64d466 Binary files /dev/null and b/src/assets/images/mapimg/image 66.png differ diff --git a/src/assets/images/mapimg/头部右.png b/src/assets/images/mapimg/头部右.png new file mode 100644 index 0000000..14c0a52 Binary files /dev/null and b/src/assets/images/mapimg/头部右.png differ diff --git a/src/assets/images/mapimg/实时视频.png b/src/assets/images/mapimg/实时视频.png new file mode 100644 index 0000000..4546cd6 Binary files /dev/null and b/src/assets/images/mapimg/实时视频.png differ diff --git a/src/assets/images/mapimg/编组.png b/src/assets/images/mapimg/编组.png new file mode 100644 index 0000000..354f82f Binary files /dev/null and b/src/assets/images/mapimg/编组.png differ diff --git a/src/routers/modules/staticRouter.ts b/src/routers/modules/staticRouter.ts index d0cedfd..4baa9e2 100644 --- a/src/routers/modules/staticRouter.ts +++ b/src/routers/modules/staticRouter.ts @@ -87,6 +87,11 @@ export const staticRouter: RouteRecordRaw[] = [ name: "工程概况", component: () => import("@/views/sevenLargeScreen/comprehensiveManage/projectOverview/index.vue") }, + { + path: "/projectOverviewer", + name: "工程概况-1", + component: () => import("@/views/sevenLargeScreen/comprehensiveManage/projectOverview/indexer.vue") + }, { path: "/smartPartyBuilding", name: "智慧党建", @@ -124,6 +129,12 @@ export const staticRouter: RouteRecordRaw[] = [ name: "智能安全帽", component: () => import("@/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue") }, + { + path: "/smartSafeHater", + // path: "/carPosition", + name: "新智能安全帽", + component: () => import("@/views/sevenLargeScreen/digitalConstruction/smartSafeHat/indexer.vue") + }, { path: "/edgeProtection", name: "临边防护网", diff --git a/src/stores/modules/map3D.ts b/src/stores/modules/map3D.ts new file mode 100644 index 0000000..7e931c2 --- /dev/null +++ b/src/stores/modules/map3D.ts @@ -0,0 +1,30 @@ +import { defineStore, createPinia } from "pinia" +// import piniaPluginPersistedstate from "pinia-plugin-persistedstate"; + +// 定义 MapViewdata 的类型 +interface MapViewdata { + Mapswitch: boolean; +} + +export const MapViewdata = defineStore({ + id: "MapViewdata", + + // 数据 + state: (): MapViewdata => ({ + Mapswitch: true + }), + + // 方法 + actions: { + async toggleMapSwitch() { + this.Mapswitch = !this.Mapswitch; + } + } + +}) + +// piniaPersist(持久化) +// const pinia = createPinia(); +// pinia.use(piniaPluginPersistedstate); + +// export default pinia; \ No newline at end of file diff --git a/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/centerTop.vue b/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/centerTop.vue index 2ef733c..d8f0da8 100644 --- a/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/centerTop.vue +++ b/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/centerTop.vue @@ -8,9 +8,7 @@ v-for="(item, index) in topText2" :key="item.id" @click="activeBtn(item, index)" - > - {{ item.title }} - + >{{ item.title }}
- {{ item.title }} -
+ >{{ item.title }}
- +
+ :name="index" + :poster="''" + :deviceIp="`http://${item.account}:${item.password}`" + :videoUrls="item.serialNumber" + :autoPlay="true" + >
-
+
更换图片 - +
+ + + diff --git a/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/indexer.vue b/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/indexer.vue new file mode 100644 index 0000000..02c1ff0 --- /dev/null +++ b/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/indexer.vue @@ -0,0 +1,140 @@ + + + + diff --git a/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/indexer.vue b/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/indexer.vue new file mode 100644 index 0000000..f67724a --- /dev/null +++ b/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/indexer.vue @@ -0,0 +1,2869 @@ + + + + + + + + + diff --git a/src/views/sevenLargeScreen/indexL.vue b/src/views/sevenLargeScreen/indexL.vue index fef5a0a..9ef49d1 100644 --- a/src/views/sevenLargeScreen/indexL.vue +++ b/src/views/sevenLargeScreen/indexL.vue @@ -1,5 +1,12 @@ + + \ No newline at end of file diff --git a/src/views/sevenLargeScreen/projectshow/components/MapDialog.vue b/src/views/sevenLargeScreen/projectshow/components/MapDialog.vue new file mode 100644 index 0000000..21a6606 --- /dev/null +++ b/src/views/sevenLargeScreen/projectshow/components/MapDialog.vue @@ -0,0 +1,1275 @@ + + + + + \ No newline at end of file diff --git a/src/views/sevenLargeScreen/projectshow/components/VideoPreview.vue b/src/views/sevenLargeScreen/projectshow/components/VideoPreview.vue new file mode 100644 index 0000000..3c6941b --- /dev/null +++ b/src/views/sevenLargeScreen/projectshow/components/VideoPreview.vue @@ -0,0 +1,253 @@ + + + + + + \ No newline at end of file diff --git a/src/views/sevenLargeScreen/projectshow/components/map.ts b/src/views/sevenLargeScreen/projectshow/components/map.ts new file mode 100644 index 0000000..e69de29 diff --git a/src/views/sevenLargeScreen/projectshow/index.vue b/src/views/sevenLargeScreen/projectshow/index.vue new file mode 100644 index 0000000..6f03e88 --- /dev/null +++ b/src/views/sevenLargeScreen/projectshow/index.vue @@ -0,0 +1,58 @@ + + + + + diff --git a/vite.config.ts b/vite.config.ts index 2dfb6e3..c6051c3 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -15,7 +15,7 @@ import optimizer from "vite-plugin-optimizer"; // import AutoImport from "unplugin-auto-import/vite"; // import Components from "unplugin-vue-components/vite"; // import { ElementPlusResolver } from "unplugin-vue-components/resolvers"; -// import { vitePluginMars3d } from "vite-plugin-mars3d"; +import { vitePluginMars3d } from "vite-plugin-mars3d"; // @see: https://vitejs.dev/config/ // export const BASE_IMAGE_URL = import.meta.env.NODE_ENV === "development" ? "./src" : ""; //在vite.config.ts中增加 @@ -74,7 +74,7 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => { }, plugins: [ vue(), - // vitePluginMars3d(), + vitePluginMars3d(), createHtmlPlugin({ inject: { data: {