自定义预警、数据查询、字典维护接口调试

src/assets/css/main.css

@@ -1,169 +1,165 @@
 * {
-    margin: 0;
-    padding: 0;
+  margin: 0;
+  padding: 0;
 }
 
 html,
 body,
 #app,
 .wrapper {
-    width: 100%;
-    height: 100%;
-    overflow: hidden;
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
 }
 
 body {
-    font-family: 'PingFang SC', 'Helvetica Neue', Helvetica, 'microsoft yahei', arial, STHeiTi, sans-serif;
+  font-family: "PingFang SC", "Helvetica Neue", Helvetica, "microsoft yahei",
+    arial, STHeiTi, sans-serif;
 }
 
 a {
-    text-decoration: none;
+  text-decoration: none;
 }
 
 .content-box {
-    position: absolute;
-    left: 250px;
-    right: 0;
-    top: 70px;
-    bottom: 0;
-    padding-bottom: 30px;
-    -webkit-transition: left 0.3s ease-in-out;
-    transition: left 0.3s ease-in-out;
-    background: #f0f0f0;
+  position: absolute;
+  left: 250px;
+  right: 0;
+  top: 70px;
+  bottom: 0;
+  padding-bottom: 8px;
+  -webkit-transition: left 0.3s ease-in-out;
+  transition: left 0.3s ease-in-out;
+  background: #f0f0f0;
 }
 
 .content {
-    width: auto;
-    height: 100%;
-    padding: 5px;
-    overflow-y: auto;
-    overflow-x: hidden;
-    box-sizing: border-box;
+  width: auto;
+  height: calc(100% - 40px);
+  padding: 5px;
+  overflow-y: auto;
+  overflow-x: hidden;
+  box-sizing: border-box;
 }
 
 .content-collapse {
-    left: 65px;
+  left: 65px;
 }
 
 .container {
-    padding: 30px;
-    background: #fff;
-    border: 1px solid #ddd;
-    border-radius: 5px;
+  padding: 30px;
+  background: #fff;
+  border: 1px solid #ddd;
+  border-radius: 5px;
 }
 
 .crumbs {
-    margin: 10px 0;
+  margin: 10px 0;
 }
 
 .el-table th {
-    background-color: #f5f7fa !important;
+  background-color: #f5f7fa !important;
 }
 
 .pagination {
-    margin: 20px 0;
-    text-align: right;
+  margin: 20px 0;
+  text-align: right;
 }
 
 .plugins-tips {
-    padding: 20px 10px;
-    margin-bottom: 20px;
+  padding: 20px 10px;
+  margin-bottom: 20px;
 }
 
-.el-button+.el-tooltip {
-    margin-left: 10px;
+.el-button + .el-tooltip {
+  margin-left: 10px;
 }
 
 .el-table tr:hover {
-    background: #f6faff;
+  background: #f6faff;
 }
 
 .mgb20 {
-    margin-bottom: 20px;
+  margin-bottom: 20px;
 }
 
 .move-enter-active,
 .move-leave-active {
-    transition: opacity 0.1s ease;
+  transition: opacity 0.1s ease;
 }
 
 .move-enter-from,
 .move-leave-to {
-    opacity: 0;
+  opacity: 0;
 }
 
-
 /*BaseForm*/
 
 .form-box {
-    width: 600px;
+  width: 600px;
 }
 
 .form-box .line {
-    text-align: center;
+  text-align: center;
 }
 
 .el-time-panel__content::after,
 .el-time-panel__content::before {
-    margin-top: -7px;
+  margin-top: -7px;
 }
 
-.el-time-spinner__wrapper .el-scrollbar__wrap:not(.el-scrollbar__wrap--hidden-default) {
-    padding-bottom: 0;
+.el-time-spinner__wrapper
+  .el-scrollbar__wrap:not(.el-scrollbar__wrap--hidden-default) {
+  padding-bottom: 0;
 }
 
-
 /*Upload*/
 
 .pure-button {
-    width: 150px;
-    height: 40px;
-    line-height: 40px;
-    text-align: center;
-    color: #fff;
-    border-radius: 3px;
+  width: 150px;
+  height: 40px;
+  line-height: 40px;
+  text-align: center;
+  color: #fff;
+  border-radius: 3px;
 }
 
 .g-core-image-corp-container .info-aside {
-    height: 45px;
+  height: 45px;
 }
 
-
 /*VueEditor*/
 
 .ql-container {
-    min-height: 400px;
+  min-height: 400px;
 }
 
 .ql-snow .ql-tooltip {
-    transform: translateX(117.5px) translateY(10px) !important;
+  transform: translateX(117.5px) translateY(10px) !important;
 }
 
 .editor-btn {
-    margin-top: 20px;
+  margin-top: 20px;
 }
 
-
 /*markdown*/
 
 .v-note-wrapper .v-note-panel {
-    min-height: 500px;
+  min-height: 500px;
 }
 
-
 /* //滚动条的宽度 */
 
 ::-webkit-scrollbar {
-    width: 6px;
-    height: 8px;
-    background-color: #e4e4e4;
-    border-radius: 6px;
+  width: 6px;
+  height: 8px;
+  background-color: #e4e4e4;
+  border-radius: 6px;
 }
 
-
 /* //滚动条的滑块 */
 
 ::-webkit-scrollbar-thumb {
-    background-color: #a9aaad;
-    border-radius: 6px;
-}
+  background-color: #a9aaad;
+  border-radius: 6px;
+}

src/pages/Home.vue

@@ -22,38 +22,42 @@ import vHeader from "../components/Header.vue";
 import vSidebar from "../components/Sidebar.vue";
 import vTags from "../components/Tags.vue";
 
-import {  fetchStationListAll,getStationinfoAll} from "/@/api/api.js";
+import { fetchStationListAll, fetchBooststation } from "/@/api/api.js";
 const store = useStore();
 const collapse = computed(() => store.state.collapse);
 onBeforeMount(async () => {
-  await getStationList();
   await getStationListAll();
+  await getBooststation();
 });
-//get 场站
-const getStationList = async () => {
-//   const resold = await fetchStationList();
+// //get 场站
+// const getStationList = async () => {
+// //   const resold = await fetchStationList();
 
-  const resnew = await getStationinfoAll();
-//   console.log("resold>>>>>>>>qweqwe", resold);
-  let arr = [];
-  resnew.data.forEach((item) => {
-    let ddd = {
+//   const resnew = await getStationinfoAll();
+// //   console.log("resold>>>>>>>>qweqwe", resold);
+//   let arr = [];
+//   resnew.data.forEach((item) => {
+//     let ddd = {
 
-    id :item.id,
-    name: item.name,
-    model:item.model,
-    modelList : item.modelList,
-    equipmentmodel: null,
-};
-    arr.push(ddd);
-  });
+//     id :item.id,
+//     name: item.name,
+//     model:item.model,
+//     modelList : item.modelList,
+//     equipmentmodel: null,
+// };
+//     arr.push(ddd);
+//   });
 
-  // console.log("resnew>>>>>>>>123", resnew);
-  // console.log("arr>>>>>>>>456", arr);
-  store.dispatch("actionsStationList", arr);
-};
+//   // console.log("resnew>>>>>>>>123", resnew);
+//   // console.log("arr>>>>>>>>456", arr);
+//   store.dispatch("actionsStationList", arr);
+// };
 const getStationListAll = async () => {
-  const res = await fetchStationListAll();
-  store.dispatch("actionsStationListAll", res);
+  const { data } = await fetchStationListAll();
+  store.dispatch("actionsStationListAll", data);
+};
+const getBooststation = async () => {
+  const { data } = await fetchBooststation();
+  store.dispatch("actionsBooststationList", data);
 };
 </script>

src/pages/alarmConfig/bj_custom/custom.vue

@@ -29,8 +29,7 @@
         <el-upload
           class="handle-edit mr10"
           style="display: inline"
-          action="/sharding/alertrule2/import"
-          :headers="token"
+          :action="baseURL + 'alertrule/import'"
           :show-file-list="false"
           :on-success="handleSuccess"
           :on-progress="handleProgress"
@@ -52,43 +51,66 @@
           class="mr10"
           style="width: 150px"
           popper-class="select"
+          @change="categorychanged"
         >
-          <el-option key="1" label="风机" value="1"></el-option>
-          <el-option key="2" label="电气" value="2"></el-option>
+          <el-option key="1" label="风机报警" value="windturbine"></el-option>
+          <el-option
+            key="2"
+            label="升压站报警"
+            value="booststation"
+          ></el-option>
         </el-select>
-        <el-select          
-          v-model="query.station"
+        <el-select
+          v-model="query.wpId"
           clearable
           class="mr10"
           style="width: 150px"
-          placeholder="全部场站"
+          :placeholder="
+            query.category == 'windturbine' ? '全部场站' : '全部升压站'
+          "
           popper-class="select"
-          @change="changeStation()"
+          @change="changeStation"
         >
           <el-option
             v-for="item in stationList"
             :key="item.id"
             :value="item.id"
-            :label="item.name"
+            :label="item.aname"
           ></el-option>
         </el-select>
-        <el-select v-model="query.relatedparts" clearable class="mr10" style="width: 150px" placeholder="所属部件">
-            <el-option
-            v-for="item in state.fetchList"
-            :key="item.partCode"
+        <el-select
+          v-if="query.category == 'windturbine'"
+          v-model="query.relatedparts"
+          clearable
+          class="mr10"
+          style="width: 150px"
+          placeholder="所属部件"
+        >
+          <el-option
+            v-for="item in fetchList"
+            :key="item.id"
             :label="item.name"
-            :value="item.partCode">
-            </el-option>
+            :value="item.nemCode"
+          >
+          </el-option>
         </el-select>
-        <el-select v-model="query.enabled" clearable class="mr10" style="width: 150px" placeholder="是否可用">
-            <el-option
+        <el-select
+          v-model="query.enabled"
+          clearable
+          class="mr10"
+          style="width: 150px"
+          placeholder="是否可用"
+        >
+          <el-option
             v-for="item in state.isEnabled"
             :key="item.id"
             :label="item.name"
-            :value="item.id">
-            </el-option>
+            :value="item.id"
+          >
+          </el-option>
         </el-select>
         <el-select
+          v-if="query.category == 'windturbine'"
           v-model="query.modelId"
           clearable
           class="mr10"
@@ -97,10 +119,10 @@
           popper-class="select"
         >
           <el-option
-            v-for="item in state.modelList"
-            :key="item"
-            :value="item"
-            :label="item"
+            v-for="item in modelList"
+            :key="item.id"
+            :value="item.id"
+            :label="item.aname"
           ></el-option>
         </el-select>
         <el-select
@@ -137,63 +159,33 @@
       header-cell-name="table-header"
       :highlight-current-row="true"
     >
-      <el-table-column label="编码" align="center" prop="id" min-width="50" />
-      <el-table-column
-        label="场站"
-        align="center"
-        prop="windPowerStation.name"
-        min-width="50"
-      />
-      <el-table-column
-        label="机型"
-        align="center"
-        prop="modelId"
-        min-width="50"
-      />
-      <el-table-column label="名称" align="left" prop="name" min-width="50" />
-      <el-table-column label="表达式" align="left">
-        <template #default="scope">
-          {{ scope.row.expressionShow }}
-        </template>
-      </el-table-column>
-      <el-table-column label="级别" align="center" prop="rank" min-width="20">
-        <template #default="scope">{{ rankConvert(scope.row.rank) }}</template>
-      </el-table-column>
       <el-table-column
-        label="类型"
+        v-for="item in query.category == 'windturbine'
+          ? state.tableHeader
+          : state.tableHeader1"
+        :key="item.code"
+        :label="item.title"
         align="center"
-        prop="category"
-        min-width="20"
+        :prop="item.code"
+        :minWidth="item.width ? item.width : 60"
+        show-overflow-tooltip
       >
-        <template #default="scope">{{
-          categoryConvert(scope.row.category)
-        }}</template>
-      </el-table-column>
-      <el-table-column label="描述" align="left">
         <template #default="scope">
