صفحهٔ اصلی گشت‌و‌گذار راهنما
ثبت نام ورود
wangcong
/
visualization-design
1
0
انشعاب 0
پرونده‌ها مشکلات 0 درخواست واکشی 0 ویکی
فهرست منبع

feat:view

ananzhusen 1 سال پیش
والد
1044dceb57
کامیت
6342543a8c
4فایلهای تغییر یافته به همراه149 افزوده شده و 59 حذف شده
نمای یکپارچه نمایش آمار تفاوت ها
  1. 0 0
      public/view/assets/index.js
  2. 65 8
      public/view/index.html
  3. 72 44
      src/services/download.ts
  4. 12 7
      src/views/components/Header.vue

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
public/view/assets/index.js


+ 65 - 8
public/view/index.html
مشاهده فایل 

@@ -2,7 +2,7 @@
 
 <html>
 
 <html>
 
   <head>
 
   <head>
 
     <meta charset="UTF-8" />
 
     <meta charset="UTF-8" />
 
-    <link rel="icon" href="/view/favicon.ico" />
 
+    <link rel="icon" href="./favicon.ico" />
 
     <meta content="yes" name="apple-mobile-web-app-capable" />
 
     <meta content="yes" name="apple-mobile-web-app-capable" />
 
     <meta content="yes" name="apple-touch-fullscreen" />
 
     <meta content="yes" name="apple-touch-fullscreen" />
 
     <meta content="telephone=no,email=no" name="format-detection" />
 
     <meta content="telephone=no,email=no" name="format-detection" />
 
@@ -19,16 +19,56 @@
 
       content="乐吾乐le5le可视化是一个集动态交互、丰富展示、数据管理等一体的全功能智能可视化平台，为物联网、工业互联网、电力能源、水利工程、智慧农业、智慧医疗、智慧城市等智能可视化场景而生。"
 
       content="乐吾乐le5le可视化是一个集动态交互、丰富展示、数据管理等一体的全功能智能可视化平台，为物联网、工业互联网、电力能源、水利工程、智慧农业、智慧医疗、智慧城市等智能可视化场景而生。"
 
     />
 
     />
 
 
 
-    <link rel="stylesheet" href="/view/css/index.css?v=1" />
 
+    <link rel="stylesheet" href="./css/index.css" />
 
+    <style>
 
+      .dialog {
 
+        display: none;
 
+        position: fixed;
 
+        z-index: 9999;
 
+        top: 0;
 
+        left: 0;
 
+        width: 100%;
 
+        height: 100%;
 
+        background-color: rgba(0, 0, 0, 0.5);
 
+      }
 
 
 
+      .dialog iframe {
 
+        position: absolute;
 
+        top: 50%;
 
+        left: 50%;
 
+        transform: translate(-50%, -50%);
 
+        width: 80%;
 
+        height: 80%;
 
+      }
 
+
 
+      .dialog .close {
 
+        position: absolute;
 
+        top: 10px;
 
+        right: 10px;
 
+        font-size: 24px;
 
+        cursor: pointer;
 
+        color: #fff;
 
+      }
 
+
 
+    </style>
 
     <title>乐吾乐可视化</title>
 
     <title>乐吾乐可视化</title>
 
-    <script type="module" crossorigin src="/view/assets/index.js"></script>
 
-    <link rel="stylesheet" crossorigin href="/view/assets/index.css">
 
+    <script type="module" crossorigin src="./assets/index.js"></script>
 
+    <link rel="stylesheet" crossorigin href="./assets/index.css">
 
   </head>
 
   </head>
 
 
 
   <body>
 
   <body>
 
     <div id="app"></div>
 
     <div id="app"></div>
 
-
 
+    <div class="back-button" id="back-ops">
 
+      <svg class="more" height="24" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6943" width="200" height="200"><path d="M624.788992 204.047974 585.205965 164.464026 219.560038 530.185011 585.205965 895.864013 624.788992 856.280986 298.663014 530.16105Z" p-id="6944"></path></svg>
 
+    </div>
 
+    <div class="lock" id="lock">
 
