内容提交

whychdw

2021-12-23 9f27b30e16219c66e9c88b27312a6736af5085a3

内容提交

 src/assets/js/apis/dataMager/battGroupMager.js

@@ -103,5 +103,16 @@
           data: 'json='+JSON.stringify(data)
        });
    },

    /**
     * 获取设备的最大的ID
     * @param id  设备的识别号
     * @returns {AxiosPromise}
     */
    getMaxIp(id) {
        return axios({
            method: 'post',
            url: 'BattInfAction!getDeviceId',
            data: 'json='+id
        });
    }
}

 src/assets/js/config.js

@@ -46,4 +46,9 @@
        des: '首页显示大屏展示',
        value: false,
    },
    verifyCode: {
        label: '验证码',
        des: '登录是否启用验证码',
        value: false,
    },
};

 src/assets/js/tools/getDevIp.js

New file
@@ -0,0 +1,25 @@
/**
 * 根据设备id计算设备ip
 * @param dev_id
 * @returns {string}
 */
function getDevIp(dev_id) {
  let ptn = /^[0-9]{4}([0-9]+)$/;
  let ip = '';
  if(ptn.test(dev_id)) {
    let value = Number(RegExp.$1);
    let intNum = prefixInteger(Math.floor(value/256), 3);
    let resNum = prefixInteger(value%256, 3);
    ip = '127.000.'+intNum+'.'+resNum;
  }else {
    ip = '设备ID格式不正确';
  }
  return ip;
}

// 获取001类似数据
function prefixInteger(num, length) {
  return (Array(length).join('0') + num).slice(-length);
}

export default getDevIp;

 src/components/battGroupMager/AddBattGroup.vue

@@ -216,6 +216,7 @@
                </el-col>
            </el-row>
            <div class="form-footer">
                <three-btn @click="autoComputeIp" v-if="params.FBSDeviceId == '9100'">自动计算IP</three-btn>
                <three-btn @click="submitFrom">确定</three-btn>
            </div>
        </el-form>
@@ -317,6 +318,7 @@
    import {
        constants
    } from 'zlib';
import getDevIp from "@/assets/js/tools/getDevIp";
    export default {
        props: {
            batt: {
@@ -1098,6 +1100,24 @@
              }else {
                this.params.tmp_id = 0;
              }
            },
            autoComputeIp() {
              let loading = this.$layer.loading();
              this.$apis.dataMager.battGroupMager.getMaxIp(this.params.FBSDeviceId).then(res=>{
                let rs = JSON.parse(res.data.result);
                let dev_id = rs.data;
                let ip = getDevIp(dev_id);
                this.$alert("设备IP:"+ip+"，已自动更新到设备IP", "系统提示", {
                  confirmButtonText: '确定',
                });
                this.params.FbsDeviceIp = ip;
                // 关闭等待框
                this.$layer.close(loading);
              }).catch(error=>{
                // 关闭等待框
                this.$layer.close(loading);
                console.log(error);
              })
            }
        },
        computed: {

 src/pages/login.vue

@@ -36,7 +36,7 @@
              @keyup.enter.native.stop="onSubmit"
            ></el-input>
          </el-form-item>
          <el-form-item>
          <el-form-item v-if="sysConfig.verifyCode.value">
            <el-row :gutter="8">
              <el-col :span="14">
                <el-input class="input" placeholder="验证码" v-model="loginForm.verify" @keyup.enter.native.stop="onSubmit"></el-input>
@@ -166,6 +166,7 @@
<script>
import AddLicense from "@/pages/AddLicense";
import FaceLogin from "@/components/face/FaceLogin";
import sysConfig from "@/assets/js/config"
import {
  login,
  initDBPool,
@@ -200,6 +201,7 @@
  },
  data() {
    return {
      sysConfig: sysConfig,
      register: false,
      loading: false,
      labelPosition: "right" /*  登录表单 */,
@@ -259,7 +261,7 @@
      if (this.loading) {
        return;
      }
      if(this.loginForm.verify.toLowerCase() != this.verifyCode.toLowerCase()) {
      if(this.loginForm.verify.toLowerCase() != this.verifyCode.toLowerCase() && this.sysConfig.verifyCode.value) {
        this.$message.error("验证码错误！");
        return;
      }