增加翻译文件和bug解决

wu

2024-11-26 fddf1c716af76c2968e08ce11895eaa1c26319a5

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

@@ -451,12 +451,14 @@
                    </div>
                    <el-table :data="this.tasklist1" border style="width: 700px;">
                        <el-table-column prop="mateid" :label="$t('Mateid')"></el-table-column>
                        <el-table-column prop="storageCage.cage" :label="$t('Cage No')"></el-table-column>
                        <el-table-column prop="storageCage.cell" :label="$t('Slot No')"></el-table-column>
                        <el-table-column prop="storageCage.glassWidth" :label="$t('Width')"></el-table-column>
                        <el-table-column prop="storageCage.glassHeight" :label="$t('Height')"></el-table-column>
                        <el-table-column prop="storageCage.thickness" :label="$t('Thickness')"></el-table-column>
                        <el-table-column prop="storageCage.cage" :label="$t('Start bit')"></el-table-column>
                        <el-table-column prop="storageCage.cell" :label="$t('Target bit')"></el-table-column>
                        <el-table-column prop="storageCage.glassWidth" :label="$t('Width')" width="70"></el-table-column>
                        <el-table-column prop="storageCage.glassHeight" :label="$t('Height')" width="70"></el-table-column>
                        <el-table-column prop="storageCage.thickness" :label="$t('Thickness')" width="50"></el-table-column>   
                        <el-table-column prop="storageCage.tier" :label="$t('Tier')" width="50"></el-table-column>                    
                        <el-table-column prop="storageCage.films" :label="$t('Films')"></el-table-column>
                        
                        <el-table-column :min-width="120" :label="$t('Terminate Task')">
                            <template slot-scope='scope'>
                                <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
@@ -464,17 +466,17 @@
                                <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
                                    @click="TerminateTask(scope.row.id)">{{ $t('Terminate') }}</el-button>
                            </template>
                        </el-table-column>
                        </el-table-column>  
                    </el-table>
                    <el-table :data="this.tasklist2" border style="width: 100%">
                        <el-table-column prop="mateid" :label="$t('Mateid')"></el-table-column>
                        <el-table-column prop="storageCage.cage" :label="$t('Cage No')"></el-table-column>
                        <el-table-column prop="storageCage.cell" :label="$t('Slot No')"></el-table-column>
                        <el-table-column prop="storageCage.glassWidth" :label="$t('Width')"></el-table-column>
                        <el-table-column prop="storageCage.glassHeight" :label="$t('Height')"></el-table-column>
                        <el-table-column prop="storageCage.thickness" :label="$t('Thickness')"></el-table-column>
                        <el-table-column prop="storageCage.cage" :label="$t('Start bit')"></el-table-column>
                        <el-table-column prop="storageCage.cell" :label="$t('Target bit')"></el-table-column>
                        <el-table-column prop="storageCage.glassWidth" :label="$t('Width')" width="70"></el-table-column>
                        <el-table-column prop="storageCage.glassHeight" :label="$t('Height')" width="70"></el-table-column>
                        <el-table-column prop="storageCage.thickness" :label="$t('Thickness')" width="50"></el-table-column>
                        <el-table-column prop="storageCage.tier" :label="$t('Tier')" width="50"></el-table-column>
                        <el-table-column prop="storageCage.films" :label="$t('Films')"></el-table-column>

                        <el-table-column :min-width="120" :label="$t('Terminate Task')">
                            <template slot-scope='scope'>
                                <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
