数据下载页面优化

PHM-web/src/api/manage/data.js

@@ -10,17 +10,17 @@ export function listSortieParameter(query) {
 }
 
 // 查询模型参数信息详细
-// export function getSortieParameter(ID) {
-//   return request({
-//     url: '/manage/sortieParameter/' + ID,
-//     method: 'get'
-//   })
-// }
+export function getParameter(id) {
+  return request({
+    url: '/manage/sortieParameter/' + id,
+    method: 'get'
+  })
+}
 
 // 架次信息参数数据详情
-export function getSortieParameter(ID) {
+export function getSortieParameter(id) {
   return request({
-    url: '/manage/sortieParameter/data/' + ID,
+    url: '/manage/sortieParameter/data/' + id,
     method: 'get'
   })
 }
@@ -85,4 +85,4 @@ export function modelList(query) {
     method: 'get',
     params: query
   })
-}
+}

PHM-web/src/views/manage/dataDown/index.vue

@@ -1,10 +1,19 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <!-- <el-form-item>
+      <el-form-item label="架次号" prop="sortieNo">
+        <el-input v-model="queryParams.sortieNo" placeholder="请输入模型名称" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="数据源" prop="source">
+        <el-select v-model="queryParams.source" placeholder="请选择数据参数" style="width: 100%">
+          <el-option v-for="dict in dict.type.down_type" :key="dict.value" :label="dict.label"
+            :value="dict.value"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item> -->
+      </el-form-item>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
@@ -16,17 +25,21 @@
     </el-row>
 
     <el-table v-loading="loading" border :data="dataDownList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column label="批次" align="center" prop="batchNo" />
       <!-- <el-table-column label="机型" align="center" prop="airType" />
       <el-table-column label="机号" align="center" prop="airNumber" /> -->
       <el-table-column label="架次号" align="center" prop="sortieNo" />
       <!-- <el-table-column label="下载状态" align="center" prop="downloadStatus" /> -->
-      <el-table-column label="下载方式" align="center" prop="downloadMethod" />
-      <el-table-column label="解析状态" align="center" prop="analysisStatus" />
+      <el-table-column prop="source" label="下载方式" align="center">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.down_type" :value="scope.row.source" />
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="解析状态" align="center" prop="analysisStatus" /> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleDetail(scope.row)"
+          <el-button size="mini" type="text" @click="handleDetail(scope.row)"
             v-hasPermi="['manage:deepIsolationModel:edit']">详情</el-button>
         </template>
       </el-table-column>
@@ -39,18 +52,17 @@
     <!-- <dataDownDialog :open="open" :cancel='cancel' :getList='getList' /> -->
     <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="500px" append-to-body>
       <el-form ref="form" :model="onlineForm" :rules="rules" label-width="100px">
-        <el-form-item prop="dataSource">
+        <el-form-item  label="数据源" prop="dataSource">
           <template>
             <el-radio v-model="onlineForm.dataSource" label="1">机载phm</el-radio>
             <el-radio v-model="onlineForm.dataSource" label="0">数链仿真</el-radio>
           </template>
         </el-form-item>
         <el-form-item label="架次信息" prop="sortie">
-          <el-select v-model="onlineForm.sortieNumber" placeholder="请选择架次" style="width:100%">
-            <el-option v-for="item in sortieList" :key="item.id" :label="item.sortieNumber"
-              :value="item.sortieNumber">
-                <span style="float: left">{{ item.sortieNumber }}</span>
-                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.aircraftNumber }}</span>
+          <el-select v-model="onlineForm.sortieNumber" filterable allow-create placeholder="请选择架次" style="width:100%">
+            <el-option v-for="item in sortieList" :key="item.id" :label="item.sortieNumber" :value="item.sortieNumber">
+              <span style="float: left">{{ item.sortieNumber }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.aircraftNumber }}</span>
             </el-option>
           </el-select>
         </el-form-item>
@@ -73,6 +85,29 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <!-- 详情 -->
+    <el-dialog :title="title" :visible.sync="openDetails" :close-on-click-modal="false" width="500px" append-to-body>
+      <el-form ref="formParams" :model="formParams" :rules="rules" label-width="100px">
+        <el-form-item label="架次编号" prop="sortieNo">
+          <el-input v-model="formParams.sortieNo" disabled />
+        </el-form-item>
+        <el-form-item label="批次号" prop="batchNo">
+          <el-input v-model="formParams.batchNo" disabled />
+        </el-form-item>
+        <el-form-item label="参数数据路径" prop="dataPath">
+          <el-input v-model="formParams.dataPath" disabled />
+        </el-form-item>
+        <el-form-item label="数据源" prop="source">
+          <el-select v-model="formParams.source" disabled>
+            <el-option v-for="dict in dict.type.down_type" :key="dict.value" :label="dict.label"
+              :value="parseInt(dict.value)"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="openDetails = !openDetails">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -84,16 +119,17 @@ import {
   addDataDown,
   updateDataDown,
   airborneDataDown,
-  simulationDataDown
+  simulationDataDown,
 } from '@/api/manage/dataDown'
 import { listInstructionInfo } from '@/api/manage/instructionInfo'