+      <svg class="unlock" t="1712916992634" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4296" width="16" height="16"><path d="M768.25422 0q48.810328 0 94.061569 18.303873t80.333664 50.33565 56.436941 74.740814 21.354518 91.519364l0 150.49851-123.042701 0 0-122.025819q0-64.063555-36.099305-99.654419t-97.112214-35.590864q-54.911619 0-88.468719 35.590864t-33.5571 99.654419l0 124.059583-128.12711 0 0-152.532274q0-48.810328 19.320755-91.519364t53.386296-74.740814 80.333664-50.33565 101.179742-18.303873zM766.220457 693.513406l0 87.451837 0 47.793446q0 27.455809-9.660377 51.860973t-26.438928 41.692155-39.658391 27.455809-50.33565 10.168818l-514.542205 0q-27.455809 0-49.82721-9.660377t-38.641509-26.438928-24.913605-39.14995-8.643496-47.793446l0-323.368421q0-28.472691 19.829196-47.793446t46.268123-19.320755l629.449851 0q28.472691 0 47.793446 19.320755t19.320755 47.793446l0 179.988083z" p-id="4297" fill="#e6e6e6"></path></svg>
 
+      <svg class="locked" t="1712917017184" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4494" width="16" height="16"><path d="M385.150849 385.662338l-128.895105 0 0-150.377622q0-49.102897 19.436563-91.556444t53.706294-74.677323 80.815185-50.637363 101.786214-18.413586q49.102897 0 94.625375 18.413586t80.815185 50.637363 56.263736 74.677323 20.971029 91.556444l0 150.377622-123.78022 0 0-121.734266q0-64.447552-35.804196-99.74026t-97.182817-35.292707q-55.240759 0-88.999001 35.292707t-33.758242 99.74026l0 121.734266zM826.053946 447.040959q27.62038 0 47.568432 19.948052t19.948052 47.568432l0 317.122877q0 27.62038-9.718282 51.66034t-26.597403 41.942058-39.896104 28.131868-50.637363 10.22977l-516.603397 0q-27.62038 0-50.125874-10.22977t-38.361638-27.108891-24.551449-39.384615-8.695305-48.07992l0-324.283716q0-27.62038 19.436563-47.568432t47.056943-19.948052l61.378621 0 128.895105 0 255.744256 0 123.78022 0 61.378621 0z" p-id="4495" fill="#e6e6e6"></path></svg>
 
+    </div>
 
+    <div id="dialog" class="dialog">
 
+      <span class="close" onclick="closeDialog()">&times;</span>
 
+      <iframe id="pay-iframe" src="javascript:void(0);" frameborder="0"></iframe>
 
+    </div>
 
     <div class="message-wrap" id="message-wrap">
 
     <div class="message-wrap" id="message-wrap">
 
       <div class="body">
 
       <div class="body">
 
         <svg
 
         <svg
 
@@ -36,7 +76,7 @@
 
           viewBox="0 0 16 16"
 
           viewBox="0 0 16 16"
 
           width="1em"
 
           width="1em"
 
           height="1em"
 
           height="1em"
 
-          class="t-icon t-icon-error-circle-filled"
 
+          class="t-icon t-icon-error-circle-filled error"
 
         >
 
         >
 
           <path
 
           <path
 
             fill="currentColor"
 
             fill="currentColor"
 
@@ -44,6 +84,8 @@
 
             fill-opacity="0.9"
 
             fill-opacity="0.9"
 
           ></path>
 
           ></path>
 
         </svg>
 
         </svg>
 
+        <svg fill="none" viewBox="0 0 24 24" width="1em" height="1em" class="t-icon t-icon-error-circle-filled warn"><path fill="currentColor" d="M12 1a11 11 0 110 22 11 11 0 010-22zm-1 13h2V6.5h-2V14zm2 1.5h-2v2h2v-2z"></path></svg>
 
