Pārlūkot izejas kodu

10.11做完静态页面

liuqiao 11 mēneši atpakaļ
vecāks
revīzija
54bf48abd5

+ 254 - 131
src/views/home.vue

@@ -630,7 +630,7 @@
             </el-dialog>
             <!-- 优化器 -->
                  <el-dialog v-model="dialog.optimizer"
-             align-center :modal="false" :close-on-click-modal="true"
+             align-center :modal="false"  :close-on-click-modal="false"
               :append-to-body="true" draggable :fullscreen="false" :modal-append-to-body="false" modal-class="summary-dlg"
               :before-close="handleClose" width="430" class="dialog_class bgcolor tianjia sel">
   
@@ -789,6 +789,188 @@
                   </el-button>
                 </div>
               </template>
+            </el-dialog>
+             <!-- 进步优化器 -->
+             <el-dialog v-model="dialog.jboptimizer"
+             align-center :modal="false"  :close-on-click-modal="false"
+              :append-to-body="true" draggable :fullscreen="false" :modal-append-to-body="false" modal-class="summary-dlg"
+              :before-close="handleClose" width="430" class="dialog_class bgcolor tianjia sel">
+  
+              <template #header="{ titleId, titleClass }">
+                <div class="my-header ">
+                  <el-image :src="getImgPath('t2.png')" fit="contain"></el-image>
+                  <h4 :id="titleId" :class="titleClass">优化算法:</h4>
+                </div>
+              </template>
+              <div class="numberinput lefttext">
+                <el-form >
+                  <el-form-item label="优化算法:" :label-width="formLabelWidth1">
+                    <el-select   v-model="ys" :suffix-icon="CaretBottom" placeholder="请选择">
+                            <el-option
+                              v-for="item in yslist"
+                              :key="item.value"
+                              :label="item.label"
+                              :value="item.value">
+                            </el-option>
+                          </el-select>
+                  </el-form-item>
+                       <el-form-item label="种群规模:" :label-width="formLabelWidth1">
+                    <el-input-number v-model="num" :step="100" :min="1" :max="1000" controls-position="right" />
+                  </el-form-item>
+                  <el-form-item label="迭代次数:" :label-width="formLabelWidth1">
+                    <el-input-number v-model="num" :step="100" :min="1" :max="1000" controls-position="right" />
+                  </el-form-item>
+                  <el-form-item label="交叉概率:" :label-width="formLabelWidth1">
+                    <el-input-number v-model="num"  :step="0.1" :min="1" :max="1000" controls-position="right" />
+                  </el-form-item>
+                  <el-form-item label="变异概率:" :label-width="formLabelWidth1">
+                    <el-input-number v-model="num"  :step="0.1" :min="1" :max="1000" controls-position="right" />
+                  </el-form-item>
+                  <el-form-item label="交叉算子:" :label-width="formLabelWidth1">
+                    <el-select   v-model="addval2" :suffix-icon="CaretBottom" placeholder="请选择">
+                            <el-option
+                              v-for="item in addlist2"
+                              :key="item.value"
+                              :label="item.label"
+                              :value="item.value">
+                            </el-option>
+                          </el-select>
+                  </el-form-item>
+                  <el-form-item label="竞赛规模:" :label-width="formLabelWidth1">
+                    <el-input-number v-model="num" :min="1" :max="10" controls-position="right" />
+                  </el-form-item>
+                  <el-form-item label="保留优选策略:" :label-width="formLabelWidth1">
+                    <el-select   v-model="addval3" :suffix-icon="CaretBottom" placeholder="请选择">
+                            <el-option
+                              v-for="item in addlist3"
+                              :key="item.value"
+                              :label="item.label"
+                              :value="item.value">
+                            </el-option>
+                          </el-select>
+                  </el-form-item>
+                  <el-form-item label="变异算子选择:" :label-width="formLabelWidth1">
+                    <el-select   v-model="addval4" :suffix-icon="CaretBottom" placeholder="请选择">
+                            <el-option
+                              v-for="item in addlist4"
+                              :key="item.value"
+                              :label="item.label"
+                              :value="item.value">
+                            </el-option>
+                          </el-select>
+                  </el-form-item>
+                  <el-form-item label="GPU" :label-width="formLabelWidth1">
+                    <el-select   v-model="addval8" :suffix-icon="CaretBottom" placeholder="请选择">
+                            <el-option
+                              v-for="item in addlist8"
+                              :key="item.value"
+                              :label="item.label"
+                              :value="item.value">
+                            </el-option>
+                          </el-select>
+                  </el-form-item>
+                </el-form>
+              </div>
+              <template #footer>
+                <div class="dialog-footer">
+                  <el-button @click="dialog.jboptimizer = false">取消</el-button>
+                  <el-button type="primary" @click="dialog.jboptimizer = false">
+                    确定
+                  </el-button>
+                </div>
+              </template>
+            </el-dialog>
+            <!-- Xfiol -->
+            <el-dialog v-model="dialog.Xfiol"
+              align-center
+              :modal="false"
+              :close-on-click-modal="false"
+              :append-to-body="true"
+              draggable
+              :fullscreen="false"
+              :modal-append-to-body="false"
+               modal-class="summary-dlg2 summary-dlg"
+              :before-close="handleClose" width="500" class="dialog_class bgcolor tianjia sel">
+  
+              <template #header="{ titleId, titleClass }">
+                <div class="my-header ">
+                  <el-image :src="getImgPath('xuek9.png')" fit="contain"></el-image>
+                  <h4 :id="titleId" :class="titleClass">Xfiol</h4>
+                </div>
+              </template>
+              <div class="youhualog youhualog1" style="height: 480px;">
+                <ul>
+                  <li v-for="(tab, index) in xfoil"  :key="index" :class="{ 'active2': activeIndex3 === index }"
+                  @click="activeIndex3 = index">{{ tab }}</li>
+                </ul>
+                <!-- 输入 -->
+                <div class="eldesign classtable" style="margin-top: 10px;" v-if="activeIndex3==0">
+                <el-table :data="designtable" border style="width: 100%" height="400">
+                  <el-table-column prop="name" label="启用" width="50">
+                    <template v-slot="scope">
+                    <el-checkbox :label="false" v-model="scope.row.qi" />
+                  </template>
+                </el-table-column>
+                  <el-table-column prop="name" label="参数">
+                    <template #default="{ row }">
+                    <el-input v-model="row.name" @change="handleEdit(row)" />
+                  </template>
+                </el-table-column>
+                <el-table-column prop="yin" label="参数值1">
+                  <template #default="{ row }">
+                    <el-input v-model="row.yin" @change="handleEdit(row)" />
+                  </template>
+                </el-table-column>
+                  <el-table-column prop="cai" label="参数值2" width="100">
+                  <template #default="{ row }">
+                    <el-input v-model="row.cai" @change="handleEdit(row)" />
+                  </template>
+                </el-table-column>
+                </el-table>
+              </div>
+              <!-- 执行 -->
+              <div class="eldesign classtable" style="margin-top: 10px;" v-if="activeIndex3==1">
+              <div style="display: flex;">
+                <el-form-item label="执行路径" >
+                    <el-input v-model="num" :min="1" :max="10" controls-position="right" />
+                  </el-form-item>
+                  <el-button type="primary" style="margin-left: 10px;">选择路劲</el-button>
+                </div>
+              </div>
+              <!-- 输出 -->
+              <div class="eldesign classtable" style="margin-top: 10px;" v-if="activeIndex3==2">
+            <el-table :data="designtable" border style="width: 100%" height="400">
+              <el-table-column prop="name" label="启用" width="50">
+                <template v-slot="scope">
+                <el-checkbox :label="false" v-model="scope.row.qi" />
+              </template>
+            </el-table-column>
+              <el-table-column prop="name" label="参数">
+                <template #default="{ row }">
+                <el-input v-model="row.name" @change="handleEdit(row)" />
+              </template>
+            </el-table-column>
+            <el-table-column prop="yin" label="参数值1">
+              <template #default="{ row }">
+                <el-input v-model="row.yin" @change="handleEdit(row)" />
+              </template>
+            </el-table-column>
+              <el-table-column prop="cai" label="参数值2" width="100">
+              <template #default="{ row }">
+                <el-input v-model="row.cai" @change="handleEdit(row)" />
+              </template>
+            </el-table-column>
+            </el-table>
+            </div>
+              </div>
+              <template #footer>
+                <div class="dialog-footer">
+                  <el-button @click="dialog.Xfiol = false">取消</el-button>
+                  <el-button type="primary" @click="dialog.Xfiol = false">
+                    确定
+                  </el-button>
+                </div>
+              </template>
             </el-dialog>
             <!-- 内容区 -->
             <div class="main  mianflex">
