1

lzhe

2024-06-26 3377e93abdc06410ce8bc5f0cd538d089dda34e8

1

 src/views/home/widgets/components/mdcEquipmentRun.vue

@@ -2,7 +2,7 @@
 * @Author: lzhe lzhe@example.com
 * @Date: 2024-04-16 15:22:46
 * @LastEditors: lzhe lzhe@example.com
 * @LastEditTime: 2024-06-23 21:52:10
 * @LastEditTime: 2024-06-24 22:33:49
 * @FilePath: /CPSnew/smart-web/src/views/home/widgets/components/mdcDeviceStatus.vue
 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -234,7 +234,6 @@
                    if(res.code == 200) {
                        var recordDom = document.getElementById('equipment');
                        this.option.yAxis.data = res.data.categories;
                        console.log(this.option.yAxis.data,'this.option.yAxis.data')
                        this.option.series[0].data = res.data.series[0].data;
                        this.oeeTitle = res.data.series[0].name;
                        var myChart = echarts.init(recordDom);

 src/views/home/widgets/index.vue

@@ -39,7 +39,6 @@
                    <div class="widgets-aside-title"><el-icon><el-icon-circle-plus-filled/></el-icon>添加部件</div>
                    <div class="widgets-aside-close" @click="close()"><el-icon><el-icon-close /></el-icon></div>
                </el-header>
                {{grid.layout.join(',')}},xxxx
                <el-header style="height:auto">
                    <div class="selectLayout">
                        <div class="selectLayout-item item01" :class="{active:grid.layout.join(',')=='12,6,6'}" @click="setLayout([12,6,6])">
@@ -61,6 +60,14 @@
                                <el-col :span="24"><span></span></el-col>
                                <el-col :span="24"><span></span></el-col>
                                <el-col :span="24"><span></span></el-col>
                            </el-row>
                        </div>
                        <div class="selectLayout-item item04" :class="{active:grid.layout.join(',').indexOf('24,12,6,6')>-1}" @click="setLayout([24,12,6,6])">
                            <el-row :gutter="2">
                                <el-col :span="24"><span></span></el-col>
                                <el-col :span="12"><span></span></el-col>
                                <el-col :span="6"><span></span></el-col>
                                <el-col :span="6"><span></span></el-col>
                            </el-row>
                        </div>
                    </div>
@@ -183,8 +190,9 @@
                                return 1;  
                            }  
                            // 如果 xcoordinate 也相同，则不交换位置  
                            return 0;  
                            return 0;
                        });
                        console.log(cards)
                        cards.forEach((item,index)=> {
                            this.$CONFIG.DEFAULT_GRID.copmsList[index] = [item.cardKey];
                            this.$CONFIG.DEFAULT_GRID.layout[index] = item.cardWide * 2;
@@ -304,8 +312,8 @@
    .selectLayout {width: 100%;display: flex;}
    .selectLayout-item {width:60px;height:60px;border: 2px solid var(--el-border-color-light);padding:5px;cursor: pointer;margin-right: 15px;}
    .selectLayout-item span {display: block;background: var(--el-border-color-light);height:46px;}
    .selectLayout-item.item02 span {height:30px;}
    .selectLayout-item.item02 .el-col:nth-child(1) span {height:14px;margin-bottom: 2px;}
    .selectLayout-item.item02 span,.selectLayout-item.item04 span {height:30px;}
    .selectLayout-item.item02 .el-col:nth-child(1) span,.selectLayout-item.item04 .el-col:nth-child(1) span {height:14px;margin-bottom: 2px;}
    .selectLayout-item.item03 span {height:14px;margin-bottom: 2px;}
    .selectLayout-item:hover {border-color: var(--el-color-primary);}
    .selectLayout-item.active {border-color: var(--el-color-primary);}