面板 样式修改 工序+第一次的倒计时修改为 闪+工序运行时间

haoxuan

2023-09-14 04b13a0cdb319ccddc9ec3d4ec6cd3fd11c6eda6

 src/components/AddIssue.vue

@@ -3,12 +3,17 @@
  <el-dialog
    :close-on-click-modal="false"
    :visible.sync="islook"
    width="700px"
    width="753px"
    class="add-event-dialog"
    :show-close="false"
  >
    <div class="tank-box" v-loading.fullscreen.lock="isLoading" element-loading-text="下发中，请稍后...">
      <div slot="title" class="tac drawerHeader">新任务</div>
    <div class="tank-box">
      <div slot="title" class="tac drawerHeader">
        <span class="title-l">新任务</span>
        <!-- <span class="title-r" @click="closeClick">
          <img src="../../public/close.png" />
        </span> -->
      </div>
      <div class="dialog-content-box">
        <div
          style="
@@ -16,7 +21,6 @@
            width: 100%;
            height: 100%;
            overflow: hidden;
            margin-bottom: 30px;
            text-align: left;
          "
        >
@@ -65,10 +69,11 @@
                  工时： {{ taskData.Procedure.procedure.workHours || "" }}
                </div>
                <div class="title-item">
                  起止时间： {{ formatDate(taskData.Order.startTime) || "" }}
                  计划时间： {{ formatDate(taskData.Order.startTime) || "" }}
                  -
                  {{ formatDate(taskData.Order.endTime) }}
                </div>

                <div class="title-item">
                  客户名称：{{ taskData.Order.customer || "" }}
                </div>
@@ -85,10 +90,10 @@
                  style="
                    color: #fff;
                    font-size: 18px;
                    font-weight: 700;
                    margin-bottom: 10px;
                    margin-top: 20px;
                  "
                  class="color_4efefa"
                >
                  工艺参数
                </div>
@@ -97,7 +102,8 @@
                  v-for="(item, index) in Arr"
                  :key="index"
                >
                  {{ item.Key }}：{{ item.Value || "" }}
                  {{ item.Key }}：{{ item.Value || "" }} 
                  
                </div>
              </div>
            </div>
@@ -105,28 +111,40 @@
              <div
                style="
                  color: red;
                  font-size: 16px;
                  font-size: 26px;
                  width: 100%;
                  text-align: center;
                  font-weight: 700;
                  margin-bottom: 20px;
                  margin-bottom: 15px;
                  margin-top: 10px;
                  line-height:35px;
                "
              >
              <template v-if="showBtn == 2">
                  <div class="gif">
                    <img  src="../../public/shan.gif" />
                  </div>
                </template>
                <template v-if="showBtn == 3&&!isLoading">
                  <div class="gif">
                    <span class="yuandian"></span>
                  </div>
                </template>
                {{ message }}
              </div>
              <div class="progress-item">
                <span>{{ parseInt((num / 60) * 100) }}%</span>
                <el-progress
                  style="width: calc(100% - 50px); float: right"
                  define-back-color="#CDC6C6"
                  color="#00cc66"
                  text-color="#fff"
                  :text-inside="true"
                  :stroke-width="20"
                  :percentage="parseInt((num / 60) * 100)"
                ></el-progress>
              </div>
              <template v-if="showBtn == 3&&isLoading">
                <div class="progress-item">
                    <span>{{ parseInt((num / 60) * 100) }}%</span>
                    <el-progress
                      style="width: calc(100% - 50px); float: right"
                      define-back-color="#CDC6C6"
                      color="#00cc66"
                      text-color="#fff"
                      :text-inside="true"
                      :stroke-width="20"
                      :percentage="parseInt((num / 60) * 100)"
                    ></el-progress>
                </div>
              </template>
            </div>
          </template>

@@ -139,16 +157,14 @@
      </div>
      <div slot="footer" class="dialog-footer tac" style="overflow: hidden">
        <template v-if="messageError">
          <div class="btn" style="margin-left: 220px" @click="confirmClick2">
          <div class="btn"  @click="confirmClick2">
            <img src="../../public/confirm3.png" />
          </div>
        </template>
        <template v-else>
          <div class="btn" @click="closeClick">
            <img src="../../public/btn1.png" />
          </div>
         
          <div class="btn" v-if="showBtn == 1" @click="confirmClick1">
            <img src="../../public/confirm3.png" />
            <img src="../../public/confirm1.png" />
          </div>
          <div class="btn" v-if="showBtn == 2">
            <img src="../../public/confirm2.png" />
@@ -159,7 +175,11 @@
            v-prevent-re-click="3000"
            @click="onSubmit()"
          >
            <i class="el-icon-loading icon-loading" v-if="isLoading"/>
            <img src="../../public/confirm1.png" />
          </div>
          <div class="btn" @click="closeClick">
              <img src="../../public/btn1.png" />
          </div>
        </template>
      </div>