@@ -798,7 +980,7 @@
             <div class="main_container">
               <div class="main_model">
                
-                <vuefindex  v-if="activeName=='Role'" ref="vuefval" :optimizer="dialog.optimizer" @optimizerfalse="optimizerfalse()" ></vuefindex>
+                <vuefindex  v-if="activeName=='Role'" ref="vuefval" :Xfiol="dialog.Xfiol" :jboptimizer="dialog.jboptimizer"  :optimizer="dialog.optimizer" @optimizerfalse="optimizerfalse($event)" ></vuefindex>
                 <div  class="maxh221">
              <!-- 中间部分 -->
              <div  class="conter_mian classtable " v-if="activeName=='Three'&&tabactive=='列表监控'">
@@ -889,38 +1071,43 @@
                     <el-input v-model="row.name" @change="handleEdit(row)" />
                   </template>
                 </el-table-column>
-                  <el-table-column prop="date" label="变量类型">
+                  <!-- <el-table-column prop="date" label="变量类型">
                     <template #default="{ row }">
                     <el-input v-model="row.date" @change="handleEdit(row)" />
                   </template>
-                </el-table-column>
+                </el-table-column> -->
                   <el-table-column prop="name" label="上限值">
                     <template #default="{ row }">
                     <el-input v-model="row.name" @change="handleEdit(row)" />
                   </template>
                 </el-table-column>
