shishuaikang
2023-12-08 172fbd8ed8a64952de9c2c806f1ba4b4c2409558
拌和站大屏图片更换,搅和站样式修改
已修改9个文件
46 ■■■■■ 文件已修改
web/src/assets/mixing/container_10.png 补丁 | 查看 | 原始文档 | blame | 历史
web/src/assets/mixing/container_100.png 补丁 | 查看 | 原始文档 | blame | 历史
web/src/assets/mixing/container_20.png 补丁 | 查看 | 原始文档 | blame | 历史
web/src/assets/mixing/container_40.png 补丁 | 查看 | 原始文档 | blame | 历史
web/src/assets/mixing/container_60.png 补丁 | 查看 | 原始文档 | blame | 历史
web/src/assets/mixing/container_80.png 补丁 | 查看 | 原始文档 | blame | 历史
web/src/assets/mixing/container_90.png 补丁 | 查看 | 原始文档 | blame | 历史
web/src/views/MixingInfo/messageInfo.vue 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/src/views/MixingInfo/mixing.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/src/assets/mixing/container_10.png

web/src/assets/mixing/container_100.png

web/src/assets/mixing/container_20.png

web/src/assets/mixing/container_40.png

web/src/assets/mixing/container_60.png

web/src/assets/mixing/container_80.png

web/src/assets/mixing/container_90.png

web/src/views/MixingInfo/messageInfo.vue
@@ -6,37 +6,42 @@
        <div class="mixing_main">
            <div class="mixing_left">
                <div class="mixing_left_num">
                    <div class="">{{ mixingList && mixingList.tableNum }}</div>
                    <div class="">{{ mixingList.tableNum }}</div>
                </div>
                <div class="mixing_left_name">{{ mixingList && mixingList.materialName }}</div>
                <div class="mixing_left_name">{{ mixingList.materialName || '' }}</div>
            </div>
            <div class="mixing_right">
                <div class="mixing_rows">
                    <div class="mixing_rows_titles">产地名称:</div>
                    <div class="mixing_rows_datas">{{ mixingList && mixingList.nameOfOrigin }}</div>
                    <div class="mixing_rows_datas">{{ mixingList.nameOfOrigin || '' }}</div>
                </div>
                <div class="mixing_rows">
                    <div class="mixing_rows_titles">进场数量:</div>
                    <div class="mixing_rows_datas">{{ mixingList && mixingList.incomingQuantity }} t</div>
                    <div class="mixing_rows_datas">{{ mixingList.incomingQuantity || '' }} t</div>
                </div>
                <div class="mixing_rows">
                    <div class="mixing_rows_titles">进场日期:</div>
                    <div class="mixing_rows_datas">{{ mixingList && mixingList.inTime }}</div>
                    <div class="mixing_rows_datas">{{ mixingList.inTime || '' }}</div>
                </div>
                <div class="mixing_rows">
                    <div class="mixing_rows_titles">检验日期:</div>
                    <div class="mixing_rows_datas">{{ mixingList && mixingList.inspectionDate }}</div>
                    <div class="mixing_rows_datas">{{ mixingList.inspectionDate || '' }}</div>
                </div>
                <div class="mixing_rows">
                    <div class="mixing_rows_titles">检验状态:</div>
                    <div class="mixing_rows_datas"
                        :class="{ 'standardStyle': mixingList.status === 1, 'notStandardStyle': mixingList.status !== 1 }">
                        {{ mixingList && mixingList.status === 1 ? '合格' : mixingList && mixingList.status === 2 ? '待检' : ''
                        {{ mixingList.status === 1 ? '合格' : mixingList.status === 2 ? '待检' : ''
                        }}</div>
                </div>
                <div class="mixing_rows">
                    <div class="mixing_rows_titles">报告编号:</div>
                    <div class="mixing_rows_datas">{{ mixingList && mixingList.reportNumber }}</div>
                    <div class="mixing_rows_datas small_size">
                        {{
                            mixingList.reportNumber &&
                            mixingList.reportNumber.replace(/\s/g, '\n')
                        }}
                    </div>
                </div>
            </div>
        </div>
@@ -47,7 +52,7 @@
    data() {
        return {
            timer: null,//定时器
            mixingList: [],//展示数据
            mixingList: {},//展示数据
        }
    },
    created() {
@@ -80,8 +85,9 @@
                tableNum: window.location.href.split('/')[5].split('=')[1]
            }
            this.$api.Infos.showHmixings(params).then(res => {
                if (res.statusMsg === 'ok') {
                    this.mixingList = res.data === null ? [] : res.data
                if (res.statusMsg === 'ok' && res.data) {
                    res.data.reportNumber = "TYZQ1-ZTSS-J1-CGL-20231207-001 TYZQ1-ZTSS-J1-CGL-20231207-002"
                    this.mixingList = res.data
                } else {
                    this.$message.warning('请检查网络或联系管理员!!!')
                }
@@ -104,9 +110,8 @@
    .mixing_header {
        width: 100%;
        height: 3.2rem;
        height: 9rem;
        position: relative;
        padding: 4rem;
        display: flex;
        justify-content: center;
        align-items: center;
@@ -128,7 +133,7 @@
        flex: 1;
        width: 100%;
        height: 100%;
        padding: 6rem;
        padding: 3rem 4rem 5rem 4rem;
        display: flex;
        .mixing_left {
@@ -185,7 +190,7 @@
            background: linear-gradient(to right, #0D3776 0%, #041A40 100%);
            display: flex;
            flex-direction: column;
            justify-content: space-between;
            justify-content: space-around;
            padding: 2rem 4rem;
            .mixing_rows {
@@ -193,17 +198,22 @@
                display: flex;
                .mixing_rows_titles {
                    flex: none;
                    color: #FFFFFF;
                    font-weight: 400;
                    font-size: 5rem;
                }
                .mixing_rows_datas {
                    flex: none;
                    overflow: hidden;
                    flex: 1;
                    color: #FFFFFF;
                    font-weight: 400;
                    font-size: 5rem;
                    white-space: pre-wrap;
                    &.small_size {
                        font-size: 4.3rem;
                    }
                }
                .standardStyle {
web/src/views/MixingInfo/mixing.vue
@@ -263,7 +263,7 @@
                > p {
                    position: absolute;
                    left: 50%;
                    top: 18%;
                    top: 9%;
                    font-size: 0.7rem;
                    white-space: nowrap;
                    transform: translate(-50%, -50%);