1.预警信息点击弹窗去掉，将弹窗内容全部放到预警信息里。包括右下角 确认报警按钮；

2.预警查询在部件后边增加  状态 解除-未解除 的筛选框。
3.经济分析里所有的 国能宁夏 选项框 去掉

src/views/IntegratedAlarm/safe/components/safecomponent.vue

@@ -1,5 +1,6 @@
 <template>
-  <div class="safeCom" @click="clickAlarmItem">
+ <!-- @click="clickAlarmItem" -->
+  <div class="safeCom">
     <div class="safeCom_head">
       <i
         :class="['iconfont', iconfonts()]"
@@ -15,7 +16,11 @@
         </div>
       </div>
     </div>
-    <el-table :data="alarmList" style="width: 100%" height="calc(100% - 51px)">
+    <el-table
+      :data="dialogTableData"
+      style="width: 100%"
+      height="calc(100% - 100px)"
+    >
       <el-table-column
         prop="tsName"
         label="时间"
@@ -38,30 +43,35 @@
         width="80"
         show-overflow-tooltip
       />
-      <!-- :prop="alarmType==='custom' ? characteristic : description" -->
       <el-table-column
         :prop="alarmType === 'custom' ? 'characteristic' : 'description'"
         align="center"
         label="信息"
         show-overflow-tooltip
       />
-      <!-- <el-table-column label="级别" width="80" show-overflow-tooltip>
+      <el-table-column
+        prop="faultCause"
+        label="故障原因"
+        align="left"
+        show-overflow-tooltip
+      >
+        <template #default="{ row }">
+          {{ row.faultCause == "NULL" ? "--" : row.faultCause }}
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop=""
+        label="解除时间"
+        align="center"
+        width="220"
+        show-overflow-tooltip
+      >
         <template #default="scope">
-          <el-tag
-            class="ml-2"
-            :type="
-              scope.row.lv === 5
-                ? 'danger'
-                : scope.row.lv === 4
-                ? 'warning'
-                : 'info'
-            "
-            >{{ scope.row.lvName }}</el-tag
-          >
+          <span>{{ scope.row.endts || scope.row.closeTime || "--" }}</span>
         </template>
-      </el-table-column> -->
+      </el-table-column>
 
-      <el-table-column
+      <!-- <el-table-column
         label="状态"
         width="75"
         align="center"
@@ -77,8 +87,41 @@
             >{{ scope.row.isClose ? "已解除" : "未解除" }}</span
           >
         </template>