-                  <el-table-column prop="q" label="权重系数">
+                <el-table-column prop="yin" label="下限值">
+                  <template #default="{ row }">
+                    <el-input v-model="row.yin" @change="handleEdit(row)" />
+                  </template>
+                </el-table-column>
+                  <!-- <el-table-column prop="q" label="权重系数">
                     <template #default="{ row }">
                     <el-input v-model="row.q" @change="handleEdit(row)" />
                   </template>
-                </el-table-column>
+                </el-table-column> -->
                   <el-table-column prop="cai" label="基准值" width="100">
                   <template #default="{ row }">
                     <el-input v-model="row.cai" @change="handleEdit(row)" />
                   </template>
                 </el-table-column>
-                <el-table-column prop="yin" label="下限值">
-                  <template #default="{ row }">
-                    <el-input v-model="row.yin" @change="handleEdit(row)" />
+                <el-table-column prop="q" label="说明">
+                    <template #default="{ row }">
+                    <el-input v-model="row.q" @change="handleEdit(row)" />
                   </template>
-                </el-table-column> 
+                </el-table-column>
                 </el-table>
                 
                 </div>
                 <div class="elconstraint classtable" v-if="activeIndex2==1">
                   <el-table :data="tableData" stripe style="width: 100%" height="100">
                   <el-table-column type="index" label="编号"  width="100" />
-                  <el-table-column prop="data" label="约束类型" >
+                  <!-- <el-table-column prop="data" label="约束类型" >
                   <template v-slot="scope">
                     <el-select v-model="scope.row.device"  class="no-border " :suffix-icon="CaretBottom"  placeholder="请选择">
                           <el-option
@@ -932,7 +1119,12 @@
                         </el-select>
 
                   </template>
