he wei
2024-09-20 76cb16b9d0df086c99807420884e06d0454027cf
U 云南昆明需求修改
7个文件已修改
360 ■■■■■ 已修改文件
src/assets/js/config.module.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/OpsAllocation/teamManage.vue 52 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/alarmMager/deviceTimequery.vue 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/alarmMager/js/powerBoxAlarmData.js 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/alarmMager/js/powerInfoData.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/dataTest/hfSwitch.vue 127 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/dataTest/movingRingSystem/const/getAcDcData.js 160 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/js/config.module.js
@@ -92,11 +92,11 @@
     * 南京测控: 'njck'
     * 云南昆明供电局:'ynkm'
     */
    // name: "",
    name: "",
    // name: "sxty", // 请查看alarmPopup是否开启,logo是否开启且为gjdw
    // name: "tydc",
    // name: 'njck',
    name: "ynkm",
    // name: "ynkm",
    //value: false,
  },
  // 是否要(加验签) 安全模式
src/views/OpsAllocation/teamManage.vue
@@ -19,7 +19,8 @@
                  ]"
                  v-for="(sub, idx) in item.stationInfList"
                  :key="'sub_' + idx"
                  @click="changeCurr(sub)">
                  @click="changeCurr(sub)"
                >
                  {{ sub.stationName3 }}
                </div>
              </div>
@@ -30,6 +31,14 @@
        <div class="info">
          <div class="title">
            告警列表<span>当前站点: {{ currentStation.stationName3 }}</span>
            <el-button
              v-if="!currentStation.alarmList.length"
              @click="goRealTime(currentStation)"
              type="success"
              size="mini"
              >实时监控</el-button
            >
            <span v-else></span>
          </div>
          <div class="table-wrap full">
            <div class="table-contain">
@@ -38,7 +47,8 @@
                stripe
                size="mini"
                height="100%"
                style="width: 100%">
                style="width: 100%"
              >
                <el-table-column type="index" label="序号"></el-table-column>
                <el-table-column
                  :prop="item.prop"
@@ -47,7 +57,8 @@
                  :resizable="false"
                  align="center"
                  v-for="(item, index) in alarmHeaders"
                  :key="index"></el-table-column>
                  :key="index"
                ></el-table-column>
                <!-- <el-table-column
                  label="重要紧急"
                  min-width="120"
@@ -66,16 +77,21 @@
                  label="操作"
                  fixed="right"
                  min-width="200"
                  align="center">
                  align="center"
                >
                  <template slot-scope="scope">
                    <el-button
                      @click="goAlarm(scope.row)"
                      type="primary"
                      size="mini">实时告警</el-button>
                      size="mini"
                      >实时告警</el-button
                    >
                    <el-button
                      @click="goRealTime(scope.row)"
                      type="success"
                      size="mini">实时监控</el-button>
                      size="mini"
                      >实时监控</el-button
                    >
                  </template>
                </el-table-column>
              </el-table>
@@ -231,12 +247,23 @@
        Math.random();
      switch (obj.aType) {
        case "power":
          //电源实时告警
          this.$router.push("/alarmMager/powerRealtimeInfo" + search);
          // pwrAlmFlag=115 南网 跳转到通讯电源实时告警   其它110等全跳转电源实时告警页面
          if (obj.pwrAlmFlag == 115) {
            // 通讯电源实时告警
            this.$router.push("/alarmMager/powerBoxAlarm" + search);
          } else {
            //电源实时告警
            this.$router.push("/alarmMager/powerRealtimeInfo" + search);
          }
          break;
        case "device":
          //设备实时告警
          this.$router.push("/alarmMager/deviceTimequery" + search);
          this.$router.push(
            "/alarmMager/deviceTimequery" +
              search +
              "&stationId=" +
              obj.stationId
          );
          break;
        case "batt":
          //电池实时告警
@@ -289,9 +316,9 @@
              powerAlarmList = item.powerAlarmList || [];
            item.alarmList = [
              ...powerAlarmList.map((v) => ({ ...v, aType: "power" })),
              ...battAlarmList.map((v) => ({ ...v, aType: "batt" })),
              ...deviceAlarmList.map((v) => ({ ...v, aType: "device" })),
              ...powerAlarmList.map((v) => ({ ...v, aType: "power" })),
            ];
          });
          stationList.push(...v.stationInfList);
