Merge remote-tracking branch 'origin/develop' into develop-rmd

PHM-admin/phm-manage/src/main/java/com/phm/manage/controller/OrderInfoController.java

@@ -1,12 +1,16 @@
 package com.phm.manage.controller;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.phm.common.annotation.Log;
 import com.phm.common.core.controller.BaseController;
 import com.phm.common.core.domain.AjaxResult;
 import com.phm.common.core.page.TableDataInfo;
 import com.phm.common.enums.BusinessType;
 import com.phm.common.utils.poi.ExcelUtil;
+import com.phm.manage.domain.OrderConfig;
 import com.phm.manage.domain.OrderInfo;
+import com.phm.manage.domain.common.CommonResult;
+import com.phm.manage.service.IOrderConfigService;
 import com.phm.manage.service.IOrderInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -27,6 +31,9 @@ public class OrderInfoController extends BaseController {
     @Autowired
     private IOrderInfoService orderInfoService;
 
+    @Autowired
+    private IOrderConfigService orderConfigService;
+
     /**
      * 查询系统指令信息列表
      */
@@ -88,4 +95,14 @@ public class OrderInfoController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(orderInfoService.deleteOrderInfoByIds(ids));
     }
+    @GetMapping("/sortieList")
+    public CommonResult<OrderConfig> getS(OrderInfo orderInfo) {
+        OrderConfig orderConfig = new OrderConfig();
+        orderConfig.setOrderCode(orderInfo.getOrderCode());
+        List<OrderConfig> orderConfigList = orderConfigService.selectOrderConfigList(orderConfig);
+        if (CollectionUtil.isEmpty(orderConfigList)) {
+            return CommonResult.buildSuccess();
+        }
+        return CommonResult.success(orderConfigList.get(0));
+    }
 }

PHM-web/src/views/manage/faultDiagnosis/falseAlarmResult.vue

@@ -1,7 +1,11 @@
 <template>
-  <div>
-    <el-table :data="parameterData" style="width: 100%">
-      <el-table-column v-for="(item,index) in keyList" :key="index" align="center" :label="item" :prop="item">
+  <div v-if="mergedArray.length > 0">
+    <el-table :data="mergedArray" style="width: 100%">
+      <el-table-column v-for="(item, index) in keyList" :key="index">
+        <template slot="header">
+          {{item}}
+        </template>·
+        <template slot-scope="scope">{{scope.row[item]}}</template>
       </el-table-column>
     </el-table>
   </div>
