tangjunhao 5 месяцев назад
Родитель
Сommit
6335a8bd61

+ 2 - 2
src/views/components/fileuploads.vue

@@ -304,9 +304,9 @@ defineExpose({ gfid, bfid, initWebUploader, files, msg })
 .text_color .webuploader-pick {
   color: #d5d5d5;
 }
-.el-progress__text {
+/* .el-progress__text {
   color: #d5d5d5 !important;
-}
+} */
 .disflex .el-col {
   color: #fff;
 }

+ 22 - 8
src/views/home.vue

@@ -1090,7 +1090,7 @@
             <template #footer>
               <div class="dialog-footer">
                 <el-button @click="dialog.Taxs = false">取消</el-button>
-                <el-button type="primary">
+                <el-button type="primary" @click="dialog.Taxs = false">
                   确定
                 </el-button>
               </div>
@@ -1311,12 +1311,13 @@
             <div class="main_container">
               <div class="main_model">
                 <div class="jindutiao" v-show="progressshow">
+                  <span style="width: 150px;">运行进度</span>
                   <!-- <el-progress :text-inside="true" :stroke-width="26" :percentage="70" /> -->
                   <div class="demo-progress">
-                    <el-progress :percentage="percentage" :stroke-width="15" :color="customColors">
-                      <template #default="{ percentage }">
+                    <el-progress :percentage="percentage" :color="customColor">
+                      <!-- <template #default="{ percentage }">
                         <span class="percentage-value">当前进度:{{ percentage }}%</span>
-                      </template>
+                      </template> -->
                     </el-progress>
                     <!-- <button @click="tbn">点我</button> -->
                   </div>
@@ -1567,7 +1568,7 @@
                             <div class="sev_ruwu">
                               <div class="disflex flexend">
                                 <el-form-item label="新增变量数:" v-if="activeIndex2 === 0">
-                                  <el-input v-model="tableval" maxlength="18"
+                                  <el-input v-model="tableval" maxlength="6"
                                     oninput="value=value.replace(/[^\a-\z\A-\Z0-9\u4E00-\u9FA5]/g,'')" class="w-50 m-2"
                                   /> 
                                 </el-form-item>
@@ -2196,6 +2197,9 @@ const tasktable = ref([
 
   // },
 ])
+
+const customColor = ref('#2267B1')
+
 const customColors = [
   { color: '#f56c6c', percentage: 20 },
   { color: '#f56c6c', percentage: 40 },
@@ -3249,7 +3253,7 @@ const onAddItem = () => {
     for (let i = 0; i < tablevalnum; i++) {
       eloptimize.value.push({
         name: `c${i + 1}`,
-        optdir: 1,
+        optdir: '1',
         weight: 0,
         scaling: 0,
         factor: 0,
@@ -4642,15 +4646,25 @@ color: #2267B1;
 }
 
 .jindutiao {
-
+  margin: 20px;
+  width: 60%;
   padding: 0 0 2px 0px;
-  background: #9FCDFF;
+  /* background: #9FCDFF; */
+  display: flex;
+  justify-content: center;
+  align-items: center;
 }
 
 .jindutiao .demo-progress {
   width: 100%;
 }
 
+.jindutiao .demo-progress .el-progress__text {
+  font-size: 13px;
+  color: #333333;
+  font-family: 'Microsoft YaHei';
+}
+
 .jindutiao .percentage-value {
   font-size: 13px;
   color: #333333;

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

@@ -89,7 +89,7 @@
       <span class="dialog-footer">
         <el-button @click="eldialog = false">取消</el-button>
         <el-button type="primary" @click="saveclick();"
-          >确</el-button
+          >确</el-button
         >
       </span>
     </template>

+ 2 - 2
src/views/threejsView/components/ThreeScene.vue

@@ -319,7 +319,7 @@ const adjustCameraForCgns = (scene, camera) => {
 .el-checkbox__label{
   font-size: 12px;
 }
-.el-progress-bar__outer{
+/* .el-progress-bar__outer{
   height: 15px !important;
-}
+} */
 </style>

+ 2 - 2
src/views/titlecomponent/Doptimize.vue

@@ -30,10 +30,10 @@
                   <div style="display: flex;">
                 <el-input type="text" style="margin-right: 10px;" v-model="youhua.ns">
                   <!-- <template #prepend>X方向</template> -->
-                  <template  #prefix>初始 </template>
+                  <template  #prefix><span style="margin-right: 8px;">初始</span></template>
                 </el-input>
                 <el-input type="text" style="margin-right: 10px;" v-model="youhua.nsmax">
-                  <template  #prefix>最大</template>
+                  <template  #prefix><span style="margin-right: 8px;">最大</span></template>
                 </el-input>
               </div>
               </el-form-item>

+ 2 - 2
src/views/titlecomponent/Xfoil.vue

@@ -254,14 +254,14 @@ let outParams = ref([
   {
     code: "xtr_upper",
     value: "0.1",
-    name: "上表面转点位置xtr-upper",
+    name: "上表面转点位置xtr-upper",
     flag: 1,
     
   },
   {
     code: "xtr_lower",
     value: "0.1",
-    name: "下表面转点位置xtr-lower",
+    name: "下表面转点位置xtr-lower",
     flag: 1,
     
   }

+ 1 - 1
src/views/titlecomponent/ffds.vue

@@ -102,7 +102,7 @@ let wid = ref()
 let fid = ref()
 let ffdid = ref()
 let ffdvalue = ref({
-  fname: "204",
+  fname: "",
   nx: 10,
   ny: 2,
   nz: 2

+ 1 - 6
src/views/vuetree/Sidebar.vue

@@ -173,12 +173,7 @@ const datatree = ref([
           img:'fsi.png',
           name:'FSI'
         },
-        {
-          id:'3-14',
-          label: 'CATIA',
-          img:'catia.png',
-          name:'CATIA'
-        },
+        
         {
           id:'3-15',
           label: 'Flight',