更改首页展示

src/router/index.js

@@ -13,7 +13,7 @@ VueRouter.prototype.push = function push(location) {
 }
 
 const router = new VueRouter({
-  mode: 'history',
+  mode: 'hash',
   base: process.env.BASE_URL,
   routes: [...publicRoutes] // 做权限的时候 删除 ...privateRoutes
 })

src/router/modules/system.js

@@ -218,6 +218,15 @@ export default [
           title: '历年航材消耗数据-汇总计算'
         }
       },
+      {
+        name: 'PreResult',
+        path: '/qualityManage/preProcessing',
+        component: () => import('@/views/als/preProcessing/index.vue'),
+        meta: {
+          parent: 'BasicData',
+          title: '数据预处理'
+        }
+      },
       {
         name: 'FlightData',
         path: '/dataManage/flightData',

src/views/als/faultCase/index.vue

@@ -5,7 +5,7 @@
         <div class="view-dataType-title-btn">
           <el-button type="success" @click="openDialog()" :disabled="currentNode.type == 2">新增</el-button>
           <el-button type="warning" @click="remove(tableCheckItems)" :disabled="tableCheckItems.length == 0">删除</el-button>
-          <el-dropdown split-button type="primary" style="margin-left: 10px" trigger="click" @command="handleExport">
+          <el-dropdown split-button type="primary" style="margin-left: 10px" trigger="click" @command="handleExportBtn">
             更多
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item command="handleImport">导入</el-dropdown-item>
@@ -329,6 +329,10 @@ export default {
       this.getFaultCaseAPI({ faultPhenomenon: keyWordData })
     },
 
+    //更多按钮
+    handleExportBtn(type) {
+      this[type]()
+    },
     async addFaultCaseAPI() {
       try {
         const { code } = await addFaultCase({ ...this.form })
@@ -466,7 +470,7 @@ export default {
 
     /** 导入按钮操作 */
     handleImport() {
-      this.upload.title = '警告列表导入'
+      this.upload.title = '故障字典导入'
       this.upload.open = true
     },
     /** 下载模板操作 */

src/views/als/flightData/index.vue

@@ -52,12 +52,12 @@
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="上传飞参数据" label-width="100px" prop="ossId">
+              <el-form-item label="上传飞参数据" label-width="110px" prop="ossId">
                 <FileUpload v-model="form.ossId" :limit="1" :fileSize="500" :fileType="['xls', 'xlsx']" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="警告列表导入" label-width="100px">
+              <el-form-item label="警告列表导入" label-width="110px">
                 <el-upload
                   ref="upload"
                   :limit="1"

src/views/als/model/index.vue

@@ -17,7 +17,7 @@
       </div>
       <!-- 添加或修改模型信息对话框 -->
       <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="600px" :before-close="handleClose">
-        <el-form ref="form" :model="form" label-width="80px">
+        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
           <el-form-item label="模型名称" prop="name">
             <el-input v-model="form.name" placeholder="请输入模型名称" />
           </el-form-item>
@@ -197,7 +197,14 @@ export default {
       debounceFn: debounce(this.fetch, 500),
       partsData: [],
       aircraftTypeTreeData: [],
-      allAirConfig: []
+      allAirConfig: [],
+      rules: {
+        name: [{ required: true, message: '模型名称不能为空', trigger: 'blur' }],
+        type: [{ required: true, message: '模型类型不能为空', trigger: 'change' }],
+        url: [{ required: true, message: '模型链接不能为空', trigger: 'blur' }],
+        aircraftType: [{ required: true, message: '机型不能为空', trigger: 'change' }],
+        partId: [{ required: true, message: '部件不能为空', trigger: 'change' }]
+      }
     }
   },
   watch: {
@@ -244,6 +251,7 @@ export default {
 
     aircraftTypeChange(node) {
       this.form.aircraftType = node.id
+      this.form.partId = null
       this.getAirConfigurationAPI({ aircraftType: this.form.aircraftType })
     },
 

src/views/als/utils/common.js

@@ -82,10 +82,10 @@ const service = axios.create({
   // 超时
   timeout: 10000
 })
-export async function download(url, params, filename, config) {
+export function download(url, params, filename, config) {
   downloadLoadingInstance = Loading.service({ text: '正在下载数据，请稍候', spinner: 'el-icon-loading', background: 'rgba(0, 0, 0, 0.7)' })
   try {
-    const data = await service.post(url, params, {
+    const data = service.post(url, params, {
       transformRequest: [
         (params_1) => {
           return tansParams(params_1)
@@ -95,12 +95,13 @@ export async function download(url, params, filename, config) {
       responseType: 'blob',
       ...config
     })
+    console.log('data', data)
     const isBlob = blobValidate(data)
+    console.log('isBlob', isBlob)
     if (isBlob) {
-      const blob = new Blob([data])
-      saveAs(blob, filename)
+      saveAs(new Blob([data]), filename)
     } else {
-      const resText = await data.text()
+      const resText = data.text()
       const rspObj = JSON.parse(resText)
       const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default']
       Message.error(errMsg)
@@ -118,6 +119,7 @@ export async function download(url, params, filename, config) {
  * @param {*} params  参数
  */
 export function tansParams(params) {
+  console.log('params', params)
   let result = ''
   for (const propName of Object.keys(params)) {
     const value = params[propName]
@@ -136,6 +138,7 @@ export function tansParams(params) {
       }
     }
   }
+  console.log('result', result)
   return result
 }
 

src/views/home/index.vue

@@ -10,7 +10,7 @@
                   <el-image style="width: 80px; height: 80px; margin-top: 10px" :src="imgUrl"></el-image>
                   <div class="info">
                     <p>{{ item.aircaftCatalogCode }}</p>
-                    <span class="success-state">健康 </span>
+                    <span :class="item.healthStatus == '故障' ? 'warning-state' : 'success-state'">{{ item.healthStatus }} </span>
                   </div>
                 </div>
               </div>
@@ -168,6 +168,7 @@ export default {
           }
         })
       })
+      console.log('this.aircaftCatalogAll', this.aircaftCatalogAll)
     },
     handleChange(item) {
       switch (item) {