Bladeren bron

.gitignore 文件修改、系统部分页面接口替换、字段替换、参数替换、样式修改。

Koishi 1 jaar geleden
bovenliggende
commit
683bbb193a

+ 3 - 3
.gitignore

@@ -3,6 +3,6 @@ node_modules/
 .vscode
 dist
 dist_electron
-.zip
-.rar
-.7z
+*.zip
+*.rar
+*.7z

+ 3 - 3
src/api/api.js

@@ -1,6 +1,6 @@
 import request from "./axios.js";
 export const baseURL = "http://10.81.3.154:6015/";
-// export const baseURL = "http://192.168.1.108:6015/";
+// export const baseURL = "http://192.168.1.102:6015/";
 import JSONBIG from "json-bigint";
 
 // 获取场站数据
@@ -843,10 +843,10 @@ export const getWtModel = (wpId) => {
     });
 };
 
-export const getWpList = () => {
+export const getWpList = (types = "") => {
     return request({
         method: "get",
-        url: `/alertrule/querywpllist`,
+        url: `/alertrule/querywpllist?types=${types}`,
     });
 };
 export const getBpList = () => {

+ 1 - 1
src/components/alarmPopupa/index.vue

@@ -78,7 +78,7 @@ export default {
       if (alarmItem.deviceType === "booststation") {
         alarmName = "升压站报警";
       } else if (alarmItem.deviceType === "inverter") {
-        alarmName = "逆变器报警";
+        alarmName = "光伏报警";
       } else if (alarmItem.deviceType === "windturbine") {
         alarmName = "设备报警";
       } else if (alarmItem.deviceType === "station") {

+ 3 - 7
src/pages/alarmConfig/bj_windturbine/windturbine.vue

@@ -54,13 +54,9 @@
           popper-class="select"
           @change="categorychanged"
         >
-          <el-option key="1" label="风机报警" value="windturbine"></el-option>
-          <el-option
-            key="2"
-            label="升压站报警"
-            value="booststation"
-          ></el-option>
-          <el-option key="3" label="逆变器报警" value="inverter"></el-option>
+          <el-option key="2" label="升压站" value="booststation"></el-option>
+          <el-option key="1" label="风机" value="windturbine"></el-option>
+          <el-option key="3" label="光伏" value="inverter"></el-option>
         </el-select>
         <el-select
           v-model="query.wpId"

+ 2 - 2
src/pages/alarmConfig/bj_windturbine/windturbine_components.vue

@@ -279,7 +279,7 @@ export default {
       categoryArray: [
         { id: "windturbine", label: "风机报警" },
         { id: "booststation", label: "升压站报警" },
-        { id: "inverter", label: "逆变器报警" },
+        { id: "inverter", label: "光伏报警" },
       ],
       wpArray: [],
       modelArray: [],
@@ -379,7 +379,7 @@ export default {
       fetchRelatePartAndAlarmType().then((res) => {
         const keyMap = {
           fjbj: "风机部件",
-          gfbj: "逆变器部件",
+          gfbj: "光伏部件",
         };
 
         let associatedComponentsArray = [];

+ 29 - 21
src/pages/safe/historywaring.vue

@@ -10,7 +10,12 @@
           style="width: 100px"
           placeholder="全部"
           popper-class="select"
-          @change="typechange"
+          @change="
+            () => {
+              getStationList();
+              typechange();
+            }
+          "
         >
           <el-option
             v-for="item in state.typeList"
@@ -181,7 +186,7 @@
 </template>
 
 <script setup>
-import { watch, reactive, nextTick, computed, onMounted } from "vue";
+import { watch, reactive, nextTick, computed, onMounted, ref } from "vue";
 import { useRouter, useRoute } from "vue-router";
 import dayjs from "dayjs";
 import {
@@ -190,6 +195,7 @@ import {
   fetchWindturbineList,
   fetchModel,
   fetchRelatePartAndAlarmType,
+  getWpList,
 } from "/@/api/api.js";
 import { ElMessage } from "element-plus";
 import { initWebSocket } from "/@/websocket/indextest";
@@ -201,14 +207,15 @@ const isStation = computed(() => store.getters.isStation);
 const route = useRoute();
 
 onMounted(() => {
-  getequipmentmodel_list();
-  getfetchRelatePart();
   state.dateTime = [
     dayjs().startOf("day").format("YYYY-MM-DD HH:mm:ss"),
     dayjs().format("YYYY-MM-DD HH:mm:ss"),
   ];
   state.deviceId = route.params.deviceId || "";
   state.alarmId = route.params.alarmId || "";
+  getStationList();
+  getequipmentmodel_list();
+  getfetchRelatePart();
 });
 // 机型
 const getequipmentmodel_list = async () => {
@@ -235,7 +242,7 @@ const state = reactive({
       value: "windturbine",
     },
     {
-      label: "逆变器",
+      label: "光伏",
       value: "inverter",
     },
   ],
@@ -255,36 +262,37 @@ const state = reactive({
   tableData: [],
   isshowwindturbineName: true,
   tableHeader: [
-    { title: "时间", code: "ts", width: "180" },
-    { title: "场站", code: "stationname", width: "180" },
-    { title: "机组", code: "devicename", width: "180" },
-    { title: "故障编码", code: "nemCode" },
+    { title: "时间", code: "ts", width: "150" },
+    { title: "场站", code: "stationname", width: "150" },
+    { title: "机组", code: "devicename", width: "150" },
+    { title: "故障编码", code: "nemCode", width: "100" },
     { title: "故障原因", code: "faultCause" },
     { title: "故障解决方法", code: "resolvent" },
-    { title: "报警信息", code: "description" },
+    { title: "报警信息", code: "description", width: "180" },
     { title: "级别", code: "rank", width: "80" },
     { title: "类型", code: "alarmtype", width: "80" },
   ],
   tableHeader1: [
-    { title: "时间", code: "ts", width: "180" },
-    { title: "升压站", code: "stationname", width: "180" },
-    { title: "报警信息", code: "description" },
+    { title: "时间", code: "ts", width: "150" },
+    { title: "升压站", code: "stationname", width: "150" },
+    { title: "报警信息", code: "description", width: "180" },
     { title: "级别", code: "rank", width: "80" },
     { title: "类型", code: "alarmtype", width: "80" },
   ],
 });
 // 场站列表/升压站列表
-const stationList = computed(() => {
-  if (state.typeVal == "windturbine") {
-    return store.state.stationListAll;
-  } else if (state.typeVal == "booststation") {
-    return store.state.booststationList;
-  }
-});
+const stationList = ref([]);
+
+const getStationList = async () => {
+  const { data } = await getWpList(state.typeVal);
+  console.log(1111, data);
+  stationList.value = data;
+};
+
 watch(
   () => stationList,
   (val, old) => {
-    val.value.length &&
+    val?.value?.length &&
       nextTick(async () => {
         state.stationId = val.value[0]?.id;
         await getWindturbineList();

+ 2 - 2
src/pages/safe/realwaring.vue

@@ -44,7 +44,7 @@
         </div>
         <div class="lineItem card">
           <Safecom
-            title="逆变器报警"
+            title="光伏报警"
             deviceType="inverter"
             alarmType="inverter"
           />
@@ -67,7 +67,7 @@
         </div>
         <div class="lineItem card">
           <Safecom
-            title="逆变器自定义报警"
+            title="光伏自定义报警"
             deviceType="inverter"
             alarmType="custom"
           />

+ 1 - 1
src/pages/safe/safecomponent.vue

@@ -28,7 +28,7 @@
         label="报警信息"
         show-overflow-tooltip
       />
-      <el-table-column label="级别" width="75" show-overflow-tooltip>
+      <el-table-column label="级别" width="80" show-overflow-tooltip>
         <template #default="scope">
           <el-tag
             class="ml-2"

+ 1 - 1
src/router/index.js

@@ -278,7 +278,7 @@ const routes = [
             isshow: "super_admin,common",
             name: "alarmConfigfan",
             meta: {
-              title: "风机报警",
+              title: "报警配置",
             },
             component: () =>
               import(

+ 1 - 1
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.108:6015",
+                // target: "http://192.168.1.102:6015",
                 changeOrigin: true, //开启代理
                 rewrite: (path) => path.replace(/^\/sharding/, ""),
             },