whychw
2020-11-10 a16e1ed4c3560fb994e3289162642ea28d3dc242
U 操作日志需要操作添加参数dev_name
13个文件已修改
136 ■■■■ 已修改文件
src/api/services/electric/index.js 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/chargePower/alone.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/chargePower/main.vue 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/chargePower/menu.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/chargePower/mixture.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/chargePower/parallel.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/chargePower/series.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/loadManager/autoload.vue 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/loadManager/burstload.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/loadManager/manualload.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/rectifier/group.vue 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/rectifier/main.vue 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/user/syslog.vue 40 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/services/electric/index.js
@@ -89,9 +89,10 @@
     * 电源系统单点控制
     * 参数:id, num, val
     */
    setPos(id, ip, num, val) {
    setPos(id, dev_name, ip, num, val) {
        let data = {
            electric_id: id,
            dev_name: dev_name,
            electric_ip: ip,
            num: num,
        };
@@ -172,9 +173,10 @@
     * 设置组合界面的控制
     * 参数:id, num, val
     */
    setGroupPos(id, ip, num, val) {
    setGroupPos(id, name, ip, num, val) {
        let data = {
            electric_id: id,
            dev_name: name[0] + '套',
            electric_ip: ip,
            num: num,
        };
@@ -209,18 +211,22 @@
            case 7:
                // 输出合闸1
                data.switchon1 = 1;
                data.dev_name = name[1] + '套';
            break;
            case 8:
                // 输出合闸2
                data.switchon2 = 1;
                data.dev_name = name[1] + '套';
            break;
            case 9:
                // 输出分闸1
                data.switchoff1 = 1;
                data.dev_name = name[1] + '套';
            break;
            case 10:
                // 输出分闸2
                data.switchoff2 = 1;
                data.dev_name = name[1] + '套';
            break;
            case 11:
                // 并联运行启动
@@ -241,9 +247,10 @@
     * 设定电压和电流
     * 参数:id, num, val
     */
    giveVal(id, num, val) {
    giveVal(id, dev_name, num, val) {
        let data = {
            electric_id: id,
            dev_name: dev_name,
            num: num,
        };
        // 给定确认
src/views/chargePower/alone.vue
@@ -364,6 +364,7 @@
        num: 20,
        currset: this.local_set_cur,
        electric2KW_id: this.electric2KW_id
        ,dev_name: this.group + '机组'
      };
      this.$api.chargepower.upDateControlData(param).then((res) => {
        res = JSON.parse(res.data.result);
@@ -383,6 +384,7 @@
        num: 7,
        currset_confirm: 1,
        electric2KW_id: this.electric2KW_id
        ,dev_name: this.group + '机组'
      };
      this.$api.chargepower.upDateControlData(param1).then((res) => {
        res = JSON.parse(res.data.result);
@@ -423,6 +425,7 @@
        num: 21,
        volset: this.local_set_vol,
        electric2KW_id: this.electric2KW_id
        ,dev_name: this.group + '机组'
      };
      this.$api.chargepower.upDateControlData(param).then((res) => {
        res = JSON.parse(res.data.result);
@@ -442,6 +445,7 @@
        num: 6,
        volset_confirm: 1,
        electric2KW_id: this.electric2KW_id
        ,dev_name: this.group + '机组'
      };
      this.$api.chargepower.upDateControlData(param1).then((res) => {
        res = JSON.parse(res.data.result);
@@ -464,6 +468,7 @@
        num: 3,
        fault_reset: 1,
        electric2KW_id: this.electric2KW_id
        ,dev_name: this.group + '机组'
      };
      this.$api.chargepower.upDateControlData(param).then((res) => {
        res = JSON.parse(res.data.result);
@@ -486,6 +491,7 @@
        num: 2,
        remote_start: 1,
        electric2KW_id: this.electric2KW_id
        ,dev_name: this.group + '机组'
      };
      this.$api.chargepower.upDateControlData(param).then((res) => {
        res = JSON.parse(res.data.result);
@@ -508,6 +514,7 @@
        num: 8,
        remote_stop: 1,
        electric2KW_id: this.electric2KW_id
        ,dev_name: this.group + '机组'
      };
      this.$api.chargepower.upDateControlData(param).then((res) => {
        res = JSON.parse(res.data.result);
src/views/chargePower/main.vue
@@ -437,6 +437,7 @@
        num: 20,
        currset: this.local_set_cur,
        electric2KW_id: this.groupInfo[this.current_grp].electric2KW_id
        ,dev_name: this.current_grp + '机组'
      };
      this.controlData[this.current_grp].local_set_cur = this.local_set_cur;
@@ -458,6 +459,7 @@
        num: 7,
        currset_confirm: 1,
        electric2KW_id: this.groupInfo[this.current_grp].electric2KW_id
        ,dev_name: this.current_grp + '机组'
      };
      this.$api.chargepower.upDateControlData(param1).then((res) => {
        res = JSON.parse(res.data.result);
@@ -498,6 +500,7 @@
        num: 21,
        volset: this.local_set_vol,
        electric2KW_id: this.groupInfo[this.current_grp].electric2KW_id
        ,dev_name: this.current_grp + '机组'
      };
      this.controlData[this.current_grp].local_set_vol = this.local_set_vol;
      this.$api.chargepower.upDateControlData(param).then((res) => {
@@ -518,6 +521,7 @@
        num: 6,
        volset_confirm: 1,
        electric2KW_id: this.groupInfo[this.current_grp].electric2KW_id
        ,dev_name: this.current_grp + '机组'
      };
      this.$api.chargepower.upDateControlData(param1).then((res) => {
        res = JSON.parse(res.data.result);
@@ -606,6 +610,7 @@
        num: 4,
        conscurrswitch: 1,
        electric2KW_id: this.groupInfo[group].electric2KW_id
        ,dev_name: group + '机组'
      };
      this.$api.chargepower.upDateControlData(param).then((res) => {
        res = JSON.parse(res.data.result);
@@ -628,6 +633,7 @@
        num: 11,
        consvolswitch: 1,
        electric2KW_id: this.groupInfo[group].electric2KW_id
        ,dev_name: group + '机组'
      };
      this.$api.chargepower.upDateControlData(param).then((res) => {
        res = JSON.parse(res.data.result);
@@ -649,6 +655,7 @@
        num: 10,
        start_upper_set: 1,
        electric2KW_id: this.groupInfo[group].electric2KW_id
        ,dev_name: group + '机组'
      };
      this.$api.chargepower.upDateControlData(param).then((res) => {
        res = JSON.parse(res.data.result);
@@ -670,6 +677,7 @@
        num: 9,
        start_screen_set: 1,
        electric2KW_id: this.groupInfo[group].electric2KW_id
        ,dev_name: group + '机组'
      };
      this.$api.chargepower.upDateControlData(param).then((res) => {
        res = JSON.parse(res.data.result);
@@ -691,6 +699,7 @@
        num: 5,
        constantvol: 1,
        electric2KW_id: this.groupInfo[group].electric2KW_id
        ,dev_name: group + '机组'
      };
      this.$api.chargepower.upDateControlData(param).then((res) => {
        res = JSON.parse(res.data.result);
@@ -712,6 +721,7 @@
        num: 12,
        othermode: 1,
        electric2KW_id: this.groupInfo[group].electric2KW_id
        ,dev_name: group + '机组'
      };
      this.$api.chargepower.upDateControlData(param).then((res) => {
        res = JSON.parse(res.data.result);
@@ -734,6 +744,7 @@
        num: 2,
        remote_start: 1,
        electric2KW_id: this.groupInfo[group].electric2KW_id
        ,dev_name: group + '机组'
      };
      this.$api.chargepower.upDateControlData(param).then((res) => {
        res = JSON.parse(res.data.result);
@@ -756,6 +767,7 @@
        num: 8,
        remote_stop: 1,
        electric2KW_id: this.groupInfo[group].electric2KW_id
        ,dev_name: group + '机组'
      };
      this.$api.chargepower.upDateControlData(param).then((res) => {
        res = JSON.parse(res.data.result);
src/views/chargePower/menu.vue
@@ -473,6 +473,7 @@
        num: 10,
        start_upper_set: 1,
        electric2KW_id: this.groupInfo[group].electric2KW_id
        ,dev_name: group + '机组'
      };
      this.$api.chargepower.upDateControlData(param).then((res) => {
        res = JSON.parse(res.data.result);
@@ -494,6 +495,7 @@
        num: 9,
        start_screen_set: 1,
        electric2KW_id: this.groupInfo[group].electric2KW_id
        ,dev_name: group + '机组'
      };
      this.$api.chargepower.upDateControlData(param).then((res) => {
        res = JSON.parse(res.data.result);
@@ -515,6 +517,7 @@
        num: 4,
        conscurrswitch: 1,
        electric2KW_id: this.groupInfo[group].electric2KW_id
        ,dev_name: group + '机组'
      };
      this.$api.chargepower.upDateControlData(param).then((res) => {
        res = JSON.parse(res.data.result);
@@ -536,6 +539,7 @@
        num: 11,
        consvolswitch: 1,
        electric2KW_id: this.groupInfo[group].electric2KW_id
        ,dev_name: group + '机组'
      };
      this.$api.chargepower.upDateControlData(param).then((res) => {
        res = JSON.parse(res.data.result);
@@ -557,6 +561,7 @@
        num: 5,
        constantvol: 1,
        electric2KW_id: this.groupInfo[group].electric2KW_id
        ,dev_name: group + '机组'
      };
      this.$api.chargepower.upDateControlData(param).then((res) => {
        res = JSON.parse(res.data.result);
@@ -578,6 +583,7 @@
        num: 12,
        othermode: 1,
        electric2KW_id: this.groupInfo[group].electric2KW_id
        ,dev_name: group + '机组'
      };
      this.$api.chargepower.upDateControlData(param).then((res) => {
        res = JSON.parse(res.data.result);
@@ -602,6 +608,7 @@
      let param = {
        num: 0,
        electric2KW_ip: this.groupInfo[group].electric2KW_ip
        ,dev_name: group + '机组'
      };
      const value = this['list_' + group][type + '_' + idx];
      switch (idx) {
src/views/chargePower/mixture.vue
@@ -434,6 +434,7 @@
          num: 21,
          volset: this.local_set_vol,
          electric2KW_id: this.groupInfo[v].electric2KW_id
          ,dev_name: v + '机组'
        };
        this.$api.chargepower.upDateControlData(param).then((res) => {
          res = JSON.parse(res.data.result);
@@ -453,6 +454,7 @@
          num: 6,
          volset_confirm: 1,
          electric2KW_id: this.groupInfo[v].electric2KW_id
          ,dev_name: v + '机组'
        };
        this.$api.chargepower.upDateControlData(param1).then((res) => {
          res = JSON.parse(res.data.result);
@@ -476,6 +478,7 @@
        num: 3,
        fault_reset: 1,
        electric2KW_id: this.groupInfo[group].electric2KW_id
        ,dev_name: group + '机组'
      };
      this.$api.chargepower.upDateControlData(param).then((res) => {
        res = JSON.parse(res.data.result);
@@ -499,6 +502,7 @@
          num: 2,
          remote_start: 1,
          electric2KW_id: this.groupInfo[v].electric2KW_id
          ,dev_name: v + '机组'
        };
        this.$api.chargepower.upDateControlData(param).then((res) => {
          res = JSON.parse(res.data.result);
@@ -523,6 +527,7 @@
          num: 8,
          remote_stop: 1,
          electric2KW_id: this.groupInfo[v].electric2KW_id
          ,dev_name: v + '机组'
        };
        this.$api.chargepower.upDateControlData(param).then((res) => {
          res = JSON.parse(res.data.result);
src/views/chargePower/parallel.vue
@@ -452,6 +452,7 @@
          num: 20,
          currset: this.local_set_cur,
          electric2KW_id: this.groupInfo[v].electric2KW_id
          ,dev_name: v + '机组'
        };
        this.$api.chargepower.upDateControlData(param).then((res) => {
          res = JSON.parse(res.data.result);
@@ -471,6 +472,7 @@
          num: 7,
          currset_confirm: 1,
          electric2KW_id: this.groupInfo[v].electric2KW_id
          ,dev_name: v + '机组'
        };
        this.$api.chargepower.upDateControlData(param1).then((res) => {
          res = JSON.parse(res.data.result);
@@ -513,6 +515,7 @@
          num: 21,
          volset: this.local_set_vol,
          electric2KW_id: this.groupInfo[v].electric2KW_id
          ,dev_name: v + '机组'
        };
        this.$api.chargepower.upDateControlData(param).then((res) => {
          res = JSON.parse(res.data.result);
@@ -532,6 +535,7 @@
          num: 6,
          volset_confirm: 1,
          electric2KW_id: this.groupInfo[v].electric2KW_id
          ,dev_name: v + '机组'
        };
        this.$api.chargepower.upDateControlData(param1).then((res) => {
          res = JSON.parse(res.data.result);
@@ -555,6 +559,7 @@
        num: 3,
        fault_reset: 1,
        electric2KW_id: this.groupInfo[group].electric2KW_id
        ,dev_name: group + '机组'
      };
      this.$api.chargepower.upDateControlData(param).then((res) => {
        res = JSON.parse(res.data.result);
@@ -578,6 +583,7 @@
          num: 2,
          remote_start: 1,
          electric2KW_id: this.groupInfo[v].electric2KW_id
          ,dev_name: v + '机组'
        };
        this.$api.chargepower.upDateControlData(param).then((res) => {
          res = JSON.parse(res.data.result);
@@ -602,6 +608,7 @@
          num: 8,
          remote_stop: 1,
          electric2KW_id: this.groupInfo[v].electric2KW_id
          ,dev_name: v + '机组'
        };
        this.$api.chargepower.upDateControlData(param).then((res) => {
          res = JSON.parse(res.data.result);
src/views/chargePower/series.vue
@@ -438,6 +438,7 @@
          num: 21,
          volset: this.local_set_vol,
          electric2KW_id: this.groupInfo[v].electric2KW_id
          ,dev_name: v + '机组'
        };
        this.$api.chargepower.upDateControlData(param).then((res) => {
          res = JSON.parse(res.data.result);
@@ -457,6 +458,7 @@
          num: 6,
          volset_confirm: 1,
          electric2KW_id: this.groupInfo[v].electric2KW_id
          ,dev_name: v + '机组'
        };
        this.$api.chargepower.upDateControlData(param1).then((res) => {
          res = JSON.parse(res.data.result);
@@ -480,6 +482,7 @@
        num: 3,
        fault_reset: 1,
        electric2KW_id: this.groupInfo[group].electric2KW_id
        ,dev_name: group + '机组'
      };
      this.$api.chargepower.upDateControlData(param).then((res) => {
        res = JSON.parse(res.data.result);
@@ -503,6 +506,7 @@
          num: 2,
          remote_start: 1,
          electric2KW_id: this.groupInfo[v].electric2KW_id
          ,dev_name: v + '机组'
        };
        this.$api.chargepower.upDateControlData(param).then((res) => {
          res = JSON.parse(res.data.result);
@@ -527,6 +531,7 @@
          num: 8,
          remote_stop: 1,
          electric2KW_id: this.groupInfo[v].electric2KW_id
          ,dev_name: v + '机组'
        };
        this.$api.chargepower.upDateControlData(param).then((res) => {
          res = JSON.parse(res.data.result);
src/views/loadManager/autoload.vue
@@ -197,6 +197,7 @@
        data: {
          set_power: '',
          dev_id: '',
          dev_name: '',
          dev_ip: '',
          num: 0
        },
@@ -225,6 +226,7 @@
        data: {
          delay: '',
          dev_id: '',
          dev_name: '',
          dev_ip: '',
          num: 0
        },
@@ -299,6 +301,7 @@
      // 根据机柜信息构造查询条件
      let searchParams = {
        all_open: '1',
        dev_name: obj.dev_name,
        dev_id: obj.dev_id,
        dev_ip: obj.dev_ip
      };
@@ -348,6 +351,7 @@
      this.updateSetPower.data.set_power = obj.set_power;
      this.updateSetPower.data.dev_id = obj.dev_id;
      this.updateSetPower.data.dev_ip = obj.dev_ip;
      this.updateSetPower.data.dev_name = obj.dev_name;
      this.updateSetPower.data.num = obj.FZ_button_num;
      this.updateSetPower.show = true;
    }
@@ -356,6 +360,7 @@
      // console.log(obj);
      this.updateDelay.data.delay = obj.interval_time;
      this.updateDelay.data.dev_id = obj.dev_id;
      this.updateDelay.data.dev_name = obj.dev_name;
      this.updateDelay.data.dev_ip = obj.dev_ip;
      this.updateDelay.data.num = obj.FZ_button_num;
      this.updateDelay.show = true;
@@ -364,6 +369,7 @@
      let param = {
        interval_time: this.updateDelay.data.delay,
        dev_id: this.updateDelay.data.dev_id,
        dev_name: this.updateDelay.data.dev_name,
        dev_ip: this.updateDelay.data.dev_ip,
        num: this.updateDelay.data.num
      };
@@ -393,6 +399,7 @@
      let param = {
        set_power: this.updateSetPower.data.set_power,
        dev_id: this.updateSetPower.data.dev_id,
        dev_name: this.updateSetPower.data.dev_name,
        dev_ip: this.updateSetPower.data.dev_ip,
        num: this.updateSetPower.data.num
      };
@@ -434,10 +441,10 @@
        });
        return false;
      }*/
      debugger;
      // 根据机柜信息构造查询条件
      let searchParams = {
        dev_id: item.dev_id,
        dev_name: item.dev_name,
        start_auto: 1,
        dev_ip: item.dev_ip
      };
@@ -464,6 +471,7 @@
      // 根据机柜信息构造查询条件
      let searchParams = {
        dev_id: item.dev_id,
        dev_name: item.dev_name,
        stop_auto: 1,
        dev_ip: item.dev_ip
      };
src/views/loadManager/burstload.vue
@@ -167,6 +167,7 @@
        data: {
          set_power: '',
          dev_id: '',
          dev_name: '',
          dev_ip: '',
          num: 0
        },
@@ -269,6 +270,7 @@
      // 根据机柜信息构造查询条件
      let searchParams = {
        all_open: '1',
        dev_name: obj.dev_name,
        dev_id: obj.dev_id,
        dev_ip: obj.dev_ip
      };
@@ -295,6 +297,7 @@
      // console.log(obj);
      this.updateSetPower.data.set_power = obj.set_power;
      this.updateSetPower.data.dev_id = obj.dev_id;
      this.updateSetPower.data.dev_name = obj.dev_name;
      this.updateSetPower.data.dev_ip = obj.dev_ip;
      this.updateSetPower.data.num = obj.FZ_button_num;
      this.updateSetPower.show = true;
@@ -303,6 +306,7 @@
      let param = {
        set_power: this.updateSetPower.data.set_power,
        dev_id: this.updateSetPower.data.dev_id,
        dev_name: this.updateSetPower.data.dev_name,
        dev_ip: this.updateSetPower.data.dev_ip,
        num: this.updateSetPower.data.num
      };
@@ -370,6 +374,7 @@
      let searchParams = {
        sudden_crease: 1,
        dev_id: item.dev_id,
        dev_name: item.dev_name,
        dev_ip: item.dev_ip
      };
      // 查询后台
src/views/loadManager/manualload.vue
@@ -230,6 +230,7 @@
      // 根据机柜信息构造查询条件
      let searchParams = {
        all_open: '1',
        dev_name: obj.dev_name,
        dev_id: obj.dev_id,
        dev_ip: obj.dev_ip
      };
@@ -330,6 +331,7 @@
      // 根据机柜信息和点击的按钮的编号构造查询条件
      let searchParams = {
        dev_id: item.dev_id,
        dev_name: item.dev_name,
        num: index,
        dev_ip: item.dev_ip
      };
src/views/rectifier/group.vue
@@ -449,6 +449,7 @@
          powerstartflag: 0,
        }
      ],
      itemName: this.$route.query.group,
      item1: {
        name: itemName[0],
        type: ['km1', 'km2'],
@@ -808,8 +809,9 @@
      let id = item.data.electric_id;
      let ip = item.info.electric_ip;
      let loading = this.$layer.loading(1);
      let dev_name = [this.itemName, item.name];
      // 设置点位
      this.$api.electric.setGroupPos(id, ip, num, val).then((res)=>{
      this.$api.electric.setGroupPos(id, dev_name, ip, num, val).then((res)=>{
        let rs = JSON.parse(res.data.result);
        // 关闭等待
        this.$layer.close(loading);
@@ -841,7 +843,7 @@
          this.giveVal.vol = form.dcvol;
          // 设置给定的电压值
          this.giveVal.volset = this.getVal(form.dcvol, 'vol');
          this.$api.electric.giveVal(this.item1.data.electric_id, 13, this.giveVal.volset).then((res) => {
          this.$api.electric.giveVal(this.item1.data.electric_id, this.itemName, 13, this.giveVal.volset).then((res) => {
            res = JSON.parse(res.data.result);
            if (res.code) {
              this.$message({
@@ -883,7 +885,7 @@
          // 设置给定电流的值
          this.giveVal.currset = this.getVal(form.dccurr, 'curr');
          this.$api.electric.giveVal(this.item1.data.electric_id, 14, this.giveVal.currset).then((res) => {
          this.$api.electric.giveVal(this.item1.data.electric_id, this.itemName, 14, this.giveVal.currset).then((res) => {
            res = JSON.parse(res.data.result);
            if (res.code) {
              this.$message({
@@ -933,8 +935,10 @@
      // 显示等待框
      let loading = this.$layer.loading(1);
      let dev_name = [this.itemName, this.item1.name];
      // 设置点位
      this.$api.electric.setGroupPos(electric_id, ip, num, value).then((res)=>{
      this.$api.electric.setGroupPos(electric_id, dev_name, ip, num, value).then((res)=>{
        let rs = JSON.parse(res.data.result);
        if (rs.code) {
          this.$message({
src/views/rectifier/main.vue
@@ -655,6 +655,7 @@
        title: '套电源设定电压',
        form: {
          electric_id: '4001',
          dev_name: '',
          electric_ip: '127.0.0.1',
          dcvol: 0,
          num: 2,
@@ -672,6 +673,7 @@
        title: '套电源设定电流',
        form: {
          electric_id: '4001',
          dev_name: '',
          electric_ip: '127.0.0.1',
          dccurr: 0,
          num: 1,
@@ -906,10 +908,11 @@
    }
    ,setPos(item, num, val) {
      let id = item.info.electric_id;
      let dev_name = item.info.electric_name;
      let ip = item.info.electric_ip;
      let loading = this.$layer.loading(1);
      // 设置点位
      this.$api.electric.setPos(id, ip, num, val).then((res)=>{
      this.$api.electric.setPos(id, dev_name, ip, num, val).then((res)=>{
        let rs = JSON.parse(res.data.result);
        // 关闭等待
        this.$layer.close(loading);
@@ -923,6 +926,7 @@
      this.set_vol_dialog.idx = item.idx;
      this.set_vol_dialog.show = true;
      // 设置form表单的值
      this.set_vol_dialog.form.dev_name = item.info.electric_name;
      this.set_vol_dialog.form.electric_id = item.info.electric_id;
      this.set_vol_dialog.form.electric_ip = item.info.electric_ip;
      this.set_vol_dialog.form.dcvol = item.data.upsetvol;
@@ -940,7 +944,7 @@
          let form = this.set_vol_dialog.form;
          let loading = this.$layer.loading(1);
          // 设置点位(电压值乘10)
          this.$api.electric.setPos(form.electric_id, form.electric_ip, form.num, form.dcvol).then((res)=>{
          this.$api.electric.setPos(form.electric_id, form.dev_name, form.electric_ip, form.num, form.dcvol).then((res)=>{
            let rs = JSON.parse(res.data.result);
            // 执行成功
            if(rs.code == 1) {
@@ -961,6 +965,7 @@
      this.set_curr_dialog.idx = item.idx;
      this.set_curr_dialog.show = true;
      // 设置form表单的值
      this.set_curr_dialog.form.dev_name = item.info.electric_name;
      this.set_curr_dialog.form.electric_id = item.info.electric_id;
      this.set_curr_dialog.form.electric_ip = item.info.electric_ip;
      this.set_curr_dialog.form.dccurr = item.data.upsetcurr;
@@ -978,7 +983,7 @@
          let form = this.set_curr_dialog.form;
          let loading = this.$layer.loading(1);
          // 设置点位(电压值乘10)
          this.$api.electric.setPos(form.electric_id, form.electric_ip, form.num, form.dccurr).then((res)=>{
          this.$api.electric.setPos(form.electric_id, form.dev_name, form.electric_ip, form.num, form.dccurr).then((res)=>{
            let rs = JSON.parse(res.data.result);
            // 执行成功
            if(rs.code == 1) {
src/views/user/syslog.vue
@@ -21,6 +21,13 @@
                <el-option v-for="(item, index) in operateList" :key="'operate_' + index" :label="item.text" :value="item.value"></el-option>
              </el-select>
            </el-form-item>
            <!-- 操作 -->
            <el-form-item label="操作人">
              <el-select v-model="uId" placeholder="选择操作人">
                <el-option label="全部" value="0"></el-option>
                <el-option v-for="(item, index) in userList" :key="'operate_' + index" :label="item.text" :value="item.value"></el-option>
              </el-select>
            </el-form-item>
          </el-form>
          <div class="btn-grp">
            <div class="btn_3d" @click="getUserLog">查询</div>
@@ -35,11 +42,7 @@
              :data="data_logs"
              >
              <el-table-column
                 prop="date"
                label="日期">
              </el-table-column>
              <el-table-column
                 prop="time"
                 prop="uOprateDay"
                label="时间">
              </el-table-column>
              <el-table-column
@@ -49,6 +52,10 @@
              <el-table-column
                 prop="SystemType"
                label="系统类型">
              </el-table-column>
              <el-table-column
                 prop="uName"
                label="操作人">
              </el-table-column>
              <el-table-column
                 prop="uOprateMsg"
@@ -87,8 +94,10 @@
          ,data_logs: []
          ,operate: "0"
          ,system: "0"
          ,uId: "0"
          ,operateList: []
          ,systemList: []
          ,userList: []
          ,time_start: new Date(Date.now() - 1000 * 60 * 60 * 24 + 1000).format('yyyy-MM-dd hh:mm:ss')
          ,time_end: new Date().format('yyyy-MM-dd hh:mm:ss')
        }
@@ -131,6 +140,21 @@
          this.systemList = list;
        });
      }
      // 查询所有用户
      ,getAllUsers () {
        this.$api.user.getAllUsers().then((res) => {
          res = JSON.parse(res.data.result);
          let list = [];
          if (res.code) {
            list = res.data;
          }
          list.forEach((v) => {
            v.value = v.UId;
            v.text = v.UName;
          });
          this.userList = list;
        });
      }
      // 查询日志
      ,getUserLog () {
        let param = {
@@ -138,6 +162,7 @@
          ,uSystemType: this.system
          ,uOprateDay: this.time_start
          ,uOprateDay1: this.time_end
          ,uId: this.uId
          ,page: {
            pageCurr: this.pageCurr
            ,pageSize: 10
@@ -149,6 +174,7 @@
          let list = [];
          if (res.code) {
            list = res.data;
            this.log_len = list[list.length - 1].page.pageAll;
          } else {
            this.$message({
              type: 'warning',
@@ -156,11 +182,8 @@
            });
          }
          list.forEach((v) => {
            let dateTime = v.uOprateDay.split(' ');
            v.OprateType = operate_name[v.uOprateType];
            v.SystemType = system_name[v.uSystemType];
            v.date = dateTime[0];
            v.time = dateTime[1];
          });
          this.data_logs = list;
        }).catch(e => {
@@ -174,6 +197,7 @@
    mounted () {
      this.getOperateList();
      this.getSystemList();
      this.getAllUsers();
    }
}
</script>