whychw
2020-10-12 5e42aca2b8f965ba6fd9ca63307c5ca6fa06311a
U 二次弹窗修改 水冷加切换线路按钮
9个文件已修改
132 ■■■■ 已修改文件
src/api/services/load/index.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/chargePower/main.vue 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/loadManager/autoload.vue 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/loadManager/burstload.vue 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/loadManager/manualload.vue 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/rectifier/main.vue 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/waterCooling/index1.vue 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/waterCooling/index2.vue 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/waterCooling/index3.vue 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/services/load/index.js
@@ -82,6 +82,7 @@
   * json:{"start_auto":"1","dev_id":"1001", 'dev_ip': ''}
   */
  ,autoLoad (data) {
    debugger;
    return self.$axios({
      method: 'post'
      ,url: 'Dynamicload_controlAction_load_updateStart_auto'
src/views/chargePower/main.vue
@@ -26,21 +26,21 @@
        </div>
        <!-- 模式 -->
        <div class="flex_2btn_grp vertical_middle">
          <div class="btn_3d" v-btn-confirm="handleConfirm" data-fn="setConsvol" data-confirmTxt="模式切换确认" :param="JSON.stringify(['CONTEXT.item'])">{{item}}恒压模式</div>
          <div class="btn_3d" v-btn-confirm="handleConfirm" data-fn="setConsvol" data-confirmTxt="模式切换确认" :param="JSON.stringify([item])">{{item}}恒压模式</div>
          <div class="center_con">{{model[item] ? '恒流' : '恒压'}}</div>
          <div class="btn_3d" v-btn-confirm="handleConfirm" data-fn="setConscurr" data-confirmTxt="模式切换确认" :param="JSON.stringify(['CONTEXT.item'])">{{item}}恒流模式</div>
          <div class="btn_3d" v-btn-confirm="handleConfirm" data-fn="setConscurr" data-confirmTxt="模式切换确认" :param="JSON.stringify([item])">{{item}}恒流模式</div>
        </div>
        <!-- 串并模式 -->
        <div class="flex_2btn_grp vertical_middle">
          <div class="btn_3d" v-btn-confirm="handleConfirm" data-fn="constantvol" data-confirmTxt="模式切换确认" :param="JSON.stringify(['CONTEXT.item'])">{{item}}机组切换为4并或2串2并模式</div>
          <div class="btn_3d" v-btn-confirm="handleConfirm" data-fn="constantvol" data-confirmTxt="模式切换确认" :param="JSON.stringify([item])">{{item}}机组切换为4并或2串2并模式</div>
          <div class="center_con">{{item}}机组当前为{{constantvolflag.A ? '4并或2串2并模式' : '4并或2串2并之外模式'}}</div>
          <div class="btn_3d" v-btn-confirm="handleConfirm" data-fn="othermode" data-confirmTxt="模式切换确认" :param="JSON.stringify(['CONTEXT.item'])">{{item}}机组切换为4并或2串2并之外模式</div>
          <div class="btn_3d" v-btn-confirm="handleConfirm" data-fn="othermode" data-confirmTxt="模式切换确认" :param="JSON.stringify([item])">{{item}}机组切换为4并或2串2并之外模式</div>
        </div>
        <!-- 遥控 上位机 -->
        <div class="flex_2btn_grp vertical_middle">
          <div class="btn_3d" v-btn-confirm="handleConfirm" data-fn="setRemoteControl" data-confirmTxt="控制切换确认" :param="JSON.stringify(['CONTEXT.item'])">{{item}}机组切换到上位机控制</div>
          <div class="btn_3d" v-btn-confirm="handleConfirm" data-fn="setRemoteControl" data-confirmTxt="控制切换确认" :param="JSON.stringify([item])">{{item}}机组切换到上位机控制</div>
          <div class="center_con">{{local_remote_control[item] ? '上位机控制' : '触摸屏控制'}}</div>
          <div class="btn_3d" v-btn-confirm="handleConfirm" data-fn="setLocalControl" data-confirmTxt="控制切换确认" :param="JSON.stringify(['CONTEXT.item'])">{{item}}机组切换到就地控制</div>
          <div class="btn_3d" v-btn-confirm="handleConfirm" data-fn="setLocalControl" data-confirmTxt="控制切换确认" :param="JSON.stringify([item])">{{item}}机组切换到就地控制</div>
        </div>
        <div class="text_row vertical_middle">
          <div class="inner">
@@ -64,11 +64,11 @@
        </div>
        <!-- 启动停止 -->
        <div class="flex_2btn_grp vertical_middle">
          <div class="btn_3d" v-btn-confirm="handleConfirm" data-fn="remoteStart" data-confirmTxt="启动确认" :param="JSON.stringify(['CONTEXT.item'])">{{item}}启动</div>
          <div class="btn_3d" v-btn-confirm="handleConfirm" data-fn="remoteStart" data-confirmTxt="启动确认" :param="JSON.stringify([item])">{{item}}启动</div>
          <div class="center_con">
            <div class="indicator" :class="{'status_normal': !0, 'status_error': !1}"></div>
          </div>
          <div class="btn_3d" v-btn-confirm="handleConfirm" data-fn="remoteStop" data-confirmTxt="停止确认" :param="JSON.stringify(['CONTEXT.item'])">{{item}}停止</div>
          <div class="btn_3d" v-btn-confirm="handleConfirm" data-fn="remoteStop" data-confirmTxt="停止确认" :param="JSON.stringify([item])">{{item}}停止</div>
        </div>
      </div>
      <!-- 右侧按钮 -->
src/views/loadManager/autoload.vue
@@ -7,13 +7,13 @@
        <!-- 按钮组 -->
        <div class="item_btn_grp">
          <div class="vertical_middle">
            <div class="btn_3d" v-btn-confirm="handleConfirm" data-fn="startLoad" data-confirmTxt="启动加减载确认" :param="JSON.stringify(['CONTEXT.item'])">启动加减载</div>
            <div class="btn_3d" v-btn-confirm="handleConfirm" data-fn="startLoad" data-confirmTxt="启动加减载确认" :param="JSON.stringify(['CONTEXT.list[' + index + ']'])">启动加减载</div>
          </div>
          <div class="vertical_middle">
            <div class="btn_3d" v-btn-confirm="handleConfirm" data-fn="stopLoad" data-confirmTxt="停止加减载确认" :param="JSON.stringify(['CONTEXT.item'])">停止加减载</div>
            <div class="btn_3d" v-btn-confirm="handleConfirm" data-fn="stopLoad" data-confirmTxt="停止加减载确认" :param="JSON.stringify(['CONTEXT.list[' + index + ']'])">停止加减载</div>
          </div>
          <div class="vertical_middle">
            <div class="btn_3d" v-btn-confirm="handleConfirm" data-fn="switchOff" data-confirmTxt="全部分闸确认" :param="JSON.stringify(['CONTEXT.item'])">全部分闸</div>
            <div class="btn_3d" v-btn-confirm="handleConfirm" data-fn="switchOff" data-confirmTxt="全部分闸确认" :param="JSON.stringify(['CONTEXT.list[' + index + ']'])">全部分闸</div>
          </div>
        </div>
        <!-- 自动流程 -->
@@ -222,11 +222,20 @@
          if (arr.length > 2) {
            console.warn('目前不支持深层属性参数');
          }
          cbParam.push(this[arr[1]]);
          let _param = arr[1];
          if (_param.indexOf('[') > -1) {
            const reg = /\[|\]/;
            let _arr = _param.split(reg);
            cbParam.push(this[_arr[0]][_arr[1]]);
          } else {
            cbParam.push(this[_param]);
          }
          console.log(this[arr[1]], 99);
        } else {
          cbParam.push(v);
        }
      });
      this[this.cbFn](...cbParam);
    }
    ,handleConfirm (obj) {
@@ -385,6 +394,7 @@
        });
        return false;
      }*/
      debugger;
      // 根据机柜信息构造查询条件
      let searchParams = {
        dev_id: item.dev_id,
src/views/loadManager/burstload.vue
@@ -12,10 +12,10 @@
        <!-- 按钮组 -->
        <div class="item_btn_grp">
          <div class="vertical_middle">
            <div class="btn_3d" v-btn-confirm="handleConfirm" data-fn="suddenChange" data-confirmTxt="突变加减载确认" :param="JSON.stringify(['CONTEXT.item'])">突变加减载</div>
            <div class="btn_3d" v-btn-confirm="handleConfirm" data-fn="suddenChange" data-confirmTxt="突变加减载确认" :param="JSON.stringify(['CONTEXT.list[' + itemIndex + ']'])">突变加减载</div>
          </div>
          <div class="vertical_middle">
            <div class="btn_3d" v-btn-confirm="handleConfirm" data-fn="switchOff" data-confirmTxt="全部分闸确认" :param="JSON.stringify(['CONTEXT.item'])">全部分闸</div>
            <div class="btn_3d" v-btn-confirm="handleConfirm" data-fn="switchOff" data-confirmTxt="全部分闸确认" :param="JSON.stringify(['CONTEXT.list[' + itemIndex + ']'])">全部分闸</div>
          </div>
        </div>
        <!-- 数据 -->
@@ -166,11 +166,20 @@
          if (arr.length > 2) {
            console.warn('目前不支持深层属性参数');
          }
          cbParam.push(this[arr[1]]);
          let _param = arr[1];
          if (_param.indexOf('[') > -1) {
            const reg = /\[|\]/;
            let _arr = _param.split(reg);
            cbParam.push(this[_arr[0]][_arr[1]]);
          } else {
            cbParam.push(this[_param]);
          }
          console.log(this[arr[1]], 99);
        } else {
          cbParam.push(v);
        }
      });
      this[this.cbFn](...cbParam);
    }
    ,handleConfirm (obj) {
src/views/loadManager/manualload.vue
@@ -7,7 +7,7 @@
        <div class="btn_main">
          <div class="lay_label vertical_middle">{{item.dev_name}}</div>
          <div class="lay_content vertical_middle">
            <div class="btn_3d" v-btn-confirm="handleConfirm" data-fn="switchOff" data-confirmTxt="全部分闸确认" :param="JSON.stringify(['CONTEXT.item'])">全部分闸</div>
            <div class="btn_3d" v-btn-confirm="handleConfirm" data-fn="switchOff" data-confirmTxt="全部分闸确认" :param="JSON.stringify(['CONTEXT.list[' + index + ']'])">全部分闸</div>
          </div>
        </div>
       <!-- 是否允许合闸 -->
@@ -151,11 +151,20 @@
          if (arr.length > 2) {
            console.warn('目前不支持深层属性参数');
          }
          cbParam.push(this[arr[1]]);
          let _param = arr[1];
          if (_param.indexOf('[') > -1) {
            const reg = /\[|\]/;
            let _arr = _param.split(reg);
            cbParam.push(this[_arr[0]][_arr[1]]);
          } else {
            cbParam.push(this[_param]);
          }
          console.log(this[arr[1]], 99);
        } else {
          cbParam.push(v);
        }
      });
      this[this.cbFn](...cbParam);
    }
    ,handleConfirm (obj) {
src/views/rectifier/main.vue
@@ -33,10 +33,10 @@
        </div>
        <!-- 模式 -->
        <div class="flex_2btn_grp vertical_middle">
          <div class="btn_3d" v-btn-confirm="handleConfirm" data-fn="setPos" data-confirmTxt="切换模式确认" :param="JSON.stringify(['CONTEXT.item', 3])">{{item.idx}}恒压模式</div>
          <div class="btn_3d" v-btn-confirm="handleConfirm" data-fn="setPos" data-confirmTxt="切换模式确认" :param="JSON.stringify(['CONTEXT.list[' + index + ']', 3])">{{item.idx}}恒压模式</div>
          <div class="center_con" v-if="item.data.consvolcurrflag">恒流</div>
          <div class="center_con" v-else>恒压</div>
          <div class="btn_3d" v-btn-confirm="handleConfirm" data-fn="setPos" data-confirmTxt="切换模式确认" :param="JSON.stringify(['CONTEXT.item', 4])">{{item.idx}}恒流模式</div>
          <div class="btn_3d" v-btn-confirm="handleConfirm" data-fn="setPos" data-confirmTxt="切换模式确认" :param="JSON.stringify(['CONTEXT.list[' + index + ']', 4])">{{item.idx}}恒流模式</div>
        </div>
        <!-- A设定电压 -->
        <div class="text_row vertical_middle">
@@ -52,20 +52,20 @@
        </div>
        <!-- A套输出合分闸 -->
        <div class="flex_2btn_grp vertical_middle">
          <div class="btn_3d" v-btn-confirm="handleConfirm" data-fn="setPos" data-confirmTxt="合闸确认" :param="JSON.stringify(['CONTEXT.item', 15])">{{item.idx}}套输出合闸</div>
          <div class="btn_3d" v-btn-confirm="handleConfirm" data-fn="setPos" data-confirmTxt="合闸确认" :param="JSON.stringify(['CONTEXT.list[' + index + ']', 15])">{{item.idx}}套输出合闸</div>
          <div class="center_con">
            <div class="indicator" :class="{'status_normal': !item.state.qs1_state, 'status_error': item.state.qs1_state}"><span>{{item.k_name1}}</span></div>
            <div class="indicator" :class="{'status_normal': !item.state.qs2_state, 'status_error': item.state.qs2_state}"><span>{{item.k_name2}}</span></div>
          </div>
          <div class="btn_3d" v-btn-confirm="handleConfirm" data-fn="setPos" data-confirmTxt="分闸确认" :param="JSON.stringify(['CONTEXT.item', 16])">{{item.idx}}套输出分闸</div>
          <div class="btn_3d" v-btn-confirm="handleConfirm" data-fn="setPos" data-confirmTxt="分闸确认" :param="JSON.stringify(['CONTEXT.list[' + index + ']', 16])">{{item.idx}}套输出分闸</div>
        </div>
        <!-- A启动停止 -->
        <div class="flex_2btn_grp vertical_middle">
          <div class="btn_3d" v-btn-confirm="handleConfirm" data-fn="setPos" data-confirmTxt="启动确认" :param="JSON.stringify(['CONTEXT.item', 7])">{{item.idx}}启动</div>
          <div class="btn_3d" v-btn-confirm="handleConfirm" data-fn="setPos" data-confirmTxt="启动确认" :param="JSON.stringify(['CONTEXT.list[' + index + ']', 7])">{{item.idx}}启动</div>
          <div class="center_con">
            <div class="indicator" :class="{'status_normal': !item.data.powerstartflag, 'status_error': item.data.powerstartflag}"></div>
          </div>
          <div class="btn_3d" v-btn-confirm="handleConfirm" data-fn="setPos" data-confirmTxt="停止确认" :param="JSON.stringify(['CONTEXT.item', 8])">{{item.idx}}停止</div>
          <div class="btn_3d" v-btn-confirm="handleConfirm" data-fn="setPos" data-confirmTxt="停止确认" :param="JSON.stringify(['CONTEXT.list[' + index + ']', 8])">{{item.idx}}停止</div>
        </div>
      </div>
    </div>
@@ -705,11 +705,20 @@
          if (arr.length > 2) {
            console.warn('目前不支持深层属性参数');
          }
          cbParam.push(this[arr[1]]);
          let _param = arr[1];
          if (_param.indexOf('[') > -1) {
            const reg = /\[|\]/;
            let _arr = _param.split(reg);
            cbParam.push(this[_arr[0]][_arr[1]]);
          } else {
            cbParam.push(this[_param]);
          }
          console.log(this[arr[1]], 99);
        } else {
          cbParam.push(v);
        }
      });
      this[this.cbFn](...cbParam);
    }
    ,handleConfirm (obj) {
src/views/waterCooling/index1.vue
@@ -2,6 +2,8 @@
  <div class="page_watercooling flex_column posA_full">
    <div class="page_title">运行界面</div>
    <div class="btn-group">
      <div class="btn_3d" @click="toWater(2)">切换到2号水冷装置</div>
      <div class="btn_3d" @click="toWater(3)">切换到3号水冷装置</div>
      <div class="btn_3d btn-toggle" @click="changeStatus">{{showTable ? '显示运行图' : '显示表格'}}</div>
    </div>
    <div class="page_content" :class="{'turn_end': showTable}">
@@ -12,7 +14,7 @@
          <science-box v-for="(load, key) in loads" :key="'load_' + key" 
            no-header
            class="panel_info"
            :class="{'highlight': load.data.FValue}"
            :class="{'highlight': load.data.FValue > 0.1}"
            :cssWidth="load.position.width"
            :cssHeight="load.position.height"
            :top="load.position.top" :left="load.position.left">
@@ -428,6 +430,10 @@
    go (path) {
      this.$router.push({path});
    }
    // 跳转到其他水冷
    ,toWater (line) {
      this.$router.push({path: '/watercooling/index/' + line});
    }
    ,start () {
    }
@@ -815,6 +821,14 @@
  position: absolute;
  top: 0;
  right: 10px;
  display: -webkit-flex;
  display: flex;
}
.btn-group .btn_3d {
  margin-top: 4px;
}
.btn-group .btn_3d ~ .btn_3d {
  margin-left: 1em;
}
.btn-toggle {
  margin-top: 4px;
src/views/waterCooling/index2.vue
@@ -2,6 +2,8 @@
  <div class="page_watercooling flex_column posA_full">
    <div class="page_title">运行界面</div>
    <div class="btn-group">
      <div class="btn_3d" @click="toWater(1)">切换到1号水冷装置</div>
      <div class="btn_3d" @click="toWater(3)">切换到3号水冷装置</div>
      <div class="btn_3d btn-toggle" @click="changeStatus">{{showTable ? '显示运行图' : '显示表格'}}</div>
    </div>
    <div class="page_content" :class="{'turn_end': showTable}">
@@ -12,7 +14,7 @@
          <science-box v-for="(load, key) in loads" :key="'load_' + key" 
            no-header
            class="panel_info"
            :class="{'highlight': load.data.FValue}"
            :class="{'highlight': load.data.FValue > 0.1}"
            :cssWidth="load.position.width"
            :cssHeight="load.position.height"
            :top="load.position.top" :left="load.position.left">
@@ -399,6 +401,10 @@
    ,stop () {
    }
    // 跳转到其他水冷
    ,toWater (line) {
      this.$router.push({path: '/watercooling/index/' + line});
    }
    ,changeStatus () {
      this.showTable = !this.showTable;
    }
@@ -763,6 +769,14 @@
  position: absolute;
  top: 0;
  right: 10px;
  display: -webkit-flex;
  display: flex;
}
.btn-group .btn_3d {
  margin-top: 4px;
}
.btn-group .btn_3d ~ .btn_3d {
  margin-left: 1em;
}
.btn-toggle {
  margin-top: 4px;
src/views/waterCooling/index3.vue
@@ -2,6 +2,8 @@
  <div class="page_watercooling flex_column posA_full">
    <div class="page_title">运行界面</div>
    <div class="btn-group">
      <div class="btn_3d" @click="toWater(1)">切换到1号水冷装置</div>
      <div class="btn_3d" @click="toWater(2)">切换到2号水冷装置</div>
      <div class="btn_3d btn-toggle" @click="changeStatus">{{showTable ? '显示运行图' : '显示表格'}}</div>
    </div>
    <div class="page_content" :class="{'turn_end': showTable}">
@@ -251,6 +253,10 @@
    }
    ,stop () {
    }
    // 跳转到其他水冷
    ,toWater (line) {
      this.$router.push({path: '/watercooling/index/' + line});
    }
    ,changeStatus () {
      this.showTable = !this.showTable;
@@ -550,6 +556,14 @@
  position: absolute;
  top: 0;
  right: 10px;
  display: -webkit-flex;
  display: flex;
}
.btn-group .btn_3d {
  margin-top: 4px;
}
.btn-group .btn_3d ~ .btn_3d {
  margin-left: 1em;
}
.btn-toggle {
  margin-top: 4px;