bklLiudl
2025-01-17 569e06f34e59321d07444a087ab1028666a2ac8e
Merge branch 'master' into liudl
1个文件已修改
105 ■■■■ 已修改文件
Web/src/views/device/deviceInfo/index.vue 105 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Web/src/views/device/deviceInfo/index.vue
@@ -89,35 +89,62 @@
                            <div >
                                <el-form label-position="right" label-width="40px" style="">
                                    <el-form-item label="工位">
                                        <el-input id="locaText" :disabled="lockInputStatus" v-model="stationValue.locatNo" style="width: 200px; margin-right: 10px;"></el-input>
                                        <el-input id="locaText" :disabled="lockInputStatus"
                                            v-model="stationValue.locatNo"
                                            style="width: 200px; margin-right: 10px;"></el-input>
                                        <el-button @click="textLock(stationValue)">{{lockText}}</el-button>
                                        <el-button @click="write('zidong',stationValue)">自动</el-button>
                                        <el-button @click="write('shoudong',stationValue)">手动</el-button>
                                        <el-button @mousedown="writeDown('huifu',stationValue)"  @mouseup="writeUp('huifu',stationValue)">报警恢复</el-button>
                                        <el-button @mousedown="writeDown('huifu', stationValue)"
                                            @mouseup="writeUp('huifu', stationValue)">报警恢复</el-button>
                                    </el-form-item>
                                                                        
                                    <el-form-item>
                                        <el-button size="large" :disabled="lockStatus" @mousedown="writeDown('1diandong',stationValue)"  @mouseup="writeUp('1diandong',stationValue)">1点动</el-button>
                                        <el-button size="large" :disabled="lockStatus" @mousedown="writeDown('2diandong',stationValue)"  @mouseup="writeUp('2diandong',stationValue)">2点动</el-button>
                                        <el-button size="large" :disabled="lockStatus" @mousedown="writeDown('3diandong',stationValue)"  @mouseup="writeUp('3diandong',stationValue)">3点动</el-button>
                                        <el-button size="large" :disabled="lockStatus" @mousedown="writeDown('4diandong',stationValue)"  @mouseup="writeUp('4diandong',stationValue)">4点动</el-button>
                                        <el-button size="large" :disabled="lockStatus"
                                            @mousedown="writeDown('1diandong', stationValue)"
                                            @mouseup="writeUp('1diandong', stationValue)">1点动</el-button>
                                        <el-button size="large" :disabled="lockStatus"
                                            @mousedown="writeDown('2diandong', stationValue)"
                                            @mouseup="writeUp('2diandong', stationValue)">2点动</el-button>
                                        <el-button size="large" :disabled="lockStatus"
                                            @mousedown="writeDown('3diandong', stationValue)"
                                            @mouseup="writeUp('3diandong', stationValue)">3点动</el-button>
                                        <el-button size="large" :disabled="lockStatus"
                                            @mousedown="writeDown('4diandong', stationValue)"
                                            @mouseup="writeUp('4diandong', stationValue)">4点动</el-button>
                                    </el-form-item>
                                    <el-form-item>
                                        <el-button size="large" :disabled="lockStatus" @mousedown="writeDown('1liandong',stationValue)"  @mouseup="writeUp('1liandong',stationValue)">1联动</el-button>
                                        <el-button size="large" :disabled="lockStatus" @mousedown="writeDown('2liandong',stationValue)"  @mouseup="writeUp('2liandong',stationValue)">2联动</el-button>
                                        <el-button size="large" :disabled="lockStatus" @mousedown="writeDown('3liandong',stationValue)"  @mouseup="writeUp('3liandong',stationValue)">3联动</el-button>
                                        <el-button size="large" :disabled="lockStatus" @mousedown="writeDown('4liandong',stationValue)"  @mouseup="writeUp('4liandong',stationValue)">4联动</el-button>
                                        <el-button size="large" :disabled="lockStatus"
                                            @mousedown="writeDown('1liandong', stationValue)"
                                            @mouseup="writeUp('1liandong', stationValue)">1联动</el-button>
                                        <el-button size="large" :disabled="lockStatus"
                                            @mousedown="writeDown('2liandong', stationValue)"
                                            @mouseup="writeUp('2liandong', stationValue)">2联动</el-button>
                                        <el-button size="large" :disabled="lockStatus"
                                            @mousedown="writeDown('3liandong', stationValue)"
                                            @mouseup="writeUp('3liandong', stationValue)">3联动</el-button>
                                        <el-button size="large" :disabled="lockStatus"
                                            @mousedown="writeDown('4liandong', stationValue)"
                                            @mouseup="writeUp('4liandong', stationValue)">4联动</el-button>
                                    </el-form-item>
                                    
                                    <el-form-item>
                                        <el-button size="large" :disabled="lockStatus" @mousedown="writeDown('yizaisheng',stationValue)"  @mouseup="writeUp('yizaisheng',stationValue)">移栽上升</el-button>
                                        <el-button size="large" :disabled="lockStatus" @mousedown="writeDown('fanzhuansheng',stationValue)"  @mouseup="writeUp('fanzhuansheng',stationValue)">翻转机上升</el-button>
                                        <el-button size="large" :disabled="lockStatus"
                                            @mousedown="writeDown('yizaisheng', stationValue)"
                                            @mouseup="writeUp('yizaisheng', stationValue)">移栽上升</el-button>
                                        <el-button size="large" :disabled="lockStatus"
                                            @mousedown="writeDown('fanzhuansheng', stationValue)"
                                            @mouseup="writeUp('fanzhuansheng', stationValue)">翻转机上升</el-button>
                                    </el-form-item>
                                    <el-form-item>
                                        <el-button size="large" :disabled="lockStatus" @mousedown="writeDown('yizaijiang',stationValue)"  @mouseup="writeUp('yizaijiang',stationValue)">移栽下降</el-button>
                                        <el-button size="large" :disabled="lockStatus" @mousedown="writeDown('fanzhuanjiang',stationValue)"  @mouseup="writeUp('fanzhuanjiang',stationValue)">翻转机下降</el-button>
                                        <el-button size="large" :disabled="lockStatus"
                                            @mousedown="writeDown('yizaijiang', stationValue)"
                                            @mouseup="writeUp('yizaijiang', stationValue)">移栽下降</el-button>
                                        <el-button size="large" :disabled="lockStatus"
                                            @mousedown="writeDown('fanzhuanjiang', stationValue)"
                                            @mouseup="writeUp('fanzhuanjiang', stationValue)">翻转机下降</el-button>
                                    </el-form-item>
                                </el-form>
