修改报警列表样式及展示数据

src/components/alarm/index.vue

@@ -23,7 +23,15 @@
             :prop="item.code"
             :label="item.title"
             align="center"
+            :width="item.width"
           >
+            <template #default="{ row }">
+              <span v-if="item.code == 'rank'">{{ getRank(row.rank) }}</span>
+              <span v-else-if="item.code == 'endts'">{{
+                row.endts ? "解除" : "未解除"
+              }}</span>
+              <span v-else>{{ row[item.code] }}</span>
+            </template>
           </el-table-column>
         </el-table>
         <el-pagination
@@ -50,11 +58,13 @@ export default {
       dialogVisible: false,
       tableData: [],
       tableHeader: [
-        { title: "时间", code: "ts" },
-        { title: "场站名称", code: "stationname" },
-        { title: "设备名称", code: "devicename" },
-        { title: "是否确认", code: "confirmed" },
-        { title: "报警描述显示", code: "description" },
+        { title: "时间", code: "ts", width: "200" },
+        { title: "场站名称", code: "stationname", width: "200" },
+        { title: "设备名称", code: "devicename", width: "180" },
+        { title: "报警描述", code: "description" },
+        { title: "级别", code: "rank", width: "120" },
+        { title: "是否确认", code: "confirmed", width: "120" },
+        { title: "是否解除", code: "endts", width: "120" },
       ],
       page: {
         pagesize: 10,
@@ -68,6 +78,19 @@ export default {
   },
   created() {},
   methods: {
+    getRank(rank) {
+      if (rank === 1) {
+        return "低级";
+      } else if (rank === 2) {
+        return "低中级";
+      } else if (rank === 3) {
+        return "中级";
+      } else if (rank === 4) {
+        return "中高级";
+      } else if (rank === 5) {
+        return "高级";
+      }
+    },
     // 初始化弹窗数据
     openDialog(wtid, wpid, type) {
       this.wtype = type;

src/components/sbsAlarm/index.vue

@@ -0,0 +1,181 @@
+<template>
+  <el-drawer
+    class="custom-drawer"
+    v-model="drawer"
+    :title="title + '报警列表'"
+    direction="rtl"
+    size="45%"
+    :before-close="handleClose"
+  >
+    <div class="drawer-form">
+      <div class="select-item">
+        开始日期：
+        <el-date-picker
+          v-model="begin"
+          type="datetime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          placeholder="选择日期"
+          size="mini"
+          popper-class="date-select"
+        >
+        </el-date-picker>
+      </div>
+      <div class="select-item">
+        结束日期：
+        <el-date-picker
+          v-model="end"
+          type="datetime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          placeholder="选择日期"
+          size="mini"
+          popper-class="date-select"
+        >
+        </el-date-picker>
+      </div>
+      <div class="btns">
+        <el-button round size="mini" class="buttons" @click="getAlarm"
+          >搜索</el-button
+        >
+      </div>
+    </div>
+    <div class="table-wrapper">
+      <el-table height="100%" :data="drawerList">
+        <el-table-column
+          v-for="(item, index) in tableHeader"
+          :key="index"
+          sortable
+          :prop="item.code"
+          :label="item.title"
+          align="center"
+          :width="item.width"
+        >
+          <template #default="{ row }">
+            <span v-if="item.code == 'rank'">{{ getRank(row.rank) }}</span>
+            <span v-else-if="item.code == 'endts'">{{
+              row.endts ? "解除" : "未解除"
+            }}</span>
+            <span v-else>{{ row[item.code] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        style="display: flex; justify-content: flex-end; align-items: center"
+        @current-change="handleCurrentChange"
+        :current-page="page.currentPage"
+        :page-size="page.pagesize"
+        layout="total, prev, pager, next, jumper"
+        :total="page.total"
+      >
+      </el-pagination>
+    </div>
+  </el-drawer>
+</template>
+<script>
+import { GetTableData } from "@/api/zhbj/index.js";
+import dayjs from "dayjs";
+export default {
+  name: "sbsAlarm", //
+  components: {},
+  props: {},
+  data() {
+    return {
+       drawer: false,
+      title: "",
+      drawerList: [],
+      description: "",
+      sub: "",
+      begin: "",
+      end: "",
+      page: { currentPage: 1, pagesize: 22, total: 0 },
+      tableHeader: [
+        { title: "时间", code: "ts", width: "160" },
+        { title: "场站名称", code: "stationname", width: "140" },
+        { title: "报警描述", code: "description" },
+        { title: "级别", code: "rank", width: "110" },
+        { title: "是否确认", code: "confirmed", width: "110" },
+        { title: "是否解除", code: "endts", width: "110" },
+      ],
+    };
+  },
+ watch: {
+    "$store.state.drawer": {
+      handler(val) {
+        this.drawer = val;
+      },
+      immediate: true,
+    },
+  },
+  methods: {
+    getRank(rank) {
+      if (rank === 1) {
+        return "低级";
+      } else if (rank === 2) {
+        return "低中级";
+      } else if (rank === 3) {
+        return "中级";
+      } else if (rank === 4) {
+        return "中高级";
+      } else if (rank === 5) {
+        return "高级";
+      }
+    },
+    // 初始化弹窗数据
+    openDialog(wtid, wpid, type) {
+      this.wtype = type;
+      this.wtid = wtid;
+      this.wpid = wpid;
+      if (wtid && wpid) {
+        this.getTableData();
+        this.dialogVisible = true;
+      }
+    },
+    getTableData() {
+      GetTableData({
+        begin: dayjs().startOf("day").format("YYYY-MM-DD HH:mm:ss"),
+        end: dayjs().format("YYYY-MM-DD HH:mm:ss"),
+        alarmType: this.wtype == -1 ? "windturbine" : "inverter",
+        stationid: this.wpid,
+        deviceid: this.wtid,
+        pageNum: this.page.currentPage,
+        pageSize: this.page.pagesize,
+        description: "",
+      }).then(({ data }) => {
+        if (data.ls.length) {
+          this.tableData = data.ls.map((item) => {
+            return {
+              ...item,
+              confirmed: item.confirmed ? "是" : "否",
+              ts: dayjs(item.ts).format("YYYY-MM-DD HH:mm:ss"),
+            };
+          });
+          this.page.total = data.total;
+        } else {
+          this.tableData = [];
+          this.page.total = 0;
+        }
+      });
+    },
+    // 取消操作
+    cancel() {
+      this.wtid = "";
+      this.wpid = "";
+      this.page.currentPage = 1;
+      this.dialogVisible = false;
+    },
+
+    handleCurrentChange(val) {
+      this.page.currentPage = val;
+      this.getTableData();
+    },
+  },
+  mounted() {},
+  computed: {},
+};
+</script>
+<style lang="less" scoped>
+.el-pagination {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+}
+</style>

src/tools/request.js

@@ -62,7 +62,6 @@ service.interceptors.response.use(
         service.defaults.showLoading = false;
       }
       if (status === 200) {
-        console.log(response.data);
         return response.data;
       } else {
         return false;

src/views/alarmCenter/boosterAlarm.vue

@@ -1,190 +0,0 @@
-<template>
-  <div>
-    <div class="query mg-b-8">
-      <div class="query-items">
-        <div class="query-item">
-          <div class="lable">场站：</div>
-          <div class="search-input">
-            <el-select v-model="stationId" clearable placeholder="请选择" popper-class="select">
-              <el-option
-                v-for="item in ChangZhan"
-                :key="item.id"
-                :value="item.id"
-                :label="item.name"
-              ></el-option>
-            </el-select>
-          </div>
-        </div>
-        <div class="query-item">
-          <div class="lable">开始日期：</div>
-          <div class="search-input">
-            <el-date-picker
-              v-model="startDate"
-              type="datetime"
-              placeholder="开始日期"
-              popper-class="date-select"
-              value-format="YYYY-MM-DD HH:mm:ss"
-            ></el-date-picker>
-          </div>
-        </div>
-        <div class="query-item">
-          <div class="lable">结束日期：</div>
-          <div class="search-input">
-            <el-date-picker
-              v-model="endDate"
-              type="datetime"
-              placeholder="开始日期"
-              popper-class="date-select"
-              value-format="YYYY-MM-DD HH:mm:ss"
-            ></el-date-picker>
-          </div>
-        </div>
-        <div class="query-actions">
-          <button class="btn green" @click="getTable()">查询</button>
-          <button class="btn green" @click="exportExcel()">导出</button>
-        </div>
-      </div>
-    </div>
-    <div class="table-box">
-      <div class="title">升压站报警</div>
-      <ComTable
-        ref="curRef"
-        :data="tableData"
-        :pageSize="20"
-        @onPagging="onChangePage"
-        height="73vh"
-        v-loading="tableLoading"
-        element-loading-text="拼命加载中.."
-        element-loading-background="rgba(0, 0, 0, 0.8)"
-      ></ComTable>
-    </div>
-  </div>
-</template>
-<script>
-import ComTable from "@/components/coms/table/table.vue";
-
-export default {
-  name: "boosterAlarm",
-  components: { ComTable },
-  data() {
-    let that = this;
-    return {
-      ChangZhan: [],
-      stationId: "MHS_FDC",
-      startDate: "",
-      endDate: "",
-      tableLoading: true,
-      pageIndex: 1,
-      pageSize: 20,
-      tableData: {
-        column: [
-          {
-            name: "场站",
-            field: "stationName",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-            id: "id"
-          },
-          {
-            name: "变电站",
-            field: "",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-            id: "id"
-          },
-
-          {
-            name: "报警时间",
-            field: "alertTime",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-            id: "id"
-          },
-          {
-            name: "报警描述",
-            field: "alertText",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-            id: "id"
-          },
-          {
-            name: "处理方式",
-            field: "",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-            id: "id"
-          }
-        ],
-        data: [],
-        currentPageTotal: 0
-      }
-    };
-  },
-  created() {
-    this.ChangZhanVal();
-    let end = new Date();
-    let start = new Date(end.getTime() - 1 * 24 * 60 * 60 * 1000);
-    this.endDate = end.formatDate("yyyy-MM-dd hh:mm:ss");
-    this.startDate = start.formatDate("yyyy-MM-dd hh:mm:ss");
-    this.getTable();
-  },
-  methods: {
-    // 场站
-    ChangZhanVal() {
-      var that = this;
-      that.API.requestData({
-        method: "GET",
-        baseURL: "http://10.83.66.220:8020/",
-        subUrl: "benchmarking/wplist",
-        success(res) {
-          that.ChangZhan = res.data;
-          that.stationId = res.data[0].id;
-        }
-      });
-    },
-    getTable() {
-      let that = this;
-      this.tableLoading = true;
-      this.API.requestData({
-        timeout: 30000,
-        method: "GET",
-        baseURL: "http://192.168.1.18:8075/",
-        subUrl: "alarm/history/page2",
-        data: {
-          category1: "SYZ",
-          stationid: this.stationId,
-          starttime: this.startDate,
-          endtime: this.endDate,
-          pagenum: this.pageIndex,
-          pagesize: this.pageSize
-        },
-        success(res) {
-          that.tableData.data = res.data.records;
-          that.tableLoading = false;
-          that.tableData.total = res.data.total;
-        }
-      });
-    },
-    onChangePage(params) {
-      this.pageIndex = params.pageIndex;
-      this.pageSize = params.pageSize;
-      this.getTable();
-    },
-    exportExcel(){
-        this.BASE.exportExcel(this.tableData,"升压站报警");
-    }
-  }
-};
-</script>
-<style scoped>
-.title {
-  background: rgba(255, 255, 255, 0.1);
-  margin-bottom: 8px;
-  padding: 1vh;
-}
-</style>

src/views/alarmCenter/customAlarm.vue

@@ -1,236 +0,0 @@
-<template>
-  <div>
-    <div class="query mg-b-8">
-      <div class="query-items">
-        <div class="query-item">
-          <div class="lable">场站：</div>
-          <div class="search-input">
-            <el-select
-              v-model="stationId"
-              clearable
-              placeholder="请选择"
-              popper-class="select"
-              @change="(stationId) => { Windturbines() }"
-            >
-              <el-option
-                v-for="item in ChangZhan"
-                :key="item.id"
-                :value="item.id"
-                :label="item.name"
-              ></el-option>
-            </el-select>
-          </div>
-        </div>
-        <div class="query-item">
-          <div class="lable">机组：</div>
-          <div class="search-input">
-            <el-select v-model="wtId" placeholder="请选择" popper-class="select">
-              <el-option
-                v-for="item in windturbines"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              ></el-option>
-            </el-select>
-          </div>
-        </div>
-        <div class="query-item">
-          <div class="lable">开始日期：</div>
-          <div class="search-input">
-            <el-date-picker
-              v-model="startDate"
-              type="datetime"
-              placeholder="开始日期"
-              popper-class="date-select"
-              value-format="YYYY-MM-DD HH:mm:ss"
-            ></el-date-picker>
-          </div>
-        </div>
-        <div class="query-item">
-          <div class="lable">结束日期：</div>
-          <div class="search-input">
-            <el-date-picker
-              v-model="endDate"
-              type="datetime"
-              placeholder="开始日期"
-              popper-class="date-select"
-              value-format="YYYY-MM-DD HH:mm:ss"
-            ></el-date-picker>
-          </div>
-        </div>
-        <div class="query-actions">
-          <button class="btn green" @click="getTable()">查询</button>
-          <button class="btn green" @click="exportExcel()">导出</button>
-        </div>
-      </div>
-    </div>
-    <div class="table-box">
-      <div class="title">自定义报警</div>
-      <ComTable
-        ref="curRef"
-        :data="tableData"
-        :pageSize="20"
-        @onPagging="onChangePage"
-        height="73vh"
-        v-loading="tableLoading"
-        element-loading-text="拼命加载中.."
-        element-loading-background="rgba(0, 0, 0, 0.8)"
-      ></ComTable>
-    </div>
-  </div>
-</template>
-<script>
-import ComTable from "@/components/coms/table/table.vue";
-
-export default {
-  name: "customAlarm",
-  components: { ComTable },
-  data() {
-    let that = this;
-    return {
-      ChangZhan: [],
-      stationId: "MHS_FDC",
-      windturbines: [],
-      wtId: "",
-      startDate: "",
-      endDate: "",
-      tableLoading: true,
-      pageIndex: 1,
-      pageSize: 20,
-      tableData: {
-        column: [
-          {
-            name: "场站",
-            field: "stationName",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-            id: "id"
-          },
-          {
-            name: "机组",
-            field: "windturbineName",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-            id: "id"
-          },
-
-          {
-            name: "报警时间",
-            field: "alertTime",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-            id: "id"
-          },
-          {
-            name: "型号",
-            field: "modelId",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-            id: "id"
-          },
-          {
-            name: "报警描述",
-            field: "alertText",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-            id: "id"
-          }
-        ],
-        data: [],
-        currentPageTotal: 0
-      }
-    };
-  },
-  created() {
-    this.ChangZhanVal();
-    this.Windturbines();
-    let end = new Date();
-    let start = new Date(end.getTime() - 1 * 24 * 60 * 60 * 1000);
-    this.endDate = end.formatDate("yyyy-MM-dd hh:mm:ss");
-    this.startDate = start.formatDate("yyyy-MM-dd hh:mm:ss");
-    this.getTable();
-  },
-  methods: {
-    // 场站
-    ChangZhanVal() {
-      var that = this;
-      that.API.requestData({
-        method: "GET",
-        baseURL: "http://10.83.66.220:8020/",
-        subUrl: "benchmarking/wplist",
-        success(res) {
-          that.ChangZhan = res.data;
-          that.stationId = res.data[0].id;
-        }
-      });
-    },
-    Windturbines() {
-      let that = this;
-      that.API.requestData({
-        method: "GET",
-        subUrl: "powercompare/windturbineAjax",
-        data: { wpId: that.stationId },
-        success(res) {
-          that.windturbines = res.data;
-          // that.wtId = res.data[0].id;
-          that.windturbines.unshift({ id: "", name: "请选择" });
-          that.wtId = "";
-        }
-      });
-    },
-    getTable() {
-      let that = this;
-      this.tableLoading = true;
-      this.API.requestData({
-        timeout: 30000,
-        method: "GET",
-        baseURL: "http://192.168.1.18:8075/",
-        subUrl: "alarm/history/page2",
-        data: {
-          category1: "custom",
-          stationid: this.stationId,
-          starttime: this.startDate,
-          endtime: this.endDate,
-          windturbineid: this.wtId,
-          pagenum: this.pageIndex,
-          pagesize: this.pageSize
-        },
-        success(res) {
-          if (res.data) {
-            that.tableData.data = res.data.records;
-            that.tableData.total = res.data.total;
-          } else {
-            that.tableData.data = [];
-            that.tableData.total = 0;
-          }
-          that.tableLoading = false;
-        }
-      });
-    },
-    onChangePage(params) {
-      this.pageIndex = params.pageIndex;
-      this.pageSize = params.pageSize;
-      this.getTable();
-    },
-    exportExcel() {
-      // let excelData = this.BASE.deepCopy(this.tableData);
-      // excelData.data.forEach(ele => {
-      //   ele["category2"] = this.partsMap[ele["category2"]];
-      // });
-      this.BASE.exportExcel(this.tableData, "自定义报警");
-    }
-  }
-};
-</script>
-<style lang="less">
-.title {
-  background: rgba(255, 255, 255, 0.1);
-  margin-bottom: 8px;
-  padding: 1vh;
-}
-</style>

src/views/alarmCenter/customStatistics.vue

@@ -1,317 +0,0 @@
-<template>
-  <div>
-    <div class="query mg-b-8">
-      <div class="query-items">
-        <div class="query-item">
-          <div class="lable">场站：</div>
-          <div class="search-input">
-            <el-select
-              v-model="stationId"
-              clearable
-              placeholder="请选择"
-              popper-class="select"
-              @change="(stationId) => { Windturbines() }"
-            >
-              <el-option
-                v-for="item in ChangZhan"
-                :key="item.id"
-                :value="item.id"
-                :label="item.name"
-              ></el-option>
-            </el-select>
-          </div>
-        </div>
-        <div class="query-item">
-          <div class="lable">开始日期：</div>
-          <div class="search-input">
-            <el-date-picker
-              v-model="startDate"
-              type="date"
-              placeholder="开始日期"
-              popper-class="date-select"
-              value-format="YYYY-MM-DD"
-            ></el-date-picker>
-          </div>
-        </div>
-        <div class="query-item">
-          <div class="lable">结束日期：</div>
-          <div class="search-input">
-            <el-date-picker
-              v-model="endDate"
-              type="date"
-              placeholder="开始日期"
-              popper-class="date-select"
-              value-format="YYYY-MM-DD"
-            ></el-date-picker>
-          </div>
-        </div>
-        <div class="query-actions">
-          <button class="btn green" @click="getTable()">查询</button>
-        </div>
-      </div>
-    </div>
-    <div class="table-box">
-      <div class="title">自定义报警统计</div>
-      <div class="custom-report-items">
-        <div class="title" v-for="item in tableData" :key="item" @click="alertDetail(item)">
-          <div class="alarmName">{{item.alarmtext}}</div>
-          <div class="alarmCount">{{item.sum}}</div>
-        </div>
-      </div>
-    </div>
-    <el-dialog
-      title="自定义报警统计-图表"
-      v-model="dialogShow"
-      width="80%"
-      top="10vh"
-      custom-class="modal dBody"
-      :close-on-click-modal="true"
-    >
-      <div class="dGrid" height="100%">
-        <table class="com-table">
-          <thead>
-            <tr>
-              <th>风机</th>
-              <th>数量</th>
-            </tr>
-          </thead>
-          <el-scrollbar>
-            <tbody>
-              <tr v-for="item in dGridData" :key="item">
-                <td>{{item.name}}</td>
-                <td>{{item.sum}}</td>
-              </tr>
-            </tbody>
-          </el-scrollbar>
-        </table>
-      </div>
-      <div class="dChart" height="100%" id="dChart">
-        <!-- <div class="title">报警统计柱状图</div> -->
-        <!-- <multiple-hover-bar-chart height="80%" width="90%"></multiple-hover-bar-chart> -->
-        <!-- <multiple-hover-bar-chart height="100%" :list="dChartData"></multiple-hover-bar-chart> -->
-      </div>
-    </el-dialog>
-  </div>
-</template>
-<script>
-// import ComTable from "@/components/coms/table/table.vue";
-import MultipleHoverBarChart from "../../components/chart/bar/multiple-bar-chart.vue";
-import * as echarts from "echarts";
-export default {
-  name: "customStatistics",
-  components: { MultipleHoverBarChart },
-  data() {
-    let that = this;
-    return {
-      ChangZhan: [],
-      stationId: "MHS_FDC",
-      startDate: "",
-      endDate: "",
-      tableData: [],
-      dialogShow: false,
-      dGridData: [],
-      dChartData: []
-
-      // tableLoading: true
-    };
-  },
-  created() {
-    this.ChangZhanVal();
-    let end = new Date();
-    let start = new Date(end.getTime() - 1 * 24 * 60 * 60 * 1000);
-    this.endDate = end.formatDate("yyyy-MM-dd");
-    this.startDate = start.formatDate("yyyy-MM-dd");
-    this.getTable();
-  },
-  methods: {
-    // 场站
-    ChangZhanVal() {
-      var that = this;
-      that.API.requestData({
-        method: "GET",
-        baseURL: "http://10.83.66.220:8020/",
-        subUrl: "benchmarking/wplist",
-        success(res) {
-          that.ChangZhan = res.data;
-          that.stationId = res.data[0].id;
-        }
-      });
-    },
-    getTable() {
-      let that = this;
-      this.tableLoading = true;
-      this.API.requestData({
-        timeout: 30000,
-        method: "GET",
-        baseURL: "http://192.168.1.18:8075/",
-        subUrl: "alarm/count/querymap2",
-        data: {
-          stationid: this.stationId,
-          datebegin: this.startDate,
-          dateend: this.endDate
-        },
-        success(res) {
-          let tmpArr = [];
-          for (var key in res.data) {
-            let item = res.data[key];
-            item["key"] = key;
-            tmpArr.push(item);
-          }
-          tmpArr.sort(function(a, b) {
-            return b["sum"] - a["sum"];
-          });
-          that.tableData = tmpArr;
-        }
-      });
-    },
-    async alertDetail(item) {
-      this.dialogShow = true;
-      let resData = await this.API.requestData({
-        timeout: 30000,
-        method: "GET",
-        baseURL: "http://192.168.1.18:8075/",
-        subUrl: "alarm/count/querybyname2",
-        data: {
-          stationid: this.stationId,
-          datebegin: this.startDate,
-          dateend: this.endDate,
-          snapid: item["key"]
-        }
-      });
-      let keyValue = resData.data.data;
-      const dGridData = [];
-      for (let key in keyValue) {
-        dGridData.push({ sum: keyValue[key], name: key });
-      }
-      dGridData.sort(function(a, b) {
-        return b.sum - a.sum;
-      });
-      this.dGridData = dGridData;
-      this.alertDetailChart(item);
-    },
-    async alertDetailChart(item) {
-      let resData = await this.API.requestData({
-        timeout: 30000,
-        method: "GET",
-        baseURL: "http://192.168.1.18:8075/",
-        subUrl: "alarm/count/lineandproject",
-        data: {
-          stationid: this.stationId,
-          datebegin: this.startDate,
-          dateend: this.endDate,
-          snapid: item["key"]
-        }
-      });
-      let dataX = [],
-        data1 = [],
-        data2 = [];
-      for (let item of resData.data.data) {
-        dataX.push(item["linenum"]);
-        data1.push(item["happendsum"]);
-        data2.push(item["sum"]);
-      }
-
-      let option = {
-        color: ["#05bb4c", "#4b55ae", "#fa8c16"],
-        title: {
-          text: "报警统计柱状图",
-          left: "5%"
-        },
-        tooltip: {
-          trigger: "axis",
-          axisPointer: {
-            type: "shadow"
-          }
-        },
-        legend: {
-          data: ["总数", "发生数量"],
-          textStyle: {
-            color: "#fff"
-          }
-        },
-        grid: {
-          left: "5%",
-          right: "6%",
-          bottom: "3%",
-          containLabel: true
-        },
-        xAxis: { name: "线路", type: "category", data: dataX },
-        yAxis: { name: "数量", type: "value" },
-        series: [
-          {
-            name: "总数",
-            type: "bar",
-            barWidth: 40,
-            barGap: "-100%",
-            label: { normal: { show: true, position: "top" } },
-            data: data2
-          },
-          {
-            name: "发生数量",
-            type: "bar",
-            barGap: "-100%",
-            barWidth: 40,
-            label: { normal: { show: true, position: "inside" } },
-            data: data1
-          }
-        ]
-      };
-      let chart = echarts.init(document.getElementById("dChart"));
-      chart.clear();
-      chart.setOption(option);
-    }
-  }
-};
-</script>
-<style lang="less">
-.dGrid {
-  height: 70vh;
-  width: 30%;
-  display: inline-block;
-  table {
-    tbody {
-      height: 65vh;
-    }
-  }
-}
-.dChart {
-  height: 70vh;
-  width: 70%;
-  display: inline-block;
-  vertical-align: top;
-}
-.dBody {
-  height: 80vh;
-}
-.title {
-  background: rgba(255, 255, 255, 0.1);
-  margin-bottom: 8px;
-  padding: 1vh;
-}
-
-.custom-report-items {
-  display: flex;
-  flex-wrap: wrap;
-  .title {
-    height: 80px;
-    width: 18.8vw;
-    background: fade(@gray, 40);
-    color: @gray-l;
-    font-size: 1.85vh;
-    margin-left: 7px;
-    margin-right: 7px;
-    margin-top: 7px;
-    margin-bottom: 7px;
-    cursor: pointer;
-    div {
-      width: 100%;
-      display: block;
-      clear: both;
-      text-align: center;
-      &:first-child {
-        margin-bottom: 20px;
-      }
-    }
-  }
-}
-</style>

src/views/alarmCenter/index.vue

@@ -1,11 +0,0 @@
-<template>
-  <router-view />
-</template>
-
-<script>
-export default {
-  name: "alarmCenter", //综合报警
-};
-</script>
-
-<style></style>

src/views/alarmCenter/scadaAlarm.vue

@@ -1,366 +0,0 @@
-<template>
-  <div>
-    <div class="query mg-b-8">
-      <div class="query-items">
-        <div class="query-item">
-          <div class="lable">场站：</div>
-          <div class="search-input">
-            <el-select
-              v-model="stationId"
-              clearable
-              placeholder="请选择"
-              popper-class="select"
-              @change="
-                (stationId) => {
-                  Windturbines();
-                }
-              "
-            >
-              <el-option
-                v-for="item in ChangZhan"
-                :key="item.id"
-                :value="item.id"
-                :label="item.name"
-              ></el-option>
-            </el-select>
-          </div>
-        </div>
-        <div class="query-item">
-          <div class="lable">机组：</div>
-          <div class="search-input">
-            <el-select
-              v-model="wtId"
-              placeholder="请选择"
-              popper-class="select"
-            >
-              <el-option
-                v-for="item in windturbines"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              ></el-option>
-            </el-select>
-          </div>
-        </div>
-        <div class="query-item">
-          <div class="lable">描述：</div>
-          <div class="search-input">
-            <el-input v-model="alarmDesc" placeholder="报警描述"></el-input>
-          </div>
-        </div>
-        <div class="query-item">
-          <div class="lable">等级：</div>
-          <div class="search-input">
-            <el-select
-              v-model="level"
-              clearable
-              placeholder="请选择"
-              popper-class="select"
-            >
-              <el-option
-                v-for="item in levelArray"
-                :key="item.id"
-                :value="item.id"
-                :label="item.name"
-              />
-            </el-select>
-          </div>
-        </div>
-        <div class="query-item">
-          <div class="lable">分类：</div>
-          <div class="search-input">
-            <el-select
-              v-model="partsId"
-              clearable
-              placeholder="请选择"
-              popper-class="select"
-            >
-              <el-option
-                v-for="item in partsArray"
-                :key="item.id"
-                :value="item.id"
-                :label="item.name"
-              />
-            </el-select>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="query mg-b-8">
-      <div class="query-items">
-        <div class="query-item">
-          <div class="lable">开始日期：</div>
-          <div class="search-input">
-            <el-date-picker
-              v-model="startDate"
-              type="datetime"
-              placeholder="开始日期"
-              popper-class="date-select"
-              value-format="YYYY-MM-DD HH:mm:ss"
-            ></el-date-picker>
-          </div>
-        </div>
-        <div class="query-item">
-          <div class="lable">结束日期：</div>
-          <div class="search-input">
-            <el-date-picker
-              v-model="endDate"
-              type="datetime"
-              placeholder="开始日期"
-              popper-class="date-select"
-              value-format="YYYY-MM-DD HH:mm:ss"
-            ></el-date-picker>
-          </div>
-        </div>
-        <div class="query-actions">
-          <button class="btn green" @click="getTable()">查询</button>
-          <button class="btn green" @click="exportExcel()">导出</button>
-        </div>
-      </div>
-    </div>
-    <div class="table-box">
-      <div class="title">SCADA报警</div>
-      <ComTable
-        ref="curRef"
-        :data="tableData"
-        :pageSize="20"
-        @onPagging="onChangePage"
-        @sizeChange="sizeChange"
-        @pageClick="pageClick"
-        height="68vh"
-        v-loading="tableLoading"
-        element-loading-text="拼命加载中.."
-        element-loading-background="rgba(0, 0, 0, 0.8)"
-      ></ComTable>
-    </div>
-  </div>
-</template>
-<script>
-import ComTable from "@/components/coms/table/table.vue";
-
-export default {
-  name: "scadaAlarm",
-  components: { ComTable },
-  data() {
-    let that = this;
-    return {
-      ChangZhan: [],
-      stationId: "MHS_FDC",
-      windturbines: [],
-      wtId: "",
-      alarmDesc: "",
-      levelArray: [
-        {
-          id: "",
-          name: "请选择",
-        },
-        {
-          id: "1",
-          name: "一级",
-        },
-        {
-          id: "2",
-          name: "二级",
-        },
-        {
-          id: "3",
-          name: "三级",
-        },
-        {
-          id: "4",
-          name: "四级",
-        },
-        {
-          id: "5",
-          name: "五级",
-        },
-      ],
-      level: "",
-      partsArray: [],
-      partsMap: {},
-      partsId: "",
-      startDate: "",
-      endDate: "",
-      tableLoading: true,
-      pageIndex: 1,
-      pageSize: 20,
-      tableData: {
-        column: [
-          {
-            name: "场站",
-            field: "stationName",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-            id: "id",
-          },
-          {
-            name: "机组",
-            field: "windturbineName",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-            id: "id",
-          },
-
-          {
-            name: "报警时间",
-            field: "alertTime",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-            id: "id",
-          },
-          {
-            name: "报警描述",
-            field: "alertText",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-            id: "id",
-          },
-          {
-            name: "报警类别",
-            field: "category2",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-            id: "id",
-            template: function (row) {
-              return that.partsMap[row];
-            },
-          },
-          {
-            name: "报警等级",
-            field: "rank",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-            id: "id",
-          },
-        ],
-        data: [],
-        currentPageTotal: 0,
-      },
-    };
-  },
-  created() {
-    this.ChangZhanVal();
-    this.Windturbines();
-    this.Parts();
-    let end = new Date();
-    let start = new Date(end.getTime() - 1 * 24 * 60 * 60 * 1000);
-    this.endDate = end.formatDate("yyyy-MM-dd hh:mm:ss");
-    this.startDate = start.formatDate("yyyy-MM-dd hh:mm:ss");
-    this.getTable();
-  },
-  methods: {
-    // 场站
-    ChangZhanVal() {
-      var that = this;
-      that.API.requestData({
-        method: "GET",
-        baseURL: "http://10.83.66.220:8020/",
-        subUrl: "benchmarking/wplist",
-        success(res) {
-          that.ChangZhan = res.data;
-          that.stationId = res.data[0].id;
-        },
-      });
-    },
-    Windturbines() {
-      let that = this;
-      that.API.requestData({
-        method: "GET",
-        subUrl: "powercompare/windturbineAjax",
-        data: { wpId: that.stationId },
-        success(res) {
-          that.windturbines = res.data;
-          // that.wtId = res.data[0].id;
-          that.windturbines.unshift({ id: "", name: "请选择" });
-          that.wtId = "";
-        },
-      });
-    },
-    Parts() {
-      let that = this;
-      that.API.requestData({
-        method: "GET",
-        subUrl: "powercompare/warningClassAjax",
-        success(res) {
-          that.partsArray = res.data;
-          that.partsArray.unshift({ id: "", name: "请选择" });
-          that.partsId = "";
-          res.data.forEach((ele) => {
-            that.partsMap[ele.id] = ele.name;
-          });
-        },
-      });
-    },
-    getTable() {
-      let that = this;
-      this.tableLoading = true;
-      this.API.requestData({
-        timeout: 30000,
-        method: "GET",
-        baseURL: "http://192.168.1.18:8075/",
-        subUrl: "alarm/history/page2",
-        data: {
-          category1: "windturbine",
-          stationid: this.stationId,
-          starttime: this.startDate,
-          endtime: this.endDate,
-          category2: this.partsId,
-          keyword: this.alarmDesc,
-          windturbineid: this.wtId,
-          pagenum: this.pageIndex,
-          pagesize: this.pageSize,
-        },
-        success(res) {
-          if (res.data) {
-			  let rank = ['低','中低','中','中高','高'];
-			  res.data.records.forEach((ele,index) =>{
-				ele.rank = rank[parseInt(ele.rank) - 1]
-			  })
-            that.tableData.data = res.data.records;
-            that.tableData.total = res.data.total;
-          } else {
-            that.tableData.data = [];
-            that.tableData.total = 0;
-          }
-          that.tableLoading = false;
-        },
-      });
-    },
-    onChangePage(params) {
-      this.pageIndex = params.pageIndex;
-      this.pageSize = params.pageSize;
-      this.getTable();
-      console.log("页码切换:", params);
-    },
-
-    sizeChange(res) {
-      console.log("每页数量:", res);
-    },
-
-    pageClick(res) {
-      console.log("页码:", res);
-    },
-
-    exportExcel() {
-      let excelData = this.BASE.deepCopy(this.tableData);
-      excelData.data.forEach((ele) => {
-        ele["category2"] = this.partsMap[ele["category2"]];
-      });
-      this.BASE.exportExcel(excelData, "SCADA报警");
-    },
-  },
-};
-</script>
-<style lang="less">
-.title {
-  background: rgba(255, 255, 255, 0.1);
-  margin-bottom: 8px;
-  padding: 1vh;
-}
-</style>

src/views/allLifeManage/index.vue

@@ -1,93 +0,0 @@
-<template>
-  <div class="health">
-    <div class="selections mg-b-16">
-      <div class="item" @click="tabSelect(0)" :class="{ active: tabIndex == 0 }">设备采购</div>
-      <div class="item" @click="tabSelect(1)" :class="{ active: tabIndex == 1 }">设备初始化信息</div>
-      <div class="item" @click="tabSelect(2)" :class="{ active: tabIndex == 2 }">设备维护与故障</div>
-    </div>
-    <div class="curHeight" v-if="tabIndex == 0">
-      <Tab1 />
-    </div>
-    <div class="curHeight" v-if="tabIndex == 1">
-      <Tab2 />
-    </div>
-    <div class="curHeight" v-if="tabIndex == 2">
-      <Tab3 />
-    </div>
-  </div>
-</template>
-
-<script>
-import Tab1 from "./tab1.vue";
-import Tab2 from "./tab2.vue";
-import Tab3 from "./tab3.vue";
-export default {
-  // 名称
-  name: "wtSaturability",
-
-  // 使用组件
-  components: {
-    Tab1,
-    Tab2,
-    Tab3
-  },
-
-  // 数据
-  data () {
-    const that = this;
-    return {
-      tabIndex: 0,
-    };
-  },
-
-  // 函数
-  methods: {
-    tabSelect (state) {
-      this.tabIndex = state;
-    },
-    // 请求服务
-    requestData () {
-      
-    }
-  },
-
-  created () {
-    this.requestData();
-  },
-
-  mounted () { },
-
-  unmounted () { },
-};
-</script>
-
-<style lang="less" scope>
-.health {
-  .selections {
-    display: flex;
-
-    .item {
-      flex: 0 0 128px;
-      text-align: center;
-      line-height: 33px;
-      margin-right: 8px;
-      color: @font-color;
-      font-size: @fontsize-s;
-      background: fade(@gray, 20);
-      border: 1px solid fade(@gray, 20);
-
-      &:hover,
-      &.active {
-        background: fade(@green, 20);
-        border: 1px solid @green;
-        color: @green;
-        cursor: pointer;
-      }
-    }
-  }
-
-  .curHeight {
-    height: 87vh;
-  }
-}
-</style>

src/views/allLifeManage/tab1.vue

@@ -1,418 +0,0 @@
-<template>
-  <div class="knowledge-2">
-    <div class="query mg-b-8">
-      <div class="query-items">
-        <div class="query-item">
-          <div class="lable">供应商：</div>
-          <div class="search-input">
-            <el-select
-              v-model="vendor"
-              clearable
-              placeholder="请选择"
-              popper-class="select"
-            >
-              <el-option
-                v-for="item in vendorArray"
-                :key="item.company"
-                :value="item.company"
-                :label="item.company"
-              />
-            </el-select>
-          </div>
-        </div>
-        <div class="query-item">
-          <div class="lable">采购单号：</div>
-          <div class="search-input">
-            <el-input
-              placeholder="请输入描述"
-              size="middle"
-              v-model="ponum"
-              clearable
-            ></el-input>
-          </div>
-        </div>
-        <div class="query-item">
-          <div class="lable">仓库：</div>
-          <div class="search-input">
-            <el-select
-              v-model="warehouse"
-              clearable
-              placeholder="请选择"
-              popper-class="select"
-            >
-              <el-option
-                v-for="item in warehouseArray"
-                :key="item.warehouse"
-                :value="item.warehouse"
-                :label="item.warehouse"
-              />
-            </el-select>
-          </div>
-        </div>
-        <div class="query-item">
-          <div class="lable">日期：</div>
-          <div class="search-input">
-            <el-date-picker
-              size="medium"
-              v-model="dateArea"
-              type="datetimerange"
-              :picker-options="pickerOptions"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              align="right"
-            >
-            </el-date-picker>
-          </div>
-        </div>
-      </div>
-      <div class="query-actions" style="margin-right: 1500px">
-        <button class="btn green" @click="onClickSearch">查询</button>
-      </div>
-    </div>
-    <div>
-      <ComTable :data="tableData" height="85vh"></ComTable>
-    </div>
-  </div>
-</template>
-
-<script>
-import ComTable from "@com/coms/table/table.vue";
-import api from "@api/wisdomOverhaul/lifecycle/index.js";
-import api1 from "@api/economic/index.js";
-export default {
-  components: { ComTable },
-  data() {
-    return {
-      dateArea: [
-        this.fmtDate(
-          new Date(
-            new Date().setTime(new Date().getTime() - 3600 * 1000 * 24 * 30)
-          )
-        ),
-        this.fmtDate(new Date()),
-      ],
-      pageSize: 100,
-      pageNum: 1,
-      ponum: "",
-      vendor: "联合动力",
-      vendorArray: [],
-      warehouse: "",
-      warehouseArray: [],
-      tableData: {
-        column: [
-          {
-            name: "采购单号",
-            field: "ponum",
-            is_num: true,
-            is_light: false,
-          },
-          {
-            name: "状态",
-            field: "status",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "状态日期",
-            field: "statusdate",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "供应商",
-            field: "vendor",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "总成本",
-            field: "totalcost",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "含税总成本",
-            field: "totaltax",
-            is_num: true,
-            is_light: false,
-          },
-          {
-            name: "地点",
-            field: "sitenum",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "描述",
-            field: "cription",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "库存项目",
-            field: "itemnum",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "仓库",
-            field: "warehouse",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "订购数量",
-            field: "orderqty",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "订购单位",
-            field: "orderunit",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "不含税单价",
-            field: "unitcost",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "含税行成本",
-            field: "linecost",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "录入日期",
-            field: "enterdate",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "录入人",
-            field: "enterby",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "规格型号",
-            field: "modelnum",
-            is_num: false,
-            is_light: false,
-          },
-        ],
-        data: [],
-      },
-    };
-  },
-  created() {
-    // this.requestSafeList();
-    this.value1 = this.getTime(1);
-    this.value2 = this.getTime(2);
-    this.getVendor();
-  },
-  methods: {
-    getTime(val) {
-      //时间戳处理，val=1是默认开始时间（当前月第一天），val=2是默认结束时间（今天）
-      var date = new Date();
-      var year = date.getFullYear(),
-        month = date.getMonth() + 1,
-        day = date.getDate();
-      month >= 1 && month <= 9 ? (month = "0" + month) : "";
-      day >= 0 && day <= 9 ? (day = "0" + day) : "";
-      var begin = year + "-" + month + "-01";
-      var end = year + "-" + month + "-" + day;
-      if (val == 1) {
-        return begin;
-      } else if (val == 2) {
-        return end;
-      }
-    },
-
-    // 获取厂家
-    getVendor() {
-      api.companiesList().then((res) => {
-        if (res.data) {
-          this.vendorArray = res.data;
-          this.vendor = res.data[0].company;
-          this.getWarehouse();
-        }
-      });
-
-      // let that = this;
-      // that.API.requestData({
-      //   baseURL: "http://192.168.1.18:9988",
-      //   subUrl: "companies/list",
-      //   success(res) {
-      //     that.vendorArray = res.data;
-      //     that.vendor = res.data[0].company;
-      //     that.getWarehouse();
-      //   },
-      // });
-    },
-    // 获取仓库
-    getWarehouse() {
-      api.warehouseList().then((res) => {
-        if (res.data) {
-          this.warehouseArray = res.data;
-          this.warehouse = res.data[0].warehouse;
-          this.requestSafeList();
-        }
-      });
-
-      // let that = this;
-      // that.API.requestData({
-      //   baseURL: "http://192.168.1.18:9988",
-      //   subUrl: "warehouse/list",
-      //   success(res) {
-      //     that.warehouseArray = res.data;
-      //     that.warehouse = res.data[0].warehouse;
-      //     that.requestSafeList();
-      //   },
-      // });
-    },
-
-    // 格式化日期
-    fmtDate(date) {
-      let curDate = date || new Date();
-      let year = curDate.getFullYear();
-      let mouth = curDate.getUTCMonth() + 1;
-      let day = curDate.getDate();
-      let hour = curDate.getHours();
-      let minutes = curDate.getMinutes();
-      let seconds = curDate.getSeconds();
-      return (
-        year +
-        "-" +
-        (mouth < 10 ? "0" + mouth : mouth) +
-        "-" +
-        (day < 10 ? "0" + day : day) +
-        " " +
-        (hour < 10 ? "0" + hour : hour) +
-        ":" +
-        (minutes < 10 ? "0" + minutes : minutes) +
-        ":" +
-        (seconds < 10 ? "0" + seconds : seconds)
-      );
-    },
-    BeginChange(vl) {
-      this.value1 = vl;
-    },
-    EndChange(vl) {
-      this.value2 = vl;
-    },
-    typeChange(vl) {
-      this.type = vl;
-    },
-    // 搜索按钮
-    onClickSearch() {
-      this.requestSafeList();
-    },
-    // 获取查询列表
-    requestSafeList() {
-      let that = this;
-      if (!that.dateArea || !that.dateArea.length) {
-        that.BASE.showMsg({
-          msg: "请先选择要查询的日期区间后再试",
-        });
-      } else {
-        let starttime = this.dateArea.length
-          ? new Date(this.dateArea[0]).formatDate("yyyy-MM-dd hh:mm:ss")
-          : "";
-        let endtime = this.dateArea.length
-          ? new Date(this.dateArea[1]).formatDate("yyyy-MM-dd hh:mm:ss")
-          : "";
-
-        // let data = {
-        //   category1:'SYZ',
-        //   starttime,
-        //   endtime,
-        //   pagenum: that.pageNum,
-        //   pagesize: that.pageSize,
-        //   stationid: that.wpId,
-        // };
-
-        api
-          .polineList({
-            vendor: this.vendor,
-            ponum: this.ponum,
-            warehouse: this.warehouse,
-            starttime,
-            endtime,
-            pagenum: this.pageNum,
-            pagesize: this.pageSize,
-          })
-          .then((res) => {
-            if (res.data.records.length) {
-              res.data.records.forEach((ele, index) => {
-                ele.index = index + 1;
-                ele.timeDate = this.fmtDate(new Date(ele.time));
-                if (ele.value > 0) {
-                  ele.value = parseFloat(ele.value).toFixed(4);
-                }
-              });
-              this.tableData.data = res.data.records || [];
-            } else {
-              // that.BASE.showMsg({
-              //   type: "warning",
-              //   msg: "所选日期区间之内暂无数据，请重试",
-              // });
-            }
-            this.showDialog = true;
-          });
-
-        // that.API.requestData({
-        //   // baseURL:"http://192.168.1.14:8075/",
-        //   baseURL: "http://192.168.1.18:9988",
-        //   subUrl: "poline/list",
-        //   method: "GET",
-        //   data: {
-        //     vendor: that.vendor,
-        //     ponum: that.ponum,
-        //     warehouse: that.warehouse,
-        //     starttime,
-        //     endtime,
-        //     pagenum: that.pageNum,
-        //     pagesize: that.pageSize,
-        //   },
-        //   success(res) {
-        //     if (res.data.records.length) {
-        //       res.data.records.forEach((ele, index) => {
-        //         ele.index = index + 1;
-        //         ele.timeDate = that.fmtDate(new Date(ele.time));
-        //         if (ele.value > 0) {
-        //           ele.value = parseFloat(ele.value).toFixed(4);
-        //         }
-        //       });
-        //       that.tableData.data = res.data.records || [];
-        //     } else {
-        //       // that.BASE.showMsg({
-        //       //   type: "warning",
-        //       //   msg: "所选日期区间之内暂无数据，请重试",
-        //       // });
-        //     }
-        //     that.showDialog = true;
-        //   },
-        // });
-      }
-    },
-  },
-};
-</script>
-
-<style lang="less" scope>
-@titleGray: #9ca5a8;
-@rowGray: #606769;
-@darkBack: #536268;
-.knowledge-2 {
-  .el-select {
-    width: 200px;
-  }
-  .el-input {
-    width: 200px;
-  }
-}
-</style>

src/views/allLifeManage/tab2.vue

@@ -1,428 +0,0 @@
-<template>
-  <div class="draught-fan-list">
-    <div class="query mg-b-8">
-      <div class="query-items">
-        <div class="query-item">
-          <div class="lable">风场：</div>
-          <div class="search-input">
-            <el-select
-              v-model="wpId"
-              clearable
-              placeholder="请选择"
-              popper-class="select"
-              @change="getWtArray"
-            >
-              <el-option
-                v-for="item in wpArray"
-                :key="item.id"
-                :value="item.id"
-                :label="item.name"
-              />
-            </el-select>
-          </div>
-        </div>
-        <div class="query-item">
-          <div class="lable">风机：</div>
-          <div class="search-input">
-            <el-select
-              v-model="wtId"
-              clearable
-              placeholder="请选择"
-              popper-class="select"
-            >
-              <el-option
-                v-for="item in wtArray"
-                :key="item.id"
-                :value="item.id"
-                :label="item.name"
-              />
-            </el-select>
-          </div>
-        </div>
-      </div>
-      <div class="query-actions">
-        <button class="btn green" @click="search()">查询</button>
-      </div>
-    </div>
-    <div class="df-table">
-      <ComTable height="78vh" :data="tableData"></ComTable>
-    </div>
-  </div>
-</template>
-
-<script>
-import ComTable from "@com/coms/table/table.vue";
-import api from "@api/wisdomOverhaul/lifecycle/index.js";
-import api1 from "@api/economic/index.js";
-export default {
-  // 名称
-  name: "cutAnalyse",
-
-  // 使用组件
-  components: {
-    ComTable,
-  },
-
-  // 数据
-  data() {
-    const that = this;
-    return {
-      wpArray: [],
-      wpId: "",
-      wtArray: [],
-      wtId: "",
-      tableData: {
-        column: [
-          // {
-          //   name: "风机编号",
-          //   field: "wtnum",
-          //   is_num: false,
-          //   is_light: false,
-          //   sortable: true
-          // },
-          // {
-          //   name: "所属风电场",
-          //   field: "ownerwf",
-          //   is_num: false,
-          //   is_light: false,
-          //   sortable: true
-          // },
-          // {
-          //   name: "所属工程",
-          //   field: "ownerproject",
-          //   is_num: false,
-          //   is_light: false,
-          //   sortable: true
-          // },
-          // {
-          //   name: "所属线路",
-          //   field: "ownerline",
-          //   is_num: false,
-          //   is_light: false,
-          //   sortable: true
-          // },
-          // {
-          //   name: "编号",
-          //   field: "wtwfnum",
-          //   is_num: false,
-          //   is_light: false,
-          //   sortable: true
-          // },
-          // {
-          //   name: "编号",
-          //   field: "wtgridnum",
-          //   is_num: false,
-          //   is_light: false,
-          //   sortable: true
-          // },
-          {
-            name: "供应商",
-            field: "vendor",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-          },
-          {
-            name: "型号",
-            field: "model",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-          },
-          {
-            name: "额定功率",
-            field: "ratedpower",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-          },
-          {
-            name: "额定风速",
-            field: "ratedwinspe",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-          },
-          {
-            name: "额定电压",
-            field: "ratedvoltage",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-          },
-          {
-            name: "额定转速",
-            field: "ratedrev",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-          },
-          {
-            name: "切入风速",
-            field: "cutinwinspe",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-          },
-          {
-            name: "切出风速",
-            field: "cutoutwinspe",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-          },
-          {
-            name: "生存风速",
-            field: "maxwinspe",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-          },
-          // {
-          //   name: "最低温度",
-          //   field: "lowertemp",
-          //   is_num: false,
-          //   is_light: false,
-          //   sortable: true
-          // },
-          // {
-          //   name: "最高温度",
-          //   field: "hightemp",
-          //   is_num: false,
-          //   is_light: false,
-          //   sortable: true
-          // },
-          // {
-          //   name: "最低转速",
-          //   field: "lowerrev",
-          //   is_num: false,
-          //   is_light: false,
-          //   sortable: true
-          // },
-          // {
-          //   name: "最高转速",
-          //   field: "highrev",
-          //   is_num: false,
-          //   is_light: false,
-          //   sortable: true
-          // },
-          // {
-          //   name: "风轮直径",
-          //   field: "roterdiameter",
-          //   is_num: false,
-          //   is_light: false,
-          // },
-          // {
-          //   name: "月大风切入合格率",
-          //   field: "monthinputbigratio",
-          //   is_num: false,
-          //   is_light: false,
-          //   sortable: true
-          // },
-          // {
-          //   name: "轮毂高度",
-          //   field: "hubheight",
-          //   is_num: false,
-          //   is_light: false,
-          //   sortable: true
-          // },
-          // {
-          //   name: "出厂日期",
-          //   field: "releasedate",
-          //   is_num: false,
-          //   is_light: false,
-          //   sortable: true
-          // },
-          {
-            name: "吊装日期",
-            field: "installdate",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-          },
-          // {
-          //   name: "调试日期",
-          //   field: "testdate",
-          //   is_num: false,
-          //   is_light: false,
-          //   sortable: true
-          // },
-          // {
-          //   name: "投运日期",
-          //   field: "opdate",
-          //   is_num: false,
-          //   is_light: false,
-          //   sortable: true
-          // },
-          // {
-          //   name: "位置",
-          //   field: "location",
-          //   is_num: false,
-          //   is_light: false,
-          //   sortable: true
-          // },
-          {
-            name: "风机位置",
-            field: "wflocation",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-          },
-          {
-            name: "风机ID",
-            field: "wtid",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-          },
-        ],
-        data: [],
-      },
-    };
-  },
-
-  // 函数
-  methods: {
-    // 获取风场
-    getWpArray() {
-      api1.benchmarkingWplist({}).then((res) => {
-        this.wpArray = res.data;
-        this.wpId = this.wpId || res.data[0].id;
-        this.getWtArray(this.wpId, true);
-      });
-    },
-
-    // 获取风机
-    getWtArray(wpId, keepRequest) {
-      let that = this;
-      if (wpId) {
-        api1
-          .powercompareWindturbineAjax({
-            wpId: wpId,
-          })
-          .then((res) => {
-            this.wtArray = res.data;
-            const findRes = res.data.some((ele) => {
-              return ele.id === this.wtId;
-            });
-            this.wtId = findRes ? this.wtId : res.data[0].id;
-            this.getTableData();
-          });
-      } else {
-        that.wtArray = [];
-        that.wtId = "";
-      }
-    },
-
-    getTableData() {
-      // let that = this;
-      if (!this.wpId) {
-        this.BASE.showMsg({
-          msg: "场站与日期不可为空",
-        });
-      } else {
-        api
-          .windturbineList({
-            wtid: this.wtId,
-          })
-          .then((res) => {
-            if(res.data)
-            res.data.forEach((ele) => {
-              ele.installdate = new Date(ele.installdate).formatDate(
-                "yyyy-MM-dd hh:mm:ss"
-              );
-              ele.opdate = new Date(ele.opdate).formatDate(
-                "yyyy-MM-dd hh:mm:ss"
-              );
-              ele.releasedate = new Date(ele.releasedate).formatDate(
-                "yyyy-MM-dd hh:mm:ss"
-              );
-              ele.testdate = new Date(ele.testdate).formatDate(
-                "yyyy-MM-dd hh:mm:ss"
-              );
-            });
-            this.tableData.data = res.data;
-          });
-
-        // that.API.requestData({
-        //   method: "GET",
-        //   baseURL: "http://192.168.1.18:9988/",
-        //   subUrl: "windturbine/list",
-        //   data: {
-        //     wtid: that.wtId,
-        //   },
-        //   success(res) {
-        //     res.data.forEach((ele) => {
-        //       ele.installdate = new Date(ele.installdate).formatDate(
-        //         "yyyy-MM-dd hh:mm:ss"
-        //       );
-        //       ele.opdate = new Date(ele.opdate).formatDate(
-        //         "yyyy-MM-dd hh:mm:ss"
-        //       );
-        //       ele.releasedate = new Date(ele.releasedate).formatDate(
-        //         "yyyy-MM-dd hh:mm:ss"
-        //       );
-        //       ele.testdate = new Date(ele.testdate).formatDate(
-        //         "yyyy-MM-dd hh:mm:ss"
-        //       );
-        //     });
-        //     that.tableData.data = res.data;
-        //   },
-        // });
-      }
-    },
-
-    search() {
-      this.getTableData();
-    },
-  },
-
-  created() {
-    this.getWpArray();
-  },
-
-  mounted() {},
-
-  unmounted() {},
-};
-</script>
-
-<style lang="less" scoped>
-.draught-fan-list {
-  width: 100%;
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-
-  .btn-group-tabs {
-    display: flex;
-    flex-direction: row;
-
-    .photovoltaic {
-      margin-left: 1.481vh;
-    }
-  }
-
-  .df-table {
-    border: 0.093vh solid fade(@darkgray, 50%);
-    position: relative;
-    overflow: auto;
-    flex-grow: 1;
-    margin-top: 1.481vh;
-
-    &:before {
-      content: "";
-      width: 0.37vh;
-      height: 0.37vh;
-      background: @write;
-      position: absolute;
-      left: 0.278vh;
-      top: 0.278vh;
-    }
-
-    tbody {
-      height: calc(100vh - 166px);
-    }
-  }
-}
-</style>

src/views/allLifeManage/tab3.vue

@@ -1,357 +0,0 @@
-<template>
-  <div class="draught-fan-list">
-    <div class="query mg-b-8">
-      <div class="query-items">
-        <div class="query-item">
-          <div class="lable">风场：</div>
-          <div class="search-input">
-            <el-select
-              v-model="wpId"
-              clearable
-              placeholder="请选择"
-              popper-class="select"
-              @change="getWtArray"
-            >
-              <el-option
-                v-for="item in wpArray"
-                :key="item.id"
-                :value="item.id"
-                :label="item.name"
-              />
-            </el-select>
-          </div>
-        </div>
-        <div class="query-item">
-          <div class="lable">风机：</div>
-          <div class="search-input">
-            <el-select
-              v-model="wtId"
-              clearable
-              placeholder="请选择"
-              popper-class="select"
-            >
-              <el-option
-                v-for="item in wtArray"
-                :key="item.id"
-                :value="item.id"
-                :label="item.name"
-              />
-            </el-select>
-          </div>
-        </div>
-        <div class="query-item">
-          <div class="lable">开始日期：</div>
-          <div class="search-input">
-            <el-date-picker
-              v-model="starttime"
-              type="date"
-              value-format="YYYY-MM-DD"
-              placeholder="选择日期"
-              popper-class="date-select"
-            >
-            </el-date-picker>
-          </div>
-        </div>
-        <div class="query-item">
-          <div class="lable">结束日期：</div>
-          <div class="search-input">
-            <el-date-picker
-              v-model="endtime"
-              type="date"
-              value-format="YYYY-MM-DD"
-              placeholder="选择日期"
-              popper-class="date-select"
-            >
-            </el-date-picker>
-          </div>
-        </div>
-        <div class="query-item">
-          <div class="lable">类型：</div>
-          <div class="search-input">
-            <el-select
-              v-model="type"
-              clearable
-              placeholder="请选择"
-              popper-class="select"
-            >
-              <el-option
-                v-for="item in typeArray"
-                :key="item.id"
-                :value="item.id"
-                :label="item.name"
-              />
-            </el-select>
-          </div>
-        </div>
-      </div>
-      <div class="query-actions">
-        <button class="btn green" @click="search()">查询</button>
-      </div>
-    </div>
-    <div class="df-table">
-      <ComTable height="78vh" :data="tableData"></ComTable>
-    </div>
-  </div>
-</template>
-
-<script>
-import ComTable from "@com/coms/table/table.vue";
-import api from "@api/wisdomOverhaul/lifecycle/index.js";
-import api1 from "@api/economic/index.js";
-export default {
-  // 名称
-  name: "cutAnalyse",
-
-  // 使用组件
-  components: {
-    ComTable,
-  },
-
-  // 数据
-  data() {
-    const that = this;
-    return {
-      wpArray: [],
-      wpId: "",
-      wtArray: [],
-      wtId: "",
-      type: "异动",
-      typeArray: [
-        {
-          id: "检修",
-          label: "检修",
-          value: "检修",
-        },
-        {
-          id: "异动",
-          label: "异动",
-          value: "异动",
-        },
-        {
-          id: "故障",
-          label: "故障",
-          value: "故障",
-        },
-      ],
-      starttime: new Date().formatDate("yyyy-MM") + "-01",
-      endtime: new Date().formatDate("yyyy-MM-dd"),
-      tableData: {
-        column: [
-          {
-            name: "检修负责人",
-            field: "leader",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-          },
-          {
-            name: "检修类型",
-            field: "type",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-          },
-          {
-            name: "风机编号",
-            field: "wtnum",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-          },
-          {
-            name: "开始时间",
-            field: "starttime",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-          },
-          {
-            name: "结束时间",
-            field: "endtime",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-          },
-          {
-            name: "检修原因",
-            field: "problem",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-          },
-          {
-            name: "检修方式",
-            field: "solveway",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-          },
-          {
-            name: "设备唯一编号",
-            field: "eqnum",
-            is_num: false,
-            is_light: false,
-            sortable: true,
-          },
-        ],
-        data: [],
-      },
-    };
-  },
-
-  // 函数
-  methods: {
-    // 获取风场
-
-    getWpArray() {
-      api1.benchmarkingWplist({}).then((res) => {
-        this.wpArray = res.data;
-        this.wpId = this.wpId || res.data[0].id;
-        this.getWtArray(this.wpId, true);
-      });
-    },
-    // getWpArray() {
-    //   // let that = this;
-    //   // that.API.requestData({
-    //   //   method: "GET",
-    //   //   subUrl: "powercompare/windfarmAjax",
-    //   //   success (res) {
-    //   //     that.wpArray = res.data;
-    //   //     that.wpId = that.wpId || res.data[0].id;
-    //   //     that.getWtArray(that.wpId, true);
-    //   //   }
-    //   // });
-    // },
-
-    // 获取风机
-    getWtArray(wpId, keepRequest) {
-      let that = this;
-      if (wpId) {
-        api1
-          .powercompareWindturbineAjax({
-            wpId: wpId,
-          })
-          .then((res) => {
-            this.wtArray = res.data;
-            const findRes = res.data.some((ele) => {
-              return ele.id === this.wtId;
-            });
-            this.wtId = findRes ? this.wtId : res.data[0].id;
-            this.getTableData();
-          });
-
-        // that.API.requestData({
-        //   method: "GET",
-        //   subUrl: "powercompare/windturbineAjax",
-        //   data: {
-        //     wpId,
-        //   },
-        //   success(res) {
-        //     that.wtArray = res.data;
-        //     const findRes = res.data.some((ele) => {
-        //       return ele.id === that.wtId;
-        //     });
-        //     that.wtId = findRes ? that.wtId : res.data[0].id;
-        //     that.getTableData();
-        //   },
-        // });
-      } else {
-        that.wtArray = [];
-        that.wtId = "";
-      }
-    },
-
-    getTableData() {
-      let that = this;
-      if (!that.wpId || !that.starttime || !that.endtime) {
-        that.BASE.showMsg({
-          msg: "场站与日期不可为空",
-        });
-      } else {
-        api
-          .equoperationrecordList({
-            wtid: this.wtId,
-            starttime: this.starttime,
-            endtime: this.endtime,
-            type: this.type,
-            pagenum: 1,
-            pagesize: 50000,
-          })
-          .then((res) => {
-            if(res.data)
-            this.tableData.data = res.data.records;
-          });
-
-        // that.API.requestData({
-        //   method: "GET",
-        //   baseURL: "http://192.168.1.18:9988/",
-        //   subUrl: "equoperationrecord/list",
-        //   data: {
-        //     wtid: that.wtId,
-        //     starttime: that.starttime,
-        //     endtime: that.endtime,
-        //     type: that.type,
-        //     pagenum: 1,
-        //     pagesize: 50000,
-        //   },
-        //   success(res) {
-        //     that.tableData.data = res.data.records;
-        //   },
-        // });
-      }
-    },
-
-    search() {
-      this.getTableData();
-    },
-  },
-
-  created() {
-    this.getWpArray();
-  },
-
-  mounted() {},
-
-  unmounted() {},
-};
-</script>
-
-<style lang="less" scoped>
-.draught-fan-list {
-  width: 100%;
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-
-  .btn-group-tabs {
-    display: flex;
-    flex-direction: row;
-
-    .photovoltaic {
-      margin-left: 1.481vh;
-    }
-  }
-
-  .df-table {
-    border: 0.093vh solid fade(@darkgray, 50%);
-    position: relative;
-    overflow: auto;
-    flex-grow: 1;
-    margin-top: 1.481vh;
-
-    &:before {
-      content: "";
-      width: 0.37vh;
-      height: 0.37vh;
-      background: @write;
-      position: absolute;
-      left: 0.278vh;
-      top: 0.278vh;
-    }
-
-    tbody {
-      height: calc(100vh - 166px);
-    }
-  }
-}
-</style>

src/views/cutAnalyse/index.vue

@@ -1,549 +0,0 @@
-<template>
-  <div class="draught-fan-list">
-    <div class="query mg-b-8">
-      <div class="query-items">
-        <div class="query-item">
-          <div class="lable">场站：</div>
-          <div class="search-input">
-            <el-select v-model="wpId" clearable placeholder="请选择" popper-class="select">
-              <el-option v-for="item in wpArray" :key="item.id" :value="item.id" :label="item.name" />
-            </el-select>
-          </div>
-        </div>
-        <div class="query-item">
-          <div class="lable">日期：</div>
-          <div class="search-input">
-            <el-date-picker v-model="recorddate" type="date" value-format="YYYY-MM-DD" placeholder="选择日期" popper-class="date-select">
-            </el-date-picker>
-          </div>
-        </div>
-      </div>
-      <div class="query-actions">
-        <button class="btn green" @click="search()">查询</button>
-      </div>
-    </div>
-    <div class="df-table">
-      <ComTable height="78vh" :data="tableData"></ComTable>
-    </div>
-    <el-dialog title="切入切出风速整合历史" v-model="dialogShow" width="85%" top="10vh" custom-class="modal"
-      :close-on-click-modal="true" @closed="dialogType = ''">
-      <ComTable height="100vh" :data="tableHistoryData"></ComTable>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import ComTable from "@com/coms/table/table.vue";
-export default {
-  // 名称
-  name: "cutAnalyse",
-
-  // 使用组件
-  components: {
-    ComTable
-  },
-
-  // 数据
-  data () {
-    const that = this;
-    return {
-      isAsc: "asc",
-      wpArray: [],
-      wpId: "",
-      recorddate: new Date((new Date().getTime() - 3600 * 1000 * 24)).formatDate("yyyy-MM-dd"),
-      dialogShow: false,
-      tableData: {
-        column: [
-          {
-            name: "风机",
-            field: "windturbineid",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "总小风切入",
-            field: "inputsmall",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "总小风切入合格率",
-            field: "inputsmallratio",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "总大风切入",
-            field: "inputbig",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "总大风切入合格率",
-            field: "inputbigratio",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "总小风切出",
-            field: "outputsmall",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "总小风切出合格率",
-            field: "outputsmallratio",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "总大风切出",
-            field: "outputbig",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "总大风切出合格率",
-            field: "outputbigmaxratio",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "日小风切入",
-            field: "dayinputsmall",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "日小风切入合格率",
-            field: "dayinputsmallratio",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "日小风切出",
-            field: "dayoutputsmall",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "日小风切出合格率",
-            field: "dayoutputsmallratio",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "日大风切入",
-            field: "dayinputbig",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "日大风切入合格率",
-            field: "dayinputbigratio",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "日大风切出",
-            field: "dayoutputbig",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "日大风切出合格率",
-            field: "dayoutputbigratio",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "月小风切入",
-            field: "monthinputsmall",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "月小风切入合格率",
-            field: "monthinputsmallratio",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "月大风切入",
-            field: "monthinputbig",
-            is_num: false,
-            is_light: false,
-          },
-          {
-            name: "月大风切入合格率",
-            field: "monthinputbigratio",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "月小风切出",
-            field: "monthoutputsmall",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "月小风切出合格率",
-            field: "monthoutputsmallratio",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "月大风切出",
-            field: "monthoutputbig",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "月大风切出合格率",
-            field: "monthoutputbigratio",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "年小风切入",
-            field: "yearinputsmall",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "年小风切入合格率",
-            field: "yearinputsmallratio",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "年大风切入",
-            field: "yearinputbig",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "年大风切入合格率",
-            field: "yearinputbigratio",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "年小风切出",
-            field: "yearoutputsmall",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "年小风切出合格率",
-            field: "yearoutputsmallratio",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "年大风切出",
-            field: "yearoutputbig",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "年大风切出合格率",
-            field: "yearoutputbigratio",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "操作",
-            field: "",
-            is_num: false,
-            is_light: false,
-            template () {
-              return "<el-button type='text' style='cursor: pointer;'>历史</el-button>";
-            },
-            click (e, row) {
-              that.getOutputspeedHistoryList(row)
-            }
-          }
-        ],
-        data: [],
-      },
-      tableHistoryData: {
-        column: [
-          {
-            name: "风机",
-            field: "windturbineid",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "日期",
-            field: "time",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "总小风切入",
-            field: "inputsmall",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "总大风切入",
-            field: "inputbig",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "总小风切出",
-            field: "outputsmall",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "总大风切出",
-            field: "outputbig",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "日小风切入",
-            field: "dayinputsmall",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "日小风切出",
-            field: "dayoutputsmall",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "日大风切入",
-            field: "dayinputbig",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "日大风切出",
-            field: "dayoutputbig",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "月小风切入",
-            field: "monthinputsmall",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "月大风切入",
-            field: "monthinputbig",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "月小风切出",
-            field: "monthoutputsmall",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "月大风切出",
-            field: "monthoutputbig",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "年小风切入",
-            field: "yearinputsmall",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "年大风切入",
-            field: "yearinputbig",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "年小风切出",
-            field: "yearoutputsmall",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          },
-          {
-            name: "年大风切出",
-            field: "yearoutputbig",
-            is_num: false,
-            is_light: false,
-            sortable: true
-          }
-        ],
-        data: [],
-      },
-    };
-  },
-
-  // 函数
-  methods: {
-    // 请求服务
-    requestData () {
-      let that = this;
-      that.API.requestData({
-        method: "GET",
-        subUrl: "powercompare/windfarmAjax",
-        success (res) {
-          that.wpArray = res.data;
-          that.wpId = res.data[0].id;
-          that.getOutputSpeedList(that.wpId)
-        }
-      });
-    },
-
-    getOutputSpeedList (wpId) {
-      let that = this;
-      if (!that.wpId || !that.recorddate) {
-        that.BASE.showMsg({
-          msg: "场站与日期不可为空"
-        });
-      } else {
-        that.API.requestData({
-          method: "POST",
-          subUrl: "outputspeed/outputSpeedlist",
-          data: {
-            wpId,
-            isAsc: that.isAsc,
-            recorddate: that.recorddate
-          },
-          success (res) {
-            that.tableData.data = res.data;
-          }
-        });
-      }
-
-    },
-
-    getOutputspeedHistoryList (item) {
-      let that = this;
-      that.API.requestData({
-        method: "POST",
-        subUrl: "outputspeed/outputspeedhistorylist",
-        data: {
-          wpId: item.windpowerstationid,
-          wtId: item.windturbineid,
-          beginDate: (new Date().formatDate("yyyy-MM") + '-01'),
-          endDate: new Date().formatDate("yyyy-MM-dd")
-        },
-        success (res) {
-          res.data.forEach(ele => {
-            ele.time = new Date(ele.recorddate).formatDate("yyyy-MM-dd");
-          });
-          that.tableHistoryData.data = res.data;
-          that.dialogShow = true;
-        }
-      });
-    },
-
-    search () {
-      this.getOutputSpeedList(this.wpId);
-    }
-  },
-
-  created () {
-    this.requestData();
-  },
-
-  mounted () { },
-
-  unmounted () { },
-};
-</script>
-
-<style lang="less" scoped>
-.draught-fan-list {
-  width: 100%;
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-
-  .btn-group-tabs {
-    display: flex;
-    flex-direction: row;
-
-    .photovoltaic {
-      margin-left: 1.481vh;
-    }
-  }
-
-  .df-table {
-    border: 0.093vh solid fade(@darkgray, 50%);
-    position: relative;
-    overflow: auto;
-    flex-grow: 1;
-    margin-top: 1.481vh;
-
-    &:before {
-      content: '';
-      width: 0.37vh;
-      height: 0.37vh;
-      background: @write;
-      position: absolute;
-      left: 0.278vh;
-      top: 0.278vh;
-    }
-
-    tbody {
-      height: calc(100vh - 166px);
-    }
-  }
-}
-</style>

src/views/stateMonitor/alarmCenter/commonAlarm/index.vue

@@ -129,15 +129,21 @@
           stripe
         >
           <el-table-column
-            v-for="(item, index) in alarmType == 'windturbine'
-              ? tableHeader
-              : tableHeader1"
+            v-for="(item, index) in tableHeader"
             :key="index"
             sortable
             :prop="item.code"
             :label="item.title"
             align="center"
+            :width="item.width"
           >
+            <template #default="{ row }">
+              <span v-if="item.code == 'rank'">{{ getRank(row.rank) }}</span>
+              <span v-else-if="item.code == 'endts'">{{
+                row.endts ? "解除" : "未解除"
+              }}</span>
+              <span v-else>{{ row[item.code] }}</span>
+            </template>
           </el-table-column>
         </el-table>
         <el-pagination
@@ -187,11 +193,13 @@ export default {
       alarmData: [],
       loading: false,
       tableHeader: [
-        { title: "时间", code: "ts" },
-        { title: "场站名称", code: "stationname" },
-        { title: "设备名称", code: "devicename" },
-        { title: "报警描述显示", code: "description" },
-        { title: "是否确认", code: "confirmed" },
+        { title: "时间", code: "ts", width: "220" },
+        { title: "场站名称", code: "stationname", width: "220"  },
+        { title: "设备名称", code: "devicename", width: "200"  },
+        { title: "报警描述", code: "description" },
+        { title: "级别", code: "rank", width: "180" },
+        { title: "是否确认", code: "confirmed", width: "180" },
+        { title: "是否解除", code: "endts", width: "180" },
       ],
       tableHeader1: [
         { title: "时间", code: "ts" },
@@ -199,7 +207,7 @@ export default {
         { title: "是否确认", code: "confirmed" },
       ],
       page: {
-        pagesize: 20,
+        pagesize: 22,
         currentPage: 1,
         total: 0,
       },
@@ -209,6 +217,19 @@ export default {
     this.GetWpOptions();
   },
   methods: {
+    getRank(rank) {
+      if (rank === 1) {
+        return "低级";
+      } else if (rank === 2) {
+        return "低中级";
+      } else if (rank === 3) {
+        return "中级";
+      } else if (rank === 4) {
+        return "中高级";
+      } else if (rank === 5) {
+        return "高级";
+      }
+    },
     GetWpOptions() {
       getWpList({ type: 0 }).then(({ data }) => {
         if (data && data.data.length) {
@@ -367,7 +388,6 @@ export default {
       align-items: center;
       justify-content: space-between;
       width: 100%;
-      margin-bottom: 5px;
       .left-content {
         width: 242px;
         height: 41px;

src/views/stateMonitor/factoryMonitor/components/saliderBar.vue

@@ -22,7 +22,6 @@
           <span class="alarm-icon svg-icon svg-icon-red" @click="handler">
             <SvgIcon svgid="svg-alarm"></SvgIcon>
           </span>
-          <!-- <span>{{ alarmLength }}</span> -->
         </el-tooltip>
 
         <router-link :to="item.path">

src/views/stateMonitor/factoryMonitor/photovoltaic/lightBoosterStation/index.vue

@@ -64,7 +64,7 @@
     v-model="drawer"
     :title="title + '报警列表'"
     direction="rtl"
-    size="45%"
+    size="55%"
     :before-close="handleClose"
   >
     <div class="drawer-form">
@@ -73,6 +73,7 @@
         <el-date-picker
           v-model="begin"
           type="datetime"
+          :disabled-date="disabledDate"
           value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="选择日期"
           size="mini"
@@ -85,6 +86,7 @@
         <el-date-picker
           v-model="end"
           type="datetime"
+          :disabled-date="disabledDate2"
           value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="选择日期"
           size="mini"
@@ -101,23 +103,22 @@
     <div class="table-wrapper">
       <el-table height="100%" :data="drawerList">
         <el-table-column
-          property="ts"
-          label="时间"
-          width="200"
+          v-for="(item, index) in tableHeader"
+          :key="index"
+          sortable
+          :prop="item.code"
+          :label="item.title"
           align="center"
-        />
-        <el-table-column
-          property="description"
-          label="描述"
-          show-overflow-tooltip
-          align="center"
-        />
-        <el-table-column
-          property="confirmed"
-          label="是否确认"
-          width="120"
-          align="center"
-        />
+          :width="item.width"
+        >
+          <template #default="{ row }">
+            <span v-if="item.code == 'rank'">{{ getRank(row.rank) }}</span>
+            <span v-else-if="item.code == 'endts'">{{
+              row.endts ? "解除" : "未解除"
+            }}</span>
+            <span v-else>{{ row[item.code] }}</span>
+          </template>
+        </el-table-column>
       </el-table>
       <el-pagination
         style="display: flex; justify-content: flex-end; align-items: center"
@@ -173,6 +174,14 @@ export default {
       begin: "",
       end: "",
       page: { currentPage: 1, pagesize: 22, total: 0 },
+      tableHeader: [
+        { title: "时间", code: "ts", width: "160" },
+        { title: "场站名称", code: "stationname", width: "150" },
+        { title: "报警描述", code: "description" },
+        { title: "级别", code: "rank", width: "110" },
+        { title: "是否确认", code: "confirmed", width: "110" },
+        { title: "是否解除", code: "endts", width: "110" },
+      ],
     };
   },
   watch: {
@@ -184,6 +193,35 @@ export default {
     },
   },
   methods: {
+    // 时间选择器第一个禁用
+    disabledDate(time) {
+      if (this.end) {
+        return time.getTime() > Date.parse(this.end);
+      } else {
+        return null;
+      }
+    },
+    // 时间选择器第二个禁用
+    disabledDate2(time) {
+      if (this.begin) {
+        return time.getTime() < Date.parse(this.begin);
+      } else {
+        return null;
+      }
+    },
+    getRank(rank) {
+      if (rank === 1) {
+        return "低级";
+      } else if (rank === 2) {
+        return "低中级";
+      } else if (rank === 3) {
+        return "中级";
+      } else if (rank === 4) {
+        return "中高级";
+      } else if (rank === 5) {
+        return "高级";
+      }
+    },
     renderData(company, wpId) {
       this.wpId = wpId;
     },

src/views/stateMonitor/factoryMonitor/windPowerPlant/boosterStation/index.vue

@@ -38,12 +38,13 @@
     <!-- 米粮局Vue组件-2022-10-24 16_45_46 -->
     <MLJ class="booster-station-body" v-if="wpId === 'NMM_KGDL_MLJ_FDC_STA'" />
   </div>
+  <!-- <sbsAlarm /> -->
   <el-drawer
     class="custom-drawer"
     v-model="drawer"
     :title="title + '报警列表'"
     direction="rtl"
-    size="45%"
+    size="55%"
     :before-close="handleClose"
   >
     <div class="drawer-form">
@@ -53,6 +54,7 @@
           v-model="begin"
           type="datetime"
           value-format="YYYY-MM-DD HH:mm:ss"
+          :disabled-date="disabledDate"
           placeholder="选择日期"
           size="mini"
           popper-class="date-select"
@@ -64,6 +66,7 @@
         <el-date-picker
           v-model="end"
           type="datetime"
+          :disabled-date="disabledDate2"
           value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="选择日期"
           size="mini"
@@ -80,23 +83,22 @@
     <div class="table-wrapper">
       <el-table height="100%" :data="drawerList">
         <el-table-column
-          property="ts"
-          label="时间"
-          width="200"
+          v-for="(item, index) in tableHeader"
+          :key="index"
+          sortable
+          :prop="item.code"
+          :label="item.title"
           align="center"
-        />
-        <el-table-column
-          property="description"
-          label="描述"
-          show-overflow-tooltip
-          align="center"
-        />
-        <el-table-column
-          property="confirmed"
-          label="是否确认"
-          width="120"
-          align="center"
-        />
+          :width="item.width"
+        >
+          <template #default="{ row }">
+            <span v-if="item.code == 'rank'">{{ getRank(row.rank) }}</span>
+            <span v-else-if="item.code == 'endts'">{{
+              row.endts ? "解除" : "未解除"
+            }}</span>
+            <span v-else>{{ row[item.code] }}</span>
+          </template>
+        </el-table-column>
       </el-table>
       <el-pagination
         style="display: flex; justify-content: flex-end; align-items: center"
@@ -112,6 +114,7 @@
 </template>
 <script>
 import headerButton from "../../components/headerButton.vue";
+// import sbsAlarm from "@/components/sbsAlarm/index.vue";
 import { ElMessageBox } from "element-plus";
 // 风场
 import GJY from "./components/GJY.vue";
@@ -134,6 +137,7 @@ export default {
   name: "boosterStation",
   components: {
     headerButton,
+    // sbsAlarm,
     GJY,
     BHB,
     BHBSQ,
@@ -161,6 +165,14 @@ export default {
       begin: "",
       end: "",
       page: { currentPage: 1, pagesize: 22, total: 0 },
+      tableHeader: [
+        { title: "时间", code: "ts", width: "160" },
+        { title: "场站名称", code: "stationname", width: "150" },
+        { title: "报警描述", code: "description" },
+        { title: "级别", code: "rank", width: "110" },
+        { title: "是否确认", code: "confirmed", width: "110" },
+        { title: "是否解除", code: "endts", width: "110" },
+      ],
     };
   },
   watch: {
@@ -172,6 +184,35 @@ export default {
     },
   },
   methods: {
+    // 时间选择器第一个禁用
+    disabledDate(time) {
+      if (this.end) {
+        return time.getTime() > Date.parse(this.end);
+      } else {
+        return null;
+      }
+    },
+    // 时间选择器第二个禁用
+    disabledDate2(time) {
+      if (this.begin) {
+        return time.getTime() < Date.parse(this.begin);
+      } else {
+        return null;
+      }
+    },
+    getRank(rank) {
+      if (rank === 1) {
+        return "低级";
+      } else if (rank === 2) {
+        return "低中级";
+      } else if (rank === 3) {
+        return "中级";
+      } else if (rank === 4) {
+        return "中高级";
+      } else if (rank === 5) {
+        return "高级";
+      }
+    },
     renderData(company, wpId) {
       this.wpId = wpId;
     },
@@ -183,8 +224,6 @@ export default {
         .startOf("day")
         .format("YYYY-MM-DD HH:mm:ss");
       this.end = dayjs().format("YYYY-MM-DD HH:mm:ss");
-      //   this.drawer = true;
-      //   console.log(id);
       this.getAlarm();
     },
     getAlarm() {
@@ -211,6 +250,14 @@ export default {
           this.drawerList = [];
           this.page.total = 0;
         }
+        // this.drawerList = [
+        //   {
+        //     ts: "2020-09-03 11:55:55",
+        //     stationname: "高家堰鹰嵩",
+        //     rank: 1,
+        //     confirmed: true,
+        //   },
+        // ];
         if (!this.drawer) {
           this.$store.commit("changeBoosterAlarm", data.total);
         }