U 2MW页面 补加按钮二次确认

whychw

2020-10-09 b6c044b823f17ef3d27d90b35fc8030da2e3d876

U 2MW页面 补加按钮二次确认

 src/components/scrollAd.vue

@@ -48,17 +48,17 @@
      // }
      const ElRoot = this.$refs.root;
      ElRoot.addEventListener('mouseenter', () => {
        console.log('mouseEnter');
        // console.log('mouseEnter');
        this.stop();
      });
      ElRoot.addEventListener('mouseleave', () => {
        console.log('mouseleave');
        // console.log('mouseleave');
        this.timer.open();
      });
      // console.log(ElRoot, 0);
    },
    updated () {
      console.log('scrollAd  updated');
      // console.log('scrollAd  updated');
    },
    methods: {
      getWidth () {

 src/views/chargePower/alone.vue

@@ -47,8 +47,8 @@
          </div>
          <div class="panel_btn_grp">
            <div class="btn_3d exception" @click="cur_vol_setVisible = true">电压电流给定</div>
            <div class="btn_3d" @click="remoteStart">启动电源</div>
            <div class="btn_3d" @click="remoteStop">停止电源</div>
            <div class="btn_3d" v-btn-confirm="handleConfirm" data-fn="remoteStart" data-confirmTxt="启动电源确认" :param="JSON.stringify([null])">启动电源</div>
            <div class="btn_3d" v-btn-confirm="handleConfirm" data-fn="remoteStop" data-confirmTxt="停止电源确认" :param="JSON.stringify([null])">停止电源</div>
          </div>
        </div>
        <div class="inner">
@@ -150,6 +150,17 @@
        <el-button type="primary" @click="cur_vol_setVisible = false">关闭</el-button>
      </span>
    </el-dialog>
    <!-- 按钮二次确认 -->
    <el-dialog
      :title="confirmTxt"
      :visible.sync="confirmVisible"
      width="30%">
      <!-- <span>{{}}</span> -->
      <span slot="footer" class="dialog-footer">
        <el-button @click="confirmVisible = false">取 消</el-button>
        <el-button type="primary" @click="callBack">确 定</el-button>
      </span>
    </el-dialog>
    <!--  -->
  </div>
</template>
@@ -170,6 +181,10 @@
  },
  data () {
    return {
      confirmTxt: '',
      confirmVisible: false,
      cbFn: null,
      cbParam: null,
      cur_vol_setVisible: false,
      switchFlag: false,
      local_set_cur: 0,
@@ -221,6 +236,17 @@
      let height = $container.offsetHeight;
      this.rect.position = this.$common.transSize(width, height, 360, 700, can.getInfo('rect_0'));
    }
    ,callBack () {
      this.confirmVisible = false;
      this[this.cbFn](...this.cbParam);
    }
    ,handleConfirm (obj) {
      // console.log(obj, 9090);
      this.confirmTxt = obj.confirmTxt;
      this.cbFn = obj.cbFn;
      this.cbParam = obj.cbParam;
      this.confirmVisible = true;
    }
    // 返回模式选择页
    ,back () {
      this.$router.push('/chargepower/main');

 src/views/chargePower/mixture.vue

@@ -33,9 +33,9 @@
            :cssHeight="rects[2].position.height"
            :top="rects[2].position.top" :left="rects[2].position.left">
            <div class="posA_full panel_btn_grp">
              <div class="btn_3d" @click="remoteStart">启动电源</div>
              <div class="btn_3d" v-btn-confirm="handleConfirm" data-fn="remoteStart" data-confirmTxt="启动电源确认" :param="JSON.stringify([null])">启动电源</div>
              <div class="btn_3d exception" @click="cur_vol_setVisible = true">电压电流给定</div>
              <div class="btn_3d" @click="remoteStop">停止电源</div>
              <div class="btn_3d" v-btn-confirm="handleConfirm" data-fn="remoteStop" data-confirmTxt="停止电源确认" :param="JSON.stringify([null])">停止电源</div>
            </div>
          </science-box>
          <science-box
@@ -182,6 +182,17 @@
        <el-button type="primary" @click="cur_vol_setVisible = false">关闭</el-button>
      </span>
    </el-dialog>
    <!-- 按钮二次确认 -->
    <el-dialog
      :title="confirmTxt"
      :visible.sync="confirmVisible"
      width="30%">
      <!-- <span>{{}}</span> -->
      <span slot="footer" class="dialog-footer">
        <el-button @click="confirmVisible = false">取 消</el-button>
        <el-button type="primary" @click="callBack">确 定</el-button>
      </span>
    </el-dialog>
    <!--  -->
  </div>
</template>
@@ -199,6 +210,10 @@
  },
  data () {
    return {
      confirmTxt: '',
      confirmVisible: false,
      cbFn: null,
      cbParam: null,
      cur_vol_setVisible: false,
      timer: new this.$common.Timeout(),
      switchFlag: [false, false],
@@ -290,6 +305,17 @@
        this.rects[i].position = this.$common.transSize(width, height, 960, 700, can.getInfo('rect_' + i));
      }
    }
    ,callBack () {
      this.confirmVisible = false;
      this[this.cbFn](...this.cbParam);
    }
    ,handleConfirm (obj) {
      // console.log(obj, 9090);
      this.confirmTxt = obj.confirmTxt;
      this.cbFn = obj.cbFn;
      this.cbParam = obj.cbParam;
      this.confirmVisible = true;
    }
    ,back () {
      this.$router.push('/chargepower/main');
    }

 src/views/chargePower/parallel.vue

@@ -33,9 +33,9 @@
            :cssHeight="rects[2].position.height"
            :top="rects[2].position.top" :left="rects[2].position.left">
            <div class="posA_full panel_btn_grp">
              <div class="btn_3d" @click="remoteStart">启动电源</div>
              <div class="btn_3d" v-btn-confirm="handleConfirm" data-fn="remoteStart" data-confirmTxt="启动电源确认" :param="JSON.stringify([null])">启动电源</div>
              <div class="btn_3d exception" @click="cur_vol_setVisible = true">电压电流给定</div>
              <div class="btn_3d" @click="remoteStop">停止电源</div>
              <div class="btn_3d" v-btn-confirm="handleConfirm" data-fn="remoteStop" data-confirmTxt="停止电源确认" :param="JSON.stringify([null])">停止电源</div>
            </div>
          </science-box>
          <science-box
@@ -197,6 +197,17 @@
        <el-button type="primary" @click="cur_vol_setVisible = false">关闭</el-button>
      </span>
    </el-dialog>
    <!-- 按钮二次确认 -->
    <el-dialog
      :title="confirmTxt"
      :visible.sync="confirmVisible"
      width="30%">
      <!-- <span>{{}}</span> -->
      <span slot="footer" class="dialog-footer">
        <el-button @click="confirmVisible = false">取 消</el-button>
        <el-button type="primary" @click="callBack">确 定</el-button>
      </span>
    </el-dialog>
    <!--  -->
  </div>
</template>
@@ -214,6 +225,10 @@
  },
  data () {
    return {
      confirmTxt: '',
      confirmVisible: false,
      cbFn: null,
      cbParam: null,
      cur_vol_setVisible: false,
      timer: new this.$common.Timeout(),
      switchFlag: [false, false],
@@ -307,6 +322,17 @@
        this.rects[i].position = this.$common.transSize(width, height, 960, 700, can.getInfo('rect_' + i));
      }
    }
    ,callBack () {
      this.confirmVisible = false;
      this[this.cbFn](...this.cbParam);
    }
    ,handleConfirm (obj) {
      // console.log(obj, 9090);
      this.confirmTxt = obj.confirmTxt;
      this.cbFn = obj.cbFn;
      this.cbParam = obj.cbParam;
      this.confirmVisible = true;
    }
    ,back () {
      this.$router.push('/chargepower/main');
    }

 src/views/chargePower/series.vue

@@ -33,9 +33,9 @@
            :cssHeight="rects[2].position.height"
            :top="rects[2].position.top" :left="rects[2].position.left">
            <div class="posA_full panel_btn_grp">
              <div class="btn_3d" @click="remoteStart">启动电源</div>
              <div class="btn_3d" v-btn-confirm="handleConfirm" data-fn="remoteStart" data-confirmTxt="启动电源确认" :param="JSON.stringify([null])">启动电源</div>
              <div class="btn_3d exception" @click="cur_vol_setVisible = true">电压电流给定</div>
              <div class="btn_3d" @click="remoteStop">停止电源</div>
              <div class="btn_3d" v-btn-confirm="handleConfirm" data-fn="remoteStop" data-confirmTxt="停止电源确认" :param="JSON.stringify([null])">停止电源</div>
            </div>
          </science-box>
          <science-box
@@ -186,6 +186,17 @@
        <el-button type="primary" @click="cur_vol_setVisible = false">关闭</el-button>
      </span>
    </el-dialog>
    <!-- 按钮二次确认 -->
    <el-dialog
      :title="confirmTxt"
      :visible.sync="confirmVisible"
      width="30%">
      <!-- <span>{{}}</span> -->
      <span slot="footer" class="dialog-footer">
        <el-button @click="confirmVisible = false">取 消</el-button>
        <el-button type="primary" @click="callBack">确 定</el-button>
      </span>
    </el-dialog>
    <!--  -->
  </div>
</template>
@@ -203,6 +214,10 @@
  },
  data () {
    return {
      confirmTxt: '',
      confirmVisible: false,
      cbFn: null,
      cbParam: null,
      cur_vol_setVisible: false,
      timer: new this.$common.Timeout(),
      switchFlag: [false, false],
@@ -294,6 +309,17 @@
        this.rects[i].position = this.$common.transSize(width, height, 960, 700, can.getInfo('rect_' + i));
      }
    }
    ,callBack () {
      this.confirmVisible = false;
      this[this.cbFn](...this.cbParam);
    }
    ,handleConfirm (obj) {
      // console.log(obj, 9090);
      this.confirmTxt = obj.confirmTxt;
      this.cbFn = obj.cbFn;
      this.cbParam = obj.cbParam;
      this.confirmVisible = true;
    }
    ,back () {
      this.$router.push('/chargepower/main');
    }

 src/views/main.vue

