内容提交

longyvfengyun

2023-12-25 d8d792a6842832e8f6af6604274c438b25053afe

内容提交

 package-lock.json

@@ -4454,14 +4454,10 @@
      }
    },
    "node_modules/caniuse-lite": {
      "version": "1.0.30001286",
      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001286.tgz",
      "integrity": "sha512-zaEMRH6xg8ESMi2eQ3R4eZ5qw/hJiVsO/HlLwniIwErij0JDr9P+8V4dtx1l+kLq6j3yy8l8W4fst1lBnat5wQ==",
      "dev": true,
      "funding": {
        "type": "opencollective",
        "url": "https://opencollective.com/browserslist"
      }
      "version": "1.0.30001571",
      "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001571.tgz",
      "integrity": "sha512-tYq/6MoXhdezDLFZuCO/TKboTzuQ/xR5cFdgXPfDtM7/kchBO3b4VWghE/OAi/DV7tTdhmLjZiZBZi1fA/GheQ==",
      "dev": true
    },
    "node_modules/case-sensitive-paths-webpack-plugin": {
      "version": "2.4.0",
@@ -22561,9 +22557,9 @@
      }
    },
    "caniuse-lite": {
      "version": "1.0.30001286",
      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001286.tgz",
      "integrity": "sha512-zaEMRH6xg8ESMi2eQ3R4eZ5qw/hJiVsO/HlLwniIwErij0JDr9P+8V4dtx1l+kLq6j3yy8l8W4fst1lBnat5wQ==",
      "version": "1.0.30001571",
      "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001571.tgz",
      "integrity": "sha512-tYq/6MoXhdezDLFZuCO/TKboTzuQ/xR5cFdgXPfDtM7/kchBO3b4VWghE/OAi/DV7tTdhmLjZiZBZi1fA/GheQ==",
      "dev": true
    },
    "case-sensitive-paths-webpack-plugin": {

 package.json

@@ -3,8 +3,8 @@
  "version": "2.2.5",
  "private": true,
  "scripts": {
    "serve": "vue-cli-service serve --mode dev",
    "build": "vue-cli-service build",
    "serve": "set NODE_OPTIONS=--openssl-legacy-provider & vue-cli-service serve --mode dev",
    "build": "set NODE_OPTIONS=--openssl-legacy-provider & vue-cli-service build",
    "lint": "vue-cli-service lint"
  },
  "dependencies": {

 src/assets/js/axios.js

@@ -3,7 +3,7 @@
import rejectReplay from "@/assets/js/tools/rejectReplay";
if(process.env.NODE_ENV == 'dev') {
    // 跨域请求
    axios.defaults.baseURL = 'http://localhost:8919/fg/';
    axios.defaults.baseURL = 'http://localhost:8091/fg/';
    axios.defaults.withCredentials = true;  // 保持请求头
}
let skipUrls = ["Server_stateAction_action_getTimestamp"];

 src/assets/js/config.js

@@ -2,18 +2,18 @@
    logo: {
        label: '平台logo',
        des: '显示平台logo状态',
        fileName: 'qwh',       // gjdw, nfdw, gjdx, qwh
        value: true,
        fileName: 'nfdw',       // gjdw, nfdw, gjdx, qwh
        value: false,
    },
    uKey: {
        label: 'uKey',
        des: "用户需要通过插入uKey才可以登录",
        value: false,
        value: true,
    },
    face: {
        label: "人脸识别",
        des: "用户可以直接通过人脸识别登录",
        value: false
        value: true
    },
    autograph: {
        label: '签名',
@@ -23,23 +23,23 @@
    changeIp: {
        label: '远程修改IP',
        des: '电池信息配置中点击编辑可以远程修改ip',
        value: false,
        value: true,
    },
    dischargeByFace: {
        label: '启动放电添加人脸识别',
        des: '启动充放电测试使用人脸识别',
        value: false,
        value: true,
    },
    copyRight: {
        label: '版权声明',
        des: '显示版权信息',
        data: '版权所有：北京清网华科技股份有限公司 电话：021-75498（路电）',
        value: true,
        value: false,
    },
    weather: {
        label: '天气预报',
        des: '启动充放电测试使用人脸识别',
        value: true,
        value: false,
    },
    bigScreen: {
        label: '大屏数据展示',
@@ -73,4 +73,4 @@
        name: '',       // 成都石化 cdsh， 标准版为''
        value: false,
    },
};
};

 src/pages/dataMager/battGroupMager.vue

@@ -4,9 +4,10 @@
            <div class="table-row">
                <div class="table-cell text-right">省：</div>
                <div class="table-cell">
                    <el-select 
                    <el-select
                    v-model="filters.values.province"
                    @change="searchCity"  
                    @change="searchCity"
                    allow-create
                    size="small" placeholder="请选择省">
                        <el-option
                        v-for="item in filters.data.province"
@@ -18,9 +19,10 @@
                </div>
                <div class="table-cell text-right">市：</div>
                <div class="table-cell">
                    <el-select 
                    <el-select
                    v-model="filters.values.city"
                    @change="searchCounty"  
                    @change="searchCounty"
                    allow-create
                    size="small" placeholder="请选择市">
                        <el-option
                        v-for="item in filters.data.city"
@@ -32,9 +34,9 @@
                </div>
                <div class="table-cell text-right">区/县/班组：</div>
                <div class="table-cell">
                    <el-select 
                    <el-select
                    v-model="filters.values.county"
                    @change="searchHome"  
                    @change="searchHome"
                    size="small" placeholder="请选择区/县/班组">
                        <el-option
                        v-for="item in filters.data.county"
@@ -46,10 +48,11 @@
                </div>
                <div class="table-cell text-right">机房名称：</div>
                <div class="table-cell w360">
                    <el-select 
                    <el-select
                    v-model="filters.values.home"
                    @change="changeHome"
                    filterable
                    allow-create
                    size="small" placeholder="请选择机房名称">
                        <el-option
                        v-for="item in filters.data.home"
@@ -308,9 +311,9 @@
                <el-button type="primary" @click="searchData" round size="mini" icon="el-icon-search">查询</el-button>
                <el-button type="primary" round size="mini" icon="el-icon-wallet" @click="exportFile">导出</el-button>
            </div>
            <el-pagination size="mini" 
            :current-page="page.pageCurr" 
            :page-sizes="[10, 20, 30, 50, 100]" 
            <el-pagination size="mini"
            :current-page="page.pageCurr"
            :page-sizes="[10, 20, 30, 50, 100]"
            :page-size="page.pageSize"
            layout="total, sizes, prev, pager, next, jumper"
            :total="page.pageAll"
@@ -344,7 +347,7 @@
        top="0"
        class="dialog-center"
        :modal-append-to-body="false">
            <add-group-mager 
            <add-group-mager
            v-if="addDialog"
            :batt="batt"
            @success="addSuccess"></add-group-mager>
@@ -358,7 +361,7 @@
        top="0"
        class="dialog-center"
        :modal-append-to-body="false">
            <edit-group-mager 
            <edit-group-mager
            v-if="editDialog"
            :batt="batt"
            @success="editSuccess"></edit-group-mager>
@@ -619,7 +622,7 @@
                            };
                            data.push(tmp);
                        }
                        

                    }
                }
                // 设置第一笔数据
