From 7194f72bc959c704387d1af4cbcc6625754057cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= <zhaozhengyi1b@126.com>
Date: Wed, 26 Mar 2025 18:01:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A4=A7=E5=B1=8F=E7=9C=8B?=
 =?UTF-8?q?=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/smartScreen/OrderScreen/index.js      |  25 +++
 .../OrderScreen/charts/DemoBar.vue            | 145 -------------
 .../OrderScreen/charts/DemoChart.vue          |  97 ---------
 .../OrderScreen/charts/DemoLine.vue           | 120 ----------
 .../OrderScreen/charts/DemoList.vue           |  89 --------
 .../OrderScreen/charts/DemoPie.vue            | 120 ----------
 .../SmartScreen/OrderScreen/charts/chart1.vue | 184 ++++++++--------
 .../OrderScreen/charts/chart100.vue           | 112 ----------
 .../SmartScreen/OrderScreen/charts/chart2.vue | 195 -----------------
 .../SmartScreen/OrderScreen/charts/chart3.vue | 205 ------------------
 .../SmartScreen/OrderScreen/charts/chart4.vue |  78 -------
 .../OrderScreen/charts/chart40.vue            | 115 ----------
 .../OrderScreen/charts/chart41.vue            |  89 --------
 .../SmartScreen/OrderScreen/charts/chart5.vue | 118 ----------
 .../SmartScreen/OrderScreen/charts/chart6.vue | 126 -----------
 .../SmartScreen/OrderScreen/charts/chart7.vue | 129 -----------
 .../SmartScreen/OrderScreen/charts/chart8.vue | 116 ----------
 src/views/SmartScreen/OrderScreen/index.css   |  12 +-
 src/views/SmartScreen/OrderScreen/index.vue   | 201 +++++------------
 src/views/SmartScreen/ReportScreen/index.css  |  21 +-
 src/views/SmartScreen/index.vue               |   7 +-
 21 files changed, 200 insertions(+), 2104 deletions(-)
 create mode 100644 src/api/smartScreen/OrderScreen/index.js
 delete mode 100644 src/views/SmartScreen/OrderScreen/charts/DemoBar.vue
 delete mode 100644 src/views/SmartScreen/OrderScreen/charts/DemoChart.vue
 delete mode 100644 src/views/SmartScreen/OrderScreen/charts/DemoLine.vue
 delete mode 100644 src/views/SmartScreen/OrderScreen/charts/DemoList.vue
 delete mode 100644 src/views/SmartScreen/OrderScreen/charts/DemoPie.vue
 delete mode 100644 src/views/SmartScreen/OrderScreen/charts/chart100.vue
 delete mode 100644 src/views/SmartScreen/OrderScreen/charts/chart2.vue
 delete mode 100644 src/views/SmartScreen/OrderScreen/charts/chart3.vue
 delete mode 100644 src/views/SmartScreen/OrderScreen/charts/chart4.vue
 delete mode 100644 src/views/SmartScreen/OrderScreen/charts/chart40.vue
 delete mode 100644 src/views/SmartScreen/OrderScreen/charts/chart41.vue
 delete mode 100644 src/views/SmartScreen/OrderScreen/charts/chart5.vue
 delete mode 100644 src/views/SmartScreen/OrderScreen/charts/chart6.vue
 delete mode 100644 src/views/SmartScreen/OrderScreen/charts/chart7.vue
 delete mode 100644 src/views/SmartScreen/OrderScreen/charts/chart8.vue

