Merge branch 'dev' of http://182.92.166.109:3000/zhuangyuanke/postdischarge-ui into dev

src/views/manage/Auditing/index.vue

@@ -210,15 +210,13 @@ export default {
     // this.info();
     this.patientId = this.$route.query.patientId
     this.CheckStatus = this.$route.query.routeCheckStatus
-    console.log(this.CheckStatus, 'CheckStatus')
     getByPatientId(this.$route.query.patientId).then(res => {
         res.data.birthDate ? res.data.age = getAge(res.data.birthDate) : ''
         this.list = res.data
         this.portaitCheckStatus = res.data.portaitCheckStatus
-        console.log(this.portaitCheckStatus, '------')
+
       })
 
-    // console.log(this.portaitCheckStatus, '--------------')
   },
   methods: {
     //路径审核页面传值
@@ -228,7 +226,6 @@ export default {
     // 画像审核传值
     portraitlist(val) {
       this.portraitlistdata = val
-      console.log(this.portraitlistdata, '999999999')
     },
     // 忽略
     ignore() {

src/views/manage/Portraitedit/index.vue

@@ -233,11 +233,8 @@ export default {
     // 右侧列表
     getParams() {
       groupingValue(this.querytParams).then(res => {
-        console.log(res, 'res')
         this.moban = JSON.parse(JSON.stringify(res))
         this.getParamslistData = res
-        console.log(this.getParamslistData, '009090')
-
       })
     },
 

src/views/manage/components/Scriptpreviewopen.vue

@@ -82,20 +82,19 @@
         </div> -->
       </el-col>
       <!-- 画布 -->
-      <el-col :span="20">
+      <el-col :span="24">
         <el-col :span="24">
           <div id="page"></div>
         </el-col>
       </el-col>
       <!-- 属性栏 -->
-      <el-col :span="4">
+      <!-- <el-col :span="4">
         <section class="right-part">
-          <!-- 缩略图 -->
           <div id="minimap">
             <div class="title">缩略图</div>
           </div>
         </section>
-      </el-col>
+      </el-col> -->
     </el-row>
     <!-- 弹窗 -->
     <article>
@@ -522,7 +521,6 @@ export default {
     };
   },
   mounted() {
-    console.log(11111111111111111)
     this.initG6Editor();
     this.getlist();
     // this.editor.getCurrentPage().save()
@@ -541,8 +539,6 @@ export default {
     },
     // 初始化
     initG6Editor() {
-    console.log(11111111111111111)
-
       const _this = this;
       const editor = new G6Editor();
       this.editor = editor;
@@ -618,18 +614,30 @@ export default {
       const toolbar = new G6Editor.Toolbar({
         container: "toolbar"
       });
+      const container = document.getElementById('page');
+      // 为 graph 容器添加鼠标滚轮事件监听
+      container.addEventListener('mousewheel', (e) => {
+        e.preventDefault();
+        const ratio = 1.1; // 设置放大缩小的比例
+        const oldScale = this.editor.getCurrentPage().getZoom(); // 获取当前的缩放比例
+        // console.log(oldScale, 'oldScale')
+        const newScale = e.wheelDelta > 0 ? oldScale * ratio : oldScale / ratio; // 根据滚轮方向计算新的缩放比例
+        // console.log(newScale, 'oldScale')
+        this.editor.getCurrentPage().zoom(newScale); // 执行缩放操作
+      })
+
       // 属性栏
       // const detailpannel = new G6Editor.Detailpannel({
       //   container: "detailpannel"
       // });
       // 缩略图
-      let minimapWidth = getComputedStyle(document.querySelector(".right-part")).width;
-      minimapWidth = Number(minimapWidth.replace(/px$/, ""));
-      const minimap = new G6Editor.Minimap({
-        container: "minimap",
-        width: minimapWidth,
-        height: 200
-      });
+      // let minimapWidth = getComputedStyle(document.querySelector(".right-part")).width;
+      // minimapWidth = Number(minimapWidth.replace(/px$/, ""));
+      // const minimap = new G6Editor.Minimap({
+      //   container: "minimap",
+      //   width: minimapWidth,
+      //   height: 200
+      // });
       // 右键菜单
       const contextmenu = new G6Editor.Contextmenu({
         container: "contextmenu"
@@ -639,7 +647,7 @@ export default {
       editor.add(itempannel);
       editor.add(toolbar);
       // editor.add(detailpannel);
-      editor.add(minimap);
+      // editor.add(minimap);
       editor.add(contextmenu);
       // 挂载到window，方便调试
       window.editor = editor;

src/views/manage/components/portrait.vue

@@ -124,7 +124,6 @@ export default {
     portaitCheckStatus: {
       handler(newValue, oldValue) {
         this.portaitCheckStatus=newValue
-        console.log(newValue, "portaitCheckStatus");
       },
     }
 

src/views/system/Scriptpreview/index.vue

@@ -417,6 +417,17 @@ export default {
       const toolbar = new G6Editor.Toolbar({
         container: "toolbar"
       });
+      const container = document.getElementById('page');
+      // 为 graph 容器添加鼠标滚轮事件监听
+      container.addEventListener('mousewheel', (e) => {
+        e.preventDefault();
+        const ratio = 1.1; // 设置放大缩小的比例
+        const oldScale = this.editor.getCurrentPage().getZoom(); // 获取当前的缩放比例
+        // console.log(oldScale, 'oldScale')
+        const newScale = e.wheelDelta > 0 ? oldScale * ratio : oldScale / ratio; // 根据滚轮方向计算新的缩放比例
+        // console.log(newScale, 'oldScale')
+        this.editor.getCurrentPage().zoom(newScale); // 执行缩放操作
+      })
       // 属性栏
       // const detailpannel = new G6Editor.Detailpannel({
       //   container: "detailpannel"