+        <svg fill="none" viewBox="0 0 24 24" width="1em" height="1em" class="t-icon t-icon-check-circle-filled success"><path fill="currentColor" d="M12 23a11 11 0 100-22 11 11 0 000 22zM7.5 10.59l3 3 6-6L17.91 9l-7.41 7.41L6.09 12l1.41-1.41z"></path></svg>
 
         <div id="message-text">这是一个消息</div>
 
         <div id="message-text">这是一个消息</div>
 
       </div>
 
       </div>
 
     </div>
 
     </div>
 
@@ -56,11 +98,26 @@
 
         <button id="login-btn">登录</button>
 
         <button id="login-btn">登录</button>
 
       </div>
 
       </div>
 
     </div>
 
     </div>
 
+    <script src="./js/jweixin-1.6.0.js"></script>
 
     <script>
 
     <script>
 
       window.name = document.title;
 
       window.name = document.title;
 
+      function closeDialog() {
 
+        var dialog = document.getElementById("dialog");
 
+        dialog.style.display = "none";
 
+      };
 
+      pushHistory();
 
+      window.addEventListener("popstate", function (e) {
 
+        WeixinJSBridge.call('closeWindow');
 
+        wx.miniProgram.navigateBack({delta:1});
 
+      }, false);
 
+      function pushHistory() {
 
+        var state = {
 
+          title: "title",
 
+          url: "#"
 
+        };
 
+        window.history.pushState(state, state.title, state.url);
 
+      }
 
     </script>
 
     </script>
 
-    <script src="/view/js/测试图形库.js"></script>
 
-    <script src="https://res.wx.qq.com/open/js/jweixin-1.6.0.js"></script>
 
 
 
   </body>
 
   </body>
 
 </html>
 
 </html>

+ 72 - 44
src/services/download.ts
مشاهده فایل 

@@ -72,7 +72,7 @@ export const getDownloadList = (meta2dData: any, path: string = 'v') => {
 
         url: img,
 
         url: img,
 
         path: `/view/projects/assets` + _img,
 
         path: `/view/projects/assets` + _img,
 
       });
 
       });
 
-      meta2dData.bkImage = `/view/projects/assets` + _img;
 
+      meta2dData.bkImage = `projects/assets` + _img;
 
     }
 
     }
 
   }
 
   }
 
 
 
@@ -100,7 +100,7 @@ export const getDownloadList = (meta2dData: any, path: string = 'v') => {
 
               path: `/view/projects/assets` + _img,
 
               path: `/view/projects/assets` + _img,
 
             });
 
             });
 
           }
 
           }
 
-          pen[i] = `/view/projects/assets` + _img;
 
+          pen[i] = `projects/assets` + _img;
 
         }
 
         }
 
       }
 
       }
 
     }
 
     }
 