@@ -629,7 +632,7 @@
                });
                // 设置机房
                this.filters.data.home = data;
                

                // 查询数据
                this.searchData(true);
            });
@@ -651,7 +654,7 @@
        searchData(noLoading) {
            if(!noLoading) {
                this.loading = this.$layer.loading(1);
            } 
            }
            let filters= this.filters.values;
            // 构造查询条件
            let searchParams = {

 src/pages/dataTest/realTime.vue

@@ -916,7 +916,7 @@
      top="0"
      class="dialog-center"
      :modal-append-to-body="false"
    > 
    >
        <div class="wx_guides">
          <p>参考线：</p>
          <p><el-input v-model="guidesVal"></el-input></p>
@@ -943,6 +943,20 @@
      </div>
    </right-menu>
    <stop-outline-curing :dev-id="batt.FBSDeviceId" :stop-time="stopTime"></stop-outline-curing>
      <el-dialog
          title="人脸校验"
          width="480px"
          :visible.sync="startFaceShow"
          :close-on-click-modal="false"
          top="0"
          :modal="false"
          class="dialog-center"
          :modal-append-to-body="false"
          :destroy-on-close="true">
          <check-face
              v-if="startFaceShow"
              @checkSuccess="startFaceSuccess"></check-face>
      </el-dialog>
  </flex-layout>
</template>

@@ -1012,12 +1026,15 @@
import AutoCheck from "@/pages/dataTest/dialogs/autoCheck";
import const_9120 from "@/assets/js/const/const_9120";
import LithiumPackTab from "@/pages/dataTest/components/lithiumPackTab";
import CheckFace from "@/components/checkFace.vue";
import config from "@/assets/js/config";

/* import moment from "moment"; */
let vol, resChart, temp, conduct, currChart, leakVol, monConnRes;
let tblData = [];
export default {
  components: {
      CheckFace,
    LithiumPackTab,
    AutoCheck,
    stopOutlineCuring,
@@ -1066,6 +1083,9 @@
        this.resize();
      });
    },
    "$store.user.realTabsConfig"(pageConfig) {
      this.pageConfig = pageConfig;
    }
    // "diagram.type"(n) {
    //   // console.log(n, '===========测试类型：');
    //   let batt = this.batt;
