Merge remote-tracking branch 'origin/master'

zhoushihao

2024-12-10 24bc065e9009bfb3c778e762921268a389aeaf49

 UI-Project/src/views/hollow/hollowequipment.vue

@@ -5,13 +5,13 @@
        <el-button id="searchButton" type="success" @click="handlezhiban">
          {{ $t('hellow.createtask') }}
        </el-button>
        <el-button style="margin-left: 20px;" id="searchButton" type="success" @click="handleBinda">
          {{ $t('hellow.starttask') }}
        </el-button>
        <el-button style="margin-left: 20px;" id="searchButton" type="success" @click="handleBindb">{{
            $t('hellow.stoptask')
          }}
        </el-button>
<!--        <el-button style="margin-left: 20px;" id="searchButton" type="success" @click="handleBinda">-->
<!--          {{ $t('hellow.starttask') }}-->
<!--        </el-button>-->
<!--        <el-button style="margin-left: 20px;" id="searchButton" type="success" @click="handleBindb">{{-->
<!--            $t('hellow.stoptask')-->
<!--          }}-->
<!--        </el-button>-->
    <el-switch style="margin-top: 7px;margin-left: 10px;" v-model="ganghua" class="mb-2" :inactive-text="$t('hellow.schedulingswitch')" @change="handleChange" />
  </div>
      <div style="margin-bottom: -5px;margin-left: 5px;">
@@ -42,16 +42,21 @@
        </el-form>
      </div>
      <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
    <el-table height="480" ref="table" :data="tableDataa"
    <el-table height="650" ref="table" :data="tableDataa"
              :header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }">
      <el-table-column prop="sequence" :label="$t('hellow.order')" align="center"/>
      <el-table-column prop="thickness" :label="$t('hellow.thickness')" align="center"/>
      <el-table-column prop="layer" :label="$t('hellow.coatingtypes')" align="center"/>
      <el-table-column prop="layer" :label="$t('hellow.layer')" align="center"/>
      <el-table-column prop="filmsId" :label="$t('hellow.coatingtypes')" align="center"/>
      <el-table-column prop="height" :label="$t('hellow.height')" align="center"/>
      <el-table-column prop="width" :label="$t('hellow.width')" align="center"/>
      <el-table-column prop="state" :label="$t('hellow.state')" align="center"/>
      <el-table-column prop="state" :label="$t('hellow.state')" align="center">
        <template #default="scope">
          {{ scope.row.state == -1 ? "等待出片" : "出片完成" }}
        </template>
      </el-table-column>
    </el-table>
      <div style="display: flex;margin-left: 500px;margin-top: 10px;">
      <div style="display: flex;margin-left: 40%;margin-top: 10px;">
        <!-- <div style="float: center;"> -->
      <div style="margin-top: 5px;margin-right: 5px;">线路</div>
  <el-pagination
@@ -70,7 +75,7 @@
  <el-dialog v-model="dialogFormVisiblea" top="5vh" width="85%">
  <el-table
    ref="table"
    style="margin-top: 20px; height: 500px;"
    style="margin-top: 20px; height: 700px;"
    :data="tableDatab"
    :header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }"
    row-key="projectNumber"
@@ -171,6 +176,7 @@
      </div>
    </template>
  </el-dialog>
  <!-- 缺片详情 -->
  <el-dialog v-model="dialogFormVisibleb" top="7vh" width="70%" height="500">
    <div style="margin-top: -20px;text-align: center;margin-left: 400px;">
      <el-form-item :label="$t('hellow.cardnumbera')" style="width: 14vw">
@@ -298,6 +304,7 @@
  dialogFormVisiblea.value = true;
  fetchFlowCardId();
};
// 缺片详情
const handleBindRack = (row) => {
  const { projectNumber, layer } = row;
  currentRow.projectNumber  = row.projectNumber;
@@ -358,7 +365,8 @@
    var url="/hollowGlass/hollowGlassRelationInfo/queryLackByFlowCard?flowCardId="+flowCardId + "&layer=" + layer;
    const response = await request.post(url)
    if (response.code == 200) {
      tableDatac.value = response.data[1];
      // tableDatac.value = response.data[1];
      tableDatac.value = response.data;
      ElMessage.success(response.message);
    } else {
      ElMessage.error(response.message);