Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

ZengTao

2023-09-18 5aa99c119f387d6f32a58dfc7190351f6f92ecf6

 CanadaMes-ui/src/views/home/index.vue

@@ -60,25 +60,25 @@


.gezi {

    height: 35px;

    


    position: absolute;

    width: 3.07px;

    width: 3.08px;

    /* width: 4.22px; */

}



.gezi:nth-child(22),

/* .gezi:nth-child(22),

.gezi:nth-child(43),

.gezi:nth-child(64),

.gezi:nth-child(85) {

    margin-left: 7px;

    /* margin-left: 10px; */

}

    margin-left: 10px;

} */







.blocks {



    


    background-image: url('../../img/xmjc.png');

    margin: 0 auto;

    background-repeat: no-repeat;

@@ -176,6 +176,10 @@
        transform: translateX(-150%);

    }

}



.el-dialog {

    width: 80%;

}

</style>

<template>

    <el-container>

@@ -183,7 +187,8 @@
        <el-main>

            <div class="box" @click="dialogFormVisible2 = true">

                <div class="text">

                    Alarm:

                    <!-- Alarm: -->

                    {{ this.text }}

                    <label v-for="item in this.alarm" :key="item['id']">

                        {{ item['content'] }}

                    </label>

@@ -241,23 +246,28 @@
        <el-footer>

            <div class="blocks" style="position: relative;">

                <div style="display:flex;position: absolute;float:left;z-index: 999;top:102px;left:237px;">

                    <div :class="getStatusClass(item.state)" v-for="(item,index) in cagelist1" :key="item['date']"

                        :style="{ height: 35 * item['glassWidth'] + 'px',left:3.07*index+'px' }" @click="showcageinfo(item['cage'])"></div>

                    <div :class="getStatusClass(item.state)" v-for="(item, index) in cagelist1" :key="item['date']"

                        :style="{ height: 35 * item['glassWidth'] + 'px', left: 3.07 * index + Math.abs(item['cage'] - 10) * 6.8 + 'px' }"

                        @click="showcageinfo(item['cage'])"></div>

                </div>

                <div style="display:flex;position: absolute;float:left;z-index: 999;top:102px;left:640px;">

                    <div :class="getStatusClass(item.state)" v-for="(item,index) in cagelist2" :key="item['date']"

                        :style="{ height: 35 * item['glassWidth'] + 'px',left:3.07*index+'px' }" @click="showcageinfo(item['cage'])"></div>

                    <div :class="getStatusClass(item.state)" v-for="(item, index) in cagelist2" :key="item['date']"

                        :style="{ height: 35 * item['glassWidth'] + 'px', left: 3.07 * index + Math.abs(item['cage'] - 5) * 6.8 + 'px' }"

                        @click="showcageinfo(item['cage'])"></div>

                </div>

                <div style="display:flex;position: absolute;float:left;z-index: 999;top:139px;left:237px;">

                    <div :class="getStatusClass(item.state)" v-for="(item,index) in cagelist3" :key="item['date']"

                        :style="{ height: 35 * item['glassWidth'] + 'px', top: item['width'] * 35 - 35 + 'px',left:3.07*index+'px' }"

                    <div :class="getStatusClass(item.state)" v-for="(item, index) in cagelist3" :key="item['date']"

                        :style="{ height: 35 * item['glassWidth'] + 'px', top: item['width'] * 35 - 35 + 'px', left: 3.07 * index + Math.abs(item['cage'] - 10) * 6.8 + 'px' }"

                        @click="showcageinfo(item['cage'])">

                    </div>

                </div>

                <div style="display:flex;position: absolute;float:left;z-index: 999;top:139px;left:640px;">

                    <div :class="getStatusClass(item.state)" v-for="(item,index) in cagelist4" :key="item['date']"

                        :style="{ height: 35 * item['glassWidth'] + 'px', top: item['width'] * 35 - 35 + 'px',left:3.07*index+'px' }"

                    <div :class="getStatusClass(item.state)" v-for="(item, index) in cagelist4" :key="item['date']"

                        :style="{ height: 35 * item['glassWidth'] + 'px', top: item['width'] * 35 - 35 + 'px', left: 3.07 * index + Math.abs(item['cage'] - 5) * 6.8 + 'px' }"

                        @click="showcageinfo(item['cage'])"></div>

                </div>

                <div class="blue gezi"

                    :style="{ display: flex, position: absolute, float: left, top: 105 + 'px', left: 1050 + 'px', height: loadglassheight + 'px', width: 5 + 'px' }">

                </div>

                <div class="blocks-img" :style="{ left: car1 + 'px', top: '16px' }"></div>

                <div class="blocks-img" :style="{ left: car2 + 'px', top: '175px' }"></div>

