YiWuProject.git

parent: 30fd531c | 补丁 | 提交 | show whitespace

wangfei

2025-02-19 73d050cad30ba9c8cc168709f116013f7eeb864c

大理片笼新增小车并调整位置，上片更换结束工程显示及逻辑，更改破损、人工拿走接口

3个文件已修改

1个文件已添加

	UI-Project/src/assets/C1.png	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	UI-Project/src/views/GlassStorage/rawfilmstorage.vue	32 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	UI-Project/src/views/Returns/upreturns.vue	82 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	UI-Project/src/views/Returns/upreturns2.vue	47 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 UI-Project/src/assets/C1.png


 UI-Project/src/views/GlassStorage/rawfilmstorage.vue

@@ -410,9 +410,9 @@
        </el-table>
      </div>
    </el-card>
    <div class="awatch">
      <img src="../../assets/ypcc.png" alt=""
           style="width: 100%;height: 120%;margin-left: -10px;position: relative;margin-top: -20px;">
    <div class="img-dlpl" >
    <div class="img-car1" :style="'z-index:999;top:243px;left:' + 460 + 'px;position:absolute;'">
    </div>
    </div>
    <el-dialog v-model="dialogFormVisiblea" top="5vh" width="85%" >
    <el-table  ref="table" style="margin-top: 20px;height: 700px;"
@@ -636,4 +636,30 @@
  text-align: center;
  margin-top: -15px;
}
.img-dlpl{
  margin-left: 20px;
  margin-top: -40px;
  background-image:url('../../assets/ypcc.png');
  background-repeat: no-repeat;
  background-attachment: local;
  min-height: 500px;
  width: 1400px;
  max-width: 100%;
  background-size: 1600px 600px;
  overflow: hidden;
  position:relative
}
.img-car1{
  display: flex;
  background-image:url('../../assets/C1.png');
  position: absolute;
  background-repeat: no-repeat;
  background-attachment: local;
  min-width: 200px;
  height: 100px;
  max-height: 100%;
  background-size: 40px 100px;
  overflow: hidden;
  position:relative
}
</style>

 UI-Project/src/views/Returns/upreturns.vue

@@ -103,10 +103,6 @@
onBeforeUnmount(() => {
  closeWebSocket();
});
// 结束工程
const handledelete = (row) => {
  blindb.value = true;
};
const requestData = {
  state: 100
};
@@ -151,36 +147,7 @@
    console.error(error);
  }
}
// 结束工程
const deleteTask = async () => {
  try {
    let engineeringId = window.localStorage.getItem('engineeringIda')
    if (engineeringId !== '') {
      const response = await request.post('/loadGlass/engineering/engineering/deleteTask', {
        engineerId: engineeringId,
      })
      if (response.code == 200) {
        ElMessage.success(response.message);
        tableDatad.value = response.data;
        canSelectProjecta.value = true;
        canSelectProjectb.value = true;
        canSelectProjectc.value = false;
        blindb.value = false;
      } else {
        ElMessage.error(response.message);
    }
  }
    else  {
      ElMessage({
        type: 'info',
        message: t('basicData.infonull'),
      })
    }
}
catch (error) {
    console.error(error);
  }
}

