大屏

jiangping

2023-08-24 64b3ee8aebe765c668b7f04b2bc1ee9a3919bdfb

大屏

 h5_standard/.env.production

@@ -18,7 +18,7 @@
# VUE_APP_API = 'https://hsky.doumee.com/doumeeplant_api/'

# æµ‹è¯•
# VUE_APP_API = 'https://dmtest.ahapp.net/doumeeplant_api/'
VUE_APP_API = 'https://dmtest.ahapp.net/doumeeplant_api/'

# æ¼”示
VUE_APP_API = 'https://www.mes.red/doumeeplant/'
# VUE_APP_API = 'https://www.mes.red/doumeeplant/'

 h5_standard/src/components/newCom/user.vue

@@ -17,7 +17,7 @@
            <div class="content_total">共{{form.total}}条数据</div>
            <div class="content_list">
                <div class="content_list_item" v-for="(item, i) in list" :key="i" @click="jump(item)">
                    <div class="content_list_item_name">{{item.name}}&nbsp;|&nbsp;{{item.dmodel.name}}</div>
                    <div class="content_list_item_name" v-if="item.dmodel">{{item.name}}&nbsp;|&nbsp;{{item.dmodel.name}}</div>
                </div>
            </div>
        </div>

 h5_standard/src/views/plannedProgress/details.vue

@@ -51,12 +51,33 @@
                        <div class="content_list_item_content_item_label">计划人员：</div>
                        <div class="content_list_item_content_item_nr">{{info.usermodel.realname}}</div>
                    </div>
                    <div class="content_list_item_content_item">
                        <div class="content_list_item_content_item_label">分配数量：</div>
                        <div class="content_list_item_content_item_nr">{{info.createTime}}</div>
                    </div>
                    <div class="content_list_item_content_item">
                        <div class="content_list_item_content_item_label">完工数量：</div>
                        <div class="content_list_item_content_item_nr" v-if="info.umodel">{{info.doneNum}}{{info.umodel.name}}</div>
                    </div>
                </div>
            </div>
        </div>
        <NotFound info="暂未分配工单" v-if="info.workorderList && info.workorderList.length === 0" />
        <template v-else>
            <div class="details_timeline" v-for="(item, i) in info.workorderList" :key="i">
            <div class="details_list">
                <div class="details_list_item" v-for="(item, i) in info.workorderList" :key="i" @click="jump(item.id)">
                    <div class="details_list_item_top">
                        <span>{{ item.createUserName }}</span><span>{{ item.code }}</span>
                    </div>
                    <div class="details_list_item_center">
                        <span>良品数：{{ item.qualifiedNum }}</span><span>不良数：<span class="red">{{ item.unqualifiedNum }}</span></span>
                    </div>
                    <div class="details_list_item_bottom">
                        <span>{{ item.createTime }}</span>
                    </div>
                </div>
            </div>
            <!-- <div class="details_timeline" v-for="(item, i) in info.workorderList" :key="i">
                <div class="details_timeline_header">
                    <div class="details_timeline_header_code">
                        <span>工单编号：{{item.code}}</span>
@@ -68,10 +89,10 @@
                    <span v-if="item.status === 3" class="purple">已检验</span>
                    <span v-if="item.status === 4">已报工</span>
                    <span v-if="item.status === 5">已入库</span>
                    <span v-if="item.status === 6">已取消</span>
                    <span v-if="item.status === 6">已取消</span> -->
                    <!--                <span v-if="item.status === 7">已取消</span>-->
                    <!--                <span v-if="item.status === 8">已关闭</span>-->
                </div>
                <!-- </div>
                <div class="details_timeline_item" v-if="item.produceDate">
                    <div class="activedian"></div>
                    <div class="dian active"></div>
@@ -132,21 +153,22 @@
                        </div>
                    </div>
                </div>
            </div>
            </div> -->
        </template>
    </div>
</template>

<script setup lang="ts">
    import { ref, onMounted, watch } from 'vue'
    import { useRoute } from "vue-router"
    import { useRoute, useRouter } from "vue-router"
    import { queryByID } from '@/apis/PlanningAPI'
    import NotFound from '@/components/common/NotFound.vue'

    const route = useRoute()
    const router = useRouter()

    // è¯¦æƒ…数据
    let info = ref({})
    let info:any = ref({})

    let loading = ref<boolean>(true)

