内容提交

longyvfengyun

2023-03-13 aa9577229eeb0dad4c70519d059d2ee09764ac4c

内容提交

 public/theme/science-green.css

@@ -417,6 +417,7 @@
  tr.el-table__row--striped
  td {
  background-color: #153953;
  color: #FFFFFF;
}

.el-science-blue

 src/components/bigScreenPage/big_screen_page.vue

@@ -138,8 +138,11 @@
import PieList from "@/components/myCharts/PieList.vue";
import AcInfoBox from "@/components/bigScreenPage/acInfoBox.vue";
import MonWarnBar from "@/components/myCharts/monWarnBar.vue";
import createWs from "@/assets/js/websocket";
const WSMixin = createWs("screen");
export default {
  name: "big_screen_page",
  mixins: [WSMixin],
  components: {
    MonWarnBar,
    AcInfoBox,
@@ -167,7 +170,14 @@
    },
    mapHandleClick(data) {
      console.log(data);
    },
    onWSMessage(res) {
      let rs = JSON.parse(res.data);
      console.log(rs);
    }
  },
  mounted() {

  }
}
</script>
@@ -224,7 +234,7 @@
  height: 100%;
}
.big-screen-middle {
  width: 880px;
  width: 960px;
  padding: 8px;
}
.big-screen-middle-container {
@@ -285,7 +295,7 @@
}
.mon-info-box {
  display: inline-block;
  margin-left: 20px;
  margin-left: 8px;
  width: 139px;
  height: 90px;
  background-image: url("./images/mon_info_box1.png");

 src/components/myCharts/MapChart.vue

@@ -23,27 +23,55 @@
      let data = [
        {
          name: "节",
          value: 100,
          color: "#0081FF",
          fontColor: "#FFFFFF",
          points: [121.4648,31.2891],
          label: "测试机房1",
          value: 8,
          color: "#7668F9",
          points: [118.8062, 31.9208]
        },
        {
          name: "",
          value: 50,
          color: "#FF6B6C",
          fontColor: "#FFFFFF",
          points: [117.7831, 40.0204]
          label: "测试机房2",
          value: 100,
          color: "#0081FF",
          points: [127.9688, 45.368],
        },
        {
          name: "",
          label: "测试机房3",
          value: 100,
          color: "#0081FF",
          points: [110.3467, 41.4899],
        },
        {
          name: "节",
          label: "测试机房4",
          value: 50,
          color: "#FF6B6C",
          points: [125.8154, 44.2584]
        },
        {
          name: "",
          value: 8,
          label: "测试机房6",
          color: "#7668F9",
          points: [116.4551, 40.2539]
        },
        {
          name: "节",
          label: "测试机房7",
          value: 8,
          color: "#66F842",
          fontColor: "#000000",
          points: [117.3065, 39.0887]
          points: [123.1238, 42.1216]
        },
        {
          name: "节",
          label: "测试机房8",
          value: 100,
          color: "#0081FF",
          points: [114.4995, 38.1006],
        },
      ];
      //data = list;
      data = list;
      let geoJson = require(`../../../public/mapJson/${mapName}.json`);
      echarts.registerMap(mapName, geoJson);

@@ -52,7 +80,7 @@
      areaList.forEach((v) => {
        data0.push({
          name: v.properties.name,
          value: Math.floor(Math.random() * 3) * 50
          value: Math.floor(Math.random() * 2) * 100
        });
      });

@@ -65,6 +93,7 @@
            color: item.color,
            fontColor: item.fontColor,
            value: item.points.concat(data[i].value),
            label: item.label?item.label:"",
            data: item
          });
        }
@@ -73,6 +102,10 @@
      return {
        tooltip: {
          show: true,
          formatter(params) {
            console.log(params);
            return params.data.label;
          }
        },
        visualMap: {
          show: false,
@@ -83,7 +116,7 @@
          min: 0,
          max: 100,
          inRange: {
            color: ['#025483', '#116493', '#3A8EBE']
            color: ['#025483', '#116493']
          },
          seriesIndex: [1]
        },
@@ -156,7 +189,37 @@
               return params.data.color;
              }
            },
            tooltip: {
              show: true,
            },
            zlevel: 7
          },
          {
            name: '散点',
            type: 'effectScatter',
            coordinateSystem: 'geo',
            rippleEffect: {
              scale: 3,
            },
            symbolSize: 20,
            data: convertData(data),
            label:{
              formatter(params) {
                return params.data.label;
              },
              position: 'right',
              show: true,
              color: "#FFFFFF",
              fontWeight: "bold",
              padding: [0, 0, 0, 8]
            },
            itemStyle: {
              show: false,
            },
            tooltip: {
              show: true,
            },
            zlevel: 6
          },
          {
            type: 'map',
@@ -180,7 +243,10 @@
            },
            roam: true,
            animation: false,
            data: data0
            data: data0,
            tooltip: {
              show: false
            }
          },
        ]
      };

 src/layout/components/AlarmPopup.vue

