src/assets/js/config.module.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/views/dataTest/components/CircuitDiagram.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/views/dataTest/components/DischargeDialogContent.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/views/dataTest/components/DischargeParams.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/views/dataTest/realTime.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/assets/js/config.module.js
@@ -92,8 +92,10 @@ * 南京测控: 'njck' * 云南昆明供电局:'ynkm' * 苏州地铁: 'szdt' * 重庆定制: 'cqdz' */ // name: "", name: "cqdz", // name: "sxty", // 请查看alarmPopup是否开启,logo是否开启且为gjdw // name: "tydc", // name: 'szdt', src/views/dataTest/components/CircuitDiagram.vue
@@ -266,6 +266,9 @@ type: [String, Number], default: 0, }, calcLoadCurr: { type: [String, Number] }, }, computed: { isCollect() { @@ -327,7 +330,9 @@ return rs; }, loadCurr() { return this.batt.loadCurr != undefined return this.calcLoadCurr ? this.calcLoadCurr : this.batt.loadCurr != undefined ? this.batt.loadCurr.toHold(2) : "??"; }, src/views/dataTest/components/DischargeDialogContent.vue
@@ -5,6 +5,7 @@ :batt="batt" :p-read-only="readOnly" :param-data="paramData" :calc-load-curr="calcLoadCurr" :is-request="isRequest" @close="close" ></discharge-params61850> @@ -69,7 +70,10 @@ default () { return {} } } }, calcLoadCurr: { type: [String, Number] }, }, data() { return {}; src/views/dataTest/components/DischargeParams.vue
@@ -51,10 +51,10 @@ </div> <div class="table-row"> <div class="table-cell pr16"> <el-form-item :label="disCurrText" prop="disCurr"> <el-form-item :label="disCurrText" :prop="isCqdz ? 'disCurr1' : 'disCurr'"> <el-input v-model="params.disCurr" :readonly="readOnly || pReadOnly" :readonly="readOnly || pReadOnly || isCqdz" ></el-input> </el-form-item> </div> @@ -606,13 +606,13 @@ }, setFaceSuccess() { this.setFaceShow = false; this.$nextTick(()=>{ this.$nextTick(() => { this.setParams(); }); }, startFaceSuccess() { this.startFaceShow = false; this.$nextTick(()=>{ this.$nextTick(() => { this.startTest(); }); }, @@ -676,6 +676,9 @@ groupIndexInFBSDevice: this.batt.groupIndexInFBSDevice + 1, }; }, isCqdz() { return this.$CFG.clientName.name === "cqdz"; }, rangeLabel() { let ranges = this.ranges; let result = {}; @@ -688,6 +691,10 @@ }, disCurrText() { let batt = this.batt; if (this.isCqdz) { return "核容电流(A)"; } return "核容电流(1~300A)" + " 实际负载电流:" + batt.loadCurr + "A"; }, }, src/views/dataTest/realTime.vue
@@ -457,6 +457,27 @@ </div> </div> </science-box> <!-- 重庆定制 --> <science-box style="margin-top: 8px; position: relative;" no-header v-show="isCqdz && is61850" > <div class="hdw-state-list table-layout"> <div class="table-row"> <div class="table-cell text-right">交流A相电压:</div> <div class="table-cell">{{ acin1Vola }}</div> </div> <div class="table-row"> <div class="table-cell text-right">交流B相电压:</div> <div class="table-cell">{{ acin1Volb }}</div> </div> <div class="table-row"> <div class="table-cell text-right">交流C相电压:</div> <div class="table-cell">{{ acin1Volc }}</div> </div> </div> </science-box> <!-- 上次核容测试信息 --> <science-box style="position: relative; margin-top: 8px" @@ -575,6 +596,7 @@ <circuit-diagram v-show="batt.fbsdeviceId" :batt="batt" :calc-load-curr="calcLoadCurr" :online-vol="inputs.onlineVol" :group-vol="inputs.groupVol" :batt-curr="inputs.groupCurr" @@ -856,6 +878,7 @@ v-if="dischargeDialog.show" :is-request="isRequest" :batt="batt" :calc-load-curr="calcLoadCurr" @close="closeDisChargeDialog" > </discharge-dialog-content> @@ -1399,6 +1422,10 @@ ); let pageConfig = this.$store.getters["user/realTabsConfig"]; return { acin1Vola: 0, acin1Volb: 0, acin1Volc: 0, calcLoadCurr: 0, tabConfigFromBattInf: {}, restartFaceShow: false, regularTestResInfo: { @@ -2315,6 +2342,9 @@ groupNum: batt.groupIndexInFBSDevice, pageType, // standard-标准,dbs-多宝山 }; if (this.isCqdz && this.is61850) { params.stationId = batt.stationId; } // console.log("=====9=", params, JSON.stringify(params)); this.SOCKET.send(JSON.stringify(params)); }, @@ -2338,6 +2368,17 @@ // 处理是否需要申请放电 或者申请状态 if (this.isSxty) { this.checkDischarge(data.testNumber, data.Fbs9100SetParamTemp); } if (this.isCqdz && this.is61850) { let pwrdevAcdc = data.pwrdevAcdc?.data2; _obj = {}; if (pwrdevAcdc?.list.length) { _obj = pwrdevAcdc.list[0]; } this.acin1Vola = _obj.acin1Vola; this.acin1Volb = _obj.acin1Volb; this.acin1Volc = _obj.acin1Volc; this.calcLoadCurr = _obj.loaderCurr; } this.dataChangeFlag = Math.random(); // 数据更新 if (this.acdcSecuityFlag) { @@ -4574,6 +4615,13 @@ isSxty() { return this.$CFG.clientName.name === "sxty"; }, isCqdz() { return this.$CFG.clientName.name === "cqdz"; }, is61850() { let batt = this.batt; return regEquipType(batt.fbsdeviceId, "equip61850"); }, isCanUpdateTime() { let batt = this.batt; return regEquipType(batt.fbsdeviceId, "equip61850") && !this.isSxty;