-                </el-table-column>
+                </el-table-column> -->
+                <el-table-column prop="address" label="约束名称">
+                        <template #default="{ row }">
+                          <el-input v-model="row.address" @change="handleEdit(row)" />
+                        </template>
+                      </el-table-column>
                       <el-table-column prop="name" label="约束关系"  >
                         <template v-slot="scope">
                         <el-select class="no-border "  v-model="scope.row.z" :suffix-icon="CaretBottom" placeholder="请选择">
@@ -957,12 +1149,12 @@
                 <div class="eloptimize classtable" v-if="activeIndex2==2">
                   <el-table :data="eloptimize" stripe style="width: 100%" height="100">
                   <el-table-column type="index" label="编号"  width="70" />
-                  <el-table-column prop="qi" label="启用" width="70">
+                  <!-- <el-table-column prop="qi" label="启用" width="70">
                   <template v-slot="scope">
                     <el-checkbox :label="false" v-model="scope.row.qi" />
                   </template>
-                </el-table-column>
-                  <el-table-column prop="data" label="目标类型" width="120">
+                </el-table-column> -->
+                  <!-- <el-table-column prop="data" label="目标类型" width="120">
                   <template v-slot="scope">
                     <el-select v-model="scope.row.device"  class="no-border " :suffix-icon="CaretBottom"  placeholder="请选择">
                           <el-option
@@ -974,8 +1166,13 @@
                         </el-select>
 
                   </template>
-            </el-table-column>
-                  <el-table-column prop="name" label="优化方向"  width="100">
+            </el-table-column> -->
+            <el-table-column prop="address" label="目标名称">
+                    <template #default="{ row }">
+                          <el-input v-model="row.address"  />
+                        </template>
+                  </el-table-column>
+                  <el-table-column prop="name" label="优化方向">
                     <template v-slot="scope">
                     <el-select class="no-border "  v-model="scope.row.z" :suffix-icon="CaretBottom" placeholder="请选择">
                           <el-option
@@ -993,7 +1190,7 @@
                           <el-input v-model="row.q" @change="handleEdit(row)" />
                         </template>
                   </el-table-column>
-                  <el-table-column prop="cai" label="采用基准翼型数据缩放" width="180">
+                  <el-table-column prop="cai" label="数据缩放">
                     <template v-slot="scope">
                     <el-checkbox :label="scope.row.qi?'采用':'不采用'" v-model="scope.row.qi" />
 
@@ -1004,7 +1201,7 @@
                           <el-input v-model="row.yin" @change="handleEdit(row)" />
                         </template>
                   </el-table-column>
-                  <el-table-column prop="address" label="备注" width="200">
+                  <el-table-column prop="address" label="说明" >
                     <template #default="{ row }">
                           <el-input v-model="row.address" @change="handleEdit(row)" />
                         </template>
@@ -1071,10 +1268,11 @@
   let tableval=ref();
   let vuefval=ref();
   let elodingfalse=ref(false);
-  let footerShow=ref(false);
+  let footerShow=ref(true);
   let tabName=ref("one")
   const tabs = ['信息栏', '优化问题'];
   const listli = ['设计变量', '约束条件', '优化目标'];
+  const xfoil = ['输入', '执行', '输出'];
   // let quxian=ref([{
   //   val:'1',name:"设计变量",
   //   val:'2',name:"约束条件",
@@ -1089,6 +1287,7 @@
 let quval = ref("设计变量")
   const activeIndex = ref(0);
   const activeIndex2 = ref(0);
