11.15

src/views/index/FEMLab/fem.vue

@@ -233,7 +233,7 @@
           ref="geometryugrid"
           :projectId="project.projectId"
           :solverType="'hcfd'"
-          :accept="'.igs,stp,sat'"
+          :accept="'.igs,.stp,.sat,.sab,.x_t,.x_b,.iges,.step,.stp,.stl'"
           :name="'Load File'"
           :upId="'3'"
         ></vue-uploader>

src/views/index/FEMLab/fileupload.vue

@@ -216,7 +216,8 @@ export default {
                         }
                         if (file.ext=='bdf') {
                         v_this.fembdf(response.bfid);
-                        }else if(file.ext == "igs"){
+                        }else if(file.ext == "igs"||file.ext == "sat"||file.ext == "sab"||file.ext == ".x_t"
+                ||file.ext == "x_b"||file.ext == "iges"||file.ext == "step"||file.ext == "stp"||file.ext == "stl"){
                              v_this.bindmesh(response.bfid,file.ext);  
                         }
                     });

src/views/index/HCFDLab/fileupload.vue

@@ -296,8 +296,8 @@ export default {
                 v_this.bindugrid(response.bfid);
                 }else if (file.ext == "mapbc"){
                      v_this.bindmapbc(response.bfid);
-                }else if (file.ext == "igs"){
-               ;
+                }else if (file.ext == "igs"||file.ext == "sat"||file.ext == "sab"||file.ext == ".x_t"
+                ||file.ext == "x_b"||file.ext == "iges"||file.ext == "step"||file.ext == "stp"||file.ext == "stl"){
                      v_this.bindmesh(response.bfid,file.ext);
                 }else
                 {

src/views/index/HCFDLab/index.vue

@@ -517,7 +517,7 @@
           ref="geometryugrid"
           :projectId="project.projectId"
           :solverType="'hcfd'"
-          :accept="'.igs,stp,sat'"
+          :accept="'.igs,.stp,.sat,.sab,.x_t,.x_b,.iges,.step,.stp,.stl'"
           :name="'Load File'"
           :upId="'3'"
         ></vue-uploader>

src/views/index/index.vue

@@ -179,6 +179,8 @@
             >
               <el-tree
                 :data="data"
+                class="my-tree"
+                  show-checkbox
                 :props="defaultProps"
                 @node-click="handleNodeClick"
               ></el-tree>
@@ -448,24 +450,60 @@ export default {
       ],
       data: [
         {
-          label: "几何（33）",
+          label: "HCFDLab",
           children: [
             {
-              label: "几何点（17）",
-              children: [
-                {
-                  label: "三级 1-1-1",
-                },
+              label: "Geometry",
+              children: [{
+              id: 9,
+              label: 'points'
+            }, {
+              id: 10,
+              label: 'Curves'
+            }, {
+              id: 10,
+              label: 'Surfaces'
+            }
               ],
+            },
+             {
+              label: "Mesh",
+             
+            },
+             {
+              label: "Parts",
+             
             },
             {
-              label: "曲线（17）",
+              label: "Custom Control",
               children: [
                 {
-                  label: "三级 1-1-1",
+                  label: "Surface Control",
+                },
+                 {
+                  label: "Curves Control",
+                },
+                 {
+                  label: "Volume Control",
                 },
               ],
             },
+             {
+              label: "Physics",
+             
+            },
+             {
+              label: "Solution",
+             
+            },
+            {
+              label: "Jobs",
+             
+            },
+            {
+              label: "Results",
+             
+            },
           ],
         },
         {
@@ -605,13 +643,21 @@ export default {
     clearTimeout(this.timeoutObj);
     clearTimeout(this.serverTimeoutObj);
   },
-  destroyed() {
+  // destroyed() {
+  //   this.websock.close();
+  //   //this.websock=null;
+  //   //console.log( this.websock.close());
+  //   // 清除时间
+  //   clearTimeout(this.timeoutObj);
+  //   clearTimeout(this.serverTimeoutObj);
+  // },
+    destroyed() {
+     if(this.websock!=null){
     this.websock.close();
-    //this.websock=null;
-    //console.log( this.websock.close());
-    // 清除时间
     clearTimeout(this.timeoutObj);
     clearTimeout(this.serverTimeoutObj);
+    console.log("关闭了websocket")
+      }
   },
   mounted() {
     let curcolor = this.$store.state.themecolor;
@@ -1383,9 +1429,9 @@ export default {
 }
 </style>
 <style>
-.left {
+/* .left {
   display: none;
-}
+} */
 .selecr .el-form-item__label {
   line-height: 36px;
 }
@@ -1451,6 +1497,33 @@ export default {
   width: 20px;
   height: 20px;
 }
+/* .my-tree .el-tree-node__content label.el-checkbox ,.my-tree .el-tree-node__content label.el-checkbox {
+  display: none;
+}
+.my-tree .el-tree-node__children label.el-checkbox{
+  display: inline-block;
+  margin-left: -17px;
+} */
+.my-tree .el-tree-node__content label.el-checkbox {
+    display: none;
+  }
+/* .my-tree  .el-tree-node__children label.el-checkbox {
+    display: inline-block;
+    margin-left: -5px;
+  }
+ .my-tree .el-tree-node__children  .el-tree-node  .is-leaf + .el-checkbox .el-checkbox__inner {
+      display: inline-block;
+    } */
+
+   .my-tree .el-tree-node__children  .el-checkbox .el-checkbox__inner {
+      display: none;
+    }
+.my-tree .el-tree-node .is-leaf + .el-checkbox .el-checkbox__inner{
+display: none;
+}
+.my-tree .el-checkbox .el-checkbox__inner{
+display: inline-block;
+}
 </style>
 <style lang="scss" scoped>
 /deep/.toolbar-part-detail {
@@ -1484,4 +1557,5 @@ export default {
 /deep/.leftsearch .el-button {
   background-color: #fff;
 }
+
 </style>