// 开始上片
const handleon = async () => {
  let filmRemove = window.localStorage.getItem('filmRemove')
@@ -314,7 +281,7 @@
      } 
    );
    if (confirmResult === 'confirm') {
     const response = await request.post('/loadGlass/engineering/engineering/insetDamage', {
     const response = await request.post('/loadGlass/engineering/engineering/identControls', {
       glassId: row.glassId,
       line: 5,
       status: 1,
@@ -344,7 +311,7 @@
      } 
    );
    if (confirmResult === 'confirm') {
      const response = await request.post('/loadGlass/engineering/engineering/insetDamage', {
      const response = await request.post('/loadGlass/engineering/engineering/identControls', {
       glassId: row.glassId,
       line: 5,
       status: 1,
@@ -385,6 +352,40 @@
        // const response = await request.post(url);
        if (response.code === 200) {
          ElMessage.success(response.message);
        } else {
          ElMessage.error(response.message);
        }
      } else {
      }
    }
  } catch (error) {
  }
};
// 结束工程
const deleteTask = async () => {
      try {
    const confirmResult = await ElMessageBox.confirm(
      t('searchOrder.pdeleteTask'),
      t('workOrder.prompt'),
      {
        confirmButtonText: t('workOrder.yes'),
        cancelButtonText: t('workOrder.cancel'),
        type: 'warning',
      }
    );
    if (confirmResult === 'confirm') {
    let engineeringId = window.localStorage.getItem('engineeringIda')
    if (engineeringId !== '') {
      const response = await request.post('/loadGlass/engineering/engineering/deleteTask', {
        engineerId: engineeringId,
      })
      if (response.code == 200) {
        ElMessage.success(response.message);
        canSelectProjecta.value = true;
        canSelectProjectb.value = true;
        canSelectProjectc.value = false;
        blindb.value = true;
        tableDatad.value = response.data;
        } else {
          ElMessage.error(response.message);
        }
@@ -437,7 +438,7 @@
    <el-button :disabled="!canSelectProjecta" style="margin-top: 5px;margin-left: 15px;"  type="primary" @click="selectproject">{{ $t('Mounting.previewproject') }}</el-button>
    <el-button :disabled="!canSelectProjectb" style="margin-top: 5px;margin-left: 20px;" type="success" @click="handleBind">{{ $t('basicData.startloading') }}</el-button>
    <el-button :disabled="!canSelectProjectc" style="margin-top: 5px;margin-left: 20px;"  id="searchButton" type="warning" @click="handleBinda">{{ $t('basicData.stop') }}</el-button>
    <el-button :disabled="!canSelectProjectc" style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="danger" @click="handledelete">{{ $t('searchOrder.deleteTask') }}</el-button>
    <el-button :disabled="!canSelectProjectc" style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="danger" @click="deleteTask">{{ $t('searchOrder.deleteTask') }}</el-button>
    <el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="info" @click="handlezhiban">{{ $t('searchOrder.dutyinformation') }}</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;">
@@ -452,11 +453,7 @@
          <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 }">
              <span>{{ 1 }}</span>
            </template>
          </el-table-column>
          <el-table-column prop="layoutSequence" :label="$t('Mounting.projectnumber')" align="center"/>
      <el-table-column
      align="center"
      prop="state"
@@ -534,7 +531,6 @@
        </el-table>
        <template #footer>
      <div id="dialog-footer">
        <el-button type="danger" @click="deleteTask()">{{ $t('searchOrder.deleteTask') }}</el-button>
        <el-button @click="blindb = false">{{ $t('large.close') }}</el-button>
      </div>
    </template>

 UI-Project/src/views/Returns/upreturns2.vue

@@ -185,34 +185,37 @@
// 结束工程
const deleteTask = async () => {
  try {
    const confirmResult = await ElMessageBox.confirm(
      t('searchOrder.pdeleteTask'),
      t('workOrder.prompt'),
      {
        confirmButtonText: t('workOrder.yes'),
        cancelButtonText: t('workOrder.cancel'),
        type: 'warning',
      }
    );
    if (confirmResult === 'confirm') {
    let engineeringId = window.localStorage.getItem('engineeringIda')
    console.log(engineeringId);
    if (engineeringId !== '') {
      const response = await request.post('/loadGlass/engineering/engineering/deleteTask', {
        engineerId: engineeringId,
      })
      if (response.code == 200) {
        ElMessage.success(response.message);
        tableDatad.value = response.data;
        canSelectProjecta.value = true;
        canSelectProjectb.value = true;
        canSelectProjectc.value = false;
        blindb.value = false;
        blindb.value = true;
        tableDatad.value = response.data;
      } else {
        ElMessage.error(response.message);
    }
  }
    else  {
      ElMessage({
        type: 'info',
        message: t('basicData.infonull'),
      })
      } else {
    }
}
catch (error) {
    console.error(error);
  } catch (error) {
  }
}
};
// 开始上片
const handleon = async () => {
  let filmRemove = window.localStorage.getItem('filmRemove')
@@ -347,7 +350,7 @@
      } 
    );
    if (confirmResult === 'confirm') {
     const response = await request.post('/loadGlass/engineering/engineering/insetDamage', {
     const response = await request.post('/loadGlass/engineering/engineering/identControls', {
       glassId: row.glassId,
       line: 6,
       status: 1,
@@ -377,7 +380,7 @@
      } 
    );
    if (confirmResult === 'confirm') {
      const response = await request.post('/loadGlass/engineering/engineering/insetDamage', {
      const response = await request.post('/loadGlass/engineering/engineering/identControls', {
       glassId: row.glassId,
       line: 6,
       status: 1,
@@ -441,7 +444,7 @@
    <el-button :disabled="!canSelectProjecta" style="margin-top: 5px;margin-left: 15px;"  type="primary" @click="selectproject">{{ $t('Mounting.previewproject') }}</el-button>
    <el-button :disabled="!canSelectProjectb" style="margin-top: 5px;margin-left: 20px;" type="success" @click="handleBind">{{ $t('basicData.startloading') }}</el-button>
    <el-button :disabled="!canSelectProjectc" style="margin-top: 5px;margin-left: 20px;"  id="searchButton" type="warning" @click="handleBinda">{{ $t('basicData.stop') }}</el-button>
    <el-button :disabled="!canSelectProjectc" style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="danger" @click="handledelete">{{ $t('searchOrder.deleteTask') }}</el-button>
    <el-button :disabled="!canSelectProjectc" style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="danger" @click="deleteTask">{{ $t('searchOrder.deleteTask') }}</el-button>
    <el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="info" @click="handlezhiban">{{ $t('searchOrder.dutyinformation') }}</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;">
@@ -456,11 +459,7 @@
          <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 }">
              <span>{{ 1 }}</span>
            </template>
          </el-table-column>
          <el-table-column prop="layoutSequence" :label="$t('Mounting.projectnumber')" align="center"/>
          <el-table-column
      align="center"
      prop="state"
@@ -542,14 +541,6 @@
        <el-button @click="blindb = false">{{ $t('large.close') }}</el-button>
      </div>
    </template>
    <!-- <template #footer>
      <div id="dialog-footer">
        <el-button type="primary" @click="deleteTask">
          {{ $t('basicData.confirm') }}
        </el-button>
        <el-button @click="blindb = false">{{ $t('basicData.cancel') }}</el-button>
      </div>
    </template> -->
  </el-dialog>
  <!-- 值班信息 -->
    <el-dialog v-model="dialoglea" top="15vh" width="70%" :title="$t('searchOrder.dutyinformation')">

			@@ -410,9 +410,9 @@
			</el-table>
			</div>
			</el-card>
			<div class="awatch">
			<img src="../../assets/ypcc.png" alt=""
			style="width: 100%;height: 120%;margin-left: -10px;position: relative;margin-top: -20px;">
			<div class="img-dlpl" >
			<div class="img-car1" :style="'z-index:999;top:243px;left:' + 460 + 'px;position:absolute;'">
			</div>
			</div>
			<el-dialog v-model="dialogFormVisiblea" top="5vh" width="85%" >
			<el-table ref="table" style="margin-top: 20px;height: 700px;"
			@@ -636,4 +636,30 @@
			text-align: center;
			margin-top: -15px;
			}
			.img-dlpl{
			margin-left: 20px;
			margin-top: -40px;
			background-image:url('../../assets/ypcc.png');
			background-repeat: no-repeat;
			background-attachment: local;
			min-height: 500px;
			width: 1400px;
			max-width: 100%;
			background-size: 1600px 600px;
			overflow: hidden;
			position:relative
			}
			.img-car1{
			display: flex;
			background-image:url('../../assets/C1.png');
			position: absolute;
			background-repeat: no-repeat;
			background-attachment: local;
			min-width: 200px;
			height: 100px;
			max-height: 100%;
			background-size: 40px 100px;
			overflow: hidden;
			position:relative
			}
			</style>

			@@ -103,10 +103,6 @@
			onBeforeUnmount(() => {
			closeWebSocket();
			});
			// 结束工程
			const handledelete = (row) => {
			blindb.value = true;
			};
			const requestData = {
			state: 100
			};
			@@ -151,36 +147,7 @@
			console.error(error);
			}
			}
			// 结束工程
			const deleteTask = async () => {
			try {
			let engineeringId = window.localStorage.getItem('engineeringIda')
			if (engineeringId !== '') {
			const response = await request.post('/loadGlass/engineering/engineering/deleteTask', {
			engineerId: engineeringId,
			})
			if (response.code == 200) {
			ElMessage.success(response.message);
			tableDatad.value = response.data;
			canSelectProjecta.value = true;
			canSelectProjectb.value = true;
			canSelectProjectc.value = false;
			blindb.value = false;
			} else {
			ElMessage.error(response.message);
			}
			}
			else {
			ElMessage({
			type: 'info',
			message: t('basicData.infonull'),
			})
			}
			}
			catch (error) {
			console.error(error);
			}
			}

			// 开始上片
			const handleon = async () => {
			let filmRemove = window.localStorage.getItem('filmRemove')
			@@ -314,7 +281,7 @@
			}
			);
			if (confirmResult === 'confirm') {
			const response = await request.post('/loadGlass/engineering/engineering/insetDamage', {
			const response = await request.post('/loadGlass/engineering/engineering/identControls', {
			glassId: row.glassId,
			line: 5,
			status: 1,
			@@ -344,7 +311,7 @@
			}
			);
			if (confirmResult === 'confirm') {
			const response = await request.post('/loadGlass/engineering/engineering/insetDamage', {
			const response = await request.post('/loadGlass/engineering/engineering/identControls', {
			glassId: row.glassId,
			line: 5,
			status: 1,
			@@ -385,6 +352,40 @@
			// const response = await request.post(url);
			if (response.code === 200) {
			ElMessage.success(response.message);
			} else {
			ElMessage.error(response.message);
			}
			} else {
			}
			}
			} catch (error) {
			}
			};
			// 结束工程
			const deleteTask = async () => {
			try {
			const confirmResult = await ElMessageBox.confirm(
			t('searchOrder.pdeleteTask'),
			t('workOrder.prompt'),
			{
			confirmButtonText: t('workOrder.yes'),
			cancelButtonText: t('workOrder.cancel'),
			type: 'warning',
			}
			);
			if (confirmResult === 'confirm') {
			let engineeringId = window.localStorage.getItem('engineeringIda')
			if (engineeringId !== '') {
			const response = await request.post('/loadGlass/engineering/engineering/deleteTask', {
			engineerId: engineeringId,
			})
			if (response.code == 200) {
			ElMessage.success(response.message);
			canSelectProjecta.value = true;
			canSelectProjectb.value = true;
			canSelectProjectc.value = false;
			blindb.value = true;
			tableDatad.value = response.data;
			} else {
			ElMessage.error(response.message);
			}
			@@ -437,7 +438,7 @@
			<el-button :disabled="!canSelectProjecta" style="margin-top: 5px;margin-left: 15px;" type="primary" @click="selectproject">{{ $t('Mounting.previewproject') }}</el-button>
			<el-button :disabled="!canSelectProjectb" style="margin-top: 5px;margin-left: 20px;" type="success" @click="handleBind">{{ $t('basicData.startloading') }}</el-button>
			<el-button :disabled="!canSelectProjectc" style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="warning" @click="handleBinda">{{ $t('basicData.stop') }}</el-button>
			<el-button :disabled="!canSelectProjectc" style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="danger" @click="handledelete">{{ $t('searchOrder.deleteTask') }}</el-button>
			<el-button :disabled="!canSelectProjectc" style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="danger" @click="deleteTask">{{ $t('searchOrder.deleteTask') }}</el-button>
			<el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="info" @click="handlezhiban">{{ $t('searchOrder.dutyinformation') }}</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;">
			@@ -452,11 +453,7 @@
			<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 }">
			<span>{{ 1 }}</span>
			</template>
			</el-table-column>
			<el-table-column prop="layoutSequence" :label="$t('Mounting.projectnumber')" align="center"/>
			<el-table-column
			align="center"
			prop="state"
			@@ -534,7 +531,6 @@
			</el-table>
			<template #footer>
			<div id="dialog-footer">
			<el-button type="danger" @click="deleteTask()">{{ $t('searchOrder.deleteTask') }}</el-button>
			<el-button @click="blindb = false">{{ $t('large.close') }}</el-button>
			</div>
			</template>

			@@ -185,34 +185,37 @@
			// 结束工程
			const deleteTask = async () => {
			try {
			const confirmResult = await ElMessageBox.confirm(
			t('searchOrder.pdeleteTask'),
			t('workOrder.prompt'),
			{
			confirmButtonText: t('workOrder.yes'),
			cancelButtonText: t('workOrder.cancel'),
			type: 'warning',
			}
			);
			if (confirmResult === 'confirm') {
			let engineeringId = window.localStorage.getItem('engineeringIda')
			console.log(engineeringId);
			if (engineeringId !== '') {
			const response = await request.post('/loadGlass/engineering/engineering/deleteTask', {
			engineerId: engineeringId,
			})
			if (response.code == 200) {
			ElMessage.success(response.message);
			tableDatad.value = response.data;
			canSelectProjecta.value = true;
			canSelectProjectb.value = true;
			canSelectProjectc.value = false;
			blindb.value = false;
			blindb.value = true;
			tableDatad.value = response.data;
			} else {
			ElMessage.error(response.message);
			}
			}
			else {
			ElMessage({
			type: 'info',
			message: t('basicData.infonull'),
			})
			} else {
			}
			}
			catch (error) {
			console.error(error);
			} catch (error) {
			}
			}
			};
			// 开始上片
			const handleon = async () => {
			let filmRemove = window.localStorage.getItem('filmRemove')
			@@ -347,7 +350,7 @@
			}
			);
			if (confirmResult === 'confirm') {
			const response = await request.post('/loadGlass/engineering/engineering/insetDamage', {
			const response = await request.post('/loadGlass/engineering/engineering/identControls', {
			glassId: row.glassId,
			line: 6,
			status: 1,
			@@ -377,7 +380,7 @@
			}
			);
			if (confirmResult === 'confirm') {
			const response = await request.post('/loadGlass/engineering/engineering/insetDamage', {
			const response = await request.post('/loadGlass/engineering/engineering/identControls', {
			glassId: row.glassId,
			line: 6,
			status: 1,
			@@ -441,7 +444,7 @@
			<el-button :disabled="!canSelectProjecta" style="margin-top: 5px;margin-left: 15px;" type="primary" @click="selectproject">{{ $t('Mounting.previewproject') }}</el-button>
			<el-button :disabled="!canSelectProjectb" style="margin-top: 5px;margin-left: 20px;" type="success" @click="handleBind">{{ $t('basicData.startloading') }}</el-button>
			<el-button :disabled="!canSelectProjectc" style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="warning" @click="handleBinda">{{ $t('basicData.stop') }}</el-button>
			<el-button :disabled="!canSelectProjectc" style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="danger" @click="handledelete">{{ $t('searchOrder.deleteTask') }}</el-button>
			<el-button :disabled="!canSelectProjectc" style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="danger" @click="deleteTask">{{ $t('searchOrder.deleteTask') }}</el-button>
			<el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="info" @click="handlezhiban">{{ $t('searchOrder.dutyinformation') }}</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;">
			@@ -456,11 +459,7 @@
			<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 }">
			<span>{{ 1 }}</span>
			</template>
			</el-table-column>
			<el-table-column prop="layoutSequence" :label="$t('Mounting.projectnumber')" align="center"/>
			<el-table-column
			align="center"
			prop="state"
			@@ -542,14 +541,6 @@
			<el-button @click="blindb = false">{{ $t('large.close') }}</el-button>
			</div>
			</template>
			<!-- <template #footer>
			<div id="dialog-footer">
			<el-button type="primary" @click="deleteTask">
			{{ $t('basicData.confirm') }}
			</el-button>
			<el-button @click="blindb = false">{{ $t('basicData.cancel') }}</el-button>
			</div>
			</template> -->
			</el-dialog>
			<!-- 值班信息 -->
			<el-dialog v-model="dialoglea" top="15vh" width="70%" :title="$t('searchOrder.dutyinformation')">