diff --git a/src/api/smartScreen/OrderScreen/index.js b/src/api/smartScreen/OrderScreen/index.js
new file mode 100644
index 0000000..f6ccf04
--- /dev/null
+++ b/src/api/smartScreen/OrderScreen/index.js
@@ -0,0 +1,25 @@
+import request from '@/utils/request'
+
+/**
+ * 获取订单数字翻牌器数据
+ * @param {查询条件} data
+ */
+export function GetLargeScreenOrder(query) {
+    return request({
+        url: 'mes/orderManagement/OrderSmart/GetLargeScreenOrder',
+        method: 'get',
+        params: query
+    })
+}
+
+/**
+ * 获取订单进度列表
+ * @param {查询条件} data
+ */
+export function GetOrderProgressList(query) {
+    return request({
+        url: 'mes/orderManagement/OrderSmart/GetOrderProgress',
+        method: 'get',
+        params: query
+    })
+}
diff --git a/src/views/SmartScreen/OrderScreen/charts/DemoBar.vue b/src/views/SmartScreen/OrderScreen/charts/DemoBar.vue
deleted file mode 100644
index 39f7105..0000000
--- a/src/views/SmartScreen/OrderScreen/charts/DemoBar.vue
+++ /dev/null
@@ -1,145 +0,0 @@
-<template>
-    <div ref="chartRef" :style="{ height: height, width: width }" />
-</template>
-
-<script setup>
-import { getCurrentInstance, watch, onMounted, ref } from 'vue'
-import * as echarts from 'echarts'
-import theme from '../theme/chalk.json'
-echarts.registerTheme('theme', theme)
-import { CanvasRenderer } from 'echarts/renderers'
-echarts.use([CanvasRenderer])
-const { proxy } = getCurrentInstance()
-const chartRef = ref(null)
-const props = defineProps({
-    width: {
-        type: String,
-        default: '100%'
-    },
-    height: {
-        type: String,
-        default: '450px'
-    }
-})
-const options = {
-    title: {
-        text: '工单对比',
-        left: 'left'
-    },
-    tooltip: {
-        trigger: 'axis',
-        axisPointer: {
-            type: 'shadow'
-        }
-    },
-    grid: {
-        left: '3%',
-        right: '4%',
-        bottom: '3%',
-        containLabel: true
-    },
-    xAxis: {
-        data: ['周一', '周二', '周三', '周四', '周五', '周六', '周日'],
-        boundaryGap: true,
-        axisTick: {
-            show: false
-        }
-    },
-    yAxis: {
-        type: 'value',
-        axisTick: {
-            show: false
-        }
-    },
-    // 图例
-    legend: {
-        textStyle: {
-            color: '#fff'
-        },
-        data: ['计划', '实际', '占比']
-    },
-    series: [
-        {
-            name: '计划',
-            type: 'bar',
-            data: [312, 79, 59, 100, 541, 55, 142],
-            label: {
-                show: true,
-                position: 'top',
-                textBorderColor: '#fff',
-                textBorderWidth: 1,
-                color: '#fff'
-            }
-        },
-        {
-            name: '实际',
-            type: 'bar',
-            data: [108, 241, 239, 400, 542, 46, 425],
-            label: {
-                show: true,
-                position: 'top',
-                textBorderColor: '#fff',
-                textBorderWidth: 1,
-                color: '#fff'
-            }
-        },
-        {
-            name: '占比',
-            type: 'bar',
-            data: [10, 44, 44, 54, 20, 46, 60],
-            label: {
-                show: true,
-                position: 'top',
-                textBorderColor: '#fff',
-                textBorderWidth: 1,
-                color: '#fff'
-            }
-        }
-    ]
-}
-const chart = ref(null)
-function initChart() {
-    chart.value = echarts.init(proxy.$refs.chartRef, 'theme')
-    chart.value.setOption(options)
-}
-onMounted(() => {
-    initChart()
-    window.addEventListener('resize', () => {
-        chart.value?.resize()
-    })
-})
-/// ============ 修改数据 ===========
-import { getMoudle03 } from '@/api/smartScreen/ProdScreen/index.js'
-function updateData() {
-    getMoudle03().then((res) => {
-        if (res.code === 200) {
-            options.title = res.data.title
-            options.xAxis.data = res.data.xAxis.data
-            options.series = res.data.series
-            chart.value.setOption(options)
-        }
-    })
-}
-function handleQuery() {
-    updateData()
-}
-// handleQuery()
-let timer1 = null
-const clearSearchTimer = () => {
-    clearInterval(timer1)
-    timer1 = null
-}
-const createSearchTimer = () => {
-    clearSearchTimer()
-    timer1 = setInterval(() => {
-        handleQuery()
-    }, 1000 * 60 * 5)
-}
-onMounted(() => {
-    createSearchTimer()
-})
-onUnmounted(() => {
-    clearSearchTimer()
-})
-/// ==========================================
-</script>
diff --git a/src/views/SmartScreen/OrderScreen/charts/DemoChart.vue b/src/views/SmartScreen/OrderScreen/charts/DemoChart.vue
deleted file mode 100644
index 3172246..0000000
--- a/src/views/SmartScreen/OrderScreen/charts/DemoChart.vue
+++ /dev/null
@@ -1,97 +0,0 @@
-<template>
-    <div ref="chartRef" :style="{ height: height, width: width }" />
-</template>
-
-<script setup>
-import { getCurrentInstance, watch, onMounted, ref } from 'vue'
-import * as echarts from 'echarts'
-import theme from '../theme/chalk.json'
-echarts.registerTheme('theme', theme)
-import { CanvasRenderer } from 'echarts/renderers'
-echarts.use([CanvasRenderer])
-const { proxy } = getCurrentInstance()
-const chartRef = ref(null)
-const props = defineProps({
-    width: {
-        type: String,
-        default: '400px'
-    },
-    height: {
-        type: String,
-        default: '350px'
-    }
-})
-watch(
-    () => props.chartData,
-    (val) => {
-        if (chart != null) {
-            // setOptions(val)
-        }
-    },
-    { deep: true }
-)
-const options = {
-    title: {
-        text: '柱状图',
-        left: 'left'
-    },
-    tooltip: {
-        trigger: 'axis',
-        axisPointer: {
-            type: 'shadow'
-        }
-    },
-    grid: {
-        left: '3%',
-        right: '4%',
-        bottom: '3%',
-        containLabel: true
-    },
-    xAxis: {
-        data: ['周一', '周二', '周三', '周四', '周五', '周六', '周日'],
-        boundaryGap: true,
-        axisTick: {
-            show: false
-        }
-    },
-    yAxis: {
-        type: 'value',
-        axisTick: {
-            show: false
-        }
-    },
-    // 图例
-    legend: {
-        data: ['参数1', '参数2']
-    },
-    series: [
-        {
-            name: '参数1',
-            type: 'bar',
-            data: [1, 2, 3, 4, 5, 6, 7],
-            // 动画时长与模式
-            animationDuration: 3000,
-            animationEasing: 'cubicInOut'
-        },
-        {
-            name: '参数2',
-            type: 'bar',
-            data: [1, 2, 3, 4, 5, 6, 7],
-            // 动画时长与模式
-            animationDuration: 3000,
-            animationEasing: 'cubicInOut'
-        }
-    ]
-}
-const chart = ref(null)
-function initChart() {
-    chart.value = echarts.init(proxy.$refs.chartRef, 'theme')
-    chart.value.setOption(options)
-}
-onMounted(() => {
-    initChart()
-    window.addEventListener('resize', () => {
-        chart.value?.resize()
-    })
-})
-</script>
diff --git a/src/views/SmartScreen/OrderScreen/charts/DemoLine.vue b/src/views/SmartScreen/OrderScreen/charts/DemoLine.vue
deleted file mode 100644
index 19138a4..0000000
--- a/src/views/SmartScreen/OrderScreen/charts/DemoLine.vue
+++ /dev/null
@@ -1,120 +0,0 @@
-<template>
-    <div ref="chartRef" :style="{ height: height, width: width }" />
-</template>
-
-<script setup>
-import { getCurrentInstance, watch, onMounted, ref } from 'vue'
-import * as echarts from 'echarts'
-import theme from '../theme/chalk.json'
-echarts.registerTheme('theme', theme)
-import { CanvasRenderer } from 'echarts/renderers'
-echarts.use([CanvasRenderer])
-const { proxy } = getCurrentInstance()
-const chartRef = ref(null)
-const props = defineProps({
-    width: {
-        type: String,
-        default: '100%'
-    },
-    height: {
-        type: String,
-        default: '400px'
-    }
-})
-let options = {
-    title: {
-        text: '本月产量',
-        left: 'left'
-    },
-    tooltip: {
-        trigger: 'axis',
-        axisPointer: {
-            type: 'shadow'
-        }
-    },
-    grid: {
-        left: '3%',
-        right: '4%',
-        bottom: '3%',
-        containLabel: true
-    },
-    xAxis: {
-        data: ['11-01', '11-02', '11-03', '11-04', '11-05', '11-06', '11-07', '11-08', '11-09'],
-        boundaryGap: true,
-        axisTick: {
-            show: false
-        }
-    },
-    yAxis: {
-        type: 'value',
-        axisTick: {
-            show: false
-        }
-    },
-    // 图例
-    legend: {
-        data: ['产量（个）']
-    },
-    series: [
-        {
-            name: '产量（个）',
-            type: 'line',
-            smooth: false,
-            data: [124, 252, 141, 335, 255, 414, 252, 127, 212],
-            label: {
-                show: true,
-                position: 'top',
-                textBorderColor: '#fff',
-                textBorderWidth: 1,
-                color: '#fff'
-            }
-        }
-    ]
-}
-
-const chart = ref(null)
-function initChart() {
-    chart.value = echarts.init(proxy.$refs.chartRef, 'theme')
-    chart.value.setOption(options)
-}
-onMounted(() => {
-    initChart()
-    window.addEventListener('resize', () => {
-        chart.value?.resize()
-    })
-})
-/// ============ 修改数据 ===========
-import { getMoudle02 } from '@/api/smartScreen/ProdScreen/index.js'
-function updateData() {
-    // getMoudle02().then((res) => {
-    //     if (res.code === 200) {
-    //         options.title = res.data.title
-    //         options.xAxis.data = res.data.xAxis.data
-    //         options.series = res.data.series
-    //         chart.value.setOption(options)
-    //     }
-    // })
-}
-function handleQuery() {
-    updateData()
-}
-// handleQuery()
-let timer1 = null
-const clearSearchTimer = () => {
-    clearInterval(timer1)
-    timer1 = null
-}
-const createSearchTimer = () => {
-    clearSearchTimer()
-    timer1 = setInterval(() => {
-        handleQuery()
-    }, 1000 * 60 * 5)
-}
-onMounted(() => {
-    createSearchTimer()
-})
-onUnmounted(() => {
-    clearSearchTimer()
-})
-/// ==========================================
-</script>
diff --git a/src/views/SmartScreen/OrderScreen/charts/DemoList.vue b/src/views/SmartScreen/OrderScreen/charts/DemoList.vue
deleted file mode 100644
index 252b288..0000000
--- a/src/views/SmartScreen/OrderScreen/charts/DemoList.vue
+++ /dev/null
@@ -1,89 +0,0 @@
-<!-- 今日工单 -->
-<template>
-    <div>
-        <div class="title">今日工单进度</div>
-        <el-table height="450" :data="dataList" v-loading="loading" ref="tableRef" highlight-current-row @mouseover.native="clearScroll" @mouseleave.native="createScroll">
-            <el-table-column type="index" width="50" align="center" />
-            <el-table-column prop="workorder" label="工单号" :show-overflow-tooltip="true" />
-            <el-table-column prop="productionName" label="产品名称" :show-overflow-tooltip="true" />
-            <el-table-column prop="productionCode" label="产品编号" :show-overflow-tooltip="true" />
-            <el-table-column prop="dispatchNum" label="派发数量" :show-overflow-tooltip="true" />
-            <el-table-column prop="finishedNum" label="完成数量" :show-overflow-tooltip="true" />
-            <el-table-column prop="status" label="工单状态" :show-overflow-tooltip="true">
-                <template #default="scope">
-                    <el-tag v-if="scope.row.status === 1" type="info">未开始</el-tag>
-                    <el-tag v-if="scope.row.status === 2" type="primary">进行中</el-tag>
-                    <el-tag v-if="scope.row.status === 3" type="success">已完成</el-tag>
-                </template>
-            </el-table-column>
-        </el-table>
-    </div>
-</template>
-
-<script setup>
-const { proxy } = getCurrentInstance()
-import { getMoudle06 } from '@/api/smartScreen/ProdScreen/index.js'
-const loading = ref(false)
-const dataList = ref([])
-function getList() {
-    getMoudle06().then((res) => {
-        const { code, data } = res
-        if (code == 200) {
-            dataList.value = data
-        }
-    })
-}
-// 查询
-function handleQuery() {
-    getList()
-}
-handleQuery()
-// 自动获取数据
-let timer1 = null
-const clearSearchTimer = () => {
-    clearInterval(timer1)
-    timer1 = null
-}
-const createSearchTimer = () => {
-    clearSearchTimer()
-    timer1 = setInterval(() => {
-        handleQuery()
-    }, 1000 * 60 * 5)
-}
-
-// 自动滚动
-let timer2 = null
-let tableRef = ref(null)
-
-const clearScroll = () => {
-    clearInterval(timer2)
-    timer2 = null
-}
-const createScroll = () => {
-    clearScroll()
-    // 拿到 table
-    const _table = tableRef.value.layout.table.refs
-    // // 拿到可以滚动的元素
-    const tableWrapper = _table.bodyWrapper.firstElementChild.firstElementChild
-    timer2 = setInterval(() => {
-        tableWrapper.scrollTop += 1
-        // 判断是否滚动到底部，如果到底部了置为0（可视高度+距离顶部=整个高度）
-        if (tableWrapper.clientHeight + tableWrapper.scrollTop >= tableWrapper.scrollHeight) {
-            tableWrapper.scrollTop = 0
-        }
-    }, 100)
-}
-
-onMounted(() => {
-    createSearchTimer()
-    createScroll()
-})
-onUnmounted(() => {
-    clearScroll()
-    clearSearchTimer()
-})
-</script>
-
-<style scoped>
-@import './table.css';
-</style>
diff --git a/src/views/SmartScreen/OrderScreen/charts/DemoPie.vue b/src/views/SmartScreen/OrderScreen/charts/DemoPie.vue
deleted file mode 100644
index c1abee0..0000000
--- a/src/views/SmartScreen/OrderScreen/charts/DemoPie.vue
+++ /dev/null
@@ -1,120 +0,0 @@
-<template>
-    <div ref="chartRef" :style="{ height: height, width: width }" />
-</template>
-
-<script setup>
-import { getCurrentInstance, watch, onMounted, ref } from 'vue'
-import * as echarts from 'echarts'
-import theme from '../theme/chalk.json'
-echarts.registerTheme('theme', theme)
-import { CanvasRenderer } from 'echarts/renderers'
-echarts.use([CanvasRenderer])
-const { proxy } = getCurrentInstance()
-const chartRef = ref(null)
-const props = defineProps({
-    width: {
-        type: String,
-        default: '100%'
-    },
-    height: {
-        type: String,
-        default: '450px'
-    }
-})
-const options = {
-    title: {
-        text: '',
-        left: 'left'
-    },
-    legend: {
-        type: 'scroll',
-        top: 20
-    },
-    tooltip: {
-        trigger: 'axis',
-        axisPointer: {
-            type: 'shadow'
-        }
-    },
-    grid: {
-        left: '3%',
-        right: '4%',
-        bottom: '3%',
-        containLabel: true
-    },
-    series: [
-        {
-            name: '参数1',
-            type: 'pie',
-            data: [
-                { value: 1048, name: '模块1' },
-                { value: 735, name: '模块2' },
-                { value: 580, name: '模块3' },
-                { value: 484, name: '模块4' },
-                { value: 300, name: '模块5' }
-            ],
-            label: {
-                position: 'outside',
-                formatter: '{b}\n{d}%'
-            },
-            // 动画时长与模式
-            animationDuration: 3000,
-            animationEasing: 'cubicInOut'
-        }
-    ]
-}
-const chart = ref(null)
-function initChart() {
-    chart.value = echarts.init(proxy.$refs.chartRef, 'theme')
-    chart.value.setOption(options)
-}
-onMounted(() => {
-    initChart()
-    window.addEventListener('resize', () => {
-        chart.value?.resize()
-    })
-})
-/// ============ 修改数据 ===========
-import { getMoudle04 } from '@/api/smartScreen/ProdScreen/index.js'
-function updateData() {
-    getMoudle04().then((res) => {
-        if (res.code === 200) {
-            options.title = res.data.title
-            let _series = res.data.series
-            _series.forEach((item) => {
-                item.label = {
-                    // 设置label在扇区内部
-                    position: 'outside',
-                    // 自定义显示格式，{b}表示名称，{d}表示百分比
-                    formatter: '{b}\n{d}%'
-                }
-            })
-            options.series = _series
-            chart.value.setOption(options)
-            console.log(_series)
-        }
-    })
-}
-function handleQuery() {
-    updateData()
-}
-handleQuery()
-let timer1 = null
-const clearSearchTimer = () => {
-    clearInterval(timer1)
-    timer1 = null
-}
-const createSearchTimer = () => {
-    clearSearchTimer()
-    timer1 = setInterval(() => {
-        handleQuery()
-    }, 1000 * 60 * 5)
-}
-onMounted(() => {
-    createSearchTimer()
-})
-onUnmounted(() => {
-    clearSearchTimer()
-})
-/// ==========================================
-</script>
diff --git a/src/views/SmartScreen/OrderScreen/charts/chart1.vue b/src/views/SmartScreen/OrderScreen/charts/chart1.vue
index 17020b1..79af96c 100644
--- a/src/views/SmartScreen/OrderScreen/charts/chart1.vue
+++ b/src/views/SmartScreen/OrderScreen/charts/chart1.vue
@@ -1,137 +1,141 @@
-<!-- 今日工单 -->
 <template>
     <div>
         <div class="title">{{ title }}</div>
