he wei
2025-01-14 933bfd4bf3a4961009da4099c0aa740a1c28fb5d
U 全功能假负载 逆变修改
5个文件已修改
29 ■■■■■ 已修改文件
src/views/dataTest/components/hr6184Content.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/dataTest/realTime6183.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/dataTest/realTime6184.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/login/components/UKeyBind/BindStep3.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/login/js/api.js 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/dataTest/components/hr6184Content.vue
@@ -466,7 +466,7 @@
      start(this.devId, this.idx + 1)
        .then((res) => {
          res = res.data;
          if (res.code && res.data2) {
          if (res.code && res.data) {
            // 提示信息
            this.$layer.msg("启动测试成功");
            this.$emit("close");
src/views/dataTest/realTime6183.vue
@@ -113,7 +113,7 @@
                            size="mini"
                            v-if="canStopHr"
                            @click="stopTest"
                            >停止核容</el-button
                            >停止{{ systemData.workState == 2 ? "核容" : "充电" }}</el-button
                        >
            <el-button
                            type="primary"
@@ -1994,8 +1994,9 @@
                }
                return "设备全称";
            },
      // 判断当前设备是否可以停止 核容和充电
      canStopHr() {
       return  this.systemData.workState == 2 && this.currentGroup == this.currWorkGrp - 1;
       return  (this.systemData.workState == 2 || this.systemData.workState == 1) && this.currentGroup == this.currWorkGrp - 1;
      },
      canStopRes() {
       return  this.systemData.workState == 4 && this.currentGroup == this.currWorkGrp - 1;
src/views/dataTest/realTime6184.vue
@@ -45,7 +45,7 @@
              {{ currentGroup == 0 ? "电池组: 1" : "电池组: 2" }}
            </div>
            <!-- 按钮组 -->
            <el-button type="warning" size="mini" v-if="canStopHr" @click="stopTest">停止核容</el-button>
            <el-button type="warning" size="mini" v-if="canStopHr" @click="stopTest">停止{{ systemData.workState == 2 ? "核容" : "充电" }}</el-button>
            <el-button type="primary" size="mini" v-if="canStopRes" @click="stopResTest">停止内阻测试</el-button>
            <el-button type="primary" size="mini" v-else :disabled="!canTest"
              @click="confirmStartResTest">启动内阻测试</el-button>
@@ -1812,9 +1812,10 @@
                }
                return "设备全称";
            },
            canStopHr() {
                return this.systemData.workState == 2 && this.currentGroup == this.currWorkGrp - 1;
            },
            // 判断当前设备是否可以停止 核容和充电
      canStopHr() {
       return  (this.systemData.workState == 2 || this.systemData.workState == 1) && this.currentGroup == this.currWorkGrp - 1;
      },
            canStopRes() {
                return this.systemData.workState == 4 && this.currentGroup == this.currWorkGrp - 1;
            },
src/views/login/components/UKeyBind/BindStep3.vue
@@ -65,12 +65,13 @@
            let loading = this.$layer.loading();
            getUKeyByUName(name).then(res => {
                let rs = res.data;
        // 1:已经绑定ukey,0:用户不存在 -1:可以绑定
                if (rs.code == 1) {
                    this.$layer.msg(name + "已经绑定ukey");
                    this.$layer.msg(rs.msg);
                    // 关闭等待框
                    this.$layer.close(loading);
                } else if (rs.code == -1) {
                    this.$layer.msg(name + "用户不存在,请检查输入的用户名");
                } else if (rs.code == 0) {
                    this.$layer.msg(rs.msg);
                    // 关闭等待框
                    this.$layer.close(loading);
                } else {
src/views/login/js/api.js
@@ -131,15 +131,15 @@
/**
 * 根据用户名查询绑定的ukey
 * @param UName 用户名称
 * @param userName 用户名称
 * @returns {AxiosPromise}
 */
export const getUKeyByUName = (UName) => {
export const getUKeyByUName = (userName) => {
  return axios({
    method: "GET",
    url: "/user/searchUNameToUKey",
    params: {
      uKeyId: UName,
      userName,
    },
  });
};