内容修改

longyvfengyun

2024-04-25 8bf1fdef15535f5eef87d25d699fab8fe4c5bca2

内容修改

 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',
@@ -91,11 +91,11 @@
     * å—京测控: 'njck'
     * äº‘南昆明供电局：'ynkm'
     */
     name: '',
    //name: 'sxty',   // è¯·æŸ¥çœ‹alarmPopup是否开启，logo是否开启且为gjdw
     // name: '',
    name: 'sxty',   // è¯·æŸ¥çœ‹alarmPopup是否开启，logo是否开启且为gjdw
    // name: 'tydc',
    // name: 'njck',
    //name: 'ynkm',
    // name: 'ynkm',
    //value: false,
  },
  // æ˜¯å¦è¦ï¼ˆåŠ éªŒç­¾ï¼‰ å®‰å…¨æ¨¡å¼

 src/views/dataMager/components/AddBattGroup.vue

@@ -156,9 +156,9 @@
          </el-form-item>
        </el-col>
        <el-col :span="layout.span">
          <el-form-item label="电池组类型" prop="battGroupNum">
          <el-form-item label="电池组类型" prop="cellShowType">
            <el-select
              v-model="params.battGroupNum"
              v-model="params.cellShowType"
              placeholder="请选择电池类型"
            >
              <el-option
@@ -588,6 +588,7 @@
        batttIndependentPlaced: "", // æ˜¯å¦ç‹¬ç«‹è“„电池室放置
        junChargeVoltageValue: 0, // å‡å……电压设定值
        signType: 0,    // éªŒç­¾æ ¼å¼
        cellShowType: 0,    // ç”µæ± ç±»åž‹
      },
      signTypes: const_61850.signTypes,
      tmpList: [],

 src/views/dataTest/components/diagrams/intelCircuit/index.vue

@@ -1,6 +1,7 @@
<script>
import circuitDiagram from "./js/circuitDiagram";
import state from "./js/state";
import getIntelDevState from "@/views/dataTest/js/getIntelDevState";
export default {
  name: "intelCircuit",
  diagram: "",
@@ -54,6 +55,12 @@
        };
      },
    },
    state: {
      type: Array,
      default() {
        return getIntelDevState();
      }
    }
  },
  watch: {
    update() {
@@ -134,9 +141,27 @@

      state(diagram, {
        isConnect,
        type: this.type
      });
    },
  },
  computed: {
    type(){
      // è°¨è®°è¿™ä¸ªä¸Žstate数组的下标有关，数组改变对应判断也要调整
      if(this.isConnect) {
        let state0 = this.state[0];
        if(state0.value1 === 0 && state0.value2 === 0) {
          return 3;
        }else if(state0.value1 === 1 && state0.value2 !== 1) {
          return 2;
        }else if(state0.value1 !== 1 && state0.value2 === 2) {
          return 1;
        }
      }else {
        return 0;
      }
    }
  },
  mounted() {
    this.$options.diagram = circuitDiagram(
      this.$refs.static,

 src/views/dataTest/components/diagrams/intelCircuit/js/state.js

@@ -4,7 +4,8 @@

function state(diagram, option) {
  let {
    isConnect
    isConnect,
    type,   // 0-未连接 1-直流母线1断开 2-直流母线2断开 3-直流母线1，2正常
  } = option;

  // æ¸…除电流
@@ -15,8 +16,19 @@
    return;
  }

  normal1(diagram, option);
  normal2(diagram, option);
  if(type === 1) {
    normal2(diagram, option);
    dcDc2(diagram, option);
  }else if(type === 2) {
    normal1(diagram, option);
    dcDc1(diagram, option);
  }else if(type === 3) {
    normal1(diagram, option);
    normal2(diagram, option);
  }

  // normal1(diagram, option);
  // normal2(diagram, option);
  // dcDc1(diagram, option);
  // dcDc2(diagram, option);
}

 src/views/dataTest/intelRealTime.vue

@@ -168,6 +168,7 @@
          :option="devData"
          :update="diagram.update"
          :is-connect="diagram.isConnect"
          :state="stateList"
        ></intel-circuit>
      </div>
    </content-box>

 src/views/reportStatistics/eleAssess.vue

@@ -79,14 +79,22 @@
              æœ¬å¹´ï¼šç­›é€‰æ¡ä»¶ä¸­è®°å½•æ—¶é—´çš„时间段内 <br/>
              å¾€å¹´ï¼šç­›é€‰æ¡ä»¶ä¸­è®°å½•æ—¶é—´å¼€å§‹æ—¶é—´ä¹‹å‰çš„时间
            </div>
            <div>统计类型<i class="el-icon-question"></i>:</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 class="table-cell text-right">统计方式</div>
        <div class="table-cell">
          <el-select size="small" v-model="statictype" @click="changStatictype">
            <el-option
              v-for="item in statictypes" :key="item.value"
              :value="item.value" :label="item.label">
            </el-option>
          </el-select>
@@ -435,6 +443,17 @@
          value: 0
        }
      ],
      statictype: 1,
      statictypes: [
        {
          label: "容量+内阻",
          value: 0,
        },
        {
          label: "容量",
          value: 1
        },
      ],
    };
  },
  mounted() {
@@ -469,7 +488,8 @@
        this.startDrsj = (yy-1) + "-01-01 00:00:00";
        this.endDrsj = (yy-1) + "-12-31 23:59:59";
      }

      this.statictype = 1;
      this.wj = 0;
    },
    serchQuality() {
      serchQuality()
@@ -616,7 +636,8 @@
          new Date(this.endDrsj).format("yyyy-MM-dd") + " 23:59:59",
        testStartType: this.starttype,
        assess: this.assess,
        wj: this.wj
        wj: this.wj,
        statictype: this.statictype
      };
      let params = {
        pageNum: isExportFile ? 1 : this.queryInfo.pageCurr,
@@ -764,6 +785,9 @@
      // this.endDrsj = day1;

      this.serchLowData();
    },
    changStatictype() {
      this.serchLowData();
    }
  },
};

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

Binary files differ