@@ -1080,6 +1100,7 @@
    let lastCapacityTest = const_61850.lastCapacityTest;
    let pageConfig = this.$store.getters["user/realTabsConfig"];
    return {
        startFaceShow: false,
      // 成都石化
      cdshStatus:this.cdshFan(),
      guidesDialog:false,
@@ -1092,7 +1113,7 @@
        leakVol:0

      },
      // 
      //
      loading: false,
      workPlanDialog: false,
      dcdcWorkDialog: false,
@@ -1605,7 +1626,7 @@
    cdshFan:function(){
      return this.$CFG.clientName.name;
    },
    // 
    //
    tabClick(tab) {
      this.acTabs = tab.name;
      // 根据tab更新电路图
@@ -1942,6 +1963,16 @@
      if (regEquipType(data.FBSDeviceId, ["equip61850"])) {
        this.getLastCapacityTest(data);
      }

      let keyList = ["eleLine", "vol", "res", "temp", "conduct", "monConnRes",
        "curr", "leakVol", "tblData", "dianchigaojing", "niBianInfoTab", "jggdInfoTab", "elePrice", "bmsInfo"];
      for(let i=0; i<keyList.length; i++) {
        let key = keyList[i];
        if(this.pageConfig[key]) {
          this.acTabs = key;
          break;
        }
      }
      this.loading = true;
      this.changeTabsName();
      this.$nextTick(()=>{
@@ -2154,7 +2185,7 @@
                        // }else{
                          obj[key] = vm.guidesData[key];
                        // }
                        

                      }
                      return obj;
                    }();
@@ -2725,7 +2756,7 @@
        this.chargeMon = chargeMon;
        this.dischargeMon = dischargeMon;
        this.tdata = data;
        

        // 更新表格
        if (this.acTabs == "tblData") {
          this.table.datas = data;
@@ -3373,6 +3404,20 @@
    closeDisChargeDialog() {
      this.dischargeDialog.show = false;
    },
      startFaceSuccess() {
            this.startFaceShow = false;
          let batt = this.batt;
          let loading = this.$layer.loading();
          this.$apis.outline.restart(batt.FBSDeviceId).then((res) => {
              let rs = JSON.parse(res.data.result);
              if (rs.code == 1) {
                  this.$alert("发送重启命令成功", "系统提示");
              } else {
                  this.$alert("发送重启命令失败!", "系统提示");
              }
              this.$layer.close(loading);
          }).catch((error) => {});
      },
    restartSystem() {
      let self = this;
      let batt = this.batt;
@@ -3381,27 +3426,17 @@
        confirmButtonText: "确定",
        cancelButtonText: "取消",
        inputType: "password",
      })
        .then(({ value }) => {
      }).then(({ value }) => {
          if (value == resetPwd) {
            let loading = this.$layer.loading();
            this.$apis.outline
              .restart(batt.FBSDeviceId)
              .then((res) => {
                let rs = JSON.parse(res.data.result);
                if (rs.code == 1) {
                  this.$alert("发送重启命令成功", "系统提示");
                } else {
                  this.$alert("发送重启命令失败!", "系统提示");
                }
                this.$layer.close(loading);
              })
              .catch((error) => {});
              if (config.dischargeByFace.value) {
                            this.startFaceShow = true;
              }else {
                  this.startFaceSuccess();
              }
          } else {
            this.$layer.msg("密码不正确");
          }
        })
        .catch(() => {});
        }).catch(() => {});
    },
    changeSkin() {
      this.$nextTick(() => {
@@ -3539,7 +3574,7 @@
      if(this.cdshStatus == "cdsh"){
        list.MonCount = this.inputs.MonCount;
        list.MonVolStd = this.inputs.MonVolStd + "V";
        

      }
      if (this.inputs.batt_state === 3) {
        // 为0是不更新剩余容量
@@ -3979,7 +4014,7 @@
.wx_guides p {
  display: inline-block;
  margin-right: 10px;
  

}
.wx_guides p /deep/.el-input__inner {
  color:#000;

 src/pages/login.vue

@@ -564,6 +564,7 @@
      this.loading = false;
      let rs = JSON.parse(res.data.result);
      if (rs.code == 1) {
        this.initPageConfig();
        // 非自动登录提示登录成功
        if (!this.isAutoLogin) {
          this.$message.success("登录成功");
@@ -795,6 +796,19 @@
        this.normalLogin();
      });
    },
    initPageConfig() {
      this.$apis.pageSetting.realTime
          .getRealTabsConfig()
          .then((res) => {
            let rs = JSON.parse(res.data.result);
            // 设置pageConfig
            this.$store.dispatch("user/changeRealTabsConfig", rs.data);
          })
          .catch((error) => {
            // 设置pageConfig
            this.$store.dispatch("user/changeRealTabsConfig", []);
          });
    },
  },
  computed: {
    uKeyState() {
@@ -946,9 +960,9 @@
    //console.log(AES.decrypt("FCGylc7v1wXzmTqpRXPPGA=="));
    //console.log(md5("a123456"));
    //console.log(JSON.stringify("5OUaEnC33sVNY+jeXlx3Qg=="));
    // let rsaWord = RSA.encrypt("123456");
    // console.log(rsaWord);
    //console.log(RSA.decrypt("", const_num.privateKey));
    let rsaWord = RSA.encrypt("123456");
    console.log(rsaWord);
    // console.log(RSA.decrypt("MoRg8hhjrvdWQ2YeQiyscX8ycqPQJbGz1n1iRfLCA9qszFRxW9zcRpD10rsUmvdxLmpXp2s5RZW6Mc9B9M6THEGVuWRwkPnPIE3X5xUSeIxCfSW1ksibd0t+mAgWDhz7gnDjUGUKof/kmNmaC65uC2bW4+hMmuyyP1YTHjeNpL0=", const_num.privateKey));
  },
};
</script>