优化部分显示

朱桂飞

2023-03-29 0c26022095437c5ce3d1f790b70afb7ddabf0395

优化部分显示

 App.vue

@@ -32,11 +32,11 @@
            console.log('App Launch')

        },

        onShow: function() {

            console.log('App Show')

            //console.log('App Show')



        },

        onHide: function() {

            console.log('App Hide')

            //console.log('App Hide')

        },
        methods:{
         

 common/request/fly.js

@@ -20,8 +20,8 @@
    const userinfo =  uni.getStorageSync('userinfo');

    if (token) {

        config.headers["X-Access-Token"] = token;
		
        if(userinfo)
    }

    if (userinfo) {

        config.headers["X-Tenant-Id"] = userinfo.loginTenantId;

    } 

    console.log('========================================== ')

@@ -63,6 +63,12 @@
                      },

            });

            

        } else {

            uni.showToast({

                title: '网络错误，请稍后重试~',

                icon: 'none',

                mask: true

            });

        }

        //发生网络错误后会走到这里

        //return Promise.resolve("ssss")


 pages/tabBar/general.vue

@@ -88,21 +88,27 @@
                <view class="flex">

                    <view class="flex-sub flex flex-direction">

                        <text class="text-df">烘干数量</text>

                        <text class="text-bold text-sl margin-top-xs text-cyan margin-top-sm">{{showValue(model.feed)}} <text

                                class="text-gray text-sm margin-left-xs">筐</text></text>

                        <text class="text-bold text-sl margin-top-xs text-cyan margin-top-sm">{{showValue(model.feed)}}

                            <text class="text-gray text-sm margin-left-xs">筐</text></text>

                    </view>

                    <view class="flex-twice flex flex-direction justify-between">

                        <view class="flex-sub flex">

                            <view class="flex flex-direction flex-sub">

                                <text class="text-gray text-xs">批次信息</text>

                                <text class="text-black"><text class="text-black">种类:</text> {{showValue(model.group)}} <text

                                        class="text-gray text-xs"></text></text>

                                <text class="text-black">

                                    <text class="text-black">种类:</text>

                                    <text class="margin-lr-xs">{{showValue(model.group)}}</text>

                                    <text class="text-gray text-xs"></text>

                                </text>



                            </view>

                            <view class="flex flex-direction flex-sub">

                                <text class="text-white text-xs">批次</text>

                                <text class="text-black"><text class="text-black">批次:</text> {{showValue(model.batch)}} <text

                                        class="text-gray text-xs"></text></text>

                                <text class="text-black">

                                    <text class="text-black">批次:</text>

                                    <text class="margin-lr-xs">{{showValue(model.batch)}}</text>

                                    <text class="text-gray text-xs"></text>

                                </text>



                            </view>



@@ -110,14 +116,20 @@
                        <view class="flex-sub flex margin-top-sm">

                            <view class="flex flex-direction flex-sub">

                                <text class="text-gray text-xs">烘干信息</text>

                                <text class="text-cyan"><text class="text-black">重量:</text> {{showValue(model.weight)}} <text

                                        class="text-gray text-xs">kg</text></text>

                                <text class="text-cyan">

                                    <text class="text-black">重量:</text>

                                    <text class="margin-lr-xs">{{showValue(model.weight)}}</text>

                                    <text class="text-gray text-xs">kg</text>

                                </text>



                            </view>

                            <view class="flex flex-direction flex-sub">

                                <text class="text-white text-xs">时间</text>

                                <text class="text-cyan"><text class="text-black">时间:</text> {{showValue(model.dryTime)}} <text

                                        class="text-gray text-xs">min</text></text>

                                <text class="text-cyan">

                                    <text class="text-black">时间:</text>

                                    <text class="margin-lr-xs">{{showValue(model.dryTime)}}</text>

                                    <text class="text-gray text-xs">min</text>

                                </text>

                            </view>



                        </view>

@@ -146,7 +158,8 @@
                </view>

            </view>



            <lunc-calendar ref="calendar" @dayChange="dayChange" weekType="星期" @monthChange="monthChange" :showShrink="true" shrinkState="week" :signList="monthList"></lunc-calendar>

            <lunc-calendar ref="calendar" @dayChange="dayChange" weekType="星期" @monthChange="monthChange"

                :showShrink="true" shrinkState="week" :signList="monthList"></lunc-calendar>

        </view>





@@ -175,7 +188,8 @@
                    <view style="width:160rpx;" class="flex align-center text-xs ">

                        <text>进度:</text>

                        <view style="width: 100rpx;">

                            <u-line-progress :percentage="calcProgress(item.dryTime,item.et)" height="10"></u-line-progress>

                            <u-line-progress :percentage="calcProgress(item.dryTime,item.et)"

                                height="10"></u-line-progress>

                        </view>

                    </view>

                </view>

