内容提交

longyvfengyun

2022-05-13 e71d644d5a1bc79f32ac89740c7829c9244eb987

内容提交

 src/assets/js/tools/getPasswordRule.js

@@ -12,19 +12,19 @@
  };
  switch (Number(type)) {
    case 1:
      result.pattern = new RegExp("(?=.*[a-z])(?=.*[A-Z])(?=.*\\d)[^]{"+num+",}");
      result.pattern = new RegExp("((?=.*[a-z])(?=.*[A-Z])(?=.*\\d)[^]){"+num+",}");
      result.msg="最少"+num+"个字符，至少1个大写字母，1个小写字母和1个数字";
      break;
    case 2:
      result.pattern = new RegExp("(?=.*[a-z])(?=.*[A-Z])(?=.*\\d)(?=.*[$@$!%*?&.])[A-Za-z\\d$@$!%*?&.]{"+num+",}");
      result.pattern = new RegExp("((?=.*[a-z])(?=.*[A-Z])(?=.*\\d)(?=.*[$@$!%*?&.])[A-Za-z\\d$@$!%*?&.]){"+num+",}");
      result.msg="最少"+num+"个字符，至少1个大写字母，1个小写字母和1个特殊字符";
      break;
    case 3:
      result.pattern = new RegExp("(?=.*[A-Z])(?=.*\\d)(?=.*[$@$!%*#?&])[A-Z\\d$@$!%*#?&][^]{"+num+",}");
      result.pattern = new RegExp("((?=.*[A-Z])(?=.*\\d)(?=.*[$@$!%*#?&])[A-Z\\d$@$!%*#?&][^]){"+num+",}");
      result.msg="最少"+num+"个字符，至少1个大写字母，1个数字和1个特殊字符";
      break;
    case 4:
      result.pattern = new RegExp("(?=.*[a-z])(?=.*\\d)(?=.*[$@$!%*#?&])[a-z\\d$@$!%*#?&][^]{"+num+",}");
      result.pattern = new RegExp("((?=.*[a-z])(?=.*\\d)(?=.*[$@$!%*#?&])[a-z\\d$@$!%*#?&][^]){"+num+",}");
      result.msg = "最少"+num+"个字符，至少1个小写字母，1个数字和1个特殊字符";
      break;
    default:

 src/components/params/61850/DischargeParams.vue

@@ -188,6 +188,7 @@
                MonomerTmp_High: 0, // 单体温度上限
                DCVolHighLimit: 0,  // 升压上限
                ChargeCurrSet: 0, // 充电电流
                BattGroupNum: 0,  // 电池组编号
            },
            rules: {
                DisCap: [{
@@ -257,6 +258,7 @@
                MonomerTmp_High: 0, // 单体温度上限
                DCVolHighLimit: 0,  // 升压上限
                ChargeCurrSet: 0, // 充电电流
                BattGroupNum: 0,  // 电池组编号
            };
        },
        // 获取参数
@@ -272,7 +274,8 @@
            // 查询后台
            this.$apis.dischargeTest.e61850.getParams({
                num: this.cmd.get,
                dev_id: this.batt.FBSDeviceId
                dev_id: this.batt.FBSDeviceId,
                BattGroupNum: this.batt.GroupIndexInFBSDevice+1
            }).then(res => {
                let rs = JSON.parse(res.data.result);
                if (rs.code == 1) {

 src/components/params/BTS/DischargeParams.vue

@@ -324,7 +324,8 @@
            // 查询后台
            this.$apis.dischargeTest.bts.getParams({
                num: this.cmd.get,
                dev_id: this.batt.FBSDeviceId
                dev_id: this.batt.FBSDeviceId,
                BattGroupNum: this.batt.GroupIndexInFBSDevice+1
            }).then(res => {
                let rs = JSON.parse(res.data.result);
                if(rs.code == 1) {

 src/pages/dataTest/components/chargeDialogContent.vue

@@ -237,7 +237,8 @@
            // 查询后台
            this.$apis.dischargeTest.bts.getParams({
                num: this.cmd.get,
                dev_id: this.batt.FBSDeviceId
                dev_id: this.batt.FBSDeviceId,
                BattGroupNum: this.batt.GroupIndexInFBSDevice+1
            }).then(res => {
                let rs = JSON.parse(res.data.result);
                if(rs.code == 1) {

 src/pages/dataTest/components/dischargeDialogContent.vue

@@ -261,7 +261,8 @@
            // 查询后台
            this.$apis.dischargeTest.bts.getParams({
                num: this.cmd.get,
                dev_id: this.batt.FBSDeviceId
                dev_id: this.batt.FBSDeviceId,
                BattGroupNum: this.batt.GroupIndexInFBSDevice+1
            }).then(res => {
                let rs = JSON.parse(res.data.result);
                if(rs.code == 1) {

 src/pages/index.vue

@@ -33,12 +33,12 @@
                            </div>
                            <div class="item-wrapper text-wrapper">电池组告警机房</div>
                        </div>
                        <div class="map-icon-item">
                            <div class="item-wrapper icon-wrapper">
                                <img src="../assets/images/home-charge.png" />
                            </div>
                            <div class="item-wrapper text-wrapper">电池组放电延时机房</div>
                        </div>
<!--                        <div class="map-icon-item">-->
<!--                            <div class="item-wrapper icon-wrapper">-->
<!--                                <img src="../assets/images/home-charge.png" />-->
<!--                            </div>-->
<!--                            <div class="item-wrapper text-wrapper">电池组放电延时机房</div>-->
<!--                        </div>-->
                        <div class="map-icon-item">
                            <div class="item-wrapper icon-wrapper">
                                <img src="../assets/images/home-normal.png" />

 src/pages/userMager/addEdit.vue

@@ -98,26 +98,27 @@
            </el-select>
          </el-form-item>
          <div class="clear" v-if="status == 'edit'"></div>
<!--          <el-form-item label="用户角色:" class="table-cell">-->
<!--            <el-select-->
<!--              v-model="formData.uRole"-->
<!--              size="mini"-->
<!--              placeholder="请选择用户角色"-->
<!--              class="width_140"-->
<!--            >-->
<!--              <el-option-->
<!--                v-for="item in URoleList"-->
<!--                :key="item.value"-->
<!--                :label="item.label"-->
<!--                :value="item.value"-->
<!--              >-->
<!--              </el-option>-->
<!--            </el-select>-->
<!--          </el-form-item>-->
          <el-form-item label="用户角色等级:" class="table-cell">
            <el-select
              v-model="formData.uRole"
              size="mini"
              placeholder="请选择用户角色"
              class="width_140"
            >
              <el-option
                v-for="item in URoleList"
                :key="item.value"
                :label="item.label"
                :value="item.value"
              >
              </el-option>
            </el-select>
          </el-form-item>
          <el-form-item label="用户类型:" class="table-cell">
            <el-select
              v-model="formData.type"
              size="mini"
              :disabled="true"
              placeholder="请选择用户类型"
              class="width_140">
              <el-option

 src/pages/userMager/userInfo.vue

@@ -27,6 +27,7 @@
                    </template>
                </el-table-column>
                <el-table-column prop="PermitgroupName" align="center" width="180" label="权限组"></el-table-column>
                <el-table-column prop="URoleText" :min-width="120" align="center" label="用户角色"></el-table-column>
<!--                <el-table-column prop="URoleText" :min-width="120" align="center" label="用户角色"></el-table-column>-->
                <el-table-column prop="typeText" :min-width="120" align="center" label="用户类型">
                  <template slot-scope="scope">