@@ -130,69 +157,83 @@
                                        <el-col :span="8">
                                            <el-form-item >
                                                <el-button @click="write('UpTask',stationValue)">更改任务</el-button>
                                                <el-button @click="writeTaskInfo('writeTask',stationValue)">任务写入</el-button>
                                                <el-button @click="writeTaskInfo('writeTaskDelete',stationValue)">任务清空</el-button>
                                                <el-button
                                                    @click="writeTaskInfo('writeTask', stationValue)">任务写入</el-button>
                                                <el-button
                                                    @click="writeTaskInfo('writeTaskDelete', stationValue)">任务清空</el-button>
                                            </el-form-item>
                                        </el-col>    
                                        <el-col :span="6">
                                            <el-form-item label="任务号" >
                                                <el-input v-model="stationValue.taskNo" style="width: 200px; "></el-input>
                                                <el-input v-model="stationValue.taskNo"
                                                    style="width: 200px; "></el-input>
                                            </el-form-item>
                                        </el-col>
                                        <el-col :span="6">
                                            <el-form-item label="托盘号">
                                                <el-input v-model="stationValue.palletNo" style="width: 200px; margin-right: 10px;"></el-input>
                                                <el-input v-model="stationValue.palletNo"
                                                    style="width: 200px; margin-right: 10px;"></el-input>
                                            </el-form-item>
                                        </el-col>
                                        <el-col :span="6">
                                            <el-form-item label="起始工位">
                                                <el-input v-model="stationValue.startLoction" style="width: 200px; margin-right: 10px;"></el-input>
                                                <el-input v-model="stationValue.startLoction"
                                                    style="width: 200px; margin-right: 10px;"></el-input>
                                            </el-form-item>
                                        </el-col>
                                        <el-col :span="6">
                                            <el-form-item label="目标工位">
                                                <el-input v-model="stationValue.endLoction" style="width: 200px; margin-right: 10px;"></el-input>
                                                <el-input v-model="stationValue.endLoction"
                                                    style="width: 200px; margin-right: 10px;"></el-input>
                                            </el-form-item>
                                        </el-col>
                                        <el-col :span="6">
                                            <el-form-item label="起始排">
                                                <el-input v-model="stationValue.startPai" style="width: 200px; margin-right: 10px;"></el-input>
                                                <el-input v-model="stationValue.startPai"
                                                    style="width: 200px; margin-right: 10px;"></el-input>
                                            </el-form-item>
                                        </el-col>
                                        <el-col :span="6">
                                            <el-form-item label="起始列">
                                                <el-input v-model="stationValue.startLie" style="width: 200px; margin-right: 10px;"></el-input>
                                                <el-input v-model="stationValue.startLie"
                                                    style="width: 200px; margin-right: 10px;"></el-input>
                                            </el-form-item>
                                        </el-col>
                                        <el-col :span="6">
                                            <el-form-item label="起始层">
                                                <el-input v-model="stationValue.startCeng" style="width: 200px; margin-right: 10px;"></el-input>
                                                <el-input v-model="stationValue.startCeng"
                                                    style="width: 200px; margin-right: 10px;"></el-input>
                                            </el-form-item>
                                        </el-col>
                                        <el-col :span="6">
                                            <el-form-item label="目标排">
                                                <el-input v-model="stationValue.endPai" style="width: 200px; margin-right: 10px;"></el-input>
                                                <el-input v-model="stationValue.endPai"
                                                    style="width: 200px; margin-right: 10px;"></el-input>
                                            </el-form-item>
                                        </el-col>
                                        <el-col :span="6">
                                            <el-form-item label="目标列">
                                                <el-input v-model="stationValue.endLie" style="width: 200px; margin-right: 10px;"></el-input>
                                                <el-input v-model="stationValue.endLie"
                                                    style="width: 200px; margin-right: 10px;"></el-input>
                                            </el-form-item>
                                        </el-col>
                                        <el-col :span="6">
                                            <el-form-item label="目标层">
                                                <el-input v-model="stationValue.endCeng" style="width: 200px; margin-right: 10px;"></el-input>
                                                <el-input v-model="stationValue.endCeng"
                                                    style="width: 200px; margin-right: 10px;"></el-input>
                                            </el-form-item>
                                        </el-col>
                                        
                                        <el-col :span="6">
                                            <el-form-item label="缠膜信号">
                                                <el-input v-model="stationValue.chanMo" disabled style="width: 200px; margin-right: 10px;"></el-input>
                                                <el-input v-model="stationValue.chanMo" disabled
                                                    style="width: 200px; margin-right: 10px;"></el-input>
                                            </el-form-item>
                                        </el-col>
                                        <el-col :span="6">
                                            <el-form-item label="拆膜信号">
                                                <el-input v-model="stationValue.chaiMo" disabled style="width: 200px; margin-right: 10px;"></el-input>
                                                <el-input v-model="stationValue.chaiMo" disabled
                                                    style="width: 200px; margin-right: 10px;"></el-input>
                                            </el-form-item>
                                        </el-col>
                                    </el-row>    
@@ -325,6 +366,11 @@
            // }
        }
    });
    signalR.onreconnected(() => {
        console.log('重连成功plc***');
        handleQuery();
    });
});
const handleSwitchChange = (field: string, value: boolean) => {
    const param = { [field]: value };
@@ -333,7 +379,6 @@
//更新堆垛机
// updateStacker({ stationNum: '10', boxHeight: 200 })
function updateStacker(data: any) {
    debugger;
    const foundCell = cellsDataLine.value.find(cell => cell.Code === data.stationNum);
    if (foundCell) {
        foundCell.EndLocat = data.endLocat;
@@ -388,7 +433,6 @@
//切换层平面
function floorTogglePlain(buttonNumber) {
    const floorData = [cellsDataOne.value, cellsDataTwo.value, cellsDataThree.value];
    debugger;
    if (buttonNumber >= 1 && buttonNumber <= 3) {
        const index = buttonNumber - 1;
        floorStates.value = {
@@ -532,7 +576,6 @@
</script>
<style scoped>
.box-card {
    height: 30px;
    padding: 0;