内容提交

longyvfengyun

2022-06-09 679f4da19338fdfd43edb960124c2d6e4437e022

内容提交

 src/assets/images/login_loading.gif

 src/assets/js/config.js

@@ -13,7 +13,7 @@
    face: {
        label: "人脸识别",
        des: "用户可以直接通过人脸识别登录",
        value: false
        value: true
    },
    autograph: {
        label: '签名',

 src/components/face/FaceLogin.vue

@@ -10,6 +10,8 @@
import faceManager from '../../assets/js/apis/faceManager/faceManager.js'
import {uKeyLogin} from "@/assets/js/api";
import const_num from "@/assets/js/const/const_num";
import sysConfig from "@/assets/js/config";
import RSA from "@/assets/js/tools/RSA";
export default {
    props: {
        faceShow: {
@@ -114,7 +116,7 @@
        },
        // 请求后台验证人脸
        facePost: function () {
            if(!this.$store.state.ukey.isIn) {
            if(!this.$store.state.ukey.isIn && sysConfig.uKey.value) {
                this.faceDetect = '请先插入ukey';
                this.setTime = setTimeout(() => {
                    this.facePost();
@@ -153,8 +155,13 @@
            faceManager.getUserName().then(res => {
                let result = JSON.parse(res.data.result);
                if (result.code == 1) {
                    let password = RSA.decrypt(result.data.USnId, const_num.privateKey)
                    this.uKeyLogin(result.data.UName, password);
                    let password = RSA.decrypt(result.data.USnId, const_num.privateKey);
                    if(sysConfig.uKey.value) {
                      this.uKeyLogin(result.data.UName, password);
                    }else {
                      this.faceSuccessLogin(result.data.UName, password);
                    }

                }
            }).catch(err => {
                console.log(err);
@@ -173,6 +180,12 @@
                this.facePost();
            });
        },
        faceSuccessLogin(username, password) {
          this.$emit("successLogin", {
            username,
            password
          });
        },
        handleLogin(res, username) {
            let rs = JSON.parse(res.data.result);
            if (rs.code == 1) {

 src/pages/dataTest/history.vue

@@ -792,8 +792,8 @@
                                    show: true,
                                    position: 'end',
                                    formatter: [
                                        '{a|' + allData.groupVol[specialPoint.min][0] + '}' + '{c|}',
                                        '{b|锅底电压:' + allData.groupVol[specialPoint.min][1] + 'V}' + '{c|}'
                                        '{a|Tg:' + allData.groupVol[specialPoint.min][0] + '}' + '{c|}',
                                        '{b|锅底电压Vg:' + allData.groupVol[specialPoint.min][1] + 'V}' + '{c|}'
                                    ].join('\n'),
                                    rich: {
                                        a: {
@@ -814,8 +814,8 @@
                                    show: true,
                                    position: 'end',
                                    formatter: [
                                        '{c|}' + '{a|' + allData.groupVol[specialPoint.max][0] + '}',
                                        '{c|}' + '{b|驼峰电压:' + allData.groupVol[specialPoint.max][1] + 'V}'
                                        '{c|}' + '{a|Tt:' + allData.groupVol[specialPoint.max][0] + '}',
                                        '{c|}' + '{b|驼峰电压Vt:' + allData.groupVol[specialPoint.max][1] + 'V}'
                                    ].join('\n'),
                                    rich: {
                                        a: {

 src/pages/login.vue

@@ -1,6 +1,6 @@
<template>
  <div class="auto-login-loading" v-if="isAutoLogin">
    <img src="../assets/images/loading-open.gif">
    <img src="../assets/images/login_loading.gif">
  </div>
  <div class="login-wrapper" v-else>
    <div class="login_container">
@@ -168,6 +168,7 @@
          v-if="face.show"
          :visible.sync="face.show"
          @success="checkServeLicense"
          @successLogin="faceSuccessLogin"
        ></face-login>
      </el-dialog>
      <!-- 功能描述 -->
@@ -720,6 +721,15 @@
        sessionStorage.setItem("passwordType", "4");
      });
    },
    faceSuccessLogin(info) {
      this.face.show = false;
      this.loginForm.username = info.username;
      this.loginForm.password = info.password;
      this.loginForm.verify = this.verifyCode;
      this.$nextTick(()=>{
        this.normalLogin();
      });
    }
  },
  computed: {
    uKeyState() {
@@ -825,7 +835,7 @@
    //console.log(AES.decrypt("FCGylc7v1wXzmTqpRXPPGA=="));
    //console.log(md5("a123456"));
    //console.log(JSON.stringify("5OUaEnC33sVNY+jeXlx3Qg=="));
    // let rsaWord = RSA.encrypt("123456");
    // let rsaWord = RSA.encrypt("890-ppPP");
    // console.log(rsaWord);
    //console.log(RSA.decrypt("", const_num.privateKey));
  },

 src/pages/reportStatistics/eleAnalyse.vue

@@ -119,6 +119,12 @@
            return {
                exportUrl: baseURL+"ExportTable.servlet",
                allSelected: true,
                limitValues: {
                  lowCA: 0.4,
                  lowCH: 0.5,
                  lowRA: 0.94,
                  lowRH: 0.01,
                },
                eleAnalysetable: {
                    headers: [{
                            prop: "BattGroupId",
@@ -185,6 +191,11 @@
                            prop: "group_vol_percentage",
                            label: "容量百分比",
                            width: 95
                        },
                        {
                          prop: "records",
                          label: "指导建议",
                          width: 95
                        }
                    ],
                    datas: []
@@ -436,6 +447,7 @@
                        this.$layer.msg('暂无查询结果！');
                    }
                }).catch((err) => {
                    console.log(err);
                    // 关闭等待框
                    this.$layer.close(loading);
                    this.$layer.msg('查询失败');
@@ -445,6 +457,7 @@
                let order_num = 1;
                let battgroupid = 0;
                let line_arr = new Array();
                let limitValues = this.limitValues;
                allData = [];
                this.chartData = [];
                this.eleAnalysetable.datas = [];
@@ -495,6 +508,16 @@
                            pointArray.push(data[i].tmodel.data[j].group_vol.toFixed(0));
                            allDate.push(data[i].tmodel.data[j].test_starttime);
                            line_arr.push(pointArray);
                            let realCap = tableObj.group_vol;
                            let MonCapStd = data[i].data.MonCapStd;

                            if (realCap >= MonCapStd * limitValues.lowCA) {
                              tableObj.records = '正常'; //指导建议
                            } else if (realCap < MonCapStd * limitValues.lowCA && realCap > MonCapStd * limitValues.lowCH) {
                              tableObj.records = '告警'; //指导建议
                            } else {
                              tableObj.records = '更换'; //指导建议
                            }
                        }
                    }
                }

 src/pages/reportStatistics/eleMonomer.vue

@@ -205,8 +205,12 @@
                            label: "容量百分比",
                        },
                        {
                          prop: "capDecline",
                          label: "容量下降原因",
                        },
                        {
                            prop: "records",
                            label: "维护记录",
                            label: "指导建议",
                        }
                    ],
                    datas: []
@@ -480,6 +484,7 @@
                    this.$layer.close(loading);
                    this.eleAnalysetable.datas = [];
                    serchLowResdata = JSON.parse(res.data.result);
                    console.log(serchLowResdata);
                    lowCA = serchLowResdata.lowCA;
                    lowCH = serchLowResdata.lowCH;
                    lowRa = serchLowResdata.lowRA;
@@ -572,8 +577,12 @@
                                label: "容量百分比",
                            },
                            {
                              prop: "capDecline",
                              label: "容量下降原因",
                            },
                            {
                                prop: "records",
                                label: "维护记录",
                                label: "指导建议",
                            }
                        ];
                        let order_num = 0;
@@ -614,13 +623,27 @@
                            tableObj.vol_percentage = (realCap * 100 / data[i].binf.MonCapStd).toFixed(0) +
                                "%"; //容量百分比
                            if (realCap >= data[i].binf.MonCapStd * lowCA) {
                                tableObj.records = '正常'; //维护记录
                                tableObj.records = '正常'; //指导建议
                            } else if (realCap < data[i].binf.MonCapStd * lowCA && realCap > data[i].binf
                                .MonCapStd * lowCH) {
                                tableObj.records = '告警'; //维护记录
                                tableObj.records = '告警'; //指导建议
                            } else {
                                tableObj.records = '更换'; //维护记录
                                tableObj.records = '更换'; //指导建议
                            }

                            tableObj.capDecline = "";
                            debugger;
                            let item = data[i];
                            // 浮充电压过低
                            if((item.binf.FloatVolLevel-item.sdata.group_vol)>2) {
                              tableObj.capDecline +="浮充电压过低";
                            }

                            // 充电电流过大
                            if(item.binf.MonCapStd/10*2<item.sdata.test_curr) {
                              tableObj.capDecline += tableObj.capDecline?",充电电流过大":"充电电流过大";
                            }
                            //tableObj.capDecline = tableObj.capDecline?"无":tableObj.capDecline;
                            this.eleAnalysetable.datas.push(tableObj); //请求表格数据
                        }
                        MonNumlist.forEach((item, index) => {
@@ -711,7 +734,7 @@
                            },
                            {
                                prop: "advice",
                                label: "维护建议",
                                label: "指导建议",
                            }
                        ].filter(item=>{
                          let isIn = false;
@@ -807,23 +830,23 @@
                            if (serchLowResdata.newsum == 1) {
                                //根据平均值比较
                                if (conduct >= ((this.arrAverageNum(monser_arr[test_index]).toFixed(0)) * lowRa)) {
                                    tableObj.advice = "正常"; //维护建议;
                                    tableObj.advice = "正常"; //指导建议;
                                } else if (conduct < (this.arrAverageNum(monser_arr[test_index]).toFixed(0)) * lowRa &&
                                    conduct > (this.arrAverageNum(monser_arr[test_index]).toFixed(0)) * lowRH) {
                                    tableObj.advice = "告警"; //维护建议;
                                    tableObj.advice = "告警"; //指导建议;
                                } else {
                                    tableObj.advice = "更换"; //维护建议;
                                    tableObj.advice = "更换"; //指导建议;
                                }

                            } else if (serchLowResdata.newsum == 0) {
                                //根据标称值比较
                                let MonSerstd = resdata.binf.MonResStd;
                                if (conduct >= (MonSerstd * lowRa)) {
                                    tableObj.advice = "正常"; //维护建议;
                                    tableObj.advice = "正常"; //指导建议;
                                } else if (conduct < (MonSerstd * lowRa) && conduct > MonSerstd * lowRH) {
                                    tableObj.advice = "告警"; //维护建议;
                                    tableObj.advice = "告警"; //指导建议;
                                } else {
                                    tableObj.advice = "更换"; //维护建议;
                                    tableObj.advice = "更换"; //指导建议;
                                }
                            }