Ver Fonte

303页面修改,补充默认值

tangjunhao há 6 meses atrás
pai
commit
6ca5334c97

BIN
src/assets/flowimg/flight.png


+ 0 - 1
src/style/index.css

@@ -659,7 +659,6 @@ ul{
 height: 30px;
 }
 .colortext  .classtable .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf, .eldesign,.colortext  .classtable .el-table td.el-table__cell div{
-   /* background-color: rgba(238, 238, 238, 1);  */
    background-color:#fafafa; 
    color: #333333;
    font-weight: 400;

+ 8 - 295
src/views/home.vue

@@ -717,181 +717,7 @@
               </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="youhua.algorithm" :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="youhua.popsize" :step="100" :min="0" :max="1000" controls-position="right" />
-                </el-form-item>
-                <el-form-item label="迭代次数:" :label-width="formLabelWidth1">
-                  <el-input-number v-model="youhua.epoch" :step="100" :min="0" :max="1000" controls-position="right" />
-                </el-form-item>
-                <el-form-item label="交叉概率:" :label-width="formLabelWidth1">
-                  <el-input-number v-model="youhua.probcrossover" :step="0.1" :min="0" :max="1000"
-                    controls-position="right" />
-                </el-form-item>
-                <el-form-item label="变异概率:" :label-width="formLabelWidth1">
-                  <el-input-number v-model="youhua.probmut" :step="0.1" :min="0" :max="1000" controls-position="right" />
-                </el-form-item>
-                <el-form-item label="交叉算子:" :label-width="formLabelWidth1">
-                  <el-select v-model="youhua.proboperator" :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="youhua.probscale" :min="0" :max="100" controls-position="right" />
-                </el-form-item>
-                <el-form-item label="保留优选策略:" :label-width="formLabelWidth1">
-                  <el-select v-model="youhua.strategy" :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="youhua.operator" :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="youhua.gpu" :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="getaddsave(); 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="dianjia(index)">{{ tab }}</li>
-              </ul>
-              <div class="chushij">
-                <el-button type="info" size="small" @click="initialize()">初始化</el-button>
-              </div> -->
-              <!-- 输入 -->
-              <!-- <div class="eldesign classtable" style="margin-top: 10px;" v-if="activeIndex3 == 0">
-                <el-table :data="srtable" border style="width: 100%" height="400">
-                  <el-table-column prop="enable" label="启用" width="50">
-                    <template v-slot="scope">
-                      <el-checkbox :false-label="'0'" :true-label="'1'" :label="false" v-model="scope.row.enable" />
-                    </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="v1" label="参数值1">
-                    <template #default="{ row }">
-                      <el-input v-model.number="row.v1" @change="handleEdit(row)" />
-                    </template>
-                  </el-table-column>
-                  <el-table-column prop="v2" label="参数值2" width="100">
-                    <template #default="{ row }">
-                      <el-input v-model.number="row.v2" @change="handleEdit(row)" />
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="操作" width="140">
-                    <template #default="scope">
-                      <el-button size="small" type="success" @click.stop="susave(scope.$index, scope.row)">保存</el-button>
-                      <el-button size="small" type="danger" @click.stop="sudelete(scope.$index, scope.row)">删除</el-button>
-                    </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-select v-model="zhixing" :suffix-icon="CaretBottom" placeholder="请选择">
-                      <el-option label="Rosenbrock" value="Rosenbrock">
-                      </el-option>
-                    </el-select>
-                  </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="sctable" border style="width: 100%" height="400">
-                  <el-table-column prop="enable" label="启用" width="50">
-                    <template v-slot="scope">
-                      <el-checkbox :false-label="'0'" :true-label="'1'" :label="false" v-model="scope.row.enable" />
-                    </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="v1" label="参数值1">
-                    <template #default="{ row }">
-                      <el-input v-model="row.v1" @change="handleEdit(row)" />
-                    </template>
-                  </el-table-column>
-                  <el-table-column prop="v2" label="参数值2" width="100">
-                    <template #default="{ row }">
-                      <el-input v-model="row.v2" @change="handleEdit(row)" />
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="操作" width="140">
-                    <template #default="scope">
-                      <el-button size="small" type="success" @click.stop="scsave(scope.$index, scope.row)">保存</el-button>
-                      <el-button size="small" type="danger" @click.stop="scdelete(scope.$index, scope.row)">删除</el-button>
-                    </template>
-                  </el-table-column>
-                </el-table>
-              </div>
-            </div>
-            <template #footer>
-              <div class="dialog-footer">
-                <el-button type="info" @click="newxfiol">新建 </el-button>
-                <el-button type="info" @click="dialog.Xfiol = false">取消</el-button>
-                <el-button type="primary" @click="dialog.Xfiol = 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"
@@ -915,117 +741,7 @@
               </div>
             </template>
           </el-dialog>
-          <!--梯度优化器  -->
-          <!-- <el-dialog v-model="dialog.tidu" 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('xuek12.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="youhua.algorithm" :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 v-model="youhua.popsize" :step="100" :min="0" :max="1000" controls-position="right" />
-                </el-form-item>
-                <el-form-item label="输出精度等级:" :label-width="formLabelWidth1">
-                  <el-input v-model="youhua.epoch" :step="100" :min="0" :max="1000" controls-position="right" />
-                </el-form-item>
-                <el-form-item label="线性约束容差:" :label-width="formLabelWidth1">
-                  <el-input v-model="youhua.epoch" :step="100" :min="0" :max="1000" controls-position="right" />
-                </el-form-item>
-                <el-form-item label="非线性约束容差:" :label-width="formLabelWidth1">
-                  <el-input v-model="youhua.epoch" :step="100" :min="0" :max="1000" controls-position="right" />
-                </el-form-item>
-                <el-form-item label="最优性度量容差::" :label-width="formLabelWidth1">
-                  <el-input v-model="youhua.epoch" :step="100" :min="0" :max="1000" controls-position="right" />
-                </el-form-item>
-                <el-form-item label="梯度验证级别:" :label-width="formLabelWidth1">
-                  <el-select v-model="youhua.algorithm" :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>
-            </div>
-            <template #footer>
-              <div class="dialog-footer">
-                <el-button @click="dialog.tidu = false">取消</el-button>
-                <el-button type="primary" @click=" dialog.tidu = false">
-                  确定
-                </el-button>
-              </div>
-            </template>
-          </el-dialog> -->
-           <!--CST  -->
-           <!-- <el-dialog v-model="dialog.CSTt" 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="900" class="dialog_class bgcolor tianjia sel">
-
-            <template #header="{ titleId, titleClass }">
-              <div class="my-header ">
-                <el-image :src="getImgPath('xuek0.png')" fit="contain"></el-image>
-                <h4 :id="titleId" :class="titleClass">CST</h4>
-              </div>
-            </template>
-            <div class="numberinput lefttext ">
-              <el-form>
-                <div style="width: 49%;">
-                <el-form-item label="CST阶数:" :label-width="formLabelWidth3">
-                  <el-input v-model="cstnum" :max="20" controls-position="right" @keydown.enter='keydownenter'/>
-                </el-form-item>
-              </div>
-                <div style="display: flex;">
-                <div class="cstleft ">
-                <el-form-item label="上表面类函数参数N1:" :label-width="formLabelWidth1">
-                  <el-input v-model="youhua.popsize" :step="100" :min="0" :max="1000" controls-position="right" />
-                </el-form-item>
-                <el-form-item label="下表面类函数参数N1:" :label-width="formLabelWidth1">
-                  <el-input v-model="youhua.popsize" :step="100" :min="0" :max="1000" controls-position="right" />
-                </el-form-item>
-              </div>
-              <div class="cstleft " style="margin-left: 20px;">
-                <el-form-item label="上表面类函数参数N2:" :label-width="formLabelWidth1">
-                  <el-input v-model="youhua.popsize" :step="100" :min="0" :max="1000" controls-position="right" />
-                </el-form-item>
-                <el-form-item label="下表面类函数参数N2:" :label-width="formLabelWidth1">
-                  <el-input v-model="youhua.popsize" :step="100" :min="0" :max="1000" controls-position="right" />
-                </el-form-item>
-              </div>
-            </div>
-            <div class="classtable">
-            <el-table :data="tableDatacst" style="width: 100%" border>
-              <el-table-column prop="date" label="" width="180" />
-              <el-table-column
-                v-for="(item,index) in tablecstHeaders" :key="index"
-                :prop="item.prop"
-                :label="item.label">
-                  <template #default="{ row }"> 
-                      <el-input v-model="row[item.prop]"  @change="handleEdit(row)"/>
-                    </template>
-              </el-table-column>
-          </el-table>
-        </div>
-              </el-form>
-            </div>
-            <template #footer>
-              <div class="dialog-footer">
-                <el-button @click="dialog.CSTt = false">取消</el-button>
-                <el-button type="primary" @click="cstok()">
-                  确定
-                </el-button>
-              </div>
-            </template>
-          </el-dialog> -->
+          
           <!-- 列表 -->
           <el-dialog v-model="dialog.listdialog" 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"
@@ -1233,7 +949,7 @@
           <!-- 导出报告 -->
           <el-dialog v-model="dialog.exportreport" 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="700" class="dialog_class bgcolor tianjia sel" style="height: 722px;">
+            :before-close="handleClose" width="600" class="dialog_class bgcolor tianjia sel" style="max-height: 70%;">
 
             <template #header="{ titleId, titleClass }">
               <div class="my-header ">
@@ -1286,7 +1002,7 @@
           <!-- CST -->
           <el-dialog v-model="dialog.CSTt" 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="900" class="dialog_class bgcolor colortext tianjia sel">
+            :before-close="handleClose" width="840" class="dialog_class bgcolor colortext tianjia sel">
 
             <template #header="{ titleId, titleClass }">
               <div class="my-header ">
@@ -1307,7 +1023,7 @@
            <!-- FFD -->
            <el-dialog v-model="dialog.ffdt" 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="900" class="dialog_class bgcolor colortext tianjia sel">
+            :before-close="handleClose" width="730" class="dialog_class bgcolor colortext tianjia sel">
 
             <template #header="{ titleId, titleClass }">
               <div class="my-header ">
@@ -4554,14 +4270,11 @@ color: #2267B1;
  background: #fff;
 }
 
-.classtable .el-table .cell {
-  font-family: 'Source Sans-Regular';
-  font-size: 14px;
-}
-
 .classtable .el-table td.el-table__cell div {
-  height: 30px;
+  height: 31px;
   overflow: hidden;
+  display: flex;
+  align-items: center; /* 垂直居中 */
 }
 
 .classtable .el-table td.el-table__cell,

+ 6 - 2
src/views/home/querylist.vue

@@ -48,11 +48,15 @@
                 v-model:page-size="gd.pageSize4"
                 small
                 background
-                layout="prev, total, pager, next"
+                layout="prev, slot, pager, next"
                 :total="parseInt(gd.total)"
                 class="mt-4"
                 @current-change="handleCurrentChange2"
-            />
+            >
+              <template #default>
+                <span>总计 {{ gd.total }}</span>
+              </template>
+            </el-pagination>
         </div>
     </div>
 </template>

+ 19 - 4
src/views/openpage.vue

@@ -17,11 +17,11 @@
                     fit="contain"
                 ></el-image> -->
             </div>
-            <h3  class="zjmian"><span><el-image
+            <h3  class="zjmian"><el-button @click="gohome()"><el-image
                     style="height: 100%"
                     :src="leftjt"
                     fit="contain"
-                ></el-image></span>主界面</h3>
+                ></el-image>主界面</el-button></h3>
             <el-menu-item  index="/home/newfile">新建</el-menu-item>
            <el-menu-item   index="/home/querylist" >打开</el-menu-item>
           <el-menu-item    index="/home/savefile" >保存</el-menu-item>
@@ -64,6 +64,12 @@ const activeIndex=computed(()=>{
     }
 
     }
+
+const gohome = () => {
+  let objlist = JSON.parse(sessionStorage.getItem("objlist"));
+  router.push({path:"/home",query:{pid:objlist.pid}});
+}
+
 </script>
 <style lang="scss" scoped>
 .zjmian{
@@ -76,8 +82,17 @@ span{
   margin-right: 12px;
 }
 .el-image{
-  margin-bottom: 5px;
-
+  // margin-bottom: 5px;
+  width: 20px;
+  margin-right: 8px;
+}
+.el-button{
+  color: #FFD153;
+  background-color: #2267B1;
+  border: none;
+  padding: 8px 15px 8px 7px;
+  font-size: 18px;
+  font-family: 'Source Sans Pro-Regular';
 }
 }
 

+ 10 - 10
src/views/titlecomponent/ADflow.vue

@@ -358,27 +358,27 @@ let liftindexlist = ref([
   { label: "z", value: 3 }
 ])
 let inParams = ref([
-  {
-    code: "alpha",
-    value: 2.66482,
-    name: "攻角",
-    type: 1,
-    flag: 1
-  },
   {
     code: "mach",
     value: 0.734,
-    name: "马赫数",
+    name: "马赫数Ma",
     type: 1,
     flag: 1
   },
   {
     code: "reynolds",
     value: 6.5e6,
-    name: "雷诺数",
+    name: "雷诺数Re",
     type: 1,
     flag: 1
-  }
+  },
+  {
+    code: "alpha",
+    value: 2.66482,
+    name: "攻角AoA",
+    type: 1,
+    flag: 1
+  },
 ])
 
 let outParams = ref([

+ 5 - 5
src/views/titlecomponent/Exreport.vue

@@ -9,13 +9,13 @@
       <el-radio :value="HTML">HTML</el-radio>
       <el-radio :value="image">image</el-radio>
     </el-radio-group>
-    <div style="text-align: center;width: 100%;">
+    <!-- <div style="text-align: center;width: 100%;">
       <el-transfer 
       v-model="selectedvalue" 
       :data="tranlist"
-      
+      class="custom_transfer"
       />
-    </div>
+    </div> -->
     <el-form-item label="选择文件:" :label-width="formLabelWidth">
       <el-row style="width: 100%">
         <el-col :span="24">
@@ -36,14 +36,14 @@
         </el-col>
       </el-row>
     </el-form-item>
-    <div>
+    <!-- <div>
       <el-checkbox-group>
         <el-checkbox label="表1" value="表1"/>
         <el-checkbox label="表1" value="表1"/>
         <el-checkbox label="表1" value="表1"/>
         <el-checkbox label="表1" value="表1"/>
       </el-checkbox-group>
-    </div>
+    </div> -->
     <el-form-item label="选择名称:" :label-width="formLabelWidth">
       <el-row>
         <el-col span="20">

+ 27 - 14
src/views/titlecomponent/csts.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="XFpdding">
+  <div class="XFpdding" style="height: 463px;">
     <div class="numberinput lefttext">
       <el-form>
         <div>
@@ -78,7 +78,7 @@
         </div>
         <div class="classtable">
           <el-table :data="tableDatacst" style="width: 100%" border="true">
-            <el-table-column prop="date" label="" width="180" />
+            <el-table-column prop="date" label="" width="150" />
             <el-table-column
               v-for="(item, index) in tablecstHeaders"
               :key="index"
@@ -104,20 +104,33 @@ import { ElMessage, ElButton, ElDialog, ElSelect } from "element-plus"
 import { Edit, CaretBottom } from "@element-plus/icons-vue"
 import { cs, ta } from "element-plus/es/locale/index.mjs"
 let formLabelWidth3 = ref(100)
-let formLabelWidth200 = ref(200)
-let cstn = ref("")
+let formLabelWidth200 = ref(180)
+let cstn = ref("8")
 let pid = ref("")
 let cstid = ref("")
 let cstvalue = ref({
-  uppern1: "",
-  lowern1: "",
-  uppern2: "",
-  lowern2: "",
+  uppern1: "0.5",
+  lowern1: "1",
+  uppern2: "0.5",
+  lowern2: "1",
 })
 let upperb = ref("")
 let lowerb = ref("")
-let tableDatacst = ref([{ date: "上表面CST参数" }, { date: "下表面CST参数" }])
-let tablecstHeaders = ref([])
+let tableDatacst = ref([
+  { date: "上表面CST参数", X1: "0.173482", X2: "0.151492", X3: "0.180515", X4: "0.121639", X5: "0.182491", X6: "0.118110", X7: "0.157365", X8: "0.136958", X9: "0.146738" },
+  { date: "下表面CST参数", X1: "0.173482", X2: "0.151492", X3: "0.180515", X4: "0.121639", X5: "0.182491", X6: "0.118110", X7: "0.157365", X8: "0.136958", X9: "0.146738" }
+])
+let tablecstHeaders = ref([
+  {prop:"X1",label:"X1"},
+  {prop:"X2",label:"X2"},
+  {prop:"X3",label:"X3"},
+  {prop:"X4",label:"X4"},
+  {prop:"X5",label:"X5"},
+  {prop:"X6",label:"X6"},
+  {prop:"X7",label:"X7"},
+  {prop:"X8",label:"X8"},
+  {prop:"X9",label:"X9"},
+])
 // cst时间
 const clickblur = () => {
   //cstnum.value='';
@@ -128,18 +141,18 @@ const clickblur = () => {
   if (num == 0 || num == undefined || num == null) {
   } else {
     for (let i = 1; i <= num + 1; i++) {
-      arrheader.push("x" + i)
+      arrheader.push("X" + i)
     }
     arrheader.forEach(function (item, index) {
-      let name = "x" + Number(index + 1)
+      let name = "X" + Number(index + 1)
       let obj = { label: item, prop: name }
       console.log(obj)
       tablecstHeaders.value.push(obj)
     })
     tableDatacst.value.forEach(function (item) {
       for (let j = 1; j <= num + 1; j++) {
-        let name = "x" + j
-        item["x" + j] = null
+        let name = "X" + j
+        item["X" + j] = null
       }
       tablearr.push(item)
     })

+ 53 - 40
src/views/titlecomponent/ffds.vue

@@ -1,7 +1,7 @@
 <template>
-  <div class="XFpdding">
+  <div class="XFpdding" style="height: 463px;">
     <div>
-      <el-form-item label="FFD包围盒:" >
+      <el-form-item label="FFD包围盒:" :label-width="formLabelWidth1">
         <el-input
           v-model="ffdvalue.fname"
           :max="20"
@@ -21,7 +21,7 @@
         </template>
         </el-input>
       </el-form-item>
-      <el-form-item label="参考坐标系:" >
+      <el-form-item label="参考坐标系:" :label-width="formLabelWidth1">
         <el-radio-group v-model="order">
           <el-radio :value="0" :label="0">x-y-z</el-radio>
           <el-radio :value="1" :label="1">x-z-y</el-radio>
@@ -32,24 +32,25 @@
         </el-radio-group>
       </el-form-item>
     </div>
-    <el-form-item label="控制点数:" >
-      <div style="display: flex">
-        <el-input type="text" style="margin-right: 10px" v-model="ffdvalue.nx">
-          <!-- <template #prepend>X方向</template> -->
-          <template #prefix>X方向</template>
-        </el-input>
-        <el-input type="text" style="margin-right: 10px" v-model="ffdvalue.ny">
-          <template #prefix>Y方向</template>
-        </el-input>
-        <el-input type="text" style="margin-right: 10px" v-model="ffdvalue.nz">
-          <template #prefix>Z方向</template>
-        </el-input>
-        <el-button @click="generateTable">应用</el-button>
-      </div>
+    <el-form-item label="控制点数(X,Y,Z):" :label-width="formLabelWidth1">
+      <el-row style="width: 100%;" :gutter="5">
+        <el-col :span="6">
+          <el-input-number style="width: 120px;" v-model="ffdvalue.nx" controls-position="right" />
+        </el-col>
+        <el-col :span="6">
+          <el-input-number style="width: 120px;" v-model="ffdvalue.ny" controls-position="right" />
+        </el-col>
+        <el-col :span="6">
+          <el-input-number style="width: 120px;" v-model="ffdvalue.nz" controls-position="right" />
+        </el-col>
+        <el-col :span="6">
+          <el-button @click="generateTable" style="width: 100%;">应用</el-button>
+        </el-col>
+      </el-row>
     </el-form-item>
     <div class="classtable">
       <el-table :data="tableDatacst1" style="width: 100%" border>
-        <el-table-column prop="表格" label="" width="180" />
+        <el-table-column prop="axis" label="" width="60" />
         <el-table-column
           v-for="(item, index) in tablecstHeaders"
           :key="index"
@@ -72,22 +73,34 @@ import fileUploads from '../components/fileuploads.vue'
 import { request, uploadFile } from "@/utils/request"
 import { ElMessage, ElButton, ElDialog, ElSelect } from "element-plus"
 import { Edit, CaretBottom } from "@element-plus/icons-vue"
-let formLabelWidth3 = ref(100)
-let formLabelWidth200 = ref(200)
+let formLabelWidth1 = ref('200')
 
 let pid = ref()
 let fid = ref()
 let ffdid = ref()
 let ffdvalue = ref({
-  fname: "",
-  nx: 0,
-  ny: 0,
-  nz: 0
+  fname: "204",
+  nx: 10,
+  ny: 2,
+  nz: 2
 })
-let order = ref(0)
+let order = ref(1)
 let vars = ref()
-let tableDatacst1 = ref([])
-let tablecstHeaders = ref([]) // 表格列头
+let tableDatacst1 = ref([
+{ axis: "Z1", X1: "1", X2: "2", X3: "3", X4: "4", X5: "5", X6: "6", X7: "7", X8: "8", X9: "9" },
+{ axis: "Z2", X1: "1", X2: "2", X3: "3", X4: "4", X5: "5", X6: "6", X7: "7", X8: "8", X9: "9" }
+])
+let tablecstHeaders = ref([
+  {prop:"X1",label:"X1"},
+  {prop:"X2",label:"X2"},
+  {prop:"X3",label:"X3"},
+  {prop:"X4",label:"X4"},
+  {prop:"X5",label:"X5"},
+  {prop:"X6",label:"X6"},
+  {prop:"X7",label:"X7"},
+  {prop:"X8",label:"X8"},
+  {prop:"X9",label:"X9"},
+]) 
 const imageSrc = new URL('@/assets/flowimg/ffdFileSave.png', import.meta.url).href;
 const generateTable = () => {
   console.log("generateTable");
@@ -103,28 +116,28 @@ const generateTable = () => {
 
   switch (order.value) {
     case 0: // x-y-z
-      columns = Array.from({ length: xCount }, (_, i) => ({ label: `x${i + 1}`, prop: `x${i + 1}` }));
-      rows = Array.from({ length: yCount }, (_, i) => ({ label: `y${i + 1}`, prop: `y${i + 1}` }));
+      columns = Array.from({ length: xCount }, (_, i) => ({ label: `X${i + 1}`, prop: `X${i + 1}` }));
+      rows = Array.from({ length: yCount }, (_, i) => ({ label: `Y${i + 1}`, prop: `Y${i + 1}` }));
       break;
     case 1: // x-z-y
-      columns = Array.from({ length: xCount }, (_, i) => ({ label: `x${i + 1}`, prop: `x${i + 1}` }));
-      rows = Array.from({ length: zCount }, (_, i) => ({ label: `z${i + 1}`, prop: `z${i + 1}` }));
+      columns = Array.from({ length: xCount }, (_, i) => ({ label: `X${i + 1}`, prop: `X${i + 1}` }));
+      rows = Array.from({ length: zCount }, (_, i) => ({ label: `Z${i + 1}`, prop: `Z${i + 1}` }));
       break;
     case 2: // y-x-z
-      columns = Array.from({ length: yCount }, (_, i) => ({ label: `y${i + 1}`, prop: `y${i + 1}` }));
-      rows = Array.from({ length: xCount }, (_, i) => ({ label: `x${i + 1}`, prop: `x${i + 1}` }));
+      columns = Array.from({ length: yCount }, (_, i) => ({ label: `Y${i + 1}`, prop: `Y${i + 1}` }));
+      rows = Array.from({ length: xCount }, (_, i) => ({ label: `X${i + 1}`, prop: `X${i + 1}` }));
       break;
     case 3: // y-z-x
-      columns = Array.from({ length: yCount }, (_, i) => ({ label: `y${i + 1}`, prop: `y${i + 1}` }));
-      rows = Array.from({ length: zCount }, (_, i) => ({ label: `z${i + 1}`, prop: `z${i + 1}` }));
+      columns = Array.from({ length: yCount }, (_, i) => ({ label: `Y${i + 1}`, prop: `Y${i + 1}` }));
+      rows = Array.from({ length: zCount }, (_, i) => ({ label: `Z${i + 1}`, prop: `Z${i + 1}` }));
       break;
     case 4: // z-x-y
-      columns = Array.from({ length: zCount }, (_, i) => ({ label: `z${i + 1}`, prop: `z${i + 1}` }));
-      rows = Array.from({ length: xCount }, (_, i) => ({ label: `x${i + 1}`, prop: `x${i + 1}` }));
+      columns = Array.from({ length: zCount }, (_, i) => ({ label: `Z${i + 1}`, prop: `Z${i + 1}` }));
+      rows = Array.from({ length: xCount }, (_, i) => ({ label: `X${i + 1}`, prop: `X${i + 1}` }));
       break;
     case 5: // z-y-x
-      columns = Array.from({ length: zCount }, (_, i) => ({ label: `z${i + 1}`, prop: `z${i + 1}` }));
-      rows = Array.from({ length: yCount }, (_, i) => ({ label: `y${i + 1}`, prop: `y${i + 1}` }));
+      columns = Array.from({ length: zCount }, (_, i) => ({ label: `Z${i + 1}`, prop: `Z${i + 1}` }));
+      rows = Array.from({ length: yCount }, (_, i) => ({ label: `Y${i + 1}`, prop: `Y${i + 1}` }));
       break;
     default:
       break;
@@ -136,7 +149,7 @@ const generateTable = () => {
   // 生成表格的数据行
   tableDatacst1.value = [];
   for (let i = 1; i <= rows.length; i++) {
-    let row = { 表格: rows[i - 1].label };
+    let row = { axis: rows[i - 1].label };
     columns.forEach((column) => {
       row[column.prop] = null; // 每个单元格初始化为空
     });