feat: 计划时间取值字段更改; 修复0通道没有任务的情况下1通道的数据跑到左边的问题

songshankun

2023-10-23 2280d3aaaf652a89159efbe196356d9c6c35bbe8

 src/components/TaskControlModal.vue

@@ -65,9 +65,9 @@
                  工时： {{ currentTaskData.Procedure.procedure.workHours || "" }}
                </div>
                <div class="title-item">
                  计划时间： {{ formatDate(currentTaskData.Order.startTime) || "" }}
                  计划时间： {{ formatDate(currentTaskData.Procedure.startTime) || "" }}
                  -
                  {{ formatDate(currentTaskData.Order.endTime) }}
                  {{ formatDate(currentTaskData.Procedure.endTime) }}
                </div>

                <div class="title-item">
@@ -136,8 +136,12 @@
                    </div>
                  </template>
                  <div class="gif-right">
                    ----- 剩余时间 -----
                    <span>00:00:{{ 30 - Number(num) < 10 ? 0 : '' }}{{ 30 - Number(num) }}</span>
                    <div>
                      ----- 剩余时间 -----
                    </div>
                    <div>
                      <span>00:00:{{ 30 - Number(num) < 10 ? 0 : '' }}{{ 30 - Number(num) }}</span>
                    </div>
                  </div>
                </div>
                {{ message }}
@@ -212,6 +216,7 @@

<script>
import {getTaskInfo, sendProcessParams, startTask,} from "@/api/home"; // 产线
import {channelNameConfig} from "@/common/constants";
export default {
  name: 'TaskControlModal',
  components: {},
@@ -243,11 +248,7 @@
      isLoading: false,
      second: 0,
      secondTimer: null,
      // 通道名称配置 Channel 0 对应展示 0, Channel 1 对应展示 A,暂时忽略其余情况
      channelNameConfig: {
        0: '0',
        1: 'A'
      }
      channelNameConfig: channelNameConfig
    };
  },
  mounted() {
@@ -366,6 +367,8 @@
    getCurrentTaskProduceParams(id) {
      // const id = this.currentTaskData?.Procedure?.ID
      if (id) {
        this.currentProcessParams = []
        this.getProcessParamsErrMsg = ""
        startTask({id}).then((res) => {
          if (res.code === 200) {
            this.currentProcessParams = res.data.Params ?? []
@@ -424,9 +427,9 @@
      if (this.currentTaskData?.Procedure?.ID && this.currentTaskData?.Procedure?.Status === 1) {
        this.num = 0;
        this.showBtn = 1;
        this.show = true;
        // this.show = true;
      } else {
        this.show = false;
        // this.show = false;
      }
    },
    getDateObj(date, fmt) {