11

Mr.Zhang

2023-08-23 b2439ac8beab79c41548cd60788e015e669880db

11

 screen_standard/src/views/index.vue

@@ -54,7 +54,7 @@
                <div class="scroll_item_row">{{ item.materialName }}</div>
                <div class="scroll_item_row">{{ item.materialCode }}</div>
                <div class="scroll_item_row">{{ item.num }}</div>
                <div class="scroll_item_row">
                <div class="scroll_item_row" style="text-align: left;">
                  <el-tooltip v-for="(child, i) in item.procedureList" :key="i" effect="dark"
                    :content="'已报工良品数' + child.doneNum + '；工序计划数' + child.planNum" placement="top">
                    <div class="scroll_item_row_item" @click="jump(child.procedureId, child.procedureName)">
@@ -137,8 +137,8 @@
                <div v-for="(item, index) in data.log" :key="index"
                  :class="index % 2 == 0 ? 'scroll_item scroll_item_bg1' : 'scroll_item scroll_item_bg2'">
                  <div class="scroll_item_row">{{ item.userName }}</div>
                  <div class="scroll_item_row">{{ item.materialName }}</div>
                  <div class="scroll_item_row">{{ item.procedureName }}</div>
                  <div class="scroll_item_row">{{ item.materialCode }}</div>
                  <div class="scroll_item_row">{{ dateToSub(item.createTime) }}</div>
                  <div class="scroll_item_row">{{ item.qualifiedNum || 0 }}</div>
                  <div class="scroll_item_row">{{ item.unqualifiedNum || 0 }}</div>
@@ -187,7 +187,10 @@
                :class="index % 2 == 0 ? 'scroll_item scroll_item_bg1' : 'scroll_item scroll_item_bg2'">
                <div class="scroll_item_row">{{ dateToSub(item.checkdate) }}</div>
                <div class="scroll_item_row">{{ item.deviceName }}</div>
                <div class="scroll_item_row">{{ item.status == 0 ? '合格' : '不合格' }}</div>
                <div class="scroll_item_row">
                  <span v-if="item.status == 0">正常</span>
                  <span v-else style="color: #F84F26">异常</span>
                </div>
                <div class="scroll_item_row">{{ item.userName }}</div>
              </div>
            </div>
@@ -1088,7 +1091,7 @@
            color: #01D9FE;

            &:nth-child(5) {
              flex: 2.7;
              flex: 3;
              
            }
          }
@@ -1129,7 +1132,7 @@

                &:nth-child(5) {
                  flex: 3;
                  
                  justify-content: start;
                }
                .scroll_item_row_item {
                  margin-top: -11px;
@@ -1427,8 +1430,8 @@
          left: 50%;
          transform: translate(-50%, -50%);
          z-index: 999;
          width: 114px;
          height: 114px;
          width: 100px;
          height: 100px;
          border-radius: 50%;
          border: 2px dashed #01D9FE;
          display: flex;

 screen_standard/src/views/process.vue

@@ -199,7 +199,7 @@
      start()
    })
  // 报工日志分页查询 
  getRecordLogPage(enterprise.companyId, enterprise.departId, { capacity: 9999, page: 1, model: { procedureId: route.query.procedureId } })
  getRecordLogPage(enterprise.companyId, enterprise.departId, { capacity: 20, page: 1, model: { procedureId: route.query.procedureId } })
    .then(res => {
      data.reportListData = res.records
      reportStart()