@@ -337,14 +347,14 @@
        </el-dialog>

        <el-dialog :visible.sync="dialogFormVisible3" :title="$t('Cage Details')">

            <el-table :data="this.cageinfo" :height="700" border style="width: 100%;overflow: auto;">

                <el-table-column :width="150" prop="cage" :label="$t('The Cage number')"></el-table-column>

                <el-table-column prop="cage" :label="$t('The Cage number')"></el-table-column>

                <el-table-column prop="cell" :label="$t('cell')"></el-table-column>

                <el-table-column prop="tier" :label="$t('tier')"></el-table-column>

                <el-table-column prop="glassId" :label="$t('glassid')"></el-table-column>

                <el-table-column :width="130" prop="orderId" :label="$t('order number')"></el-table-column>

                <el-table-column :width="150" prop="lengthWidth" :label="$t('Length and width')"></el-table-column>

                <el-table-column prop="orderId" :label="$t('order number')"></el-table-column>

                <el-table-column prop="lengthWidth" :label="$t('Length and width')"></el-table-column>

                <el-table-column prop="coating" :label="$t('coating')"></el-table-column>

                <el-table-column :width="140" :label="$t('Operate')">

                <el-table-column :label="$t('Operate')">

                    <template slot-scope='scope'>

                        <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"

                            @click="deleteglass(scope.row.glassId, scope.row.state)">{{ $t('delete') }}</el-button>

@@ -360,7 +370,7 @@
</template>

<script>



import { home, home2, loadtask, InsertOrder, Addglassid, UpdateTask, SelectAlarmmgInfo, SelectCageInfo, DeleteByGlassID, OutByGlassID, Loadcarlist } from "../../api/home";

import { home, home2, loadtask, InsertOrder, Addglassid, UpdateTask, SelectAlarmmgInfo, SelectCageInfo, DeleteByGlassID, OutByGlassID, Loadcarlist, SelectPassword } from "../../api/home";





import LanguageMixin from '../../lang/LanguageMixin'

@@ -369,6 +379,7 @@
    name: "Home",

    data() {

        return {

            name: 'Confirm',

            mixins: [LanguageMixin],

            dialogFormVisible: false,

            dialogFormVisible1: false,

@@ -403,7 +414,10 @@
            // car2: 300,

            cageinfo: [],

            cage: 0,

            carlist:[]

            carlist: [],

            loadglassheight: 0,

            password: 1,

            text: ""

        };

    },

    created() {

@@ -435,10 +449,11 @@
                    //console.log("收到数据====" + msg.data);

                    let obj = JSON.parse(msg.data);

                    if (obj.params != null) {

                        this.car1 = 145 + 8.15 * (obj.params[0][0]-this.carlist[0]['start'])/(this.carlist[0]['end']-this.carlist[0]['start'])*100;

                        this.car2 = 210 + 8.15 * (obj.params[0][1]-this.carlist[1]['start'])/(this.carlist[1]['end']-this.carlist[1]['start'])*100;

                        this.car1 = 145 + 8.1 * Math.abs(obj.params[0][0] - this.carlist[0]['start']) / Math.abs(this.carlist[0]['end'] - this.carlist[0]['start']) * 100;

                        this.car2 = 210 + 8.25 * Math.abs(obj.params[0][1] - this.carlist[1]['start']) / Math.abs(this.carlist[1]['end'] - this.carlist[1]['start']) * 100;

                        // this.car1 = 210 + 11.25 * (obj.params[0][1]-this.carlist[1]['start'])/(this.carlist[1]['end']-this.carlist[1]['start'])*100;

                        // this.car2 = 300 + 11.25 * (obj.params[0][1]-this.carlist[1]['start'])/(this.carlist[1]['end']-this.carlist[1]['start'])*100;

                        console.log(obj.params[0][1], this.carlist[1]['start']);

                    }

                    this.tableData = obj.tableData[0];

                    this.cagelist1 = obj.cagelist1[0];

@@ -448,7 +463,11 @@
                    this.tasklist1 = obj.tasklist1[0];

                    this.tasklist2 = obj.tasklist2[0];

                    this.alarm = obj.alarmmg[0];

                    this.loadglassheight = obj.loadglassheight;



                    if (obj.dbconnected == "false") {

                        this.text = this.$t('DataBase Connection failed');

                    }

                    SelectCageInfo(this.cage).then(res => {

                        this.cageinfo = res.data.cageinfo;

                    });

@@ -497,6 +516,9 @@
            Loadcarlist().then(res => {

                this.carlist = res.data.carlist;

                console.log(this.carlist);

            });

            SelectPassword().then(res => {

                this.password = res.data.password;

            });

        },

        //根据格子状态修改颜色