-          {{ scope.row.descriptionShow }}
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="是否启用"
-        align="center"
-        prop="enabled"
-        min-width="20"
-      >
-        <template #default="scope">
-          {{ enabledConvert(scope.row.enabled) }}
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="所属部件"
-        align="center"
-        prop="relatedParts"
-        min-width="30"
-      >
-        <template #default="scope">
-          <span>{{ scope.row.datadictionary?.name }}</span>
+          <span v-if="item.code == 'rank'">
+            {{ rankConvert(scope.row.rank) }}
+          </span>
+          <span v-else-if="item.code == 'category'">
+            {{ categoryConvert(scope.row.category) }}
+          </span>
+          <span v-else-if="item.code == 'enable'">
+            {{ enabledConvert(scope.row.enable) }}
+          </span>
+          <span v-else>
+            {{ scope.row[item.code] }}
+          </span>
         </template>
       </el-table-column>
+
       <el-table-column label="操作" align="center" width="100">
         <template #default="scope">
           <el-button
@@ -202,11 +194,10 @@
             round
             size="mini"
             icon="el-icon-lx-edit"
-            :disabled="notEdit || scope.row.range == 1"
+            :disabled="notEdit"
             @click="handleEditClick(scope.row)"
             >编辑</el-button
           >
-          <!-- <el-button type="primary" plain round size="mini" icon="el-icon-search" @click="handleViewClick(scope.$index, scope.row)">查看</el-button> -->
         </template>
       </el-table-column>
     </el-table>
@@ -225,11 +216,22 @@
       @close="dialogclose"
       :isVisible="state.visible"
       :form="state.form"
+      :rankList="state.rankList"
+      :modelListAll="state.modelListAll"
+      :fetchListAll="state.fetchListAll"
     />
   </el-card>
 </template>
 <script setup>
-import { custombj_fetchTableData, getStationinfo, fetchRelatePart } from "/@/api/api.js";
+import {
+  custombj_fetchTableData,
+  getStationinfo,
+  fetchRelatePartAndAlarmType,
+  fetchModel,
+  fetchBooststation,
+  custombj_importTemplate,
+  baseURL,
+} from "/@/api/api.js";
 import { outExportExcel } from "/@/utils/exportExcel"; //引入文件
 import { ref, onMounted, provide, computed, reactive, watch } from "vue";
 import { useStore } from "vuex";
@@ -241,19 +243,29 @@ const { notEdit } = common();
 const token = { token: sessionStorage.getItem("token") };
 const store = useStore();
 const router = useRouter();
-const stationList = computed(() => store.state.stationList);
 const isStation = computed(() => store.getters.isStation);
