Parcourir la source

Merge branch 'master' of http://182.92.126.35:3000/hrx/mky-vent-base

hongrunxia il y a 11 mois
Parent
commit
60fdc1969f

+ 5 - 4
src/views/vent/performance/comment/CADModal.vue

@@ -18,16 +18,17 @@
   </BasicModal>
 </template>
 <script lang="ts" setup>
-  import { ref, triggerRef } from 'vue';
+  import { ref } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { onMounted } from 'vue';
   import CADViewer from '/@/views/vent/performance/fileDetail/commen/CADViewer.vue';
-  import { useGlobSetting } from '/@/hooks/setting';
+  // import { useGlobSetting } from '/@/hooks/setting';
   import { AUTO_LOGIN_URL_QUERY } from '/@/router/constant';
 
-  const { sysOrgCode } = useGlobSetting();
+  // const { sysOrgCode } = useGlobSetting();
   // 不是布尔台的使用 mxcad 模式,是布尔台的使用 iframe 模式以避免“法律风险”
-  const mxcadmode = ref(sysOrgCode !== 'sdmtjtbetmk');
+  const mxcadmode = ref(true);
+  // const mxcadmode = ref(sysOrgCode !== 'sdmtjtbetmk');
 
   // CAD预览器的 DEMO 01 相关代码
   const iframesrc = ref('');

+ 0 - 1
src/views/vent/performance/fileDetail/commen/CADViewer.vue

@@ -41,7 +41,6 @@
   );
 
   onMounted(() => {
-    postMessage('MKY_Open_Mxweb', window.location.origin + '/mxcad/test31.mxweb');
     const route = useRoute();
     if (route.query.id && route.query.filename) {
       // 通过 url query 指定文件 ID 的形式使用该组件