@@ -369,8 +396,11 @@
    display: flex;
    flex-direction: column;
    .title {
      display: flex;
      justify-content: space-between;
      align-items: center;
      font-weight: 700;
      padding-left: 1em;
      padding: 4px 1em;
      span {
        display: inline-block;
        margin-left: 3em;
src/views/alarmMager/deviceTimequery.vue
@@ -732,12 +732,15 @@
    };
  },
  watch: {
    "$route"() {
      if(this.$route.query.pageFlag && this.$route.query.pageFlag != this.pageFlag) {
    $route() {
      if (
        this.$route.query.pageFlag &&
        this.$route.query.pageFlag != this.pageFlag
      ) {
        this.pageFlag = this.$route.query.pageFlag;
        this.refreshFN();
      }
    }
    },
  },
  mounted() {
    this.listToBeConfirmed();
@@ -830,7 +833,8 @@
      let query = this.$route.query;
      if (query.fromType == "fromIndex") {
        this.selectValue1 = query.province ? query.province : "";
        this.selectValue2 = query.stationName ? query.stationName : "";
        // this.selectValue2 = query.stationName ? query.stationName : "";
        this.selectValue2 = query.stationId ? query.stationId : "";
        this.value = query.alarmId ? query.alarmId : "0";
        this.sendMessage();
      }
src/views/alarmMager/js/powerBoxAlarmData.js
@@ -26,7 +26,8 @@
        {value:"110119",label:"通信故障",model:true},
        {value:"110011,110138,110302,110303",label:"防雷器故障",model:true},
        {value:"110038,110324,110509",label:"监控单元故障",model:true},
        {value:"110017,110018,110019,110020,110021,110022,110023,110024,110025,110026,110027,110028,110029,110030,110031,110032",label:"模块故障",model:true}
        {value:"110017,110018,110019,110020,110021,110022,110023,110024,110025,110026,110027,110028,110029,110030,110031,110032",label:"模块故障",model:true},
        { value: "110550, 110551, 110552, 110553, 110554, 110555, 110556, 110557, 110558, 110559, 110560, 110561, 110562, 110563, 110564, 110565", label: "模块关机", model: true },
    ],
    
};
src/views/alarmMager/js/powerInfoData.js
@@ -13,6 +13,8 @@
    { value: "110079,110080,110081,110082,110083,110084,110085,110086,110087,110088,110089,110090,110091,110092,110093,110094", label: "整流器过流", model: true },
    { value: "110095,110096,110097,110098,110099,110100,110101,110102,110103,110104,110105,110106,110107,110108,110109,110110", label: "整流器交流异常", model: true },
    { value: "110047,110048,110049,110050,110051,110052,110053,110054,110055,110056,110057,110058,110059,110060,110061,110062", label: "整流器过压", model: true },
    { value: "110550, 110551, 110552, 110553, 110554, 110555, 110556, 110557, 110558, 110559, 110560, 110561, 110562, 110563, 110564, 110565", label: "模块关机", model: true },
  ],
  // 故障
  gz: [
src/views/dataTest/hfSwitch.vue
@@ -261,7 +261,7 @@
                  </el-col>
                </div>
                <div class="center-box center-botton-box chart-wrapper">
                  <p class="chart-title"><i class="icon"></i>模块输出电流</p>
                  <p class="chart-title"><i class="icon"></i>模块输出</p>
                  <div ref="chartcurrent6" class="mksc-current"></div>
                  <div class="arrows-box border-left-top"></div>
                  <div class="arrows-box border-left-bottom"></div>
@@ -2869,6 +2869,7 @@
    optionData13: function () {
      let data = [];
      let dataName = [];
      let volData = [];
      const moduleSwitchStatus = this.moduleSwitchStatus * 1;
      const moduleInUseCount = this.moduleCount;
@@ -2885,9 +2886,13 @@
      checkedList.map((v) => {
        let index = v + 1;
        let prop = `m${index}Outcurr`;
        let propV = `m${index}OutVol`;
        dataName.push("模块" + index);
        data.push(this.acdcData[prop]);
        volData.push(this.acdcData[propV]);
      });
      console.log("checkedList", volData, "=============");
      let option = {
        grid: {
@@ -2899,7 +2904,20 @@
        tooltip: {
          trigger: "axis",
          axisPointer: {
            type: "cross",
             type: 'line',
            label: {
                show: true,
                backgroundColor: '#7B7DDC'
            }
            // type: "cross",
          },
        },
        legend: {
          left: "center",
          top: "8%",
          data: ["电流", "电压"],
          textStyle: {
            color: "#fff",
          },
        },
        xAxis: [
@@ -2927,6 +2945,7 @@
            type: "value",
            // min: 0,
            // max: 140,
            name: '单位: A',
            splitNumber: 10,
            splitLine: {
              show: true,
@@ -2937,13 +2956,45 @@
              },
            },
            axisLine: {
              show: false,
              show: true,
              lineStyle: {
                color: "#fff", // 设置为红色
                width: 1, // 设置线条宽度为2
              },
            },
            axisLabel: {
              color: "#fff",
            },
            axisTick: {
              show: true,
            },
          },
          {
            type: "value",
            // min: 0,
            // max: 140,
            name: '单位: V',
            splitNumber: 10,
            splitLine: {
              show: false,
              lineStyle: {
                type: "dotted",
                color: "rgba(255,255,255,0.1)",
              },
            },
            axisLine: {
              show: true,
              lineStyle: {
                color: "#fff", // 设置为红色
                width: 1, // 设置线条宽度为2
              },
            },
            axisLabel: {
              color: "#ff0",
            },
            axisTick: {
              show: true,
            },
          },
        ],
@@ -2989,6 +3040,72 @@
            tooltip: {
              show: true,
            },
            // areaStyle: {
            //   normal: {
            //     color: new echarts.graphic.LinearGradient(
            //       0,
            //       0,
            //       0,
            //       1,
            //       [
            //         {
            //           offset: 0,
            //           color: "rgba(255,26,85,1)",
            //         },
            //         {
            //           offset: 1,
            //           color: "rgba(23,129,186,0)",
            //         },
            //       ],
            //       false
            //     ),
            //     shadowBlur: 10,
            //   },
            // },
            data: data,
          },
          {
            name: "电压",
            type: "line",
            // smooth: true, //是否平滑
            showAllSymbol: true,
            // symbol: 'image://./static/images/guang-circle.png',
            symbol: "circle",
            symbolSize: 10,
            yAxisIndex: 1,
            label: {
              show: false,
              position: "top",
              textStyle: {
                color: "#6c50f3",
              },
            },
            itemStyle: {
              color: new echarts.graphic.LinearGradient(
                0,
                0,
                1,
                0,
                [
                  {
                    offset: 0,
                    color: "#05cb86",
                  },
                  {
                    offset: 1,
                    color: "#0aadd3",
                  },
                ],
                false
              ),
              borderWidth: 8,
              shadowBlur: 0,
              shadowOffsetY: 0,
              shadowOffsetX: 0,
            },
            tooltip: {
              show: true,
            },
            areaStyle: {
              normal: {
                color: new echarts.graphic.LinearGradient(
@@ -3011,11 +3128,11 @@
                shadowBlur: 10,
              },
            },
            data: data,
            data: volData,
          },
        ],
      };
      this.$options.chart.chartcurrent6.setOption(option);
      this.$options.chart.chartcurrent6?.setOption(option);
    },
    // 列表布尔值数据处理
    setListData: function (data) {
src/views/dataTest/movingRingSystem/const/getAcDcData.js
@@ -337,6 +337,166 @@
      unit: 'A',
    },
    {
      // prop: '',
      key: 'm1OutVol',
      label1: '#1',
      label: '模块1输出电压',
      value: 0,
      unit: 'V',
    },
    {
      // prop: '',
      key: 'm2OutVol',
      label1: '#2',
      label: '模块2输出电压',
      value: 0,
      unit: 'V',
    },
    {
      // prop: '',
      key: 'm3OutVol',
      label1: '#3',
      label: '模块3输出电压',
      value: 0,
      unit: 'V',
    },
    {
      // prop: '',
      key: 'm4OutVol',
      label1: '#4',
      label: '模块4输出电压',
      value: 0,
      unit: 'V',
    },
    {
      // prop: '',
      key: 'm5OutVol',
      label1: '#5',
      label: '模块5输出电压',
      value: 0,
      unit: 'V',
    },
    {
      // prop: '',
      key: 'm6OutVol',
      label1: '#6',
      label: '模块6输出电压',
      value: 0,
      unit: 'V',
    },
    {
      // prop: '',
      key: 'm7OutVol',
      label1: '#7',
      label: '模块7输出电压',
      value: 0,
      unit: 'V',
    },
    {
      // prop: '',
      key: 'm8OutVol',
      label1: '#8',
      label: '模块8输出电压',
      value: 0,
      unit: 'V',
    },
    {
      // prop: '',
      key: 'm9OutVol',
      label1: '#9',
      label: '模块9输出电压',
      value: 0,
      unit: 'V',
    },
    {
      // prop: '',
      key: 'm10OutVol',
      label1: '#10',
      label: '模块10输出电压',
      value: 0,
      unit: 'V',
    },
    {
      // prop: '',
      key: 'm11OutVol',
      label1: '#11',
      label: '模块11输出电压',
      value: 0,
      unit: 'V',
    },
    {
      // prop: '',
      key: 'm12OutVol',
      label1: '#12',
      label: '模块12输出电压',
      value: 0,
      unit: 'V',
    },
    {
      // prop: '',
      key: 'm13OutVol',
      label1: '#13',
      label: '模块13输出电压',
      value: 0,
      unit: 'V',
    },
    {
      // prop: '',
      key: 'm14OutVol',
      label1: '#14',
      label: '模块14输出电压',
      value: 0,
      unit: 'V',
    },
    {
      // prop: '',
      key: 'm15OutVol',
      label1: '#15',
      label: '模块15输出电压',
      value: 0,
      unit: 'V',
    },
    {
      // prop: '',
      key: 'm16OutVol',
      label1: '#16',
      label: '模块16输出电压',
      value: 0,
      unit: 'V',
    },
    {
      // prop: '',
      key: 'm17OutVol',
      label1: '#17',
      label: '模块17输出电压',
      value: 0,
      unit: 'V',
    },
    {
      // prop: '',
      key: 'm18OutVol',
      label1: '#18',
      label: '模块18输出电压',
      value: 0,
      unit: 'V',
    },
    {
      // prop: '',
      key: 'm19OutVol',
      label1: '#19',
      label: '模块19输出电压',
      value: 0,
      unit: 'V',
    },
    {
      // prop: '',
      key: 'm20OutVol',
      label1: '#20',
      label: '模块20输出电压',
      value: 0,
      unit: 'V',
    },
    {
      prop: 'acdcAcVolHLimit',
      key: 'acVolHLimit',
      label1: '交流电压上限',