+  const activeIndex3 = ref(0);
   const color1 = ref('');
   let showTrigger=ref(false);
   const datatree = ref([
@@ -1118,8 +1317,8 @@ let quval = ref("设计变量")
   
   ])
   let options1=ref([
-{ label: '增大', value: '增大' },
-{ label: '减小', value: '减小' },
+{ label: '最大化', value: '最大化' },
+{ label: '最小化', value: '最小化' },
 ])
   let options2=ref([
 { label: '升力系数', value: '升力系数' },
@@ -1129,108 +1328,6 @@ let options3=ref([
 { label: '大于', value: '大于' },
 { label: '小于', value: '小于' },
 ])
-  const datatree1 = ref([
-    {
-      id:2,
-      label: '优化问题组件',
-      img:'',
-      children: [
-        {
-          id:'2_1',
-          label: '优化问题',
-          img:"wen.png",
-         
-        },
-      ],
-    },
-    {
-      id:3,
-      label: '学科分析组件',
-      img:'',
-      children: [
-        {
-          id:'3-1',
-          label: 'CATIA',
-          img:'xuek1.png',
-        },
-        {
-          id:'3-0',
-          label: 'CST',
-          img:'xuek1.png',
-        },
-        {
-          id:'3-2',
-          label: 'Excel',
-          img:'xuek2.png',
-   
-        },
-        {
-          id:'3-3',
-          label: 'Feko',
-          img:'xuek3.png'
-        },
-        {
-          id:'3-4',
-          label: 'Fluent',
-          img:'xuek4.png',
-         
-        },
-        {
-          id:'3-5',
-          label: 'HCFD',
-          img:'xuek5.png',
-   
-        },
-        {
-          id:'3-6',
-          label: 'Matlab',
-          img:"xuek6.png"
-        },
-        {
-          id:'3-7',
-          label: 'Nastran',
-          img:'xuek7.png',
-         
-        },
-        {
-          id:'3-8',
-          label: 'Python',
-          img:'xuek8.png',
-   
-        },
-        {
-          id:'3-9',
-          label: 'AirfoilAero',
-          img:'xuek9.png'
-        },
-      ],
-    },
-    {
-      id:4,
-      label: '优化器组件',
-      img:'',
-      children: [
-        {
-          id:'4-1',
-          label: '进化优化器',
-          img:'youh1.png',
-         
-        },
-        {
-          id:'4-2',
-          label: '代理优化器',
-          img:'youh2.png',
-   
-        },
-        {
-          id:'4-3',
-          label: '梯度优化器',
-          img:'youh3.png',
-        },
-      ],
-    },
-  
-  ])
   let  defaultExpandedArr=ref([]);
   const defaultProps = {
     children: 'children',
@@ -1366,9 +1463,10 @@ let options3=ref([
   let addlist7 = ref([
   { label: '1e-7', value: '1e-7' },
   ])
-  let addval8=ref("YES")
+  let addval8=ref("NO")
   let addlist8 = ref([
   { label: 'YES', value: 'YES' },
+  { label: 'NO', value: 'NO' },
   ])
   let dialog = ref({
     newdialog: false,
@@ -1379,6 +1477,8 @@ let options3=ref([
     parameter:false,
     agency:false,
     optimizer:false,
+    jboptimizer:false,
+    Xfiol:false,
     enddialog:false,
     addfun:false,
     sufun:false,
@@ -1434,7 +1534,7 @@ let options3=ref([
     qi:"false",
     date: '2016-05-03',
     device: '升阻比',
-    z: '大',
+    z: '大',
     q:1.0,
     cai:false,
     yin:1.0,
@@ -1560,9 +1660,18 @@ let options3=ref([
      dialogbolen();
   }
   const optimizerfalse=(val)=>{
-    console.log(11111)
-    dialog.value.optimizer=true;
-    console.log(dialog.value.optimizer);
+ if(val=='优化器'){
+  dialog.value.optimizer=true;
+ }else if(val=='进化优化器'){
+  dialog.value.jboptimizer=true;
+ }else if(val=='AirfoilAero'){
+  dialog.value.Xfiol=true;
+ }else{
+  dialog.value.optimizer=false;
+  dialog.value.jboptimizer=false;
+  dialog.value.Xfiol=false;
+ }
+
   }
   
   // 模块选择
@@ -1670,7 +1779,7 @@ let options3=ref([
         qi:"false",
         date: '2016-05-03',
         device: '升阻比',
-        z: '大',
+        z: '大',
         q:1.0,
         cai:false,
         yin:1.0,
@@ -1692,6 +1801,9 @@ let options3=ref([
       }
   </script>
   <style lang="scss" scoped>
+
+ 
+
   .conter_flex{
     display: flex;
     .ech{
@@ -1796,6 +1908,7 @@ display: flex;
   background: #DFDFDF ;
   border: 1px solid #2267B1;
   font-size: 14px;
+  text-align: center;
 
 }
 .footer-content{
@@ -1859,5 +1972,15 @@ border: 1px solid #2267B1;
 .conter_mian{
   padding: 1px;
 }
-
+.summary-dlg2 .el-dialog__body{
+  padding:0;
+}
+.summary-dlg .el-dialog__wrapper{
+    pointer-events:none;
+  }
+.summary-dlg .el-dialog{
+     pointer-events:auto; }
+     .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell{
+      background-color: #fff;
+     }
   </style>

+ 66 - 4
src/views/home/newfile.vue

@@ -13,9 +13,10 @@
       <el-collapse-item title="工程模板" name="2">
         <div class="collapse-list">
          
-            <div class="list"  v-for="(item, index) in collapselist" :key="index" >
-              <router-link :to="{ path: '/home', query: { id: index } }">
-                <el-image :src="item.img" fit="contain" ></el-image>       </router-link>
+            <div class="list"  v-for="(item, index) in collapselist" :key="index"  @click="clickimg(item,'2',index)" >
+              <!-- <router-link :to="{ path: '/home', query: { id: index } }"> -->
+                <el-image :src="item.image" fit="contain"  ></el-image>  
+                   <!-- </router-link> -->
             </div>
    
         </div>
@@ -62,18 +63,27 @@ import open3 from "@/assets/img/open3.png";
 let router = useRouter();
 let eldialog=ref(false);
 const activeNames = ref(['1','2']);
+let mid=ref('');
+let modelflow=ref();
+let gcid=ref('');//工程模版
+let mob=ref('');
 let newfile=ref({
   name:'',
   description:'',
 });
 
+onMounted(() => {
+  modelget();
+});
 const handleChange = (val) => {
   console.log(val)
 
 }
 const newclick = () => {
+     sessionStorage.clear();
   eldialog.value=true;
 
+
 }
 
 let collapselist = ref([
@@ -90,11 +100,63 @@ const saveclick=()=>{
     ElMessage.error('描述不能为空')
   }
   else{
-    router.push({ path: "/home" ,query:{name:1 ,vlaobj:JSON.stringify(newfile.value)}});
+    router.push({ path: "/home" ,query:{id:'1',name:1 ,vlaobj:JSON.stringify(newfile.value)}});
   eldialog.value = false;
+  if(gcid.value=='2'){
+    
+    modeladd();
   }
+  }
+
+}
+//模版添加
 
+// 模版查询
+const modelget=()=>{
+  const params = {
+        transCode: 'MDO0005',
+        count:5,
+        page:1,
+        searchtag:''
+    }
+    request(params)
+        .then((res) => {
+            collapselist.value=res.rows;
+        })
+        .catch((err) => {
+            ElMessage.error(err.returnMsg)
+        })
+}
+const modeladd=()=>{
+  const params = {
+        transCode: 'MDO0004',
+        mid:mid.value,
+        name:newfile.value.name,
+        remark:newfile.value.description
+    }
+    request(params)
+        .then((res) => {
+          ElMessage({
+                  message: res.returnMsg,
+                  type: 'success',
+              })
+              modelflow.value=res;
+              console.log(modelflow.value);
+              router.push({ path: "/home",query:{id:'2'}});
+              sessionStorage.setItem("objlist",JSON.stringify(modelflow.value));
+        })
+        .catch((err) => {
+            ElMessage.error(err.returnMsg)
+        })
 }
+const clickimg=(data,index,id)=>{
+   mid.value=data.mid;
+   mob.value=id;//判断当前点击第几的模版
+   gcid.value=index;
+eldialog.value=true;
+
+}
+
 </script>
 <style lang="scss" scoped>
 .collapse-list{

+ 1 - 1
src/views/home/querylist.vue

@@ -28,7 +28,7 @@
                             <el-button
                               size="small"
                               type="danger"
-                              @click="handdelete(scope.$index, scope.row)"
+                              @click.stop="handdelete(scope.$index, scope.row)"
                               >删除</el-button
                             >
                           </template>

+ 26 - 12
src/views/vuetree/index.vue

@@ -1,7 +1,7 @@
 <template>
   <VueFlow ref="vueFlowRef" :nodes="nodes" :edges="edges"  :class="{ dark }"
     class="basic-flow" 
-    :default-viewport="{ zoom: 1.5 }" :min-zoom="0.2" :max-zoom="1.5" @drop="onDrop"
+    :default-viewport="{ zoom: 1.5 }" :min-zoom="0.2" :max-zoom="2.5" @drop="onDrop"
     @contextmenu.prevent="onContextMenu" @node-contextmenu="logEvent('contextmenu', $event)" 
     @dragover="onDragOver" @dragleave="onDragLeave" @edge-click="onEdgeClick" @node-double-click="onNodeDoubleClick"  @node-click="onNodeClick">
     <template  #node-default="props">
@@ -72,6 +72,12 @@ const props = defineProps({
   optimizer: {
     type: Boolean,
   },
+  jboptimizer: {
+    type: Boolean,
+  },
+  Xfiol: {
+    type: Boolean,
+  },
   // color1: {
   //   type: String,
   // },
@@ -112,9 +118,13 @@ function onNodeClick(e) {
 }
 function onNodeDoubleClick(e) {
   noid.value = e.node;
-  if (e.node.data.label == '优化器'||e.node.data.label=='进化优化器') {
-    console.log(e.node);
-    emit('optimizerfalse', true);
+  if (e.node.data.label == '优化器') {
+    emit('optimizerfalse','优化器');
+  }else if(e.node.data.label=='进化优化器'){
+    emit('optimizerfalse','进化优化器');
+
+  }else if(e.node.data.label=='AirfoilAero'){
+    emit('optimizerfalse','AirfoilAero');
   }
 
 }
@@ -196,6 +206,7 @@ const addflow = () => {
         isshare:'1',
         flow:mergedObj.value 
     }
+    console.log(params);
     request(params)
         .then((res) => {
             console.log(res);
@@ -219,28 +230,31 @@ function toggleDarkMode() {
   dark.value = !dark.value
 }
 onMounted(() => {
-  getroter();
+  setTimeout(function() {
+    getroter();
+}, 1500);
   // childfun();
 
 });
 // 获取链接
 const getroter=()=>{
 
- if(route.query.id=='2'){
+  if(route.query.id=='1'){
+    let nodesflow=JSON.parse(route.query.vlaobj)
+    newobj.value.name=nodesflow.name;
+    newobj.value.description=nodesflow.description;
+
+ }else if(route.query.id=='2'){
   let objlist=JSON.parse(sessionStorage.getItem("objlist"));
   let nodesflow=JSON.parse(objlist.flow)
-
+console.log(objlist);
+console.log(2233345)
       nodes.value=nodesflow.nodes;
       edges.value=nodesflow.edges;
       newobj.value.name=objlist.name;
       newobj.value.description=objlist.remark;
       console.log(objlist.pid);
       pid.value=objlist.pid;
- }else if(route.query.id='1'&&route.query!={}){
-  newroter.value=JSON.parse(route.query.vlaobj);
-  newobj.value= newroter.value;
-   console.log( newobj.value);
-  
  }
 }
 //改变线的粗

+ 3 - 2
src/views/vuetree/useDnD.js

@@ -55,7 +55,7 @@ function imagefun(){
     }else if(nid=='3-7'){
       return datas = {label:'Nastran', image:xuek7}
     }else if(nid=='3-8'){
-      return datas = {label:'Python', image:xuek8}
+      return datas = {label:'Rosenbrock', image:xuek8}
     }else if(nid=='3-9'){
       return datas = {label:'AirfoilAero', image:xuek9}
     }else if(nid=='4-1'){
@@ -186,7 +186,8 @@ export default function useDragAndDrop() {
       off()
     })
     addNodes(snodes.value)
-    //addEdges(sedges.value)
+    
+   // addEdges(sedges.value)
   }
 
   return {