工序弹框的 列表和详情的更新同步

haoxuan

2023-10-11 a1a6630f2eabfc78a379b5808b1bf7231a084d0b

 src/views/visualization.vue

@@ -90,7 +90,7 @@
            </span> -->
          </div>
          <div class="gongx">
          <el-steps v-if="taskData.AllProcedures" :active="taskData.CurrentProcedureIndex?taskData.CurrentProcedureIndex:0"  finish-status="success" class="steps">
          <el-steps v-if="taskData.AllProcedures" :active="taskData.CurrentProcedureIndex ?? 0"  finish-status="success" class="steps">
            <el-step icon="" :title="item" v-for="(item,index) in taskData.AllProcedures" :key="index"></el-step>
          </el-steps>
        </div>
@@ -104,7 +104,7 @@
                      style="font-size: 35px; font-weight: 600"
                      class="color_green"
                    >
                      {{ taskData.finishNumber }}{{ taskData.Order.unit }}
                      {{ taskData.finishNumber || 0 }}{{ taskData.Order.unit }}
                    </dd>
                  </dl>
                </div>
@@ -124,33 +124,37 @@
              </div>
            </div>
            <div class="content_right">
              <div class="gif" v-if="taskData.Procedure.ID" @click="processModelClick(taskData,index)">
                    <img v-if="taskData.isUpdateIcon"  src="../../public/shan.gif" />
                    <span v-else class="yuandian"></span>
               </div>
              <el-descriptions :column="(activeName == 1||activeName == 3) ? 2 : 1" :colon="true">
                <el-descriptions-item label="产品名称">{{
                  taskData.Order.productName || ""
                  taskData.Order.productName || "--"
                }}</el-descriptions-item>
                <el-descriptions-item label="数量"
                  >{{ taskData.Order.amount || 0
                  }}{{ taskData.Order.unit }}</el-descriptions-item
                >
                <el-descriptions-item label="交货日期">{{
                  taskData.Order.deliverDate || ""
                  taskData.Order.deliverDate || "--"
                }}</el-descriptions-item>
                <el-descriptions-item label="工时">
                  {{ taskData.Procedure.procedure.workHours || "" }}
                  {{ taskData.Procedure.procedure.workHours || "--" }}
                </el-descriptions-item>
                <el-descriptions-item label="计划时间"
                  >{{ formatDate(taskData.Order.startTime) || "" }}
                  >{{ formatDate(taskData.Order.startTime) || "--" }}
                  -
                  {{ formatDate(taskData.Order.endTime) }}</el-descriptions-item
                >
                <el-descriptions-item label="货物描述">{{
                  taskData.Order.orderAttr || ""
                }}</el-descriptions-item>
                <el-descriptions-item label="客户名称">{{
                  taskData.Order.customer || ""
                <el-descriptions-item label="通道">
                  {{ channelNameConfig[taskData.Channel] || "--" }}
                </el-descriptions-item>
                <el-descriptions-item label="客户编码">{{
                  taskData.Order.customer || "--"
                }}</el-descriptions-item>
                <el-descriptions-item label="参数要求">{{
                  taskData.Order.parameter || ""
                  taskData.Order.parameter || "--"
                }}</el-descriptions-item>
              </el-descriptions>
              <el-descriptions :column="1" :colon="true">
@@ -163,7 +167,7 @@
                    :text-inside="true"
                    :stroke-width="30"
                    :percentage="
                      (taskData.Order && taskData.finishNumber != 0)
                      (taskData.Order && taskData.finishNumber != 0 && taskData.Order.amount)
                        ? parseInt(
                            (taskData.finishNumber / taskData.Order.amount) *
                              100
@@ -223,13 +227,20 @@
                      </div>
                    </div>
                    <div class="card-top-input-out-l">
                      <div>
                      <div class="font_dian">
                        <!-- 设备12<i
                            style="font-size: 14px"
                            class="el-icon-right font-arrow-20"
                          ></i>
                          设备13 -->
                        {{ list.materialName }}
                          <el-popover
                          width="200"
                          :content="list.materialName"
                          placement="top-start"
                          trigger="click"
                        >
                          <span slot="reference">{{ list.materialName }}</span>
                        </el-popover>
                      </div>
                    </div>
                    <div class="card-top-input-out-r">
@@ -264,11 +275,12 @@
                  v-for="(item, index) in taskData.procedureList"
                >
                  <div
                    class="card"
                    :key="index2"
                    v-for="(list, index2) in item"
                  >
                    <template v-if="list.name == '工序'">
                    <div
                      class="card"
                      v-if="list.name == '工序'">
                      <div class="card_content">
                        <div class="card_contentLeft color_blue font_dian">
                          <!-- {{ list.deviceName }} -->
@@ -286,7 +298,7 @@
                      <div class="card_top-3">
                        <span class="card-top-r-t"
                          >完成进度：{{
                            taskData.Order && taskData.finishNumber != 0
                            (taskData.Order && taskData.finishNumber != 0 && taskData.Order.amount)
                              ? parseInt(
                                  (taskData.finishNumber /
                                    taskData.Order.amount) *
@@ -326,24 +338,34 @@
                        <!-- <span class="card-top-r-t">完成进度：50%</span>
                          <span class="card-top-r-b">12月28日 08:24</span> -->
                      </div>
                    </template>
                    <template v-else>
                      <!-- <div class="card_content">
                        
                      </div> -->
                      <div :class="(activeName==1||activeName == 3)?'card_top-4 font_size_20px':'card_top-4'">
                        <div>工艺编号：<div >{{ list.number }}</div></div>
                        <!-- <div
                          style="
                            font-size: 14px;
                            color: #cfcfcf;
                            line-height: 20px;
                          "
                    </div>
                    <div v-else class="process-params">
                      <div class="process-params-title">
                        <el-popover
                          width="200"
                          :content="list.number"
                          placement="top-start"
                          trigger="click"
                        >
                          工艺的具体信息请点击控制查看！
                        </div> -->
                          <span slot="reference">工艺编号：{{ list.number }}</span>
                        </el-popover>

                      </div>
                    </template>
                      <div class="process-params-value">
                        <!-- 工艺参数-->
                        {{mergeProcessParams(taskData.Arr)}}
                      </div>

                      <!-- <div
                        style="
                          font-size: 14px;
                          color: #cfcfcf;
                          line-height: 20px;
                        "
                      >
                        工艺的具体信息请点击控制查看！
                      </div> -->
                    </div>
                  </div>
                </el-carousel-item>
              </el-carousel>
@@ -353,9 +375,9 @@
              ></p>
              <div class="right-small-btn bottom-box-btn">
                <el-button type="primary"> 打印</el-button>
                <el-button v-if="taskData.Procedure.Status==3" type="primary" class="huise"> 完成</el-button>

                <el-popover
                 v-else
                v-if="taskData.Procedure.Status && taskData.Procedure.Status!==3"
                  placement="top-end"
                  width="160"
                  class="button-finish"
@@ -378,6 +400,7 @@
                  </div>
                  <el-button type="primary" slot="reference"> 完成</el-button>
                </el-popover>
                <el-button  v-else type="primary" class="huise"> 完成</el-button>
              </div>
            </div>
            <i class="el-icon-arrow-right font-arrow-20 color_318583"></i>
@@ -419,8 +442,15 @@
                        </div>
                      </div>
                      <div class="card-top-input-out-l">
                        <div>
                          {{ list.materialName }}
                        <div class="font_dian">
                          <el-popover
                            width="200"
                            :content="list.materialName"
                            placement="top-start"
                            trigger="click"
                          >
                            <span slot="reference">{{ list.materialName }}</span>
                          </el-popover>
                        </div>
                      </div>
                      <div class="card-top-input-out-r">
@@ -442,7 +472,7 @@
          <template
              v-if="activeName == 2 &&(!taskData||Object.keys(taskData).length==0)"
            >
            

            <el-empty description="暂无任务..."></el-empty>
          </template>
        </div>
@@ -481,7 +511,6 @@
            <span v-else>
              <img  v-if="plcStatus == 1&&!plcNotConnected"  src="../../public/duan.png" />
              <img  v-else src="../../public/lian.png" />
              <!-- <span class="yuandian"></span> -->
              {{ plcStatus==1?'断开':(plcStatus==2?'生产中':'待机') }}
            </span>
          </span>
@@ -495,7 +524,7 @@
          <div class="right-person-box" v-if="workers && workers.length > 0">
            <dl
              class="right-small-person"
              v-for="(item, index) in workers"
              v-for="(item, index) in deduplicateWorkers(displayWorkers())"
              :key="index"
            >
              <dt>
@@ -515,9 +544,9 @@
              <!-- <span>{{ item.phoneNum || "" }}</span> -->
              <span class="color_yellow"><i class="el-icon-star-on" /><i class="el-icon-star-on" /><i class="el-icon-star-on" /><i class="el-icon-star-on" /><i class="el-icon-star-on" /></span>
            </dl>
           

          </div>
         

          <!-- <div
            style="
              width: 100%;
@@ -573,19 +602,20 @@
          </div>
        </div>
      </div>
      

    </template> -->
    <!-- 控制的弹框 -->
    <AddControl ref="control" :Arr="Arr" />
    <!-- 控制的弹框 -->
    <AddIssue
    <TaskControlModal
      ref="control"
      :Arr="Arr"
      :safeProduce="safeProduce"
      :taskData="taskData"
      :Order="taskData.Order"
      @getSetProductNumber="getTaskInfo"
      :activeName="activeName"
      @getSetProductNumber="reloadPage"
      @isTip="isTip"
    />
    <!-- 工艺模型 -->
    <ProcessModel
      ref="processModel"
      :listData="listData"
      @updateGet="updateGet"
    />
  </div>
</template>
@@ -600,20 +630,28 @@
  getProgress,
  countdown,
  getTaskUnStarted,
  processModelList,
} from "@/api/home/index"; // 产线
import Card from "@/components/Card.vue";
import Knowledge from "../components/Knowledge.vue";
import AddControl from "../components/AddControl.vue";
import AddIssue from "../components/AddIssue.vue";
import ProcessModel from  "../components/ProcessModel.vue";
import TaskControlModal from "@/components/TaskControlModal.vue";
import {channelNameConfig} from "@/common/constants";
import _ from 'lodash'
export default {
  components: {
    TaskControlModal,
    Card,
    Knowledge,
    AddControl,
    AddIssue,
    ProcessModel,
  },
  data() {
    return {
      pollingTaskCountTimer: null,
      activeName: 1,
      progress: 70, //进度
      passrate: 30, //合格率
@@ -623,6 +661,8 @@
      // 右侧完成
      finishShow:{},
      workers:[],
      // 保存当前不同通道的值班人
      channelWorkersMap:{0:[],1:[]},
      TasksCopy:[],
      Tasks: [
        {
@@ -709,9 +749,11 @@
      countDownHour: 0,
      countDownMinute: 0,
      Arr: [],
      ArrError:'',
      // 记录定时器状态
      procInfoTimer: null,
      cutdownTimer: null,
      ProcessModelTimer: null,
      TaskCount:0,
      plcStatus:0,
      isTipShow:false,
@@ -720,6 +762,21 @@
      // 设备断开的原因
      plcNotConnected:'',
      ChannelAmount:0,
      object:{
        Order: {},
        Procedure: {
          procedure: { inputMaterials: [], outputMaterials: [], workers: [] },
        },
        inputMaterials: [],
        outputMaterials: [],
        procedureList: [],
      },
      processList:[],
      listData:[],
      resResult:[],
      resprocInfoTimer:null,
      channelNameConfig: channelNameConfig,
      index:null,
    };
  },
  mounted() {
@@ -734,7 +791,17 @@
      this.getDate3();
      this.getDate2();
    }, 5000);
    this.getTaskInfo();

    let channelType = this.getChannelTypeFromUrl()
    channelType = channelType ?? 1
    this.activeName = channelType
    this.getTaskInfo(channelType);
    this.getTaskCountStatistics()
  },
  beforeDestroy() {
    clearTimeout(this.pollingTaskCountTimer)
    clearTimeout(this.procInfoTimer)
    clearTimeout(this.ProcessModelTimer)
  },
  watch:{
    // isFinsh(){
@@ -744,10 +811,86 @@
    // }
  },
  methods: {
    deduplicateWorkers(workers){
      return _.uniqBy(workers,ele=>ele.workerName)
    },
    updateGet(number,val){
      if(val){
        this.getTaskInfo(this.activeName,'new')
        return true;
      }
      this.listData.number=number
      if(this.index){
        this.TasksCopy[this.index].number=number
      }
    },
    getModelList(){
      for (let i in this.TasksCopy){
        this.TasksCopy[i].isUpdateIcon=false;
        if(this.TasksCopy[i].Procedure.ID&&this.TasksCopy[i].number){
          processModelList({
            procedureId: this.TasksCopy[i].Procedure.ID,
            page: 1,
            pageSize:6,
            number:this.TasksCopy[i].number
          }).then(res=>{
            if(res.code==200){
              this.processList=res.data?res.data:[];
              if(this.processList.length>0){
                for(let j in this.processList){
                  if(this.processList[j].isUpdate){
                    this.TasksCopy[i].isUpdateIcon=true;
                    this.$forceUpdate()
                    break;
                  }
                }
              }
            }
            this.resResult[i]=res;
            console.log( this.resResult[i],'===res111')
          })
        }
      }
    },
    processModelClick(list,index){
      this.listData=list;
      this.index=index
      if( Object.keys(this.listData).length > 0){
        if(this.listData.Procedure.ID&&this.listData.number){
          this.$refs.processModel.islook=true
          return true;
        }
      }
      this.$message.error('当前工序无编号，无法查看工序!')
    },
    getProcessModelList(){
      this.getModelList()
      let string=false;
      if(this.resResult.length>0){
        for(let i in this.resResult){
          if(this.resResult[i]){
            string=false;
          }
        }
      }
      if (!this.ProcessModelTimer&&!string) {
          this.ProcessModelTimer = setInterval(() => {
            this.resResult=[]
          this.getModelList();
        }, 5000)
      }
    },
    mergeProcessParams(params){
      if (params?.length){
        return params.map(ele=> `${ele.Key}: ${ele.Value}`).join(' ')
      }else{
        return ''
      }
    },
    taskClick(){
      if(this.TaskCount>0){
        this.getStartArr()
        this.$refs.control.islook=true
        // this.getStartArr()
        this.$refs.control.show=true
      }else{
        this.$message({
          message:'目前没有任务！',
@@ -761,17 +904,30 @@
    },
    cutClick(val) {
      this.activeName = val;
      this.updateChannelTypeToUrl(val)
      if(this.activeName==2){
        this.Tasks=this.TasksCopy.slice(0,2)
        if(this.Tasks.length<2){
          if(this.Tasks.length==0){
            this.Tasks.push(this.object)
          }
          this.Tasks.push(this.object)
        }
      }else if(this.activeName==1){
        this.Tasks=this.TasksCopy.slice(0,1)
        if(this.Tasks.length<1){
          this.Tasks.push(this.object)
        }
      }else if(this.activeName==3){
        this.Tasks=this.TasksCopy.slice(1)
        if(this.Tasks.length<1){
          this.Tasks.push(this.object)
        }
      }
    },
    reloadPage() {
    reloadPage(val) {
      // window.location.reload();
      this.getTaskInfo();
      this.getTaskInfo(val);
    },
    getcountdown() {
      countdown().then((res) => {
@@ -791,7 +947,6 @@
        }
      });
    },

    getDateObj(date, fmt) {
      if (/(y+)/.test(fmt)) {
        fmt = fmt.replace(
@@ -854,7 +1009,7 @@
        let String=now-date*1000;
        let seconds=Math.floor(String/1000)
        let minutes=Math.floor(seconds/60)
        

        let days=Math.floor(String/1000/60/60/24)
        let hours=Math.floor(minutes/60)-days*24
        let m=minutes-days*24*60-hours*60
@@ -864,7 +1019,7 @@
      setInterval(() => {
       d= getCha();
      }, 6000);
      return d;
      return date?d:'--';
    },
    setInterCard(value, name, i) {
      if (this.TasksCopy[i].Procedure.procedure[value]!=null) {
@@ -905,66 +1060,90 @@
      }
    },

    getTaskInfo() {
      let object = {
        Order: {},
        Procedure: {
          procedure: { inputMaterials: [], outputMaterials: [], workers: [] },
        },
        inputMaterials: [],
        outputMaterials: [
            // [
            //   {
            //    materialId:11111,
            //    materialName:'272大家啊放假了卡艰苦奋斗垃圾发快递垃圾反馈来得及克隆',
            //    amount:100,
            //    unit:'件'
            //   }
            // ]
        ],
        procedureList: [
        //  [ 
        //     {
        //       name:"工序",
        //       deviceName:'1111dhafjdhajkhf jkdahjkf打法即可打開鏈接肯德基啊看來jdad大风京东卡老司机番窠倒臼开了房金阿奎第十六届反馈拉德斯基k打卡机阿珂附件打开了点击阿里卡减肥的卡拉胶开了房大街上克隆fk啦大家防空雷達數據看i'
        //     },
        //   ]
        ],
      };
    /**
     * 轮询获取任务数量
     */
    getTaskCountStatistics(){
      getTaskInfo({taskMode:1}).then((res) => {
        if (res.code === 200&&res.data) {
          this.TaskCount=res.data?.TaskCount ?? 0
        }
      },err=>{
        this.TaskCount = 0
        console.error(err)
      }).finally(()=>{
        this.pollingTaskCountTimer = setTimeout(()=>{
          this.getTaskCountStatistics()
        //   20秒一次轮询
        },20000)
      });
    },

    /**
     * 根据当前展示的是0通道还是1通道还是两个通道展示对应的值班人
     * @return {*[]}
     */
    displayWorkers(){
      let showWorkers = []
      if (this.activeName===1){
        showWorkers =[...this.channelWorkersMap[0]]
      }else if (this.activeName===2){
        showWorkers =[...this.channelWorkersMap[0],...this.channelWorkersMap[1]]
      }else if (this.activeName===3){
        showWorkers =[...this.channelWorkersMap[1]]
      }else {
        return []
      }

      return showWorkers
    },

    getTaskInfo(val,info) {
      this.Tasks = [];
      this.TasksCopy=[]
      getTaskInfo({taskMode:2}).then((res) => {
        if (res.code == 200&&res.data) {
          let arr=[]
          // let arr=[]
          if(res.data.Tasks){
           arr.sort(function(a,b){
            res.data.Tasks.sort(function(a,b){
            return (a.Channel - b.Channel)
           })
          }
          this.activeName=1;
          this.TasksCopy = res.data.Tasks ? res.data.Tasks : [];
          this.safeProduce=res.data.Prompt.safeProduce?res.data.Prompt.safeProduce:''
          // this.safeProduce=res.data.Prompt.safeProduce?res.data.Prompt.safeProduce:''
          this.plcNotConnected=res.data.Prompt.plcNotConnected?res.data.Prompt.plcNotConnected:''
          this.ChannelAmount=res.data.ChannelAmount?res.data.ChannelAmount:1
          // if(this.ChannelAmount>1 &&this.TasksCopy.length<2){
          //   this.TasksCopy.push(object)
          //   this.TasksCopy.push(this.object)
          // }
          this.TaskCount=res.data.TaskCount?res.data.TaskCount:0
          
          if (this.TasksCopy.length == 0&&this.TaskCount==0) {

          if ((this.TasksCopy.length ==0 )||!this.TasksCopy) {
            if (this.activeName == 1||this.activeName == 3) {
              this.TasksCopy.push(object);
              this.TasksCopy.push(this.object);
            } else {
              this.TasksCopy.push(object);
              this.TasksCopy.push(object);
              this.TasksCopy.push(this.object);
              this.TasksCopy.push(this.object);
            }
          }
          this.workers=res.data.workers?res.data.workers:[]

          // 将值班人根据通道号分组
          const groupByChannel= _.groupBy(res.data.Tasks,ele=>ele.Channel)
          const taskList0= _.first(groupByChannel[0])
          const taskList1= _.first(groupByChannel[1])
          const worker0List = taskList0?.Procedure?.procedure?.workers ?? []
          const worker1List = taskList1?.Procedure?.procedure?.workers ?? []
          this.channelWorkersMap['0'] =worker0List
          this.channelWorkersMap['1'] =worker1List

          for (let i in this.TasksCopy) {
            this.TasksCopy[i].procedureList = [];
            this.TasksCopy[i].inputMaterials = [];
            this.TasksCopy[i].outputMaterials = [];
            this.TasksCopy[i].finishNumber = 0;
            this.TasksCopy[i].number=0;
            this.TasksCopy[i].isUpdateIcon=false;
            this.finishShow['finishShow&'+i]=false
            this.TasksCopy[i].Procedure.procedure.workers = this.TasksCopy[i].Procedure
              .procedure.workers
@@ -977,29 +1156,37 @@
                ...this.TasksCopy[i].Procedure.procedure,
              },
            ]);
           

            if (this.TasksCopy[i].Procedure.ID) {
              startTask({ id: this.TasksCopy[i].Procedure.ID }).then((res) => {
                if (res.code == 200) {
                  this.TasksCopy[i].number=res.data.Number
                  // res.data.number
                  this.TasksCopy[i].procedureList[0].push({
                    number: res.data.Number,
                  });
                  // this.TasksCopy[i].Arr=res.data.Params ? res.data.Params : []
                  this.TasksCopy[i].Arr=res.data.Params ? res.data.Params : []
                  // this.isFinsh=Number(i)+1
                  this.$forceUpdate()
                }
              });
            }
            this.setInterCard("inputMaterials", "cardBox1&" + i, i);
            this.setInterCard("outputMaterials", "cardBox3&" + i, i);
          }
          this.getProcessModelList();
          this.getStartArr()
          this.cutClick(val?val:1)
          if(info=='new'){
            return true;
          }

          this.getProgressInfo();
              if (!this.procInfoTimer) {
              if (!this.procInfoTimer&&!this.resprocInfoTimer) {
                this.procInfoTimer = setInterval(() => {
                  this.getProgressInfo();
                }, 3000);
          }
              }
        }
        // if (res.code != 200 || this.TasksCopy.length == 0) {
        //   this.getcountdown();
@@ -1010,10 +1197,10 @@
        //     }, 60000);
        //   }
        // }
        this.cutClick(1)

      });
      // this.TasksCopy.push(object)
      // this.TasksCopy.push(object)
      // this.TasksCopy.push(this.object)
      // this.TasksCopy.push(this.object)
    },
    getStartArr(){
      // for (let i in this.TasksCopy) {
@@ -1026,17 +1213,42 @@
      getTaskInfo({taskMode:1}).then(res=>{
        if(res.code==200){
          this.taskData=res.data.Tasks?res.data.Tasks[0]:{};
          if (this.taskData.Procedure.ID) {
          this.ArrError=''
          if (Object.keys(this.taskData).length > 0 &&this.taskData.Procedure.ID) {
              startTask({ id: this.taskData.Procedure.ID }).then((res) => {
                if (res.code == 200) {
                  this.Arr =res.data.Params ? res.data.Params : []
                }else{
                  this.ArrError=res.msg?res.msg:'获取工艺参数失败！';
                }
              });
            }
        }
      })
    },
    /**
     * 向URL中设置当前通道展示类型
     * @param {number} type 通道展示类型
     */
    updateChannelTypeToUrl(type){
      const activeName = this.getChannelTypeFromUrl();
      if (activeName === type){
        return
      }
      let path = this.$router.history.current.path
      this.$router.push({path, query: {activeName:  `${type ?? 1}`}})
    },
    /**
     * 从URL获取当前通道展示类型
     * @return {number}
     */
    getChannelTypeFromUrl(){
      let activeName = new URLSearchParams(location.search).get('activeName')
      activeName = activeName ? +activeName : undefined
      return activeName
    },
    getProgressInfo() {
      this.resprocInfoTimer=null
      for (let i in this.TasksCopy){
        if(this.TasksCopy[i].Procedure.ID){
          getProgress({
@@ -1049,10 +1261,10 @@
                : 0;
                this.plcStatus=res.data.plcStatus?res.data.plcStatus:0
            }
            this.resprocInfoTimer=res;
          });
        }
      }
      
    },
    // 设置
    setUrl() {
@@ -1083,7 +1295,7 @@
        finishTask({ id: taskData.Procedure.ID }).then((res) => {
          if (res.code == 200) {
            this.finishShow['finishShow&'+i] = false;
            this.getTaskInfo();
            this.reloadPage(this.activeName?this.activeName:1);
            this.$message.success("操作成功！");
          }
        });
@@ -1110,7 +1322,7 @@
 background:#12234a!important;
 color:#fff!important;
 border-color: #09e5ed !important;
 

 .popper__arrow::after{
  border-top-color:#09e5ed !important;
 }
@@ -1122,7 +1334,7 @@
 color:#318583;
}
.el-empty{
  height:100%;
  height:calc(100% - 190px);
  .el-empty__description p{
    font-size:16px!important;
    color:#fff!important;
@@ -1159,7 +1371,7 @@
    box-sizing: border-box;
    border-right: 1px solid #eee;
  }
  

  .small_title {
    margin-bottom: 30px;
  }
@@ -1215,7 +1427,7 @@
      font-size:14px;
    }
  }
  

  .el-step{
    .el-step__icon{
     background:#00cc66;
@@ -1226,19 +1438,47 @@
      }
    }
  }
  .el-step__head.is-process{
    color: #00cc66 !important;
    border-color:#00cc66;
  }
  .el-step__title.is-process{
    color: #00cc66 !important;
  }
  .el-step__head.is-wait{
    color:#fff;
    border-color:#fff;
  }
  .el-step__title.is-wait{
    color:#fff;
  }

  // 使步骤条节点状态成功时,前面的线同步更改颜色
  .steps{
    /* 进行中状态：圈线 */
    &  .el-step__head.is-process {
      color: #00cc66;
      border-color: #00cc66;
    }
    /* 进行中状态：圈内 */
    &  .el-step__head.is-process > .el-step__icon {
      background: #00cc66;
      color: #00cc66;
    }
    /* 进行中状态：title（文字） */
    &  .el-step__title.is-process {
      color: #00cc66;
    }

    /* 完成状态：圈线 */
    &  .el-step__head.is-success {
      color: #00cc66;
      border-color: #00cc66;
    }
    /* 完成状态：title（文字） */
    &  .el-step__title.is-success {
      color: #00cc66;
    }
    /* 完成状态：line
     * 描述：第一步完成，第二步进行时，之间的进度条有颜色
     */
    &  .el-step__head.is-success > .el-step__line > .el-step__line-inner {
      width: 100% !important;
      border-width: 1px !important;
    }
  }
}
.set-title {
@@ -1343,6 +1583,16 @@
  background: #09e5ed !important;
  color: #333 !important;
}
.yuandian {
        width: 35px;
        height: 35px;
        display:inline-block;
        // background: #15d815;
        background:red;
        border-radius: 50%;
        // margin-top:-5px;
        vertical-align: middle;
      }
.bottom_list {
  position: relative;
  padding: 10px;
@@ -1403,8 +1653,7 @@
      overflow-y:auto;
    }
    .el-carousel__item{
    //  height:auto;
     min-height:160px;
      height:auto;
    }
  }
  .bottom-box-btn{
@@ -1412,6 +1661,10 @@
    position:absolute;
    bottom:10px;
    left:10px;
    .el-button{
      height: 40px;

    }
  }
}

@@ -1419,7 +1672,6 @@
  font-size: 20px;
}
.right-small-btn {
  margin-top: 10px;
  width: calc(100% - 20px);
  margin: 0 auto;
  position: absolute;
@@ -1534,7 +1786,7 @@
          width: 100%;
          height: 30px;
          // text-align: left;
          font-size: 24px;
          font-size: 28px!important;
          margin: 0;
          text-align: center;
          line-height: 36px;
@@ -1547,6 +1799,18 @@
        padding: 0 10px;
        background: rgb(22 72 173);
        border-radius: 6px;
        position:relative;
        .gif{
          position:absolute;
          right:15px;
          top:10px;
          width:35px;
          vertical-align: middle;
          cursor:pointer;
          img{
            width:100%;
          }
        }
        // background: #233b9e;
        .el-descriptions-row{
          height:45px;
@@ -1590,12 +1854,18 @@
        margin-top: 10px;
        color: #333;
        position: relative;
        .font_dian{
            -webkit-box-orient:vertical;
            overflow:hidden;
            text-overflow:ellipsis;
            white-space:nowrap;
          }
        .card_top-2{
          width:35%;
          width:38%;
        }
        .card-top-input-out-r,
        .card_top-3 {
          width:65%;
          width:62%;
        }
        .card_top-2,.card-top-input-out-r,
        .card_top-3 {
@@ -1711,12 +1981,7 @@
            border-radius: 5px 5px 0 0;
            background: rgb(19, 35, 90);
          }
          .font_dian{
            -webkit-box-orient:vertical;
            overflow:hidden;
            text-overflow:ellipsis;
            white-space:nowrap;
          }


          .card_contentRight {
            width: 100%;
@@ -1786,18 +2051,6 @@
          // float:left;
          display:inline-block;
        }
      }
      
      .yuandian {
        width: 25px;
        height: 25px;
        line-height: 40px;
        margin-top: 12.5px;
        display: inline-block;
        background: #15d815;
        display: block;
        border-radius: 50%;
        float: right;
      }
    }
    .right-top-m-btn {
@@ -1870,7 +2123,7 @@
      .right-base-btn {
        width: 100%;
        position: absolute;
        bottom: 0;
        bottom: 24px;
        left: 0;
        .el-button--primary {
          width: 100%;
@@ -1880,6 +2133,10 @@
          color: #fff;
          font-weight: 700;
          font-size: 18px;
          height: 40px;
          display: flex;
          align-items: center;
          justify-content: center;
        }
      }
      // .call {
@@ -1905,4 +2162,23 @@
  font-weight: 700 !important;
  font-size: 16px;
}
.process-params{
  margin-top: 10px;
  border-radius: 5px;
  overflow: hidden;
  color: #fff;
  font-size: 12px;
  &-title{
    height: 25px;
    padding: 0 5px;
    background-color: #13235a;
    line-height: 25px;
  }
  &-value{
    background-color: #6b83ff;
    min-height: 45px;
    box-sizing: border-box;
    padding: 12px;
  }
}
</style>