oyq28 7 mesi fa
parent
commit
6b290b75e6

+ 1 - 1
imcs-ui/src/views/zuihou/chfLargeScreen/twoDatasModel/component/main-item.vue

@@ -67,7 +67,7 @@ export default {
 <style lang="scss" scoped>
 .item-container {
   height: 100%;
-  width: 100%;
+  width: 113%;
   display: grid;
   grid-template-rows: 20% repeat(4, 1fr);
 }

+ 1 - 1
imcs-ui/src/views/zuihou/chfLargeScreen/twoDatasModel/component/metric-component.vue

@@ -21,7 +21,7 @@
             padding-bottom: 5%;
           "
         >
-          周度生产指标
+          周计划
         </div>
         <div style="font-size: 3vh">
           18件

+ 3 - 1
imcs-ui/src/views/zuihou/chfLargeScreen/twoDatasModel/component/order.vue

@@ -12,6 +12,7 @@
         :key="item.prop"
         :prop="item.prop"
         :label="item.label"
+        :width="item.width"
       />
     </el-table>
   </div>
@@ -45,7 +46,8 @@ export default {
         },
         {
           prop: 'deliveryTime',
-          label: '交付时间'
+          label: '交付时间',
+          width: 500
         },
       ]
     }

+ 1 - 1
imcs-ui/src/views/zuihou/chfLargeScreen/twoDatasModel/component/production-condition.vue

@@ -17,7 +17,7 @@
       </div>
       <div style="display: flex;justify-content: space-around;margin: 5%">
         <div style="width: 60%;">
-          周产量
+          周产量
         </div>
         <div style="font-size: 2vh;width: 40%;">
           {{machines.monthCount}}

+ 6 - 3
imcs-ui/src/views/zuihou/chfLargeScreen/twoDatasModel/component/progress.vue

@@ -46,15 +46,18 @@ export default {
         {
           prop: 'processedTime',
           label: '已加工时',
-          width: 100
+          width: 100,
+          formatter: (row) => `${row.processedTime}分钟`
         },
         {
           prop: 'remainTime',
-          label: '剩余工时'
+          label: '剩余工时',
+          formatter: (row) => `${row.remainTime}分钟`
         },
         {
           prop: 'sumTime',
-          label: '总工时'
+          label: '总工时',
+          formatter: (row) => `${row.sumTime}分钟`
         },
         {
           prop: 'point',

+ 4 - 4
imcs-ui/src/views/zuihou/qualityCenter/qualityResult/Index.vue

@@ -64,8 +64,8 @@
       <el-table-column prop="workpieceName" :label='$t("machining.table.qualityResult.workpieceName")' :show-overflow-tooltip="true"></el-table-column>
       <!-- 零件编号 -->
       <el-table-column prop="uniqueCode" :label='$t("machining.table.qualityResult.uniqueCode")'  :show-overflow-tooltip="true"></el-table-column>
-      <!-- 工序名称 -->
-      <el-table-column prop="procedureName" :label='$t("machining.table.qualityResult.procedureNo")' :show-overflow-tooltip="true"></el-table-column>
+      <!-- 工序名称
+      <el-table-column prop="procedureName" :label='$t("machining.table.qualityResult.procedureNo")' :show-overflow-tooltip="true"></el-table-column>-->
       <!-- X -->
       <el-table-column prop="okFlag" :label='$t("machining.table.qualityResult.okFlag")' :show-overflow-tooltip="true"></el-table-column>
       <!-- Y
@@ -74,7 +74,7 @@
       <el-table-column prop="createTime" :label='$t("machining.table.qualityResult.createTime")' :show-overflow-tooltip="true"></el-table-column>
 
       <!-- 操作 -->
-      <el-table-column
+<!--      <el-table-column
         :label="$t('table.operation')"
         fixed="right"
         align="center"
@@ -91,7 +91,7 @@
             />
           </el-tooltip>
         </template>
-      </el-table-column>
+      </el-table-column>-->
     </el-table>
     <pagination
       v-show="tableData.total > 0"