@@ -432,7 +432,7 @@
  position: fixed;
  bottom: 0;
  right: 0;
  z-index: 99;
  z-index: 9999;
  user-select: none;
}
.alarm-popup-container {

 src/views/dataMager/battGroupMager.vue

@@ -163,9 +163,7 @@
          @click="addHome()"
          round
          size="mini"
          icon="el-icon-plus"
          >新建机房</el-button
        >
          icon="el-icon-plus">新建电池组</el-button>
      </div>
    </div>
    <!-- 电池信息编辑选择 -->

 src/views/dataMager/components/nodeManage.vue

New file
@@ -0,0 +1,42 @@
<template>
  <div class="node-manage">
    <el-transfer
      v-model="value"
      :data="data"
      filterable
      class="transfer-width320"
      :titles="['非节点站', '节点站']"
      :button-texts="['移除', '添加']"
      @change="handleChange"></el-transfer>
  </div>
</template>

<script>
export default {
  name: "nodeManage",
  data() {
    return {
      data: [],
      value: [],
    };
  },
  methods: {
    handleChange() {

    }
  },
  mounted() {

  }
}
</script>

<style scoped>
.node-manage {
  width: 960px;
  height: 600px;
  background-color: #024d5f;
  padding-top: 16px;
  padding-bottom: 16px;
}
</style>

 src/views/dataMager/js/station.js

@@ -94,15 +94,21 @@
 * 查询说有的站点
 * @param pageCurr 查询页
 * @param pageSize 每页信息数
 * @param stationName1 省
 * @param stationName2 市
 * @param stationName5 区县
 * @returns {AxiosPromise}
 */
export const searchStationAll = (pageCurr, pageSize)=> {
export const searchStationAll = (pageCurr, pageSize, stationName1, stationName2, stationName5)=> {
  return axios({
    method: "GET",
    url: "StationInf/searchStationAll",
    params: {
      pageCurr,
      pageSize
      pageSize,
      stationName1,
      stationName2,
      stationName5
    },
  });


 src/views/dataMager/powerMager.vue

@@ -148,9 +148,7 @@
          @click="addHome()"
          round
          size="mini"
          icon="el-icon-plus"
          >新建机房
        </el-button>
          icon="el-icon-plus">新建电源设备</el-button>
      </div>
    </div>
    <!-- 添加电源设备 -->
@@ -600,4 +598,4 @@
</script>

<style scoped>
</style>
</style>

 src/views/dataMager/totalStation.vue

@@ -1,5 +1,5 @@
<template>
  <flex-layout>
  <flex-layout :loading="loading">
    <div class="table-layout filter-box-table" slot="header">
      <div class="table-row">
        <div class="table-cell text-right">省：</div>
@@ -40,7 +40,7 @@
        <div class="table-cell">
          <el-select
            v-model="filters.values.county"
            @change="searchHome"
            @change="searchData"
            size="small"
            placeholder="请选择区/县/班组"
          >
@@ -79,6 +79,14 @@
      </el-table>
    </div>
    <div class="flex-page-footer" slot="footer">
      <div class="el-pagination-btns">
        <el-button
          type="primary"
          @click="searchData"
          round
          size="mini"
          icon="el-icon-search">查询</el-button>
      </div>
      <el-pagination
        size="mini"
        :current-page="page.pageCurr"
@@ -88,16 +96,44 @@
        :total="page.pageAll"
        @current-change="currentChange"
        @size-change="sizeChange"></el-pagination>
      <div class="el-pagination-btns">
        <el-button
          type="primary"
          @click="nodeManage"
          round
          size="mini">节点站管理</el-button>
        <el-button
          type="primary"
          @click="addStation"
          round
          size="mini">新建站点</el-button>
      </div>
    </div>
    <!-- 添加快捷菜单 -->
    <el-dialog
      title="添加快捷菜单"
      width="auto"
      :visible.sync="nodeManageDialog"
      :close-on-click-modal="false"
      top="0"
      class="dialog-center"
      :modal="false"
      :modal-append-to-body="false">
      <node-manage v-if="nodeManageDialog"></node-manage>
    </el-dialog>
  </flex-layout>
</template>

<script>
import {searchStationAll} from "./js/station";
import {searchCity, searchCounty, searchProvince} from "@/assets/js/api";
import NodeManage from "@/views/dataMager/components/nodeManage.vue";

export default {
  name: "totalStation",
  components: {
    NodeManage
  },
  data() {
    return {
      loading: false,
@@ -124,7 +160,7 @@
        {
          prop: "stationName",
          label: "机房名称",
          minWidth: 360,
          minWidth: 480,
        },
        {
          prop: 'nodeStationText',
@@ -158,12 +194,13 @@
        pageSize: 20,
        pageAll: 0,
      },
      nodeManageDialog: true
    };
  },
  methods: {
    searchProvince() {
      // 查询省
      this.loading = this.$layer.loading(1);
      this.loading = true;
      searchProvince().then((res) => {
        res = res.data;
        var data = [];
@@ -260,10 +297,17 @@
      this.searchData();
    },
    searchData() {
      if(!this.loading) {
        this.loading = true;
      }
      let pageCurr = this.page.pageCurr;
      let pageSize = this.page.pageSize;
      searchStationAll(pageCurr, pageSize).then(res=>{
        this.$layer.close(this.loading);
      let values = this.filters.values;
      let stationName1 = values.province;
      let stationName2 = values.city;
      let stationName5 = values.county;
      searchStationAll(pageCurr, pageSize, stationName1, stationName2, stationName5).then(res=>{
        this.loading = false;
        let rs = res.data;
        let data = [];
        if(rs.code == 1 && rs.data) {
@@ -281,6 +325,12 @@
        console.log(error);
      });
    },
    nodeManage() {
      this.nodeManageDialog = true;
    },
    addStation() {

    }
  },
  mounted() {
    this.searchProvince();