wukai 1 неделя назад
Родитель
Сommit
a9f5bbe2cf
2 измененных файлов с 15 добавлено и 15 удалено
  1. 4 4
      src/views/calc/calcDay/index.vue
  2. 11 11
      src/views/ws/workshop/index.vue

+ 4 - 4
src/views/calc/calcDay/index.vue

@@ -84,15 +84,15 @@
       <el-table-column label="总米长" align="center" prop="length" />
       <el-table-column label="总重量" align="center" prop="weight" />
       <el-table-column label="稼动率" align="center" prop="efficiency" />
-      <el-table-column label="总电量" align="center" prop="kwh" />
-      <el-table-column label="告警数量" align="center" prop="alarm" />
+<!--      <el-table-column label="总电量" align="center" prop="kwh" />-->
+<!--      <el-table-column label="告警数量" align="center" prop="alarm" />-->
       <el-table-column label="A班" align="center">
         <el-table-column label="米长" align="center" prop="lengthA" />
         <el-table-column label="重量" align="center" prop="weightA" />
         <el-table-column label="稼动率" align="center" prop="efficiencyA" />
         <el-table-column label="开机时间" align="center" prop="openTimeA" />
         <el-table-column label="停机时间" align="center" prop="closeTimeA" />
-        <el-table-column label="电量" align="center" prop="kwhA" />
+<!--        <el-table-column label="电量" align="center" prop="kwhA" />-->
         <el-table-column label="停经片停机" align="center" prop="stop1A" />
         <el-table-column label="CCD停机" align="center" prop="stop2A" />
         <el-table-column label="人工停机" align="center" prop="stop3A" />
@@ -103,7 +103,7 @@
         <el-table-column label="稼动率" align="center" prop="efficiencyB" />
         <el-table-column label="开机时间" align="center" prop="openTimeB" />
         <el-table-column label="停机时间" align="center" prop="closeTimeB" />
-        <el-table-column label="电量" align="center" prop="kwhB" />
+<!--        <el-table-column label="电量" align="center" prop="kwhB" />-->
         <el-table-column label="停经片停机" align="center" prop="stop1B" />
         <el-table-column label="CCD停机" align="center" prop="stop2B" />
         <el-table-column label="人工停机" align="center" prop="stop3B" />

+ 11 - 11
src/views/ws/workshop/index.vue

@@ -86,11 +86,11 @@
     <!-- 添加或修改车间管理对话框 -->
     <el-dialog :title="title" v-model="open" width="1300px" append-to-body>
       <el-form ref="workshopRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="车间编码" prop="wsCode">
+        <el-form-item label="编码" prop="wsCode">
           <el-input v-model="form.wsCode" placeholder="请输入车间编码" />
         </el-form-item>
-        <el-form-item label="车间名称" prop="wsName">
-          <el-input v-model="form.wsName" placeholder="请输入车间名称" />
+        <el-form-item label="用能名称" prop="wsName">
+          <el-input v-model="form.wsName" placeholder="用能名称" />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
@@ -107,12 +107,12 @@
         <el-table :data="twinWorkshopEnergyList" :row-class-name="rowTwinWorkshopEnergyIndex" @selection-change="handleTwinWorkshopEnergySelectionChange" ref="twinWorkshopEnergy">
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column label="序号" align="center" prop="index" width="50"/>
-          <el-table-column label="设备名称" prop="energyName" width="250">
+          <el-table-column label="设备名称" prop="energyName" width="300">
             <template #default="scope">
               <el-input v-model="scope.row.energyName" placeholder="请输入能源设备名称" />
             </template>
           </el-table-column>
-          <el-table-column label="类型" prop="energyType" width="80">
+          <el-table-column label="类型" prop="energyType" width="120">
             <template #default="scope">
               <el-select v-model="scope.row.energyType" placeholder="请选择">
                 <el-option
@@ -124,16 +124,16 @@
               </el-select>
             </template>
           </el-table-column>
-          <el-table-column label="路径" prop="energyPath" width="300">
+          <el-table-column label="路径" prop="energyPath" width="500">
             <template #default="scope">
               <el-input v-model="scope.row.energyPath" placeholder="请输入路径" />
             </template>
           </el-table-column>
-          <el-table-column label="编码" prop="energyCode" width="250">
-            <template #default="scope">
-              <el-input v-model="scope.row.energyCode" placeholder="请输入编码" />
-            </template>
-          </el-table-column>
+<!--          <el-table-column label="编码" prop="energyCode" width="250">-->
+<!--            <template #default="scope">-->
+<!--              <el-input v-model="scope.row.energyCode" placeholder="请输入编码" />-->
+<!--            </template>-->
+<!--          </el-table-column>-->
           <el-table-column label="计算系数" prop="coefficient" width="150">
             <template #default="scope">
               <el-input v-model="scope.row.coefficient" placeholder="请输入计算系数" />