whychdw
2022-02-18 01b8083c3df2743085a6463c17fbf6090c67c6b6
LD9内容新增
5个文件已修改
82 ■■■■ 已修改文件
src/assets/js/config.js 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/PageHeader.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/dataTest/js/getTblHeader.js 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/dataTest/realTime.vue 49 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/login.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/js/config.js
@@ -61,4 +61,9 @@
        des: "长时间不操作自动退出",
        value: false
    },
    logCap: {
        label: "审计容量",
        des: "显示审计容量的健康度",
        value: false
    }
};
src/components/PageHeader.vue
@@ -127,6 +127,7 @@
                @handleClick="goToScreenManage"
              ></progress-state>
              <progress-state
                  v-if="showLogCap"
                  icon="el-icon-xinxi"
                  :state="logCountFlag"
                  :content="logCountMsg"></progress-state>
@@ -315,6 +316,7 @@
      showProgress: false,
      pifuDrawer: false,
      showLogo: false,
      showLogCap: platform.logCap.value,
      version: "",
      weatherState: platform.weather.value,
      bigScreen: platform.bigScreen.value,
@@ -448,6 +450,9 @@
      }
    },
    startLogUseCount() {
      if(!this.showLogCap) {
        return false;
      }
      this.timer2.start(()=>{
        this.$axios.all([
            this.logUseCount()
src/pages/dataTest/js/getTblHeader.js
@@ -49,6 +49,27 @@
            width: "",
            key1: "leakVol",
        },
        {
            prop: "monCap",
            label: "实际容量(AH)",
            width: "",
            key1: "monCap",
            type: "LD9",
        },
        {
            prop: "monTestCap",
            label: "测试容量(AH)",
            width: "",
            key1: "monTestCap",
            type: "LD9",
        },
        {
            prop: "monDisTimeLong",
            label: "放电可持续时长(分钟)",
            width: "",
            key1: "monDisTimeLong",
            type: "LD9",
        },
    ];
    // 判断是否为锂电池
    if (regEquipType(dev_id, ["lithium"])) {
src/pages/dataTest/realTime.vue
@@ -1508,26 +1508,24 @@
      let postData = {
        battGroupId: this.batt.BattGroupId,
      };
      BattRtAlarmActionGetInfo(postData)
        .then((res) => {
          let rs = JSON.parse(res.data.result);
          if (rs.code == 1) {
            this.table2.datas = rs.data;
          }
        })
        .catch((err) => {
          console.log(err);
        });
      BattRsAlarmActionGetInfo(postData)
        .then((res) => {
          let rs = JSON.parse(res.data.result);
          if (rs.code == 1) {
            this.table1.datas = rs.data;
          }
        })
        .catch((err) => {
          console.log(err);
        });
      if(this.tabsConfig.dianchigaojing && this.pageConfig.dianchigaojing) {
        BattRtAlarmActionGetInfo(postData).then((res) => {
            let rs = JSON.parse(res.data.result);
            if (rs.code == 1) {
              this.table2.datas = rs.data;
            }
          }).catch((err) => {
            console.log(err);
          });
        BattRsAlarmActionGetInfo(postData).then((res) => {
            let rs = JSON.parse(res.data.result);
            if (rs.code == 1) {
              this.table1.datas = rs.data;
            }
          }).catch((err) => {
            console.log(err);
          });
      }
    },
    toggleChange() {
      this.resize();
@@ -2334,7 +2332,8 @@
    },
    /* echars图表 */
    realTimeSearch() {
      var batt = this.batt;
      let batt = this.batt;
      let type = this.diagram.type;
      realTimeSearch({
        BattGroupId: batt.BattGroupId,
      }).then((res) => {
@@ -2354,6 +2353,10 @@
              curr1: item.mon_JH_curr,
              leakVol1: item.mon_LY_vol,
              monConnRes: item.mon_conn_res,
              monCap: item.mon_cap,
              monTestCap: type==1?item.monTestCap:"---",
              monResCap: type==1?(item.monCap-item.monTestCap): "---",
              monDisTimeLong: type==1?item.monDisTimeLong:"---",
            };
          });
        }
@@ -3259,8 +3262,12 @@
    dataHeaders() {
      let headers = this.table.headers;
      let tabConfig = this.pageConfig;
      let batt = this.batt;
      return headers.filter(item=>{
        let isShow = item.key1?tabConfig[item.key1]:true;
        if(item.type) {
          isShow = regEquipType(batt.FBSDeviceId, item.type);
        }
        return isShow;
      });
    }
src/pages/login.vue
@@ -757,7 +757,7 @@
      }
    });
    // console.log(AES.encrypt("sys_123456"));
    //console.log(AES.encrypt("123456"));
    // console.log(encodeURIComponent("B17jjjYoBkbfZChw/fHzcA=="));
    // console.log(decodeURIComponent("B17jjjYoBkbfZChw%2FfHzcA%3D%3D"))
    //console.log(AES.decrypt("BAaiESc qt58gWNITRtXWw=="));