songshankun
2023-11-28 e85193ea9acae04e9dbf6ca5b97f1735d4cc2e13
src/views/dashboard/index.vue
@@ -38,7 +38,7 @@
                  <Loading />
                </el-icon>
                <div v-if="!craftModelStore.hasMore">加载完成</div>
                <div v-if="!craftModelStore.hasMore && craftModelStore.craftModelList.length > 6">加载完成</div>
              </div>
            </el-scrollbar>
          </div>
@@ -58,7 +58,7 @@
    <template #middleBlock3>
      <SubTitle>任务详情</SubTitle>
      <div class="task-detail">
        <TaskControl :task="activeTask" @should-reload="reloadChannel"></TaskControl>
        <TaskControl :task="activeTask" :workers="currentWorkers" @should-reload="reloadChannel"></TaskControl>
      </div>
      <ColorInfo :type="1"></ColorInfo>
      <ColorInfo :type="2"></ColorInfo>
@@ -96,7 +96,7 @@
import { computed, ref } from 'vue'
import ChannelCollapse from '@/views/dashboard/components/ChannelCollapse.vue'
import type { Worker, Order, Task, Material } from '@/api/task'
import type { Task, Material } from '@/api/task'
import type { CraftModel } from '@/api/craftModel'
import PersonInfo from '@/views/dashboard/components/PersonInfo.vue'
import ProcessInfo from '@/views/dashboard/components/ProcessInfo.vue'
@@ -124,6 +124,7 @@
import { updateCraftParams } from '@/api'
import { Loading } from '@element-plus/icons-vue'
import { isNumber } from 'lodash-es'
defineOptions({
  name: 'DashboardView'
@@ -202,13 +203,14 @@
            message: '更新成功!',
            type: 'success'
          })
          craftModelStore.getCraftModelList()
        }
      },
      (err) => {
        console.error(err, '----err')
        setTimeout(() => {
          editActive(craftModel)
        }, 500)
        }, 300)
      }
    )
  }
@@ -234,6 +236,15 @@
  currentMaterialInfo.value = material
  showMaterialDetail.value = true
}
const currentWorkers = computed(() => {
  const channel = activeTask.value?.Channel
  if (isNumber(channel)) {
    return channels.value[channel].workers ?? []
  } else {
    return []
  }
})
</script>
<style scoped lang="scss">