Merge branch 'pgsql' of https://github.com/le5le-com/visualization-design into pgsql

public/view/meta2d-react/src/router/index.tsx

@@ -1,5 +1,5 @@
 import { Route, Routes } from "react-router-dom";
-import Meta3d from "../views/3d/Meta3d";
+// import Meta3d from "../views/3d/Meta3d";
 import Meta2dView from "../views/2d/Meta2d";
 
 export default function Router() {
@@ -7,7 +7,7 @@ export default function Router() {
     <Routes>
       <Route path="/" element={<Meta2dView/>} />
       <Route path="/2d" element={<Meta2dView/>} />
-      <Route path="/3d" element={<Meta3d />} />
+      {/* <Route path="/3d" element={<Meta3d />} /> */}
     </Routes>
   );
 }

public/view/meta2d-vue2/src/router/index.js

@@ -17,11 +17,11 @@ const router = new VueRouter({
       name: '2d',
       component: () => import('../views/2d/Meta2d.vue'),
     },
-    {
-      path: '/3d',
-      name: '3d',
-      component: () => import('../views/3d/Meta3d.vue'),
-    },
+    // {
+    //   path: '/3d',
+    //   name: '3d',
+    //   component: () => import('../views/3d/Meta3d.vue'),
+    // },
   ],
 });
 

public/view/meta2d-vue3/src/router/index.ts

@@ -3,7 +3,7 @@ import { createRouter, createWebHistory } from 'vue-router';
 const routes = [
   { path: '/', component: () => import('../views/2d/Meta2d.vue') },
   { path: '/2d', component: () => import('../views/2d/Meta2d.vue') },
-  { path: '/3d', component: () => import('../views/3d/Meta3d.vue') },
+  // { path: '/3d', component: () => import('../views/3d/Meta3d.vue') },
 ];
 const router = createRouter({
   history: createWebHistory('/'),

src/views/components/Header.vue

@@ -412,11 +412,13 @@
         </t-tooltip>
         </div>
    </template>
-   <div class="pay-box pay-diagram">
+   <div class="pay-box pay-diagram" style="font-size: 14px;
+    line-height: 30px;
+    color: #6E7B91;">
     Zip包仅包含数据文件和图片文件，不包含js等依赖库。
-    <div class="title desc">- 注意</div>Zip包用于平台（已包含js等依赖库）的快捷导入导出项目，无法作为独立部署包使用。
+    <div >- 注意</div>Zip包用于平台（已包含js等依赖库）的快捷导入导出项目，无法作为独立部署包使用。
     <p v-if="downloadZipDialog.hasJs">
-      <p class="title desc">- 当前图纸包含js企业图形依赖库。</p>
+      <p>- 当前图纸包含js企业图形依赖库。</p>
       项目中打开如果没有js企业图形依赖库，对应的图元将无法显示。
       推荐下载为离线部署包（包含js企业图形依赖库）。
   </p>
@@ -973,7 +975,6 @@ const preDownloadZip =async () =>{
     svgPens: [],
   });
   downloadZipDialog.checked = true;
-  console.log("payList",payList);
   if(payList.jsPens.length||payList.iotPens.length||payList.svgPens.length){
     downloadZipDialog.hasJs = true;
   }else{
@@ -1227,7 +1228,6 @@ const showPayListDialog = async () => {
   data.goods.forEach((item, index) => {
       price += item.num * item.unitPrice;
   });
-  console.log("goods",data.goods)
   data.payDiagram.price = price;
   // data.goods.forEach((item, index) => {
   //   item.checked = true;
@@ -1550,13 +1550,11 @@ const preFrameDownload = async () => {
   downloadList = getFrameDownloadList(meta2dData,undefined,downloadType,flag_3d);
   if (iframeNum === 0) {
     //如果没有嵌入场景
-    console.log(2);
     saveDownload();
   } else {
     setTimeout(() => {
       if (compareNum < iframeNum) {
         //message阻塞/报错的情况
-        console.log("1")
         saveDownload();
       }
     }, 10000);
@@ -1565,7 +1563,6 @@ const preFrameDownload = async () => {
 
 const saveDownload = async () => {
   const list = [...downloadList];
-  console.log("list",list);
   //控件
   let jsPath= '';
   switch (downloadType) {