.env.development

@@ -5,4 +5,4 @@ ENV = 'development'
 # 开发环境
 VUE_APP_BASE_API ='/api'
 
-VUE_APP_BASE_API_target ='http://localhost:9091'
+VUE_APP_BASE_API_target ='http://localhost:9192'

src/router/public-routes.js

@@ -10,7 +10,7 @@ export const publicRoutes = [
   },
   {
     path: '/',
-    redirect: '/home',
+    redirect: '/flightData',
     name: 'Layout',
     component: Layout,
     children: [

src/store/modules/user.js

@@ -25,8 +25,8 @@ export default {
           duration: 1000
         })
         setTimeout(() => {
-          // router.push('/')
-          router.push('/flightData')
+          router.push('/')
+          // router.push('/flightData')
         }, 1000)
       }
     },

src/views/als/faultDiagnosis/index.vue

@@ -17,18 +17,13 @@
       </div>
       <el-dialog title="诊断结果" :visible.sync="resultVisible" width="1200px">
         <LTable ref="resultTable" :showColumnSetting="false" :defaultFetch="false" :columns="resultColumns" :dataSource="resultTableData" :options="resultOptions" :pagination="resultTableRequset"></LTable>
+        <!-- <span slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="resultVisible=false">确 定</el-button>
+        </span> -->
       </el-dialog>
       <el-dialog title="执行进度" :visible.sync="progressVisible" width="800px">
         <el-progress :text-inside="true" :stroke-width="24" :percentage="percentage" status="success"></el-progress>
       </el-dialog>
-      <el-dialog title="结果展示" :visible.sync="resultShowVisible" :before-close="resultShowDialogClose" width="800px">
-        <div style="margin: 10px 0px">{{ resultShowData.result }}</div>
-        <el-image style="width: 500px" v-if="resultShowData.url !== ''" :src="resultShowData.url" :preview-src-list="[resultShowData.url]"></el-image>
-        <span slot="footer" class="dialog-footer">
-          <el-button @click="resultShowDialogClose">取 消</el-button>
-          <el-button type="primary" @click="resultShowDialogClose">确 定</el-button>
-        </span>
-      </el-dialog>
     </div>
   </div>
 </template>