@@ -529,7 +531,7 @@
            <div style="height: 760px;">
                <!--功能-->
                <div>
                    <el-button type="primary" @click="ManualMatching()" :disabled="(this.LastQueue.state > 0)"
                    <el-button type="primary" @click="ManualMatching()" :disabled="(this.LastQueue.state > 3)"
                        style="z-index: 999;">{{ $t('Manual matching') }}</el-button>
                    <el-button type="primary" @click="ManualTake()" :disabled="(this.LastQueue.state > 0)"
                        style="z-index: 999;">{{
@@ -611,6 +613,7 @@
                        style="width: 100%;padding:0;">
                        <el-table-column prop="flowcard" :label="$t('Order')"></el-table-column>
                        <el-table-column prop="mateid" :label="$t('Mateid')"></el-table-column>
                        <el-table-column prop="tier" :label="$t('Tier')" width="50"></el-table-column>
                        <el-table-column prop="films" :label="$t('Films')"></el-table-column>
                        <el-table-column prop="width" :label="$t('Width')"></el-table-column>
                        <el-table-column prop="height" :label="$t('Height')"></el-table-column>
@@ -635,6 +638,7 @@
                <el-table-column :min-width="80" prop="thickness" :label="$t('Thickness')"></el-table-column>
                <el-table-column :min-width="80" prop="films" :label="$t('Films')"></el-table-column>
                <el-table-column :min-width="80" prop="number" :label="$t('number')"></el-table-column>
                <el-table-column :min-width="80" prop="tier" :label="$t('Tier')"></el-table-column>
                <el-table-column :min-width="80" prop="mateid" :label="$t('Mateid')"></el-table-column>
                <!-- <el-table-column :min-width="80" prop="width" :label="$t('Width')"></el-table-column> -->
                <el-table-column :min-width="250" :label="$t('Operate')">
@@ -816,7 +820,7 @@
                </el-table-column>
                <el-table-column prop="cell" :label="$t('Slot No')" align="center">
                    <template slot-scope="scope">
                        <div :style="{backgroundColor: scope.row.state === 0 ? '#00FFFF' : '', width: '105%', height: '100%', lineHeight: '38px' }">
                        <div :style="{ width: '105%', height: '100%', lineHeight: '38px' }">
                            {{ scope.row.cell }}
                        </div>
                    </template>
@@ -830,7 +834,7 @@
                </el-table-column>
                <el-table-column prop="mateid" :label="$t('Mateid')" align="center">
                    <template slot-scope="scope">
                        <div :style="{width: '105%', height: '100%', lineHeight: '38px' }">
                        <div :style="{backgroundColor: scope.row.state === 0 ? '#00FFFF' : '',width: '105%', height: '100%', lineHeight: '38px' }">
                            {{ scope.row.mateid }}
                        </div>
                    </template>
@@ -898,6 +902,13 @@
                        </div>
                    </template>
                </el-table-column>
                <el-table-column prop="cell" :label="$t('Slot No')" align="center">
                    <template slot-scope="scope">
                        <div :style="{width: '105%', height: '100%', lineHeight: '38px' }">
                            {{ scope.row.cell }}
                        </div>  
                    </template>
                </el-table-column>
                <el-table-column prop="mateid" :label="$t('Mateid')" align="center">
                    <template slot-scope="scope">
                        <div :style="{width: '105%', height: '100%', lineHeight: '38px' }">
@@ -939,6 +950,8 @@
                <el-input v-model="StorageCageForm.thickness" autocomplete="off" style="width:15%;" />
                <label for="">{{ $t('Films') }}</label>
                <el-input v-model="StorageCageForm.films" autocomplete="off" style="width:15%;" />
                <label for="">{{ $t('Tier') }}</label>
                <el-input v-model="StorageCageForm.tier" autocomplete="off" style="width:15%;" />
                <el-button @click="SelectGlassInfo()" type="primary">
                    {{ $t('Select') }}</el-button>
            </div>
@@ -1032,7 +1045,8 @@
                glasswidthmm: "",
                glassheightmm: "",
                thickness: "",
                films: ""
                films: "",
                tier: ""
            },
            StorageCageAddInfo: [],
            TaskqueueInfo: [],
@@ -1172,6 +1186,8 @@
                    this.tasklist3 = obj.glassInfoFlowCard[0];
                    this.tasklist2 = obj.StoragTaskeTaskFeed[0];
                    this.tasklist1 = obj.StoragTaskeTaskOut[0];
                    // console.log(obj.StoragTaskeTaskOut[0]);
                    
                    this.SelectSetting = obj.SelectSetting[0];
                    this.selectedOption1.films = obj.SelectMeasure[0];
                    this.selectedOption2.thickness = obj.SelectMeasure[0];
@@ -1305,6 +1321,7 @@
                UpdateQueue(this.StorageCageAddInfo[index]).then(res => {
                    if (res.data.message == 200) {
                        this.$message.success(this.$t('Operation successful'));
                        // this.StorageCageAdd = false;
                    } else {
                        this.$message.error(this.$t('Operation failed'));
                    }
@@ -1403,9 +1420,9 @@
        },
        //查询玻璃信息
        SelectGlassInfo() {
            console.log(this.StorageCageForm.glasswidthmm);

            SelectGlassInfo(this.StorageCageForm.glasswidthmm, this.StorageCageForm.glassheightmm, this.StorageCageForm.thickness, this.StorageCageForm.films).then(res => {
            // console.log(this.StorageCageForm.glasswidthmm);
            // console.log(this.StorageCageForm.tier);
            SelectGlassInfo(this.StorageCageForm.glasswidthmm, this.StorageCageForm.glassheightmm, this.StorageCageForm.thickness, this.StorageCageForm.films,this.StorageCageForm.tier).then(res => {
                this.StorageCageAddInfo = res.data.StorageCageAddInfo;
            })
        },
@@ -1556,6 +1573,7 @@
        //人工匹配
        ManualMatching() {
            this.StorageCageAdd = true;
            this.SelectGlassInfo();
            this.Measuermode = false;
        },
        //人工拿走