-import { listSortieParameter,getSortieParameter } from '@/api/manage/data'
+import { listSortieParameter, getParameter } from '@/api/manage/data'
 import dataDownDialog from '@/views/manage/dataDown/dataDownDialog'
 import { listSortie } from '@/api/manage/sortie'
 
 export default {
   name: 'DataDown',
   components: { dataDownDialog },
+  dicts: ['down_type'],
   data() {
     return {
       index: 1,
@@ -121,35 +157,33 @@ export default {
       instructionInfoList: [],
       // 是否显示弹出层
       open: false,
+      // 是否显示弹出层
+      openDetails: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        type:0,
-        batchNo: null,
-        airType: null,
-        airNumber: null,
+        type: 0,
         sortieNo: null,
-        downloadStatus: null,
-        downloadMethod: null,
-        analysisStatus: null,
+        source: null,
       },
       // 离线下载表单参数
       form: {
         type: '.xlsx',
         path: '/phm/uploadPath',
       },
+      formParams: {},
       // 在线下载表单参数
       onlineForm: {
-        dataSource:'1',
-        sortieNumber:null
+        dataSource: '1',
+        sortieNumber: null,
       },
       // 表单校验
       rules: {},
       //打开离线下载对话框
       openOffline: false,
       // 架次信息
-      sortieList:[]
+      sortieList: [],
     }
   },
   created() {
@@ -168,18 +202,16 @@ export default {
       }
       listInstructionInfo(queryParams).then(response => {
         this.instructionInfoList = response.rows
-        console.log("this.instructionInfoList",this.instructionInfoList);
       })
     },
     // 架次信息列表
     getSortieList() {
       this.loading = true
-      const query={
-        pageNum: 1
+      const query = {
+        pageNum: 1,
       }
       listSortie(query).then(response => {
         this.sortieList = response.rows
-        console.log("sortieList",this.sortieList);
         this.total = response.total
         this.loading = false
       })
@@ -188,11 +220,10 @@ export default {
     getList() {
       this.loading = true
       listSortieParameter(this.queryParams).then(response => {
-        this.dataDownList = response.rows;
-        console.log("dataDownList",this.dataDownList);
-        this.total = response.total;
-        this.loading = false;
-      });
+        this.dataDownList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
     },
     // 取消按钮
     cancel() {
@@ -207,10 +238,11 @@ export default {
         remark: null,
       }
       this.onlineForm = {
-        dataSource : '1',
-        sortieNumber : null
-      },
+        dataSource: '1',
+        sortieNumber: null,
+      }
       this.resetForm('form')
+      this.resetForm('formParams')
       this.resetForm('onlineForm')
     },
     /** 搜索按钮操作 */
@@ -243,14 +275,12 @@ export default {
     // 详情
     handleDetail(row) {
       console.log(row)
-      getSortieParameter(row.id).then(response => {
-          console.log("response",response);
-          // this.dataDownList = response.rows;
-          // this.total = response.total;
-          // this.getList()
-          // this.loading = false;
-          // this.reset()
-        });
+      // openDetails
+      getParameter(row.id).then(response => {
+        console.log('response', response)
+        this.formParams = response.data
+        this.openDetails = true
+      })
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -265,30 +295,37 @@ export default {
     /** 在线下载提交按钮 */
     submitForm() {
       this.loading = true
-      console.log("this.onlineForm",this.onlineForm);
-      if(this.onlineForm.dataSource ==='1'){
-        airborneDataDown(this.onlineForm.sortieNumber).then(response => {
-          console.log("response",response);
-
-          // this.dataDownList = response.rows;
-          this.total = response.total;
-          this.getList()
-          this.loading = false;
-          this.reset()
-        });
-      }else{
-        simulationDataDown(this.onlineForm.sortieNumber).then(response => {
-          console.log("response",response);
-          // this.dataDownList = response.rows;
-          this.total = response.total;
-          this.getList()
-          this.loading = false;
-          this.reset()
-        });
+      this.butLoading = true
+      if (this.onlineForm.dataSource === '1') {
+        airborneDataDown(this.onlineForm.sortieNumber)
+          .then(response => {
+            this.getList()
+            this.loading = false
+            this.open = false
+            this.butLoading = false
+            this.reset()
+          })
+          .catch(error => {
+            this.butLoading = false
+            this.loading = false
+          })
+      } else {
+        simulationDataDown(this.onlineForm.sortieNumber)
+          .then(response => {
+            this.getList()
+            this.loading = false
+            this.open = false
+            this.butLoading = false
+            this.reset()
+          })
+          .catch(error => {
+            this.butLoading = false
+            this.loading = false
+          })
       }
     },
     // 离线下载提交
-    offlineSubmitForm(){
+    offlineSubmitForm() {
       // TODO
     },
     /** 删除按钮操作 */