haoxuan
2023-09-16 23af06e2777e939fddc7823e480887175d2f61bc
面板的样式修改
2个文件已修改
40 ■■■■■ 已修改文件
src/views/set.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/visualization.vue 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/set.vue
@@ -570,7 +570,7 @@
    };
  },
  mounted() {
    this.getnetworkCardList();
    this.buttonClick(this.active)
  },
  watch: {},
  methods: {
src/views/visualization.vue
@@ -45,13 +45,13 @@
            <span class="title-item"
              >工单编号:
              <span class="color_4efefa">{{
                taskData.Order.workOrderId || ""
                taskData.Order.workOrderId || "--"
              }}</span>
            </span>
            <span class="title-item"
              >当前工序:
              <span class="color_4efefa">{{
                taskData.Procedure.procedure.procedureName || ""
                taskData.Procedure.procedure.procedureName || "--"
              }}</span>
            </span>
            <span class="title-item"
@@ -75,8 +75,8 @@
              </span>
            </span> -->
          </div>
          <div class="gongx" v-if="taskData.AllProcedures">
          <el-steps :active="taskData.CurrentProcedureIndex?taskData.CurrentProcedureIndex:0"  finish-status="success" class="steps">
          <div class="gongx">
          <el-steps v-if="taskData.AllProcedures" :active="taskData.CurrentProcedureIndex?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>
@@ -584,7 +584,7 @@
  },
  data() {
    return {
      activeName: 2,
      activeName: 1,
      progress: 70, //进度
      passrate: 30, //合格率
      production: 25, //生产中
@@ -851,7 +851,12 @@
        },
        inputMaterials: [],
        outputMaterials: [],
        procedureList: [],
        procedureList: [
          // {
          //   number: 11111,
          //   name: "工艺",
          // }
        ],
      };
      this.Tasks = [];
      getTaskInfo({ page: 1, pageSize: this.activeName }).then((res) => {
@@ -923,11 +928,10 @@
            }, 60000);
          }
        }
        debugger
        if(this.activeName==2){
            this.Tasks[1]=null
        }
      });
      // this.Tasks.push(object)
      // this.Tasks.push(object)
    },
    getStartArr(){
      for (let i in this.Tasks) {
@@ -1288,9 +1292,10 @@
    .el-carousel__container{
      overflow-y:auto;
    }
    // .el-carousel__item{
    //   min-height:116px;
    // }
    .el-carousel__item{
    //  height:auto;
     min-height:160px;
    }
  }
}
@@ -1357,11 +1362,12 @@
      align-content: center;
      justify-content: space-around;
      align-items: center;
      overflow:hidden;
      .title-item {
        width: calc(33.333% - 50px);
        width: calc((100% - 50px)/3);
        float: left;
        margin-right: 10px;
        padding: 15px 20px;
        padding: 10px 5px;
        text-align: center;
        border-radius: 4px;
        display: inline-block;
@@ -1453,7 +1459,7 @@
        // border: 1px solid #ccc;
        background: #6b83ff;
        border-radius: 5px;
        margin-top: 20px;
        margin-top: 10px;
        color: #333;
        position: relative;
        .card_top-2,