8.2

src/permission.js

@@ -8,7 +8,7 @@ import { Caegw_LogUrl } from '@/settings' // 引入settings.js
 
 NProgress.configure({ showSpinner: false }) // NProgress配置
 
-const whiteList = ['/fail404', '/home','/sso','/login/index','/register/index', '/forget/index', '/protocol/index','/indexLayout/index']// 免登录的'白名单
+const whiteList = ['/fail404', '/home','/sso','/login/index','/register/index', '/forget/index', '/protocol/index','/indexLayout/index','/index']// 免登录的'白名单
 // 前置路由守卫
 router.beforeEach(async (to, from, next) => {
   NProgress.start() // 开启进度条

src/router/index.js

@@ -79,7 +79,19 @@ export const constantRoutes = [
       }]
     
     },
+  //HCFD
+  // {
+  //   path: 'HCFDLab/index',
+  //   component: Layout,
+  //   children:[{
+  //     path: '/index',
+  //     name: 'index',
+  //     component: () => import('@/views/HCFDLab/index'),
+  //     meta: { title: '项目新建', icon: '' },
+  //     hidden: true,
+  //   }]
   
+  // },
   // 登陆
   {
     path: '/login',

src/views/index/HCFDLab/index.vue

@@ -0,0 +1,36 @@
+<template>
+<div class="hcfdlab">
+  <el-tabs  :tab-position="tabPosition" v-model="activeName" type="card" @tab-click="handleClick">
+          <el-tab-pane label="几何建模" name="one"><geometry></geometry></el-tab-pane>
+          <el-tab-pane label="网格划分" name="two"> <meshindex></meshindex></el-tab-pane>
+          <el-tab-pane label="通用设置" name="three"> 通用设置</el-tab-pane>
+          <el-tab-pane label="物理模型" name="four">物理模型 </el-tab-pane>
+           <el-tab-pane label="求解控制" name="five">求解控制</el-tab-pane>
+          <el-tab-pane label="结果查看" name="six"> 结果查看 </el-tab-pane>
+          <el-tab-pane label="工具箱" name="twelve">工具箱</el-tab-pane>
+
+           
+    </el-tabs>
+</div>
+</template>
+<script>
+// 引入组件
+import geometry from '../geometry/index.vue'
+import meshindex from '../meshindex/index.vue'
+export default {
+  components:{geometry,meshindex},
+  data() {
+    return { 
+        tabPosition: 'top',
+        activeName: 'one',
+    }
+  },
+  methods:{
+      
+        handleClick(tab, event) {
+
+        }
+      }
+}
+
+      </script>

src/views/index/geometry/index.vue

@@ -1457,6 +1457,35 @@ v-if="activeobj.czindex=='0'"
     <el-button type="primary" @click="dialog.dialogentity = false">OK</el-button>
   </span>
 </el-dialog>
+<!-- 布尔运算 -->
+<el-dialog
+  :visible.sync="dialog.Booledialog"
+  v-if="activeobj.czindex=='4'"
+  :modal='false'
+  custom-class='dialoglocation dialog_color'
+   width="385px"
+  :close-on-click-modal='false'
+ >
+  <div slot="title" class=dialog_header>
+     <el-image :src="cz5" fit="cover" />
+     <span>布尔运算</span>
+  </div>
+   <div class="line">
+      <div class="linetext">布尔运算
+      </div>
+    </div> 
+   <div class="heigeinput">
+        <div class="listbtn"> 
+       <el-button plain class="anniu">合并</el-button>
+        <el-button plain class="anniu">相减</el-button>
+         <el-button plain class="anniu">相交</el-button>
+      </div> 
+  </div>
+   <span slot="footer" class="dialog-footer">
+    <el-button @click="dialog.Booledialog = false">取 消</el-button>
+    <el-button type="primary" @click="dialog.Booledialog = false">OK</el-button>
+  </span>
+ </el-dialog>
 <!--移动  -->
 <el-dialog
   :visible.sync="dialog.yddialog"
@@ -1467,7 +1496,7 @@ v-if="activeobj.czindex=='0'"
   :close-on-click-modal='false'
  >
   <div slot="title" class=dialog_header>
-     <el-image :src="cj" fit="cover" />
+     <el-image :src="cz6" fit="cover" />
      <span>移动</span>
   </div>
      <div class="selecr">
@@ -1660,7 +1689,7 @@ v-if="activeobj.czindex=='0'"
   :close-on-click-modal='false'
  >
   <div slot="title" class=dialog_header>
-     <el-image :src="cj" fit="cover" />
+     <el-image :src="cz8" fit="cover" />
      <span>复制</span>
   </div>
      <div class="selecr">
@@ -1767,7 +1796,7 @@ v-if="activeobj.czindex=='0'"
   :close-on-click-modal='false'
  >
   <div slot="title" class=dialog_header>
-     <el-image :src="cj" fit="cover" />
+     <el-image :src="cz9" fit="cover" />
      <span>印痕</span>
   </div>
      <div class="selecr">
@@ -1952,7 +1981,7 @@ v-if="activeobj.czindex=='0'"
   :close-on-click-modal='false'
  >
   <div slot="title" class=dialog_header>
-     <el-image :src="cj" fit="cover" />
+     <el-image :src="cz10" fit="cover" />
      <span>清除重复对象</span>
   </div>
      <div class="selecr heigeinput">
@@ -2021,7 +2050,7 @@ v-if="activeobj.czindex=='0'"
   :close-on-click-modal='false'
  >
   <div slot="title" class=dialog_header>
-     <el-image :src="cj" fit="cover" />
+     <el-image :src="cz12" fit="cover" />
      <span>转换</span>
   </div>
      <div class="selecr heigeinput">
@@ -2182,7 +2211,7 @@ v-if="activeobj.czindex=='0'"
   :close-on-click-modal='false'
  >
   <div slot="title" class=dialog_header>
-     <el-image :src="cj" fit="cover" />
+     <el-image :src="cz13" fit="cover" />
      <span>扩展</span>
   </div>
      <div class="selecr heigeinput">
@@ -2273,7 +2302,7 @@ v-if="activeobj.czindex=='0'"
   :close-on-click-modal='false'
  >
   <div slot="title" class=dialog_header>
-     <el-image :src="cj" fit="cover" />
+     <el-image :src="cz14" fit="cover" />
      <span>旋转</span>
   </div>
      <div class="selecr heigeinput ">
@@ -2343,7 +2372,7 @@ v-if="activeobj.czindex=='0'"
   :close-on-click-modal='false'
  >
   <div slot="title" class=dialog_header>
-     <el-image :src="cj" fit="cover" />
+     <el-image :src="cz15" fit="cover" />
      <span>对称</span>
   </div>
      <div class="selecr heigeinput ">
@@ -2512,6 +2541,7 @@ export default {
             setdialog:false,
             dialogintersect:false,
             dialogentity:false,
+            Booledialog:false,
             yddialog:false,
             tiele:false,
             dialogclone:false,
@@ -2807,7 +2837,7 @@ export default {
             { img:cz13, titlie:'扩展'},
             {img:cz14, titlie:'旋转'},   
             { img:cz15, titlie:'对称'},
-            {img:cz16, titlie:'扫略'}, 
+            // {img:cz16, titlie:'扫略'}, 
         ],
           bjlist:[
            { img:bj1, titlie:'新建'},
@@ -2966,7 +2996,7 @@ methods:{
        this.dialog.dialogentity=true;
       break;
       case 4:
-       
+         this.dialog.Booledialog=true;
        break;
       case 5:
            this.dialog.yddialog=true;

src/views/index/index.vue

@@ -6,7 +6,10 @@
                  
                     
              </div> -->
-        
+        <div v-if="value2=='0'">
+        <hcfd></hcfd>
+        </div>
+        <div class="adi" v-else>
           <el-tabs  :tab-position="tabPosition" v-model="activeName" type="card" @tab-click="handleClick">
           <el-tab-pane label="几何建模" name="one"><geometry></geometry></el-tab-pane>
           <el-tab-pane label="网格划分" name="two"> <meshindex></meshindex></el-tab-pane>
@@ -23,6 +26,7 @@
             <el-tab-pane label="操作" name="thirteen"><caozuo ></caozuo></el-tab-pane>
            
         </el-tabs>
+        </div>
         <div class="textselsect">
          <el-select v-model="value" placeholder="请选择">
         <el-option
@@ -32,9 +36,9 @@
           :value="item.value">
         </el-option>
       </el-select>
-      <el-select v-model="value1" placeholder="请选择">
+      <el-select v-model="value2" placeholder="请选择">
         <el-option
-          v-for="item in options1"
+          v-for="item in options2"
           :key="item.value"
           :label="item.label"
           :value="item.value">
@@ -83,8 +87,9 @@ import zuoye from './zuoye/index.vue'
 import result from './result/index.vue'
 import toolindex from './tool/index.vue'
 import caozuo from './caozuo/index.vue'
+import hcfd from './HCFDLab/index.vue'
 export default {
-  components:{geometry,meshindex,Geometryandclass,Materials,touch,initial,boundary,Meshauto,loadcase,zuoye,result,caozuo,toolindex},
+  components:{geometry,meshindex,Geometryandclass,Materials,touch,initial,boundary,Meshauto,loadcase,zuoye,result,caozuo,toolindex,hcfd},
   data() {
     return {
         // current:0,
@@ -150,6 +155,11 @@ export default {
 
         ],
         value1:'0',
+    options2:[
+    {value: '0',label: 'HCFDLab'},
+    { value: '1',label: 'adi'},
+        ],
+      value2:'0',
     }
 
 
@@ -232,8 +242,7 @@ html,body{
     .right{
         padding: 15px;
         flex: 1;
-         height: 100%;
-          height: 88vh;
+        //  height: 100%;
           position: relative;
         
     }