@@ -720,7 +720,33 @@ export const getFrameDownloadList =(meta2dData: any, path: string = 'v',type:Fra
 
   if(path === 'v'){ //iframe嵌入的页面无需再次下载
 
   if(path === 'v'){ //iframe嵌入的页面无需再次下载
 
     //其他文件
 
     //其他文件
 
     let files = [];
 
     let files = [];
 
-    let files_3d = [];
 
+    let files_3d = [
 
+      '/view/index.html',
 
+      '/view/favicon.ico',
 
+      '/view/view.conf',
 
+      '/view/离线部署包使用说明.pdf',
 
+
 
+      '/view/css/index.css',
 
+
 
+      '/view/assets/index.js',
 
+      '/view/assets/index.css',
 
+      '/view/assets/cloudy.env',
 
+      '/view/assets/default.env',
 
+      '/view/assets/dusk.env',
 
+      '/view/assets/night.env',
 
+      '/view/assets/sunny.env',
 
+      '/view/assets/cloudy.jpg',
 
+      '/view/assets/dusk.jpg',
 
+      '/view/assets/night.jpg',
 
+      '/view/assets/sunny.jpg',
 
+      '/view/assets/luopan.png',
 
+      '/view/assets/Rain.png',
 
+      '/view/assets/zhizhen.png',
 
+      '/view/assets/默认环境光.png',
 
+      '/view/assets/draco_decoder_gltf.js',
 
+      '/view/assets/draco_wasm_wrapper_gltf.js',
 
+      '/view/assets/draco_decoder_gltf.wasm',
 
+    ];
 
     switch (type) {
 
     switch (type) {
 
       case Frame.vue3:
 
       case Frame.vue3:
 
         files =[
 
         files =[
 
@@ -736,19 +762,19 @@ export const getFrameDownloadList =(meta2dData: any, path: string = 'v',type:Fra
 
           '/view/meta2d-vue3/tsconfig.node.json',
 
           '/view/meta2d-vue3/tsconfig.node.json',
 
           '/view/meta2d-vue3/vite.config.ts',
 
           '/view/meta2d-vue3/vite.config.ts',
 
         ];
 
         ];
 
-        if(flag_3d){
 
-          //存在3d场景
 
-          files_3d.push(...[
 
-            '/meta2d-vue3/src/plugins/meta3d/index.ts',
 
-            '/meta2d-vue3/src/plugins/meta3d/meta3d.css',
 
-            '/meta2d-vue3/src/plugins/meta3d/meta3d.js',
 
-            // '/view/meta2d-vue3/src/views/3d/Meta3d.vue',
 
-            // '/meta2d-vue3/public/meta3d/js/draco_decoder_gltf.js',
 
-            // '/meta2d-vue3/public/meta3d/js/draco_decoder_gltf.wasm',
 
-            // '/meta2d-vue3/public/meta3d/js/draco_wasm_wrapper_gltf.js',
 
-          ]);
 
-          files.push( '/view/meta2d-vue3/src/views/3d/Meta3d.vue',)
 
-        }
 
+        // if(flag_3d){
 
+        //   //存在3d场景
 
+        //   files_3d.push(...[
 
+        //     '/meta2d-vue3/src/plugins/meta3d/index.ts',
 
+        //     '/meta2d-vue3/src/plugins/meta3d/meta3d.css',
 
+        //     '/meta2d-vue3/src/plugins/meta3d/meta3d.js',
 
+        //     // '/view/meta2d-vue3/src/views/3d/Meta3d.vue',
 
+        //     // '/meta2d-vue3/public/meta3d/js/draco_decoder_gltf.js',
 
+        //     // '/meta2d-vue3/public/meta3d/js/draco_decoder_gltf.wasm',
 
+        //     // '/meta2d-vue3/public/meta3d/js/draco_wasm_wrapper_gltf.js',
 
+        //   ]);
 
+        //   files.push( '/view/meta2d-vue3/src/views/3d/Meta3d.vue',)
 
+        // }
 
         break;
 
         break;
 
       case Frame.vue2:
 
       case Frame.vue2:
 
           files =[
 
           files =[
 
@@ -762,19 +788,19 @@ export const getFrameDownloadList =(meta2dData: any, path: string = 'v',type:Fra
 
             '/view/meta2d-vue2/vite.config.js'
 
             '/view/meta2d-vue2/vite.config.js'
 
           ];
 
           ];
 
 
 
-          if(flag_3d){
 
-            files_3d.push(...[
 
-              '/meta2d-vue2/src/plugins/meta3d/index.js',
 
-              '/meta2d-vue2/src/plugins/meta3d/meta3d.css',
 
-              '/meta2d-vue2/src/plugins/meta3d/meta3d.js',
 
-              // '/meta2d-vue2/src/views/3d/Meta3d.vue',
 
-              // '/meta2d-vue2/public/meta3d/js/draco_decoder_gltf.js',
 
-              // '/meta2d-vue2/public/meta3d/js/draco_decoder_gltf.wasm',
 
-              // '/meta2d-vue2/public/meta3d/js/draco_wasm_wrapper_gltf.js',
 
-            ]);
 
-            files.push( '/view/meta2d-vue2/src/views/3d/Meta3d.vue',)
 
-          }
 
-          break;
 
+          // if(flag_3d){
 
+          //   files_3d.push(...[
 
+          //     '/meta2d-vue2/src/plugins/meta3d/index.js',
 
+          //     '/meta2d-vue2/src/plugins/meta3d/meta3d.css',
 
+          //     '/meta2d-vue2/src/plugins/meta3d/meta3d.js',
 
+          //     // '/meta2d-vue2/src/views/3d/Meta3d.vue',
 
+          //     // '/meta2d-vue2/public/meta3d/js/draco_decoder_gltf.js',
 
+          //     // '/meta2d-vue2/public/meta3d/js/draco_decoder_gltf.wasm',
 
+          //     // '/meta2d-vue2/public/meta3d/js/draco_wasm_wrapper_gltf.js',
 
+          //   ]);
 
+          //   files.push( '/view/meta2d-vue2/src/views/3d/Meta3d.vue',)
 
+          // }
 
+          // break;
 
       case Frame.react:
 
       case Frame.react:
 
         files =[
 
         files =[
 
           '/view/meta2d-react/src/router/index.tsx',
 
           '/view/meta2d-react/src/router/index.tsx',
 
@@ -789,19 +815,19 @@ export const getFrameDownloadList =(meta2dData: any, path: string = 'v',type:Fra
 
           '/view/meta2d-react/tsconfig.node.json',
 
           '/view/meta2d-react/tsconfig.node.json',
 
           '/view/meta2d-react/vite.config.ts',
 
           '/view/meta2d-react/vite.config.ts',
 
         ];
 
         ];
 
-        if(flag_3d){
 
-          files_3d.push(...[
 
-            '/meta2d-react/src/plugins/meta3d/index.ts',
 
-            '/meta2d-react/src/plugins/meta3d/meta3d.css',
 
-            '/meta2d-react/src/plugins/meta3d/meta3d.js',
 
-            // '/meta2d-react/src/views/3d/Meta3d.tsx',
 
-            // '/meta2d-react/public/meta3d/js/draco_decoder_gltf.js',
 
-            // '/meta2d-react/public/meta3d/js/draco_decoder_gltf.wasm',
 
-            // '/meta2d-react/public/meta3d/js/draco_wasm_wrapper_gltf.js',
 
-          ]);
 
-          files.push('/view/meta2d-react/src/views/3d/Meta3d.tsx',)
 
-        }
 
-        break;
 
+        // if(flag_3d){
 
+        //   files_3d.push(...[
 
+        //     '/meta2d-react/src/plugins/meta3d/index.ts',
 
+        //     '/meta2d-react/src/plugins/meta3d/meta3d.css',
 
+        //     '/meta2d-react/src/plugins/meta3d/meta3d.js',
 
+        //     // '/meta2d-react/src/views/3d/Meta3d.tsx',
 
+        //     // '/meta2d-react/public/meta3d/js/draco_decoder_gltf.js',
 
+        //     // '/meta2d-react/public/meta3d/js/draco_decoder_gltf.wasm',
 
+        //     // '/meta2d-react/public/meta3d/js/draco_wasm_wrapper_gltf.js',
 
+        //   ]);
 
+        //   files.push('/view/meta2d-react/src/views/3d/Meta3d.tsx',)
 
+        // }
 
+        // break;
 
       default:
 
       default:
 
         break;
 
         break;
 
     }
 
     }
 
@@ -815,8 +841,10 @@ export const getFrameDownloadList =(meta2dData: any, path: string = 'v',type:Fra
 
     if(flag_3d){
 
     if(flag_3d){
 
       files_3d.forEach((file) => {
 
       files_3d.forEach((file) => {
 
         lists.add({
 
         lists.add({
 
-          url: (cdn ? cdn + '/v' : import.meta.env.BASE_URL.slice(0, -1)) + '/view/meta3d/'+file.split('/meta3d/')[1],
 
-          path: file,
 
+          // url: (cdn ? cdn + '/v' : import.meta.env.BASE_URL.slice(0, -1)) + '/view/meta3d/'+file.split('/meta3d/')[1],
 
+          // path: file,
 
+          url: (cdn ? cdn : '') + file,
 
+          path: `/${folderName}/public${file}`,
 
         });
 
         });
 
       })
 
       })
 
     }
 
     }

+ 12 - 7
src/views/components/Header.vue
مشاهده فایل 

@@ -670,8 +670,11 @@ const dealWithMessage = async (e) => {
 
           }else{

           }else{

             let folderName =downloadType===Frame.vue3?'meta2d-vue3':downloadType===Frame.vue2?'meta2d-vue2': 'meta2d-react';

             let folderName =downloadType===Frame.vue3?'meta2d-vue3':downloadType===Frame.vue2?'meta2d-vue2': 'meta2d-react';

             list.forEach((item) => {

             list.forEach((item) => {

-              if(item.path.startsWith('/meta3d/')){

-                item.path = `/${folderName}/public/${item.path}`;

+              // if(item.path.startsWith('/meta3d/')){

+              //   item.path = `/${folderName}/public/${item.path}`;

+              // }

+              if(item.path.startsWith('/vue3/')||item.path.startsWith('/vue2/')||item.path.startsWith('/react/')){

+                item.path = item.path.replace('vue3',folderName).replace('vue2',folderName).replace('react',folderName);

               }

               }

             });

             });

             downloadList = new Set([...downloadList, ...list]);

             downloadList = new Set([...downloadList, ...list]);

@@ -1691,7 +1694,7 @@ const preDownload =() => {
 
         }),

         }),

         '*'

         '*'

       );

       );

-      pen_3d[0].iframe = '/view?data=3d';

+      pen_3d[0].iframe ='view/index.html?data=3d';// '/view?data=3d';

     } else {

     } else {

       pen_3d.forEach((pen) => {

       pen_3d.forEach((pen) => {

         //发送消息

         //发送消息

@@ -1708,7 +1711,7 @@ const preDownload =() => {
 
           }),

           }),

           '*'

           '*'

         );

         );

-        pen.iframe = `/view?data=3d-${params.id}`;

+        pen.iframe = `view/index.html?data=3d-${params.id}`;//`/view?data=3d-${params.id}`;

       });

       });

     }

     }

     iframeNum += pen_3d.length;

     iframeNum += pen_3d.length;

