From d73673fe9aa4d92dba5044d9a341252cfae32bd6 Mon Sep 17 00:00:00 2001
From: Vce <daisy_vce@yeah.net>
Date: Thu, 6 Jun 2024 23:13:42 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../examSystem2/examManagement/examManagement.vue |  3 ++-
 .../questionManagement/questionManagement.vue     | 15 +++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/views/projectFront/examSystem2/examManagement/examManagement.vue b/src/views/projectFront/examSystem2/examManagement/examManagement.vue
index 0c27ff75..c1673ba9 100644
--- a/src/views/projectFront/examSystem2/examManagement/examManagement.vue
+++ b/src/views/projectFront/examSystem2/examManagement/examManagement.vue
@@ -688,7 +688,8 @@ export default {
         pageSize: row ? row.pageSize : this.question.pageSize,
         questionName: "",
         subjectId: row ? row.questionSubjectId : this.questionSubjectId,
-        isEnable:1
+        isEnable:1,
+        projectSn: this.$store.state.projectSn
       }).then((result) => {
         if (result.success) {
           console.log(result);
diff --git a/src/views/projectFront/examSystem2/questionManagement/questionManagement.vue b/src/views/projectFront/examSystem2/questionManagement/questionManagement.vue
index 63f2b4e5..a8abb445 100644
--- a/src/views/projectFront/examSystem2/questionManagement/questionManagement.vue
+++ b/src/views/projectFront/examSystem2/questionManagement/questionManagement.vue
@@ -72,10 +72,11 @@
         <el-upload ref="upload" :headers="headers" :before-upload="beforeAvatarUpload" :on-success="handleSuccess"
             :action="$http.defaults.baseURL + 'exam/questionBank/importExcel'"
             :limit="1" :show-file-list="false"
-            :data="{ sn: $store.state.userInfo.headquartersSn }"
+            :data="{projectSn: this.$store.state.projectSn}"
             name="excelFile"
             style="float: right; margin: 0 0 0 15px"
           >
+            <!-- :data="{ projectSn: $store.state.projectSn, subjectId:subjectId }" -->
           <el-button type="primary" plain size="medium" @click="importFn"
             v-permission="{key: 'questionManagement_import', menuPath: '/project/examSystem2/questionManagement'}">
             导入题库
@@ -462,7 +463,14 @@
     >
       <div class="preview-content">
         <div class="preview-question-title">
-          1、{{questionForm.questionName}}({{questionForm.type == 1 ? '单选题' : '多选题'}})
+          <div v-if="questionForm.questionName && questionForm.questionName.includes('svg')">
+            <div style="display:flex">
+              <div>1、</div>
+              <div v-html="questionForm.questionName"></div>
+              <div>({{questionForm.type == 1 ? '单选题' : '多选题'}})</div>
+            </div>
+          </div>
+          <div v-else>1、{{questionForm.questionName}}({{questionForm.type == 1 ? '单选题' : '多选题'}})</div>
         </div>
         <div class="preview-question-content">
           <div class="preview-question-item" v-for="(item, index) in questionArr" :key="item.id">
@@ -514,6 +522,9 @@ export default {
   name: "questionManagement",
   data() {
     return {
+      importParams:{
+        projectSn: this.$store.state.projectSn
+      },
       radio: 0,
       questionArr: [{ isCheck: true, questionContent: "" },{ isCheck: true, questionContent: "" },{ isCheck: true, questionContent: "" },{ isCheck: true, questionContent: "" }],
       levelArr: [

From 4c816d4ec5f526265f2ce9e8e1ee5d070c7dee6e Mon Sep 17 00:00:00 2001
From: Vce <daisy_vce@yeah.net>
Date: Fri, 7 Jun 2024 15:54:43 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9ai=E9=A2=84=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/api/equipmentCenter/electricBox.js     |  3 +
 .../projectFront/aiAnalysis/warningList.vue   | 55 ++++++++++++++++---
 2 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/src/assets/js/api/equipmentCenter/electricBox.js b/src/assets/js/api/equipmentCenter/electricBox.js
index 12499883..f4351ee0 100644
--- a/src/assets/js/api/equipmentCenter/electricBox.js
+++ b/src/assets/js/api/equipmentCenter/electricBox.js
@@ -20,6 +20,9 @@ export const aiAnalyseHardWareRecordEdit = data => post('xmgl/aiAnalyseHardWareR
 export const aiAnalyseHardWareRecordDelete = data => post('xmgl/aiAnalyseHardWareRecord/delete', data);
 export const aiAnalyseHardWareRecordList = data => post('xmgl/aiAnalyseHardWareRecord/list', data);
 
+//编辑
+export const aiAnalyseHardWareRecordEditApi = data => post('xmgl/aiAnalyseHardWareAlarmRecord/setFalsePositive', data);
+
 //分页列表查询AI分析硬件设备报警记录信息
 export const aiAnalyseHardWareAlarmRecordApi = data => post('xmgl/aiAnalyseHardWareAlarmRecord/selectPageList', data);
 export const getCrewListDataApi = data => post('xmgl/systemUser/getProjectChilderSystemUserList', data); // 查询 所有整改人员
diff --git a/src/views/projectFront/aiAnalysis/warningList.vue b/src/views/projectFront/aiAnalysis/warningList.vue
index 38648ba7..5fea3d7b 100644
--- a/src/views/projectFront/aiAnalysis/warningList.vue
+++ b/src/views/projectFront/aiAnalysis/warningList.vue
@@ -106,9 +106,13 @@
                     <span class="time">{{ getTypeName(item.alarmType) }}</span>
                     <span>{{ item.createTime }}</span>
                   </div>
-                  <div class="status-style" :class="item.handleResult?'result-style':'no-result-style'">{{item.handleResult?'已处置':'未处置'}}</div>
+                  <!-- <div class="status-style" :class="item.handleResult?'result-style':'no-result-style'">{{item.handleResult?'已处置':'未处置'}}</div> -->
+                  <div class="status-style" :class="!item.handleResult?'no-result-style':item.handleResult==1?'result-style':'ignoreStyle'">
+                    <!-- {{item.handleResult?'已处置':'未处置'}} -->
+                    {{!item.handleResult?'未处置':item.handleResult==1?'已处置':'误报忽略'}}
+                  </div>
                 </div>
-                <!-- 来源 -->
+                <!-- 来源 --> 
                 <div class="title" @click="openDialogDetail(item)">
                   <!-- {{ $t('message.sixComplete.carDense.from') + ':' }}{{ item.alarmDesc }} -->
                   <el-tooltip
@@ -181,11 +185,11 @@
     <el-dialog :modal-append-to-body="false" @close="close" title="处置详情" :visible.sync="recordShow" width="667px">
       <div class="dialog_content">
         <el-form size="medium" ref="addEditForm" :model="addEditForm" :rules="addEditRules" label-width="120px" class="dialogFormBox">
-          <!-- <el-form-item label="处置结果" prop="handleResult">
+          <el-form-item label="处置结果" prop="handleResult">
             <el-radio :disabled="isDetail" v-model="addEditForm.handleResult" :label="1">已处置</el-radio>
             <el-radio :disabled="isDetail" v-model="addEditForm.handleResult" :label="2">误报忽略</el-radio>
           </el-form-item>
-          <el-form-item label="描述" prop="desc" v-if="addEditForm.handleResult != 2">
+          <!-- <el-form-item label="描述" prop="desc" v-if="addEditForm.handleResult != 2">
             <el-input
               :autosize="{ minRows: 2, maxRows: 6 }"
               :disabled="isDetail"
@@ -204,7 +208,8 @@
           </el-form-item>
           <div class="dialog-footer" v-if="!isDetail">
             <el-button class="cancleBtn" icon="el-icon-circle-close" size="medium" @click="recordShow = false">取消 </el-button>
-            <el-button @click="addBtn" type="primary" icon="el-icon-circle-check" size="medium">确定 </el-button>
+            <el-button @click="addBtn" type="primary" icon="el-icon-circle-check" size="medium" v-if="addEditForm.handleResult != 2">确定 </el-button>
+            <el-button @click="ignoreBtn" type="primary" icon="el-icon-circle-check" size="medium" v-if="addEditForm.handleResult == 2">确定 </el-button>
           </div>
         </el-form>
       </div>
@@ -215,7 +220,8 @@
 import {
   aiAnalyseHardWareAlarmRecordApi,
   aiAnalyseHardWareAlarmRecordEdit,
-  getViolatorList
+  getViolatorList,
+  aiAnalyseHardWareRecordEditApi,
 } from '@/assets/js/api/equipmentCenter/electricBox'
 import { getDictionaryItemApi } from '@/assets/js/api/companyDiagram.js'
 import { getWorkerInfoList, selectHierarchyEnterpriseListApi } from '@/assets/js/api/laborPerson.js'
@@ -440,7 +446,28 @@ export default {
       this.$refs.addEditForm.validate(valid => {
         if (valid) {
           console.log('保存', params)
-          aiAnalyseHardWareAlarmRecordEdit(params).then(result => {
+          // aiAnalyseHardWareAlarmRecordEdit(params).then(result => {
+          aiAnalyseHardWareRecordEditApi(params).then(result => {
+            if (result.success) {
+              this.$message.success(result.message)
+              this.getList()
+              this.recordShow = false
+            }
+          })
+        } else {
+          return false
+        }
+      })
+    },
+    ignoreBtn(){
+      let params = JSON.parse(JSON.stringify(this.addEditForm))
+      params.projectSn = this.$store.state.projectSn
+      params.handleResult = 2;
+      this.$refs.addEditForm.validate(valid => {
+        if (valid) {
+          console.log('误报忽略', params)
+          // aiAnalyseHardWareAlarmRecordEdit(params).then(result => {
+          aiAnalyseHardWareRecordEditApi(params).then(result => {
             if (result.success) {
               this.$message.success(result.message)
               this.getList()
@@ -532,6 +559,15 @@ export default {
       json.isPushed = 1
       aiAnalyseHardWareAlarmRecordApi(json).then(res => {
         this.workerList = res.result.records
+        // let tempArr = []
+        // this.workerList.map(item => {
+        //   if(item.id == '1790158137802788866'){
+        //     tempArr.push(item)
+        //     console.log("77777777777",item)
+        //   }
+        // })
+        // console.log("88888888888",tempArr)
+        // this.workerList = tempArr
         this.pageInfo.total = res.result.total
         setTimeout(() => {
           this.$previewRefresh()
@@ -635,7 +671,7 @@ export default {
       left: 0px;
       color: white;
       text-align: center;
-      width: 60px;
+      width: 70px;
       height: 20px;
       line-height: 20px;
       border-radius: 10px;
@@ -648,6 +684,9 @@ export default {
     .no-result-style{
       background-color: #5B82EE;
     }
+    .ignoreStyle{
+      background-color: rgba(0, 0, 0, 0.5);
+    }
   }
   .title {
     width: 70%;