@@ -52,7 +47,6 @@ export default {
     return {
       resultVisible: false,
       progressVisible: false,
-      resultShowVisible: false,
       keyWordData: '',
       aircaftModelIdList: [],
       currentNodeKey: '',
@@ -126,8 +120,6 @@ export default {
             {
               name: '故障诊断',
               type: 'text',
-              statusKey: 'status',
-              disableKey: '2',
               round: false,
               plain: false,
               onClick: (row, index, scope) => {
@@ -201,22 +193,6 @@ export default {
               return h('span', {}, '-')
             }
           }
-        },
-        {
-          button: true,
-          label: '操作',
-          width: '240px',
-          group: [
-            {
-              name: '查看结果',
-              type: 'text',
-              round: false,
-              plain: false,
-              onClick: (row, index, scope) => {
-                this.checkRelustShow(row)
-              }
-            }
-          ]
         }
       ],
       resultOptions: {
@@ -398,14 +374,6 @@ export default {
       }
     },
 
-    resultShowDialogClose() {
-      this.resultShowVisible = false
-      this.resultShowData = {
-        url: '',
-        result: ''
-      }
-    },
-
     submit() {
       this.beginExecute(row)
     },
@@ -419,13 +387,6 @@ export default {
       this.resultVisible = true
     },
 
-    async checkRelustShow(row) {
-      const { data } = await getListByIdsApi(JSON.parse(row.resultContent).ossId)
-      this.resultShowData.url = data[0].url
-      this.resultShowData.result = JSON.parse(row.resultContent).result
-      this.resultShowVisible = true
-    },
-
     async getImgUrl(ossId) {
       const { data } = await getListByIdsApi(ossId)
       const newUrl = data[0].url
@@ -447,19 +408,20 @@ export default {
 
       try {
         this.form.dataId = row.id
-        // const res = await executeFault(this.form)
+        const res = await executeFault(this.form)
         clearInterval(myTimer)
-        // if (res?.code === 200) {
-        this.percentage = 100
-        this.$message({
-          type: 'success',
-          message: '执行成功!'
-        })
-        this.resultVisible = true
-        this.getFaultDiagnosisResultAPI({ sortieNo: this.currentSortieNo })
-        this.getDataImportAPI({ aircraftId: this.aircaftModelIdList })
-        this.handleClose()
-        // }
+        if (res?.code === 200) {
+          this.percentage = 100
+          this.$message({
+            type: 'success',
+            message: '执行成功!'
+          })
+          this.resultVisible = true
+          console.log('11', JSON.parse(res.msg))
+          this.getFaultDiagnosisResultAPI({ sortieNo: this.currentSortieNo })
+          this.getDataImportAPI({ aircraftId: this.aircaftModelIdList })
+          this.handleClose()
+        }
       } catch (error) {
         clearInterval(myTimer)
       } finally {

src/views/als/flightData/index.vue

@@ -24,10 +24,10 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label="上传飞参数据" label-width="110px" prop="ossId">
-                <FileUpload v-model="form.ossId" :limit="1" :fileSize="500" :fileType="['xls', 'xlsx', 'csv', 'txt']" :isNameCheck="true" :isAirType="isAirType" @uploadValue="uploadValue" />
+                <FileUpload v-model="form.ossId" :limit="1" :fileSize="500" :fileType="['xls', 'xlsx', 'csv', 'txt']" :isNameCheck="false" :isAirType="isAirType" @uploadValue="uploadValue" />
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <!-- <el-col :span="12">
               <el-form-item label="警告列表导入" label-width="110px">
                 <el-upload
                   ref="upload"
@@ -49,7 +49,7 @@
                   </div>
                 </el-upload>
               </el-form-item>
-            </el-col>
+            </el-col> -->
           </el-row>
           <el-row>
             <el-col :span="12">
@@ -71,12 +71,12 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label="飞行时间" prop="flightDate">
-                <el-date-picker disabled v-model="form.flightDate" type="datetime" placement="bottom-start" value-format="yyyy-MM-dd HH:mm:ss" placeholder="上传飞参数据自动生成"></el-date-picker>
+                <el-date-picker v-model="form.flightDate" type="datetime" placement="bottom-start" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择飞行时间"></el-date-picker>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="架次号" prop="sortieNo">
-                <el-input disabled v-model="form.sortieNo" placeholder="上传飞参数据自动生成" />
+                <el-input v-model="form.sortieNo" placeholder="请输入架次号" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -128,7 +128,7 @@ export default {
         source: [{ required: true, message: '数据源不能为空', trigger: 'change' }],
         // aircaftModel: [{ required: true, message: '机型不能为空', trigger: 'change' }],
         aircraftId: [{ required: true, message: '编目不能为空', trigger: 'change' }],
-        flightDate: [{ required: true, message: '飞行时间不能为空', trigger: 'change' }],
+        // flightDate: [{ required: true, message: '飞行时间不能为空', trigger: 'change' }],
         sortieNo: [{ required: true, message: '飞架次号不能为空', trigger: 'blur' }],
         ossId: [{ required: true, message: '飞参数据不能为空', trigger: 'change' }]
       },
@@ -336,7 +336,7 @@ export default {
           })
           this.uploadFlag = true
           this.handleClose()
-          this.handleFileSuccess()
+          // this.handleFileSuccess()
           this.warnFileList = []
           this.getDataImportAPI({ aircraftId: this.aircaftModelIdList })
           this.submitBtnLoading = false
@@ -356,7 +356,7 @@ export default {
           })
           this.handleClose()
           this.submitBtnLoading = false
-          this.handleFileSuccess()
+          // this.handleFileSuccess()
           this.warnFileList = []
           this.getDataImportAPI({ aircraftId: this.aircaftModelIdList })
         }
@@ -452,12 +452,12 @@ export default {
             case '编辑':
               this.submitBtnLoading = true
               this.updateDataImportAPI()
-              this.submitFileForm()
+              // this.submitFileForm()
               break
             case '新增':
               this.submitBtnLoading = true
               this.addDataImportAPI()
-              this.submitFileForm()
+              // this.submitFileForm()
               break
           }
         }

vue.config.js

@@ -8,7 +8,7 @@ module.exports = defineConfig({
     open: true, //值为 true的话，项目启动时自动打开到浏览器里边， false不会打开
     proxy: {
       ['/api/als']: {
-        target: 'http://localhost:9090',
+        target: 'http://localhost:9191',
         ws: false,
         changeOrigin: true,
         pathRewrite: {