内容修改

longyvfengyun

2024-04-16 00d5b50516fde970ee203961fffd8bda597f6c46

内容修改

 src/assets/js/config.module.js

@@ -3,7 +3,7 @@
    label: '平台logo',
    des: '显示平台logo状态',
    fileName: 'gjdw',       // gjdw, nfdw, gjdx, qwh, gdnr
    value: false,
    value: true,
  },
  uKey: {
    label: 'uKey',
@@ -38,7 +38,7 @@
  changeIp: {
    label: '远程修改IP',
    des: '电池信息配置中点击编辑可以远程修改ip',
    value: true,
    value: false,
  },
  copyRight: {
    label: '版权声明',
@@ -91,8 +91,8 @@
     * å—京测控: 'njck'
     * äº‘南昆明供电局：'ynkm'
     */
     name: '',
    // name: 'sxty',
     // name: '',
    name: 'sxty',   // è¯·æŸ¥çœ‹alarmPopup是否开启，logo是否开启且为gjdw
    // name: 'tydc',
    // name: 'njck',
    //name: 'ynkm',
@@ -121,8 +121,8 @@
  alarmPopup: {
    label: "告警弹出框",
    des: "登录平台后，右下方告警弹出框提示",
    value: false
    // value: true
    // value: false
    value: true
  },
  WHYC: {
    label: '自用',

 src/views/OpsAllocation/components/approvalForm.vue

@@ -125,7 +125,7 @@
            // this.binf = data2.binf;
            this.groupName = data2.binf.stationName + "-" + data2.binf.battGroupName;
            this.params = data2.paramTmp;
            this.lastTestTime = data2.testInf.testStarttime;
            this.lastTestTime = data2.testInf?.testStarttime;
            this.reason = data2.main.taskDesc;
          }
          // å…³é—­ç­‰å¾…框
@@ -142,4 +142,4 @@
    this.getDisParams();
  },
};
</script>
</script>

 src/views/OpsAllocation/flow-admin.vue

@@ -234,6 +234,11 @@
            width: 180,
          },
          {
            prop: "fullStationName",
            label: "机房名称",
            width: 380,
          },
          {
            prop: "typeStr",
            label: "流程类型",
            width: 160,
@@ -294,6 +299,7 @@
                  : { P2: "管理层审批中", P3: "领导层审批中" }[
                  v.workflowMain.processLevel
                  ] || "流程状态错误";
              v.fullStationName = v.stationInf?.stationName5+"-"+v.stationInf?.stationName3;
              return v;
            });
            total = data2.total;
@@ -314,7 +320,7 @@
      }
    },
    approval(obj, viewOnly) {
      console.log(obj);
      // console.log(obj);
      this.viewOnly = !!viewOnly;
      this.flowDialogTitle = typeList[obj.workflowMain.type] + "审批";
      this.formInit();

 src/views/reportStatistics/eleAssess.vue

@@ -61,9 +61,8 @@
            :picker-options="pickerOptions0"
            type="date"
            placeholder="选择日期"
            value-format="yyyy-MM-dd"
          ></el-date-picker
          >-
            value-format="yyyy-MM-dd"></el-date-picker>
          -
          <el-date-picker
            v-model="endDrsj"
            size="small"
@@ -71,8 +70,26 @@
            :picker-options="pickerOptions1"
            type="date"
            placeholder="选择日期"
            value-format="yyyy-MM-dd"
          ></el-date-picker>
            value-format="yyyy-MM-dd"></el-date-picker>
        </div>
        <div class="table-cell text-right">
          <el-tooltip placement="top">
            <div slot="content">
              æœ¬å¹´å’Œå¾€å¹´å…·ä½“的定义如下：<br/>
              æœ¬å¹´ï¼šç­›é€‰æ¡ä»¶ä¸­è®°å½•æ—¶é—´çš„时间段内 <br/>
              å¾€å¹´ï¼šç­›é€‰æ¡ä»¶ä¸­è®°å½•æ—¶é—´å¼€å§‹æ—¶é—´ä¹‹å‰çš„时间
            </div>
            <div>统计类型<i class="el-icon-question"></i>:</div>
          </el-tooltip>

        </div>
        <div class="table-cell">
          <el-select size="small" v-model="wj" @change="changeWj">
            <el-option
              v-for="item in wjList" :key="item.value"
              :value="item.value" :label="item.label">
            </el-option>
          </el-select>
        </div>
      </div>
    </div>
@@ -287,11 +304,6 @@
            width: 100,
          },
          {
            prop: "monListVol",
            label: "电压低告警单体",
            width: 180,
          },
          {
            prop: "monListRes",
            label: "内阻高告警单体",
            width: 180,
@@ -321,6 +333,12 @@
          {
            prop: "assessment",
            label: "电池性能评估",
            width: 180,
            fixed: "right",
          },
          {
            prop: "wj",
            label: "统计类型",
            width: 180,
            fixed: "right",
          },
@@ -401,6 +419,21 @@
          value: 3,
          label: "损坏",
        },
      ],
      wj: 0,
      wjList: [
        {
          label: "全部",
          value: -1,
        },
        {
          label: "往年",
          value: 1
        },
        {
          label: "本年",
          value: 0
        }
      ],
    };
  },
