whychdw
2025-03-11 c0493c2271c81485dfda7abdd18dd9eb397c22c2
电源告警量,存在二路添加二路告警
5个文件已修改
97 ■■■■ 已修改文件
src/views/dataTest/components/AnalogTabPane.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/dataTest/components/WarnTabPane.vue 90 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/dataTest/movingRingSystem/HomeList.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/dataTest/realTimeData.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/home/home-conductor.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/dataTest/components/AnalogTabPane.vue
@@ -827,7 +827,7 @@
}
.page-right-width {
  width: 360px;
  width: 400px;
}
.page-division {
src/views/dataTest/components/WarnTabPane.vue
@@ -14,18 +14,28 @@
              prop="name"
              label="名称"
              align="center"
              min-width="100"
              width="140"
              class-name="table-list-name white-color"
            >
            </el-table-column>
            <el-table-column
              prop="value"
              label="值"
              label="一路"
              align="center"
              class-name="table-list-value"
            >
              <template slot-scope="scope">
                <hdw-light :type="scope.row.value"></hdw-light>
              </template>
            </el-table-column>
            <el-table-column
              prop="value1"
              label="二路"
              align="center"
              class-name="table-list-value"
            >
              <template slot-scope="scope">
                <hdw-light :type="scope.row.value1"></hdw-light>
              </template>
            </el-table-column>
          </el-table>
@@ -44,18 +54,28 @@
              prop="name"
              label="名称"
              align="center"
              min-width="100"
              width="140"
              class-name="table-list-name white-color"
            >
            </el-table-column>
            <el-table-column
              prop="value"
              label="值"
              label="一路"
              align="center"
              class-name="table-list-value"
            >
              <template slot-scope="scope">
                <hdw-light :type="scope.row.value"></hdw-light>
              </template>
            </el-table-column>
            <el-table-column
              prop="value1"
              label="二路"
              align="center"
              class-name="table-list-value"
            >
              <template slot-scope="scope">
                <hdw-light :type="scope.row.value1"></hdw-light>
              </template>
            </el-table-column>
          </el-table>
@@ -74,18 +94,28 @@
              prop="name"
              label="名称"
              align="center"
              min-width="100"
              width="140"
              class-name="table-list-name white-color"
            >
            </el-table-column>
            <el-table-column
              prop="value"
              label="值"
              label="一路"
              align="center"
              class-name="table-list-value"
            >
              <template slot-scope="scope">
                <hdw-light :type="scope.row.value"></hdw-light>
              </template>
            </el-table-column>
            <el-table-column
              prop="value1"
              label="二路"
              align="center"
              class-name="table-list-value"
            >
              <template slot-scope="scope">
                <hdw-light :type="scope.row.value1"></hdw-light>
              </template>
            </el-table-column>
          </el-table>
@@ -104,18 +134,28 @@
              prop="name"
              label="名称"
              align="center"
              min-width="100"
              width="140"
              class-name="table-list-name white-color"
            >
            </el-table-column>
            <el-table-column
              prop="value"
              label="值"
              label="一路"
              align="center"
              class-name="table-list-value"
            >
              <template slot-scope="scope">
                <hdw-light :type="scope.row.value"></hdw-light>
              </template>
            </el-table-column>
            <el-table-column
              prop="value1"
              label="二路"
              align="center"
              class-name="table-list-value"
            >
              <template slot-scope="scope">
                <hdw-light :type="scope.row.value1"></hdw-light>
              </template>
            </el-table-column>
          </el-table>
@@ -252,24 +292,24 @@
    return {
      warning: {
        overVol: [
          { key: "isAcin1OverVola", name: "交流A相电压", value: 0, id: 110001 },
          { key: "isAcin1OverVolb", name: "交流B相电压", value: 0, id: 110004},
          { key: "isAcin1OverVolc", name: "交流C相电压", value: 0, id: 110007 },
          { key: "isAcin1OverVola", name: "交流A相电压", value: 0, id: 110001, key1: 'isAcin2OverVola', value1: 0, id1: 110137 },
          { key: "isAcin1OverVolb", name: "交流B相电压", value: 0, id: 110004, key1: 'isAcin2OverVolb', value1: 0, id1: 110140},
          { key: "isAcin1OverVolc", name: "交流C相电压", value: 0, id: 110007, key1: 'isAcin2OverVolc', value1: 0, id1: 110143 },
        ],
        underVol: [
          { key: "isAcin1UnderVola", name: "交流A相欠压", value: 0, id: 110002 },
          { key: "isAcin1UnderVolb", name: "交流B相欠压", value: 0, id: 110005 },
          { key: "isAcin1UnderVolc", name: "交流C相欠压", value: 0, id: 110008 },
          { key: "isAcin1UnderVola", name: "交流A相欠压", value: 0, id: 110002, key1: 'isAcin2UnderVola', value1: 0, id1: 110138 },
          { key: "isAcin1UnderVolb", name: "交流B相欠压", value: 0, id: 110005, key1: 'isAcin2UnderVolb', value1: 0, id1: 110141 },
          { key: "isAcin1UnderVolc", name: "交流C相欠压", value: 0, id: 110008, key1: 'isAcin2UnderVolc', value1: 0, id1: 110144 },
        ],
        missItem: [
          { key: "isAcin1LessA", name: "交流A相缺相", value: "0", id: 110003 },
          { key: "isAcin1LessB", name: "交流B相缺相", value: "0", id: 110006 },
          { key: "isAcin1LessC", name: "交流C相缺相", value: "0", id: 110009 },
          { key: "isAcin1LessA", name: "交流A相缺相", value: "0", id: 110003, key1: 'isAcin2LessA', value1: 0, id1: 110139 },
          { key: "isAcin1LessB", name: "交流B相缺相", value: "0", id: 110006, key1: 'isAcin2LessB', value1: 0, id1: 110142 },
          { key: "isAcin1LessC", name: "交流C相缺相", value: "0", id: 110009, key1: 'isAcin2LessC', value1: 0, id1: 110145 },
        ],
        AC: [
          { key: "isAcin1Powerdown", name: "交流停电", value: "0", id: 110010 },
          { key: "isDcoutOverVol", name: "直流电压过高", value: "0", id: 110012 },
          { key: "isDcoutUnderVol", name: "直流电压过低", value: "0", id: 110013 },
          { key: "isAcin1Powerdown", name: "交流停电", value: "0", id: 110121, key1: 'isAcin2Powerdown', value1: 0, id1: 110122 },
          { key: "isDcoutOverVol", name: "直流电压过高", value: "0", id: 110012, key1: 'isDcoutOverVol1', value1: 0, id1: 110012 },
          { key: "isDcoutUnderVol", name: "直流电压过低", value: "0", id: 110013, key1: 'isDcoutUnderVol1', value1: 0, id1: 110013 },
        ],
        break: [
          { key: "isLoaderFuse", name: "负载熔断", value: "0", id: 110014},
@@ -333,7 +373,6 @@
      if (this.name == "warn") {
        let warnings = this.warning;
        let info = this.info;
        console.log(info);
        let setting = this.setting;
        for (let key in warnings) {
          let warning = warnings[key];
@@ -344,6 +383,15 @@
            }else {
              item.value = -1;
            }
            // 存在第二路
            if(item.id1) {
              let isActive1 = this.getIsActive(item.id, setting);
              if(isActive1) {
                item.value1 = getValByKey(item.key1, info, -1);
              }else {
                item.value = -1;
              }
            }
          });
        }
      }
src/views/dataTest/movingRingSystem/HomeList.vue
@@ -333,7 +333,7 @@
        let dh = [];
        if(rs.code === 1 && rs.data) {
          let list = rs.data2;
          console.log(list);
          // console.log(list);
          // 动环信息
          dh = list.cinf?.map(item=>{
            return {
src/views/dataTest/realTimeData.vue
@@ -194,7 +194,7 @@
          res = res.data;
          if (res.code && res.data.list.length) {
            this.powerInfo = res.data.list[0];
            console.log(this.powerInfo);
            // console.log(this.powerInfo);
          } else {
            this.powerInfo = {
              num: 0,
src/views/home/home-conductor.vue
@@ -777,6 +777,7 @@
        this.isShowPowerInfo = total !== 0;
        this.$nextTick(()=>{
          this.$refs.bar3d.resize();
          this.$refs.powerChart.resize();
        });
        this.others.pwrProd = [];