测试缺陷修改

src/router/modules/system.js

@@ -332,14 +332,13 @@ export default [
       },
       {
         name: 'SmTask',
-        path: '/dataManage/smTask/SMTaskDetails',
+        path: '/dataManage/SMTaskDetails',
         component: () => import('@/views/als/smTask/SMTaskDetails.vue'),
         meta: {
           parent: 'System',
           roleMenuHide: true,
           navHide: true,
-          title: '任务分配',
-          hide: true
+          title: '任务分配'
         }
       },
       /**

src/views/als/airConfiguration/index.vue

@@ -20,7 +20,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="formRef" :rules="rules" :model="form" label-width="80px">
           <el-form-item label="上级名称" prop="conCode">
             <treeselect v-model="form.parentId" :normalizer="normalizer" :options="tableData" :show-count="true" placeholder="选择上级名称" />
             <!-- <el-input v-model="form.conCode" placeholder="请输入构型编码" /> -->
@@ -195,7 +195,13 @@ export default {
         updatedTime: ''
       },
       debounceFn: debounce(this.fetch, 500),
-      aircaftModelAll: []
+      aircaftModelAll: [],
+      rules: {
+        parentId: [{ required: true, message: '上级名称不能为空', trigger: 'change' }],
+        conCode: [{ required: true, message: '构型编码不能为空', trigger: 'blur' }],
+        name: [{ required: true, message: '产品名称不能为空', trigger: 'blur' }],
+        specsModel: [{ required: true, message: '规格型号不能为空', trigger: 'blur' }]
+      }
     }
   },
   watch: {
@@ -373,14 +379,18 @@ export default {
     },
 
     submit() {
-      switch (this.dialogTitle) {
-        case '编辑':
-          this.updateAirConfigurationAPI()
-          break
-        case '新增':
-          this.addAirConfigurationAPI()
-          break
-      }
+      this.$refs.formRef.validate((valid) => {
+        if (valid) {
+          switch (this.dialogTitle) {
+            case '编辑':
+              this.updateAirConfigurationAPI()
+              break
+            case '新增':
+              this.addAirConfigurationAPI()
+              break
+          }
+        }
+      })
     },
 
     selection(val) {

src/views/als/airInstall/index.vue

@@ -11,7 +11,7 @@
           <el-button type="warning" @click="remove(tableCheckItems)" :disabled="tableCheckItems.length == 0">删除</el-button>
         </div>
         <div class="view-dataType-title-search">
-          <el-input placeholder="请输入关键字" v-model="keyWord" class="input1">
+          <el-input placeholder="请输入航材名称" v-model="keyWordData" class="input1">
             <el-button slot="append" icon="el-icon-search" @click="searchClick"></el-button>
           </el-input>
         </div>
@@ -24,7 +24,7 @@
       <!-- 添加或修改装机信息对话框 -->
       <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="1000px" :before-close="handleClose">
         <LTable ref="avmatTableRef" @current-change="avmatSelection" :showColumnSetting="false" :defaultFetch="false" :columns="avmatColumns" :dataSource="avmatTableData" :options="avmatOptions" :pagination="avmatTableRequset"></LTable>
-        <el-form ref="form" style="margin-top: 20px" :inline="true" :model="form" label-width="80px">
+        <el-form ref="formRef" style="margin-top: 20px" :inline="true" :model="form" :rules="rules" label-width="80px">
           <el-form-item label="航材名称" prop="devicesName">
             <el-input v-model="form.devicesName" placeholder="请输入航材名称" disabled />
           </el-form-item>
@@ -105,7 +105,7 @@ export default {
     return {
       dialogTitle: '新增',
       dialogVisible: false,
-      keyWord: '',
+      keyWordData: '',
       aircaftConfigIdList: [],
       currentNodeKey: '',
       currentNode: {},
@@ -135,6 +135,9 @@ export default {
         children: 'children',
         label: 'label'
       },
+      rules: {
+        devicesName: [{ required: true, message: '请在列表中选择航材数据', trigger: 'blur' }]
+      },
       searchValue: '',
       columns: [
         {
@@ -452,7 +455,6 @@ export default {
 
     async getAirInstallAPI(params) {
       if (this.$refs.table) this.$refs.table.clearSelection()
-      const { keyWord } = this
       const { pageSize, pageIndex } = this.tableRequset
       const {
         data: { list, total }
@@ -466,7 +468,7 @@ export default {
     },
 
     searchClick() {
-      this.getAirInstallAPI({ configId: this.currentConfigNodeKey })
+      this.getAirInstallAPI({ configId: this.currentConfigNodeKey, devicesName: this.keyWordData })
     },
 
     async addAirInstallAPI() {
@@ -571,14 +573,18 @@ export default {
     },
 
     submit() {
-      switch (this.dialogTitle) {
-        case '编辑':
-          this.updateAirInstallAPI()
-          break
-        case '新增':
-          this.addAirInstallAPI()
-          break
-      }
+      this.$refs.formRef.validate((valid) => {
+        if (valid) {
+          switch (this.dialogTitle) {
+            case '编辑':
+              this.updateAirInstallAPI()
+              break
+            case '新增':
+              this.addAirInstallAPI()
+              break
+          }
+        }
+      })
     },
 
     selection(val) {

src/views/als/atlasFile/index.vue

@@ -7,7 +7,7 @@
           <el-button type="warning" @click="remove(tableCheckItems)" :disabled="tableCheckItems.length == 0">删除</el-button>
         </div>
         <div class="view-dataType-title-search">
-          <el-input placeholder="请输入名称" v-model="keyWordData" class="input1">
+          <el-input placeholder="请输入文件名称" v-model="keyWordData" class="input1">
             <el-button slot="append" icon="el-icon-search" @click="searchClick"></el-button>
           </el-input>
         </div>
@@ -162,7 +162,6 @@ export default {
 
     async getAtlasFileAPI(params) {
       if (this.$refs.table) this.$refs.table.clearSelection()
-      const { keyWord } = this
       const { pageSize, pageIndex } = this.tableRequset
       const {
         data: { list, total }
@@ -176,7 +175,7 @@ export default {
     },
 
     async searchClick() {
-      this.getAtlasFileAPI({ name: keyWordData })
+      this.getAtlasFileAPI({ fileName: this.keyWordData })
     },
 
     async addAtlasFileAPI() {

src/views/als/faultCase/index.vue

@@ -25,7 +25,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" label-width="80px" :rules="rules">
           <el-form-item label="机型" prop="aircraftTypeName">
             <treeselect :value="form.aircraftTypeName" :normalizer="aircraftTypeNormalizer" :options="aircraftTypeTreeData" :show-count="true" placeholder="请选择机型" @select="aircraftTypeChange" />
           </el-form-item>
@@ -124,6 +124,13 @@ export default {
         label: 'label'
       },
       searchValue: '',
+      rules: {
+        aircraftTypeName: [{ required: true, message: '机型不能为空', trigger: 'change' }],
+        aircraftSystemName: [{ required: true, message: '系统不能为空', trigger: 'blur' }],
+        aircraftSubsystemName: [{ required: true, message: '分系统不能为空', trigger: 'blur' }],
+        faultPhenomenon: [{ required: true, message: '故障现象不能为空', trigger: 'blur' }],
+        faultCause: [{ required: true, message: '故障原因不能为空', trigger: 'blur' }]
+      },
       columns: [
         {
           prop: 'aircraftTypeName',
@@ -289,9 +296,10 @@ export default {
         if (code === 200) {
           this.$message({
             type: 'success',
-            message: '操作成功!'
+            duration: 3000,
+            message: '操作成功!ES数据同步中，稍后刷新查询!'
           })
-          await this.getFaultCaseAPI({ faultPhenomenon: keyWordData })
+          this.getFaultCaseAPI({ faultPhenomenon: keyWordData })
           this.handleClose()
         }
       } catch (error) {}
@@ -340,7 +348,7 @@ export default {
           this.$message({
             type: 'success',
             duration: 3000,
-            message: 'ES数据同步中，稍后查询!'
+            message: 'ES数据同步中，稍后刷新查询!'
           })
 
           this.handleClose()
@@ -355,7 +363,8 @@ export default {
         if (code === 200) {
           this.$message({
             type: 'success',
-            message: '操作成功!'
+            duration: 3000,
+            message: '操作成功!ES数据同步中，稍后刷新查询!'
           })
           this.handleClose()
           this.getFaultCaseAPI({ faultPhenomenon: keyWordData })

src/views/als/faultStatistics/echarts.vue

@@ -98,9 +98,9 @@ export default {
         // major: '',
         // aircraftModel: '',
         // groups: ''
-        major: '特设',
-        groups: '空56旅',
-        aircraftModel: '歼-20'
+        major: '',
+        groups: '',
+        aircraftModel: ''
       },
       typeTree: {
         children: 'children',

src/views/als/faultStatistics/index.vue

@@ -418,9 +418,9 @@ export default {
       select: {
         startStatisticsDate: '',
         endStatisticsDate: '',
-        groups: '空56旅',
-        major: '特设',
-        aircraftModel: '歼-20'
+        groups: '',
+        major: '',
+        aircraftModel: ''
       },
       typeTree: {
         children: 'children',

src/views/als/intelligentQA/index.vue

@@ -378,7 +378,8 @@ export default {
             type: 'success',
             message: '操作成功!'
           })
-          this.getHistoryAll()
+          this.chatInfo = []
+          this.getHistory()
         }
       } catch (error) {}
     },

src/views/als/judgeFaultLogic/index.vue

@@ -74,7 +74,7 @@
             <el-input v-model="form.name" placeholder="请输入判据名称" />
           </el-form-item>
           <el-col :span="24">
-            <el-form-item label="公式">
+            <el-form-item label="公式" prop="remarks">
               <MathJax ref="MathJax" :formula="form.remarks" />
             </el-form-item>
           </el-col>
@@ -219,7 +219,9 @@ export default {
         model: [{ required: true, message: '机型不能为空', trigger: 'change' }],
         sysId: [{ required: true, message: '系统不能为空', trigger: 'change' }],
         hmcCode: [{ required: true, message: 'HMC码不能为空', trigger: 'blur' }],
-        name: [{ required: true, message: '判据名称不能为空', trigger: 'blur' }]
+        name: [{ required: true, message: '判据名称不能为空', trigger: 'blur' }],
+        attribute1: [{ required: true, message: 'HMC码参数不能为空', trigger: 'blur' }],
+        remarks: [{ required: true, message: '公式不能为空', trigger: 'blur' }]
       },
       sustainRules: {
         params: [{ required: true, message: '参数不能为空', trigger: 'change' }],
@@ -293,7 +295,7 @@ export default {
     },
 
     searchClick() {
-      this.getJudgeFaultLogicAPI({ model: this.currentNodeKey, sysId: this.currentConfigNodeKey, name: keyWordData })
+      this.getJudgeFaultLogicAPI({ model: this.currentNodeKey, sysId: this.currentConfigNodeKey, keyWord: this.keyWordData })
     },
 
     async treeNodeClick(data) {

src/views/als/knowledgeExtraction/index.vue

@@ -7,7 +7,7 @@
           <el-button type="warning" @click="remove(tableCheckItems)" :disabled="tableCheckItems.length == 0">删除</el-button>
         </div>
         <div class="view-dataType-title-search">
-          <el-input placeholder="请输入名称" v-model="keyWordData" class="input1">
+          <el-input placeholder="请输入任务名称" v-model="keyWordData" class="input1">
             <el-button slot="append" icon="el-icon-search" @click="searchClick"></el-button>
           </el-input>
         </div>
@@ -17,11 +17,11 @@
       </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" label-width="80px" :rules="rules">
           <el-form-item label="任务名称" prop="taskName">
             <el-input v-model="form.taskName" placeholder="请输入任务名称" />
           </el-form-item>
-          <el-form-item label="选择抽取文件" label-width="100px" prop="ossId">
+          <el-form-item label="选择抽取文件" label-width="110px" prop="ossId">
             <el-select v-model="form.ossId" placeholder="请选择文件">
               <el-option v-for="item in fileList" :key="item.ossId" :label="item.fileName" :value="item.ossId" />
             </el-select>
@@ -183,6 +183,10 @@ export default {
       storageLoading: false,
       keyWordData: '',
       searchValue: '',
+      rules: {
+        taskName: [{ required: true, message: '任务名称不能为空', trigger: 'blur' }],
+        ossId: [{ required: true, message: '抽取文件不能为空', trigger: 'change' }]
+      },
       columns: [
         {
           prop: 'taskName',
@@ -623,7 +627,7 @@ export default {
     },
 
     async searchClick() {
-      this.getTaskListAPI({ name: this.keyWordData })
+      this.getTaskListAPI({ taskName: this.keyWordData })
     },
 
     async addTaskAPI() {
@@ -801,15 +805,19 @@ export default {
     },
 
     submit() {
-      switch (this.dialogTitle) {
-        case '编辑':
-          this.updateTaskAPI()
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          switch (this.dialogTitle) {
+            case '编辑':
+              this.updateTaskAPI()
 
-          break
-        case '新增':
-          this.addTaskAPI()
-          break
-      }
+              break
+            case '新增':
+              this.addTaskAPI()
+              break
+          }
+        }
+      })
     },
 
     clauseSubmit() {

src/views/als/knowledgeManage/ERManage/index.vue

@@ -7,7 +7,7 @@
           <el-button type="warning" @click="reset()">重置</el-button>
         </div>
         <div class="view-dataType-title-search">
-          <el-input placeholder="请输入实体名称" v-model="keyWordData" class="input1">
+          <el-input placeholder="请输入主体/客体名称" v-model="keyWordData" class="input1">
             <el-button slot="append" icon="el-icon-search" @click="searchClick"></el-button>
           </el-input>
         </div>
@@ -17,28 +17,28 @@
       </div>
       <!-- 添加或修改模型信息对话框 -->
       <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="600px" :before-close="handleClose">
-        <el-form ref="form" :model="form" label-width="80px">
-          <el-form-item label="主体类型" prop="subjectCategory">
-            <el-input :disabled="dialogTitle === '编辑'" v-model="form.subjectCategory" placeholder="请输入实体名称" />
-            <!-- <el-select v-model="form.subjectCategory" placeholder="请选择主体类型">
+        <el-form ref="form" :model="form" label-width="80px" :rules="rules">
+          <el-form-item label="主体名称" prop="subjectName">
+            <el-input v-model="form.subjectName" placeholder="请输入主体名称" :disabled="dialogTitle === '编辑'" />
+            <!-- <el-select v-model="form.subjectName" placeholder="请选择实体类型">
               <el-option v-for="(item, index) in subjectList" :key="index" :label="item.name" :value="item.name" />
             </el-select> -->
           </el-form-item>
-          <el-form-item label="主体名称" prop="subjectName">
-            <el-input v-model="form.subjectName" placeholder="请输入实体名称" :disabled="dialogTitle === '编辑'" />
-            <!-- <el-select v-model="form.subjectName" placeholder="请选择实体类型">
+          <el-form-item label="主体类型" prop="subjectCategory">
+            <el-input :disabled="dialogTitle === '编辑'" v-model="form.subjectCategory" placeholder="请输入主体类型" />
+            <!-- <el-select v-model="form.subjectCategory" placeholder="请选择主体类型">
               <el-option v-for="(item, index) in subjectList" :key="index" :label="item.name" :value="item.name" />
             </el-select> -->
           </el-form-item>
 
           <el-form-item label="客体名称" prop="objectName">
-            <el-input :disabled="dialogTitle === '编辑'" v-model="form.objectName" placeholder="请输入实体名称" />
+            <el-input :disabled="dialogTitle === '编辑'" v-model="form.objectName" placeholder="请输入客体名称" />
           </el-form-item>
           <el-form-item label="客体类型" prop="objectCategory">
-            <el-input :disabled="dialogTitle === '编辑'" v-model="form.objectCategory" placeholder="请输入实体类型" />
+            <el-input :disabled="dialogTitle === '编辑'" v-model="form.objectCategory" placeholder="请输入客体类型" />
           </el-form-item>
           <el-form-item label="关系" prop="relationName">
-            <el-select v-model="form.relationName" placeholder="请选择实体类型">
+            <el-select v-model="form.relationName" placeholder="请选择关系">
               <el-option v-for="(item, index) in relationList" :key="index" :label="item.name" :value="item.name" />
             </el-select>
             <!-- <el-input v-model="form.relationName" placeholder="请输入实体名称" /> -->
@@ -69,6 +69,13 @@ export default {
       dialogVisible: false,
       keyWordData: '',
       searchValue: '',
+      rules: {
+        subjectName: [{ required: true, message: '主体名称不能为空', trigger: 'blur' }],
+        subjectCategory: [{ required: true, message: '主体类型不能为空', trigger: 'blur' }],
+        objectName: [{ required: true, message: '客体名称不能为空', trigger: 'blur' }],
+        objectCategory: [{ required: true, message: '客体类型不能为空', trigger: 'blur' }],
+        relationName: [{ required: true, message: '关系不能为空', trigger: 'change' }]
+      },
       columns: [
         {
           prop: 'subjectName',
@@ -209,7 +216,9 @@ export default {
         this.tableData = dataList
         this.tableRequset.total = total
         this.loading.close()
-      } catch (error) {}
+      } catch (error) {
+        this.loading.close()
+      }
     },
 
     handleERData(data) {

src/views/als/knowledgeManage/entityManage/index.vue

@@ -16,7 +16,7 @@
         <LTable ref="table" @selection-change="selection" :defaultFetch="false" :fetch="fetch" :columns="columns" :dataSource="tableData" :options="options" :pagination="tableRequset"></LTable>
       </div>
       <!-- 添加或修改模型信息对话框 -->
-      <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="600px" :before-close="handleClose">
+      <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="600px" :before-close="handleClose" :rules="rules">
         <el-form ref="form" :model="form" label-width="80px">
           <el-form-item label="实体名称" prop="name">
             <el-input v-model="form.name" placeholder="请输入实体名称" />
@@ -51,6 +51,10 @@ export default {
       dialogVisible: false,
       keyWordData: '',
       searchValue: '',
+      rules: {
+        name: [{ required: true, message: '实体名称不能为空', trigger: 'blur' }],
+        category: [{ required: true, message: '实体类型不能为空', trigger: 'change' }]
+      },
       columns: [
         {
           prop: 'name',
@@ -158,13 +162,9 @@ export default {
         this.tableData = dataList
         this.tableRequset.total = total
         this.loading.close()
-
-        // const {
-        //   data: { dataList, total }
-        // } = await getEntityList()
-        // this.tableData = dataList
-        // this.tableRequset.total = total
-      } catch (error) {}
+      } catch (error) {
+        this.loading.close()
+      }
     },
 
     async getEntityClassAPI(params) {
@@ -250,14 +250,18 @@ export default {
     },
 
     submit() {
-      switch (this.dialogTitle) {
-        case '编辑':
-          this.updateEntityAPI()
-          break
-        case '新增':
-          this.addEntityAPI()
-          break
-      }
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          switch (this.dialogTitle) {
+            case '编辑':
+              this.updateEntityAPI()
+              break
+            case '新增':
+              this.addEntityAPI()
+              break
+          }
+        }
+      })
     },
 
     selection(val) {

src/views/als/smTask/SMTaskDetails.vue

@@ -114,7 +114,7 @@ import { deepClone, debounce } from '@/utils/index'
 import { flattenTree } from '../utils/common'
 
 export default {
-  name: 'SMTaskDetails',
+  name: 'SmTask',
   components: {},
   data() {
     // 这里存放数据
@@ -577,4 +577,7 @@ export default {
     background-color: transparent !important;
   }
 }
+::-webkit-scrollbar {
+  display: none;
+}
 </style>

src/views/als/smTask/index.vue

@@ -440,8 +440,10 @@ export default {
 
     checkDetails(row) {
       // this.$router.push({ name: 'SMTaskDetails', params: { smTaskId: row.id } })
+      // name: 'SMTaskDetails',
+      // this.$router.push(`/dataManage/SMTaskDetails/${row.id}`)
       this.$router.push({
-        name: 'SMTaskDetails',
+        path: '/dataManage/SMTaskDetails',
         query: {
           smTaskId: row.id
         }