@@ -158,6 +180,10 @@
                    info.value = res.data
                }
            })
    }

    const jump = (id: any) => {
        router.push({ name: 'workOrderReporting', query: { id } })
    }

    const proUserStr = (item: any) => {
@@ -296,6 +322,72 @@
            }
        }
    }
    .details_list {
        width: 100%;
        height: auto;
        background-color: #FFFFFF;
        margin-top: 20px;
        .details_list_item {
            width: 100%;
            padding: 24px 30px;
            box-sizing: border-box;
            background-color: #FFFFFF;
            border-bottom: 2px solid #F7F7F7;
            &:last-child {
                border: none !important;
            }
            .details_list_item_top {
                width: 100%;
                display: flex;
                align-items: center;
                span {
                    &:first-child {
                        font-size: 30px;
                        font-family: PingFangSC-Medium, PingFang SC;
                        font-weight: 500;
                        color: #222222;
                        margin-right: 16px;
                    }
                    &:last-child {
                        font-size: 24px;
                        font-family: PingFangSC-Regular, PingFang SC;
                        font-weight: 400;
                        color: #666666;
                    }
                }
            }
            .details_list_item_center {
                width: 100%;
                margin: 16px 0 20px 0;
                .red {
                    color: #DE5243;
                }
                span {
                    &:first-child {
                        font-size: 26px;
                        font-family: PingFangSC-Regular, PingFang SC;
                        font-weight: 400;
                        color: #333333;
                        margin-right: 100px;
                    }
                    &:last-child {
                        font-size: 26px;
                        font-family: PingFangSC-Regular, PingFang SC;
                        font-weight: 400;
                        color: #333333;
                    }
                }
            }
            .details_list_item_bottom {
                span {
                    font-size: 24px;
                    font-family: PingFangSC-Regular, PingFang SC;
                    font-weight: 400;
                    color: #999999;
                }
            }
        }
    }
    .details_timeline {
        padding: 30px;
        background: #ffffff;

 h5_standard/src/views/workOrder/reportingForWork.vue

@@ -697,6 +697,7 @@
            getDeviceByCondition({ procedureId: res.procedureId })
                .then(res1 => {
                    if (res1.code === 200) {
                        if (res1.data && res1.data.length > 0)
                        deviceId.value = res1.data[0].id
                        from.deviceId = res1.data[0].id
                        from.deviceName = res1.data[0].name

 h5_standard/src/views/workOrder/workOrderReporting.vue

@@ -311,7 +311,8 @@
            <div class="bh_zw"></div>
            <div class="bg_footer">
                <div class="bg_footer_submit" v-if="typeView == 0" @click="submit">确认报工</div>
                <div class="bg_footer_submit1" @click="jumpdj" v-if="proxy.$auth('h5:workorder:processRecord') && typeView == 1">
                <!-- proxy.$auth('h5:workorder:processRecord') &&  -->
                <div class="bg_footer_submit1" @click="jumpdj" v-if="typeView == 1">
                    <img src="@/assets/icon/gongdan_ic_shoudong@2x.png" alt="" />
                    <span>新增点检</span>
                </div>

 minipro_standard/App.vue

@@ -16,7 +16,7 @@
    /*每个页面公共css */
    @import "@/uni_modules/uview-ui/index.scss";
    @import "common/css/lib.css";
    page {
        background-color: #F3F6F9 !important;
    }

    // page {
    //     background-color: #F3F6F9 !important;
    // }

</style>

 minipro_standard/components/myTabber.vue

@@ -6,7 +6,7 @@
            fixed
            activeColor="#222"
            inactiveColor="#666"
        >
            :safeAreaInsetBottom="true">
            <u-tabbar-item text="待办">
                <view class="" slot="active-icon"> 
                    <image src="@/static/nav_daiban_sel@2x.png" class="icon-style" mode=""></image>

 minipro_standard/main.js

@@ -1,32 +1,23 @@
import Vue from 'vue'
import App from './App'


import mixin from './common/mixin'

// å¼•å…¥å…¨å±€uView

import uView from '@/uni_modules/uview-ui'
Vue.use(uView)

// vuex

import store from './store'
Vue.prototype.$store = store
store.dispatch('getHeight')

Vue.config.productionTip = false

App.mpType = 'app'


App.mpType = 'app'
console.log(uni.$u);
// #ifdef MP

// å¼•å…¥uView对小程序分享的mixin封装

const mpShare = require('@/uni_modules/uview-ui/libs/mixin/mpShare.js')
Vue.mixin(mpShare)
// #endif

Vue.mixin(mixin)
// å¼•å…¥è¯·æ±‚封装


// å¼•å…¥è¯·æ±‚封装
const app = new Vue({
    store,

  ...App


 minipro_standard/manifest.json

@@ -50,14 +50,15 @@
    "quickapp" : {},
    /* å°ç¨‹åºç‰¹æœ‰ç›¸å…³ */
    "mp-weixin" : {
        "appid" : "wxf8f2d1ee4b273688",
        "appid" : "wxcd2b89fd2ff065f8",
        "setting" : {
            "urlCheck" : false
            "urlCheck" : false,
            "es6" : true,
            "postcss" : true,
            "minified" : true
        },
        "usingComponents" : true,
                "requiredPrivateInfos": [
                    "getLocation"
                ],
        "requiredPrivateInfos" : [ "getLocation" ],
        "permission" : {
            "scope.userLocation" : {
                "desc" : "实时上传图片"

 minipro_standard/pages.json

@@ -1,12 +1,11 @@
{

    "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages

    "pages": [

        {
            "path": "pages/workbench/workbench",
            "style": {
                "navigationBarTitleText": "工作台",
                "enablePullDownRefresh": false
            }
		
        },
        {

            "path": "pages/index/index",

@@ -26,16 +25,15 @@
            {
                "navigationBarTitleText": "登录",
                "enablePullDownRefresh": false,
                                "navigationStyle": "custom"
            }
            
                "navigationStyle": "custom"
            }

        }

    ],

    "globalStyle": {

        "navigationBarTextStyle": "black",

        "navigationBarTitleText": "uni-app",
        "navigationBarBackgroundColor": "#F3F6F9",

        "backgroundColor": "#F3F6F9"

        "navigationBarBackgroundColor": "#ffffff",

        "backgroundColor": "#ffffff"

    },
    "tabBar": {
        "color": "#666666",

 minipro_standard/pages/index/index.vue

@@ -1,14 +1,10 @@
<template>

    <view>
		
    <view>

        <myTabbar :index="0" />

    </view>

</template>



<script>

    // import { coustomLogin, wxEmpower } from '@/util/api/index'





    import myTabbar from "@/components/myTabber.vue"

    export default {

        components: {

@@ -73,5 +69,5 @@
</script>



<style lang="scss" scoped>



	
</style>

 minipro_standard/pages/mine/mine.vue

@@ -1,8 +1,31 @@
<template>

    <view>



        <myTabbar :index="2" />

    </view>

<view>

    <div class="box">

        <div class="box_info" :style="{background: 'url(' + img + ')'}">

            <image src="@/static/2@2x.png" mode="widthFix" />

            <div class="box_info_box">

                <text>张三</text>

                <div class="box_info_box_x">

                    <text>豆米科技</text>

                    <image src="@/static/mine_ic_change@2x.png" alt="" />

                </div>

            </div>

        </div>

        <div class="box_function">

            <div class="box_function_item" v-for="(item, index) in MENU" :key="index">

                <div class="box_function_item_left">

                    <image :src="item.icon" alt="" />

                    <text>{{item.name}}</text>

                </div>

                <div class="box_function_item_right">

                    <van-icon name="arrow" size="20" color="#CCCCCC" />

                </div>

            </div>

        </div>

        <div class="box_out"><text>退出登录</text></div>

    </div>

    <myTabbar :index="2" />

</view>

</template>



<script>

@@ -13,15 +36,19 @@
        },

        data() {

            return {

                form: {

                    account: '',

                    password: '',

                },

                logining: false,

                openId: ''

                MENU: [
                    { name: '个人信息', url: '/personal/personalInformation', icon: require('@/static/mine_ic_gerenxinxi@2x.png') },
                    // { name: '系统通知', url: '', icon: require('@/assets/icon/mine_ic_xitonggonggao@2x.png') },
                    { name: '更新手机号', url: '/personal/updatePhone', icon: require('@/static/mine_ic_shoujihao@2x.png') },
                    { name: '更新邮箱号', url: '/personal/updateMailbox', icon: require('@/static/mine_ic_youxianghao@2x.png') },
                    { name: '扫码绑定账号', url: '', icon: require('@/static/mine_ic_bangding@2x.png') },
                    { name: '修改密码', url: '/personal/changePassword', icon: require('@/static/mine_ic_xiugaimima@2x.png') },
                ],

                img: require('@/static/mine_bg@2x.png')

            }

        },

        onLoad() {

            uni.hideTabBar()

            // uni.login({

            //     success: data => {

            //         this.wxLogin(data.code)

@@ -32,43 +59,96 @@
            // })

        },

        methods: {

            // loginAction() {

            //     if (!this.form.account || !this.form.password) {

            //         uni.$u.toast('账号或者密码不能为空')

            //     }

            //     this.logining = true

            //     coustomLogin({...this.form, openid: this.openId})

            //         .then(res => {

            //             this.$store.commit('SETTOKEN', res.token)

            //             this.$store.commit('SETUSERINFO', res)

            //             uni.navigateTo({

            //                 url:'/pages/projectList/projectList'

            //             })

            //         })

            //         .finally(() => {

            //             this.logining = false

            //         })

            // },

            // wxLogin(code) {

            //     wxEmpower({code})

            //         .then(res => {

            //             this.openId = res.openid

            //             if (res.userInfo) {

            //                 this.$store.commit('SETTOKEN', res.userInfo.token)

            //                 this.$store.commit('SETUSERINFO', res.userInfo)

            //                 uni.navigateTo({

            //                     url:'/pages/projectList/projectList'

            //                 })

            //             } 
            //         })

            //         .catch(err => {

            //             uni.$u.toast(err)

            //         })

            // }

        }

    }

</script>



<style lang="scss" scoped>



    .box {

        width: 100%;

        padding: 30rpx;

        box-sizing: border-box;

        .box_info {

            padding: 0 30rpx;

            height: 168rpx;

            border-radius: 16rpx;

            display: flex;

            align-items: center;

            background-repeat: no-repeat;

            background-size: cover;

            image {

                width: 88rpx;

                height: 88rpx;

            }

            .box_info_box {

                height: 88rpx;

                display: flex;

                margin-left: 30rpx;

                flex-direction: column;

                justify-content: space-between;

                .box_info_box_x {

                    display: flex;

                    align-items: center;

                    text {

                        font-size: 26rpx;

                        font-weight: 400;

                        color: rgba(255, 255, 255, 0.8);

                    }

                    image {

                        width: 26rpx;

                        height: 26rpx;

                        margin-left: 10rpx;

                    }

                }

                text {

                    font-size: 34rpx;

                    font-weight: 500;

                    color: #FFFFFF;

                }

            }

        }

        .box_function {

            margin-top: 30rpx;

            .box_function_item {

                display: flex;

                align-items: center;

                justify-content: space-between;

                height: 98rpx;

                border-bottom: 1rpx solid #E5E5E5;

                /*&:last-child {*/

                /*    border: none;*/

                /*}*/

                .box_function_item_left {

                    display: flex;

                    align-items: center;

                    image {

                        width: 36rpx;

                        height: 36rpx;

                        margin-right: 24rpx;

                    }

                    text {

                        font-size: 30rpx;

                        font-weight: 400;

                        color: #222222;

                    }

                }

            }

        }

        .box_out {

            position: fixed;

            bottom: 200rpx;

            left: 50%;

            transform: translate(-50%, 0);

            width: 350rpx;

            height: 88rpx;

            background: #F7F7F7;

            border-radius: 8rpx;

            display: flex;

            align-items: center;

            justify-content: center;

            font-size: 30rpx;

            font-weight: 400;

            color: #333333;

        }

    }

</style>

 minipro_standard/pages/workbench/workbench.vue

@@ -1,6 +1,21 @@
<template>

    <view>



    <view class="index">

        <view class="menu">

            <view class="menu_list" v-for="(row, i) in 3" :key="i">

                <view class="menu_list_head">

                    <span>常用功能</span>

                </view>

                <div class="menu_list_list">

                    <view class="menu_list_item" v-for="item in list" :key="item.id" @click="jump(item)">

                        <image :src="item.icon" mode="widthFix" />

                        <span>{{item.label}}</span>

                    </view>

                    <view class="menu_list_zw"></view>

                    <view class="menu_list_zw"></view>

                    <view class="menu_list_zw"></view>

                </div>

            </view>

        </view>

        <myTabbar :index="1" />

    </view>

</template>

@@ -14,7 +29,32 @@
        },

        data() {

            return {



                list: [

                    {

                        icon: require('@/static/logo@2x.png'),

                        label: '测试'

                    },

                    {

                        icon: require('@/static/logo@2x.png'),

                        label: '测试'

                    },

                    {

                        icon: require('@/static/logo@2x.png'),

                        label: '测试'

                    },

                    {

                        icon: require('@/static/logo@2x.png'),

                        label: '测试'

                    },

                    {

                        icon: require('@/static/logo@2x.png'),

                        label: '测试'

                    },

                    {

                        icon: require('@/static/logo@2x.png'),

                        label: '测试'

                    }

                ]

            };

        },

        onLoad() {
@@ -49,7 +89,88 @@
        }

    }

</script>



<style lang="scss">



<style>

    page {

        background-color: #F7F7F7 !important;

    }

</style>

<style scoped lang="scss">

.index {

    width: 100%;

    .menu {

        width: 100%;

        display: flex;

        flex-direction: column;

        .menu_list {

            display: flex;

            flex-direction: column;

            padding: 30rpx;

            box-sizing: border-box;

            margin-bottom: 20rpx;

            background: white;

            &:last-child {

                margin-bottom: 0;

            }

            .menu_list_head {

                width: 100%;

                display: flex;

                align-items: center;

                justify-content: space-between;

                margin-bottom: 40rpx;

                span {

                    font-size: 32rpx;

                    font-family: PingFangSC-Medium, PingFang SC;

                    font-weight: 500;

                    color: #222222;

                }

            }

            .menu_list_list {

                width: 100%;

                display: flex;

                align-items: center;

                flex-wrap: wrap;

                justify-content: space-between;

                .menu_list_zw {

                    width: 20%;

                    height: 0;

                }

                .menu_list_item {

                    width: 20%;

                    display: flex;

                    flex-direction: column;

                    align-items: center;

                    justify-content: center;

                    margin-top: 40rpx;

                    &:nth-child(1) {

                        margin: 0;

                    }

                    &:nth-child(2) {

                        margin: 0;

                    }

                    &:nth-child(3) {

                        margin: 0;

                    }

                    &:nth-child(4) {

                        margin: 0;

                    }

                    &:nth-child(5) {

                        margin: 0;

                    }

                    image {

                        width: 88rpx;

                        height: 88rpx;

                        border-radius: 24rpx;

                        overflow: hidden;

                    }

                    span {

                        font-size: 24rpx;

                        font-weight: 400;

                        color: #333333;

                        margin-top: 16rpx;

                    }

                }

            }

        }

    }

}

</style>

 minipro_standard/util/request/responseInterceptors.js

@@ -7,18 +7,18 @@
        /* å¯¹å“åº”成功做点什么 å¯ä½¿ç”¨async await åšå¼‚步操作*/

        const data = response.data

        // è‡ªå®šä¹‰å‚æ•°

        const custom = response.config?.custom

        if (data.code !== 200) { // æœåŠ¡ç«¯è¿”回的状态码不等于200，则reject()
            uni.$u.toast(data.message)
            if (data.code === 401) {
                // console.log('未登录、登录失效');
                // æœªç™»å½•ã€ç™»å½•å¤±æ•ˆ
                uni.reLaunch({
                    url: '/pages/login/login'
                })
            }
            return Promise.reject(data)

        }
        // const custom = response.config?.custom

        // if (data.code !== 200) { // æœåŠ¡ç«¯è¿”回的状态码不等于200，则reject()
        //     uni.$u.toast(data.message)
        //     if (data.code === 401) {
        //         // console.log('未登录、登录失效');
        //         // æœªç™»å½•ã€ç™»å½•å¤±æ•ˆ
        //         uni.reLaunch({
        //             url: '/pages/login/login'
        //         })
        //     }
        //     return Promise.reject(data)

        // }
        // console.log(data.data);

        return data.data || {}

    }, (response) => {


 platform_web/.env.development

@@ -16,7 +16,10 @@




#江萍本地

VUE_APP_BASE_URL = 'http://192.168.0.35:10021/'

# VUE_APP_BASE_URL = 'http://192.168.0.35:10021/'



#焦松

VUE_APP_BASE_URL = 'http://192.168.0.36:10021/'



#刘磊磊本地

# VUE_APP_BASE_URL = 'http://192.168.0.18:10021/'


 platform_web/src/views/business/clientRecord.vue

@@ -33,7 +33,7 @@
          </template>
        </el-table-column>
        <el-table-column prop="detail" label="备注" align="center" min-width="180px"></el-table-column>
        <el-table-column prop="updateUser" label="操作人" align="center" min-width="100px"></el-table-column>
        <el-table-column prop="createUserName" label="操作人" align="center" min-width="100px"></el-table-column>
        <el-table-column prop="createTime" label="操作时间" align="center" min-width="140px"></el-table-column>
      </el-table>
      <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">

 screen_standard/.env.development

@@ -6,6 +6,11 @@
#VITE_BASE_URL='http://192.168.0.35:10021'

# VITE_BASE_PATH='/doumeeplant_api'
<<<<<<< HEAD
# VITE_BASE_URL='https://dmtest.ahapp.net/doumeeplant_api/'

VITE_BASE_URL = 'https://www.mes.red/doumeeplant'
VITE_BASE_URL = 'https://www.mes.red/doumeeplant'
=======
VITE_BASE_URL='https://dmtest.ahapp.net/doumeeplant_api'
# VITE_BASE_URL = 'https://www.mes.red/doumeeplant'
>>>>>>> 7550fb636fec7a84dbdea55196d97ed635d7ab10

 screen_standard/.env.production

@@ -1,5 +1,5 @@
NODE_ENV = production
VITE_NAME = '生产环境'
VITE_BASE_CONTEXT = 'screen'
VITE_BASE_PATH = '/doumeeplant'
VITE_BASE_URL = 'https://www.mes.red/doumeeplant/'
VITE_BASE_PATH = '/api'
VITE_BASE_URL = 'https://www.mes.red/doumeeplant'

 screen_standard/.env.staging

@@ -2,4 +2,4 @@
VITE_NAME='测试环境'
VITE_BASE_CONTEXT='doumeeplant_screen'
VITE_BASE_PATH='/doumeeplant_api'
VITE_BASE_URL='https://dmtest.ahapp.net/doumeeplant_api/'
VITE_BASE_URL='https://dmtest.ahapp.net/doumeeplant_api'

 screen_standard/src/components/AppLayout.vue

@@ -25,10 +25,6 @@
        <img v-if="!isFull" src="@/assets/img/ic_fullscreen@2x.png" class="full-ic" @click="fullChange">
        <img v-else src="@/assets/img/ic_exitfullscreen@2x.png" class="full-ic" @click="fullChange">
        <img src="@/assets/img/title_line@2x.png" class="right-line" alt="">

        <template>
          <v-mini-weather></v-mini-weather>
        </template>
        <div class="date">
          <div class="time">{{ tempDate.time }}</div>
          <div class="day">{{ `${tempDate.date} ${tempDate.day}` }}</div>
@@ -63,8 +59,6 @@
import { reactive, toRefs, onMounted, computed } from 'vue';
import { useCounterStore } from '@/stores/counter.js'
import { useRoute, useRouter } from 'vue-router'
import { vMiniWeather   } from 'vue-mini-weather'
// export default { components: {vMiniWeather }}
const enterprise = useCounterStore()
const route = useRoute()
const router = useRouter()
@@ -88,7 +82,7 @@
    return enterprise.deviceNum
})
const unqualifiedRate = computed(() => {
    return +enterprise.unqualifiedRate.toFixed(2)
    return enterprise.unqualifiedRate
})
const title = computed(() => {
    return enterprise.procedureName ? `${enterprise.procedureName}工序数据看板` :  'DM云工厂车间大屏'
@@ -166,7 +160,7 @@
    }
  }, 1000)
  // console.log(date.getDay());
 

})
const back = () => {
  enterprise.setProcedureName('')
@@ -180,22 +174,18 @@
  background-position: center;
  background-size: 100% 100%;
  background-repeat: no-repeat;

  // width: 1920px;
  // height: 1080px;
  width: 100%;
  height: 100%;
  padding: 20px 30px;
  overflow-y: scroll;
  display: flex;
  flex-direction: column;

  padding: 30px;
  // overflow-y: scroll;
  box-sizing: border-box;
  .header {
    background-image: url('@/assets/img/bg_maintitle@2x.png');
    background-size: 100% 70px;
    background-size: 100% 74px;
    width: 100%;
    height: 70px;
    height: 74px;
    display: flex;
    padding-top: 1px;
    padding-left: 20px;
@@ -263,15 +253,14 @@
    }
  }
  .num-list {
    margin-top: 20px;
    margin-bottom: 20px;
    margin-top: 24px;
    margin-bottom: 27px;
    display: flex;
    justify-content: space-between;
    height: 80px;
    height: 88px;
    color: white;
    .num-item {
      width: calc(25% - 50px);
      height: 80px;
      background-size: 100% 100%;
      margin-right: 25px;
      padding-left: 30px;

 screen_standard/src/router/index.js

@@ -1,5 +1,5 @@
import { createRouter, createWebHashHistory } from 'vue-router'
import HomeView from '../views/HomeView.vue'
// import HomeView from '../views/HomeView.vue'
import indexView from '../views/index.vue'
import processView from '../views/process.vue'
// console.log(import.meta.env.VITE_BASE_CONTEXT);
@@ -10,6 +10,11 @@
  routes: [
    {
      path: '/',
      redirect: '/home',
      
    },
    {
      path: '/home',
      name: 'home',
      component: indexView
    },

 screen_standard/src/stores/counter.js

@@ -5,8 +5,8 @@

  state: () => {
    return {
      companyId: '8',
      departId: '',
      companyId: window.sessionStorage.getItem('companyId'),
      departId: window.sessionStorage.getItem('departId'),
      delayNum: 0, // å»¶æœŸè®¡åˆ’æ•°
      deviceNum: 0, // ä»Šæ—¥ç”Ÿäº§è®¾å¤‡æ•°
      ingNum: 0, // æ‰§è¡Œä¸­è®¡åˆ’æ•°

 screen_standard/src/views/HomeView.vue

ÎļþÒÑɾ³ý

 screen_standard/src/views/index.vue

@@ -157,7 +157,7 @@
          <span>近7天不良品分布</span>
        </div>
        <div class="content_right_top_nr">
          

          <div class="content_right_top_nr_top" id="lineChrat"></div>
          <div class="content_right_top_nr_bottom">
            <div class="content_right_top_nr_bottom_yuan" v-if="data.typeDistribution.length > 0">
@@ -166,7 +166,7 @@
            </div>
            <div id="pieChart"></div>
          </div>
          

        </div>
      </div>
      <!-- è®¾å¤‡å·¡æ£€è®°å½• -->
@@ -319,8 +319,8 @@
      }
    }
  })
 
  


  // æŠ¥å·¥æ—¥å¿—
  getRecordLogPage(companyId.value, departId.value, {
    capacity: 20,
@@ -1093,7 +1093,7 @@

            &:nth-child(5) {
              flex: 3;
              

            }
          }
        }

 screen_standard/src/views/process.vue

@@ -113,7 +113,7 @@
</template>

<script setup>
import { reactive, ref, toRefs, onMounted, onBeforeUnmount, onUnmounted } from 'vue'
import { reactive, ref, toRefs, onMounted, onUnmounted, nextTick } from 'vue'
import { getProcedurePlanData, getTop, getProcedurePlansList, getRecordLogPage, getUnqualified7DayData, getUnqualifiedCateData } from '@/utils/api.js'
import { useCounterStore } from '@/stores/counter.js'
import { useRoute } from 'vue-router'
@@ -122,8 +122,7 @@
const route = useRoute()
const enterprise = useCounterStore()
let mainTimer = ref(null)
let planTimer = ref(null)
let reportTimer = ref(null)
let scrollTimer = ref(null)
let planContainer = ref(null)
let reportLogContainer = ref(null)
const data = reactive({
@@ -140,19 +139,26 @@
    { categoryName: '尺寸不良', unqualifiedNum: 22 },
    { categoryName: '有划痕', unqualifiedNum: 5 },
    { categoryName: '其他', unqualifiedNum: 2 },
  ]
  ],
  planScroll: false,
  reportScroll: false,
})

let { listData, top1, top2, baseNum, allBad, reportListData } = toRefs(data)

// start()
onBeforeUnmount(() => {
  clearTimeout(planTimer.value)
  clearTimeout(reportTimer.value)
  clearTimeout(mainTimer.value)
})
onMounted(() => {
  window.addEventListener('resize', () => {
    console.log('resize');
    nextTick(() => {
      setDayChart()
      setTypeChart()
    })
  })
  initData()
  scrollTimer.value = setInterval(() => {
    ListScroll()
    reportScroll()
  }, 100)
  mainTimer.value = setInterval(() => {
    initData()
  }, 60000)
@@ -160,8 +166,7 @@


onUnmounted(() => {
  clearTimeout(planTimer.value)
  clearTimeout(reportTimer.value)
  clearTimeout(scrollTimer.value)
  clearTimeout(mainTimer.value)
})

@@ -175,7 +180,6 @@
  getTop(enterprise.companyId, enterprise.departId, { procedureId: route.query.procedureId })
    .then(res => {
      if (res.length) {

        data.baseNum = res[0].doneNum
        data.top1 = []
        data.top2 = []
@@ -196,52 +200,46 @@
  getProcedurePlansList(enterprise.companyId, enterprise.departId, { procedureId: route.query.procedureId })
    .then(res => {
      data.listData = res
      start()
      data.planScroll = true
    })
  // æŠ¥å·¥æ—¥å¿—分页查询 
  getRecordLogPage(enterprise.companyId, enterprise.departId, { capacity: 20, page: 1, model: { procedureId: route.query.procedureId } })
    .then(res => {
      data.reportListData = res.records
      reportStart()
      data.reportScroll = true
    })
  getUnqualified7DayData(enterprise.companyId, enterprise.departId, route.query.procedureId)
    .then(res => {
      data.dayDistribution = res
      data.allBad = res.reduce((accumulator, currentValue) => accumulator + currentValue.unqualifiedNum, 0)
      setDayChart()
    })
  getUnqualifiedCateData(enterprise.companyId, enterprise.departId, route.query.procedureId)
    .then(res => {
      data.typeDistribution = res
      data.allBad = res.reduce((accumulator, currentValue) => accumulator + currentValue.unqualifiedNum, 0)
      setTypeChart()
    })
}

// é¼ æ ‡ç§»å…¥
function handleMouseEnter() {
  clearTimeout(planTimer.value)
  data.planScroll = false
}
function handleMouseLeave() {
  start()
  data.planScroll = true
}

// é¼ æ ‡ç§»é™¤
function handleMouseEnterReport() {
  clearTimeout(reportTimer.value)
  data.reportScroll = false
}
function handleMouseLeaveReport() {
  reportStart()
  data.reportScroll = true
}

/**
 * å·¥åºè®¡åˆ’
 * å·¥åºè®¡åˆ’滚动方法
 */
// å¼€å¯å®šæ—¶å™¨
function start() {
  clearTimeout(planTimer.value)
  // å®šæ—¶å™¨è§¦å‘周期
  // let speed = ref(100)
  planTimer.value = setInterval(ListScroll, 100)
}
function ListScroll() {
  if (!data.planScroll) return
  let scrollDom = planContainer.value
  if (!scrollDom) return
  // åˆ¤è¯»ç»„件是否渲染完成
@@ -249,14 +247,14 @@
    scrollDom = planContainer.value
  } else {
    // å¦‚果列表数量过少不进行滚动
    if (scrollDom.children.length < 10) {
      clearTimeout(planTimer.value)
    if (scrollDom.children.length < 11) {
      data.planScroll = false
      return
    }
    // ç»„件进行滚动
    scrollDom.scrollTop += 1.5
    scrollDom.scrollTop += 2 
    // åˆ¤æ–­æ˜¯å¦æ»šåŠ¨åˆ°åº•éƒ¨
    if (scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight)) {
    if (scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight - 2)) {
      // èŽ·å–组件第一个节点
      let first = scrollDom.children[0]
      // åˆ é™¤èŠ‚点
@@ -267,15 +265,10 @@
  }
}
/**
 * æŠ¥å·¥æ—¥å¿—
 * æŠ¥å·¥æ—¥å¿—滚动方法
 */
function reportStart() {
  clearTimeout(reportTimer.value)
  // å®šæ—¶å™¨è§¦å‘周期
  // let speed = ref(100)
  reportTimer.value = setInterval(reportScroll, 100)
}
function reportScroll() {
  if (!data.reportScroll) return
  let scrollDom = reportLogContainer.value
  if (!scrollDom) return
  // åˆ¤è¯»ç»„件是否渲染完成
@@ -284,13 +277,13 @@
  } else {
    // å¦‚果列表数量过少不进行滚动
    if (scrollDom.children.length < 10) {
      clearTimeout(reportTimer.value)
      data.reportScroll = false
      return
    }
    // ç»„件进行滚动
    scrollDom.scrollTop += 1.5
    scrollDom.scrollTop += 2
    // åˆ¤æ–­æ˜¯å¦æ»šåŠ¨åˆ°åº•éƒ¨
    if (scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight)) {
    if (scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight - 2)) {
      // èŽ·å–组件第一个节点
      let first = scrollDom.children[0]
      // åˆ é™¤èŠ‚点
@@ -321,6 +314,10 @@
        color: '#fff',
        fontSize: 12
      }
    },
    grid: {
      top: 40,
      bottom: 40
    },
    xAxis: {
      type: 'category',
@@ -397,6 +394,7 @@
 */
function setTypeChart() {
  let dayChartDom = document.getElementById('type-distribution');
  console.log(dayChartDom);
  let myChart = echarts.init(dayChartDom);
  let legendData = []
  let seriesData = []
@@ -495,13 +493,14 @@
    flex: 1;
    margin-right: 20px;
    .proccess-plan {
      height: 424px;
      height: 464px;
      background: linear-gradient(180deg, rgba(52, 88, 159, 0) 0%, rgba(0, 86, 255, 0.4) 100%);
      margin-bottom: 20px;
    }

    .today-yield {
      height: calc(100vh - 690px);;
      height: calc(100vh - 725px);
      min-height: 226px;
      background: linear-gradient(180deg, rgba(52, 88, 159, 0) 0%, rgba(0, 86, 255, 0.4) 100%);

      .yield-content {
@@ -601,13 +600,14 @@
    flex: 1;

    .report-log {
      height: 424px;
      height: 464px;
      background: linear-gradient(180deg, rgba(52, 88, 159, 0) 0%, rgba(0, 86, 255, 0.4) 100%);
      margin-bottom: 20px;
    }

    .bad-diagram {
      height:calc(100vh - 690px);;
      height:calc(100vh - 725px);;
      min-height: 226px;
      background: linear-gradient(180deg, rgba(52, 88, 159, 0) 0%, rgba(0, 86, 255, 0.4) 100%);

      .bad-content {

 screen_standard/vite.config.js

@@ -11,6 +11,10 @@
// https://vitejs.dev/config/
export default defineConfig(({mode, command}) => {
  let env = loadEnv(mode, process.cwd(), '')
  console.log('-------');
  console.log(env.VITE_BASE_PATH);
  console.log(env.VITE_BASE_PATH.replace(env.VITE_BASE_PATH, ''));
  console.log('-------');
  return {
    base:env.VITE_BASE_CONTEXT,
    plugins: [
@@ -47,8 +51,20 @@
          changeOrigin: true,
          ws: false,  // å…è®¸websocket代理
          secure: false,
<<<<<<< HEAD
          rewrite: (path) => path.replace(env.VITE_BASE_PATH, '/')
        }
=======
          rewrite: (path) => path.replace(env.VITE_BASE_PATH, '/'),
          // rewrite: (path) => path.replace(/^\api/, ''), // å°†api替换为空
        },
        /*'/api' : {
          target: env.VITE_BASE_URL, // é€šè¿‡ä»£ç†æŽ¥å£è®¿é—®å®žé™…地址。这里是实际访问的地址。vue会通过代理服务器来代理请求
          changeOrigin: true,
          ws: false,  // å…è®¸websocket代理
          rewrite: (path) => path.replace(/^\api/, ''), // å°†api替换为空
        }*/
>>>>>>> 7550fb636fec7a84dbdea55196d97ed635d7ab10
      }
    }
  }

 server/src/main/java/doumeemes/dao/business/model/CompanyLog.java

@@ -36,6 +36,7 @@

    @ApiModelProperty(value = "创建人编码", example = "1")
    @ExcelColumn(name="创建人编码")
    @TableField(exist = false)
    private String createUserName;

    @ApiModelProperty(value = "创建时间")