1. fix sql

2. update css

fidms-ui/src/layout/components/Navbar.vue

@@ -8,14 +8,6 @@
     <div class="right-menu">
       <template v-if="device!=='mobile'">
         <search id="header-search" class="right-menu-item" />
-        
-        <el-tooltip content="源码地址" effect="dark" placement="bottom">
-          <fidmsGit id="fidms-git" class="right-menu-item hover-effect" />
-        </el-tooltip>
-
-        <el-tooltip content="文档地址" effect="dark" placement="bottom">
-          <fidmsDoc id="fidms-doc" class="right-menu-item hover-effect" />
-        </el-tooltip>
 
         <screenfull id="screenfull" class="right-menu-item hover-effect" />
 

fidms-ui/src/views/data/allinfo/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
 
       <el-form-item label="飞机类型" prop="aircraftType">
         <el-input
@@ -75,7 +75,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item> -->
-      
+
       <el-form-item label="飞行高度" prop="flightAltitude">
         <el-input
         v-model="queryParams.flightAltitude"
@@ -147,10 +147,10 @@
     </el-form>
 
 
-    
+
 
     <el-row :gutter="10" class="mb8">
-      
+
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -297,7 +297,7 @@
       <el-table-column label="探测距离" align="center" prop="detectDistance" />
       <el-table-column label="探测方位角" align="center" prop="detectAngle" />
       <el-table-column label="红外波段" align="center" prop="ifiinfraredBand" />
-      
+
 
       <el-table-column label="红外输出编号" align="center" prop="ifoid" />
       <!-- <el-table-column label="对应红外输入编号" align="center" prop="infraredInputID" /> -->
@@ -327,9 +327,9 @@
           <image-preview v-if="scope.row.infraredImagePath !== null" :src="scope.row.infraredImagePath" :width="30" :height="30" ></image-preview>
       </template>
       </el-table-column>
-    
+
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -338,7 +338,7 @@
       @pagination="getList"
     />
 
-    
+
   </div>
 </template>
 

fidms-ui/src/views/data/flowIn/index.vue

@@ -239,8 +239,8 @@
     />
 
     <!-- 添加或修改流场输入对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="650px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="130px">
         <el-row>
           <el-form-item label="3D模型" prop="model3dId">
           <el-select v-model="form.model3dId" placeholder="请选择3D模型">
@@ -334,19 +334,19 @@
           <file-upload v-model="form.fluentGridFile"/>
         </el-form-item>
         <el-form-item label="Fluent网格文件" prop="fluentGridFilePath">
-          <file-upload v-model="form.fluentGridFilePath" :fileType="fileTypeGrid" :fileSize="100" :limit="1"/>
+          <file-upload v-model="form.fluentGridFilePath" :fileType="fileTypeGrid" :fileSize="2048" :limit="1"/>
         </el-form-item>-->
         <!-- <el-form-item label="Fluent cas文件" prop="fluentCasFile">
           <file-upload v-model="form.fluentCasFile"/>
         </el-form-item>
         <el-form-item label="Fluent cas文件" prop="fluentCasFilePath">
-          <file-upload v-model="form.fluentCasFilePath" :fileType="fileTypeCas" :fileSize="100" :limit="1"/>
+          <file-upload v-model="form.fluentCasFilePath" :fileType="fileTypeCas" :fileSize="2048" :limit="1"/>
         </el-form-item>-->
         <!-- <el-form-item label="Fluent dat文件路径" prop="fluentDatFile">
           <file-upload v-model="form.fluentDatFile"/>
         </el-form-item>
         <el-form-item label="Fluent dat文件" prop="fluentDatFilePath">
-          <file-upload v-model="form.fluentDatFilePath" :fileType="fileTypeDat" :fileSize="100" :limit="1"/>
+          <file-upload v-model="form.fluentDatFilePath" :fileType="fileTypeDat" :fileSize="2048" :limit="1"/>
         </el-form-item> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -531,7 +531,7 @@ export default {
             },
             trigger: 'change'
           }