-        <el-table height="700" :data="dataList" v-loading="loading" ref="tableRef" highlight-current-row @mouseover.native="clearScroll" @mouseleave.native="createScroll">
-            <el-table-column width="80px" prop="groupCode" label="组" :show-overflow-tooltip="true" />
-            <el-table-column width="120px" label="报工/计划" :show-overflow-tooltip="true">
+        <el-table height="700" :data="dataList" v-loading="loading" ref="tableRef" @mouseover.native="clearScroll" @mouseleave.native="createScroll">
+            <el-table-column align="center" type="index" width="60" label="序号" />
+            <el-table-column align="center" width="140" prop="orderNoMes" label="订单号" />
+            <el-table-column align="center" width="140" prop="materialName" label="物料名称" />
+            <el-table-column align="center" width="80" prop="demandQuantity" label="计划数量" />
+            <el-table-column align="center" width="80" prop="demandQuantity" label="完成数量" />
+            <el-table-column align="center" label="工序">
                 <template #default="scope">
-                    {{ ` ${scope.row.reportQuantity} /  ${scope.row.planQuantity}` }}
+                    <div class="process-box">
+                        <div :class="getProcessItemClass(item, scope.row)" v-for="(item, index) in processList" :key="index">
+                            <span>{{ item.name }} :</span>
+                            <span>{{ getProcessItemData(item, scope.row) }}</span>
+                        </div>
+                    </div>
                 </template>
             </el-table-column>
-            <el-table-column min-width="260px" label="生产进度" align="center">
-                <template #default="scope">
-                    <el-progress :text-inside="true" :stroke-width="24" :percentage="getPercentage(scope.row)" :color="getProgressColor(scope.row)" />
-                </template>
-            </el-table-column>
-            <!-- <el-table-column prop="status" label="工单状态" :show-overflow-tooltip="true">
-                <template #default="scope">
-                    <el-tag v-if="scope.row.status === 1" type="info">未开始</el-tag>
-                    <el-tag v-if="scope.row.status === 2" type="primary">进行中</el-tag>
-                    <el-tag v-if="scope.row.status === 3" type="success">已完成</el-tag>
-                </template>
-            </el-table-column> -->
         </el-table>
     </div>
 </template>
 
 <script setup>
-const { proxy } = getCurrentInstance()
-import { getMoudle02 } from '@/api/smartScreen/ProdScreen/index.js'
+import { ref, onMounted, onUnmounted } from 'vue'
+import { GetOrderProgressList } from '@/api/smartScreen/OrderScreen/index.js'
+
+const processList = [
+    { id: 10, name: '物料领用' },
+    { id: 20, name: '机械加工' },
+    { id: 30, name: '中间检查' },
+    { id: 40, name: '手工研磨' },
+    { id: 50, name: '机研磨' },
+    { id: 60, name: '精研磨' },
+    { id: 70, name: '入库检查' },
+    { id: 90, name: '出货' }
+]
+
 const loading = ref(false)
 const dataList = ref([])
