liuqiao 1 rok pred
rodič
commit
f7684ba361

+ 19 - 13
src/utils/directive.js

@@ -9,23 +9,29 @@ import { startDrag } from './drag'
 const draggable = (el, binding) => {
     // 绑定拖拽事件 [绑定拖拽触发元素为弹框头部、拖拽移动元素为整个弹框]
     startDrag(el.querySelector('.el-dialog__header'), el.querySelector('.el-dialog'), binding.value);
-  
 };
-const draggleft = {
-  bind(el, binding){
-   el.querySelector('.el-dialog').style.left =binding.value;
-  },
-  inserted(el, binding){
-
-  },
-  update(el, binding){
+// const draggleft = {
+//   bind(el, binding){
+//    el.querySelector('.el-dialog').style.left =binding.value;
+//    console.log(binding.value);
+//    console.log(1111111);
+//    console.log(el);
+//   },
+//   inserted(el, binding){
+// console.log(binding)
+//   },
+//   update(el, binding){
 
-  },
+//   },
  
-}
-
+// }
+const draggleft = (el, binding) => {
+  // 绑定拖拽事件 [绑定拖拽触发元素为弹框头部、拖拽移动元素为整个弹框]
+  el.querySelector('.el-dialog').style.left =binding.value;
+  // startDrag(el.querySelector('.el-dialog__header'), el.querySelector('.el-dialog'), binding.value);
+};
 const directives = {
-    draggable,draggleft ,
+    draggable,draggleft,
  
 };
 // 这种写法可以批量注册指令

+ 15 - 14
src/views/index/FEMLab/fem.vue

@@ -1381,7 +1381,7 @@
     custom-class='dialoglocation dialog_color'
      width="385px"
       v-draggable
-    v-draggleft=[styX.left]
+    v-draggleft='[styX.left]'
     >
       <div slot="title" class=dialog_header>
      <el-image class="imge" :src="shx2" fit="cover" />
@@ -1420,7 +1420,7 @@
     custom-class='dialoglocation dialog_color'
      width="385px"
        v-draggable
-    v-draggleft=[styX.left]
+    v-draggleft='[styX.left]'
     >
       <div slot="title" class=dialog_header>
      <el-image class="imge" :src="shx10" fit="cover" />
@@ -1459,7 +1459,7 @@
     custom-class='dialoglocation dialog_color'
      width="385px"
       v-draggable
-    v-draggleft=[styX.left]
+    v-draggleft='[styX.left]'
     >
       <div slot="title" class=dialog_header>
      <el-image class="imge" :src="shx24" fit="cover" />
@@ -1512,7 +1512,7 @@
     custom-class='dialoglocation dialog_color'
      width="385px"
        v-draggable
-    v-draggleft=[styX.left]
+    v-draggleft='[styX.left]'
     >
       <div slot="title" class=dialog_header>
      <el-image class="imge" :src="shx25" fit="cover" />
@@ -1584,7 +1584,7 @@
     custom-class='dialoglocation dialog_color'
      width="385px"
       v-draggable
-    v-draggleft=[styX.left]
+    v-draggleft='[styX.left]'
     >
       <div slot="title" class=dialog_header>
      <el-image class="imge" :src="shx26" fit="cover" />
@@ -1615,7 +1615,7 @@
     custom-class='dialoglocation dialog_color'
      width="385px"
       v-draggable
-    v-draggleft=[styX.left]
+    v-draggleft='[styX.left]'
     >
       <div slot="title" class=dialog_header>
      <el-image class="imge" :src="shx27" fit="cover" />
@@ -1698,7 +1698,7 @@
     custom-class='dialoglocation dialog_color'
      width="385px"
       v-draggable
-    v-draggleft=[styX.left]
+    v-draggleft='[styX.left]'
     >
       <div slot="title" class=dialog_header>
      <el-image class="imge" :src="shx28" fit="cover" />
@@ -1794,7 +1794,7 @@
      <!--轮廓显示  Contour Displsy   :style="styX"     :left="styX"  custom-class='dialoglocation dialog_color '-->
        <el-dialog  :visible.sync="dialog.contour_visiable" 
       v-draggable
-      v-draggleft=[styX.left]
+      v-draggleft='[styX.left]'
       v-if="active=='six2-0'"
       :modal='false'
       :close-on-click-modal="false"
@@ -1878,7 +1878,7 @@
     custom-class='dialoglocation dialog_color'
      width="385px"
       v-draggable
-      v-draggleft=[styX.left]
+      v-draggleft='[styX.left]'
        >
             <div slot="title" class=dialog_header>
      <el-image class="imge" :src="p9" fit="cover" />