@@ -14,7 +18,8 @@ export default {
   props: ['resultList', 'parameterData'],
   data(){
     return{
-      keyList:[]
+      keyList:[],
+      mergedArray: []
     }
   },
   created() {
@@ -22,10 +27,16 @@ export default {
   },
   methods: {
     init() {
-      console.log('resultList', this.resultList)
-      console.log('parameterData', this.parameterData)  
-      this.keyList = Object.keys(this.parameterData[0])
-      console.log("this.keyList",this.keyList);
+      console.log('this.resultList', this.resultList);
+      this.mergedArray = this.parameterData.map((obj1, index) => {
+        let obj2 = this.resultList[index]
+
+        // 合并属性，生成新的对象
+        return { ...obj1, [`${Object.keys(obj1)[0]}_是否虚警`]: obj2 ? obj2[Object.keys(obj2)[0]] : null };
+      });
+      this.keyList = Object.keys(this.mergedArray[0])
+      console.log('this.mergedArray', this.mergedArray);
+      console.log('this.keyList', this.keyList);
     },
     cellClassName(data) {
       // debugger

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

@@ -108,7 +108,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="参数选择" v-if="!(selectModelVal==='')">
-          <el-transfer v-model="selectSortieParams" :props="{ key: 'value', label: 'desc' }" :data="parameterList"
+          <el-transfer v-model="selectSortieParams" @change="change" :props="{ key: 'value', label: 'desc' }" :data="parameterList"
             filterable filter-placeholder="请输入参数名称" :titles="['所有参数', '处理参数']">
           </el-transfer>
         </el-form-item>
@@ -148,6 +148,9 @@ import {
   modelList,
   modelListAll,
 } from '@/api/manage/data'
+import {
+  updateModel
+} from '@/api/manage/model'
 import falseAlarmResult from '@/views/manage/faultDiagnosis/falseAlarmResult'
 import groundDiagnosisResult from '@/views/manage/faultDiagnosis/groundDiagnosisResult'
 import deepIsolationResult from '@/views/manage/faultDiagnosis/deepIsolationResult'
@@ -263,6 +266,14 @@ export default {
     this.getList()
   },
   methods: {
+    change(val) {
+      const data = {
+        id: this.modelId,
+        dataParams: JSON.stringify(val)
+      }
+      updateModel(data).then((res) => {
+      })
+    },
     /** 查询架次信息列表 */
     getList() {
       this.loading = true
@@ -375,7 +386,7 @@ export default {
       this.parameterList = []
       this.selectSortieParams = []
       this.selectModelVal = val.name
-      this.selectSortieParams = JSON.parse(val.dataParams)
+      // this.selectSortieParams = JSON.parse(val.dataParams)
       this.modelId = val.id
       getSortieParams(this.selectSortieId).then(response => {
         response.data.forEach(item => {

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

@@ -96,7 +96,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="参数选择" v-if="!(selectModelVal==='')">
-          <el-transfer v-model="selectSortieParams" :props="{ key: 'value', label: 'desc' }" :data="parameterList"
+          <el-transfer v-model="selectSortieParams" @change="change" :props="{ key: 'value', label: 'desc' }" :data="parameterList"
             filterable filter-placeholder="请输入参数名称" :titles="['所有参数', '处理参数']">
           </el-transfer>
         </el-form-item>
@@ -119,6 +119,7 @@
         <missValCompletionResult v-if="showFlag=='2'" :resultList='missValCompletionResultList' />
       </div>
       <div slot="footer" class="dialog-footer">
+        <el-button type="primary" v-if="showFlag=='1'">异常值自动处理</el-button>
         <el-button type="primary" @click="next">{{ FABtnText }}</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
@@ -140,6 +141,9 @@ import {
   modelList,
   modelListAll,
 } from '@/api/manage/data'
+import {
+  updateModel
+} from '@/api/manage/model'
 import delAbnormalResult from '@/views/manage/preHandleResult/delAbnormalResult'
 import missValCompletionResult from '@/views/manage/preHandleResult/missValCompletionResult'
 
@@ -222,6 +226,14 @@ export default {
     },
   },
   methods: {
+    change(val) {
+      const data = {
+        id: this.modelId,
+        dataParams: JSON.stringify(val)
+      }
+      updateModel(data).then((res) => {
+      })
+    },
     /** 查询架次信息列表 */
     getList() {
       this.loading = true
@@ -234,6 +246,7 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false
+      this.dialogResult = false
       this.reset()
       this.checkList = ['1']
       this.selectedSortieDataType = ''
@@ -325,7 +338,7 @@ export default {
       this.parameterList = []
       this.selectSortieParams = []
       this.selectModelVal = val.name
-      this.selectSortieParams = JSON.parse(val.dataParams)
+      // this.selectSortieParams = JSON.parse(val.dataParams)
       this.modelId = val.id
       getSortieParams(this.selectSortieId).then(response => {
         response.data.forEach(item => {

PHM-web/src/views/manage/sortie/dataPlayBack.vue

@@ -29,7 +29,7 @@
     <div id="main" v-show="tableShow" ></div>
     <div class="tableShow" v-show="!tableShow" >
       <el-table :data="tableData" border >
-        <el-table-column prop="时间" label="时间" width="180"></el-table-column>
+        <el-table-column prop="Time" label="时间" width="180"></el-table-column>
         <el-table-column v-for="(item,index) in showParamsKey" 
             :key="index" 
             :prop="item" 

PHM-web/vue.config.js

@@ -68,6 +68,7 @@ module.exports = {
         minRatio: 0.8                   // 压缩率小于1才会压缩
       })
     ],
+    devtool: 'source-map'
   },
   chainWebpack(config) {
     config.plugins.delete('preload') // TODO: need test