@@ -171,7 +191,6 @@
<script>
import {
  startTask,
  setProductNumber,
  sendProcessParams,
} from "@/api/home/index"; // 产线
// import ErrorIssue from "@/components/ErrorIssue";
@@ -200,7 +219,7 @@
  data() {
    return {
      islook: false,
      showBtn: 1,
      showBtn:1,
      num: 0,
      timer: null,
      message: "请确认生产安全！",
@@ -222,10 +241,18 @@
        this.showBtn = 3;
      }
    },
    islook(){
      this.showBtn=1;
      if (this.timer) {
        clearInterval(this.timer);
      }
      this.num = 0;
    },
  },
  methods: {
    confirmClick2() {
      this.messageError = "";
      this.isLoading=false;
    },
    confirmClick1() {
      this.num = 0;
@@ -253,6 +280,7 @@
        this.islook = true;
      } else {
        this.islook = false;
        this.islook = true;
      }
    },
    getDateObj(date, fmt) {
@@ -305,19 +333,22 @@
            this.getCode(this.resParams);
          }
        }, 1000);
        if(this.isLoading){
          return true;
        }
        this.isLoading=true;
          sendProcessParams({ id: this.taskData.Procedure.ID }).then((res) => {
            console.log(res,'====res')
          sendProcessParams({ procedureId: this.taskData.Procedure.ID,position: Number(this.taskData.Position), }).then((res) => {
            if (res.code == 200) {
              setProductNumber().then((res) => {
                this.resParams = res;
                this.isLoading=false;
              });
              this.resParams = res;
              this.isLoading=false;
            } else {
              this.isLoading=false;
              this.resParams = res;
            }
          });
          setTimeout(()=>{
            this.isLoading=false;
          },30000)
      }
    },
    getCode(res) {
@@ -352,14 +383,14 @@

<style lang="scss" scoped>
.tank-box {
  width: 638px;
  height: 630px;
  padding: 0 20px;
  width: 753px;
  height: 728px;
  background: url("../../public/tank.png") no-repeat center center / cover;
  position: relative;
  .dialog-footer {
    position: absolute;
    bottom: 40px;
    bottom: 30px;
    width:94%;
  }
}
.color_4efefa {
@@ -375,9 +406,10 @@
  margin-bottom: 13px;
}
.title-box {
  width: 100%;
  width: calc(100% - 140px);
  height: auto;
  overflow: hidden;
  padding:0 70px;
  .title-item {
    width: 45%;
    float: left;
@@ -391,11 +423,11 @@
  }

  .title-bng {
    height: 42px;
    line-height: 42px;
    height: 52px;
    line-height:52px;
    span {
      width: calc(100% - 110px);
      height: 42px;
      width: calc(100% - 120px);
      height: 52px;
      text-align: center;
      display: inline-block;
      background: url("../../public/number.png") no-repeat center center / cover;
@@ -430,16 +462,24 @@
  padding: 0 !important;
}
.btn {
  width: 200px;
  width: 150px;
  height: auto;
  float: left;
  float: right;
  display: inline-block;
  position:relative;
  img {
    width: 100%;
  }
  .icon-loading{
    font-size:19px;
    color:#333;
    position:absolute;
    line-height:3.4;
    left:15%;
  }
  &:nth-of-type(1) {
    margin-right: 30px;
    margin-left: 110px;
    // margin-right: 30px;
    // margin-left: 110px;
  }
}
::v-deep .el-tabs__content {
@@ -519,13 +559,38 @@
.dialog-content-box {
  height: calc(100% - 200px);
  // overflow: hidden;
  padding: 50px 20px 20px;
  padding: 20px 0px 20px;
  .el-form {
    overflow: hidden;
  }
  .title-auto-box {
    height: calc(100% - 150px);
    height: calc(100% - 180px);
    overflow: auto;
    width:calc(100% - 140px);
    margin: 0 auto; 
    background:#0E246A;
    .title-box{
      padding:0 10px;
      width:calc(100% - 20px);
    }
  }
  .gif{
    width:35px;
    margin:0 auto;
    display:inline-block;
    vertical-align: middle;
    img{
      width:100%;
    }
    .yuandian {
        width: 35px;
        height: 35px;
        display: inline-block;
        // background: #15d815;
        background:red;
        border-radius: 50%;
        vertical-align: middle;
      }
  }
  .progress-item {
    width: 55%;
@@ -553,12 +618,29 @@
  font-weight: 600;
}
.drawerHeader {
  font-weight: 700;
  font-size: 20px;
  text-align: center;
  color: #fff;
  height: 35px;
  line-height: 35px;
  width:98%;
  margin:0 auto;
  overflow:hidden;
  .title-l{
    width:25%;
    float:left;
    margin-left:30px;
    font-size: 25px;
    color: #fff;
    height: 3.2vw;
    line-height: 4.5vw;
  }
  .title-r{
    width:60px;
    float:right;
    height: 60px;
    line-height: 5vw;
    cursor:pointer;
    img{
      display:inline-block;
      width:100%;
    }
  }
  .identify {
    width: 80px;
    height: 25px;