diff --git a/src/store/modules/workOrder.ts b/src/store/modules/workOrder.ts index fc40d01..6008791 100644 --- a/src/store/modules/workOrder.ts +++ b/src/store/modules/workOrder.ts @@ -45,12 +45,13 @@ export const useWorkOrderStore = defineStore({ }, async fetchOrderList(pagination) { const res = await getPackageList(pagination) - this.setOrderList(res.data) - if (res.data.length > 0) + if (res.data.length > 0) { + this.setOrderList(res.data) this.setActive(0) + } - return res.data + return res }, updateImmersion() { this.immersion = !this.immersion diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue index 1ecb6f0..c9a78cf 100644 --- a/src/views/home/content/Content.vue +++ b/src/views/home/content/Content.vue @@ -177,10 +177,8 @@ async function featchList() { } async function loadMore() { - if (loading.value || el.value == null) { - // console.log('图片加载中....') + if (loading.value || el.value == null) return - } const more = await featchList() listData.value.push(...more) diff --git a/src/views/worksheet/aside/Aside.vue b/src/views/worksheet/aside/Aside.vue index 4d7904f..fe59814 100644 --- a/src/views/worksheet/aside/Aside.vue +++ b/src/views/worksheet/aside/Aside.vue @@ -1,10 +1,10 @@ @@ -115,20 +127,23 @@ watch(() => workStore.immersion, () => { box-sizing: border-box; &-header { - display: flex; - justify-content: space-between; - align-items: center; padding: 12px 16px; width: 100%; overflow: hidden; - &-left { + .warpper { + display: flex; + justify-content: space-between; + align-items: center; + } + + .left { display: flex; align-items: center; overflow: hidden; } - &-right { + .right { display: flex; align-items: center; overflow: hidden; @@ -147,7 +162,7 @@ watch(() => workStore.immersion, () => { height: 100%; background: #507afd; position: absolute; - right: 0; + right: -2px; top: 0; } diff --git a/src/views/worksheet/aside/ListItem.vue b/src/views/worksheet/aside/ListItem.vue index 92f023e..78c4ee6 100644 --- a/src/views/worksheet/aside/ListItem.vue +++ b/src/views/worksheet/aside/ListItem.vue @@ -36,14 +36,14 @@ const svgName = computed(() => {
  • 筛选时间:{{ listItem.createTime }}
  • 执行人:{{ listItem.createBy }}
  • -
    -../types