-const title = ref('今日各组计划进度')
-function getList() {
-    // let demoList = []
-    // for (let i = 0; i < 10; i++) {
-    //     demoList.push({
-    //         workorder: '组' + (i + 1),
-    //         status: Math.floor(Math.random() * 3) + 1,
-    //         actualNum: Math.floor(Math.random() * 100),
-    //         planNum: Math.floor(Math.random() * 100)
-    //     })
-    // }
-    // dataList.value = demoList
-    getMoudle02().then((res) => {
-        const { code, data } = res
-        if (code == 200) {
-            dataList.value = data
-        }
-    })
+const title = ref('车间未完成订单进度')
+const tableRef = ref(null)
+
+// 获取工序项的数据
+function getProcessItemData(processItem, row) {
+    return row.list.find((item) => item.processId === processItem.id)?.num || 0
 }
-/// ====================== 进度条 ==================
-// 获取进度条百分比
-function getPercentage(row) {
+
+// 获取工序项的类名
+function getProcessItemClass(processItem, row) {
+    return getProcessItemData(processItem, row) > 0 ? 'bg-green' : 'bg-gray'
+}
+
+// 获取订单进度列表
+async function fetchOrderProgressList() {
     try {
-        let current = row.reportQuantity || 0
-        let percentage = Math.round((current / row.planQuantity) * 100)
-        if (percentage > 100) {
-            percentage = 100
+        loading.value = true
+        const response = await GetOrderProgressList()
+        if (response.code === 200) {
+            dataList.value = response.data
         }
-        if (percentage < 0) {
-            percentage = 0
-        }
-        return percentage
     } catch (error) {
-        return 0
+        console.error('获取订单进度列表失败:', error)
+    } finally {
+        loading.value = false
     }
 }
-// 获取进度条颜色
-function getProgressColor(row) {
-    const percentage = getPercentage(row)
-    if (percentage >= 0 && percentage < 50) {
-        return 'red'
-    } else if (percentage >= 50 && percentage < 90) {
-        return 'orange'
-    } else {
-        return 'green'
-    }
-}
-/// ============================================================
 
-/// ================== 自动滚动/自动获取工单列表 ======================
+// 清除搜索定时器
+function clearSearchTimer() {
+    clearInterval(searchInterval)
+    searchInterval = null
+}
 
-// 查询
-function handleQuery() {
-    getList()
-}
-handleQuery()
-// 自动获取数据
-let timer1 = null
-const clearSearchTimer = () => {
-    clearInterval(timer1)
-    timer1 = null
-}
-const createSearchTimer = () => {
+// 创建搜索定时器
+function createSearchTimer() {
     clearSearchTimer()
-    timer1 = setInterval(() => {
-        handleQuery()
-    }, 1000 * 60 * 1)
+    searchInterval = setInterval(fetchOrderProgressList, 1000 * 60 * 5)
 }
 
-let timer2 = null
-let tableRef = ref(null)
+let searchInterval
 
-const clearScroll = () => {
-    clearInterval(timer2)
-    timer2 = null
+// 清除滚动定时器
+function clearScroll() {
+    clearInterval(scrollInterval)
+    scrollInterval = null
 }
-const createScroll = () => {
+
+// 创建滚动定时器
+function createScroll() {
     clearScroll()
-    // 拿到 table
-    const _table = tableRef.value.layout.table.refs
-    // // 拿到可以滚动的元素
-    const tableWrapper = _table.bodyWrapper.firstElementChild.firstElementChild
-    timer2 = setInterval(() => {
+    const tableWrapper = tableRef.value.layout.table.refs.bodyWrapper.firstElementChild.firstElementChild
+    scrollInterval = setInterval(() => {
         tableWrapper.scrollTop += 1
-        // 判断是否滚动到底部，如果到底部了置为0（可视高度+距离顶部=整个高度）
         if (tableWrapper.clientHeight + tableWrapper.scrollTop >= tableWrapper.scrollHeight) {
             tableWrapper.scrollTop = 0
         }
     }, 100)
 }
 
+let scrollInterval
+
 onMounted(() => {
+    fetchOrderProgressList()
     createSearchTimer()
     createScroll()
 })
+
 onUnmounted(() => {
     clearScroll()
     clearSearchTimer()
 })
-/// =============================================================================================
 </script>
 
 <style scoped>
 @import './table.css';
+.process-box {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: space-around;
+}
+.process-item {
+    margin: 10px;
+    height: 40px;
+    padding: 10px;
+
+    font-size: 14px;
+    font-weight: bold;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: center;
+}
+.bg-green {
+    background-color: green;
+}
+.bg-gray {
+    background-color: gray;
+}
 </style>
diff --git a/src/views/SmartScreen/OrderScreen/charts/chart100.vue b/src/views/SmartScreen/OrderScreen/charts/chart100.vue
deleted file mode 100644
index ccd138c..0000000
--- a/src/views/SmartScreen/OrderScreen/charts/chart100.vue
+++ /dev/null
@@ -1,112 +0,0 @@
-<template>
-    <div ref="chartRef" :style="{ height: height, width: width }" />
-</template>
-
-<script setup>
-import { getCurrentInstance, watch, onMounted, ref } from 'vue'
-import * as echarts from 'echarts'
-import theme from '../theme/chalk.json'
-echarts.registerTheme('theme', theme)
-import { CanvasRenderer } from 'echarts/renderers'
-echarts.use([CanvasRenderer])
-const { proxy } = getCurrentInstance()
-const chartRef = ref(null)
-const props = defineProps({
-    width: {
-        type: String,
-        default: '100%'
-    },
-    height: {
-        type: String,
-        default: '450px'
-    }
-})
-let options = {
-    title: {
-        text: '',
-        left: 'left'
-    },
-    tooltip: {
-        trigger: 'axis',
-        axisPointer: {
-            type: 'shadow'
-        }
-    },
-    grid: {
-        left: '3%',
-        right: '4%',
-        bottom: '3%',
-        containLabel: true
-    },
-    xAxis: {
-        data: ['周一', '周二', '周三', '周四', '周五', '周六', '周日'],
-        boundaryGap: true,
-        axisTick: {
-            show: false
-        }
-    },
-    yAxis: {
-        type: 'value',
-        axisTick: {
-            show: false
-        }
-    },
-    // 图例
-    legend: {
-        data: ['产量（个）']
-    },
-    series: [
-        {
-            name: '产量（个）',
-            type: 'line',
-            data: [1, 2, 3, 4, 5, 6, 7]
-        }
-    ]
-}
-
-const chart = ref(null)
-function initChart() {
-    chart.value = echarts.init(proxy.$refs.chartRef, 'theme')
-    chart.value.setOption(options)
-}
-onMounted(() => {
-    initChart()
-    window.addEventListener('resize', () => {
-        chart.value?.resize()
-    })
-})
-/// ============ 修改数据 ===========
-import { getMoudle02 } from '@/api/smartScreen/ProdScreen/index.js'
-function updateData() {
-    getMoudle02().then((res) => {
-        if (res.code === 200) {
-            options.title = res.data.title
-            options.xAxis.data = res.data.xAxis.data
-            options.series = res.data.series
-            chart.value.setOption(options)
-        }
-    })
-}
-function handleQuery() {
-    updateData()
-}
-handleQuery()
-let timer1 = null
-const clearSearchTimer = () => {
-    clearInterval(timer1)
-    timer1 = null
-}
-const createSearchTimer = () => {
-    clearSearchTimer()
-    timer1 = setInterval(() => {
-        handleQuery()
-    }, 1000 * 60 * 5)
-}
-onMounted(() => {
-    createSearchTimer()
-})
-onUnmounted(() => {
-    clearSearchTimer()
-})
-/// ==========================================
-</script>
diff --git a/src/views/SmartScreen/OrderScreen/charts/chart2.vue b/src/views/SmartScreen/OrderScreen/charts/chart2.vue
deleted file mode 100644
index f8e8626..0000000
--- a/src/views/SmartScreen/OrderScreen/charts/chart2.vue
+++ /dev/null
@@ -1,195 +0,0 @@
-<template>
-    <div class="button-box">
-        <dv-button :bg="false" @click="changeType(1)">统计图1</dv-button>
-        <dv-button :bg="false" size="small" @click="changeType(2)">统计图2</dv-button>
-    </div>
-    <div v-loading="loading" ref="chartRef" :style="{ height: height, width: width }" />
-</template>
-
-<script setup>
-import { getCurrentInstance, watch, onMounted, ref } from 'vue'
-import * as echarts from 'echarts'
-import theme from '../theme/chalk.json'
-echarts.registerTheme('theme', theme)
-import { CanvasRenderer } from 'echarts/renderers'
-import {
-    TitleComponent,
-    TooltipComponent,
-    GridComponent,
-    MarkLineComponent // 明确导入 markLine 组件
-} from 'echarts/components'
-echarts.use([CanvasRenderer, TitleComponent, TooltipComponent, GridComponent, MarkLineComponent])
-const { proxy } = getCurrentInstance()
-const chartRef = ref(null)
-const props = defineProps({
-    width: {
-        type: String,
-        default: '100%'
-    },
-    height: {
-        type: String,
-        default: '320px'
-    }
-})
-let options = {
-    title: {
-        text: '工单对比',
-        left: 'left'
-    },
-    tooltip: {
-        trigger: 'axis',
-        axisPointer: {
-            type: 'shadow'
-        }
-    },
-    grid: {
-        left: '3%',
-        right: '4%',
-        bottom: '3%',
-        containLabel: true
-    },
-    xAxis: {
-        data: [],
-        boundaryGap: true,
-        axisTick: {
-            show: false
-        }
-    },
-    yAxis: [
-        {
-            type: 'value',
-            axisTick: {
-                show: false
-            }
-        }
-    ],
-    // 图例
-    legend: {
-        textStyle: {
-            color: '#fff'
-        },
-        top: '6%',
-        data: []
-    },
-    series: []
-}
-const chart = ref(null)
-function initChart() {
-    chart.value = echarts.init(proxy.$refs.chartRef, 'theme')
-    chart.value.setOption(options)
-}
-onMounted(() => {
-    initChart()
-    window.addEventListener('resize', () => {
-        chart.value?.resize()
-    })
-})
-/// ============ 修改数据 ===========
-import { getMoudle03 } from '@/api/smartScreen/ProdScreen/index.js'
-import { getMoudle09 } from '@/api/smartScreen/ProdScreen/index.js'
-
-const loading = ref(false)
-function updateData() {
-    loading.value = true
-    if (dataType.value === 1) {
-        getMoudle03().then((res) => {
-            if (res.code === 200) {
-                options.title = res.data.title
-                options.xAxis.data = res.data.xAxis.data
-                options.yAxis = {
-                    type: 'value',
-                    min: 0,
-                    max: null, // 设置 Y 轴的最小和最大值
-                    scale: false, // 允许数据超出Y轴范围
-                    axisTick: {
-                        show: false
-                    }
-                }
-                options.legend.data = ['报工数', '计划数']
-                let _series = res.data.series
-                _series.forEach((item, index) => {
-                    item.label = {
-                        show: true,
-                        position: index === 1 ? 'top' : 'inside',
-                        textBorderColor: '#fff',
-                        textBorderWidth: 0,
-                        color: '#fff'
-                    }
-                })
-                options.series = _series
-                chart.value.setOption(options)
-            }
-            loading.value = false
-        })
-    } else if (dataType.value === 2) {
-        getMoudle09().then((res) => {
-            if (res.code === 200) {
-                options.title = res.data.title
-                options.xAxis.data = res.data.xAxis.data
-                options.yAxis = {
-                    type: 'value',
-                    name: '报工数/计划数',
-                    min: 0,
-                    max: 2, // 设置 Y 轴的最小和最大值
-                    scale: true // 允许数据超出Y轴范围
-                }
-                options.legend.data = ['报工数/计划数']
-                let _series = res.data.series
-                _series.forEach((item, index) => {
-                    item.markLine = {
-                        data: [{ type: 'median', name: '标准值' }]
-                    }
-                    item.label = {
-                        show: true,
-                        position: 'top',
-                        textBorderColor: '#fff',
-                        textBorderWidth: 0,
-                        color: '#fff'
-                    }
-                })
-                options.series = _series
-                setTimeout(() => {
-                    chart.value.setOption(options, true)
-                })
-            }
-            loading.value = false
-        })
-    }
-}
-const dataType = ref(1)
-function changeType(type = 1) {
-    dataType.value = type
-    handleQuery()
-}
-function handleQuery() {
-    updateData()
-}
-handleQuery()
-let timer1 = null
-const clearSearchTimer = () => {
-    clearInterval(timer1)
-    timer1 = null
-}
-const createSearchTimer = () => {
-    clearSearchTimer()
-    timer1 = setInterval(() => {
-        dataType.value = dataType.value === 1 ? 2 : 1
-        handleQuery()
-    }, 1000 * 60 * 5)
-}
-onMounted(() => {
-    createSearchTimer()
-})
-onUnmounted(() => {
-    clearSearchTimer()
-})
-/// ==========================================
-</script>
-
-<style scoped>
-.button-box {
-    display: flex;
-    flex-direction: row;
-    margin-bottom: 5px;
-}
-</style>
diff --git a/src/views/SmartScreen/OrderScreen/charts/chart3.vue b/src/views/SmartScreen/OrderScreen/charts/chart3.vue
deleted file mode 100644
index 87207d7..0000000
--- a/src/views/SmartScreen/OrderScreen/charts/chart3.vue
+++ /dev/null
@@ -1,205 +0,0 @@
-<template>
-    <div class="button-box">
-        <dv-button :bg="false" @click="changeType(1)">统计图1</dv-button>
-        <dv-button :bg="false" size="small" @click="changeType(2)">统计图2</dv-button>
-    </div>
-    <div ref="chartRef" :style="{ height: height, width: width }" />
-</template>
-
-<script setup>
-import { getCurrentInstance, watch, onMounted, ref } from 'vue'
-import * as echarts from 'echarts'
-import theme from '../theme/chalk.json'
-echarts.registerTheme('theme', theme)
-import { CanvasRenderer } from 'echarts/renderers'
-echarts.use([CanvasRenderer])
-const { proxy } = getCurrentInstance()
-const chartRef = ref(null)
-const props = defineProps({
-    width: {
-        type: String,
-        default: '100%'
-    },
-    height: {
-        type: String,
-        default: '320px'
-    }
-})
-const options = {
-    title: {
-        text: '工单对比',
-        left: 'left'
-    },
-    tooltip: {
-        trigger: 'axis',
-        axisPointer: {
-            type: 'shadow'
-        }
-    },
-    grid: {
-        left: '3%',
-        right: '4%',
-        bottom: '3%',
-        containLabel: true
-    },
-    xAxis: {
-        data: [],
-        boundaryGap: true,
-        axisTick: {
-            show: false
-        }
-    },
-    yAxis: {
-        type: 'value',
-        axisTick: {
-            show: false
-        }
-    },
-    // 图例
-    legend: {
-        textStyle: {
-            color: '#fff'
-        },
-        top: '10%',
-        data: ['报工数', '计划数']
-    },
-    series: [
-        {
-            name: '报工数',
-            type: 'bar',
-            data: [],
-            label: {
-                show: true,
-                position: 'inside',
-                textBorderColor: '#fff',
-                textBorderWidth: 0,
-                color: '#fff'
-            }
-        },
-        {
-            name: '计划数',
-            type: 'bar',
-            data: [],
-            label: {
-                show: true,
-                position: 'top',
-                textBorderColor: '#fff',
-                textBorderWidth: 0,
-                color: '#fff'
-            }
-        }
-    ]
-}
-const chart = ref(null)
-function initChart() {
-    chart.value = echarts.init(proxy.$refs.chartRef, 'theme')
-    chart.value.setOption(options)
-}
-onMounted(() => {
-    initChart()
-    window.addEventListener('resize', () => {
-        chart.value?.resize()
-    })
-})
-/// ============ 修改数据 ===========
-import { getMoudle04 } from '@/api/smartScreen/ProdScreen/index.js'
-import { getMoudle10 } from '@/api/smartScreen/ProdScreen/index.js'
-function updateData() {
-    if (dataType.value === 1) {
-        options.yAxis = {
-            type: 'value',
-            min: 0,
-            max: null, // 设置 Y 轴的最小和最大值
-            scale: false, // 允许数据超出Y轴范围
-            axisTick: {
-                show: false
-            }
-        }
-        options.legend.data = ['报工数', '计划数']
-        getMoudle04().then((res) => {
-            if (res.code === 200) {
-                options.title = res.data.title
-                options.xAxis.data = res.data.xAxis.data
-                let _series = res.data.series
-                _series.forEach((item, index) => {
-                    item.label = {
-                        show: true,
-                        position: index === 1 ? 'top' : 'inside',
-                        textBorderColor: '#fff',
-                        textBorderWidth: 0,
-                        color: '#fff'
-                    }
-                })
-                options.series = _series
-                chart.value.setOption(options)
-            }
-        })
-    } else if (dataType.value === 2) {
-        options.yAxis = {
-            type: 'value',
-            name: '报工数/计划数',
-            min: 0,
-            max: 2, // 设置 Y 轴的最小和最大值
-            scale: true // 允许数据超出Y轴范围
-        }
-        options.legend.data = ['报工数/计划数']
-        getMoudle10().then((res) => {
-            if (res.code === 200) {
-                options.title = res.data.title
-                options.xAxis.data = res.data.xAxis.data
-                let _series = res.data.series
-                _series.forEach((item, index) => {
-                    item.markLine = {
-                        data: [{ type: 'median', name: '标准值' }]
-                    }
-                    item.label = {
-                        show: true,
-                        position: 'top',
-                        textBorderColor: '#fff',
-                        textBorderWidth: 0,
-                        color: '#fff'
-                    }
-                })
-                options.series = _series
-                setTimeout(() => {
-                    chart.value.setOption(options, true)
-                })
-            }
-        })
-    }
-}
-const dataType = ref(1)
-function changeType(type = 1) {
-    dataType.value = type
-    handleQuery()
-}
-function handleQuery() {
-    updateData()
-}
-handleQuery()
-let timer1 = null
-const clearSearchTimer = () => {
-    clearInterval(timer1)
-    timer1 = null
-}
-const createSearchTimer = () => {
-    clearSearchTimer()
-    timer1 = setInterval(() => {
-        handleQuery()
-    }, 1000 * 60 * 5)
-}
-onMounted(() => {
-    createSearchTimer()
-})
-onUnmounted(() => {
-    clearSearchTimer()
-})
-/// ==========================================
-</script>
-<style scoped>
-.button-box {
-    display: flex;
-    flex-direction: row;
-    margin-bottom: 5px;
-}
-</style>
diff --git a/src/views/SmartScreen/OrderScreen/charts/chart4.vue b/src/views/SmartScreen/OrderScreen/charts/chart4.vue
deleted file mode 100644
index 1077384..0000000
--- a/src/views/SmartScreen/OrderScreen/charts/chart4.vue
+++ /dev/null
@@ -1,78 +0,0 @@
-<!-- 今日工单 -->
-<template>
-    <div>
-        <div class="title">今日异常工单</div>
-        <el-table height="350" :data="dataList" v-loading="loading" ref="tableRef" highlight-current-row @mouseover.native="clearScroll" @mouseleave.native="createScroll">
-            <el-table-column prop="workorder" label="工单号" :show-overflow-tooltip="true" />
-            <el-table-column prop="description" label="描述" :show-overflow-tooltip="true" />
-        </el-table>
-    </div>
-</template>
-
-<script setup>
-const { proxy } = getCurrentInstance()
-import { getMoudle05 } from '@/api/smartScreen/ProdScreen/index.js'
-const loading = ref(false)
-const dataList = ref([])
-function getList() {
-    getMoudle05().then((res) => {
-        const { code, data } = res
-        if (code == 200) {
-            dataList.value = data
-        }
-    })
-}
-// 查询
-function handleQuery() {
-    getList()
-}
-handleQuery()
-// 自动获取数据
-let timer1 = null
-const clearSearchTimer = () => {
-    clearInterval(timer1)
-    timer1 = null
-}
-const createSearchTimer = () => {
-    clearSearchTimer()
-    timer1 = setInterval(() => {
-        handleQuery()
-    }, 1000 * 60 * 5)
-}
-
-// 自动滚动
-let timer2 = null
-let tableRef = ref(null)
-
-const clearScroll = () => {
-    clearInterval(timer2)
-    timer2 = null
-}
-const createScroll = () => {
-    clearScroll()
-    // 拿到 table
-    const _table = tableRef.value.layout.table.refs
-    // // 拿到可以滚动的元素
-    const tableWrapper = _table.bodyWrapper.firstElementChild.firstElementChild
-    timer2 = setInterval(() => {
-        tableWrapper.scrollTop += 1
-        // 判断是否滚动到底部，如果到底部了置为0（可视高度+距离顶部=整个高度）
-        if (tableWrapper.clientHeight + tableWrapper.scrollTop >= tableWrapper.scrollHeight) {
-            tableWrapper.scrollTop = 0
-        }
-    }, 100)
-}
-
-onMounted(() => {
-    createSearchTimer()
-    createScroll()
-})
-onUnmounted(() => {
-    clearScroll()
-    clearSearchTimer()
-})
-</script>
-
-<style scoped>
-@import './table.css';
-</style>
diff --git a/src/views/SmartScreen/OrderScreen/charts/chart40.vue b/src/views/SmartScreen/OrderScreen/charts/chart40.vue
deleted file mode 100644
index 0e60553..0000000
--- a/src/views/SmartScreen/OrderScreen/charts/chart40.vue
+++ /dev/null
@@ -1,115 +0,0 @@
-<template>
-    <div ref="chartRef" :style="{ height: height, width: width }" />
-</template>
-
-<script setup>
-import { getCurrentInstance, watch, onMounted, ref } from 'vue'
-import * as echarts from 'echarts'
-import theme from '../theme/chalk.json'
-echarts.registerTheme('theme', theme)
-import { CanvasRenderer } from 'echarts/renderers'
-echarts.use([CanvasRenderer])
-const { proxy } = getCurrentInstance()
-const chartRef = ref(null)
-const props = defineProps({
-    width: {
-        type: String,
-        default: '100%'
-    },
-    height: {
-        type: String,
-        default: '450px'
-    }
-})
-const options = {
-    title: {
-        text: '',
-        left: 'left'
-    },
-    legend: {
-        type: 'scroll',
-        top: 20
-    },
-    tooltip: {
-        trigger: 'axis',
-        axisPointer: {
-            type: 'shadow'
-        }
-    },
-    grid: {
-        left: '3%',
-        right: '4%',
-        bottom: '3%',
-        containLabel: true
-    },
-    series: [
-        {
-            name: '参数1',
-            type: 'pie',
-            data: [
-                { value: 1048, name: '模块1' },
-                { value: 735, name: '模块2' },
-                { value: 580, name: '模块3' },
-                { value: 484, name: '模块4' },
-                { value: 300, name: '模块5' }
-            ],
-            // 动画时长与模式
-            animationDuration: 3000,
-            animationEasing: 'cubicInOut'
-        }
-    ]
-}
-const chart = ref(null)
-function initChart() {
-    chart.value = echarts.init(proxy.$refs.chartRef, 'theme')
-    chart.value.setOption(options)
-}
-onMounted(() => {
-    initChart()
-    window.addEventListener('resize', () => {
-        chart.value?.resize()
-    })
-})
-/// ============ 修改数据 ===========
-import { getMoudle05 } from '@/api/smartScreen/ProdScreen/index.js'
-function updateData() {
-    getMoudle05().then((res) => {
-        if (res.code === 200) {
-            options.title = res.data.title
-            let _series = res.data.series
-            _series.forEach((item) => {
-                item.label = {
-                    // 设置label在扇区内部
-                    position: 'inner',
-                    // 自定义显示格式，{b}表示名称，{d}表示百分比
-                    formatter: '{b}\n{d}%'
-                }
-            })
-            options.series = _series
-            chart.value.setOption(options)
-        }
-    })
-}
-function handleQuery() {
-    updateData()
-}
-handleQuery()
-let timer1 = null
-const clearSearchTimer = () => {
-    clearInterval(timer1)
-    timer1 = null
-}
-const createSearchTimer = () => {
-    clearSearchTimer()
-    timer1 = setInterval(() => {
-        handleQuery()
-    }, 1000 * 60 * 5)
-}
-onMounted(() => {
-    createSearchTimer()
-})
-onUnmounted(() => {
-    clearSearchTimer()
-})
-/// ==========================================
-</script>
diff --git a/src/views/SmartScreen/OrderScreen/charts/chart41.vue b/src/views/SmartScreen/OrderScreen/charts/chart41.vue
deleted file mode 100644
index 04807bd..0000000
--- a/src/views/SmartScreen/OrderScreen/charts/chart41.vue
+++ /dev/null
@@ -1,89 +0,0 @@
-<!-- 今日工单 -->
-<template>
-    <div>
-        <div class="title">今日异常工单</div>
-        <el-table height="450" :data="dataList" v-loading="loading" ref="tableRef" highlight-current-row @mouseover.native="clearScroll" @mouseleave.native="createScroll">
-            <el-table-column type="index" width="50" align="center" />
-            <el-table-column prop="workorder" label="工单号" :show-overflow-tooltip="true" />
-            <el-table-column prop="productionName" label="产品名称" :show-overflow-tooltip="true" />
-            <el-table-column prop="productionCode" label="产品编号" :show-overflow-tooltip="true" />
-            <el-table-column prop="dispatchNum" label="派发数量" :show-overflow-tooltip="true" />
-            <el-table-column prop="finishedNum" label="完成数量" :show-overflow-tooltip="true" />
-            <el-table-column prop="status" label="工单状态" :show-overflow-tooltip="true">
-                <template #default="scope">
-                    <el-tag v-if="scope.row.status === 1" type="info">未开始</el-tag>
-                    <el-tag v-if="scope.row.status === 2" type="primary">进行中</el-tag>
-                    <el-tag v-if="scope.row.status === 3" type="success">已完成</el-tag>
-                </template>
-            </el-table-column>
-        </el-table>
-    </div>
-</template>
-
-<script setup>
-const { proxy } = getCurrentInstance()
-import { getMoudle06 } from '@/api/smartScreen/ProdScreen/index.js'
-const loading = ref(false)
-const dataList = ref([])
-function getList() {
-    getMoudle06().then((res) => {
-        const { code, data } = res
-        if (code == 200) {
-            dataList.value = data
-        }
-    })
-}
-// 查询
-function handleQuery() {
-    getList()
-}
-handleQuery()
-// 自动获取数据
-let timer1 = null
-const clearSearchTimer = () => {
-    clearInterval(timer1)
-    timer1 = null
-}
-const createSearchTimer = () => {
-    clearSearchTimer()
-    timer1 = setInterval(() => {
-        handleQuery()
-    }, 1000 * 60 * 5)
-}
-
-// 自动滚动
-let timer2 = null
-let tableRef = ref(null)
-
-const clearScroll = () => {
-    clearInterval(timer2)
-    timer2 = null
-}
-const createScroll = () => {
-    clearScroll()
-    // 拿到 table
-    const _table = tableRef.value.layout.table.refs
-    // // 拿到可以滚动的元素
-    const tableWrapper = _table.bodyWrapper.firstElementChild.firstElementChild
-    timer2 = setInterval(() => {
-        tableWrapper.scrollTop += 1
-        // 判断是否滚动到底部，如果到底部了置为0（可视高度+距离顶部=整个高度）
-        if (tableWrapper.clientHeight + tableWrapper.scrollTop >= tableWrapper.scrollHeight) {
-            tableWrapper.scrollTop = 0
-        }
-    }, 100)
-}
-
-onMounted(() => {
-    createSearchTimer()
-    createScroll()
-})
-onUnmounted(() => {
-    clearScroll()
-    clearSearchTimer()
-})
-</script>
-
-<style scoped>
-@import './table.css';
-</style>
diff --git a/src/views/SmartScreen/OrderScreen/charts/chart5.vue b/src/views/SmartScreen/OrderScreen/charts/chart5.vue
deleted file mode 100644
index 5c2d877..0000000
--- a/src/views/SmartScreen/OrderScreen/charts/chart5.vue
+++ /dev/null
@@ -1,118 +0,0 @@
-<template>
-    <div ref="chartRef" :style="{ height: height, width: width }" />
-</template>
-
-<script setup>
-import { getCurrentInstance, watch, onMounted, ref } from 'vue'
-import * as echarts from 'echarts'
-import theme from '../theme/chalk.json'
-echarts.registerTheme('theme', theme)
-import { CanvasRenderer } from 'echarts/renderers'
-echarts.use([CanvasRenderer])
-const { proxy } = getCurrentInstance()
-const chartRef = ref(null)
-const props = defineProps({
-    width: {
-        type: String,
-        default: '100%'
-    },
-    height: {
-        type: String,
-        default: '350px'
-    }
-})
-const options = {
-    title: {
-        text: '',
-        left: 'left'
-    },
-    legend: {
-        type: 'scroll',
-        top: 10,
-        right: 10,
-        textStyle: {
-            color: '#fff'
-        }
-    },
-    tooltip: {
-        trigger: 'axis',
-        axisPointer: {
-            type: 'shadow'
-        }
-    },
-    grid: {
-        left: '3%',
-        right: '4%',
-        bottom: '3%',
-        containLabel: true
-    },
-    series: [
-        {
-            name: '',
-            type: 'pie',
-            data: [],
-            radius: [40, 140],
-            label: {
-                position: 'outside',
-                formatter: '{b}\n{d}%',
-                textBorderColor: '#fff',
-                textBorderWidth: 0,
-                color: '#fff'
-            }
-        }
-    ]
-}
-const chart = ref(null)
-function initChart() {
-    chart.value = echarts.init(proxy.$refs.chartRef, 'theme')
-    chart.value.setOption(options)
-}
-onMounted(() => {
-    initChart()
-    window.addEventListener('resize', () => {
-        chart.value?.resize()
-    })
-})
-/// ============ 修改数据 ===========
-import { getMoudle06 } from '@/api/smartScreen/ProdScreen/index.js'
-function updateData() {
-    getMoudle06().then((res) => {
-        if (res.code === 200) {
-            options.title = res.data.title
-            let _series = res.data.series
-            // _series.forEach((item) => {
-            //     item.label = {
-            //         // 设置label在扇区内部
-            //         position: 'inner',
-            //         // 自定义显示格式，{b}表示名称，{d}表示百分比
-            //         formatter: '{b}\n{d}%'
-            //     }
-            // })
-            options.series = _series
-            chart.value.setOption(options)
-        }
-    })
-}
-function handleQuery() {
-    updateData()
-}
-handleQuery()
-let timer1 = null
-const clearSearchTimer = () => {
-    clearInterval(timer1)
-    timer1 = null
-}
-const createSearchTimer = () => {
-    clearSearchTimer()
-    timer1 = setInterval(() => {
-        handleQuery()
-    }, 1000 * 60 * 5)
-}
-onMounted(() => {
-    createSearchTimer()
-})
-onUnmounted(() => {
-    clearSearchTimer()
-})
-/// ==========================================
-</script>
diff --git a/src/views/SmartScreen/OrderScreen/charts/chart6.vue b/src/views/SmartScreen/OrderScreen/charts/chart6.vue
deleted file mode 100644
index fd8c227..0000000
--- a/src/views/SmartScreen/OrderScreen/charts/chart6.vue
+++ /dev/null
@@ -1,126 +0,0 @@
-<template>
-    <div ref="chartRef" :style="{ height: height, width: width }" />
-</template>
-
-<script setup>
-import { getCurrentInstance, onMounted, ref } from 'vue'
-import * as echarts from 'echarts'
-import theme from '../theme/chalk.json'
-echarts.registerTheme('theme', theme)
-import { CanvasRenderer } from 'echarts/renderers'
-echarts.use([CanvasRenderer])
-const { proxy } = getCurrentInstance()
-const chartRef = ref(null)
-const props = defineProps({
-    width: {
-        type: String,
-        default: '100%'
-    },
-    height: {
-        type: String,
-        default: '350px'
-    }
-})
-const options = {
-    title: {
-        text: '',
-        left: 'left'
-    },
-    tooltip: {
-        trigger: 'axis',
-        axisPointer: {
-            type: 'shadow'
-        }
-    },
-    grid: {
-        left: '3%',
-        right: '4%',
-        bottom: '3%',
-        containLabel: true
-    },
-    xAxis: {
-        type: 'value',
-        position: 'top'
-    },
-    yAxis: {
-        type: 'category',
-        inverse: true,
-        data: []
-    },
-    // 图例
-    legend: {
-        textStyle: {
-            color: '#fff'
-        },
-        data: ['']
-    },
-    series: [
-        {
-            name: '',
-            type: 'bar',
-            data: [],
-            color: '#22ed7c',
-            label: {
-                show: true,
-                position: 'outside',
-                textBorderColor: '#fff',
-                textBorderWidth: 1,
-                color: '#fff'
-            }
-        }
-    ]
-}
-const chart = ref(null)
-function initChart() {
-    chart.value = echarts.init(proxy.$refs.chartRef, 'theme')
-    chart.value.setOption(options)
-}
-onMounted(() => {
-    initChart()
-    window.addEventListener('resize', () => {
-        chart.value?.resize()
-    })
-})
-/// ============ 修改数据 ===========
-import { getMoudle07 } from '@/api/smartScreen/ProdScreen/index.js'
-function updateData() {
-    getMoudle07().then((res) => {
-        if (res.code === 200) {
-            options.title = res.data.title
-            options.yAxis.data = res.data.yAxis.data
-            let _series = res.data.series
-            // _series.forEach((item, index) => {
-            //     if (index === 0) {
-            //         item.color = 'yellow'
-            //     } else {
-            //         item.color = '#22ed7c'
-            //     }
-            // })
-            options.series = _series
-            chart.value.setOption(options)
-        }
-    })
-}
-function handleQuery() {
-    updateData()
-}
-handleQuery()
-let timer1 = null
-const clearSearchTimer = () => {
-    clearInterval(timer1)
-    timer1 = null
-}
-const createSearchTimer = () => {
-    clearSearchTimer()
-    timer1 = setInterval(() => {
-        handleQuery()
-    }, 1000 * 60 * 5)
-}
-onMounted(() => {
-    createSearchTimer()
-})
-onUnmounted(() => {
-    clearSearchTimer()
-})
-/// ==========================================
-</script>
diff --git a/src/views/SmartScreen/OrderScreen/charts/chart7.vue b/src/views/SmartScreen/OrderScreen/charts/chart7.vue
deleted file mode 100644
index 1c77804..0000000
--- a/src/views/SmartScreen/OrderScreen/charts/chart7.vue
+++ /dev/null
@@ -1,129 +0,0 @@
-<template>
-    <div ref="chartRef" :style="{ height: height, width: width }" />
-</template>
-
-<script setup>
-import { getCurrentInstance, watch, onMounted, ref } from 'vue'
-import * as echarts from 'echarts'
-import theme from '../theme/chalk.json'
-echarts.registerTheme('theme', theme)
-import { CanvasRenderer } from 'echarts/renderers'
-echarts.use([CanvasRenderer])
-const { proxy } = getCurrentInstance()
-const chartRef = ref(null)
-const props = defineProps({
-    width: {
-        type: String,
-        default: '100%'
-    },
-    height: {
-        type: String,
-        default: '300px'
-    }
-})
-let options = {
-    title: {
-        text: '本月产量',
-        left: 'left'
-    },
-    tooltip: {
-        trigger: 'axis',
-        axisPointer: {
-            type: 'shadow'
-        }
-    },
-    grid: {
-        left: '3%',
-        right: '4%',
-        bottom: '3%',
-        containLabel: true
-    },
-    xAxis: {
-        data: ['11-01', '11-02', '11-03', '11-04', '11-05', '11-06', '11-07', '11-08', '11-09'],
-        boundaryGap: true,
-        axisTick: {
-            show: false
-        }
-    },
-    yAxis: {
-        type: 'value',
-        axisTick: {
-            show: false
-        }
-    },
-    // 图例
-    legend: {
-        type: 'scroll',
-        top: 'top',
-        width: '70%',
-        left: '20%'
-    },
-    series: [
-        {
-            name: '本月每天产量',
-            type: 'line',
-            smooth: true,
-            data: [],
-            label: {
-                show: true,
-                position: 'top',
-                textBorderColor: '#fff',
-                textBorderWidth: 1,
-                color: '#fff'
-            }
-        }
-    ]
-}
-
-const chart = ref(null)
-function initChart() {
-    chart.value = echarts.init(proxy.$refs.chartRef, 'theme')
-    chart.value.setOption(options)
-}
-onMounted(() => {
-    initChart()
-    window.addEventListener('resize', () => {
-        chart.value?.resize()
-    })
-})
-/// ============ 修改数据 ===========
-import { getMoudle08 } from '@/api/smartScreen/ProdScreen/index.js'
-function updateData() {
-    getMoudle08().then((res) => {
-        if (res.code === 200) {
-            options.title = res.data.title
-            options.xAxis.data = res.data.xAxis.data
-            let _series = res.data.series
-            _series.forEach((item) => {
-                if (item.type === 'bar') {
-                    item.stack = 'group'
-                }
-            })
-            options.series = _series
-            chart.value.setOption(options)
-        }
-    })
-}
-function handleQuery() {
-    updateData()
-}
-handleQuery()
-let timer1 = null
-const clearSearchTimer = () => {
-    clearInterval(timer1)
-    timer1 = null
-}
-const createSearchTimer = () => {
-    clearSearchTimer()
-    timer1 = setInterval(() => {
-        handleQuery()
-    }, 1000 * 60 * 5)
-}
-onMounted(() => {
-    createSearchTimer()
-})
-onUnmounted(() => {
-    clearSearchTimer()
-})
-/// ==========================================
-</script>
diff --git a/src/views/SmartScreen/OrderScreen/charts/chart8.vue b/src/views/SmartScreen/OrderScreen/charts/chart8.vue
deleted file mode 100644
index aa69508..0000000
--- a/src/views/SmartScreen/OrderScreen/charts/chart8.vue
+++ /dev/null
@@ -1,116 +0,0 @@
-<template>
-    <div ref="chartRef" :style="{ height: height, width: width }" />
-</template>
-
-<script setup>
-import { getCurrentInstance, watch, onMounted, ref } from 'vue'
-import * as echarts from 'echarts'
-import theme from '../theme/chalk.json'
-echarts.registerTheme('theme', theme)
-import { CanvasRenderer } from 'echarts/renderers'
-echarts.use([CanvasRenderer])
-const { proxy } = getCurrentInstance()
-const chartRef = ref(null)
-const props = defineProps({
-    width: {
-        type: String,
-        default: '100%'
-    },
-    height: {
-        type: String,
-        default: '400px'
-    }
-})
-let options = {
-    title: {
-        text: '',
-        left: 'left'
-    },
-    tooltip: {
-        trigger: 'axis',
-        axisPointer: {
-            type: 'shadow'
-        }
-    },
-    grid: {
-        left: '3%',
-        right: '4%',
-        bottom: '3%',
-        containLabel: true
-    },
-    xAxis: {
-        data: ['周一', '周二', '周三', '周四', '周五', '周六', '周日'],
-        boundaryGap: true,
-        axisTick: {
-            show: false
-        }
-    },
-    yAxis: {
-        type: 'value',
-        axisTick: {
-            show: false
-        }
-    },
-    // 图例
-    legend: {
-        type: 'scroll',
-        top: 'top',
-        width: '70%',
-        left: '20%'
-    },
-    series: [
-        {
-            name: '',
-            type: 'line',
-            smooth: false,
-            data: [1, 2, 3, 4, 5, 6, 7]
-        }
-    ]
-}
-
-const chart = ref(null)
-function initChart() {
-    chart.value = echarts.init(proxy.$refs.chartRef, 'theme')
-    chart.value.setOption(options)
-}
-onMounted(() => {
-    initChart()
-    window.addEventListener('resize', () => {
-        chart.value?.resize()
-    })
-})
-/// ============ 修改数据 ===========
-import { getMoudle02 } from '@/api/smartScreen/ProdScreen/index.js'
-function updateData() {
-    getMoudle02().then((res) => {
-        if (res.code === 200) {
-            options.title = res.data.title
-            options.xAxis.data = res.data.xAxis.data
-            options.series = res.data.series
-            chart.value.setOption(options)
-        }
-    })
-}
-function handleQuery() {
-    updateData()
-}
-handleQuery()
-let timer1 = null
-const clearSearchTimer = () => {
-    clearInterval(timer1)
-    timer1 = null
-}
-const createSearchTimer = () => {
-    clearSearchTimer()
-    timer1 = setInterval(() => {
-        handleQuery()
-    }, 1000 * 60 * 5)
-}
-onMounted(() => {
-    createSearchTimer()
-})
-onUnmounted(() => {
-    clearSearchTimer()
-})
-/// ==========================================
-</script>
diff --git a/src/views/SmartScreen/OrderScreen/index.css b/src/views/SmartScreen/OrderScreen/index.css
index 6e3b731..e34bed7 100644
--- a/src/views/SmartScreen/OrderScreen/index.css
+++ b/src/views/SmartScreen/OrderScreen/index.css
@@ -26,7 +26,7 @@ body {
 .screen {
     padding: 0;
     margin: 0;
-    width: 99%;
+    width: 100%;
     height: 100%;
     color: #eeeeee;
     background-color: rgba(32, 163, 250, 0.2);
@@ -58,3 +58,13 @@ body {
     min-height: 350px;
     padding: 20px;
 }
+.top-box {
+    margin: 20px;
+    height: 80px;
+    background-color: rgba(60, 232, 248, 0.1);
+    border: 1px solid #a9aabc;
+}
+.main-box {
+    min-height: 60px;
+    padding: 40px;
+}
diff --git a/src/views/SmartScreen/OrderScreen/index.vue b/src/views/SmartScreen/OrderScreen/index.vue
index de351d3..b38d899 100644
--- a/src/views/SmartScreen/OrderScreen/index.vue
+++ b/src/views/SmartScreen/OrderScreen/index.vue
@@ -14,106 +14,51 @@
             <kbHeader>车间订单看板</kbHeader>
         </div>
         <div class="body">
-            <dv-border-box8 class="box8" :dur="5">
-                <div class="top" dv-bg>
-                    <el-row :gutter="20">
-                        <el-col :span="4">
-                            <div class="num-item">
-                                <div class="num-title">总订单数</div>
-                                <div class="num-value">{{ orderData.todayGroupQuantity }} 组</div>
-                            </div>
-                        </el-col>
-                        <el-col :span="4">
-                            <div class="num-item">
-                                <div class="num-title">未完成订单数</div>
-                                <div class="num-value">{{ orderData.todayLineQuantity }} 条</div>
-                            </div>
-                        </el-col>
-                        <el-col :span="4">
-                            <div class="num-item">
-                                <div class="num-title">已完成订单数</div>
-                                <div class="num-value">{{ orderData.todayPlanQuantity }} 个</div>
-                            </div>
-                        </el-col>
-                        <el-col :span="4">
-                            <div class="num-item">
-                                <div class="num-title">本月完成订单数</div>
-                                <div class="num-value">{{ orderData.todayActionProductionQuantity }} 个</div>
-                            </div>
-                        </el-col>
-                        <el-col :span="4">
-                            <div class="num-item">
-                                <div class="num-title">本周完成订单数</div>
-                                <div class="num-value">{{ orderData.todayProductTypeQuantity }}种</div>
-                            </div>
-                        </el-col>
-                        <el-col :span="4">
-                            <div class="num-item">
-                                <div class="num-title">今日完成订单数</div>
-                                <div class="num-value">{{ orderData.sevenDaysPriorPlanQuantity }} 次</div>
-                            </div>
-                        </el-col>
-                    </el-row>
-                </div>
-            </dv-border-box8>
-            <el-row :gutter="5">
-                <el-col :span="8">
-                    <dv-border-box12 class="box">
-                        <div>
-                            <chart1></chart1>
+            <div class="top-box">
+                <el-row :gutter="20">
+                    <el-col :span="4">
+                        <div class="num-item">
+                            <div class="num-title">订单总数</div>
+                            <div class="num-value">{{ cardData.orderTotalNum }} 个</div>
                         </div>
-                    </dv-border-box12>
-                </el-col>
-                <el-col :span="16">
-                    <el-row :gutter="5">
-                        <el-col :span="12">
-                            <dv-border-box12 class="box">
-                                <div>
-                                    <chart2></chart2>
-                                </div>
-                            </dv-border-box12>
-                        </el-col>
-                        <el-col :span="12">
-                            <dv-border-box12 class="box">
-                                <div>
-                                    <chart3></chart3>
-                                </div>
-                            </dv-border-box12>
-                        </el-col>
-                    </el-row>
-                    <el-row :gutter="5">
-                        <el-col :span="6">
-                            <dv-border-box12 class="box">
-                                <div>
-                                    <chart4></chart4>
-                                </div>
-                            </dv-border-box12>
-                        </el-col>
-                        <el-col :span="9">
-                            <dv-border-box12 class="box">
-                                <div>
-                                    <chart5></chart5>
-                                </div>
-                            </dv-border-box12>
-                        </el-col>
-                        <el-col :span="9">
-                            <dv-border-box12 class="box">
-                                <div>
-                                    <chart6></chart6>
-                                </div>
-                            </dv-border-box12>
-                        </el-col>
-                    </el-row>
-                </el-col>
-            </el-row>
-            <el-row :gutter="5">
+                    </el-col>
+                    <el-col :span="4">
+                        <div class="num-item">
+                            <div class="num-title">未完成订单总数</div>
+                            <div class="num-value">{{ cardData.incompleteOrderNum }} 个</div>
+                        </div>
+                    </el-col>
+                    <el-col :span="4">
+                        <div class="num-item">
+                            <div class="num-title">已完成订单总数</div>
+                            <div class="num-value">{{ cardData.completedOrderNum }} 个</div>
+                        </div>
+                    </el-col>
+                    <el-col :span="4">
+                        <div class="num-item">
+                            <div class="num-title">本月待交货订单数</div>
+                            <div class="num-value">{{ cardData.monthOrderTotalNum }} 个</div>
+                        </div>
+                    </el-col>
+                    <el-col :span="4">
+                        <div class="num-item">
+                            <div class="num-title">本月已完成订单数</div>
+                            <div class="num-value">{{ cardData.monthIncompleteOrderNum }} 个</div>
+                        </div>
+                    </el-col>
+                    <el-col :span="4">
+                        <div class="num-item">
+                            <div class="num-title">本月未完成订单数</div>
+                            <div class="num-value">{{ cardData.monthCompletedOrderNum }} 个</div>
+                        </div>
+                    </el-col>
+                </el-row>
+            </div>
+            <el-row :gutter="0">
                 <el-col :span="24">
-                    <dv-border-box12 class="box">
-                        <div>
-                            <chart7></chart7>
-                            <!-- <chart8></chart8> -->
-                        </div>
-                    </dv-border-box12>
+                    <div class="main-box">
+                        <chart1></chart1>
+                    </div>
                 </el-col>
             </el-row>
         </div>
@@ -130,58 +75,29 @@ import logo from './components/logo.vue'
 /// ================================================
 
 function back() {
-    console.log('123')
     proxy.$router.push('/')
 }
 /// ================== 图表组件导入 ======================
-// import DemoBarChart1 from './charts/DemoBarChart.vue'
-// import chart1 from './charts/七日产量趋势图.vue'
-// import chart2 from './charts/七日工单数.vue'
-// import chart3 from './charts/报工超时占比.vue'
-// import chart4 from './charts/本月工单异常分布.vue'
-// import chart5 from './charts/今日工单.vue'
-// import chart6 from './charts/异常工单.vue'
-// import chart7 from './charts/昨日工单报工数.vue'
-// 模拟图表
-import DemoList from './charts/DemoList.vue'
-import DemoLine from './charts/DemoLine.vue'
-import DemoBar from './charts/DemoBar.vue'
-import DemoPie from './charts/DemoPie.vue'
-
 // 实际图表
-
 import chart1 from './charts/chart1.vue'
-import chart2 from './charts/chart2.vue'
-import chart3 from './charts/chart3.vue'
-import chart4 from './charts/chart4.vue'
-import chart5 from './charts/chart5.vue'
-import chart6 from './charts/chart6.vue'
-import chart7 from './charts/chart7.vue'
-// import chart8 from './charts/chart8.vue'
 /// ====================================================
 
 /// =================== 获取工单数据 ======================
-import { getMoudle01 } from '@/api/smartScreen/ProdScreen/index.js'
-const orderData = ref({
-    // 今日生产组数量
-    todayGroupQuantity: 0,
-    // 今日生产线数量
-    todayLineQuantity: 0,
-    // 今日计划数量
-    todayPlanQuantity: 0,
-    // 今日行动生产数量
-    todayActionProductionQuantity: 0,
-    // 今日产品类型数量
-    todayProductTypeQuantity: 0,
-    // 七天前计划数量
-    sevenDaysPriorPlanQuantity: 0
+import { GetLargeScreenOrder } from '@/api/smartScreen/OrderScreen/index.js'
+const cardData = ref({
+    orderTotalNum: 0,
+    incompleteOrderNum: 0,
+    completedOrderNum: 0,
+    monthOrderTotalNum: 0,
+    monthIncompleteOrderNum: 0,
+    monthCompletedOrderNum: 0
 })
-function getMoudle01Data() {
-    getMoudle01().then((res) => {
-        orderData.value = res.data
+function getCardData() {
+    GetLargeScreenOrder().then((res) => {
+        cardData.value = res.data
     })
 }
-getMoudle01Data()
+getCardData()
 let timer1 = null
 const clearSearchTimer = () => {
     clearInterval(timer1)
@@ -190,7 +106,7 @@ const clearSearchTimer = () => {
 const createSearchTimer = () => {
     clearSearchTimer()
     timer1 = setInterval(() => {
-        getMoudle01Data()
+        getCardData()
     }, 1000 * 60 * 5)
 }
 onMounted(() => {
@@ -210,11 +126,6 @@ onUnmounted(() => {
     margin-bottom: 10px;
 }
 
-.top {
-    height: 80px;
-    background-color: rgba(60, 232, 248, 0.1);
-}
-
 .num-item {
     /* border: #0072ff 1px solid; */
     padding: 10px;
diff --git a/src/views/SmartScreen/ReportScreen/index.css b/src/views/SmartScreen/ReportScreen/index.css
index 6f4ea55..ef4d9a5 100644
--- a/src/views/SmartScreen/ReportScreen/index.css
+++ b/src/views/SmartScreen/ReportScreen/index.css
@@ -1,6 +1,6 @@
-body{
-	margin: 0;
-	padding: 0;
+body {
+    margin: 0;
+    padding: 0;
 }
 .background {
     padding: 0;
@@ -23,10 +23,10 @@ body{
 .screen {
     padding: 0;
     margin: 0;
-    width: 99%;
+    width: 100%;
     height: 100%;
     color: #eeeeee;
-	background-color: rgba(32, 163, 250, 0.2);
+    background-color: rgba(32, 163, 250, 0.2);
 }
 .screen .header {
     width: 100%;
@@ -47,12 +47,11 @@ body{
     top: 10px;
     color: #eeeeee;
 }
-.body{
-	display: flex;
-	flex-direction: column;
+.body {
+    display: flex;
+    flex-direction: column;
 }
-.box{
+.box {
     min-height: 350px;
-	padding: 20px;
+    padding: 20px;
 }
-
diff --git a/src/views/SmartScreen/index.vue b/src/views/SmartScreen/index.vue
index 6663ec3..6ce44e6 100644
--- a/src/views/SmartScreen/index.vue
+++ b/src/views/SmartScreen/index.vue
@@ -3,14 +3,15 @@
         <el-carousel-item :key="1">
             <OrderScreen style="height: 100%"></OrderScreen>
         </el-carousel-item>
-        <el-carousel-item :key="2">
-            <OrderScreen style="height: 100%"></OrderScreen>
-        </el-carousel-item>
+        <!-- <el-carousel-item :key="2">
+            <ReportScreen style="height: 100%"></ReportScreen>
+        </el-carousel-item> -->
     </el-carousel>
 </template>
 
 <script setup>
 import { default as OrderScreen } from '@/views/SmartScreen/OrderScreen/index'
+import { default as ReportScreen } from '@/views/SmartScreen/ReportScreen/index'
 // 设备大屏
 // import { default as AndonFullScreen } from '@/views/andonManagement/analysis/fullscreen/index'
 // Andon大屏