@@ -1946,7 +1946,7 @@
     custom-class='dialoglocation dialog_color'
      width="385px"
     v-draggable
-    v-draggleft=[styX.left]
+    v-draggleft='[styX.left]'
        >
             <div slot="title" class=dialog_header>
      <el-image class="imge" :src="p4" fit="cover" />
@@ -2032,7 +2032,7 @@
     custom-class='dialoglocation dialog_color'
      width="385px"
     v-draggable
-      v-draggleft=[styX.left]
+      v-draggleft='[styX.left]'
        >
             <div slot="title" class=dialog_header>
      <el-image class="imge" :src="p14" fit="cover" />
@@ -2041,7 +2041,7 @@
   <el-form :model="form">
    <div class="heigeinput">
         <el-form-item label="颜色">
-         <div class="saninput titleinput"> R
+         <div class="saninput titleinput">R
       <el-input v-model="colorobj.R" autocomplete="off"></el-input>G
        <el-input v-model="colorobj.G" autocomplete="off"></el-input>B
         <el-input v-model="colorobj.B" autocomplete="off"></el-input>
@@ -2097,7 +2097,7 @@
     custom-class='dialoglocation dialog_color'
      width="385px"
      v-draggable
-      v-draggleft=[styX.left]
+      v-draggleft='[styX.left]'
        >
             <div slot="title" class=dialog_header>
      <el-image class="imge" :src="p15" fit="cover" />
@@ -2146,7 +2146,7 @@
     custom-class='dialoglocation dialog_color'
      width="385px"
      v-draggable
-      v-draggleft=[styX.left]
+      v-draggleft='[styX.left]'
        >
             <div slot="title" class=dialog_header>
      <el-image class="imge" :src="p16" fit="cover" />
@@ -3604,6 +3604,7 @@ let b=(Number(this.colorobj.B)/255).toFixed(4);
   clickgeometry(e,index,key){
 var e=e||window.Event
 this.styX.left=e.clientX+'px';
+console.log(this.styX.left)
 // this.$nextTick(()=>{
 // document.querySelector('.el-dialog').style.left =this.styX.left;
 // })

+ 17 - 6
src/views/index/HCFDLab/index.vue

@@ -546,7 +546,7 @@
       custom-class='dialoglocation dialog_color'
       width="385px"
       v-draggable
-      v-draggleft='[styX.left]'
+      v-draggleft=[styX.left]
     >
       <div
         slot="title"
@@ -604,7 +604,7 @@
       custom-class='dialoglocation dialog_color'
       width="385px"
       v-draggable
-      v-draggleft='[styX.left]'
+      v-draggleft=[styX.left]
     >
       <div
         slot="title"
@@ -951,7 +951,7 @@
         class="dialog-footer"
       >
         <el-button @click="dialog.mesh_generation = false">{{ $t("HCFD.file.cancel")}}</el-button>
-         <!-- <el-button @click="mesh2d">添加2D网格</el-button> -->
+         <el-button @click="mesh2d">添加2D网格</el-button>
         <el-button
           type="primary"
           @click="meshSplitok();dialog.mesh_generation = false"
@@ -969,7 +969,7 @@
       custom-class='dialoglocation dialog_color'
       width="385px"
       v-draggable
-      v-draggleft=[styX.left]
+      v-draggleft='[styX.left]'
     >
       <div
         slot="title"
@@ -4776,6 +4776,11 @@ export default {
       default() {
         return {};
       },
+    },datajh: {
+      type: Array,
+      default() {
+        return {};
+      },
     },
   },
 
@@ -7527,9 +7532,15 @@ export default {
         })
         .catch((err) => {});
     },
-    // 网格添加2DTree
+      // 网格添加2DTree
     mesh2d(){
-
+      console.log(this.datajh)
+      let id=30;
+     const newChild = { id: id++, label: '2D', children: [] };
+        if (!this.datajh.children) {
+         this.$set(this.datajh, 'children', []);
+        }
+        this.datajh.children.push(newChild);
     },
   },
   watch: {

+ 2 - 0
src/views/index/index.vue

@@ -11,6 +11,7 @@
           ref="hcfd"
           :objopp="objopp"
           :ytdata="ytdata"
+           :datajh="data"
           :vectorparam="vectorparam"
           :pid="pid"
           :objcheck="objcheck"
@@ -1300,6 +1301,7 @@ export default {
     getCheckedNodes(obj,a){
       //  console.log(this.$refs.tree.setCheckedKeys([3]))
     },
+  
     // getMenuAllCheckedKeys(){
     //   let  checkedKeys=this.$refs.tree.getMenuAllCheckedKeys();
     //   console.log(checkedKeys);