@@ -583,6 +616,7 @@
          new Date(this.endDrsj).format("yyyy-MM-dd") + " 23:59:59",
        testStartType: this.starttype,
        assess: this.assess,
        wj: this.wj
      };
      let params = {
        pageNum: isExportFile ? 1 : this.queryInfo.pageCurr,
@@ -613,7 +647,7 @@
                testList, //6
              } = data.list[i].battTestDataInf;

              let { flag, alarm, noDisAlmLH, noDisAlmSH } = data.list[i];
              let { flag, alarm, noDisAlmLH, noDisAlmSH, wj } = data.list[i];
              if(flag === 3) {
                flag = lastCap/data.list[i].battinf.monCapStd<this.quality.change/100?3:4
              }
@@ -644,20 +678,22 @@
              tableObj.monCount = data.list[i].battinf.monCount; //单体数量
              tableObj.battProducer = data.list[i].battinf.battProducer; //电池品牌
              tableObj.battInUseDate = data.list[i].battinf.battInUseDate.substr(0, 10); //使用年限

              if(this.wj === -1) {
                if(wj === 'N') {
                  wj = "W";
                }
              }else if(this.wj === 0) {
                wj = "J";
              }else {
                wj = "W"
              }
              tableObj.wj = wj;
              let monListVol = [],
                monListRes = [];
              alarm = alarm || [];

              // å¦‚æžœflag == 0 è¦æ ¹æ®å‘Šè­¦ä¸­åŠ£åŒ–单体数组和劣坏单体数组 æ¥åˆ¤å®šç”µæ± æ€§èƒ½è¯„ä¼°
              if (0 == flag) {
                if (noDisAlmSH && noDisAlmSH.length) {
                  tableObj.flag = 3;
                  alarm = noDisAlmSH;
                } else if (noDisAlmLH && noDisAlmLH.length) {
                  tableObj.flag = 2;
                  alarm = noDisAlmLH;
                }
              if (noDisAlmSH && noDisAlmSH.length) {
                alarm = noDisAlmSH;
              }

              alarm.forEach((v) => {
@@ -718,6 +754,17 @@
      this.queryInfo.pageCurr = val2;
      this.serchLowData();
    },
    changeWj() {
      // let thistime = new Date();
      // let yy = thistime.getFullYear();
      // let MM = thistime.getMonth() + 1;
      // let dd = thistime.getDate();
      // let day1 = yy + "-" + MM + "-" + dd + " 23:59:59";
      // this.startDrsj = yy + "-01-01 00:00:00";
      // this.endDrsj = day1;

      this.serchLowData();
    }
  },
};
</script>

 Á÷³Ìͼ/20240415-ɽÎ÷Ê¡-Ì«Ô­ÊÐ-¹©µç¾Ö-¿Í»§½¨Òé.docx

Binary files differ