@@ -94,7 +94,6 @@
        let rs = JSON.parse(res.data.result);
        if(rs.code == 1) {
          let data = rs.data;
          console.log(data, '++++++++')
          let status = [];
          let reg;
          switch (type) {
@@ -142,7 +141,7 @@
    }
    ,loop () {
      this.timer.start(() => {
        console.log('getAllRtAlarm');
        // console.log('getAllRtAlarm');
        this.getConnect();
        this.getAllRtAlarm();
        this.timer.open();

 src/views/rectifier/main.vue

@@ -820,7 +820,7 @@
        table_name: this.select_date.replace(/-/g, '_'),
        record_time: this.select_date + " 00:00:00"
      };
      console.log(param, 'param');
      // console.log(param, 'param');
      // 显示进度条
      this.progress.show = true;
      // 请求后台
@@ -828,7 +828,7 @@
        this.getProgress();
        this.$api.common.download(param).then((res) => {
          res = JSON.parse(res.data.result);
          console.log(res, 'download res');
          // console.log(res, 'download res');
          if (res.code == 1) {
            // 关闭进度条
            this.progress.show = false;

 src/views/waterCooling/index2.vue

@@ -609,14 +609,14 @@
        .then(()=> {
          // this.tlist = [...list[0], ...list[1], ...list[2], ...list[3]];
          // list = [[], [], [], []];
          // draw.update2(can1, this.G_status);
          draw.update2(can1, this.G_status);
          
          this.timer.open();
        }).catch((err)=>{
          console.error(err);
          this.timer.open();
        });
        draw.update2(can1, this.G_status);
        // draw.update2(can1, this.G_status);
      }, 1000);
    }
  },

 src/views/waterCooling/index3.vue

@@ -399,14 +399,14 @@
        .then(()=> {
          // this.tlist = [...list[0], ...list[1], ...list[2], ...list[3]];
          // list = [[], [], [], []];
          // draw.update3(can1, this.G_status);
          draw.update3(can1, this.G_status);
          
          this.timer.open();
        }).catch((err)=>{
          console.error(err);
          this.timer.open();
        });
        draw.update3(can1, this.G_status);
        // draw.update3(can1, this.G_status);
         this.timer.open();
      }, 1000);
    }