若干BUG修复、接口调试、字段替换、样式调整、解决项目上线后访问接口 404 的问题。

src/api/api.js

@@ -1,12 +1,11 @@
 import request from "./axios.js";
-export const baseURL = "http://10.81.3.154:6015/";
-// export const baseURL = "http://192.168.1.106:6015/";
+import { baseURL } from "./apiConfig.js"
 import JSONBIG from "json-bigint";
 
 // 获取场站数据
 export function fetchStationListAll() {
     return request({
-        baseURL: baseURL,
+        baseURL,
         url: `alertrule/querywpllist`,
         method: "get",
     });
@@ -15,7 +14,7 @@ export function fetchStationListAll() {
 //获取部件及预警类型列表
 export function fetchRelatePartAndAlarmType() {
     return request({
-        baseURL: baseURL,
+        baseURL,
         url: "alertrule/queryalarmtypellist",
         method: "get",
     });
@@ -23,7 +22,7 @@ export function fetchRelatePartAndAlarmType() {
 //获取型号列表
 export const fetchModel = () => {
     return request({
-        baseURL: baseURL,
+        baseURL,
         url: "alertrule/querywpbyymodellist",
         method: "get",
     });
@@ -31,7 +30,7 @@ export const fetchModel = () => {
 //获取升压站列表
 export const fetchBooststation = () => {
     return request({
-        baseURL: baseURL,
+        baseURL,
         url: "alertrule/querysubllist",
         method: "get",
     });
@@ -39,7 +38,7 @@ export const fetchBooststation = () => {
 //查询自定义预警列表
 export function custombj_fetchTableData(params) {
     return request({
-        baseURL: baseURL,
+        baseURL,
         url: "alertrule/page",
         method: "get",
         params,
@@ -49,7 +48,7 @@ export function custombj_fetchTableData(params) {
 //根据场站编号，风机型号获取AI/DI测点
 export const fetchPointList = (wpId = "", modelId = "") => {
     return request({
-        baseURL: baseURL,
+        baseURL,
         url: `alertrule/querywtpointlist?wpId=${wpId}&modelId=${modelId}`,
         method: "get",
     });
@@ -57,7 +56,7 @@ export const fetchPointList = (wpId = "", modelId = "") => {
 //根据升压站编号获取AI/DI测点
 export const fetchPointListByBootst = (subId = "") => {
     return request({
-        baseURL: baseURL,
+        baseURL,
         url: `alertrule/querysubpointllist?subId=${subId}`,
         method: "get",
     });
@@ -65,7 +64,7 @@ export const fetchPointListByBootst = (subId = "") => {
 //新增/修改自定义预警
 export const custombj_postSave = (form) => {
     return request({
-        baseURL: baseURL,
+        baseURL,
         url: "alertrule/save",
         method: "post",
         data: form,
@@ -74,7 +73,7 @@ export const custombj_postSave = (form) => {
 //自定义预警模板下载
 export const custombj_importTemplate = () => {
     return request({
-        baseURL: baseURL,
+        baseURL,
         url: "alertrule/get-import-template",
         method: "get",
         responseType: "blob",
@@ -84,7 +83,7 @@ export const custombj_importTemplate = () => {
 //根据风场id获取所有风机
 export const fetchWindturbineList = (wpId = "") => {
     return request({
-        baseURL: baseURL,
+        baseURL,
         url: `alertrule/querywtlist?wpId=${wpId}`,
         method: "get",
     });
@@ -100,7 +99,7 @@ export const fetchAIDIPointList = (
     pageSize
 ) => {
     return request({
-        baseURL: baseURL,
+        baseURL,
         url: "info/point",
         method: "get",
         params: {
@@ -117,7 +116,7 @@ export const fetchAIDIPointList = (
 //字典维护列表
 export const get_datadictionary = (pageNum, pageSize, name, category) => {
     return request({
-        baseURL: baseURL,
+        baseURL,
         method: "get",
         url: `datadictionary/page?pageNum=${pageNum}&pageSize=${pageSize}&name=${name}&category=${category}`,
     });
@@ -125,7 +124,7 @@ export const get_datadictionary = (pageNum, pageSize, name, category) => {
 //字典维护 新增 修改
 export const post_saveorupdate = (data) => {
     return request({
-        baseURL: baseURL,
+        baseURL,
         method: "post",
         url: `datadictionary/save`,
         data,
@@ -135,7 +134,7 @@ export const post_saveorupdate = (data) => {
 //实时报警列表
 export const alarm_snap_top = (params) => {
     return request({
-        baseURL: baseURL,
+        baseURL,
         method: "get",
         url: `alarm/history/findAlarmByTypelist`,
         params: params,
@@ -171,7 +170,7 @@ export const getAdapterHistory = (
 ) => {
     return request({
         url: `ts/history/raw?uniformCode=${AIpoint}&thingId=${stationId}&thingType=windturbine&startTs=${startTs}&endTs=${endTs}`,
-        baseURL: baseUrl,
+        baseURL,
     });
 };
 //数据查询 数据快照
@@ -185,7 +184,7 @@ export const getAdapterHistorysnap = (
 ) => {
     return request({
         url: `ts/history/snap?uniformCode=${AIpoint}&thingId=${stationId}&thingType=windturbine&startTs=${startTs}&endTs=${endTs}&interval=${interval}`,
-        baseURL: baseUrl,
+        baseURL,
     });
 };
 
@@ -561,12 +560,7 @@ export function point(
 }
 //测点新增
 export function metrics(data) {
-    return request({
-        method: "post",
-        baseURL,
-        url: `device/metrics/single`,
-        data
-    });
+    return request.post(`device/metrics/single`, data);
 }
 //测点删除
 export function delmetrics(params) {
@@ -579,12 +573,12 @@ export function delmetrics(params) {
 //测点导入
 
 //tree新增 添加一个设备结构节点
-export function treeAdd(params) {
+export function treeAdd(data) {
     return request({
         method: "post",
         baseURL,
         url: `device/structure`,
-        params,
+        data,
     });
 }
 //tree删除 tree删除一个设备结构节点

src/api/apiConfig.js

@@ -0,0 +1,2 @@
+// export const baseURL = "http://192.168.1.110:6015/";
+export const baseURL = "http://10.81.3.154:6015/";

src/api/axios.js

@@ -6,10 +6,12 @@ import { nextTick } from "vue";
 import config from "./config";
 import JSONBIG from "json-bigint";
 import { getCookie } from "@/utils/auth"; // getToken from cookie
+import { baseURL } from "./apiConfig"
 // 配置新建一个 axios 实例
 var loading = null;
 const service = axios.create({
-    baseURL: "/sharding/",
+    // baseURL: "/sharding/",
+    baseURL,
     timeout: 20000,
     headers: { "Content-Type": "application/json" },
     showLoading: {
@@ -53,7 +55,7 @@ service.interceptors.request.use(
 service.interceptors.response.use(
     (response) => {
         // 对响应数据做点什么
-        nextTick(async() => {
+        nextTick(async () => {
             loading && (await loading.close());
         });
         const res = response.data;
@@ -61,22 +63,22 @@ service.interceptors.response.use(
             ElMessageBox.alert(
                 "登录状态已过期，您可以继续留在该页面，或者重新登录",
                 "系统提示", {
-                    confirmButtonText: "重新登录",
-                    cancelButtonText: "取消",
-                    type: "warning",
-                    callback: () => {
-                        store.dispatch("user/LogOut").then(() => {
-                            route.push("/");
-                        });
-                    },
-                }
+                confirmButtonText: "重新登录",
+                cancelButtonText: "取消",
+                type: "warning",
+                callback: () => {
+                    store.dispatch("user/LogOut").then(() => {
+                        route.push("/");
+                    });
+                },
+            }
             );
         } else {
             return response.data;
         }
     },
     (error) => {
-        nextTick(async() => {
+        nextTick(async () => {
             loading && (await loading.close());
         });
         // 对响应错误做点什么

src/components/alarmPopupa/index.vue

@@ -229,9 +229,10 @@ export default {
             ].class = `animate__bounceOutRight lv${this.alarmList[i].lv}`;
             this.alarmList[i].confirm = true;
             setTimeout(() => {
-              this.alarmList[
-                i
-              ].class = `animate__bounceOutRight hidden lv${this.alarmList[i].lv}`;
+              this.alarmList[i] &&
+                (this.alarmList[i].class = `animate__bounceOutRight hidden lv${
+                  this.alarmList[i]?.lv || 3
+                }`);
             }, 500);
           }
         }
@@ -405,6 +406,7 @@ export default {
         code: alarmItem.code,
         wpName: alarmItem.wpName,
       };
+
       if (
         configItem.isAlarmSound ||
         configItem.isAlart ||

src/pages/alarmConfig/bj_custom/custom.vue

@@ -232,9 +232,9 @@ import {
   fetchModel,
   fetchBooststation,
   custombj_importTemplate,
-  baseURL,
   getWpList,
 } from "/@/api/api.js";
+import { baseURL } from "/@/api/apiConfig.js";
 import { outExportExcel } from "/@/utils/exportExcel"; //引入文件
 import {
   ref,
@@ -363,7 +363,6 @@ const dialogclose = () => {
   getData();
 };
 const getWpArray = async () => {
-  console.log(1111, query.category);
   const { data } = await getWpList(query.category);
   stationList.value = data;
 };

src/pages/baseData/fan_components/message.vue

@@ -22,7 +22,7 @@
       <el-form-item label="结构英文名称">
         <el-input v-model="desc.enname"></el-input>
       </el-form-item>
-       <el-form-item label="英文缩写">
+      <el-form-item label="英文缩写">
         <el-input v-model="desc.sortname"></el-input>
       </el-form-item>
       <el-form-item label="描述">
@@ -54,23 +54,17 @@
   </div>
 </template>
 <script setup>
-import { ref, onMounted,  inject } from "vue";
+import { ref, onMounted, inject } from "vue";
 import { ElMessageBox, ElMessage } from "element-plus";
-import {
- treeAdd
-} from "/@/api/api.js";
+import { treeAdd } from "/@/api/api.js";
 let desc = inject("desc");
 let cascaderdata = inject("cascaderdata");
 const savedesc = async () => {
   const res = await treeAdd(desc.value);
-  if (res.status == 20000) {
+  if (res.code === 200) {
     ElMessage.success(`操作成功!`);
   } else {
     ElMessage.success(res.msg);
   }
 };
-
-
-</script>
-<style lang="scss" scoped>
-</style>
+</script>

src/pages/baseData/fan_components/yxpoint.vue

@@ -322,11 +322,7 @@ const getPoint = async (node) => {
 // 机型
 const getequipmentmodel_list = async () => {
   const { data } = await getWtModel();
-  let arr = [];
-  data.forEach((e) => {
-    arr.push(...e.modelList);
-  });
-  state.modelList = [...new Set(arr)];
+  state.modelList = data;
 };
 // 测点 编辑
 const handleEdit = (row) => {

src/pages/customWarning/index.vue

@@ -122,18 +122,26 @@
         >
         </el-date-picker>
       </div>
-
-      <el-button type="primary" size="mini" @click="getAlarmHistoryt"
-        >查询</el-button
-      >
-      <el-button
-        size="mini"
-        type="primary"
-        @click="export2Excel"
-        :disabled="state.tableData?.length == 0 ? true : false"
-      >
-        导出</el-button
-      >
+      <div>
+        <el-button type="primary" size="mini" @click="getAlarmHistoryt"
+          >查询</el-button
+        >
+        <el-button
+          size="mini"
+          type="primary"
+          @click="export2Excel"
+          :disabled="state.tableData?.length == 0 ? true : false"
+        >
+          导出</el-button
+        >
+        <el-button
+          type="primary"
+          size="mini"
+          :disabled="!state.tableData?.length"
+          @click="confirmItem(state.tableData)"
+          >确认本页</el-button
+        >
+      </div>
     </el-space>
   </el-card>
   <div class="table-wrapper">
@@ -162,12 +170,35 @@
               <span v-else-if="item.code == 'ts'">
                 {{ formatTime(scope.row.ts) }}
               </span>
+              <span
+                :style="`color:${
+                  scope.row.confirmed
+                    ? 'var(--el-color-primary)'
+                    : 'var(--el-color-danger)'
+                }`"
+                v-else-if="item.code == 'confirmed'"
+              >
+                {{ scope.row.confirmed ? "是" : "否" }}
+              </span>
               <span v-else>
                 {{ scope.row[item.code] }}
               </span>
             </p>
           </template>
         </el-table-column>
+        <el-table-column
+          label="操作"
+          width="100"
+          header-align="center"
+          align="center"
+          fixed="right"
+        >
+          <template #default="scope">
+            <el-button type="text" @click="confirmItem([scope.row])"
+              >确认本条</el-button
+            >
+          </template>
+        </el-table-column>
       </template>
       <template v-else>
         <el-table-column
@@ -187,22 +218,51 @@
               <span v-else-if="item.code == 'ts'">
                 {{ formatTime(scope.row.ts) }}
               </span>
+              <span
+                :style="`color:${
+                  scope.row.confirmed
+                    ? 'var(--el-color-primary)'
+                    : 'var(--el-color-danger)'
+                }`"
+                v-else-if="item.code == 'confirmed'"
+              >
+                {{ scope.row.confirmed ? "是" : "否" }}
+              </span>
               <span v-else>
                 {{ scope.row[item.code] }}
               </span>
             </p>
           </template>
         </el-table-column>
+        <el-table-column
+          label="操作"
+          width="100"
+          header-align="center"
+          align="center"
+          fixed="right"
+        >
+          <template #default="scope">
+            <el-button type="text" @click="confirmItem([scope.row])"
+              >确认本条</el-button
+            >
+          </template>
+        </el-table-column>
       </template>
     </el-table>
     <div class="pagination-wrapper">
       <el-pagination
         background
-        layout="total, prev, pager, next"
-        hide-on-single-page
+        layout="total, sizes, prev, pager, next"
         :current-page="query.page"
         :page-size="query.limit"
+        :page-sizes="[15, 100, 500, 1000]"
         :total="query.pageTotal"
+        @size-change="
+          (value) => {
+            query.limit = value;
+            getAlarmHistoryt();
+          }
+        "
         @current-change="handlePageChange"
       ></el-pagination>
     </div>
@@ -220,6 +280,7 @@ import {
   fetchModel,
   fetchRelatePartAndAlarmType,
   getWpList,
+  confirmAlart,
 } from "/@/api/api.js";
 import { ElMessage } from "element-plus";
 import { initWebSocket } from "/@/websocket/indextest";
@@ -252,6 +313,28 @@ const getfetchRelatePart = async () => {
   state.fetchListAll = data;
 };
 
+const confirmItem = (alarmItem) => {
+  ElMessageBox("您确定要执行此操作吗？", "提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning",
+  })
+    .then(() => {
+      confirmAlart(alarmItem)
+        .then((res) => {
+          if (res.code === 200) {
+            ElMessage.success("确认成功");
+            store.commit("removeWarning", alarmItem);
+            getAlarmHistoryt();
+          }
+        })
+        .catch(() => {
+          ElMessage.error("确认失败，请重试");
+        });
+    })
+    .catch(() => {});
+};
+
 const getColumnStyle = (columnItem) => {
   let style = "color:";
   if (columnItem.endts) {
@@ -313,6 +396,7 @@ const state = reactive({
       style: getColumnStyle,
       width: 100,
     },
+    { title: "是否确认", code: "confirmed", width: "100" },
     { title: "类型", code: "deviceTypeName", width: "80" },
   ],
   tableHeader1: [
@@ -327,6 +411,7 @@ const state = reactive({
       width: 100,
       width: "80",
     },
+    { title: "是否确认", code: "confirmed", width: "100" },
     { title: "类型", code: "deviceTypeName", width: "80" },
   ],
 });
@@ -407,7 +492,7 @@ const getWindturbineList = async () => {
 };
 const query = reactive({
   page: 1,
-  limit: 17,
+  limit: 15,
   pageTotal: null,
 });
 
@@ -532,7 +617,7 @@ const messageTypeFilter = (val) => {
 
 <style scoped lang="scss">
 .table-wrapper {
-  height: calc(100% - 70px - 50px);
+  height: calc(100% - 160px);
   background-color: #fff;
   margin-top: 10px;
   padding: 20px;

src/pages/safe/historywaring.vue

@@ -7,7 +7,6 @@
           v-model="state.typeVal"
           clearable
           size="mini"
-          style="width: 100px"
           placeholder="全部"
           popper-class="select"
           @change="
@@ -122,18 +121,26 @@
         >
         </el-date-picker>
       </div>
-
-      <el-button type="primary" size="mini" @click="getAlarmHistoryt"
-        >查询</el-button
-      >
-      <el-button
-        size="mini"
-        type="primary"
-        @click="export2Excel"
-        :disabled="state.tableData?.length == 0 ? true : false"
-      >
-        导出</el-button
-      >
+      <div>
+        <el-button type="primary" size="mini" @click="getAlarmHistoryt"
+          >查询</el-button
+        >
+        <el-button
+          size="mini"
+          type="primary"
+          @click="export2Excel"
+          :disabled="state.tableData?.length == 0 ? true : false"
+        >
+          导出</el-button
+        >
+        <el-button
+          type="primary"
+          size="mini"
+          :disabled="!state.tableData?.length"
+          @click="confirmItem(state.tableData)"
+          >确认本页</el-button
+        >
+      </div>
     </el-space>
   </el-card>
   <div class="table-wrapper">
@@ -165,12 +172,35 @@
               <span v-else-if="item.code == 'ts'">
                 {{ formatTime(scope.row.ts) }}
               </span>
+              <span
+                :style="`color:${
+                  scope.row.confirmed
+                    ? 'var(--el-color-primary)'
+                    : 'var(--el-color-danger)'
+                }`"
+                v-else-if="item.code == 'confirmed'"
+              >
+                {{ scope.row.confirmed ? "是" : "否" }}
+              </span>
               <span v-else>
                 {{ scope.row[item.code] }}
               </span>
             </p>
           </template>
         </el-table-column>
+        <el-table-column
+          label="操作"
+          width="100"
+          header-align="center"
+          align="center"
+          fixed="right"
+        >
+          <template #default="scope">
+            <el-button type="text" @click="confirmItem([scope.row])"
+              >确认本条</el-button
+            >
+          </template>
+        </el-table-column>
       </template>
       <template v-else>
         <el-table-column
@@ -193,22 +223,51 @@
               <span v-else-if="item.code == 'ts'">
                 {{ formatTime(scope.row.ts) }}
               </span>
+              <span
+                :style="`color:${
+                  scope.row.confirmed
+                    ? 'var(--el-color-primary)'
+                    : 'var(--el-color-danger)'
+                }`"
+                v-else-if="item.code == 'confirmed'"
+              >
+                {{ scope.row.confirmed ? "是" : "否" }}
+              </span>
               <span v-else>
                 {{ scope.row[item.code] }}
               </span>
             </p>
           </template>
         </el-table-column>
+        <el-table-column
+          label="操作"
+          width="100"
+          header-align="center"
+          align="center"
+          fixed="right"
+        >
+          <template #default="scope">
+            <el-button type="text" @click="confirmItem([scope.row])"
+              >确认本条</el-button
+            >
+          </template>
+        </el-table-column>
       </template>
     </el-table>
     <div class="pagination-wrapper">
       <el-pagination
         background
-        layout="total, prev, pager, next"
-        hide-on-single-page
+        layout="total, sizes, prev, pager, next"
         :current-page="query.page"
         :page-size="query.limit"
+        :page-sizes="[15, 100, 500, 1000]"
         :total="query.pageTotal"
+        @size-change="
+          (value) => {
+            query.limit = value;
+            getAlarmHistoryt();
+          }
+        "
         @current-change="handlePageChange"
       ></el-pagination>
     </div>
@@ -226,8 +285,9 @@ import {
   fetchModel,
   fetchRelatePartAndAlarmType,
   getWpList,
+  confirmAlart,
 } from "/@/api/api.js";
-import { ElMessage } from "element-plus";
+import { ElMessageBox, ElMessage } from "element-plus";
 import { initWebSocket } from "/@/websocket/indextest";
 import { outExportExcel } from "/@/utils/exportExcel"; //引入文件
 import { useStore } from "vuex";
@@ -258,6 +318,28 @@ const getfetchRelatePart = async () => {
   state.fetchListAll = data;
 };
 
+const confirmItem = (alarmItem) => {
+  ElMessageBox("您确定要执行此操作吗？", "提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning",
+  })
+    .then(() => {
+      confirmAlart(alarmItem)
+        .then((res) => {
+          if (res.code === 200) {
+            ElMessage.success("确认成功");
+            store.commit("removeWarning", alarmItem);
+            getAlarmHistoryt();
+          }
+        })
+        .catch(() => {
+          ElMessage.error("确认失败，请重试");
+        });
+    })
+    .catch(() => {});
+};
+
 const getColumnStyle = (columnItem) => {
   let style = "color:";
   if (columnItem.endts) {
@@ -318,6 +400,7 @@ const state = reactive({
       style: getColumnStyle,
       width: 100,
     },
+    { title: "是否确认", code: "confirmed", width: "100" },
     { title: "类型", code: "alarmTypeName", width: "80" },
   ],
   tableHeader1: [
@@ -332,6 +415,7 @@ const state = reactive({
       width: 100,
       width: "80",
     },
+    { title: "是否确认", code: "confirmed", width: "100" },
     { title: "类型", code: "alarmTypeName", width: "80" },
   ],
 });
@@ -412,7 +496,7 @@ const getWindturbineList = async () => {
 };
 const query = reactive({
   page: 1,
-  limit: 17,
+  limit: 15,
   pageTotal: null,
 });
 
@@ -542,7 +626,7 @@ const messageTypeFilter = (val) => {
 
 <style scoped lang="scss">
 .table-wrapper {
-  height: calc(100% - 70px - 50px);
+  height: calc(100% - 160px);
   background-color: #fff;
   margin-top: 10px;
   padding: 20px;

src/pages/safe/safecomponent.vue

@@ -10,7 +10,8 @@
         <div
           style="font-size: 14px; position: relative; right: 35px; top: 15px"
         >
-          共{{ alarmList.length }}/{{ fullTableData.length }}条
+          <!-- 共{{ alarmList.length }}/{{ fullTableData.length }}条 -->
+          {{ alarmList.length }}条
         </div>
       </div>
     </div>
@@ -230,7 +231,7 @@ export default {
 
     initWarningList() {
       let alarmList = [];
-      let fullTableData = [];
+      // let fullTableData = [];
       let dialogTableData = [];
       this.$store.state.warningList.forEach((ele) => {
         if (
@@ -240,7 +241,7 @@ export default {
           alarmList?.length < this.$store.state.warningListLimitLength &&
             alarmList.push(ele);
           dialogTableData?.length < 50 && dialogTableData.push(ele);
-          fullTableData.push(ele);
+          // fullTableData.push(ele);
         }
       });
       alarmList.sort((a, b) => {
@@ -249,14 +250,14 @@ export default {
       dialogTableData.sort((a, b) => {
         return b.ts - a.ts;
       });
-      fullTableData.sort((a, b) => {
-        return b.ts - a.ts;
-      });
+      // fullTableData.sort((a, b) => {
+      //   return b.ts - a.ts;
+      // });
       this.alarmList = alarmList;
       if (!this.stopUpdate) {
         this.dialogTableData = dialogTableData;
       }
-      this.fullTableData = fullTableData;
+      // this.fullTableData = fullTableData;
     },
 
     clickAlarmItem() {
@@ -271,16 +272,22 @@ export default {
         type: "warning",
       })
         .then(() => {
-          confirmAlart([alarmItem]).then((res) => {
-            if (res.code === 200) {
+          confirmAlart([alarmItem])
+            .then((res) => {
+              if (res.code === 200) {
+                this.BASE.showMsg({
+                  type: "success",
+                  msg: `${this.title}确认成功`,
+                });
+                this.$store.commit("removeWarning", alarmItem);
+              }
+              this.stopUpdate = false;
+            })
+            .catch(() => {
               this.BASE.showMsg({
-                type: "success",
-                msg: `${this.title}确认成功`,
+                msg: "确认失败，请重试",
               });
-              this.$store.commit("removeWarning", alarmItem);
-            }
-            this.stopUpdate = false;
-          });
+            });
         })
         .catch(() => {
           this.stopUpdate = false;
@@ -295,16 +302,22 @@ export default {
         type: "warning",
       })
         .then(() => {
-          confirmAlart(this.dialogTableData).then((res) => {
-            if (res.code === 200) {
+          confirmAlart(this.dialogTableData)
+            .then((res) => {
+              if (res.code === 200) {
+                this.BASE.showMsg({
+                  type: "success",
+                  msg: `全部${this.title}确认成功`,
+                });
+                this.$store.commit("removeWarning", this.dialogTableData);
+              }
+              this.stopUpdate = false;
+            })
+            .catch(() => {
               this.BASE.showMsg({
-                type: "success",
-                msg: `全部${this.title}确认成功`,
+                msg: "确认失败，请重试",
               });
-              this.$store.commit("removeWarning", this.dialogTableData);
-            }
-            this.stopUpdate = false;
-          });
+            });
         })
         .catch(() => {
           this.stopUpdate = false;

src/pages/systemManage/systemManage.vue

@@ -13,7 +13,7 @@
       >
         <template #label>
           <div class="alartPaneLabel">
-            <span>{{ item.alarmLevel }}级报警</span>
+            <span>{{ getAlartLevelName(item.alarmLevel) }}级报警</span>
             <div class="alartBadge" :class="getAlartStatus(item)"></div>
           </div>
         </template>
@@ -123,6 +123,20 @@ export default {
       }
     },
 
+    getAlartLevelName(lv) {
+      if (lv === 1) {
+        return "低级";
+      } else if (lv === 2) {
+        return "低中级";
+      } else if (lv === 3) {
+        return "中级";
+      } else if (lv === 4) {
+        return "中高级";
+      } else if (lv === 5) {
+        return "高级级";
+      }
+    },
+
     save() {
       let configArray = this.BASE.deepCopy(this.alarmConfigArray);
       let promiseArray = [];

vite.config.js

@@ -31,7 +31,7 @@ export default defineConfig({
             "^/sharding": {
                 // target: 'http://wanghs.nat300.top',
                 target: "http://10.81.3.154:6015",
-                // target: "http://192.168.1.106:6015",
+                // target: "http://192.168.1.110:6015",
                 changeOrigin: true, //开启代理
                 rewrite: (path) => path.replace(/^\/sharding/, ""),
             },