+      </el-table-column> -->
+      <el-table-column
+        label="是否解除"
+        width="120"
+        align="center"
+        show-overflow-tooltip
+      >
+        <template #default="scope">
+          <span
+            :style="`color:${
+              scope.row.isClose
+                ? 'var(--el-color-success)'
+                : 'var(--el-color-danger)'
+            }`"
+            >{{ scope.row.isClose ? "已解除" : "未解除" }}</span
+          >
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" width="100" align="center">
+        <template #default="scope">
+          <el-button
+            type="text"
+            style="color: #1890ff !important"
+            size="small"
+            @click="confirm(scope.row)"
+            >确认本条</el-button
+          >
+        </template>
       </el-table-column>
     </el-table>
+    <div style="margin-top: 10px; display: flex; justify-content: end;">
+      <el-button type="primary" plain @click="confirmAll"
+        >确认所有报警</el-button
+      >
+    </div>
     <el-dialog
       v-model="showDialog"
       top="50px"

src/views/IntegratedAlarm/safe/customWarning/index.vue

@@ -121,6 +121,27 @@
           </div>
         </div>
         <div class="search-item">
+          <span class="label">状态：</span>
+          <div class="search-content">
+            <el-select
+              v-model="state.statusId"
+              style="width: 120px"
+              clearable
+              size="mini"
+              placeholder="状态"
+              popper-class="select"
+            >
+              <el-option
+                v-for="item in state.statusList"
+                :key="item.id"
+                :value="item.id"
+                :label="item.name"
+              >
+              </el-option>
+            </el-select>
+          </div>
+        </div>
+        <div class="search-item">
           <span class="label">描述：</span>
           <div class="search-content">
             <el-input
@@ -381,6 +402,7 @@ const getfetchRelatePart = async () => {
   state.fetchListAll = data;
 };
 
+
 const confirmItem = (alarmItem) => {
   ElMessageBox.confirm("您确定要执行此操作吗？", "提示", {
     confirmButtonText: "确定",
@@ -442,6 +464,17 @@ const state = reactive({
   fetchListAll: {},
   modelId: "", //型号
   components: "", //部件
+  statusId: "",
+  statusList: [
+    {
+        id: 0,
+        name: "未解除",
+    },
+    {
+        id: 1,
+        name: "已解除",
+    }
+  ],
   description: "", //描述
   dateTime: [],
   startDate: null,
@@ -593,6 +626,7 @@ const getAlarmHistoryt = async () => {
     description: state.description,
     begin: state.dateTime[0],
     end: state.dateTime[1],
+    isclose: state.statusId === "0" ? false : true
   };
   const { data } = await alarm_history(params);
   //   tableLoading.value = false;

src/views/economicsOperation/benchmarkingManagement/intervalBenchmarking/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="parcel-box">
     <div class="form-wrapper">
-      <el-select
+      <!-- <el-select
         size="mini"
         :disabled="displayDetail"
         v-model="company"
@@ -28,7 +28,7 @@
         >
           <span>{{ val.name }}</span>
         </div>
-      </div>
+      </div> -->
       <!-- <div class="station">
         场站：
         <el-select

src/views/economicsOperation/benchmarkingManagement/performanceRankingList/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="home-body" style="height: 100%">
     <div class="title">
-      <el-select
+      <!-- <el-select
         size="mini"
         v-model="company"
         placeholder="请选择"
@@ -24,7 +24,7 @@
         >
           <span>{{ val.name }}</span>
         </div>
-      </div>
+      </div> -->
 
       <!-- <div class="station">
         场站：

src/views/economicsOperation/benchmarkingManagement/projectBenchmarking/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="parcel-box">
     <div class="form-wrapper">
-      <el-select
+      <!-- <el-select
         size="mini"
         :disabled="displayDetail"
         v-model="company"
@@ -28,7 +28,7 @@
         >
           <span>{{ val.name }}</span>
         </div>
-      </div>
+      </div> -->
       <!-- <div class="station">
         场站：
         <el-select

src/views/economicsOperation/benchmarkingManagement/siteBenchmarking/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="parcel-box">
     <div class="form-wrapper">
-      <el-select
+      <!-- <el-select
         size="mini"
         :disabled="displayDetail"
         v-model="company"
@@ -28,7 +28,7 @@
         >
           <span>{{ val.name }}</span>
         </div>
-      </div>
+      </div> -->
       <!-- <div class="station">
         场站：
         <el-select

src/views/economicsOperation/benchmarkingManagement/wiringBenchmarking/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="parcel-box">
     <div class="form-wrapper">
-      <el-select
+      <!-- <el-select
         size="mini"
         :disabled="displayDetail"
         v-model="company"
@@ -28,7 +28,7 @@
         >
           <span>{{ val.name }}</span>
         </div>
-      </div>
+      </div> -->
       <!-- <div class="station">
         场站：
         <el-select

src/views/economicsOperation/efficiency/consumeEfficiency/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="parcel-box">
     <div class="title">
-      <el-select
+      <!-- <el-select
         size="mini"
         v-model="company"
         placeholder="请选择"
@@ -14,7 +14,7 @@
           :value="item.id"
         >
         </el-option>
-      </el-select>
+      </el-select> -->
       <div class="station">
         日期
         <div class="search-input">

src/views/economicsOperation/efficiency/restorationEfficiency/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="parcel-box">
     <div class="title">
-      <el-select
+      <!-- <el-select
         size="mini"
         v-model="company"
         placeholder="请选择"
@@ -14,7 +14,7 @@
           :value="item.id"
         >
         </el-option>
-      </el-select>
+      </el-select> -->
       <div class="station">
         日期
         <div class="search-input">

src/views/economicsOperation/efficiency/stateEfficiency/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="parcel-box">
     <div class="title">
-      <el-select
+      <!-- <el-select
         size="mini"
         v-model="company"
         placeholder="请选择"
@@ -14,7 +14,7 @@
           :value="item.id"
         >
         </el-option>
-      </el-select>
+      </el-select> -->
       <div class="station">
         日期
         <div class="search-input">

src/views/economicsOperation/stationAnalyse/stationElectricAnalyse/index.vue

@@ -2,7 +2,7 @@
   <div class="parcel-box">
     <div class="search">
       <div class="search-left">
-        <el-select
+        <!-- <el-select
           size="mini"
           v-model="company"
           placeholder="请选择"
@@ -28,7 +28,7 @@
           >
             <span>{{ val.name }}</span>
           </div>
-        </div>
+        </div> -->
         <el-select
           size="mini"
           v-model="station"

src/views/economicsOperation/thematicAnalysis/MTBF/index.vue

@@ -2,7 +2,7 @@
   <div class="parcel-box">
     <div class="search">
       <div class="search-left">
-        <el-select
+        <!-- <el-select
           size="mini"
           v-model="company"
           placeholder="请选择"
@@ -25,7 +25,7 @@
           >
             <span>{{ val.name }}</span>
           </div>
-        </div>
+        </div> -->
         <div class="search-input">
           <el-date-picker
             size="mini"

src/views/economicsOperation/thematicAnalysis/comprehensiveAnalysis/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="comAnalysis">
     <div class="comAnalysis_top">
-      <el-select
+      <!-- <el-select
         size="mini"
         v-model="companyVal"
         placeholder="请选择"
@@ -24,7 +24,7 @@
         >
           <span>{{ val.name }}</span>
         </div>
-      </div>
+      </div> -->
       <div class="station">
         时间：
         <div class="">

src/views/economicsOperation/thematicAnalysis/failure/index.vue

@@ -2,7 +2,7 @@
   <div class="parcel-box">
     <div class="search">
       <div class="search-left">
-        <el-select
+        <!-- <el-select
           size="mini"
           v-model="company"
           placeholder="请选择"
@@ -25,7 +25,7 @@
           >
             <span>{{ val.name }}</span>
           </div>
-        </div>
+        </div> -->
         <div>
           <el-date-picker
             v-model="searchYear"

src/views/economicsOperation/thematicAnalysis/generation/index.vue

@@ -2,7 +2,7 @@
   <div class="parcel-box">
     <div class="search">
       <div class="search-left">
-        <el-select
+        <!-- <el-select
           size="mini"
           v-model="company"
           placeholder="请选择"
@@ -25,7 +25,7 @@
           >
             <span>{{ val.name }}</span>
           </div>
-        </div>
+        </div> -->
         <div class="search-input">
           <el-date-picker
             size="mini"

src/views/economicsOperation/thematicAnalysis/windEnergy/index.vue

@@ -2,7 +2,7 @@
   <div class="parcel-box">
     <div class="search">
       <div class="left">
-        <el-select
+        <!-- <el-select
           size="mini"
           v-model="company"
           placeholder="请选择"
@@ -25,7 +25,7 @@
           >
             <span>{{ val.name }}</span>
           </div>
-        </div>
+        </div> -->
         <div>
           <el-date-picker
             size="mini"

src/views/economicsOperation/windAnalyse/cutInAndOutAnalysis/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="cutInAndOutAnalysis">
     <div class="cutInAndOutAnalysis_top">
-      <el-select
+      <!-- <el-select
         size="mini"
         v-model="companyVal"
         placeholder="请选择"
@@ -14,7 +14,7 @@
           :value="item.id"
         >
         </el-option>
-      </el-select>
+      </el-select> -->
       <!-- <div class="tabCut">
               
                 <div :class="tabIndex === val.id ? 'active' : ''" v-for="val in tabOptions" :key="val.id"><span>{{

src/views/economicsOperation/windAnalyse/monthlyAnalysis/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="monthMachine">
     <div class="monthMachine_top">
-      <el-select
+      <!-- <el-select
         size="mini"
         v-model="companyVal"
         placeholder="请选择"
@@ -14,7 +14,7 @@
           :value="item.id"
         >
         </el-option>
-      </el-select>
+      </el-select> -->
       <!-- <div class="tabCut">
         <div
           @click="changeBtnsd(val.id)"

src/views/economicsOperation/windAnalyse/performanceAssess/index.vue

@@ -2,7 +2,7 @@
   <div class="comprehensiveEvaluation">
     <div class="Evaluation_topall">
       <div class="Evaluation_top">
-        <el-select
+        <!-- <el-select
           size="mini"
           v-model="companyVal"
           placeholder="请选择"
@@ -15,7 +15,7 @@
             :value="item.id"
           >
           </el-option>
-        </el-select>
+        </el-select> -->
         <!-- <div class="tabCut">
           <div
             @click="changeBtn(val.id)"

src/views/economicsOperation/windAnalyse/powerSearch/index.vue

@@ -2,7 +2,7 @@
   <div class="powerLinefitting">
     <div class="powerLinefitting_topAll">
       <div class="powerLinefitting_top">
-        <el-select
+        <!-- <el-select
           size="mini"
           v-model="companyVal"
           placeholder="请选择"
@@ -15,7 +15,7 @@
             :value="item.id"
           >
           </el-option>
-        </el-select>
+        </el-select> -->
         <!-- <div class="station">
           场站：
           <el-select

src/views/economicsOperation/windAnalyse/singleWindAnasyle/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="singleMachine">
     <div class="singleMachine_top">
-      <el-select
+      <!-- <el-select
         size="mini"
         v-model="companyVal"
         placeholder="请选择"
@@ -24,7 +24,7 @@
         >
           <span>{{ val.name }}</span>
         </div>
-      </div>
+      </div> -->
       <!-- <div class="station">
         场站：
         <el-select