YiWuProject.git

			@@ -94,10 +94,10 @@
			const handlesure = async () => {
			try {
			const response = await request.post('/loadGlass/up-patten-usage/selectUpPattenUsage', {
			stationCell: 1,
			// engineerId: 'P24101602',
			stationCell: 5,
			engineerId: selectedProjectNo.value,
			filmRemove: filmRemove.value,
			// filmRemove: filmRemove.value,
			filmRemove: parseInt(filmRemove.value, 10),
			})
			window.localStorage.setItem('engineeringId', selectedProjectNo.value)
			window.localStorage.setItem('filmRemove', filmRemove.value)
			@@ -105,8 +105,10 @@
			ElMessage.success(response.message);
			tableData.value = response.data;
			dialogFormVisible.value = false;
			selectedProjectNo.value = ''
			filmRemove.value = ''
			selectedProjectNo.value = '';
			filmRemove.value = '';
			markingMachineStatus.value = '#911005';
			cuttingMachineStatus.value = '#911005';
			} else {
			ElMessage.error(response.message);
			}
			@@ -120,10 +122,10 @@
			let engineeringId = window.localStorage.getItem('engineeringId')
			if (markingMachineStatus.value === 'green' && cuttingMachineStatus.value === 'green') {
			try {
			// const response = await request.post('/loadGlass/engineering/engineering/pause', {
			const response = await request.post('/loadGlass/engineering/engineering/changeTask', {
			stationCell: 1,
			stationCell: 5,
			filmRemove: filmRemove,
			// engineerId: 'P24101602',
			engineerId: engineeringId,
			state: 1,
			})
			@@ -144,13 +146,14 @@
			// 暂停
			const handleup = async () => {
			try {
			let filmRemove = window.localStorage.getItem('filmRemove')
			let engineeringId = window.localStorage.getItem('engineeringId')
			console.log(engineeringId);
			if (engineeringId !== '') {
			const response = await request.post('/loadGlass/engineering/engineering/pauseTask', {
			stationCell: 1,
			// engineerId: 'P24101602',
			engineeringId: engineeringId,
			const response = await request.post('/loadGlass/engineering/engineering/pause', {
			stationCell: 5,
			filmRemove: filmRemove,
			engineerId: engineeringId,
			state: 0,
			})
			if (response.code == 200) {
			@@ -173,14 +176,15 @@
			// 查询数据
			const selectReportData = async () => {
			let stateList = []
			if (selectValuesa[1] != null && selectValuesa[1] != 'undefined') {
			if (selectValuesa[1] != "") {
			stateList = [selectValuesa[1]];
			if (selectValuesa[0] != null && selectValuesa[0] != 'undefined') {
			if (selectValuesa[0] != "") {
			stateList = [selectValuesa[0]];
			}
			}
			const response = await request.post("/cacheVerticalGlass/damage/selectDamage", {
			taskState: stateList,
			taskType: 1
			const response = await request.post("/loadGlass/up-patten-usage/setUpPattenRequest", {
			state: selectValuesa[0],
			// state: stateList,
			stationCell: 5
			})
			if (response.code === 200) {
			tableData.value = response.data;
			@@ -233,21 +237,53 @@
			}
			} catch (error) {
			ElMessage.error(t('basicData.glassnull'));
			}
			}
			};

			function getStatusType2(filmRemove) {
			switch (filmRemove) {
			case 0:
			return 'success';
			case 1:
			return 'info';
			case 2:
			return 'warning';
			}
			}

			function getStatusText2(filmRemove) {
			switch (filmRemove) {
			case 0:
			return t('Mounting.noremoval');//完成
			case 1:
			return t('Mounting.coarselyground');//新建
			case 2:
			return t('Mounting.finegrinding');//执行中
			}
			}
			</script>
			<template>
			<div>
			<div id="dotClass">
			<div>{{ $t('basicData.laserprinting') }}</div>
			<i :style="{ marginTop: '2px', backgroundColor: markingMachineStatus, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
			<el-button @click="confirmMarkingMachine" style="margin-left: 30px;margin-top: -3px;">{{ $t('basicData.yes') }}</el-button>
			<div style="margin-left: 70px;">{{ $t('basicData.cuttingmachine') }}</div>
			<i :style="{ marginTop: '2px', backgroundColor: cuttingMachineStatus, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
			<el-button @click="confirmCuttingMachine" style="margin-left: 30px;margin-top: -3px;" >{{ $t('basicData.yes') }}</el-button>
			<div style="margin-left: 70px;">{{ upstatus }} </div>
			<i :style="{ marginTop: '2px', backgroundColor: cuttingMachineStatusColor, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
			<el-button @click="confirmCutting" style="margin-left: 30px;margin-top: -3px;" >{{ $t('basicData.change') }}</el-button>
			<div style="height: 500px;">
			<div>
			<div id="dotClass">
			<div>{{ $t('basicData.laserprinting') }}</div>
			<i :style="{ marginTop: '2px', backgroundColor: markingMachineStatus, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
			<el-button @click="confirmMarkingMachine" style="margin-left: 30px;margin-top: -3px;">{{
			$t('basicData.yes')
			}}
			</el-button>
			<div style="margin-left: 70px;">{{ $t('basicData.cuttingmachine') }}</div>
			<i :style="{ marginTop: '2px', backgroundColor: cuttingMachineStatus, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
			<el-button @click="confirmCuttingMachine" style="margin-left: 30px;margin-top: -3px;">{{
			$t('basicData.yes')
			}}
			</el-button>
			<div style="margin-left: 70px;">{{ upstatus }}</div>
			<i :style="{ marginTop: '2px', backgroundColor: cuttingMachineStatusColor, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
			<el-button @click="confirmCutting" style="margin-left: 30px;margin-top: -3px;">{{
			$t('basicData.change')
			}}
			</el-button>
			</div>
			<el-button style="margin-top: 5px;margin-left: 15px;" type="primary" @click="selectproject">{{ $t('Mounting.previewproject') }}</el-button>
			<el-button style="margin-top: 5px;margin-left: 20px;" type="success" @click="handleBind">{{ $t('basicData.startloading') }}</el-button>
			@@ -267,40 +303,52 @@
			<el-button type="primary" style="margin-left: 10px;" @click="selectReportData()">{{ $t('Mounting.setparameters') }}</el-button>
			<el-card style="flex: 1;margin-left: 10px;margin-top: 15px;" v-loading="loading">
			<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
			<el-table
			height="350"
			ref="table"
			:header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
			:data="tableData"
			>
			<el-table-column prop="layoutSequence" :label="$t('Mounting.project')" width="100" align="center"/>
			<el-table-column prop="engineeringId" :label="$t('Mounting.width')" width="200" align="center"/>
			<el-table-column prop="width" :label="$t('Mounting.height')" align="center"/>
			<el-table-column prop="height" :label="$t('Mounting.thickness')" align="center"/>
			<el-table-column prop="filmsId" :label="$t('Mounting.loadinglinea')" align="center"/>
			<el-table-column :label="$t('Mounting.projectnumber')" align="center">
			<template #default="{ row }">
			<!-- 这里总是显示 1 -->
			<span>{{ 1 }}</span>
			</template>
			</el-table-column>
			<el-table-column
			align="center"
			:label="$t('Mounting.state')"
			<el-table
			height="350"
			ref="table"
			:header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
			:data="tableData"
			>
			<el-table-column prop="engineeringId" :label="$t('Mounting.project')" width="100" align="center"/>
			<el-table-column prop="width" :label="$t('Mounting.width')" width="200" align="center"/>
			<el-table-column prop="height" :label="$t('Mounting.height')" align="center"/>
			<el-table-column prop="thickness" :label="$t('Mounting.thickness')" align="center"/>
			<el-table-column prop="filmsId" :label="$t('Mounting.loadinglinea')" align="center"/>
			<el-table-column :label="$t('Mounting.projectnumber')" align="center">
			<template #default="{ row }">
			<!-- 这里总是显示 1 -->
			<span>{{ 1 }}</span>
			</template>
			</el-table-column>
			<el-table-column
			align="center"
			:label="$t('Mounting.state')"
			min-width="80"
			prop="state"
			>
			<template #default="scope">
			<el-tag
			:type="scope.row.state === 100 ? 'success' : 'warning'"
			@click="toggleEnableState(scope.row)"
			>
			{{ scope.row.state === 100 ? $t('Mounting.pass') : $t('Mounting.waiting') }}
			</el-tag>
			</template>
			</el-table-column>
			<el-table-column prop="filmsId" :label="$t('Mounting.createtime')" align="center"/>
			</el-table>
			<template #default="scope">
			<el-tag
			:type="scope.row.state === 100 ? 'success' : 'warning'"
			@click="toggleEnableState(scope.row)"
			>
			{{ scope.row.state === 100 ? $t('Mounting.pass') : $t('Mounting.waiting') }}
			</el-tag>
			</template>
			</el-table-column>
			<!-- <el-table-column prop="filmRemove" :label="$t('Mounting.removalmethodp')" align="center"/> -->
			<!-- <el-table-column
			align="center"
			:label="$t('Mounting.removalmethodp')"
			prop="filmRemove"
			>
			<template #default="scope">
			<el-tag :type="getStatusType2(scope.row.filmRemove)">
			{{ getStatusText2(scope.row.filmRemove) }}
			</el-tag>
			</template>
			</el-table-column> -->
			<!-- <el-table-column prop="stationCell" :label="$t('Mounting.loadinglinea')" align="center"/> -->
			</el-table>
			</div>
			</el-card>
			<div style="display: flex;">
			@@ -308,7 +356,7 @@
			<div style="display: flex;">
			<img src="../../assets/shangpianji.png" alt=""
			style="max-width: 25%;max-height: 25%;margin-left: 10%;margin-top: 5%;">
			<el-table :data="tableDataa" border style="width: 75%;margin-top: 10%;margin-left: 2%;"
			<el-table :data="tableDataa" border style="width: 75%;margin-top: 10%;margin-left: 8%;"
			:header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
			>
			<el-table-column prop="workstationId" align="center" :label="$t('basicData.station')" min-width="60"/>
			@@ -316,7 +364,7 @@
			<el-table-column prop="patternHeight" align="center" :label="$t('basicData.height')" min-width="80"/>
			<el-table-column prop="filmsId" align="center" :label="$t('basicData.coatingtypes')" min-width="80"/>
			<el-table-column prop="number" align="center" :label="$t('basicData.quantity')" min-width="80"/>
			</el-table>
			</el-table>
			</div>
			</div>
			<!-- <div style="width: 48%;float: right;">
			@@ -430,7 +478,7 @@
			</div>
			</template>
			</el-dialog>

			</div>
			</template>

			<style scoped>