+const query = reactive({
+  pagenum: 1,
+  pagesize: 10,
+  name: "",
+  wpId: "",
+  rank: "",
+  modelId: "",
+  category: "windturbine",
+  enabled: "",
+  relatedparts: "",
+});
 const state = reactive({
   tableData: [],
-  modelList: [],
-  fetchList: [],
+  fetchListAll: [], //部件及预警类型
+  modelListAll: {}, //型号所有列表
   isEnabled: [
     {
-      id: 0,
+      id: false,
       name: "否",
     },
     {
-      id: 1,
+      id: true,
       name: "是",
     },
   ],
@@ -281,43 +293,88 @@ const state = reactive({
   ],
   visible: false,
   form: {},
+  tableHeader: [
+    { title: "编码", code: "id" },
+    { title: "场站", code: "stationName", width: "100" },
+    { title: "机型", code: "modelId" },
+    { title: "规则名称", code: "name", width: "150" },
+    { title: "表达式", code: "expression", width: "150" },
+    { title: "描述", code: "description", width: "150" },
+    { title: "所属部件", code: "relatedPartsName" },
+    { title: "级别", code: "rank" },
+    { title: "类型", code: "category" },
+    { title: "是否启用", code: "enable" },
+  ],
+  tableHeader1: [
+    { title: "编码", code: "id" },
+    { title: "升压站", code: "stationName" },
+    { title: "规则名称", code: "name" },
+    { title: "表达式", code: "expression" },
+    { title: "描述", code: "description" },
+    { title: "级别", code: "rank" },
+    { title: "类型", code: "category" },
+    { title: "是否启用", code: "enable" },
+  ],
 });
-const query = reactive({
-  pagenum: 1,
-  pagesize: 10,
-  name: "",
-  station: "",
-  rank: "",
-  modelId: "",
-  category: "1",
-  enabled: '',
-  relatedparts: ''
+//型号列表
+const modelList = computed(() => {
+  if (query.wpId == "") {
+    return [];
+  } else {
+    return state.modelListAll[query.wpId];
+  }
+});
+//部件列表
+const fetchList = computed(() => {
+  if (query.wpId == "") {
+    return [];
+  } else {
+    if (query.wpId.includes("FDC")) {
+      return state.fetchListAll?.fjbj;
+    } else {
+      return state.fetchListAll?.gfbj;
+    }
+  }
+});
+
+// 场站列表/升压站列表
+const stationList = computed(() => {
+  if (query.category == "windturbine") {
+    return store.state.stationListAll;
+  } else {
+    return store.state.booststationList;
+  }
 });
 let total = ref(0);
 onMounted(() => {
   getfetchRelatePart();
   getequipmentmodel_list();
+  getData();
 });
 const dialogclose = () => {
   state.visible = false;
+  state.form = {};
   getData();
 };
 const getData = async () => {
-  const res = await custombj_fetchTableData(query);
- 
-  state.tableData = res.records;
-  total.value = res.total;
+  const { data } = await custombj_fetchTableData(query);
+  state.tableData = data.records;
+  total.value = data.total;
 };
 //所属部件
 const getfetchRelatePart = async () => {
-    const res = await fetchRelatePart();
-    state.fetchList = res;
-    if (router && router.currentRoute.value.query.name) {
-        let queryName = router.currentRoute.value.query.name
-        query.relatedparts = queryName
-    }
-    getData()
-    console.log(res)
+  const { data } = await fetchRelatePartAndAlarmType();
+  state.fetchListAll = data;
+  //   if (router && router.currentRoute.value.query.name) {
+  //     let queryName = router.currentRoute.value.query.name;
+  //     query.relatedparts = queryName;
+  //   }
+  //   getData();
+};
+// 机型
+const getequipmentmodel_list = async () => {
+  const { data } = await fetchModel();
+  state.modelListAll = data;
 };
 const handleEditClick = (row) => {
   let obj = Object.assign({}, row);
@@ -325,125 +382,133 @@ const handleEditClick = (row) => {
   state.visible = true;
 };
 const handleInsert = () => {
-    state.form = {}
+  state.form = {
+    category: "windturbine",
+    enable: true,
+    stationId: "",
+    expression: "",
+  };
   state.visible = true;
 };
 
 //changeStation
 const changeStation = async () => {
   query.modelId = "";
-  await getequipmentmodel_list();
+  query.relatedparts = "";
 };
-// 机型
-const getequipmentmodel_list = async () => {
-  const { data } = await getStationinfo(query.station);
- 
-  if (query.station == "") {
-    let arr = [];
-    data.forEach((e) => {
-      arr.push(...e.modelList);
-    });
-    state.modelList = [...new Set(arr)];
-  } else {
-    state.modelList = data[0].modelList;
-  }
+//categorychanged
+const categorychanged = async () => {
+  clean();
+  getData();
 };
+
 // 分页导航
 const handlePageChange = (val) => {
   query.pagenum = val;
   getData();
 };
-const tableHeader = [
-  "id",
-  "规则名称",
-  "报警类别（1：风机；2：电气）",
-  "报警级别（1：低；2：中低；3：中；4：中高；5：高）",
-  "是否启用（0：停用；1：启用）",
-  "风场",
-  "风机类型",
-  "所属部件",
-  "表达式",
-  "规则描述",
-];
 
-const tableKey = [
-  "id",
-  "name",
-  "category",
-  "rank",
-  "enabled",
-  "station",
-  "modelId",
-  "relatedParts",
-  "expressionShow",
-  "descriptionShow",
-];
 // 批量导出
 const export2Excel = async () => {
-  let { name, station, rank, modelId, category } = query;
-  const res = await custombj_fetchTableData({
+  let tableHeader = [];
+  let tableKey = [];
+  const { data } = await custombj_fetchTableData({
     pagenum: 1,
-    pagesize: 999999,
-    name,
-    station,
-    rank,
-    modelId,
-    category,
+    pagesize: total.value,
+    ...query,
   });
-
   ElMessage.success(`导出成功!`);
-  outExportExcel(tableHeader, tableKey, res.records, "自定义预警配置导出excel");
+  if (query.category == "windturbine") {
+    tableHeader = state.tableHeader.map((item) => item.title);
+    tableKey = state.tableHeader.map((item) => item.code);
+  } else if (query.category == "booststation") {
+    tableHeader = state.tableHeader1.map((item) => item.title);
+    tableKey = state.tableHeader1.map((item) => item.code);
+  }
+  outExportExcel(
+    tableHeader,
+    tableKey,
+    data.records,
+    "自定义预警配置导出excel"
+  );
 };
 // 模板下载
 const outExe = () => {
-  const data = [];
-  ElMessage.success(`导出成功!`);
-  outExportExcel(tableHeader, tableKey, data, "自定义报警模板");
+  custombj_importTemplate().then((response) => {
+    const link = document.createElement("a");
+    const blob = new Blob([response], {
+      type: "application/vnd.ms-excel",
+    });
+    link.style.display = "none";
+    link.href = URL.createObjectURL(blob);
+    link.download = "自定义报警模板.xlsx";
+    document.body.appendChild(link);
+    link.click();
+    document.body.removeChild(link);
+  });
 };
 // 批量导入
-const handleSuccess = (response, file, fileList) => {
-  if (response.success) {
+const handleSuccess = (response) => {
+  if (response.code == "200") {
     ElMessage.success("导入成功!");
     getData();
   } else {
     ElMessage.error(response.msg);
   }
 };
-const handleProgress = (response, file, fileList) => {};
-const handleError = (response, file, fileList) => {
+// 批量导入中
+const handleProgress = (response) => {};
+// 批量导入失败
+const handleError = (response) => {
   ElMessage.success("导入失败!");
 };
+// 清空字段
+const clean = () => {
+  query.modelId = "";
+  query.relatedparts = "";
+  query.wpId = "";
+  query.enabled = "";
+  query.rank = "";
+  query.name = "";
+  query.pagenum = 1;
+  state.tableData = [];
+  total.value = 0;
+};
+
 const rankConvert = (val) => {
-  if (val === "1") {
+  if (val == 1) {
     return "低";
-  } else if (val === "2") {
+  } else if (val == 2) {
     return "中低";
-  } else if (val === "3") {
+  } else if (val == 3) {
     return "中";
-  } else if (val === "4") {
+  } else if (val == 4) {
     return "中高";
-  } else if (val === "5") {
+  } else if (val == 5) {
     return "高";
   }
 };
 // 类型
 const categoryConvert = (val) => {
-  if (val === "1") {
+  if (val === "windturbine") {
     return "风机";
-  } else if (val === "2") {
-    return "电气";
+  } else if (val === "booststation") {
+    return "升压站";
   }
 };
 // 状态
 const enabledConvert = (val) => {
-  if (val === 0) {
+  if (val === false) {
     return "停用";
-  } else if (val === 1) {
+  } else if (val === true) {
     return "启用";
   }
 };
 </script>
 <style scoped>
+.el-card {
+  height: 100%;
+}
 .mr10 {
   margin-right: 10px;
 }
@@ -451,4 +516,4 @@ const enabledConvert = (val) => {
 .el-button + .el-button {
   margin-left: 10px;
 }
-</style>
+</style>

src/pages/alarmConfig/bj_custom/custom_components.vue

@@ -1,6 +1,17 @@
 <template>
-  <el-dialog v-model="isShow" width="1100px" :before-close="handleClose">
-    <el-form ref="ruleFormRef" :model="form" :rules="rules" label-position="top" label-width="200px">
+  <el-dialog
+    v-model="isShow"
+    width="1100px"
+    :before-close="handleClose"
+    destroy-on-close
+  >
+    <el-form
+      ref="ruleFormRef"
+      :model="form"
+      :rules="rules"
+      label-position="top"
+      label-width="200px"
+    >
       <el-row type="flex" justify="space-between" align="middle" :gutter="10">
         <el-col :span="15">
           <el-form-item prop="name">
@@ -8,89 +19,174 @@
             <el-input v-model="form.name" />
           </el-form-item>
         </el-col>
-        <el-col :span="9" style="
+        <el-col
+          :span="9"
+          style="
             display: flex;
             justify-content: space-between;
             align-items: center;
-          ">
+          "
+        >
           <el-form-item prop="category">
             <el-tag>报警类别</el-tag>
-            <el-select v-model="form.category" class="select-mini">
-              <el-option key="1" label="风机" value="1" />
-              <el-option key="2" label="电气" value="2" />
+            <el-select
+              v-model="form.category"
+              class="select-mini"
+              @change="categorychanged"
+            >
+              <el-option
+                key="1"
+                label="风机报警"
+                value="windturbine"
+              ></el-option>
+              <el-option
+                key="2"
+                label="升压站报警"
+                value="booststation"
+              ></el-option>
             </el-select>
           </el-form-item>
           <el-form-item prop="rank">
             <el-tag>报警级别</el-tag>
             <el-select v-model="form.rank" class="select-mini">
-              <el-option key="1" label="低" value="1" />
-              <el-option key="2" label="中低" value="2" />
-              <el-option key="3" label="中" value="3" />
-              <el-option key="4" label="中高" value="4" />
-              <el-option key="5" label="高" value="5" />
+              <el-option
+                v-for="item in rankList"
+                :key="item.id"
+                :value="item.id"
+                :label="item.name"
+              ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item prop="enabled">
+          <el-form-item prop="enable">
             <el-tag>是否启用</el-tag>
-            <el-switch v-model="form.enabled" :active-value="1" :inactive-value="0" active-color="#13ce66" />
+            <el-switch
+              v-model="form.enable"
+              :active-value="true"
+              :inactive-value="false"
+              active-color="#13ce66"
+            />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="10">
         <el-col :span="6">
           <el-form-item prop="station">
-            <el-tag>风场</el-tag>
-            <el-select v-model="form.station" style="width: 100%" @change="stationChange">
-              <el-option v-for="item in stationList" :key="item.id" :value="item.id" :label="item.name" />
+            <el-tag>{{
+              form.category == "windturbine" ? "风场" : "升压站"
+            }}</el-tag>
+            <el-select
+              v-model="form.stationId"
+              style="width: 100%"
+              @change="stationChange"
+            >
+              <el-option
+                v-for="item in stationList"
+                :key="item.id"
+                :value="item.id"
+                :label="item.name"
+              />
             </el-select>
           </el-form-item>
-          <el-form-item prop="modelId">
+          <el-form-item prop="modelId" v-if="form.category == 'windturbine'">
             <el-tag>风机型号</el-tag>
-            <el-select v-model="form.modelId" style="width: 100%" @change="modelIdChange">
-              <el-option v-for="item in state.modelList" :key="item" :value="item" :label="item" />
+            <el-select
+              v-model="form.modelId"
+              style="width: 100%"
+              @change="modelIdChange"
+            >
+              <el-option
+                v-for="item in state.modelList"
+                :key="item"
+                :value="item.id"
+                :label="item.aname"
+              ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item prop="relatedParts">
+          <el-form-item
+            prop="relatedParts"
+            v-if="form.category == 'windturbine'"
+          >
             <el-tag>所属部件</el-tag>
             <el-select v-model="form.relatedParts" style="width: 100%">
-              <el-option v-for="i in state.relatePartList" :key="i.partCode" :value="i.partCode" :label="i.name" />
+              <el-option
+                v-for="item in state.relatedPartsList"
+                :key="item.nemCode"
+                :label="item.name"
+                :value="item.nemCode"
+              />
             </el-select>
           </el-form-item>
           <el-form-item prop="fault">
             <el-tag>预警类型</el-tag>
-            <el-select v-model="form.project" style="width: 100%">
-              <el-option v-for="i in faultList" :key="i.value" :value="i.value" :label="i.name" />
+            <el-select v-model="form.range" style="width: 100%">
+              <el-option
+                v-for="i in faultList"
+                :key="i.nemCode"
+                :value="i.nemCode"
+                :label="i.name"
+              />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="9">
-          <el-form-item prop="expressionShow">
+          <el-form-item prop="expression">
             <el-tag>表达式</el-tag>
-            <el-input type="textarea" rows="14" v-model="form.expressionShow" :value="form.expressionShow"
-              id="expressionInput" />
+            <el-input
+              type="textarea"
+              rows="14"
+              v-model="form.expression"
+              id="expressionInput"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="9">
           <el-tabs type="border-card">
             <el-tab-pane label="AI测点">
               <el-input v-model="state.AIPointSearch"> </el-input>
-              <el-table size="mini" fit :show-header="false" :highlight-current-row="true" :stripe="false"
-                :border="false" height="240" :data="filterAIList" @row-dblclick="rowDbclick">
+              <el-table
+                size="mini"
+                fit
+                :show-header="false"
+                :highlight-current-row="true"
+                :stripe="false"
+                :border="false"
+                height="240"
+                :data="filterAIList"
+                @row-dblclick="rowDbclick"
+              >
                 <el-table-column prop="uniformCode" />
                 <el-table-column prop="name" />
               </el-table>
             </el-tab-pane>
             <el-tab-pane label="DI测点">
               <el-input v-model="state.DIPointSearch"> </el-input>
-              <el-table size="mini" fit :show-header="false" :highlight-current-row="true" :stripe="false"
-                :border="false" height="240" :data="filterDIList" @row-dblclick="rowDbclick">
+              <el-table
+                size="mini"
+                fit
+                :show-header="false"
+                :highlight-current-row="true"
+                :stripe="false"
+                :border="false"
+                height="240"
+                :data="filterDIList"
+                @row-dblclick="rowDbclick"
+              >
                 <el-table-column prop="uniformCode" />
                 <el-table-column prop="name" />
               </el-table>
             </el-tab-pane>
             <el-tab-pane label="函数">
-              <el-table size="mini" fit :show-header="false" :highlight-current-row="true" :stripe="false"
-                :border="false" :height="270" :data="func" @row-dblclick="tabFuncRowClickHandle">
+              <el-table
+                size="mini"
+                fit
+                :show-header="false"
+                :highlight-current-row="true"
+                :stripe="false"
+                :border="false"
+                :height="270"
+                :data="func"
+                @row-dblclick="tabFuncRowClickHandle"
+              >
                 <el-table-column min-width="60%">
                   <template #default="scope">
                     <el-popover trigger="hover" placement="bottom">
@@ -98,7 +194,7 @@
                       <p>参数：{{ scope.row.param }}</p>
                       <template #reference>
                         <span size="medium" transition="fade-in-linear">{{
-                            scope.row.lab
+                          scope.row.lab
                         }}</span>
                       </template>
                     </el-popover>
@@ -111,7 +207,7 @@
                       <p>参数：{{ scope.row.param }}</p>
                       <template #reference>
                         <span size="medium" transition="fade-in-linear">{{
-                            scope.row.name
+                          scope.row.name
                         }}</span>
                       </template>
                     </el-popover>
@@ -121,8 +217,14 @@
             </el-tab-pane>
             <el-tab-pane label="运算符">
               <el-button-group>
-                <el-button v-for="item in operator" :key="item" plain type="primary" @click="elInputSplit(item)"
-                  style="width: 60px; margin: 7px 12px; height: 40px">
+                <el-button
+                  v-for="item in operator"
+                  :key="item"
+                  plain
+                  type="primary"
+                  @click="elInputSplit(item)"
+                  style="width: 60px; margin: 7px 12px; height: 40px"
+                >
                   {{ item }}
                 </el-button>
               </el-button-group>
@@ -132,9 +234,14 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="24">
-          <el-form-item prop="descriptionShow">
+          <el-form-item prop="description">
             <el-tag>规则描述</el-tag>
-            <el-input type="textarea" rows="4" v-model="form.descriptionShow" />
+            <el-input
+              type="textarea"
+              rows="4"
+              v-model="form.description"
+              id="descriptionInput"
+            />
           </el-form-item>
         </el-col>
       </el-row>
@@ -142,7 +249,9 @@
     <template #footer>
       <span class="dialog-footer">
         <el-button @click="closeDialog">取 消</el-button>
-        <el-button type="primary" @click="submitForm(ruleFormRef)">确 定</el-button>
+        <el-button type="primary" @click="submitForm(ruleFormRef)"
+          >确 定</el-button
+        >
       </span>
     </template>
   </el-dialog>
@@ -151,48 +260,85 @@
 import { ref, onMounted, reactive, computed, watch, nextTick } from "vue";
 import { ElMessageBox, ElMessage } from "element-plus";
 import {
-  fetchAIPointList,
-  fetchDIPointList,
-  fetchRelatePart,
   custombj_postSave,
   fetch_electrical_point_ai,
   fetch_electrical_point_di,
   getStationinfo,
+  fetchPointList,
+  fetchPointListByBootst,
 } from "/@/api/api.js";
 import { useStore } from "vuex";
 const store = useStore();
-const stationList = computed(() => store.state.stationList);
-onMounted(() => {
-  getfetchRelatePart();
+const emits = defineEmits(["close"]);
+const props = defineProps({
+  //是否显示
+  isVisible: {
+    type: Boolean,
+    defaule: false,
+  },
+  //表单
+  form: {
+    type: Object,
+  },
+  //型号接口数据
+  modelListAll: {
+    type: Object,
+  },
+  //所属部件及预警类型
+  fetchListAll: {
+    type: Array,
+  },
+  //报警级别
+  rankList: {
+    type: Array,
+  },
 });
-watch(() => props.isVisible,
-   (val, old) => {
+watch(
+  () => props.isVisible,
+  (val, old) => {
     nextTick(() => {
-      isShow.value = val
+      isShow.value = val;
     });
   },
   {
     deep: true,
   }
-)
-watch(() => props.form,
-   (val, old) => {
+);
+watch(
+  () => props.form,
+  (val, old) => {
     nextTick(() => {
-      form.value = val
+      form.value = val;
+      if (val.id && val.id != "") {
+        if (val?.stationId.includes("FDC") || val?.stationId.includes("GDC")) {
+          getfetchPointList();
+        } else {
+          getfetchPointListByBootst();
+        }
+      }
     });
   },
   {
     deep: true,
   }
-)
+);
 watch(
-  () => props.form?.id,
+  () => props.form?.stationId,
   (val, old) => {
-    if (val != "") {
+    if (val && val != "") {
       nextTick(async () => {
-        getfetchAIPointList();
-        getfetchDIPointList();
+        state.modelList = props.modelListAll[val];
+        if (val.includes("FDC")) {
+          state.relatedPartsList = props.fetchListAll?.fjbj;
+        } else if (val.includes("GDC")) {
+          state.relatedPartsList = props.fetchListAll?.gfbj;
+        } else {
+          state.relatedPartsList = [];
+        }
       });
+    } else {
+      state.relatedPartsList = [];
+      state.modelList = [];
     }
   },
   {
@@ -200,45 +346,41 @@ watch(
   }
 );
 
-const isShow=ref(false);
+const isShow = ref(false);
 
 const form = ref({
   id: "",
-  name: "",
-  descriptionShow: "",
-  expressionShow: "",
-  tag: "",
-  rank: "",
-  enabled: "1", // 1可用-0禁用
+  category: "windturbine", //报警类别
+  description: "", //描述
+  name: "", //规则名称
+  enable: true, //是否启用
+  expression: "", //表达式
+  range: "", //预警类型
+  rank: "", //报警级别
+  relatedParts: "", //所属部件
+  stationId: "", //场站id
+  deviceId: "",
+  electricalId: "",
+  lineId: "",
   modelId: "",
-  ednaValue: "",
-  category: "",
-  range: 0,
-  station: "",
-  windturbine: "",
-  line: "",
-  project: "",
-  electrical: "",
-  taskstart: "",
-  relatedParts: "",
-  userName: "",
-})
-const emits = defineEmits(["close"]);
-const props = defineProps({
-  isVisible: {
-    type: Boolean,
-    defaule: false,
-  },
-  form: {
-    type: Object,
-  },
+  projectId: "",
+  tag: "",
+  uniformCode: "",
+});
+// 场站列表/升压站列表
+const stationList = computed(() => {
+  if (form.value.category == "windturbine") {
+    return store.state.stationListAll;
+  } else {
+    return store.state.booststationList;
+  }
 });
 const toEmits = () => {
   emits("close"); // 向父组件传递数据
 };
 const state = reactive({
-  relatePartList: [],
-  modelList: [],
+  modelList: [], //型号列表
+  relatedPartsList: [], //部件列表
   AIPointList: [],
   DIPointList: [],
   AIPointSearch: "",
@@ -459,69 +601,68 @@ const func = [
   { lab: "PI", name: "圆周率", param: "", describe: "", scene: "" },
   { lab: "E", name: "自然对数", param: "", describe: "", scene: "" },
 ];
-const faultList = [
-  {
-    value: "sensors",
-    name: "传感器异常",
-  },
-  {
-    value: "parts",
-    name: "零部件隐患",
-  },
-  {
-    value: "control",
-    name: "控制参数优化",
-  },
-  {
-    value: "performance",
-    name: "性能下降",
-  },
-];
+const faultList = computed(() => props.fetchListAll.yj); //预警类型列表
 const ruleFormRef = ref(null);
 const rules = reactive({
   name: [{ required: true, message: "请输入规则名称", trigger: "blur" }],
   category: [{ required: true, message: "请选择报警类别", trigger: "change" }],
   rank: [{ required: true, message: "请选择报警级别", trigger: "change" }],
-  station: [{ required: true, message: "请选择风场", trigger: "change" }],
-  expressionShow: [
-    { required: true, message: "表达式不能为空", trigger: "change" },
+  stationId: [{ required: true, message: "请选择风场", trigger: "change" }],
+  expression: [
+    { required: true, message: "表达式不能为空", trigger: ["change"] },
   ],
 });
 
+//categorychanged
+const categorychanged = async (val) => {
+  form.value.stationId = "";
+  form.modelId = "";
+  form.value.expression = "";
+  form.relatedParts = "";
+  state.AIPointList = [];
+  state.DIPointList = [];
+};
 //stationChange
-const stationChange = async () => {
-  form.value.modelId = "";
-  getequipmentmodel_list();
+const stationChange = async (val) => {
+  if (form.value.category == "windturbine") {
+    form.value.modelId = "";
+    state.modelList = props.modelListAll[val];
+  } else {
+    getfetchPointListByBootst();
+  }
 };
 //modelIdChange
 const modelIdChange = async () => {
-  getfetchAIPointList();
-  getfetchDIPointList();
-};
-//机型
-const getequipmentmodel_list = async () => {
-  const { data } = await getStationinfo(form.value.station);
-  state.modelList = data[0].modelList;
+  getfetchPointList();
 };
-//所属部件
-const getfetchRelatePart = async () => {
-  const res = await fetchRelatePart();
-  state.relatePartList = res;
-};
-// 查询风场AI、DI测点
-const getfetchAIPointList = async () => {
-  const res = await fetchAIPointList(form.value.station, form.value.modelId);
-  state.AIPointList = res.sort(function (a, b) {
-    return a.uniformCode - b.uniformCode;
-  });
+// 根据场站和型号查询测点数据
+const getfetchPointList = async () => {
+  const { data } = await fetchPointList(
+    form.value.stationId,
+    form.value.modelId
+  );
+  if (Object.keys(data).length) {
+    state.AIPointList = data.ai.sort(function (a, b) {
+      return a.uniformCode - b.uniformCode;
+    });
+    state.DIPointList = data.di.sort(function (a, b) {
+      return a.uniformCode - b.uniformCode;
+    });
+  }
 };
-const getEditAiList = (station,modelId)=>{
-  debugger
-  const res = fetchAIPointList(station, modelId);
-  state.AIPointList = res.sort(function (a, b) {
-    return a.uniformCode - b.uniformCode;
-  });
+// 根据升压站查询测点数据
+const getfetchPointListByBootst = async () => {
+  const { data } = await fetchPointListByBootst(form.value.stationId);
+  if (Object.keys(data).length) {
+    state.AIPointList = data.ai.sort(function (a, b) {
+      return a.uniformCode - b.uniformCode;
+    });
+    state.DIPointList = data.di.sort(function (a, b) {
+      return a.uniformCode - b.uniformCode;
+    });
+  }
 };
+//筛选AI测点
 const filterAIList = computed(() =>
   state.AIPointList?.filter(
     (data) =>
@@ -530,6 +671,7 @@ const filterAIList = computed(() =>
       data.name.includes(state.AIPointSearch)
   )
 );
+//筛选DI测点
 const filterDIList = computed(() =>
   state.DIPointList?.filter(
     (data) =>
@@ -538,12 +680,7 @@ const filterDIList = computed(() =>
       data.name.includes(state.DIPointSearch)
   )
 );
-const getfetchDIPointList = async () => {
-  const res = await fetchDIPointList(form.value.station, form.value.modelId);
-  state.DIPointList = res.sort(function (a, b) {
-    return a.uniformCode - b.uniformCode;
-  });
-};
+
 // 函数点击事件
 const tabFuncRowClickHandle = (row) => {
   let elInput = document.getElementById("expressionInput");
@@ -577,11 +714,11 @@ const tabFuncRowClickHandle = (row) => {
     elInput.selectionStart = startPos + func.length - 1;
     elInput.selectionEnd = startPos + func.length - 1;
   }
-  form.value.expressionShow = result; // 赋值给表单中的的字段
+  form.value.expression = result; // 赋值给表单中的的字段
 };
 //rowDbclick
 const rowDbclick = (row) => {
-  elInputSplit(row.uniformCode);
+  elInputSplit(row);
 };
 // 表达式字符串拼接
 const elInputSplit = async (val) => {
@@ -590,35 +727,37 @@ const elInputSplit = async (val) => {
   let endPos = elInput.selectionEnd;
   if (startPos === undefined || endPos === undefined) return;
   let txt = elInput.value;
-  let txtSplit = val;
+  let txtSplit = val.uniformCode || val;
   let result = txt.substring(0, startPos) + txtSplit + txt.substring(endPos);
   elInput.value = result;
   elInput.focus();
   elInput.selectionStart = startPos + txtSplit.length;
   elInput.selectionEnd = startPos + txtSplit.length;
+  form.value.expression = result;
 };
-//保存
-const save = async () => {
-  const res = await custombj_postSave(form.value);
-  console.warn(res);
-  if (!res.success) {
-    ElMessage.error(res.msg);
-  } else {
-    ElMessage.success(`保存成功!`);
-    closeDialog()
-  }
-};
+
 //提交
 const submitForm = async (formEl) => {
   if (!formEl) return;
   await formEl.validate((valid, fields) => {
     if (valid) {
-      save()
+      save();
     } else {
       console.log("error submit!", fields);
     }
   });
 };
+//保存
+const save = async () => {
+  const res = await custombj_postSave(form.value);
+  console.warn(res);
+  if (res.code != 200) {
+    ElMessage.error(res.msg);
+  } else {
+    ElMessage.success(`保存成功!`);
+    closeDialog();
+  }
+};
 //reset
 const resetForm = (formEl) => {
   formEl.resetFields();
@@ -636,8 +775,9 @@ const handleClose = () => {
 //关闭触发事件
 const closeDialog = () => {
   resetForm(ruleFormRef.value);
-  state.AIPointList = []
-  state.DIPointList = []
+  form.value = {};
+  state.AIPointList = [];
+  state.DIPointList = [];
   toEmits();
 };
 </script>
@@ -675,4 +815,4 @@ const closeDialog = () => {
 .el-form--label-top .el-form-item__label {
   padding: 0;
 }
-</style>
+</style>

src/pages/baseData/dictionary.vue

@@ -2,31 +2,68 @@
   <el-card class="box-card">
     <div class="devicemenu">
       <el-space wrap :size="15">
-      <el-button type="primary" @click="handleEdit(state.addFormData)">新增</el-button>
-      <el-input v-model="state.SearchVal" placeholder="筛选" style="width: 180px" size="small" />
-      <el-button type="primary" @click="search">查询</el-button>
+        <el-button type="primary" @click="handleEdit(state.addFormData)"
+          >新增</el-button
+        >
+        <el-input
+          v-model="state.searchCategory"
+          placeholder="字典类别"
+          style="width: 180px"
+          size="small"
+        />
+        <el-input
+          v-model="state.searchName"
+          placeholder="字典名称"
+          style="width: 180px"
+          size="small"
+        />
+        <el-button type="primary" @click="search">查询</el-button>
       </el-space>
     </div>
     <el-table :data="state.TableData" stripe style="width: 100%" height="65vh">
       <!-- <el-table-column type="index" width="50" /> -->
-      <el-table-column prop="name" label="字典名称" align="center"></el-table-column>
-      <el-table-column prop="category" label="字典分类" align="center"></el-table-column>
-      <el-table-column prop="code" label="字典编码" align="center"></el-table-column>
+      <el-table-column
+        prop="name"
+        label="字典名称"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        prop="category"
+        label="字典分类"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        prop="code"
+        label="字典编码"
+        align="center"
+      ></el-table-column>
       <!-- <el-table-column prop="orderno" label="顺序号" align="center"></el-table-column> -->
       <el-table-column prop="enabled" label="是否可用" align="center">
         <template #default="scope">
-          {{ scope.row.enabled == 1 ? '是' : '否' }}
+          {{ scope.row.enabled == 1 ? "是" : "否" }}
         </template>
       </el-table-column>
       <el-table-column label="操作" width="180" align="center">
         <template #default="scope">
-          <el-button type="text" icon="el-icon-edit" @click="handleEdit(scope.row)">编辑</el-button>
+          <el-button
+            type="text"
+            icon="el-icon-edit"
+            @click="handleEdit(scope.row)"
+            >编辑</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
     <div class="pagination">
-      <el-pagination background layout="total, prev, pager, next" hide-on-single-page :current-page="query.page"
-        :page-size="query.limit" :total="pageTotal" @current-change="handlePageChange"></el-pagination>
+      <el-pagination
+        background
+        layout="total, prev, pager, next"
+        hide-on-single-page
+        :current-page="query.page"
+        :page-size="query.limit"
+        :total="pageTotal"
+        @current-change="handlePageChange"
+      ></el-pagination>
     </div>
   </el-card>
   <!-- dialog编辑弹出框 -->
@@ -55,8 +92,14 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="是否可用">
-            <el-switch v-model="editFormData.enabled" class="ml-2" active-color="#13ce66" inactive-color="#ff4949"
-              :active-value='1' :inactive-value='0' />
+            <el-switch
+              v-model="editFormData.enabled"
+              class="ml-2"
+              active-color="#13ce66"
+              inactive-color="#ff4949"
+              :active-value="1"
+              :inactive-value="0"
+            />
           </el-form-item>
         </el-col>
       </el-row>
@@ -81,9 +124,10 @@ let editVisible = ref(false); //传感点
 
 let state = reactive({
   TableData: "",
-  SearchVal: "",
+  searchName: "",
+  searchCategory: "",
   addFormData: {
-    category: '',
+    category: "",
     code: "",
     name: "",
     orderno: 1,
@@ -96,14 +140,19 @@ const query = reactive({
 });
 let pageTotal = ref(0);
 const search = async () => {
-  getTableData()
-}
+  getTableData();
+};
 // getTableData
 const getTableData = async () => {
-  const { data } = await get_datadictionary(query.page, query.limit, state.SearchVal);
-  console.warn(data);
+  const { data } = await get_datadictionary(
+    query.page,
+    query.limit,
+    state.searchName,
+    state.searchCategory
+  );
+  //   console.warn(data);
   pageTotal.value = data.total;
-  state.TableData = data.records
+  state.TableData = data.records;
 };
 
 // 编辑
@@ -114,8 +163,7 @@ const handleEdit = (row) => {
 //add
 const postSaveorupdate = async () => {
   const res = await post_saveorupdate(editFormData.value);
-  console.warn(res);
-  if (res.status == 20000) {
+  if (res.code == 200) {
     ElMessage.success(`操作成功!`);
     editVisible.value = false;
   } else {
@@ -133,10 +181,9 @@ const handlePageChange = (val) => {
   query.page = val;
   getTableData();
 };
-
 </script>
 <style lang="scss" scoped>
 .devicemenu {
   margin-bottom: 10px;
 }
-</style>
+</style>

src/pages/safe/datasearch.vue

@@ -28,10 +28,10 @@
           popper-class="select"
         >
           <el-option
-            v-for="item in state.modelList"
-            :key="item"
-            :value="item"
-            :label="item"
+            v-for="item in modelList"
+            :key="item.id"
+            :value="item.id"
+            :label="item.aname"
           ></el-option>
         </el-select>
       </div>
@@ -51,11 +51,11 @@
           ]"
           @click="clickWT(item)"
         >
-          {{ item.windturbineCode }}
+          {{ item.aname }}
         </div>
       </el-scrollbar>
     </el-card>
-    <el-card class="box-card cardmid">
+    <!-- <el-card class="box-card cardmid">
       <el-input
         v-model="state.inputAI"
         style="margin-bottom: 10px"
@@ -71,7 +71,7 @@
         default-expand-all
         @node-click="handleNodeClick"
       />
-    </el-card>
+    </el-card> -->
     <el-card class="box-card cardright">
       <el-table :data="filterAIList" style="width: 100%" height="77vh">
         <el-table-column prop="uniformCode" label="点名" width="120" />
@@ -208,6 +208,7 @@ import {
   getAdapterHistorysnap,
   AdapterHistoryExport,
   getStationinfo,
+  fetchModel,
 } from "/@/api/api.js";
 import dayjs from "dayjs";
 import * as echarts from "echarts";
@@ -217,7 +218,7 @@ import { ElMessage } from "element-plus";
 import { outExportExcel } from "/@/utils/exportExcel"; //引入文件
 const store = useStore();
 const isStation = computed(() => store.getters.isStation);
-const stationList = computed(() => store.state.stationList);
+const stationList = computed(() => store.state.stationListAll);
 const eChart = ref("eChart" + Date.now() + Math.random());
 watch(
   () => stationList,
@@ -234,7 +235,10 @@ watch(
     immediate: true,
   }
 );
-onMounted(async () => {});
+
+onMounted(async () => {
+  getequipmentmodel_list();
+});
 onUnmounted(() => {
   state.echarts?.clear(); //销毁
   clearInterval(state.Interval);
@@ -255,7 +259,7 @@ const state = reactive({
   inputAI: "",
   stationId: "",
   windturbineList: [],
-  modelList: [],
+  modelListAll: [],
   modeId: "",
   AIList: [],
   activeWT: "",
@@ -285,23 +289,41 @@ const state = reactive({
   selectTimeVal: 1,
   downData: null,
 });
-//AI点检索
-const filterAIList = computed(() =>
-  state.AIList?.filter(
-    (data) =>
-    !state.inputAI ||  
-    data.name.includes(state.inputAI)
-    //   !state.inputAI || 
-    //   (data.uniformCode.toUpperCase().includes(state.inputAI.toUpperCase()) || 
-    //   data.name.indexOf(state.inputAI))
-  )
-);
+// 机型
+const getequipmentmodel_list = async () => {
+  const { data } = await fetchModel();
+  state.modelListAll = data;
+};
+const modelList = computed(() => {
+  if (state.stationId == "") {
+    return [];
+  } else {
+    return state.modelListAll[state.stationId];
+  }
+});
+//get 风机机组
+const getWindturbineList = async () => {
+  const { data } = await fetchWindturbineList(state.stationId);
+  state.windturbineList = data;
+  state.activeWT = state.windturbineList[0]?.id;
+  state.modeId = "";
+  //   await getequipmentmodel_list();
+    await getFetchAIPointListt();
+};
 // 风机搜索
 const filterWTList = computed(() =>
   state.windturbineList?.filter(
     (data) =>
-      data.windturbineCode?.toUpperCase().includes(state.input.toUpperCase()) &&
-      data.modelid.includes(state.modeId)
+      data.aname.includes(state.input) && data.modelId.includes(state.modeId)
+  )
+);
+//AI点检索
+const filterAIList = computed(() =>
+  state.AIList?.filter(
+    (data) => !state.inputAI || data.name.includes(state.inputAI)
+    //   !state.inputAI ||
+    //   (data.uniformCode.toUpperCase().includes(state.inputAI.toUpperCase()) ||
+    //   data.name.indexOf(state.inputAI))
   )
 );
 
@@ -311,9 +333,10 @@ const getLatest = async (stationId, AIlist) => {
   state.AIList?.forEach((e) => {
     if (e.uniformCode.indexOf("AI") !== -1) {
       e.value = Number(data[e.uniformCode]?.doubleValue).toFixed(2);
-    } else {
-      e.value = data[e.uniformCode]?.booleanValue - 0;
     }
+    // else {
+    //   e.value = data[e.uniformCode]?.booleanValue - 0;
+    // }
     e["time"] = data[e.uniformCode]?.ts;
   });
 };
@@ -338,26 +361,25 @@ const getHistory = async (stationId, AIpoint) => {
 
 // get 数据快照
 const getHistorysnap = async (stationId, AIpoint, interval) => {
-  let startTs = dayjs(state.pickerVal[0]).valueOf();
-  let endTs = dayjs(state.pickerVal[1]).valueOf();
-  const data = await getAdapterHistorysnap(
-    stationId,
-    AIpoint,
-    startTs,
-    endTs,
-    interval
-  );
-  state.downData = data;
-  option.xAxis.data = [];
-  option.series[0].data = [];
-  let timeArr = [];
-  data.forEach((e) => {
-    option.series[0].data.push(e.doubleValue.toFixed(2));
-    option.xAxis.data.push(dayjs(e.ts).format("YYYY-MM-DD HH:mm:ss"));
-  });
-
-  let chat = echarts.init(document.getElementById(eChart.value));
-  state.echarts = await chat.setOption(option);
+  //   let startTs = dayjs(state.pickerVal[0]).valueOf();
+  //   let endTs = dayjs(state.pickerVal[1]).valueOf();
+  //   const data = await getAdapterHistorysnap(
+  //     stationId,
+  //     AIpoint,
+  //     startTs,
+  //     endTs,
+  //     interval
+  //   );
+  //   state.downData = data;
+  //   option.xAxis.data = [];
+  //   option.series[0].data = [];
+  //   let timeArr = [];
+  //   data.forEach((e) => {
+  //     option.series[0].data.push(e.doubleValue.toFixed(2));
+  //     option.xAxis.data.push(dayjs(e.ts).format("YYYY-MM-DD HH:mm:ss"));
+  //   });
+  //   let chat = echarts.init(document.getElementById(eChart.value));
+  //   state.echarts = await chat.setOption(option);
 };
 const option = {
   tooltip: {
@@ -394,23 +416,7 @@ const option = {
     },
   ],
 };
-//get 风机机组
-const getWindturbineList = async () => {
-  const res = await fetchWindturbineList(state.stationId);
-  state.windturbineList = res.sort((a, b) => {
-    return a.id.split("_")[1] - b.id.split("_")[1];
-  });
-  state.activeWT = state.windturbineList[0]?.id;
-  state.modeId = "";
-  await getequipmentmodel_list();
-  await getFetchAIPointListt();
-};
 
-// get 机型
-const getequipmentmodel_list = async () => {
-  const { data } = await getStationinfo(state.stationId);
-  state.modelList = data[0].modelList;
-};
 //get AI
 const getFetchAIPointListt = async () => {
   const res = await fetchAIDIPointList(
@@ -556,7 +562,7 @@ const export2Excel = async () => {
   background: var(--el-color-primary-light-9);
 }
 </style>
-<style lang="scss" >
+<style lang="scss">
 .el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content {
   background-color: #bbdbff !important;
 }
@@ -574,4 +580,4 @@ const export2Excel = async () => {
     height: 40px;
   }
 }
-</style>
+</style>

src/router/index.js

@@ -301,52 +301,52 @@ const routes = [
         ],
       },
 
-      //   {
-      //     icon: "iconfont iconjichushuju",
-      //     path: "/basedata",
-      //     name: "basedata",
-      //     isshow: "admin",
+      {
+        icon: "iconfont iconjichushuju",
+        path: "/basedata",
+        name: "basedata",
+        isshow: "admin",
 
-      //     redirect: "/basedata/station",
-      //     meta: {
-      //       title: "基础数据",
-      //     },
-      //     component: () =>
-      //       import(
-      //         /* webpackChunkName: "home" */
-      //         "../pages/routerView.vue"
-      //       ),
-      //     children: [
-      //       {
-      //         icon: "el-icon-s-home",
-      //         path: "/basedata/device",
-      //         name: "basedatadevice",
-      //         meta: {
-      //           title: "设备模型",
-      //           keepAlive: true,
-      //         },
-      //         component: () =>
-      //           import(
-      //             /* webpackChunkName: "form" */
-      //             "../pages/baseData/device.vue"
-      //           ),
-      //       },
-      //       {
-      //         icon: "el-icon-s-home",
-      //         path: "/basedata/dictionary",
-      //         name: "basedatadictionary",
-      //         meta: {
-      //           title: "字典维护",
-      //           keepAlive: true,
-      //         },
-      //         component: () =>
-      //           import(
-      //             /* webpackChunkName: "form" */
-      //             "../pages/baseData/dictionary.vue"
-      //           ),
-      //       },
-      //     ],
-      //   },
+        redirect: "/basedata/station",
+        meta: {
+          title: "基础数据",
+        },
+        component: () =>
+          import(
+            /* webpackChunkName: "home" */
+            "../pages/routerView.vue"
+          ),
+        children: [
+          {
+            icon: "el-icon-s-home",
+            path: "/basedata/device",
+            name: "basedatadevice",
+            meta: {
+              title: "设备模型",
+              keepAlive: true,
+            },
+            component: () =>
+              import(
+                /* webpackChunkName: "form" */
+                "../pages/baseData/device.vue"
+              ),
+          },
+          {
+            icon: "el-icon-s-home",
+            path: "/basedata/dictionary",
+            name: "basedatadictionary",
+            meta: {
+              title: "字典维护",
+              keepAlive: true,
+            },
+            component: () =>
+              import(
+                /* webpackChunkName: "form" */
+                "../pages/baseData/dictionary.vue"
+              ),
+          },
+        ],
+      },
       //   {
       //     icon: "el-icon-user-solid",
       //     path: "/userManage",

src/store/index.js

@@ -1,110 +1,105 @@
 import { createStore } from 'vuex'
 
 export default createStore({
-    state: {
-        tagsList: [],
-        collapse: true,
-        //stationList
-        stationList: [],
-        stationListAll: [],
-        //实时报警
-        warningList: [],
-        //是否存在实时报警轮询
-        warnInterval: null,
-        //是否启用报警弹窗
-        enableWarn: false,
-        //报警弹窗持续时间
-        warnTime: 5
-    },
-    mutations: {
-        delTagsItem(state, data) {
-            state
-                .tagsList
-                .splice(data.index, 1);
-        },
-        setTagsItem(state, data) {
-            state
-                .tagsList
-                .push(data)
-        },
-        clearTags(state) {
-            state.tagsList = []
-        },
-        closeTagsOther(state, data) {
-            state.tagsList = data;
-        },
-        closeCurrentTag(state, data) {
-            for (let i = 0, len = state.tagsList.length; i < len; i++) {
-                const item = state.tagsList[i];
-                if (item.path === data.$route.fullPath) {
-                    if (i < len - 1) {
-                        data
-                            .$router
-                            .push(state.tagsList[i + 1].path);
-                    } else if (i > 0) {
-                        data
-                            .$router
-                            .push(state.tagsList[i - 1].path);
-                    } else {
-                        data
-                            .$router
-                            .push("/");
-                    }
-                    state
-                        .tagsList
-                        .splice(i, 1);
-                    break;
-                }
-            }
-        },
-        // 侧边栏折叠
-        hadndleCollapse(state, data) {
-            state.collapse = data;
-        },
-        // stationList
-        setStationList(state, data) {
-            state.stationList = data;
-        },
-        setStationListAll(state, data) {
-            state.stationListAll = data;
-        },
-        // --------------------------------------------------------------------
-        //实时报警
-        setWarning(state, data) {
-            state.warningList.unshift(data);
-        },
-        //是否存在实时报警轮询
-        setWarnInterval(state, data) {
-            state.warnInterval = data;
-        },
-        //是否启用报警弹窗
-        setEnableWarn(state, data) {
-            state.enableWarn = data;
-        },
-        setWarnTime(state, data) {
-            state.warnTime = data;
-        }
+  state: {
+    tagsList: [],
+    collapse: true,
+    //stationList
+    stationList: [],
+    stationListAll: [],
+    booststationList: [],
+    //实时报警
+    warningList: [],
+    //是否存在实时报警轮询
+    warnInterval: null,
+    //是否启用报警弹窗
+    enableWarn: false,
+    //报警弹窗持续时间
+    warnTime: 5,
+  },
+  mutations: {
+    delTagsItem(state, data) {
+      state.tagsList.splice(data.index, 1);
     },
-    actions: {
-        actionsWarning(context, newData) {
-            context.commit("setWarning", newData);
-        },
-        //stationList
-        actionsStationList(context, newData) {
-            context.commit("setStationList", newData);
-        },
-        actionsStationListAll(context, newData) {
-            context.commit("setStationListAll", newData);
-        },
-        //是否存在实时报警轮询
-        actionsWarnInterval(context, newData) {
-            context.commit("setWarnInterval", newData);
-        }
+    setTagsItem(state, data) {
+      state.tagsList.push(data);
+    },
+    clearTags(state) {
+      state.tagsList = [];
     },
-    modules: {},
-    getters: {
-        isStation(state) {
-            return state.stationList.length == 1
+    closeTagsOther(state, data) {
+      state.tagsList = data;
+    },
+    closeCurrentTag(state, data) {
+      for (let i = 0, len = state.tagsList.length; i < len; i++) {
+        const item = state.tagsList[i];
+        if (item.path === data.$route.fullPath) {
+          if (i < len - 1) {
+            data.$router.push(state.tagsList[i + 1].path);
+          } else if (i > 0) {
+            data.$router.push(state.tagsList[i - 1].path);
+          } else {
+            data.$router.push("/");
+          }
+          state.tagsList.splice(i, 1);
+          break;
         }
-    }
-})
+      }
+    },
+    // 侧边栏折叠
+    hadndleCollapse(state, data) {
+      state.collapse = data;
+    },
+    // stationList
+    setStationList(state, data) {
+      state.stationList = data;
+    },
+    setStationListAll(state, data) {
+      state.stationListAll = data;
+    },
+    setBooststationList(state, data) {
+      state.booststationList = data;
+    },
+    // --------------------------------------------------------------------
+    //实时报警
+    setWarning(state, data) {
+      state.warningList.unshift(data);
+    },
+    //是否存在实时报警轮询
+    setWarnInterval(state, data) {
+      state.warnInterval = data;
+    },
+    //是否启用报警弹窗
+    setEnableWarn(state, data) {
+      state.enableWarn = data;
+    },
+    setWarnTime(state, data) {
+      state.warnTime = data;
+    },
+  },
+  actions: {
+    actionsWarning(context, newData) {
+      context.commit("setWarning", newData);
+    },
+    //stationList
+    actionsStationList(context, newData) {
+      context.commit("setStationList", newData);
+    },
+    actionsStationListAll(context, newData) {
+      context.commit("setStationListAll", newData);
+    },
+    actionsBooststationList(context, newData) {
+      context.commit("setBooststationList", newData);
+    },
+    //是否存在实时报警轮询
+    actionsWarnInterval(context, newData) {
+      context.commit("setWarnInterval", newData);
+    },
+  },
+  modules: {},
+  getters: {
+    isStation(state) {
+      return state.stationList.length == 1;
+    },
+  },
+});