From 1f2cabb5282b692e35e71b6bd3bcec379ae51e03 Mon Sep 17 00:00:00 2001 From: haoxuan <haoxuan> Date: 星期四, 21 九月 2023 19:32:50 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/WMS --- src/views/overview/index.vue | 73 +++++++++++++++++------------------- 1 files changed, 34 insertions(+), 39 deletions(-) diff --git a/src/views/overview/index.vue b/src/views/overview/index.vue index 536bea9..45c4208 100644 --- a/src/views/overview/index.vue +++ b/src/views/overview/index.vue @@ -10,14 +10,14 @@ v-for="item in tableList" :key="item.id" :class="{ - overview_active: item.status === 'active', - overview_done: item.status === 'done', - overview_todo: item.status === 'todo' + overview_active: item.baseOperationType === 1, + overview_done: item.baseOperationType === 2, + overview_todo: item.baseOperationType === 3 }" > <div class="top"> <div class="label"> - <span style="cursor: pointer" @click="labelClick(item.name)">{{ item.name }}</span> + <span style="cursor: pointer" @click="labelClick(item)">{{ item.name }}</span> </div> <div class="set">...</div> </div> @@ -48,6 +48,7 @@ <script> import pageMixin from "@/components/makepager/pager/mixin/pageMixin" +import { getOperationType } from "@/api/overview/overview" export default { name: "OverView", @@ -57,36 +58,7 @@ computed: {}, data() { return { - tableList: [ - { - name: "閲囪喘鍏ュ簱", - status: "active" - }, - { - name: "鍐呴儴璋冩嫧", - status: "done" - }, - { - name: "3", - status: "done" - }, - { - name: "2", - status: "active" - }, - { - name: "3", - status: "todo" - }, - { - name: "2", - status: "active" - }, - { - name: "3", - status: "todo" - } - ], + tableList: [], editConfig: { visible: false, title: "鏂板缓", @@ -94,15 +66,38 @@ } } }, - created() {}, + created() { + this.getData() + }, methods: { getList(val) { console.log(val) }, - labelClick(name) { - this.$router.push({ path: "/overview/overviewList", query: { name: name } }) + labelClick(item) { + console.log(item) + this.$router.push({ + name: "overviewList", + params: { name: item.name, workType: item.baseOperationType, id: item.id } + }) }, - getData() {} + async getData() { + await getOperationType({ + keyword: "", + page: this.pagerOptions.currPage, + pageSize: this.pagerOptions.pageSize + }).then((res) => { + console.log(res.data.data) + if (res.data.code === 200) { + const list = res.data.data.map((item) => { + return { + ...item + } + }) + this.tableList = list || [] + this.pagerOptions.totalCount = res.data.total + } + }) + } } } </script> @@ -110,7 +105,7 @@ <!-- Add "scoped" attribute to limit CSS to this component only --> <style lang="scss" scoped> .content { - height: calc(100% - 150px); + height: calc(100% - 130px); background: #fff; border-radius: 12px; .list-view { -- Gitblit v1.8.0