分支自 SuZhouGuanHong/TaiYuanTaiZhong

huanghongfeng
2024-05-11 ccb5c15ee5cf72d8567997ae25fce6518fb63ae0
平面库区优化
已修改2个文件
40 ■■■■ 文件已修改
代码管理/WMS/WMS_Client/src/views/Home.vue 38 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WMS/WMS_Server/WIDESEA_WMS/Services/system/Partial/dt_stationinfoService.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
´úÂë¹ÜÀí/WMS/WMS_Client/src/views/Home.vue
@@ -1,15 +1,6 @@
<template>
  <div>
    <el-button type="success" style="width: 10%;height: 50px;" v-on:click="selList()">刷新</el-button>
  </div>
  <div v-for="(index,inst) in datalist.length" :key="inst" style="padding: 10px;">
    <h1 style="border-bottom: 1px dashed silver; padding: 5px;;height: 52px;">
      <span v-if="inst==0">叠盘区</span>
      <span v-else-if="inst==1">上料区</span>
      <span v-else-if="inst==2">下料区</span>
      <span v-else-if="inst==3">外协区</span>
      <span v-else-if="inst==4">托盘叠放区</span>
      <span v-else>{{inst-3}}库区</span>
  <div class="fixed-row">
    <el-button type="success" style="width: 10%;height: 40px;font-size: 35px;" v-on:click="selList()">刷新</el-button>
      <span style="margin-left: 40px;">
        <el-button  circle style="background-color: #409eff;color: #000;">有货</el-button>
        <el-button  circle style="background-color: lightgreen;color: #000;">空货位</el-button>
@@ -17,6 +8,18 @@
        <el-button  circle style="background-color: red;color: #000;">异常</el-button>
        <el-button  circle style="background-color: #C0C4CC;color: #000;">禁用</el-button>
      </span>
  </div>
  <div style="height: 50px;">
  </div>
  <div v-for="(index,inst) in datalist.length" :key="inst" style="padding: 10px;">
    <h1 style="border-bottom: 1px dashed silver; padding: 5px;;height: 52px;">
      <span v-if="inst==0">托盘叠放区</span>
      <span v-else-if="inst==1">上料区</span>
      <span v-else-if="inst==2">下料区</span>
      <span v-else-if="inst==3">外协区</span>
      <span v-else-if="inst==4">叠盘区</span>
      <span v-else>{{inst-3}}库区</span>
    </h1>
  <div class="table-container">
    <div class="scrollable-table">
@@ -26,9 +29,11 @@
          :style="{ 'background-color': getBackgroundColor(items.enable,items.location_state) }">
            <el-tooltip class="item" effect="dark" placement="right" >
              <template #content v-if="items.stationType!=='' && items.bindSN !== '' && items.stationType!==null && items.bindSN !== null">
                <div>库位编号:{{ items.stationCode }}</div>
                <div>物料类型(图号): {{ items.stationType }}</div>
                <div>炉号: {{ items.heatNumber }}</div>
                <div>车轮SN号:{{ items.bindSN }}</div>
                <div>钢坯号:{{ items.billetID }}</div>
              </template>
              <template #content v-else>
                <div>目前暂无信息</div>
@@ -94,8 +99,12 @@
          return 'yellow';
        case 'OutBusy':
          return 'yellow';
        case 'Busy':
          return 'yellow';
        case 'Abnormal':
          return 'red';
        case 'Abnormal':
          return 'yellow';
        default:
          return 'transparent';
      }
@@ -154,4 +163,11 @@
.table-container::-webkit-scrollbar-thumb {
  background-color: #ccc; 
}
.fixed-row {
  position: fixed;
  width: 100%; /* è®©è¡Œçš„宽度占满整个视窗 */
  background-color: #fff; /* å¦‚果需要,设置背景色 */
  z-index: 3; /* ç¡®ä¿å›ºå®šè¡Œåœ¨å…¶ä»–内容之上 */
}
</style>
´úÂë¹ÜÀí/WMS/WMS_Server/WIDESEA_WMS/Services/system/Partial/dt_stationinfoService.cs
@@ -180,7 +180,7 @@
            WebResponseContent content = new WebResponseContent();
            VOLContext volContext = new VOLContext();
            Idt_stationinfoRepository dsta = new dt_stationinfoRepository(volContext);
            string[] stationCodes = { "DD","S", "X", "W","A", "B", "C", "D01" };
            string[] stationCodes = { "A","S", "X", "W", "DD","B", "C", "D01"};
            List<Tuple<List<dt_stationinfo>, int>> responseData = new List<Tuple<List<dt_stationinfo>, int>>();
            foreach (string code in stationCodes)
            {