@@ -188,7 +202,8 @@
                    <view class="flex flex-direction margin-left-xl margin-left-sm justify-center">

                        <view>

                            <text class="text-xxl text-green">{{showValue(item.target)}}%</text>

                            <text class="text-xs margin-top-xs text-grey text-line-through">{{showValue(item.initial)}}%</text>

                            <text

                                class="text-xs margin-top-xs text-grey margin-left-xs text-line-through">{{showValue(item.initial)}}%</text>

                        </view>

                        <text class="text-xs margin-top-xs text-grey">含水率</text>

                    </view>

@@ -197,7 +212,7 @@
                        <view>

                            <text class="text-xxl">{{showValue(item.yield )}}kg</text>

                            <text

                                class="text-xs margin-top-xs text-grey text-line-through">{{showValue(item.originWeight)}}kg</text>

                                class="text-xs margin-top-xs text-grey margin-left-xs text-line-through">{{showValue(item.originWeight)}}kg</text>

                        </view>



                        <view class="text-xs margin-top-xs text-grey">

@@ -398,6 +413,10 @@
                               gList.push(item.herbName)
                           }
                        });


                        if (weight) {

                            weight = weight.toFixed(1)

                        }

                        this.model.feed = feed
                        this.model.group  = gList.length
                        this.model.batch  = this.herbList.length
@@ -430,7 +449,11 @@
                            let date =  res.result[0]
                             let array =    date.split('-')
                             if(array && array.length == 3){
                                 this.$refs.calendar.clickDay({"day":array[2],"month":array[1],"year":array[0]})
                                this.$refs.calendar.clickDay({

                                    "day": parseInt(array[2]),

                                    "month": parseInt(array[1]),

                                    "year": parseInt(array[0])

                                })

                             }
                            
                        }

 pages/tabBar/monitor.vue

@@ -16,7 +16,7 @@
                        interval="3500" duration="600">

                        <swiper-item class="swiper-list" v-for="(item, index) in bannerList" :key="index">

                            <view class="swiper-item uni-bg-red">

                                <image class="swiper-img" :src="item.imageUrl" mode="aspectFill"></image>

                                <image class="swiper-img" :src="item.imageUrl" mode="aspectFit"></image>

                            </view>

                        </swiper-item>

                    </swiper>

@@ -31,9 +31,9 @@
                <view class='bg-orange cu-tag radius light sm margin-right-xs' v-else>停止</view>

                <!-- <view class='bg-cyan cu-tag radius light sm'>正常</view> -->

            </view>

            <view class="text-black text-df flex">

                <text class="margin-right-xs">配方名称:</text>

                <text>{{ formulaName   }} </text>

            <view class="text-black text-df flex align-center">

                <text class="margin-right-xs">批次:</text>

                <text>{{ this.$lget(this.model,'code') }} </text>

            </view>



            <view class="text-gray  margin-top-xs">

@@ -43,7 +43,20 @@


            <view class="text-gray  margin-top-xs">

                <text class="margin-right-xs">投料:</text>

                <text>{{$lget(model,'feed')}}筐</text>

                <text class="text-cyan">{{$lget(model,'feed')}} <text class="text-gray margin-left-xs">筐</text></text>
			 
            </view>
            <view class="text-gray  margin-top-xs">
                <text class="margin-right-xs">重量:</text>
                <text class="text-cyan margin-right-xs">{{$lget(model,'trendVo.weight')}}<text class="text-gray margin-left-xs">/</text></text>
                <text>  <text class="text-line-through">{{$lget(model,'originWeight')}}</text>  <text class="text-gray margin-left-xs">kg</text></text>
			 
            </view>
			
            <view class="text-gray  margin-top-xs">
                <text class="margin-right-xs">用时:</text>
                <text class="text-cyan">{{$lget(model,'trendVo.totalTime')}}<text class="text-gray margin-left-xs">min</text></text>
			 
            </view>



            <!-- <view class="margin-tb-sm" style="position: relative;">

@@ -383,10 +396,10 @@
                    tenantid: 1000

                },

                bannerList: [{

                        imageUrl: '/static/image/equ1.png'

                        imageUrl: 'https://dev.shlanbao.cn:9999/fileTransfer/preview?userFileId=1640616151832784896&isMin=false&shareBatchNum=&extractionCode='

                    },

                    {

                        imageUrl: '/static/image/equ1.png'

                        imageUrl: 'https://dev.shlanbao.cn:9999/fileTransfer/preview?userFileId=1640617395255177216&isMin=false&shareBatchNum=&extractionCode='

                    }

                ]