@@ -581,23 +603,28 @@
            this.form1 = {};

        },

        endtask(type, glassid, cell) {

            this.$confirm(this.$t('Are you sure to perform this operation ?'), this.$t('prompt'), {

            this.$prompt(this.$t('Are you sure to perform this operation ?'), this.$t('prompt'), {

                inputType: 'password',

                inputPlaceholder: this.$t('Please enter the password'),

                confirmButtonText: this.$t('Yes'),

                cancelButtonText: this.$t('No'),

                type: 'warning'

            }).then(() => {

                UpdateTask(type, glassid, cell).then(res => {

                    if (res.data.message3 == 200) {

                        this.$message.success(this.$t('Operation successful'));

                    }

                });

            }).then(({ value }) => {

                if (this.password == value) {

                    UpdateTask(type, glassid, cell).then(res => {

                        if (res.data.message3 == 200) {

                            this.$message.success(this.$t('Operation successful'));

                        }

                    });

                } else {

                    this.$message.success(this.$t('Password error'));//密码错误

                }

            }).catch(() => {

                this.$message({

                    type: 'info',

                    message: this.$t('Operation canceled')

                });

            });



        },

        showcageinfo(cage) {

            this.cage = cage;

@@ -607,20 +634,27 @@
            });

        },

        deleteglass(glassid, state) {

            this.$confirm(this.$t('Are you sure to perform this operation ?'), this.$t('prompt'), {

            this.$prompt(this.$t('Are you sure to perform this operation ?'), this.$t('prompt'), {

                inputType: 'password',

                inputPlaceholder: this.$t('Please enter the password'),

                confirmButtonText: this.$t('Yes'),

                cancelButtonText: this.$t('No'),

                type: 'warning'

            }).then(() => {

                if (state == 1) {

                    DeleteByGlassID(glassid).then(res => {

                        if (res.data.message3 == 200) {

                            this.$message.success(this.$t('Operation successful'));

                        }

                    });

            }).then(({ value }) => {

                if (this.password == value) {

                    if (state == 1) {

                        DeleteByGlassID(glassid).then(res => {

                            if (res.data.message3 == 200) {

                                this.$message.success(this.$t('Operation successful'));

                            }

                        });

                    } else {

                        this.$message.success(this.$t('No delete allowed'));

                    }

                } else {

                    this.$message.success(this.$t('No delete allowed'));

                    this.$message.success(this.$t('Password error'));//密码错误

                }



            }).catch(() => {

                this.$message({

                    type: 'info',

@@ -629,22 +663,28 @@
            });

        },

        outglass(glassid, state) {

            this.$confirm(this.$t('Are you sure to perform this operation ?'), this.$t('prompt'), {

            this.$prompt(this.$t('Are you sure to perform this operation ?'), this.$t('prompt'), {

                inputType: 'password',

                inputPlaceholder: this.$t('Please enter the password'),

                confirmButtonText: this.$t('Yes'),

                cancelButtonText: this.$t('No'),

                type: 'warning'

            }).then(() => {

                if (state == 1) {

                    OutByGlassID(glassid).then(res => {

                        if (res.data.message3 == 200) {

                            this.$message.success(this.$t('Operation successful'));

                        }

                        else if (res.data.message2 == 300) {

                            this.$message.success(this.$t('There is no such grid'));

                        }

                    });

            }).then(({ value }) => {

                if (this.password == value) {

                    if (state == 1) {

                        OutByGlassID(glassid).then(res => {

                            if (res.data.message3 == 200) {

                                this.$message.success(this.$t('Operation successful'));

                            }

                            else if (res.data.message2 == 300) {

                                this.$message.success(this.$t('There is no such grid'));

                            }

                        });

                    } else {

                        this.$message.success(this.$t('No out allowed'));

                    }

                } else {

                    this.$message.success(this.$t('No out allowed'));

                    this.$message.success(this.$t('Password error'));//密码错误

                }

            }).catch(() => {

                this.$message({