@@ -1829,7 +1832,7 @@ const preFrameDownload = async () => {
 
         }),

         }),

         '*'

         '*'

       );

       );

-      pen_3d[0].iframe = '/3d?id=3d';

+      pen_3d[0].iframe = 'view/index.html?data=3d'; //'/3d?id=3d';

     } else {

     } else {

       pen_3d.forEach((pen) => {

       pen_3d.forEach((pen) => {

         //发送消息

         //发送消息

@@ -1846,7 +1849,7 @@ const preFrameDownload = async () => {
 
           }),

           }),

           '*'

           '*'

         );

         );

-        pen.iframe = `/3d?id=3d-${params.id}`;

+        pen.iframe = `view/index.html?data=-${params.id}`; //`/3d?id=3d-${params.id}`;

       });

       });

     }

     }

     iframeNum += pen_3d.length;

     iframeNum += pen_3d.length;

@@ -2102,6 +2105,8 @@ const saveDownload = async () => {
 
     'le5le.meta2d';

     'le5le.meta2d';

   const blob = await zip.generateAsync({ type: 'blob' });

   const blob = await zip.generateAsync({ type: 'blob' });

   saveAs(blob, `${_fileName}.zip`);

   saveAs(blob, `${_fileName}.zip`);

+  MessagePlugin.closeAll();

+  MessagePlugin.success('下载成功，请在浏览器下载列表中查看');

 };

 };

 

 

 // const _downloadHtml = async () => {

 // const _downloadHtml = async () => {

@@ -2789,7 +2794,7 @@ const finishPay = async () => {
 
       doDownloadZip();

       doDownloadZip();

     }else{

     }else{

     payListDialog.show = false;

     payListDialog.show = false;

-    MessagePlugin.info('正在下载打包中，可能需要几分钟，请耐心等待...');

+    MessagePlugin.loading('正在下载打包中，可能需要几分钟，请耐心等待...',0);

     if (downloadType === Frame.html) {

     if (downloadType === Frame.html) {

       preDownload();

       preDownload();

     } else {

     } else {

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است