Merge remote-tracking branch 'origin/master'

ZengTao

2025-11-12 1449f79f342919f5b65003312b113a8dad229692

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

@@ -105,7 +105,7 @@
  parseAndSetTime();
});
let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/glassStorage/api/talk/rawGlass`;
const socketUrl = `ws://${window.ipConfig.serverUrl}/api/glassStorage/api/talk/rawGlass`;
const handleMessage = (data) => {
    const formattedTasks = data.tasks[0].map(task => {
      if (task && task.createTime) {
@@ -212,6 +212,11 @@
  }
};
const handleEdit = (row) => {
  patternWidth.value = row.patternWidth;
  patternHeight.value = row.patternHeight;
  patternThickness.value = row.patternThickness;
  filmsId.value = row.filmsId;
  remainQuantity.value = row.remainQuantity;
  window.localStorage.setItem('deviceId', row.deviceId)
  window.localStorage.setItem('slot', row.slot)
  Edit.value = true;
@@ -252,6 +257,30 @@
};
// 原片入库
const handleup = async () => {
    if (!patternWidth.value) {
    ElMessage.error(t('film.inwidth'))
    return
  }
    if (!patternHeight.value) {
    ElMessage.error(t('film.inheight'))
    return
  }
    if (!patternThickness.value) {
    ElMessage.error(t('film.inthickness'))
    return
  }
    if (!filmsId.value) {
    ElMessage.error(t('film.infilms'))
    return
  }
    if (!remainQuantity.value) {
    ElMessage.error(t('film.inquantity'))
    return
  }
    if (!slot.value) {
    ElMessage.error(t('film.selectwarehousing'))
    return
  }
  try {
    const response = await request.post('/glassStorage/rawGlassStorageDetails/patternWarehousing', {
      patternWidth: patternWidth.value,
@@ -278,6 +307,10 @@
};
// 入库请求
const handleupc = async () => {
    if (!leftingStation.value) {
    ElMessage.error(t('film.selectwarehousing'))
    return
  }
  try  {
    var url="/glassStorage/rawGlassStorageDetails/warehousingRequest?leftingStation="+leftingStation.value;
      const response = await request.post(url)
@@ -295,6 +328,10 @@
}
// 出库请求
const handleupe = async () => {
    if (!leftingStation.value) {
    ElMessage.error(t('film.selectwarehousing'))
    return
  }
  try  {
    var url="/glassStorage/rawGlassStorageDetails/outWarehousingRequest?leftingStation="+leftingStation.value;
      const response = await request.post(url)
@@ -388,6 +425,26 @@
const Editclick = async () => {
  let slot = window.localStorage.getItem('slot')
  let deviceId = window.localStorage.getItem('deviceId')
    if (!patternWidth.value) {
    ElMessage.error(t('film.inwidth'))
    return
  }
    if (!patternHeight.value) {
    ElMessage.error(t('film.inheight'))
    return
  }
    if (!patternThickness.value) {
    ElMessage.error(t('film.inthickness'))
    return
  }
    if (!filmsId.value) {
    ElMessage.error(t('film.infilms'))
    return
  }
    if (!remainQuantity.value) {
    ElMessage.error(t('basicData.selectquantity'))
    return
  }
  try {
    const response = await request.post('/glassStorage/rawGlassStorageDetails/updateQuantity', {
      deviceId: deviceId,
@@ -633,39 +690,39 @@
      </div>
    </el-card>
    <div class="img-dlpl">
      <div class="img-car1" style="z-index:999;top:250px;left:20px;position:absolute;"></div>
      <div class="img-car1" style="z-index:999;top:153px;left:20px;position:absolute;"></div>
      <!-- <div class="img-car1" :style="'z-index:999;top:250px;left:' + 20 + 'px;position:absolute;'"></div> -->
      <div class="card1" v-show="card1" style="z-index:999;top:430px;left:53px;position:absolute;"></div>
      <div class="card2" v-show="card2" style="z-index:999;top:430px;left:80px;position:absolute;"></div>
      <div class="card3" v-show="card3" style="z-index:999;top:430px;left:108px;position:absolute;"></div>
      <div class="card98" v-show="card98" style="z-index:999;top:430px;left:143px;position:absolute;"></div>
      <div class="card4" v-show="card4" style="z-index:999;top:430px;left:202px;position:absolute;"></div>
      <div class="card5" v-show="card5" style="z-index:999;top:430px;left:227px;position:absolute;"></div>
      <div class="card6" v-show="card6" style="z-index:999;top:430px;left:253px;position:absolute;"></div>
      <div class="card7" v-show="card7" style="z-index:999;top:430px;left:280px;position:absolute;"></div>
      <div class="card8" v-show="card8" style="z-index:999;top:430px;left:308px;position:absolute;"></div>
      <div class="card9" v-show="card9" style="z-index:999;top:430px;left:337px;position:absolute;"></div>
      <div class="card10" v-show="card10" style="z-index:999;top:430px;left:364px;position:absolute;"></div>
      <div class="card11" v-show="card11" style="z-index:999;top:430px;left:391px;position:absolute;"></div>
      <div class="card99" v-show="card99" style="z-index:999;top:430px;left:426px;position:absolute;"></div>
      <div class="card12" v-show="card12" style="z-index:999;top:430px;left:489px;position:absolute;"></div>
      <div class="card13" v-show="card13" style="z-index:999;top:430px;left:514px;position:absolute;"></div>
      <div class="card14" v-show="card14" style="z-index:999;top:430px;left:540px;position:absolute;"></div>
      <div class="card15" v-show="card15" style="z-index:999;top:430px;left:566px;position:absolute;"></div>
      <div class="card16" v-show="card16" style="z-index:999;top:430px;left:595px;position:absolute;"></div>
      <div class="card17" v-show="card17" style="z-index:999;top:430px;left:624px;position:absolute;"></div>
      <div class="card18" v-show="card18" style="z-index:999;top:430px;left:654px;position:absolute;"></div>
      <div class="card19" v-show="card19" style="z-index:999;top:430px;left:682px;position:absolute;"></div>
      <div class="card20" v-show="card20" style="z-index:999;top:430px;left:707px;position:absolute;"></div>
      <div class="card25" v-show="card25" style="z-index:999;top:109px;left:664px;position:absolute;"></div>
      <div class="card24" v-show="card24" style="z-index:999;top:109px;left:639px;position:absolute;"></div>
      <div class="card23" v-show="card23" style="z-index:999;top:109px;left:616px;position:absolute;"></div>
      <div class="card22" v-show="card22" style="z-index:999;top:109px;left:592px;position:absolute;"></div>
      <div class="card21" v-show="card21" style="z-index:999;top:109px;left:564px;position:absolute;"></div>
      <div class="card101" v-show="card101" style="z-index:999;top:109px;left:364px;position:absolute;"></div>
      <div class="card102" v-show="card102" style="z-index:999;top:109px;left:334px;position:absolute;"></div>
      <div class="card103" v-show="card103" style="z-index:999;top:109px;left:96px;position:absolute;"></div>
      <div class="card104" v-show="card104" style="z-index:999;top:109px;left:70px;position:absolute;"></div>
      <div class="card1" v-show="card1"     style="z-index:999;top:308px;left:53px;position:absolute;"></div>
      <div class="card2" v-show="card2"     style="z-index:999;top:308px;left:80px;position:absolute;"></div>
      <div class="card3" v-show="card3"     style="z-index:999;top:308px;left:108px;position:absolute;"></div>
      <div class="card98" v-show="card98"   style="z-index:999;top:308px;left:143px;position:absolute;"></div>
      <div class="card4" v-show="card4"     style="z-index:999;top:308px;left:202px;position:absolute;"></div>
      <div class="card5" v-show="card5"     style="z-index:999;top:308px;left:227px;position:absolute;"></div>
      <div class="card6" v-show="card6"     style="z-index:999;top:308px;left:253px;position:absolute;"></div>
      <div class="card7" v-show="card7"     style="z-index:999;top:308px;left:280px;position:absolute;"></div>
      <div class="card8" v-show="card8"     style="z-index:999;top:308px;left:308px;position:absolute;"></div>
      <div class="card9" v-show="card9"     style="z-index:999;top:308px;left:337px;position:absolute;"></div>
      <div class="card10" v-show="card10"   style="z-index:999;top:308px;left:364px;position:absolute;"></div>
      <div class="card11" v-show="card11"   style="z-index:999;top:308px;left:391px;position:absolute;"></div>
      <div class="card99" v-show="card99"   style="z-index:999;top:308px;left:426px;position:absolute;"></div>
      <div class="card12" v-show="card12"   style="z-index:999;top:308px;left:489px;position:absolute;"></div>
      <div class="card13" v-show="card13"   style="z-index:999;top:308px;left:514px;position:absolute;"></div>
      <div class="card14" v-show="card14"   style="z-index:999;top:308px;left:540px;position:absolute;"></div>
      <div class="card15" v-show="card15"   style="z-index:999;top:308px;left:566px;position:absolute;"></div>
      <div class="card16" v-show="card16"   style="z-index:999;top:308px;left:595px;position:absolute;"></div>
      <div class="card17" v-show="card17"   style="z-index:999;top:308px;left:624px;position:absolute;"></div>
      <div class="card18" v-show="card18"   style="z-index:999;top:308px;left:654px;position:absolute;"></div>
      <div class="card19" v-show="card19"   style="z-index:999;top:308px;left:682px;position:absolute;"></div>
      <div class="card20" v-show="card20"   style="z-index:999;top:308px;left:707px;position:absolute;"></div>
      <div class="card25" v-show="card25"   style="z-index:999;top:44px;left:664px;position:absolute;"></div>
      <div class="card24" v-show="card24"   style="z-index:999;top:44px;left:639px;position:absolute;"></div>
      <div class="card23" v-show="card23"   style="z-index:999;top:44px;left:616px;position:absolute;"></div>
      <div class="card22" v-show="card22"   style="z-index:999;top:44px;left:592px;position:absolute;"></div>
      <div class="card21" v-show="card21"   style="z-index:999;top:44px;left:564px;position:absolute;"></div>
      <div class="card101" v-show="card101"  style="z-index:999;top:44px;left:364px;position:absolute;"></div>
      <div class="card102" v-show="card102"  style="z-index:999;top:44px;left:334px;position:absolute;"></div>
      <div class="card103" v-show="card103"  style="z-index:999;top:44px;left:96px;position:absolute;"></div>
      <div class="card104" v-show="card104"  style="z-index:999;top:44px;left:70px;position:absolute;"></div>
    </div>
    <el-dialog v-model="dialogFormVisiblea" top="5vh" width="85%" >
    <el-table  ref="table" style="margin-top: 20px;height: 700px;"
@@ -702,7 +759,7 @@
        </el-table>
</el-dialog>
<!-- 历史任务 -->
<el-dialog v-model="blindb" top="5vh" width="95%">
<el-dialog v-model="blindb" top="5vh" width="95%" @close="iframeUrl=''">
     <iframe 
     :src="iframeUrl" 
     marginwidth="2000px"
@@ -891,11 +948,6 @@
<style scoped>
#dt { display:block; float:left;line-height: 20px;margin-left: 100px;}
#dta { display:block; float:left;line-height: 20px;margin-left: 80%;}
.awatch{
  height: 400px;
  width: 1500px;
  max-width: 100%;
}
#dialog-footer {
  text-align: center;
  margin-top: -15px;
@@ -903,19 +955,20 @@
.img-dlpl{
  margin-left: 330px;
  margin-top: 10px;
  background-image:url('../../assets/ypcc.png');
  background-image:url('/ypcc.png');
  background-repeat: no-repeat;
  background-attachment: local;
  min-height: 700px;
  min-height: 450px;
  width: 800px;
  max-width: 100%;
  background-size: 800px 700px;
  background-size: 800px 450px;
  overflow: hidden;
  position:relative
  position:relative;
  margin-left: 30%
}
.img-car1{
  display: flex;
  background-image:url('../../assets/C1.png');
  background-image:url('/C1.png');
  position: absolute;
  background-repeat: no-repeat;
  background-attachment: local;