-        ],   
+        ],
         h2oMassFraction: [
           {
             validator: (rule, value, callback) => {
@@ -575,9 +575,9 @@ export default {
         // fluentDatFilePath: [
         //   { required: true, message: "Fluent dat文件不能为空", trigger: "blur" }
         // ],
-        
+
       },
-      
+
       modelOption: [],
       fileTypeGrid: ['mesh'],
       fileTypeCas: ['cas'],

fidms-ui/src/views/data/flowOut/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="150px">
       <!--<el-form-item label="网格数" prop="gridNumber">
         <el-input
           v-model="queryParams.gridNumber"
@@ -9,8 +9,8 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>-->
-      <el-form-item label="对应流场输入编号" prop="flowFieldInputID">
-        <el-select v-model="queryParams.flowFieldInputID" placeholder="请选择对应流场输入编号">
+      <el-form-item label="流场输入编号" prop="flowFieldInputID">
+        <el-select v-model="queryParams.flowFieldInputID" placeholder="请选择流场输入编号">
           <el-option v-for="item in flowFieldInputOption"
                      :key="item.id"
                      :label="item.name"
@@ -73,7 +73,7 @@
     <el-table v-loading="loading" :data="flowOutList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="编号" align="center" prop="id" />
-      <el-table-column label="对应流场输入编号" align="center" prop="flowFieldInputID"/>
+      <el-table-column label="流场输入编号" align="center" prop="flowFieldInputID"/>
       <el-table-column label="是否为结构网格" align="center" prop="isStructureGrid">
         <template slot-scope="scope">
           <span> {{ scope.row.isStructureGrid ? '是':'否' }} </span>
@@ -185,7 +185,7 @@
 
     <!-- 添加或修改流场输出对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="125px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="130px">
         <el-form-item label="对应流场输入ID" prop="flowFieldInputID">
           <el-select v-model="form.flowFieldInputID" placeholder="请输入对应流场输入ID">
             <el-option v-for="item in flowFieldInputOption"
@@ -198,15 +198,15 @@
         <el-form-item label="是否为结构网格" prop="isStructureGrid">
           <el-checkbox v-model="form.isStructureGrid"></el-checkbox>
         </el-form-item>
-        
+
         <el-form-item label="网格数" prop="gridNumber">
           <el-input v-model="form.gridNumber" placeholder="请输入网格数" />
         </el-form-item>
         <el-form-item label="迭代步数" prop="iterationSteps">
           <el-input v-model="form.iterationSteps" placeholder="请输入迭代步数" />
         </el-form-item>
-        
-       
+
+
         <!-- <el-form-item label="文件输出" prop="outputFile">
           <file-upload v-model="form.outputFile"/>
         </el-form-item> -->
@@ -220,13 +220,13 @@
           <file-upload v-model="form.otherOutputFilePath" :fileType="imgfileType" :fileSize="2048" :limit="1"/>
         </el-form-item>
         <el-form-item label="表面温度分布图" prop="temperatureImagePath">
-          <file-upload v-model="form.temperatureImagePath" :fileType="imgfileType" :fileSize="100" :limit="1"/>
+          <file-upload v-model="form.temperatureImagePath" :fileType="imgfileType" :fileSize="2048" :limit="1"/>
         </el-form-item>
         <el-form-item label="表面速度分布图输出路径" prop="velocityImagePath">
-          <file-upload v-model="form.velocityImagePath" :fileType="imgfileType" :fileSize="100" :limit="1"/>
+          <file-upload v-model="form.velocityImagePath" :fileType="imgfileType" :fileSize="2048" :limit="1"/>
         </el-form-item>
         <el-form-item label="表面压力分布图输出路径" prop="pressureImagePath">
-          <file-upload v-model="form.pressureImagePath" :fileType="imgfileType" :fileSize="100" :limit="1"/>
+          <file-upload v-model="form.pressureImagePath" :fileType="imgfileType" :fileSize="2048" :limit="1"/>
         </el-form-item>
 
       </el-form>
@@ -288,7 +288,7 @@ export default {
       },
       // 表单参数
       form: {
-        
+
       },
       // 表单校验
       rules: {
@@ -352,6 +352,9 @@ export default {
     this.getList();
     this.getOption();
   },
+  activated() {
+    this.getOption();
+  },
   methods: {
     /** 查询流场输出列表 */
     getList() {

fidms-ui/src/views/data/infraredOut/index.vue

@@ -132,8 +132,8 @@
 
     <!-- 添加或修改红外输出对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="对应红外输入编号"  prop="infraredInputID">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="红外输入编号"  prop="infraredInputID">
           <el-select v-model="form.infraredInputID" placeholder="请输入对应红外输入编号">
             <el-option v-for="item in infraredInputOption"
                        :key="item.id"
@@ -143,13 +143,13 @@
           </el-select>
         </el-form-item>
         <el-form-item label="文件输出" prop="outputFilePath">
-          <file-upload v-model="form.outputFilePath" :fileType="fileType" :fileSize="100" :limit="1" />
+          <file-upload v-model="form.outputFilePath" :fileType="fileType" :fileSize="2048" :limit="1" />
         </el-form-item>
         <el-form-item label="红外辐射强度" prop="radiationIntensity">
           <el-input v-model="form.radiationIntensity" placeholder="请输入红外辐射强度" />
         </el-form-item>
         <el-form-item label="红外图像" prop="infraredImagePath">
-          <file-upload v-model="form.infraredImagePath" :fileType="imageType" :fileSize="100" :limit="1"/>
+          <file-upload v-model="form.infraredImagePath" :fileType="imageType" :fileSize="2048" :limit="1"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">

fidms-ui/src/views/data/model/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
       <el-form-item label="3D模型名称" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -118,7 +118,7 @@
           <file-upload v-model="form.model3dFile"/>
         </el-form-item> -->
         <el-form-item label="3D模型" prop="model3dFilePath">
-          <file-upload v-model="form.model3dFilePath" :fileType="fileType" :fileSize="100" :limit="1"/>
+          <file-upload v-model="form.model3dFilePath" :fileType="fileType" :fileSize="2048" :limit="1"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -193,7 +193,7 @@ export default {
       });
     },
 
-    
+
     // 取消按钮
     cancel() {
       this.open = false;

sql/ry_20230223.sql

@@ -1103,20 +1103,9 @@ ALTER TABLE bz_infrared_output_t
 ALTER TABLE bz_infrared_output_t
     ADD COLUMN infrared_image  VARCHAR ( 511 ) COMMENT '红外图像输出';
 
-
---  SHOW COLUMNS FROM bz_infrared_output_t;
-ALTER TABLE bz_infrared_output_t
-DROP COLUMN flow_field_output_path;
-ALTER TABLE bz_infrared_output_t
-DROP COLUMN surface_material;
-ALTER TABLE bz_infrared_output_t
-DROP COLUMN infrared_obser_dist;
-
-
-
 -- 菜单 SQL
 insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('报表管理', '2030', '1', 'allinfo', 'data/allinfo/index', 1, 0, 'C', '0', '0', 'data:allinfo:list', '#', 'admin', sysdate(), '', null, '报表管理菜单');
+values('报表管理', '0', '0', 'allinfo', 'data/allinfo/index', 1, 0, 'C', '0', '0', 'data:allinfo:list', '#', 'admin', sysdate(), '', null, '报表管理菜单');
 
 -- 按钮父菜单ID
 SELECT @parentId := LAST_INSERT_ID();