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

ZengTao

2023-09-18 5aa99c119f387d6f32a58dfc7190351f6f92ecf6

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

@@ -188,6 +188,7 @@
            <div class="box" @click="dialogFormVisible2 = true">

                <div class="text">

                    <!-- Alarm: -->

                    {{ this.text }}

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

                        {{ item['content'] }}

                    </label>

@@ -415,7 +416,8 @@
            cage: 0,

            carlist: [],

            loadglassheight: 0,

            password: 1

            password: 1,

            text: ""

        };

    },

    created() {

@@ -462,6 +464,10 @@
                    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;

                    });

@@ -619,7 +625,6 @@
                    message: this.$t('Operation canceled')

                });

            });



        },

        showcageinfo(cage) {

            this.cage = cage;